Update XDG information in support of bug report 892.

pull/1/head
Darrell Anderson 12 years ago
parent 74043b50a2
commit a353c255ba

@ -489,7 +489,7 @@ if test "$1" = "default"; then
kde_widgetdir='\${libdir}/trinity/plugins/designer'
fi
if test -z "$xdg_appsdir"; then
xdg_appsdir='\${datadir}/applications/kde'
xdg_appsdir='\${datadir}/applications/tde'
fi
if test -z "$xdg_menudir"; then
xdg_menudir='\${sysconfdir}/xdg/menus'

@ -106,9 +106,9 @@ Comment[uz@cyrillic]=Amarok - мусиқага янгидан назар таш
Comment[wa]=Amarok - Ridiscovroz vosse muzike!
Comment[zh_TW]=Amarok - 重新發現你的音樂!
Icon=amarok
X-KDE-Protocols=http
X-TDE-Protocols=http
#don't add inode/directory to mimetypes it leads to misbehavior
MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/x-ms-asf;audio/flac;audio/ogg;
DocPath=amarok/index.html
Terminal=false
Categories=Qt;KDE;AudioVideo;Audio;Player;
Categories=Qt;TDE;AudioVideo;Audio;Player;

@ -2,15 +2,15 @@
Encoding=UTF-8
ServiceTypes=application/asx,audio/*
Actions=appendToPlaylist;appendAndPlay;queueTrack;
X-KDE-Submenu=Amarok
X-KDE-Submenu[bn]=আমারক
X-KDE-Submenu[el]=AmaroK
X-KDE-Submenu[es]=amaroK
X-KDE-Submenu[ga]=AmaroK
X-KDE-Submenu[mk]=Амарок
X-KDE-Submenu[ne]=अमारोक
X-KDE-Submenu[pa]=ਅਮਰੋਕ
X-KDE-Submenu[ru]=amaroK
X-TDE-Submenu=Amarok
X-TDE-Submenu[bn]=আমারক
X-TDE-Submenu[el]=AmaroK
X-TDE-Submenu[es]=amaroK
X-TDE-Submenu[ga]=AmaroK
X-TDE-Submenu[mk]=Амарок
X-TDE-Submenu[ne]=अमारोक
X-TDE-Submenu[pa]=ਅਮਰੋਕ
X-TDE-Submenu[ru]=amaroK
[Desktop Action appendToPlaylist]
Name=Append to Playlist

@ -1,13 +1,13 @@
[Desktop Entry]
Encoding=UTF-8
Type=ServiceType
X-KDE-ServiceType=Amarok/CodecInstall
X-TDE-ServiceType=Amarok/CodecInstall
# The unplayable codec
[PropertyDef::X-KDE-Amarok-codec]
[PropertyDef::X-TDE-Amarok-codec]
Type=TQString
[PropertyDef::X-KDE-Amarok-engine]
[PropertyDef::X-TDE-Amarok-engine]
Type=TQString
# If true, Amarok will show a warning dialog about the experimental nature of this plugin.

@ -2,7 +2,7 @@
ServiceTypes=media/audiocd
Actions=Play;
Encoding=UTF-8
X-KDE-Priority=TopLevel
X-TDE-Priority=TopLevel
[Desktop Action Play]
Name=Play Audio CD with Amarok

@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Type=ServiceType
X-KDE-ServiceType=Amarok/Plugin
X-TDE-ServiceType=Amarok/Plugin
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -53,36 +53,36 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
# Type of plugin, e.g. "engine".
[PropertyDef::X-KDE-Amarok-plugintype]
[PropertyDef::X-TDE-Amarok-plugintype]
Type=TQString
# Internal name for identification, not translated.
[PropertyDef::X-KDE-Amarok-name]
[PropertyDef::X-TDE-Amarok-name]
Type=TQString
# List of authors.
[PropertyDef::X-KDE-Amarok-authors]
[PropertyDef::X-TDE-Amarok-authors]
Type=TQStringList
# List of author's email addresses.
[PropertyDef::X-KDE-Amarok-email]
[PropertyDef::X-TDE-Amarok-email]
Type=TQStringList
# Priority of the plugin. When KTrader returns multiple offers, the one with the highest rank is chosen.
# Range: 0 (disabled) - 255 (highest)
[PropertyDef::X-KDE-Amarok-rank]
[PropertyDef::X-TDE-Amarok-rank]
Type=int
# Version of the plugin.
[PropertyDef::X-KDE-Amarok-version]
[PropertyDef::X-TDE-Amarok-version]
Type=int
# Version of the framework this plugin is compatible with.
# Must be bumped after making binary incompatible changes.
[PropertyDef::X-KDE-Amarok-framework-version]
[PropertyDef::X-TDE-Amarok-framework-version]
Type=int
# If true, Amarok will show a warning dialog about the experimental nature of this plugin.
[PropertyDef::X-KDE-Amarok-experimental]
[PropertyDef::X-TDE-Amarok-experimental]
Type=bool

@ -715,7 +715,7 @@ void App::applySettings( bool firstTime )
EngineBase *engine = EngineController::engine();
if( firstTime || AmarokConfig::soundSystem() !=
PluginManager::getService( engine )->property( "X-KDE-Amarok-name" ).toString() )
PluginManager::getService( engine )->property( "X-TDE-Amarok-name" ).toString() )
{
//will unload engine for us first if necessary
engine = EngineController::instance()->loadEngine();

@ -117,18 +117,18 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, KCon
TQToolTip::add( aboutEngineButton, i18n("Click to get the plugin information.") );
/// Populate the engine selection combo box
KTrader::OfferList offers = PluginManager::query( "[X-KDE-Amarok-plugintype] == 'engine'" );
KTrader::OfferList offers = PluginManager::query( "[X-TDE-Amarok-plugintype] == 'engine'" );
KTrader::OfferList::ConstIterator end( offers.end() );
for( KTrader::OfferList::ConstIterator it = offers.begin(); it != end; ++it ) {
// Don't list the <no engine> (void engine) entry if it's not currently active,
// cause there's no point in choosing this engine (it's a dummy, after all).
if( (*it)->property( "X-KDE-Amarok-name" ).toString() == "void-engine"
if( (*it)->property( "X-TDE-Amarok-name" ).toString() == "void-engine"
&& AmarokConfig::soundSystem() != "void-engine" ) continue;
m_soundSystem->insertItem( (*it)->name() );
// Save name properties in TQMap for lookup
m_pluginName[(*it)->name()] = (*it)->property( "X-KDE-Amarok-name" ).toString();
m_pluginAmarokName[(*it)->property( "X-KDE-Amarok-name" ).toString()] = (*it)->name();
m_pluginName[(*it)->name()] = (*it)->property( "X-TDE-Amarok-name" ).toString();
m_pluginAmarokName[(*it)->property( "X-TDE-Amarok-name" ).toString()] = (*it)->name();
}
// Collection

@ -80,7 +80,7 @@ CollectionDB::CollectionDB()
m_cacheDir.cd( "albumcovers/cache" );
// Load DBEngine plugin
TQString query = "[X-KDE-Amarok-plugintype] == 'dbengine' and [X-KDE-Amarok-name] != '%1'";
TQString query = "[X-TDE-Amarok-plugintype] == 'dbengine' and [X-TDE-Amarok-name] != '%1'";
KTrader::OfferList offers = PluginManager::query( query.arg( "sqlite-dbengine" ) );
m_dbEngine = (DBEngine*) PluginManager::createFromService( offers.first() );

@ -41,7 +41,7 @@ Name[uz@cyrillic]=SQLite маълумот базаси
Name[wa]=Éndjin d' BD SQLite
Name[zh_CN]=SQLite 数据引擎
Name[zh_TW]=SQLite 資料庫引擎
X-KDE-Library=libamarok_sqlite_dbengine_plugin
X-TDE-Library=libamarok_sqlite_dbengine_plugin
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -93,11 +93,11 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=amaroK/Plugin
X-KDE-amaroK-plugintype=dbengine
X-KDE-amaroK-name=sqlite-dbengine
X-KDE-amaroK-authors=Mark Kretschmann, Christian Muehlhaeuser
X-KDE-amaroK-email=markey@web.de
X-KDE-amaroK-rank=255
X-KDE-amaroK-version=1
X-KDE-amaroK-framework-version=5
X-TDE-amaroK-plugintype=dbengine
X-TDE-amaroK-name=sqlite-dbengine
X-TDE-amaroK-authors=Mark Kretschmann, Christian Muehlhaeuser
X-TDE-amaroK-email=markey@web.de
X-TDE-amaroK-rank=255
X-TDE-amaroK-version=1
X-TDE-amaroK-framework-version=5

@ -99,12 +99,12 @@ Comment[zh_CN]=Amarok 的设备插件
Comment[zh_TW]=amaroK 裝置插件
ServiceTypes=Amarok/Plugin
X-KDE-Library=libamarok_massstorage-device
X-TDE-Library=libamarok_massstorage-device
X-KDE-Amarok-authors=Maximilian Kossick
X-KDE-Amarok-email=maximilian.kossick@googlemail.com
X-KDE-Amarok-framework-version=32
X-KDE-Amarok-name=massstorage-device
X-KDE-Amarok-plugintype=device
X-KDE-Amarok-rank=100
X-KDE-Amarok-version=1
X-TDE-Amarok-authors=Maximilian Kossick
X-TDE-Amarok-email=maximilian.kossick@googlemail.com
X-TDE-Amarok-framework-version=32
X-TDE-Amarok-name=massstorage-device
X-TDE-Amarok-plugintype=device
X-TDE-Amarok-rank=100
X-TDE-Amarok-version=1

@ -96,12 +96,12 @@ Comment[zh_CN]=Amarok 支持 NFS 的设备插件
Comment[zh_TW]=支援 NFS 的 amaroK 裝置插件
ServiceTypes=Amarok/Plugin
X-KDE-Library=libamarok_nfs-device
X-TDE-Library=libamarok_nfs-device
X-KDE-Amarok-authors=Maximilian Kossick
X-KDE-Amarok-email=maximilian.kossick@googlemail.com
X-KDE-Amarok-framework-version=32
X-KDE-Amarok-name=nfs-device
X-KDE-Amarok-plugintype=device
X-KDE-Amarok-rank=100
X-KDE-Amarok-version=1
X-TDE-Amarok-authors=Maximilian Kossick
X-TDE-Amarok-email=maximilian.kossick@googlemail.com
X-TDE-Amarok-framework-version=32
X-TDE-Amarok-name=nfs-device
X-TDE-Amarok-plugintype=device
X-TDE-Amarok-rank=100
X-TDE-Amarok-version=1

@ -95,12 +95,12 @@ Comment[zh_CN]=Amarok 支持 SMBFS 的设备插件
Comment[zh_TW]=支援 SMBFS 的 amaroK 裝置插件
ServiceTypes=Amarok/Plugin
X-KDE-Library=libamarok_smb-device
X-TDE-Library=libamarok_smb-device
X-KDE-Amarok-authors=Maximilian Kossick
X-KDE-Amarok-email=maximilian.kossick@googlemail.com
X-KDE-Amarok-framework-version=32
X-KDE-Amarok-name=smb-device
X-KDE-Amarok-plugintype=device
X-KDE-Amarok-rank=100
X-KDE-Amarok-version=1
X-TDE-Amarok-authors=Maximilian Kossick
X-TDE-Amarok-email=maximilian.kossick@googlemail.com
X-TDE-Amarok-framework-version=32
X-TDE-Amarok-name=smb-device
X-TDE-Amarok-plugintype=device
X-TDE-Amarok-rank=100
X-TDE-Amarok-version=1

@ -57,7 +57,7 @@ Name[wa]=Éndjin aKode
Name[zh_CN]=aKode 引擎
Name[zh_TW]=aKode 解碼引擎
ServiceTypes=Amarok/Plugin
X-KDE-Library=libamarok_aKode-engine
X-TDE-Library=libamarok_aKode-engine
Comment=aKode audio-engine for Amarok
Comment[af]=aKode oudio enjin vir Amarok
Comment[ar]=محرك صوتي aKode ل- AmaroK
@ -110,11 +110,11 @@ Comment[wa]=Éndjin d' son aKode po-z Amarok
Comment[zh_CN]=Amarok 的 aKode 音频引擎
Comment[zh_TW]=AmaroK 的 aKode 解碼引擎
X-KDE-Amarok-plugintype=engine
X-KDE-Amarok-name=akode-engine
X-KDE-Amarok-authors=Allan Sandfeld, Max Howell
X-KDE-Amarok-email=kde@carewolf.com
X-KDE-Amarok-rank=0
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=engine
X-TDE-Amarok-name=akode-engine
X-TDE-Amarok-authors=Allan Sandfeld, Max Howell
X-TDE-Amarok-email=kde@carewolf.com
X-TDE-Amarok-rank=0
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -54,7 +54,7 @@ Name[uz@cyrillic]=Helix тизими
Name[wa]=Éndjin Helix
Name[zh_CN]=Helix 引擎
Name[zh_TW]=Helix 解碼引擎
X-KDE-Library=libamarok_helixengine_plugin
X-TDE-Library=libamarok_helixengine_plugin
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -106,13 +106,13 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=engine
X-KDE-Amarok-name=helix-engine
X-KDE-Amarok-authors=Paul Cifarelli
X-KDE-Amarok-email=paul@cifarelli.net
X-KDE-Amarok-rank=75
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=engine
X-TDE-Amarok-name=helix-engine
X-TDE-Amarok-authors=Paul Cifarelli
X-TDE-Amarok-email=paul@cifarelli.net
X-TDE-Amarok-rank=75
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -108,12 +108,12 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Library=libamarok_kdemmengine_plugin
X-KDE-Amarok-name=KDEMM Engine
X-KDE-Amarok-plugintype=engine
X-KDE-Amarok-authors=Roland Gigler
X-KDE-Amarok-email=rolandg@web.de
X-KDE-Amarok-rank=0
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Library=libamarok_kdemmengine_plugin
X-TDE-Amarok-name=KDEMM Engine
X-TDE-Amarok-plugintype=engine
X-TDE-Amarok-authors=Roland Gigler
X-TDE-Amarok-email=rolandg@web.de
X-TDE-Amarok-rank=0
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -108,12 +108,12 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Library=libamarok_masengine_plugin
X-KDE-Amarok-name=MAS Engine
X-KDE-Amarok-plugintype=engine
X-KDE-Amarok-authors=Roland Gigler
X-KDE-Amarok-email=rolandg@web.de
X-KDE-Amarok-rank=0
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Library=libamarok_masengine_plugin
X-TDE-Amarok-name=MAS Engine
X-TDE-Amarok-plugintype=engine
X-TDE-Amarok-authors=Roland Gigler
X-TDE-Amarok-email=rolandg@web.de
X-TDE-Amarok-rank=0
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -57,7 +57,7 @@ Name[uz@cyrillic]=NMM тизими
Name[wa]=Éndjin NMM
Name[zh_CN]=NMM 引擎
Name[zh_TW]=NMM 解碼引擎
X-KDE-Library=libamarok_nmmengine_plugin
X-TDE-Library=libamarok_nmmengine_plugin
Comment=Amarok plugin
Comment[af]=Amarok inprop module
Comment[ar]=قابس ( برنامج مضاف الى ) AmaroK
@ -111,12 +111,12 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=AmaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=engine
X-KDE-Amarok-name=nmm-engine
X-KDE-Amarok-authors=NMM work group http://www.networkmultimedia.org
X-KDE-Amarok-email=nmm-dev@graphics.cs.uni-sb.de
X-KDE-Amarok-rank=50
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=engine
X-TDE-Amarok-name=nmm-engine
X-TDE-Amarok-authors=NMM work group http://www.networkmultimedia.org
X-TDE-Amarok-email=nmm-dev@graphics.cs.uni-sb.de
X-TDE-Amarok-rank=50
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -55,7 +55,7 @@ Name[uz]=<yoʻq>
Name[uz@cyrillic]=<йўқ>
Name[zh_CN]=<无引擎>
Name[zh_TW]=<不使用解碼引擎>
X-KDE-Library=libamarok_void-engine_plugin
X-TDE-Library=libamarok_void-engine_plugin
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -107,12 +107,12 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=engine
X-KDE-Amarok-name=void-engine
X-KDE-Amarok-authors=Max Howell,Mark Kretschmann
X-KDE-Amarok-email=max.howell@methylblue.com
X-KDE-Amarok-rank=1
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=engine
X-TDE-Amarok-name=void-engine
X-TDE-Amarok-authors=Max Howell,Mark Kretschmann
X-TDE-Amarok-email=max.howell@methylblue.com
X-TDE-Amarok-rank=1
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -58,7 +58,7 @@ Name[uz@cyrillic]=xine тизими
Name[wa]=Éndjin xine
Name[zh_CN]=xine 引擎
Name[zh_TW]=xine 解碼引擎
X-KDE-Library=libamarok_xine-engine
X-TDE-Library=libamarok_xine-engine
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -110,12 +110,12 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=engine
X-KDE-Amarok-name=xine-engine
X-KDE-Amarok-authors=Max Howell
X-KDE-Amarok-email=max.howell@methylblue.com
X-KDE-Amarok-rank=255
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=engine
X-TDE-Amarok-name=xine-engine
X-TDE-Amarok-authors=Max Howell
X-TDE-Amarok-email=max.howell@methylblue.com
X-TDE-Amarok-rank=255
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -2,8 +2,8 @@
Encoding=UTF-8
Type=Service
ServiceTypes=Amarok/CodecInstall
X-KDE-Amarok-codec=mp3
X-KDE-Amarok-engine=xine-engine
X-TDE-Amarok-codec=mp3
X-TDE-Amarok-engine=xine-engine
Exec=/opt/trinity/lib/amarok/install-mp3

@ -46,7 +46,7 @@ Name[uz@cyrillic]=yauap тизими
Name[wa]=Éndjin yauap
Name[zh_CN]=yauap 引擎
Name[zh_TW]=yauap 引擎
X-KDE-Library=libamarok_yauap-engine_plugin
X-TDE-Library=libamarok_yauap-engine_plugin
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -98,12 +98,12 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=engine
X-KDE-Amarok-name=yauap-engine
X-KDE-Amarok-authors=Sascha Sommer
X-KDE-Amarok-email=ssommer@suse.de
X-KDE-Amarok-rank=1
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=engine
X-TDE-Amarok-name=yauap-engine
X-TDE-Amarok-authors=Sascha Sommer
X-TDE-Amarok-email=ssommer@suse.de
X-TDE-Amarok-rank=1
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -113,7 +113,7 @@ EngineController::loadEngine() //static
m_engine = loadEngine( AmarokConfig::soundSystem() );
const TQString engineName = PluginManager::getService( m_engine )->property( "X-KDE-Amarok-name" ).toString();
const TQString engineName = PluginManager::getService( m_engine )->property( "X-TDE-Amarok-name" ).toString();
if( !AmarokConfig::soundSystem().isEmpty() && engineName != AmarokConfig::soundSystem() ) {
//AmarokConfig::soundSystem() is empty on the first-ever-run
@ -142,11 +142,11 @@ EngineController::loadEngine( const TQString &engineName )
DEBUG_BLOCK
TQString query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] != '%1'";
TQString query = "[X-TDE-Amarok-plugintype] == 'engine' and [X-TDE-Amarok-name] != '%1'";
KTrader::OfferList offers = PluginManager::query( query.arg( engineName ) );
// sort by rank, TQValueList::operator[] is O(n), so this is quite inefficient
#define rank( x ) (x)->property( "X-KDE-Amarok-rank" ).toInt()
#define rank( x ) (x)->property( "X-TDE-Amarok-rank" ).toInt()
for( int n = offers.count()-1, i = 0; i < n; i++ )
for( int j = n; j > i; j-- )
if( rank( offers[j] ) > rank( offers[j-1] ) )
@ -154,7 +154,7 @@ EngineController::loadEngine( const TQString &engineName )
#undef rank
// this is the actual engine we want
query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] == '%1'";
query = "[X-TDE-Amarok-plugintype] == 'engine' and [X-TDE-Amarok-name] == '%1'";
offers = PluginManager::query( query.arg( engineName ) ) + offers;
foreachType( KTrader::OfferList, offers ) {
@ -271,7 +271,7 @@ void EngineController::unplayableNotification() {
bool EngineController::installDistroCodec( const TQString& engine /*Filetype type*/)
{
KService::Ptr service = KTrader::self()->query( "Amarok/CodecInstall"
, TQString("[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == '%1'").arg(engine) ).first();
, TQString("[X-TDE-Amarok-codec] == 'mp3' and [X-TDE-Amarok-engine] == '%1'").arg(engine) ).first();
if( service )
{
TQString installScript = service->exec();

@ -122,7 +122,7 @@ Comment[zh_TW]=Uncle Rodney 說「10/10, amaroK is seriously super!」
Icon=amarok
Open=true
X-KDE-KonqSidebarModule=konqsidebar_universalamarok
X-KDE-KonqSidebarUniversal=true
X-KDE-KonqSidebarAddModule=konqsidebar_universalamarok
X-TDE-KonqSidebarModule=konqsidebar_universalamarok
X-TDE-KonqSidebarUniversal=true
X-TDE-KonqSidebarAddModule=konqsidebar_universalamarok

@ -170,7 +170,7 @@ extern "C"
map->insert ("Icon", "amarok");
map->insert ("Name", i18n ("Amarok"));
map->insert ("Open", "true");
map->insert ("X-KDE-KonqSidebarModule","konqsidebar_universalamarok");
map->insert ("X-TDE-KonqSidebarModule","konqsidebar_universalamarok");
fn->setLatin1 ("amarok.desktop");
return true;
}

