Fix a number of issues related to the media kioslave

2 files changed, 13 insertions, 1 deletions

diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui
index e6acb6ed6..dc4907adf 100644
--- a/kcontrol/konq/desktopbehavior.ui
+++ b/kcontrol/konq/desktopbehavior.ui
@@ -370,7 +370,15 @@
                             <cstring>enableMediaBox</cstring>
                         </property>
                         <property name="text">
-                            <string>&amp;Show device icons:</string>
+                            <string>&amp;Show device icons</string>
+                        </property>
+                    </widget>
+                    <widget class="TQCheckBox">
+                        <property name="name">
+                            <cstring>enableMediaFreeSpaceOverlayBox</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&amp;Show free space overlay on device icons</string>
                         </property>
                     </widget>
                     <widget class="TDEListView">
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index d9920e8ad..b54bf8e17 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -220,6 +220,7 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
   if (m_bHasMedia)
   {
      connect(enableMediaBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
+     connect(enableMediaFreeSpaceOverlayBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
   }
   else
   {
@@ -255,6 +256,7 @@ void DesktopBehavior::fillMediaListView()
     TQValueListIterator<KMimeType::Ptr> it2(mimetypes.begin());
     g_pConfig->setGroup( "Media" );
     enableMediaBox->setChecked(g_pConfig->readBoolEntry("enabled",false));
+    enableMediaFreeSpaceOverlayBox->setChecked(g_pConfig->readBoolEntry("FreeSpaceDisplayEnabled",true));
     TQString excludedMedia=g_pConfig->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted");
     for (; it2 != mimetypes.end(); ++it2) {
         if ( ((*it2)->name().startsWith("media/")) )
@@ -272,6 +274,7 @@ void DesktopBehavior::saveMediaListView()
 
     g_pConfig->setGroup( "Media" );
     g_pConfig->writeEntry("enabled",enableMediaBox->isChecked());
+    g_pConfig->writeEntry("FreeSpaceDisplayEnabled",enableMediaFreeSpaceOverlayBox->isChecked());
     TQStringList exclude;
     for (DesktopBehaviorMediaItem *it=static_cast<DesktopBehaviorMediaItem *>(mediaListView->firstChild());
         it; it=static_cast<DesktopBehaviorMediaItem *>(it->nextSibling()))
@@ -423,6 +426,7 @@ void DesktopBehavior::enableChanged()
     {
         behaviorTab->setTabEnabled(behaviorTab->page(2), enabled);
         enableMediaBox->setEnabled(enabled);
+        enableMediaFreeSpaceOverlayBox->setEnabled(enabled);
         setMediaListViewEnabled(enableMediaBox->isChecked());
     }