Reanimated drag & drop support again after introducing the DolphinController. It...

[dolphin.git] / src / viewsettingspage.cpp

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 2ad44d103cb8f68c9d4ff109f484a1804c203822..5bdd1753e6a973b9850ce96a1cb238a74d921d4f 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -15,42 +15,46 @@
  *   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 <kdialogbase.h>
-#include <klocale.h>
+#include "generalviewsettingspage.h"
 #include "iconsviewsettingspage.h"
 #include "detailsviewsettingspage.h"
 
-ViewSettingsPage::ViewSettingsPage(QWidget *parent) :
+#include <Q3VBoxLayout>
+#include <QTabWidget>
+#include <QLayout>
+#include <QLabel>
+
+#include <kdialog.h>
+#include <klocale.h>
+#include <kiconloader.h>
+
+ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
+                                   QWidget* parent) :
     SettingsPageBase(parent),
+    m_generalPage(0),
     m_iconsPage(0),
-    m_detailsPage(0),
-    m_previewsPage(0)
+    m_detailsPage(0)
 {
-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(parent, 0, KDialog::spacingHint());
+    Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 0, KDialog::spacingHint());
 
-    QTabWidget* tabWidget = new QTabWidget(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(DolphinIconsView::Icons, 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"));
 
-    // initialize 'Previews' tab
-    m_previewsPage = new IconsViewSettingsPage(DolphinIconsView::Previews, tabWidget);
-    tabWidget->addTab(m_previewsPage, SmallIcon("gvdirpart"), i18n("Previews"));
-
     topLayout->addWidget(tabWidget, 0, 0 );
 }
 
@@ -60,9 +64,9 @@ ViewSettingsPage::~ViewSettingsPage()
 
 void ViewSettingsPage::applySettings()
 {
+    m_generalPage->applySettings();
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();
-    m_previewsPage->applySettings();
 }
 
 #include "viewsettingspage.moc"