@ -306,11 +306,11 @@ MediaBrowser::MediaBrowser( const char *name )
m_pluginName[ i18n( "Do not handle" ) ] = "ignore";
m_pluginAmarokName["ignore"] = i18n( "Do not handle" );
// query available device plugins
m_plugins = PluginManager::query( "[X-KDE-Amarok-plugintype] == 'mediadevice'" );
m_plugins = PluginManager::query( "[X-TDE-Amarok-plugintype] == 'mediadevice'" );
for( KTrader::OfferList::ConstIterator it = m_plugins.begin(); it != m_plugins.end(); ++it ) {
// Save name properties in TQMap for lookup
m_pluginName[(*it)->name()] = (*it)->property( "X-KDE-Amarok-name" ).toString();
m_pluginAmarokName[(*it)->property( "X-KDE-Amarok-name" ).toString()] = (*it)->name();
m_pluginName[(*it)->name()] = (*it)->property( "X-TDE-Amarok-name" ).toString();
m_pluginAmarokName[(*it)->property( "X-TDE-Amarok-name" ).toString()] = (*it)->name();
}
m_views = new TQVBox( this );
@ -1677,7 +1677,7 @@ MediaBrowser::loadDevicePlugin( const TQString &deviceType )
if( deviceType == "ignore" )
return 0;
TQString query = "[X-KDE-Amarok-plugintype] == 'mediadevice' and [X-KDE-Amarok-name] == '%1'";
TQString query = "[X-TDE-Amarok-plugintype] == 'mediadevice' and [X-TDE-Amarok-name] == '%1'";
Amarok::Plugin *plugin = PluginManager::createFromQuery( query.arg( deviceType ) );
if( plugin )

