X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/0e3d1576d5d369ce49985eb75df39693336fc354..f57f351cceb9b664d681aad3680998f5bfe2137c:/src/viewsettingspage.cpp

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index d352266af..019c83afe 100644
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -15,44 +15,56 @@
  *   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 <qtabwidget.h>
-#include <qlayout.h>
-#include <qlabel.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+
+#include "columnviewsettingspage.h"
+#include "detailsviewsettingspage.h"
+#include "generalviewsettingspage.h"
+#include "iconsviewsettingspage.h"
+
+#include <QVBoxLayout>
+#include <QTabWidget>
+#include <QLayout>
+#include <QLabel>
+
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include "iconsviewsettingspage.h"
-#include "detailsviewsettingspage.h"
 
-ViewSettingsPage::ViewSettingsPage(QWidget *parent) :
+ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
+                                   QWidget* parent) :
     SettingsPageBase(parent),
+    m_generalPage(0),
     m_iconsPage(0),
     m_detailsPage(0),
-    m_previewsPage(0)
+    m_columnPage(0)
 {
-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(parent, 0, KDialog::spacingHint());
+    QVBoxLayout* topLayout = new QVBoxLayout(this);
+    topLayout->setMargin(0);
+    topLayout->setSpacing(KDialog::spacingHint());
+
+    QTabWidget* tabWidget = new QTabWidget(this);
 
-    QTabWidget* tabWidget = new QTabWidget(parent);
+    // initialize 'General' tab
+    m_generalPage = new GeneralViewSettingsPage(mainWindow, tabWidget);
+    tabWidget->addTab(m_generalPage, KIcon("view-choose"), i18n("General"));
 
     // initialize 'Icons' tab
-    m_iconsPage = new IconsViewSettingsPage(/*DolphinIconsView::Icons,*/ tabWidget);
-    tabWidget->addTab(m_iconsPage, SmallIcon("view_icon"), i18n("Icons"));
+    m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);
+    tabWidget->addTab(m_iconsPage, KIcon("view-icon"), i18n("Icons"));
 
     // initialize 'Details' tab
-    m_detailsPage = new DetailsViewSettingsPage(tabWidget);
-    tabWidget->addTab(m_detailsPage, SmallIcon("view_text"), i18n("Details"));
+    m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
+    tabWidget->addTab(m_detailsPage, KIcon("fileview-text"), i18n("Details"));
 
-    // initialize 'Previews' tab
-    m_previewsPage = new IconsViewSettingsPage(/*DolphinIconsView::Previews,*/ tabWidget);
-    tabWidget->addTab(m_previewsPage, SmallIcon("gvdirpart"), i18n("Previews"));
+    // initialize 'Column' tab
+    m_columnPage = new ColumnViewSettingsPage(mainWindow, tabWidget);
+    tabWidget->addTab(m_columnPage, KIcon("view-tree"), i18n("Column"));
 
-    topLayout->addWidget(tabWidget, 0, 0 );
+    topLayout->addWidget(tabWidget, 0, 0);
 }
 
 ViewSettingsPage::~ViewSettingsPage()
@@ -61,9 +73,10 @@ ViewSettingsPage::~ViewSettingsPage()
 
 void ViewSettingsPage::applySettings()
 {
+    m_generalPage->applySettings();
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();
-    m_previewsPage->applySettings();
+    m_columnPage->applySettings();
 }
 
 #include "viewsettingspage.moc"