minor cosmetic fix: don't use a group box if the global view properties are set ...

svn path=/trunk/KDE/kdebase/apps/; revision=634819

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index fd4dfd8dd5ba1204513dabe132fece8062723149..25aa98e0e579d495755cf9893521a7a349e4b09f 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -70,8 +70,6 @@ ViewProperties::ViewProperties(const KUrl& url) :
     const QString file(m_filepath + FILE_NAME);
     m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
 
-    kDebug() << "------------------ global timestamp: " << settings->viewPropsTimestamp() << endl;
-
     const bool useDefaultProps = !useGlobalViewProps &&
                                  (!QFileInfo(file).exists() ||
                                   (m_node->timestamp() < settings->viewPropsTimestamp()));

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index eceaf8048a594c4d28c3b84231e643a65c7d2850..350113a3cb5b21601c11ff1ad6daceee67ef63c7 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -60,6 +60,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_useAsDefault(0)
 {
     assert(dolphinView != 0);
+    const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps();
 
     setCaption(i18n("View Properties"));
     setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
@@ -72,7 +73,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     QVBoxLayout* topLayout = new QVBoxLayout();
 
     // create 'Properties' group containing view mode, sorting, sort order and show hidden files
-    QGroupBox* propsBox = new QGroupBox(i18n("Properties"), main);
+    QWidget* propsBox = main;
+    if (!useGlobalViewProps) {
+        propsBox = new QGroupBox(i18n("Properties"), main);
+    }
 
     QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox);
     m_viewMode = new QComboBox(propsBox);
@@ -133,7 +137,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     // Only show the following settings if the view properties are remembered
     // for each directory:
-    if (!DolphinSettings::instance().generalSettings()->globalViewProps()) {
+    if (!useGlobalViewProps) {
         // create 'Apply view properties to:' group
         QGroupBox* applyBox = new QGroupBox(i18n("Apply view properties to:"), main);