@ -49,7 +49,7 @@ Name[uz@cyrillic]=Мусиқани бошқалар билан бўлишиш
Name[wa]=Pårtaedjî l' muzike
Name[zh_CN]=音乐共享
Name[zh_TW]=音樂分享
X-KDE-Library=libamarok_daap-mediadevice
X-TDE-Library=libamarok_daap-mediadevice
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -101,10 +101,10 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=mediadevice
X-KDE-Amarok-name=daap-mediadevice
X-KDE-Amarok-authors=Ian Monroe
X-KDE-Amarok-email=ian@monroe.nu
X-KDE-Amarok-rank=100
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=mediadevice
X-TDE-Amarok-name=daap-mediadevice
X-TDE-Amarok-authors=Ian Monroe
X-TDE-Amarok-email=ian@monroe.nu
X-TDE-Amarok-rank=100
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -50,7 +50,7 @@ Name[uz@cyrillic]=Оддий аудио-плейер
Name[wa]=Djouweu d' son djenerike
Name[zh_CN]=通用音频播放器
Name[zh_TW]=通用音樂播放程式
X-KDE-Library=libamarok_generic-mediadevice
X-TDE-Library=libamarok_generic-mediadevice
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -102,10 +102,10 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=mediadevice
X-KDE-Amarok-name=generic-mediadevice
X-KDE-Amarok-authors=Jeff Mitchell
X-KDE-Amarok-email=kde-dev@emailgoeshere.com
X-KDE-Amarok-rank=100
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=mediadevice
X-TDE-Amarok-name=generic-mediadevice
X-TDE-Amarok-authors=Jeff Mitchell
X-TDE-Amarok-email=kde-dev@emailgoeshere.com
X-TDE-Amarok-rank=100
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -51,7 +51,7 @@ Name[uz@cyrillic]=iRiver iFP медиа-ускунаси
Name[wa]=Édjin d' media iRiver iFP
Name[zh_CN]=iRiver iFP 媒体设备
Name[zh_TW]=iRiver iFP 媒體裝置
X-KDE-Library=libamarok_ifp-mediadevice
X-TDE-Library=libamarok_ifp-mediadevice
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -103,10 +103,10 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=mediadevice
X-KDE-Amarok-name=ifp-mediadevice
X-KDE-Amarok-authors=Seb Ruiz
X-KDE-Amarok-email=me@sebruiz.net
X-KDE-Amarok-rank=100
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=mediadevice
X-TDE-Amarok-name=ifp-mediadevice
X-TDE-Amarok-authors=Seb Ruiz
X-TDE-Amarok-email=me@sebruiz.net
X-TDE-Amarok-rank=100
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -51,7 +51,7 @@ Name[uz@cyrillic]=Apple iPod медиа-ускунаси
Name[wa]=Édjin d' media Apple iPod
Name[zh_CN]=Apple iPod 媒体设备
Name[zh_TW]=Apple iPod 媒體裝置
X-KDE-Library=libamarok_ipod-mediadevice
X-TDE-Library=libamarok_ipod-mediadevice
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -103,10 +103,10 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=mediadevice
X-KDE-Amarok-name=ipod-mediadevice
X-KDE-Amarok-authors=Martin Aumueller
X-KDE-Amarok-email=aumuell@reserv.at
X-KDE-Amarok-rank=100
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=mediadevice
X-TDE-Amarok-name=ipod-mediadevice
X-TDE-Amarok-authors=Martin Aumueller
X-TDE-Amarok-email=aumuell@reserv.at
X-TDE-Amarok-rank=100
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -49,7 +49,7 @@ Name[uz@cyrillic]=MTP медиа-ускунаси
Name[wa]=Édjin d' media MTP
Name[zh_CN]=MTP 媒体设备
Name[zh_TW]=MTP 媒體裝置
X-KDE-Library=libamarok_mtp-mediadevice
X-TDE-Library=libamarok_mtp-mediadevice
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -101,10 +101,10 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=mediadevice
X-KDE-Amarok-name=mtp-mediadevice
X-KDE-Amarok-authors=Andy Kelk
X-KDE-Amarok-email=andy@mopoke.co.uk
X-KDE-Amarok-rank=100
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=mediadevice
X-TDE-Amarok-name=mtp-mediadevice
X-TDE-Amarok-authors=Andy Kelk
X-TDE-Amarok-email=andy@mopoke.co.uk
X-TDE-Amarok-rank=100
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -49,7 +49,7 @@ Name[uz@cyrillic]=Creative Nomad Jukebox медиа-ускунаси
Name[wa]=Édjin d' media Creative Nomad Jukebox
Name[zh_CN]=Creative Nomad Jukebox 媒体设备
Name[zh_TW]=Creative Nomad Jukebox 媒體裝置
X-KDE-Library=libamarok_njb-mediadevice
X-TDE-Library=libamarok_njb-mediadevice
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -100,10 +100,10 @@ Comment[wa]=Tchôke-divins po Amarok
Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=mediadevice
X-KDE-Amarok-name=njb-mediadevice
X-KDE-Amarok-authors=Andres Oton, T.R.Shashwath
X-KDE-Amarok-email=andres.oton@gmail.com, trshash84@gmail.com
X-KDE-Amarok-rank=100
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=mediadevice
X-TDE-Amarok-name=njb-mediadevice
X-TDE-Amarok-authors=Andres Oton, T.R.Shashwath
X-TDE-Amarok-email=andres.oton@gmail.com, trshash84@gmail.com
X-TDE-Amarok-rank=100
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -48,7 +48,7 @@ Name[uz@cyrillic]=Rio Karma медиа-ускунаси
Name[wa]=Édjin d' media Rio Karma
Name[zh_CN]=Rio Karma 媒体设备
Name[zh_TW]=Rio Karma 媒體裝置
X-KDE-Library=libamarok_riokarma-mediadevice
X-TDE-Library=libamarok_riokarma-mediadevice
Comment=Plugin for Amarok
Comment[af]=Inprop module vir Amarok
Comment[ar]= قابس ( برنامج مضاف الى) AmaroK
@ -100,10 +100,10 @@ Comment[zh_CN]=Amarok 插件
Comment[zh_TW]=amaroK 插件
ServiceTypes=Amarok/Plugin
X-KDE-Amarok-plugintype=mediadevice
X-KDE-Amarok-name=riokarma-mediadevice
X-KDE-Amarok-authors=Andy Kelk
X-KDE-Amarok-email=andy@mopoke.co.uk
X-KDE-Amarok-rank=100
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=32
X-TDE-Amarok-plugintype=mediadevice
X-TDE-Amarok-name=riokarma-mediadevice
X-TDE-Amarok-authors=Andy Kelk
X-TDE-Amarok-email=andy@mopoke.co.uk
X-TDE-Amarok-rank=100
X-TDE-Amarok-version=1
X-TDE-Amarok-framework-version=32

