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

List:       kde-commits
Subject:    kdebase/kcontrol/konq
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-10-26 13:31:09
Message-ID: 20041026133109.BCD3516CA9 () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Don't show Device Icon tab if "devices" protocol is not known.


  M +24 -27    desktopbehavior_impl.cpp   1.8
  M +1 -0      desktopbehavior_impl.h   1.5


--- kdebase/kcontrol/konq/desktopbehavior_impl.cpp  #1.7:1.8
@@ -42,4 +42,5 @@
 #include <konq_defaults.h> // include default values directly from libkonq
 #include <kipc.h>
+#include <kprotocolinfo.h>
 
 DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, QWidget *parent, const \
char * ) @@ -121,4 +122,6 @@ DesktopBehavior::DesktopBehavior(KConfig
   bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == \
KGlobalSettings::KMouseSettings::LeftHanded);  
+  m_bHasDevices = KProtocolInfo::isKnownProtocol(QString::fromLatin1("devices"));
+
   connect(desktopMenuGroup, SIGNAL(clicked(int)), this, SIGNAL(changed()));
   connect(iconsEnabledBox, SIGNAL(clicked()), this, SLOT(enableChanged()));
@@ -211,10 +214,12 @@ DesktopBehavior::DesktopBehavior(KConfig
   QWhatsThis::add( rightComboBox, wtstr );
 
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+  if (m_bHasDevices)
+  {
   connect(enableDevicesBox, SIGNAL(clicked()), this, SLOT(enableChanged()));
-#else
-  enableDevicesBox->hide();
-  devicesListView->hide();
-#endif
+  }
+  else
+  {
+     delete behaviorTab->page(2);
+  }
 
   load();
@@ -243,5 +248,7 @@ void DesktopBehavior::fillDevicesListVie
 void DesktopBehavior::saveDevicesListView()
 {
-#if defined(Q_OS_LINUX) || defined (Q_OS_FREEBSD)
+    if (!m_bHasDevices)
+        return;
+
     g_pConfig->setGroup( "Devices" );
     g_pConfig->writeEntry("enabled",enableDevicesBox->isChecked());
@@ -253,5 +260,4 @@ void DesktopBehavior::saveDevicesListVie
             }
      g_pConfig->writeEntry("exclude",exclude);
-#endif
 }
 
@@ -315,7 +321,6 @@ void DesktopBehavior::load()
 
     comboBoxChanged();
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+    if (m_bHasDevices)
     fillDevicesListView();
-#endif
     enableChanged();
 }
@@ -335,7 +340,6 @@ void DesktopBehavior::defaults()
     autoLineupIconsBox->setChecked(false);
     toolTipBox->setChecked(true);
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+    if (m_bHasDevices)
     fillDevicesListView();
-#endif
 
     comboBoxChanged();
@@ -358,16 +362,8 @@ void DesktopBehavior::save()
     g_pConfig->writeEntry( "ShowFileTips", toolTipBox->isChecked() );
     g_pConfig->setGroup( "Menubar" );
-#if QT_VERSION >= 0x030200
     g_pConfig->writeEntry("ShowMenubar", desktopMenuGroup->selectedId() > 0);
-#else
-    g_pConfig->writeEntry("ShowMenubar", \
                desktopMenuGroup->id(desktopMenuGroup->selected()) > 0);
-#endif
     KConfig config( "kdeglobals" );
     config.setGroup("KDE");
-#if QT_VERSION >= 0x030200
     bool globalMenuBar = desktopMenuGroup->selectedId() == 2;
-#else
-    bool globalMenuBar = desktopMenuGroup->id(desktopMenuGroup->selected()) == 2;
-#endif
     if ( globalMenuBar != config.readBoolEntry("macStyle", false) )
     {
@@ -412,9 +408,10 @@ void DesktopBehavior::enableChanged()
     vrootBox->setEnabled(enabled);
 
-#if defined(Q_OS_LINUX) || defined (Q_OS_FREEBSD)
+    if (m_bHasDevices)
+    {
     behaviorTab->setTabEnabled(behaviorTab->page(2), enabled);
     enableDevicesBox->setEnabled(enabled);
     devicesListView->setEnabled(enableDevicesBox->isChecked());
-#endif
+    }
 
     changed();

--- kdebase/kcontrol/konq/desktopbehavior_impl.h  #1.4:1.5
@@ -56,4 +56,5 @@ private:
 
         typedef enum { NOTHING = 0, WINDOWLISTMENU, DESKTOPMENU, APPMENU } \
menuChoice; +        bool m_bHasDevices;
 };
 


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