X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/445f0b64bdd34e39f0565ef870937ebd3d5dfa61..5b5a7b8da8cb3ee6bbb9f7450c87fca5de41dc05:/src/viewsettingspage.cpp

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 859f479a8..bef99bacc 100644
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -15,15 +15,17 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
 #include "viewsettingspage.h"
+
+#include "columnviewsettingspage.h"
+#include "detailsviewsettingspage.h"
 #include "generalviewsettingspage.h"
 #include "iconsviewsettingspage.h"
-#include "detailsviewsettingspage.h"
 
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 #include <QTabWidget>
 #include <QLayout>
 #include <QLabel>
@@ -34,39 +36,46 @@
 
 ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
                                    QWidget* parent) :
-    SettingsPageBase(parent),
-    m_generalPage(0),
-    m_iconsPage(0),
-    m_detailsPage(0)
+        SettingsPageBase(parent),
+        m_generalPage(0),
+        m_iconsPage(0),
+        m_detailsPage(0),
+        m_columnPage(0)
 {
-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 0, KDialog::spacingHint());
+    QVBoxLayout* topLayout = new QVBoxLayout(this);
+    topLayout->setMargin(0);
+    topLayout->setSpacing(KDialog::spacingHint());
 
     QTabWidget* tabWidget = new QTabWidget(this);
 
     // initialize 'General' tab
     m_generalPage = new GeneralViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_generalPage, SmallIcon("view_choose"), i18n("General"));
+    tabWidget->addTab(m_generalPage, KIcon("view-choose"), i18n("General"));
 
     // initialize 'Icons' tab
     m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_iconsPage, SmallIcon("view_icon"), i18n("Icons"));
+    tabWidget->addTab(m_iconsPage, KIcon("view-icon"), i18n("Icons"));
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_detailsPage, SmallIcon("view_text"), i18n("Details"));
+    tabWidget->addTab(m_detailsPage, KIcon("fileview-text"), i18n("Details"));
 
-    topLayout->addWidget(tabWidget, 0, 0 );
+    // initialize 'Column' tab
+    m_columnPage = new ColumnViewSettingsPage(mainWindow, tabWidget);
+    tabWidget->addTab(m_columnPage, KIcon("view-tree"), i18n("Column"));
+
+    topLayout->addWidget(tabWidget, 0, 0);
 }
 
 ViewSettingsPage::~ViewSettingsPage()
-{
-}
+{}
 
 void ViewSettingsPage::applySettings()
 {
     m_generalPage->applySettings();
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();
+    m_columnPage->applySettings();
 }
 
 #include "viewsettingspage.moc"