Allow zooming in and zooming out in the icons view.

[dolphin.git] / src / viewsettingspage.cpp

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index a052d84f653ffd611e47cab3ddea2234dc000e94..5bdd1753e6a973b9850ce96a1cb238a74d921d4f 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -15,23 +15,27 @@
  *   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 "generalviewsettingspage.h"
+#include "iconsviewsettingspage.h"
+#include "detailsviewsettingspage.h"
+
 #include <Q3VBoxLayout>
+#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)
 {
@@ -39,12 +43,16 @@ ViewSettingsPage::ViewSettingsPage(QWidget *parent) :
 
     QTabWidget* tabWidget = new QTabWidget(this);
 
+    // initialize 'General' tab
+    m_generalPage = new GeneralViewSettingsPage(mainWindow, tabWidget);
+    tabWidget->addTab(m_generalPage, SmallIcon("view_choose"), i18n("General"));
+
     // initialize 'Icons' tab
-    m_iconsPage = new IconsViewSettingsPage(tabWidget);
+    m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);
     tabWidget->addTab(m_iconsPage, SmallIcon("view_icon"), i18n("Icons"));
 
     // initialize 'Details' tab
-    m_detailsPage = new DetailsViewSettingsPage(tabWidget);
+    m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
     tabWidget->addTab(m_detailsPage, SmallIcon("view_text"), i18n("Details"));
 
     topLayout->addWidget(tabWidget, 0, 0 );
@@ -56,6 +64,7 @@ ViewSettingsPage::~ViewSettingsPage()
 
 void ViewSettingsPage::applySettings()
 {
+    m_generalPage->applySettings();
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();
 }