there's no need having 2-liners inside their own method when this method is only...

[dolphin.git] / src / viewsettingspage.cpp

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 859f479a8a8daf16bcb8055e7c2d9cebb17067e6..3903094b906650fec09933d108a2c7a336503580 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -15,18 +15,20 @@
  *   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.,                                       *
  *   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 "viewsettingspage.h"

+
+#include "columnviewsettingspage.h"
+#include "detailsviewsettingspage.h"

 #include "generalviewsettingspage.h"
 #include "iconsviewsettingspage.h"
 #include "generalviewsettingspage.h"
 #include "iconsviewsettingspage.h"

-#include "detailsviewsettingspage.h"

 
 

-#include <Q3VBoxLayout>
-#include <QTabWidget>
-#include <QLayout>
-#include <QLabel>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QTabWidget>
+#include <QtGui/QLayout>
+#include <QtGui/QLabel>

 
 #include <kdialog.h>
 #include <klocale.h>
 
 #include <kdialog.h>
 #include <klocale.h>


@@ -37,25 +39,32 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
     SettingsPageBase(parent),
     m_generalPage(0),
     m_iconsPage(0),
     SettingsPageBase(parent),
     m_generalPage(0),
     m_iconsPage(0),

-    m_detailsPage(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);
 
     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"), i18nc("@title:tab", "General"));

 
     // initialize 'Icons' tab
     m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);
 
     // initialize 'Icons' tab
     m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);

-    tabWidget->addTab(m_iconsPage, SmallIcon("view_icon"), i18n("Icons"));
+    tabWidget->addTab(m_iconsPage, KIcon("fileview-icon"), i18nc("@title:tab", "Icons"));

 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);

-    tabWidget->addTab(m_detailsPage, SmallIcon("view_text"), i18n("Details"));
+    tabWidget->addTab(m_detailsPage, KIcon("fileview-detailed"), i18nc("@title:tab", "Details"));
+
+    // initialize 'Column' tab
+    m_columnPage = new ColumnViewSettingsPage(mainWindow, tabWidget);
+    tabWidget->addTab(m_columnPage, KIcon("fileview-column"), i18nc("@title:tab", "Column"));

 
 

-    topLayout->addWidget(tabWidget, 0, 0 );
+    topLayout->addWidget(tabWidget, 0, 0);

 }
 
 ViewSettingsPage::~ViewSettingsPage()
 }
 
 ViewSettingsPage::~ViewSettingsPage()


@@ -67,6 +76,15 @@ void ViewSettingsPage::applySettings()
     m_generalPage->applySettings();
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();
     m_generalPage->applySettings();
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();

+    m_columnPage->applySettings();
+}
+
+void ViewSettingsPage::restoreDefaults()
+{
+    m_generalPage->restoreDefaults();
+    m_iconsPage->restoreDefaults();
+    m_detailsPage->restoreDefaults();
+    m_columnPage->restoreDefaults();

 }
 
 #include "viewsettingspage.moc"
 }
 
 #include "viewsettingspage.moc"