diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-17 17:22:17 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-17 17:22:17 -0500 |
| commit | 6342dc39907a647a0fd9f84b3ba143cef4792877 (patch) | |
| tree | 237c804f8ec6fa033d62d10a1851effbfeb09646 /kcontrol | |
| parent | dbe6ecbb725216ed78c2c7170233762956338542 (diff) | |
| download | tdebase-6342dc39907a647a0fd9f84b3ba143cef4792877.tar.gz tdebase-6342dc39907a647a0fd9f84b3ba143cef4792877.zip | |
Fix a number of issues related to the media kioslave
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/konq/desktopbehavior.ui | 10 | ||||
| -rw-r--r-- | kcontrol/konq/desktopbehavior_impl.cpp | 4 |
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>&Show device icons:</string> + <string>&Show device icons</string> + </property> + </widget> + <widget class="TQCheckBox"> + <property name="name"> + <cstring>enableMediaFreeSpaceOverlayBox</cstring> + </property> + <property name="text"> + <string>&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()); } |