Show compact-mode icon also in Konqueror

Additionally a broken signal-connection has been fixed.

diff --git a/src/dolphinpart.rc b/src/dolphinpart.rc
index 1ff1e040f70f48efe4c2d6c02d2e6d3cf231e2a0..893d6c831ae7927b249c92cfb560cf3cc26cb479 100644 (file)
--- a/src/dolphinpart.rc
+++ b/src/dolphinpart.rc
@@ -47,8 +47,8 @@
 </MenuBar>
 <ToolBar name="mainToolBar"><text context="@title:menu">Dolphin Toolbar</text>
   <Action name="icons" />
+  <Action name="compact" />
   <Action name="details" />
-  <Action name="columns" />
 </ToolBar>
 <State name="has_selection" >
   <enable>

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 3e96bebedbee443aa11dc4623fa0b33596ebdfc0..c07c072d1db612abd0fac897ddd4735179537f22 100644 (file)
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -160,7 +160,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     connect(m_previewsShown, SIGNAL(clicked()),
             this, SLOT(slotShowPreviewChanged()));
     connect(m_showInGroups, SIGNAL(clicked()),
-            this, SLOT(slotCategorizedSortingChanged()));
+            this, SLOT(slotGroupedSortingChanged()));
     connect(m_showHiddenFiles, SIGNAL(clicked()),
             this, SLOT(slotShowHiddenFilesChanged()));
 
@@ -260,7 +260,7 @@ void ViewPropertiesDialog::slotSortOrderChanged(int index)
     markAsDirty(true);
 }
 
-void ViewPropertiesDialog::slotCategorizedSortingChanged()
+void ViewPropertiesDialog::slotGroupedSortingChanged()
 {
     m_viewProps->setGroupedSorting(m_showInGroups->isChecked());
     markAsDirty(true);

diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index 694cffe880fd01b0bdb6b6c3caa0e6a948413968..6b0e9ff48075c0e1fc907b3a3b17ced3c600892b 100644 (file)
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -53,7 +53,7 @@ private slots:
     void slotViewModeChanged(int index);
     void slotSortingChanged(int index);
     void slotSortOrderChanged(int index);
-    void slotCategorizedSortingChanged();
+    void slotGroupedSortingChanged();
     void slotSortFoldersFirstChanged();
     void slotShowPreviewChanged();
     void slotShowHiddenFilesChanged();

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index f88e01a453ec9c18734ad64ccb4fafea47348c44..caa35230ab3740b58f62ea554b3aa8445c7c0a3c 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -69,7 +69,7 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view)
                                                    QList<DolphinView::AdditionalInfo>)),
             this, SLOT(slotAdditionalInfoListChanged(QList<DolphinView::AdditionalInfo>,
                                                      QList<DolphinView::AdditionalInfo>)));
-    connect(view, SIGNAL(categorizedSortingChanged(bool)),
+    connect(view, SIGNAL(groupedSortingChanged(bool)),
             this, SLOT(slotGroupedSortingChanged(bool)));
     connect(view, SIGNAL(hiddenFilesShownChanged(bool)),
             this, SLOT(slotHiddenFilesShownChanged(bool)));