From e975b7cec7cd941ccaa01494f98df7c571ab18f7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 24 Sep 2010 17:37:17 +0000 Subject: * Generic builtin icons now supported * Final fixups to builtin desktop icon configuration git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1179152 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/konq/desktopbehavior.ui | 10 +-------- kcontrol/konq/desktopbehavior_impl.cpp | 40 ++++++++++++++++++++++++---------- kcontrol/konq/desktopbehavior_impl.h | 2 ++ kdesktop/kdiconview.cc | 30 ++----------------------- 4 files changed, 34 insertions(+), 48 deletions(-) diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui index 1632021ef..6e614b022 100644 --- a/kcontrol/konq/desktopbehavior.ui +++ b/kcontrol/konq/desktopbehavior.ui @@ -389,7 +389,7 @@ mediaListView - false + true true @@ -403,14 +403,6 @@ - - - enableMediaBox - toggled(bool) - mediaListView - setEnabled(bool) - - autoLineupIconsBox showHiddenBox diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 7a7f50a76..9b2da7cf7 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -132,6 +132,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * connect(vrootBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); connect(autoLineupIconsBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); connect(toolTipBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); + connect(mediaListView, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(mediaListViewChanged(TQListViewItem *))); strMouseButton1 = i18n("&Left button:"); strButtonTxt1 = i18n( "You can choose what happens when" @@ -228,6 +229,24 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * load(); } +void DesktopBehavior::mediaListViewChanged(TQListViewItem * item) +{ + // FIXME: This should check to make sure an item was actually checked/unchecked before emitting changed() + emit changed(); +} + +void DesktopBehavior::setMediaListViewEnabled(bool enabled) +{ + for (DesktopBehaviorMediaItem *it=static_cast(mediaListView->firstChild()); + it; it=static_cast(it->nextSibling())) + { + if (it->mimeType().startsWith("media/builtin-") == false) + it->setVisible(enabled); + else + it->setVisible(TRUE); + } +} + void DesktopBehavior::fillMediaListView() { mediaListView->clear(); @@ -238,11 +257,10 @@ void DesktopBehavior::fillMediaListView() enableMediaBox->setChecked(g_pConfig->readBoolEntry("enabled",false)); 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/")) ) - { - bool ok=excludedMedia.contains((*it2)->name())==0; - new DesktopBehaviorMediaItem (this, mediaListView, (*it2)->comment(), (*it2)->name(),ok); - + if ( ((*it2)->name().startsWith("media/")) ) + { + bool ok=excludedMedia.contains((*it2)->name())==0; + new DesktopBehaviorMediaItem (this, mediaListView, (*it2)->comment(), (*it2)->name(),ok); } } } @@ -256,11 +274,11 @@ void DesktopBehavior::saveMediaListView() g_pConfig->writeEntry("enabled",enableMediaBox->isChecked()); TQStringList exclude; for (DesktopBehaviorMediaItem *it=static_cast(mediaListView->firstChild()); - it; it=static_cast(it->nextSibling())) - { - if (!it->isOn()) exclude << it->mimeType(); - } - g_pConfig->writeEntry("exclude",exclude); + it; it=static_cast(it->nextSibling())) + { + if (!it->isOn()) exclude << it->mimeType(); + } + g_pConfig->writeEntry("exclude",exclude); } @@ -405,7 +423,7 @@ void DesktopBehavior::enableChanged() { behaviorTab->setTabEnabled(behaviorTab->page(2), enabled); enableMediaBox->setEnabled(enabled); - mediaListView->setEnabled(enableMediaBox->isChecked()); + setMediaListViewEnabled(enableMediaBox->isChecked()); } changed(); diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h index 851df09f2..e7e181e4d 100644 --- a/kcontrol/konq/desktopbehavior_impl.h +++ b/kcontrol/konq/desktopbehavior_impl.h @@ -45,12 +45,14 @@ private slots: void enableChanged(); void comboBoxChanged(); void editButtonPressed(); + void mediaListViewChanged(TQListViewItem * item); private: KConfig *g_pConfig; void fillMediaListView(); void saveMediaListView(); + void setMediaListViewEnabled(bool enabled); // Combo for the menus void fillMenuCombo( TQComboBox * combo ); diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index ed0500e1c..0dce92ba3 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -842,34 +842,8 @@ bool KDIconView::deleteGlobalDesktopFiles() if ( isDesktopFile(fItem) ) { KSimpleConfig cfg( fItem->url().path(), true ); cfg.setDesktopGroup(); - if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" && - cfg.readEntry( "Name" ) == "My Documents" ) { - removeBuiltinIcon("My Documents"); - continue; - } - if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" && - cfg.readEntry( "Name" ) == "My Computer" ) { - removeBuiltinIcon("My Computer"); - continue; - } - if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" && - cfg.readEntry( "Name" ) == "My Network Places" ) { - removeBuiltinIcon("My Network Places"); - continue; - } - if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" && - cfg.readEntry( "Name" ) == "Printers" ) { - removeBuiltinIcon("Printers"); - continue; - } - if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" && - cfg.readEntry( "Name" ) == "Trash" ) { - removeBuiltinIcon("Trash"); - continue; - } - if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" && - cfg.readEntry( "Name" ) == "Web Browser" ) { - removeBuiltinIcon("Web Browser"); + if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" ) { + removeBuiltinIcon(cfg.readEntry( "Name" )); continue; } } -- cgit v1.2.3