@ -431,7 +431,7 @@ MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr,
it != MediaBrowser::instance()->getPlugins().end();
++it ){
m_pluginCombo->insertItem( (*it)->name() );
if ( (*it)->property( "X-KDE-Amarok-name" ).toString() == config->readEntry( medium->id() ) )
if ( (*it)->property( "X-TDE-Amarok-name" ).toString() == config->readEntry( medium->id() ) )
m_pluginCombo->setCurrentItem( (*it)->name() );
}

@ -98,7 +98,7 @@ void
MountPointManager::init()
{
DEBUG_BLOCK
KTrader::OfferList plugins = PluginManager::query( "[X-KDE-Amarok-plugintype] == 'device'" );
KTrader::OfferList plugins = PluginManager::query( "[X-TDE-Amarok-plugintype] == 'device'" );
debug() << "Received [" << TQString::number( plugins.count() ) << "] device plugin offers" << endl;
foreachType( KTrader::OfferList, plugins )
{

@ -45,12 +45,12 @@ PluginManager::query( const TQString& constraint )
{
// Add versioning constraint
TQString
str = "[X-KDE-Amarok-framework-version] == ";
str = "[X-TDE-Amarok-framework-version] == ";
str += TQString::number( FrameworkVersion );
if ( !constraint.stripWhiteSpace().isEmpty() )
str += " and " + constraint;
str += " and ";
str += "[X-KDE-Amarok-rank] > 0";
str += "[X-TDE-Amarok-rank] > 0";
debug() << "Plugin trader constraint: " << str << endl;
@ -74,7 +74,7 @@ PluginManager::createFromQuery( const TQString &constraint )
int rank = 0;
uint current = 0;
for ( uint i = 0; i < offers.count(); i++ ) {
if ( offers[i]->property( "X-KDE-Amarok-rank" ).toInt() > rank )
if ( offers[i]->property( "X-TDE-Amarok-rank" ).toInt() > rank )
current = i;
}
@ -176,10 +176,10 @@ PluginManager::showAbout( const TQString &constraint )
str += body.arg( i18n( "Name" ), s->name() );
str += body.arg( i18n( "Library" ), s->library() );
str += body.arg( i18n( "Authors" ), s->property( "X-KDE-Amarok-authors" ).toStringList().join( "\n" ) );
str += body.arg( i18n( "Email" ), s->property( "X-KDE-Amarok-email" ).toStringList().join( "\n" ) );
str += body.arg( i18n( "Version" ), s->property( "X-KDE-Amarok-version" ).toString() );
str += body.arg( i18n( "Framework Version" ), s->property( "X-KDE-Amarok-framework-version" ).toString() );
str += body.arg( i18n( "Authors" ), s->property( "X-TDE-Amarok-authors" ).toStringList().join( "\n" ) );
str += body.arg( i18n( "Email" ), s->property( "X-TDE-Amarok-email" ).toStringList().join( "\n" ) );
str += body.arg( i18n( "Version" ), s->property( "X-TDE-Amarok-version" ).toString() );
str += body.arg( i18n( "Framework Version" ), s->property( "X-TDE-Amarok-framework-version" ).toString() );
str += "</table></body></html>";
@ -195,12 +195,12 @@ PluginManager::dump( const KService::Ptr service )
debug() << "name : " << service->name() << endl;
debug() << "library : " << service->library() << endl;
debug() << "desktopEntryPath : " << service->desktopEntryPath() << endl;
debug() << "X-KDE-Amarok-plugintype : " << service->property( "X-KDE-Amarok-plugintype" ).toString() << endl;
debug() << "X-KDE-Amarok-name : " << service->property( "X-KDE-Amarok-name" ).toString() << endl;
debug() << "X-KDE-Amarok-authors : " << service->property( "X-KDE-Amarok-authors" ).toStringList() << endl;
debug() << "X-KDE-Amarok-rank : " << service->property( "X-KDE-Amarok-rank" ).toString() << endl;
debug() << "X-KDE-Amarok-version : " << service->property( "X-KDE-Amarok-version" ).toString() << endl;
debug() << "X-KDE-Amarok-framework-version: " << service->property( "X-KDE-Amarok-framework-version" ).toString() << endl;
debug() << "X-TDE-Amarok-plugintype : " << service->property( "X-TDE-Amarok-plugintype" ).toString() << endl;
debug() << "X-TDE-Amarok-name : " << service->property( "X-TDE-Amarok-name" ).toString() << endl;
debug() << "X-TDE-Amarok-authors : " << service->property( "X-TDE-Amarok-authors" ).toStringList() << endl;
debug() << "X-TDE-Amarok-rank : " << service->property( "X-TDE-Amarok-rank" ).toString() << endl;
debug() << "X-TDE-Amarok-version : " << service->property( "X-TDE-Amarok-version" ).toString() << endl;
debug() << "X-TDE-Amarok-framework-version: " << service->property( "X-TDE-Amarok-framework-version" ).toString() << endl;
}

Loading…
Cancel
Save