[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/configdialog
From:       Alejandro Daniel Wainzinger <aikawarazuni () gmail ! com>
Date:       2008-07-17 1:49:22
Message-ID: 1216259362.511936.2665.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 833564 by awainzinger:

Remove the MediaDeviceConfig for now, as it conflicts with MediaDevice-related \
collections' use of the MediaDeviceCache.


 M  +3 -3      ConfigDialog.cpp  


--- trunk/extragear/multimedia/amarok/src/configdialog/ConfigDialog.cpp \
#833563:833564 @@ -25,7 +25,7 @@
 
 #include "CollectionConfig.h"
 #include "GeneralConfig.h"
-#include "MediadeviceConfig.h"
+//#include "MediadeviceConfig.h"
 #include "OsdConfig.h"
 #include "PlaybackConfig.h"
 #include "ServiceConfig.h"
@@ -43,7 +43,7 @@
 
     ConfigDialogBase* collection  = new CollectionConfig( this );
     ConfigDialogBase* general     = new GeneralConfig( this );
-    ConfigDialogBase* mediadevice = new MediadeviceConfig( this );
+//    ConfigDialogBase* mediadevice = new MediadeviceConfig( this );
     ConfigDialogBase* osd         = new OsdConfig( this );
     ConfigDialogBase* playback    = new PlaybackConfig( this );
     ConfigDialogBase* services    = new ServiceConfig( this );
@@ -53,7 +53,7 @@
     addPage( osd,         i18n( "On Screen Display" ), \
                "preferences-indicator-amarok", i18n( "Configure On-Screen-Display" ) \
                );
     addPage( collection,  i18n( "Collection" ), "collection-amarok", i18n( \
                "Configure Collection" ) );
     addPage( services,    i18n( "Internet Services" ), "services-amarok", i18n( \
                "Configure Services" ) );
-    addPage( mediadevice, i18n( "Media Devices" ), \
"preferences-multimedia-player-amarok", i18n( "Configure Portable Player Support" ) \
); +//    addPage( mediadevice, i18n( "Media Devices" ), \
"preferences-multimedia-player-amarok", i18n( "Configure Portable Player Support" ) \
);  
     setButtons( Help | Ok | Apply | Cancel );
 }


[prev in list] [next in list] [prev in thread] [next in thread]