fix signal names

[dolphin.git] / src / generalsettingspage.cpp

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 64f37161cd1fbf9a298083c3ff96b1fd6da1100a..5efed4424f4d68e40834cbaa2c8b2ef5f024aeb7 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -15,7 +15,7 @@
  *   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 "generalsettingspage.h"
@@ -38,17 +38,18 @@
 #include <kvbox.h>
 
 #include "dolphinsettings.h"
-#include "dolphin.h"
+#include "dolphinmainwindow.h"
 #include "dolphinview.h"
 #include "generalsettings.h"
 
-GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
+GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* parent) :
     SettingsPageBase(parent),
+    m_mainWindow(mainWin),
     m_homeUrl(0),
     m_startSplit(0),
     m_startEditable(0)
 {
-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(parent, 2, KDialog::spacingHint());
+    Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 2, KDialog::spacingHint());
 
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
@@ -56,7 +57,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
 
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
 
-    KVBox* vBox = new KVBox(parent);
+    KVBox* vBox = new KVBox(this);
     vBox->setSizePolicy(sizePolicy);
     vBox->setSpacing(spacing);
     vBox->setMargin(margin);
@@ -95,12 +96,10 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
 
     m_iconsView = new QRadioButton(i18n("Icons"), buttonGroup);
     m_detailsView = new QRadioButton(i18n("Details"), buttonGroup);
-    m_previewsView = new QRadioButton(i18n("Previews"), buttonGroup);
 
     switch (settings->defaultViewMode()) {
         case DolphinView::IconsView:    m_iconsView->setChecked(true); break;
         case DolphinView::DetailsView:  m_detailsView->setChecked(true); break;
-        case DolphinView::PreviewsView: m_previewsView->setChecked(true); break;
     }
 
     // create 'Start with split view' checkbox
@@ -134,13 +133,9 @@ void GeneralSettingsPage::applySettings()
         settings->setHomeUrl(url.prettyUrl());
     }
 
-    DolphinView::Mode viewMode = DolphinView::IconsView;
-    if (m_detailsView->isChecked()) {
-        viewMode = DolphinView::DetailsView;
-    }
-    else if (m_previewsView->isChecked()) {
-        viewMode = DolphinView::PreviewsView;
-    }
+    const DolphinView::Mode viewMode = m_detailsView->isChecked() ?
+                                       DolphinView::DetailsView :
+                                       DolphinView::IconsView;
     settings->setDefaultViewMode(viewMode);
 
     settings->setSplitView(m_startSplit->isChecked());
@@ -158,7 +153,7 @@ void GeneralSettingsPage::selectHomeUrl()
 
 void GeneralSettingsPage::useCurrentLocation()
 {
-    const DolphinView* view = Dolphin::mainWin().activeView();
+    const DolphinView* view = m_mainWindow->activeView();
     m_homeUrl->setText(view->url().prettyUrl());
 }