Instead of having a the 3 view modes "icons", "details" and "previews" only 2 view...

svn path=/trunk/playground/utils/dolphin/; revision=613029

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f4942495702ae9ea243c8088130bd57dce01e4a4..3294672bbb3f9f563890e26df344e1966303e55b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,8 +52,7 @@ kde4_add_kcfg_files(dolphin_SRCS
    directoryviewpropertysettings.kcfgc
    generalsettings.kcfgc
    iconsmodesettings.kcfgc
    directoryviewpropertysettings.kcfgc
    generalsettings.kcfgc
    iconsmodesettings.kcfgc

-   detailsmodesettings.kcfgc
-   previewsmodesettings.kcfgc )
+   detailsmodesettings.kcfgc )

 
 kde4_add_executable(dolphin ${dolphin_SRCS})
 
 
 kde4_add_executable(dolphin ${dolphin_SRCS})
 


@@ -65,7 +64,7 @@ install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 ########### install files ###############
 
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_DIR} )
 ########### install files ###############
 
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_DIR} )

-install( FILES  directoryviewpropertysettings.kcfg generalsettings.kcfg                                iconsmodesettings.kcfg detailsmodesettings.kcfg previewsmodesettings.kcfg                               DESTINATION ${KCFG_INSTALL_DIR} )
+install( FILES  directoryviewpropertysettings.kcfg generalsettings.kcfg iconsmodesettings.kcfg detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )

 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 
 kde4_install_icons( ${ICON_INSTALL_DIR} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 
 kde4_install_icons( ${ICON_INSTALL_DIR} )

diff --git a/src/applyviewpropsjob.cpp b/src/applyviewpropsjob.cpp
index 61ce89775fa2395e7c0d25852ca85d276d848b3b..0be8f4d47d32969084f1f3c1af93159c635bf5f4 100644 (file)
--- a/src/applyviewpropsjob.cpp
+++ b/src/applyviewpropsjob.cpp
@@ -34,11 +34,12 @@ ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
 {
     m_viewProps = new ViewProperties(dir);
     m_viewProps->setViewMode(viewProps.viewMode());
 {
     m_viewProps = new ViewProperties(dir);
     m_viewProps->setViewMode(viewProps.viewMode());

-    m_viewProps->setShowHiddenFilesEnabled(viewProps.isShowHiddenFilesEnabled());
+    m_viewProps->setShowPreview(viewProps.showPreview());
+    m_viewProps->setShowHiddenFiles(viewProps.showHiddenFiles());

     m_viewProps->setSorting(viewProps.sorting());
     m_viewProps->setSortOrder(viewProps.sortOrder());
 
     m_viewProps->setSorting(viewProps.sorting());
     m_viewProps->setSortOrder(viewProps.sortOrder());
 

-    startNextJob(dir, viewProps);
+    startNextJob(dir);

 }
 
 ApplyViewPropsJob::~ApplyViewPropsJob()
 }
 
 ApplyViewPropsJob::~ApplyViewPropsJob()


@@ -52,8 +53,7 @@ void ApplyViewPropsJob::processNextItem()
     emitResult();
 }
 
     emitResult();
 }
 

-void ApplyViewPropsJob::startNextJob(const KUrl& url,
-                                     const ViewProperties& viewProps)
+void ApplyViewPropsJob::startNextJob(const KUrl& url)

 {
     KIO::ListJob* listJob = KIO::listRecursive(url, false);
     connect(listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
 {
     KIO::ListJob* listJob = KIO::listRecursive(url, false);
     connect(listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),


@@ -76,7 +76,8 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
 
             ViewProperties props(url);
             props.setViewMode(m_viewProps->viewMode());
 
             ViewProperties props(url);
             props.setViewMode(m_viewProps->viewMode());

-            props.setShowHiddenFilesEnabled(m_viewProps->isShowHiddenFilesEnabled());
+            props.setShowPreview(m_viewProps->showPreview());
+            props.setShowHiddenFiles(m_viewProps->showHiddenFiles());

             props.setSorting(m_viewProps->sorting());
             props.setSortOrder(m_viewProps->sortOrder());
         }
             props.setSorting(m_viewProps->sorting());
             props.setSortOrder(m_viewProps->sortOrder());
         }

diff --git a/src/applyviewpropsjob.h b/src/applyviewpropsjob.h
index 613cdc009ee6f0a1feab11fb4967256720566c7a..1b49d120667fb2ffde29a720d464c6dfabae266a 100644 (file)
--- a/src/applyviewpropsjob.h
+++ b/src/applyviewpropsjob.h
@@ -65,7 +65,7 @@ public:
     int progress() const { return m_progress; }
 
 private:
     int progress() const { return m_progress; }
 
 private:

-    void startNextJob(const KUrl & url, const ViewProperties& viewProps);
+    void startNextJob(const KUrl & url);

 
 private slots:
     virtual void slotResult(KJob* job);
 
 private slots:
     virtual void slotResult(KJob* job);

diff --git a/src/directoryviewpropertysettings.kcfg b/src/directoryviewpropertysettings.kcfg
index 247b8181bc6bdbe73fac9506c049d7f9a963bff3..e1ab73b64c0e86d98b72cefbd4bfc270146df886 100644 (file)
--- a/src/directoryviewpropertysettings.kcfg
+++ b/src/directoryviewpropertysettings.kcfg
@@ -16,12 +16,18 @@
     <group name="Dolphin">
         <entry name="ViewMode" type="Int" >
             <label>View Mode</label>
     <group name="Dolphin">
         <entry name="ViewMode" type="Int" >
             <label>View Mode</label>

-            <whatsthis>This option controls the style of the view. Currently supported values include icons (0), details (1) and previews (2) views.</whatsthis>
-            <default>DolphinView::PreviewsView</default>
+            <whatsthis>This option controls the style of the view. Currently supported values include icons (0) and details (1) views.</whatsthis>
+            <default>DolphinView::IconsView</default>

             <min>0</min>
             <max code="true">DolphinView::MaxModeEnum</max>
         </entry>
 
             <min>0</min>
             <max code="true">DolphinView::MaxModeEnum</max>
         </entry>
 

+        <entry name="ShowPreview" type="Bool" >
+            <label>Show preview</label>
+            <whatsthis>When this option is enabled, a preview of the file content is shown as icon.</whatsthis>
+            <default>false</default>
+        </entry>
+

         <entry name="Sorting" type="Int" >
             <label>Sort files by</label>
             <whatsthis>This option defines which attribute (name, size, date, etc) sorting is performed on.</whatsthis>
         <entry name="Sorting" type="Int" >
             <label>Sort files by</label>
             <whatsthis>This option defines which attribute (name, size, date, etc) sorting is performed on.</whatsthis>

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 4fa3cef31a7df1dafab91b20d163e4a28cbfcb13..6f6e2fb474da385458d267b0ab011a5f61ecf214 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -220,7 +220,7 @@ void DolphinMainWindow::refreshViews()
                                         m_splitter,
                                         url,
                                         props.viewMode(),
                                         m_splitter,
                                         url,
                                         props.viewMode(),

-                                        props.isShowHiddenFilesEnabled());
+                                        props.showHiddenFiles());

             connectViewSignals(i);
             m_view[i]->show();
         }
             connectViewSignals(i);
             m_view[i]->show();
         }


@@ -242,7 +242,7 @@ void DolphinMainWindow::slotShowHiddenFilesChanged()
 {
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
 {
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));

-    showHiddenFilesAction->setChecked(m_activeView->isShowHiddenFilesEnabled());
+    showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());

 }
 
 void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
 }
 
 void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)


@@ -786,11 +786,6 @@ void DolphinMainWindow::setDetailsView()
     m_activeView->setMode(DolphinView::DetailsView);
 }
 
     m_activeView->setMode(DolphinView::DetailsView);
 }
 

-void DolphinMainWindow::setPreviewsView()
-{
-    m_activeView->setMode(DolphinView::PreviewsView);
-}
-

 void DolphinMainWindow::sortByName()
 {
     m_activeView->setSorting(DolphinView::SortByName);
 void DolphinMainWindow::sortByName()
 {
     m_activeView->setSorting(DolphinView::SortByName);


@@ -823,7 +818,7 @@ void DolphinMainWindow::toggleSplitView()
                                                0,
                                                m_view[PrimaryIdx]->url(),
                                                m_view[PrimaryIdx]->mode(),
                                                0,
                                                m_view[PrimaryIdx]->url(),
                                                m_view[PrimaryIdx]->mode(),

-                                               m_view[PrimaryIdx]->isShowHiddenFilesEnabled());
+                                               m_view[PrimaryIdx]->showHiddenFiles());

         connectViewSignals(SecondaryIdx);
         m_splitter->addWidget(m_view[SecondaryIdx]);
         m_splitter->setSizes(QList<int>() << newWidth << newWidth);
         connectViewSignals(SecondaryIdx);
         m_splitter->addWidget(m_view[SecondaryIdx]);
         m_splitter->setSizes(QList<int>() << newWidth << newWidth);


@@ -861,14 +856,18 @@ void DolphinMainWindow::stopLoading()
 {
 }
 
 {
 }
 

-void DolphinMainWindow::showHiddenFiles()
+void DolphinMainWindow::togglePreview()
+{
+}
+
+void DolphinMainWindow::toggleShowHiddenFiles()

 {
     clearStatusBar();
 
     const KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
     const bool show = showHiddenFilesAction->isChecked();
 {
     clearStatusBar();
 
     const KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
     const bool show = showHiddenFilesAction->isChecked();

-    m_activeView->setShowHiddenFilesEnabled(show);
+    m_activeView->setShowHiddenFiles(show);

 }
 
 void DolphinMainWindow::showFilterBar()
 }
 
 void DolphinMainWindow::showFilterBar()


@@ -1123,7 +1122,7 @@ void DolphinMainWindow::init()
                                          m_splitter,
                                          homeUrl,
                                          props.viewMode(),
                                          m_splitter,
                                          homeUrl,
                                          props.viewMode(),

-                                         props.isShowHiddenFilesEnabled());
+                                         props.showHiddenFiles());

     connectViewSignals(PrimaryIdx);
     m_view[PrimaryIdx]->show();
 
     connectViewSignals(PrimaryIdx);
     m_view[PrimaryIdx]->show();
 


@@ -1247,15 +1246,9 @@ void DolphinMainWindow::setupActions()
     detailsView->setIcon(KIcon("view_text"));
     connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
 
     detailsView->setIcon(KIcon("view_text"));
     connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
 

-    KToggleAction* previewsView = new KToggleAction(i18n("Previews"), actionCollection(), "previews");
-    previewsView->setShortcut(Qt::CTRL | Qt::Key_3);
-    previewsView->setIcon(KIcon("gvdirpart"));
-    connect(previewsView, SIGNAL(triggered()), this, SLOT(setPreviewsView()));
-

     QActionGroup* viewModeGroup = new QActionGroup(this);
     viewModeGroup->addAction(iconsView);
     viewModeGroup->addAction(detailsView);
     QActionGroup* viewModeGroup = new QActionGroup(this);
     viewModeGroup->addAction(iconsView);
     viewModeGroup->addAction(detailsView);

-    viewModeGroup->addAction(previewsView);

 
     KToggleAction* sortByName = new KToggleAction(i18n("By Name"), actionCollection(), "by_name");
     connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName()));
 
     KToggleAction* sortByName = new KToggleAction(i18n("By Name"), actionCollection(), "by_name");
     connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName()));


@@ -1274,9 +1267,13 @@ void DolphinMainWindow::setupActions()
     KToggleAction* sortDescending = new KToggleAction(i18n("Descending"), actionCollection(), "descending");
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 
     KToggleAction* sortDescending = new KToggleAction(i18n("Descending"), actionCollection(), "descending");
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 

+    KToggleAction* showPreview = new KToggleAction(i18n("Preview"), actionCollection(), "show_preview");
+    showPreview->setIcon(KIcon("gvdirpart"));
+    connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
+

     KToggleAction* showHiddenFiles = new KToggleAction(i18n("Show Hidden Files"), actionCollection(), "show_hidden_files");
     //showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_      KDE4-TODO: what Qt-Key represents '.'?
     KToggleAction* showHiddenFiles = new KToggleAction(i18n("Show Hidden Files"), actionCollection(), "show_hidden_files");
     //showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_      KDE4-TODO: what Qt-Key represents '.'?

-    connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(showHiddenFiles()));
+    connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));

 
     KToggleAction* split = new KToggleAction(i18n("Split View"), actionCollection(), "split_view");
     split->setShortcut(Qt::Key_F10);
 
     KToggleAction* split = new KToggleAction(i18n("Split View"), actionCollection(), "split_view");
     split->setShortcut(Qt::Key_F10);


@@ -1530,9 +1527,9 @@ void DolphinMainWindow::updateViewActions()
         case DolphinView::DetailsView:
             action = actionCollection()->action("details");
             break;
         case DolphinView::DetailsView:
             action = actionCollection()->action("details");
             break;

-        case DolphinView::PreviewsView:
-            action = actionCollection()->action("previews");
-            break;
+        //case DolphinView::PreviewsView:
+        //    action = actionCollection()->action("previews");
+        //    break;

         default:
             break;
     }
         default:
             break;
     }


@@ -1551,7 +1548,7 @@ void DolphinMainWindow::updateViewActions()
 
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
 
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));

-    showHiddenFilesAction->setChecked(m_activeView->isShowHiddenFilesEnabled());
+    showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());

 
     KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
     splitAction->setChecked(m_view[SecondaryIdx] != 0);
 
     KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
     splitAction->setChecked(m_view[SecondaryIdx] != 0);

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 62327b4694c7465f71c86b9121bef277b38b83d9..e61e1775e8a6b899ce1642e58a52934aba22711c 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -234,9 +234,6 @@ private slots:
     /** The current active view is switched to the details mode. */
     void setDetailsView();
 
     /** The current active view is switched to the details mode. */
     void setDetailsView();
 

-    /** The current active view is switched to the previews mode. */
-    void setPreviewsView();
-

     /** The sorting of the current view should be done by the name. */
     void sortByName();
 
     /** The sorting of the current view should be done by the name. */
     void sortByName();
 


@@ -262,11 +259,14 @@ private slots:
     /** Stops the loading process for the current active view. */
     void stopLoading();
 
     /** Stops the loading process for the current active view. */
     void stopLoading();
 

+    /** Switches between showing a preview of the file content and showing the icon. */
+    void togglePreview();
+

     /**
      * Switches between showing and hiding of hidden marked files dependent
      * from the current state of the 'Show Hidden Files' menu toggle action.
      */
     /**
      * Switches between showing and hiding of hidden marked files dependent
      * from the current state of the 'Show Hidden Files' menu toggle action.
      */

-    void showHiddenFiles();
+    void toggleShowHiddenFiles();

 
     /**
      * Switches between showing and hiding of the filter bar dependent
 
     /**
      * Switches between showing and hiding of the filter bar dependent

diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index d896abc13e8e134c1c03a7ee7efeb50e3c73ad00..f60bf0189254deae58964b6bb2ad372e2a9603bf 100644 (file)
--- a/src/dolphinsettings.cpp
+++ b/src/dolphinsettings.cpp
@@ -32,7 +32,6 @@
 
 #include "generalsettings.h"
 #include "iconsmodesettings.h"
 
 #include "generalsettings.h"
 #include "iconsmodesettings.h"

-#include "previewsmodesettings.h"

 #include "detailsmodesettings.h"
 
 #include <Q3IconView>
 #include "detailsmodesettings.h"
 
 #include <Q3IconView>


@@ -75,7 +74,6 @@ void DolphinSettings::save()
 {
     m_generalSettings->writeConfig();
     m_iconsModeSettings->writeConfig();
 {
     m_generalSettings->writeConfig();
     m_iconsModeSettings->writeConfig();

-    m_previewsModeSettings->writeConfig();

     m_detailsModeSettings->writeConfig();
 
     QString basePath = KGlobal::instance()->instanceName();
     m_detailsModeSettings->writeConfig();
 
     QString basePath = KGlobal::instance()->instanceName();


@@ -159,7 +157,6 @@ DolphinSettings::DolphinSettings()
 {
     m_generalSettings = new GeneralSettings();
     m_iconsModeSettings = new IconsModeSettings();
 {
     m_generalSettings = new GeneralSettings();
     m_iconsModeSettings = new IconsModeSettings();

-    m_previewsModeSettings = new PreviewsModeSettings();

     m_detailsModeSettings = new DetailsModeSettings();
 }
 
     m_detailsModeSettings = new DetailsModeSettings();
 }
 


@@ -171,9 +168,6 @@ DolphinSettings::~DolphinSettings()
     delete m_iconsModeSettings;
     m_iconsModeSettings = 0;
 
     delete m_iconsModeSettings;
     m_iconsModeSettings = 0;
 

-    delete m_previewsModeSettings;
-    m_previewsModeSettings = 0;
-

     delete m_detailsModeSettings;
     m_detailsModeSettings = 0;
 }
     delete m_detailsModeSettings;
     m_detailsModeSettings = 0;
 }

diff --git a/src/dolphinsettings.h b/src/dolphinsettings.h
index ce56c0d79590db1dc3b33d4670ae37ec9cc31629..fac7894cd6f458afbcd49d0664bb2e96bb03e95e 100644 (file)
--- a/src/dolphinsettings.h
+++ b/src/dolphinsettings.h
@@ -25,7 +25,6 @@ class KBookmark;
 class KBookmarkManager;
 class GeneralSettings;
 class IconsModeSettings;
 class KBookmarkManager;
 class GeneralSettings;
 class IconsModeSettings;

-class PreviewsModeSettings;

 class DetailsModeSettings;
 
 /**
 class DetailsModeSettings;
 
 /**


@@ -45,7 +44,6 @@ public:
 
     GeneralSettings* generalSettings() const { return m_generalSettings; }
     IconsModeSettings* iconsModeSettings() const { return m_iconsModeSettings; }
 
     GeneralSettings* generalSettings() const { return m_generalSettings; }
     IconsModeSettings* iconsModeSettings() const { return m_iconsModeSettings; }

-    PreviewsModeSettings* previewsModeSettings() const { return m_previewsModeSettings; }

     DetailsModeSettings* detailsModeSettings() const { return m_detailsModeSettings; }
 
     KBookmarkManager* bookmarkManager() const;
     DetailsModeSettings* detailsModeSettings() const { return m_detailsModeSettings; }
 
     KBookmarkManager* bookmarkManager() const;


@@ -93,7 +91,6 @@ protected:
 private:
     GeneralSettings* m_generalSettings;
     IconsModeSettings* m_iconsModeSettings;
 private:
     GeneralSettings* m_generalSettings;
     IconsModeSettings* m_iconsModeSettings;

-    PreviewsModeSettings* m_previewsModeSettings;

     DetailsModeSettings* m_detailsModeSettings;
 };
 
     DetailsModeSettings* m_detailsModeSettings;
 };
 

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index 3a15a6d6667afb5d89d7608893e5b3ae82c44319..ec10babfd7a6f5142c49e8a0cf57684136853cef 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -25,7 +25,6 @@
     <text>View Mode</text>
     <Action name="icons" />
     <Action name="details" />
     <text>View Mode</text>
     <Action name="icons" />
     <Action name="details" />

-    <Action name="previews" />

    </Menu>
    <Menu name="sort" >
     <text>Sort</text>
    </Menu>
    <Menu name="sort" >
     <text>Sort</text>


@@ -35,6 +34,7 @@
     <Separator/>
     <Action name="descending" />
    </Menu>
     <Separator/>
     <Action name="descending" />
    </Menu>

+   <Action name="show_preview" />

    <Action name="show_hidden_files" />
    <Separator/>
    <Action name="split_view" />
    <Action name="show_hidden_files" />
    <Separator/>
    <Action name="split_view" />


@@ -102,8 +102,8 @@
   <Separator name="separator_1" />
   <Action name="icons" />
   <Action name="details" />
   <Separator name="separator_1" />
   <Action name="icons" />
   <Action name="details" />

-  <Action name="previews" />

   <Separator name="separator_0" />
   <Separator name="separator_0" />

+  <Action name="show_preview" />

   <Action name="split_view" />
  </ToolBar>
  <ActionProperties>
   <Action name="split_view" />
  </ToolBar>
  <ActionProperties>

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 9a647af4daa0019bcbe9af9b6935b419607cf17c..7f0481eec4cc4d2f2f683d0dbe2d006be9d7bd73 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -176,14 +176,14 @@ DolphinView::Mode DolphinView::mode() const
     return m_mode;
 }
 
     return m_mode;
 }
 

-void DolphinView::setShowHiddenFilesEnabled(bool show)
+void DolphinView::setShowHiddenFiles(bool show)

 {
     if (m_dirLister->showingDotFiles() == show) {
         return;
     }
 
     ViewProperties props(m_urlNavigator->url());
 {
     if (m_dirLister->showingDotFiles() == show) {
         return;
     }
 
     ViewProperties props(m_urlNavigator->url());

-    props.setShowHiddenFilesEnabled(show);
+    props.setShowHiddenFiles(show);

     props.save();
 
     m_dirLister->setShowingDotFiles(show);
     props.save();
 
     m_dirLister->setShowingDotFiles(show);


@@ -193,7 +193,7 @@ void DolphinView::setShowHiddenFilesEnabled(bool show)
     reload();
 }
 
     reload();
 }
 

-bool DolphinView::isShowHiddenFilesEnabled() const
+bool DolphinView::showHiddenFiles() const

 {
     return m_dirLister->showingDotFiles();
 }
 {
     return m_dirLister->showingDotFiles();
 }


@@ -203,7 +203,7 @@ void DolphinView::setViewProperties(const ViewProperties& props)
     setMode(props.viewMode());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());
     setMode(props.viewMode());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());

-    setShowHiddenFilesEnabled(props.isShowHiddenFilesEnabled());
+    setShowHiddenFiles(props.showHiddenFiles());

 }
 
 void DolphinView::renameSelectedItems()
 }
 
 void DolphinView::renameSelectedItems()


@@ -635,8 +635,8 @@ void DolphinView::loadDirectory(const KUrl& url)
     const ViewProperties props(url);
     setMode(props.viewMode());
 
     const ViewProperties props(url);
     setMode(props.viewMode());
 

-    const bool showHiddenFiles = props.isShowHiddenFilesEnabled();
-    setShowHiddenFilesEnabled(showHiddenFiles);
+    const bool showHiddenFiles = props.showHiddenFiles();
+    setShowHiddenFiles(showHiddenFiles);

     m_dirLister->setShowingDotFiles(showHiddenFiles);
 
     setSorting(props.sorting());
     m_dirLister->setShowingDotFiles(showHiddenFiles);
 
     setSorting(props.sorting());


@@ -1047,10 +1047,10 @@ void DolphinView::applyModeToView()
             m_iconsView->setGridSize(QSize(256, 24));
             break;
 
             m_iconsView->setGridSize(QSize(256, 24));
             break;
 

-        case PreviewsView:
-            m_iconsView->setViewMode(QListView::IconMode);
-            m_iconsView->setGridSize(QSize(128, 128));
-            break;
+        //case PreviewsView:
+        //    m_iconsView->setViewMode(QListView::IconMode);
+        //    m_iconsView->setGridSize(QSize(128, 128));
+        //    break;

     }
 }
 
     }
 }
 

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 39fb7cc2645d960d0875f7e9bf76721d8b20cbcf..2f1d7c60557e342dac92a2252cd7cbf14005e09f 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -97,13 +97,7 @@ public:
          * for date, group and permissions.
          */
         DetailsView = 1,
          * for date, group and permissions.
          */
         DetailsView = 1,

-
-        /**
-         * The directory items are shown as preview if possible. As
-         * fallback the items are shown as icons.
-         */
-        PreviewsView = 2,
-        MaxModeEnum = PreviewsView
+        MaxModeEnum = DetailsView

     };
 
     /** Defines the sort order for the items of a directory. */
     };
 
     /** Defines the sort order for the items of a directory. */


@@ -138,8 +132,8 @@ public:
 
     void setMode(Mode mode);
     Mode mode() const;
 
     void setMode(Mode mode);
     Mode mode() const;

-    void setShowHiddenFilesEnabled(bool show);
-    bool isShowHiddenFilesEnabled() const;
+    void setShowHiddenFiles(bool show);
+    bool showHiddenFiles() const;

 
     void setViewProperties(const ViewProperties& props);
 
 
     void setViewProperties(const ViewProperties& props);
 

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 0ad74759067012caa3c20a26747f187e79405bb8..5efed4424f4d68e40834cbaa2c8b2ef5f024aeb7 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -96,12 +96,10 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* par
 
     m_iconsView = new QRadioButton(i18n("Icons"), buttonGroup);
     m_detailsView = new QRadioButton(i18n("Details"), buttonGroup);
 
     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;
 
     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
     }
 
     // create 'Start with split view' checkbox


@@ -135,13 +133,9 @@ void GeneralSettingsPage::applySettings()
         settings->setHomeUrl(url.prettyUrl());
     }
 
         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());
     settings->setDefaultViewMode(viewMode);
 
     settings->setSplitView(m_startSplit->isChecked());

diff --git a/src/generalsettingspage.h b/src/generalsettingspage.h
index f65fb29cff9c6203f0643a4962440fff1c1d9ec1..932e752e082f1e227ee46679d387ce8350204c7f 100644 (file)
--- a/src/generalsettingspage.h
+++ b/src/generalsettingspage.h
@@ -56,7 +56,6 @@ private:
     QLineEdit* m_homeUrl;
     QRadioButton* m_iconsView;
     QRadioButton* m_detailsView;
     QLineEdit* m_homeUrl;
     QRadioButton* m_iconsView;
     QRadioButton* m_detailsView;

-    QRadioButton* m_previewsView;

     QCheckBox* m_startSplit;
     QCheckBox* m_startEditable;
 };
     QCheckBox* m_startSplit;
     QCheckBox* m_startEditable;
 };

diff --git a/src/iconsmodesettings.kcfg b/src/iconsmodesettings.kcfg
index 371e7cabf5aec121c64f2ec1b0479434e1508dc6..574aa07a922b4c4939ab0ddf52cb14c71f0c9be3 100644 (file)
--- a/src/iconsmodesettings.kcfg
+++ b/src/iconsmodesettings.kcfg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">

-<kcfg> 
+<kcfg>

     <kcfgfile name="dolphinrc"/>
     <include>kiconloader.h</include>
     <group name="IconsMode">
     <kcfgfile name="dolphinrc"/>
     <include>kiconloader.h</include>
     <group name="IconsMode">


@@ -35,6 +35,10 @@
             <label>Number of textlines</label>
             <default>2</default>
         </entry>
             <label>Number of textlines</label>
             <default>2</default>
         </entry>

+        <entry name="Preview" type="Bool">
+            <label>Show preview</label>
+            <default>true</default>
+        </entry>

         <entry name="PreviewSize" type="Int">
             <label>Preview size</label>
             <default code="true">K3Icon::SizeMedium</default>
         <entry name="PreviewSize" type="Int">
             <label>Preview size</label>
             <default code="true">K3Icon::SizeMedium</default>

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index cd35b1007c8e0083f0ebb6c27ca01b8d63abb31c..8442872a5d8429361ceb1cdaf889c4409cfee91a 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -39,10 +39,8 @@
 #define GRID_SPACING_BASE 8
 #define GRID_SPACING_INC 12
 
 #define GRID_SPACING_BASE 8
 #define GRID_SPACING_INC 12
 

-IconsViewSettingsPage::IconsViewSettingsPage(/*DolphinIconsView::LayoutMode mode,*/
-                                             QWidget* parent) :
+IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :

     KVBox(parent),
     KVBox(parent),

-    //m_mode(mode),

     m_iconSizeSlider(0),
     m_previewSizeSlider(0),
     m_textWidthBox(0),
     m_iconSizeSlider(0),
     m_previewSizeSlider(0),
     m_textWidthBox(0),


@@ -89,29 +87,27 @@ IconsViewSettingsPage::IconsViewSettingsPage(/*DolphinIconsView::LayoutMode mode
     m_iconSizeViewer->setEraseColor(iconBackgroundColor);
     slotIconSizeChanged(m_iconSizeSlider->value());
 
     m_iconSizeViewer->setEraseColor(iconBackgroundColor);
     slotIconSizeChanged(m_iconSizeSlider->value());
 

-    if (false /*m_mode == DolphinIconsView::Previews*/) {
-        // create 'Preview Size' group including slider and preview
-        Q3GroupBox* previewSizeGroup = new Q3GroupBox(2, Qt::Vertical, i18n("Preview Size"), sizesLayout);
-        previewSizeGroup->setSizePolicy(sizePolicy);
-        previewSizeGroup->setMargin(margin);
-
-        KHBox* previewSizeVBox = new KHBox(previewSizeGroup);
-        previewSizeVBox->setSpacing(spacing);
-        new QLabel(i18n("Small"), previewSizeVBox);
-        m_previewSizeSlider = new QSlider(0, 5, 1, 0,  Qt::Horizontal, previewSizeVBox);
-        m_previewSizeSlider->setValue(sliderValue(settings->previewSize()));
-        m_previewSizeSlider->setTickmarks(QSlider::TicksBelow);
-        connect(m_previewSizeSlider, SIGNAL(valueChanged(int)),
-                this, SLOT(slotPreviewSizeChanged(int)));
-        new QLabel(i18n("Large"), previewSizeVBox);
-
-        m_previewSizeViewer = new PixmapViewer(previewSizeGroup);
-        m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
-        m_previewSizeViewer->setFixedHeight(K3Icon::SizeEnormous);
-        m_previewSizeViewer->setEraseColor(iconBackgroundColor);
-
-        slotPreviewSizeChanged(m_previewSizeSlider->value());
-    }
+    // create 'Preview Size' group including slider and preview
+    Q3GroupBox* previewSizeGroup = new Q3GroupBox(2, Qt::Vertical, i18n("Preview Size"), sizesLayout);
+    previewSizeGroup->setSizePolicy(sizePolicy);
+    previewSizeGroup->setMargin(margin);
+
+    KHBox* previewSizeVBox = new KHBox(previewSizeGroup);
+    previewSizeVBox->setSpacing(spacing);
+    new QLabel(i18n("Small"), previewSizeVBox);
+    m_previewSizeSlider = new QSlider(0, 5, 1, 0,  Qt::Horizontal, previewSizeVBox);
+    m_previewSizeSlider->setValue(sliderValue(settings->previewSize()));
+    m_previewSizeSlider->setTickmarks(QSlider::TicksBelow);
+    connect(m_previewSizeSlider, SIGNAL(valueChanged(int)),
+            this, SLOT(slotPreviewSizeChanged(int)));
+    new QLabel(i18n("Large"), previewSizeVBox);
+
+    m_previewSizeViewer = new PixmapViewer(previewSizeGroup);
+    m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
+    m_previewSizeViewer->setFixedHeight(K3Icon::SizeEnormous);
+    m_previewSizeViewer->setEraseColor(iconBackgroundColor);
+
+    slotPreviewSizeChanged(m_previewSizeSlider->value());

 
     Q3GroupBox* textGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Text"), this);
     textGroup->setSizePolicy(sizePolicy);
 
     Q3GroupBox* textGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Text"), this);
     textGroup->setSizePolicy(sizePolicy);

diff --git a/src/iconsviewsettingspage.h b/src/iconsviewsettingspage.h
index 85eff44435f1caebd1f6dd0685179ba764b36eef..5aa89c86e45b5a4fd28c225578e4a1cd69afa10a 100644 (file)
--- a/src/iconsviewsettingspage.h
+++ b/src/iconsviewsettingspage.h
@@ -55,8 +55,7 @@ class IconsViewSettingsPage : public KVBox
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    IconsViewSettingsPage(/*DolphinIconsView::LayoutMode mode,*/
-                          QWidget* parent);
+    IconsViewSettingsPage(QWidget* parent);

     virtual ~IconsViewSettingsPage();
 
     /**
     virtual ~IconsViewSettingsPage();
 
     /**


@@ -71,8 +70,6 @@ private slots:
     void slotPreviewSizeChanged(int value);
 
 private:
     void slotPreviewSizeChanged(int value);
 
 private:

-    //DolphinIconsView::LayoutMode m_mode;
-

     QSlider* m_iconSizeSlider;
     PixmapViewer* m_iconSizeViewer;
     QSlider* m_previewSizeSlider;
     QSlider* m_iconSizeSlider;
     PixmapViewer* m_iconSizeViewer;
     QSlider* m_previewSizeSlider;

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index f08649ac272a2c84e8d8ff94dfb63cc8d82816b8..c69fbf3466e98673f06f7628e6f3a65b6c1aa03d 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -178,7 +178,13 @@ void InfoSidebarPage::showItemInfo()
 
         KIO::PreviewJob* job = KIO::filePreview(list,
                                                 m_preview->width(),
 
         KIO::PreviewJob* job = KIO::filePreview(list,
                                                 m_preview->width(),

-                                                K3Icon::SizeEnormous);
+                                                K3Icon::SizeEnormous,
+                                                0,
+                                                0,
+                                                true,
+                                                false);
+        job->setIgnoreMaximumSize(true);
+

         connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)),
                 this, SLOT(gotPreview(const KFileItem*, const QPixmap&)));
         connect(job, SIGNAL(failed(const KFileItem*)),
         connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)),
                 this, SLOT(gotPreview(const KFileItem*, const QPixmap&)));
         connect(job, SIGNAL(failed(const KFileItem*)),

diff --git a/src/previewsmodesettings.kcfg b/src/previewsmodesettings.kcfg
deleted file mode 100644 (file)
index 96f677f..0000000
--- a/src/previewsmodesettings.kcfg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
-<kcfg> 
-    <kcfgfile name="dolphinrc"/>
-    <include>kiconloader.h</include>
-    <group name="PreviewsMode">
-        <entry name="Arrangement" type="String">
-            <label>Arrangement</label>
-            <default>LeftToRight</default>
-        </entry>
-        <entry name="FontFamily" type="String">
-            <label>Font family</label>
-            <default code="true">KGlobalSettings::generalFont().family()</default>
-        </entry>
-        <entry name="FontSize" type="Int">
-            <label>Font size</label>
-            <default code="true">KGlobalSettings::generalFont().pointSize()</default>
-        </entry>
-        <entry name="GridHeight" type="Int">
-            <label>Grid height</label>
-        </entry>
-        <entry name="GridWidth" type="Int">
-            <label>Grid width</label>
-        </entry>
-        <entry name="GridSpacing" type="Int">
-            <label>Grid spacing</label>
-        </entry>
-        <entry name="IconSize" type="Int">
-            <label>Icon size</label>
-            <default code="true">K3Icon::SizeMedium</default>
-        </entry>
-        <entry name="NumberOfTexlines" type="Int">
-            <label>Number of textlines</label>
-            <default>2</default>
-        </entry>
-        <entry name="PreviewSize" type="Int">
-            <label>Preview size</label>
-            <default code="true">K3Icon::SizeMedium</default>
-        </entry>
-    </group>
-</kcfg>
\ No newline at end of file

diff --git a/src/previewsmodesettings.kcfgc b/src/previewsmodesettings.kcfgc
deleted file mode 100644 (file)
index 780a6d5..0000000
--- a/src/previewsmodesettings.kcfgc
+++ /dev/null
@@ -1,4 +0,0 @@
-File=previewsmodesettings.kcfg
-ClassName=PreviewsModeSettings
-Singleton=false 
-Mutators=true
\ No newline at end of file

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index e3e219b24c8b4575b792b816613756fd39a88395..60e91cabf354c2bb75ea982addb2f6d34aae0cce 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -97,7 +97,21 @@ DolphinView::Mode ViewProperties::viewMode() const
     return static_cast<DolphinView::Mode>(m_node->viewMode());
 }
 
     return static_cast<DolphinView::Mode>(m_node->viewMode());
 }
 

-void ViewProperties::setShowHiddenFilesEnabled(bool show)
+void ViewProperties::setShowPreview(bool show)
+{
+    if (m_node->showPreview() != show) {
+        m_node->setShowPreview(show);
+        updateTimeStamp();
+    }
+}
+
+bool ViewProperties::showPreview() const
+{
+    return m_node->showPreview();
+}
+
+
+void ViewProperties::setShowHiddenFiles(bool show)

 {
     if (m_node->showHiddenFiles() != show) {
         m_node->setShowHiddenFiles(show);
 {
     if (m_node->showHiddenFiles() != show) {
         m_node->setShowHiddenFiles(show);


@@ -105,7 +119,7 @@ void ViewProperties::setShowHiddenFilesEnabled(bool show)
     }
 }
 
     }
 }
 

-bool ViewProperties::isShowHiddenFilesEnabled() const
+bool ViewProperties::showHiddenFiles() const

 {
     return m_node->showHiddenFiles();
 }
 {
     return m_node->showHiddenFiles();
 }

diff --git a/src/viewproperties.h b/src/viewproperties.h
index bdc052ed88ee0b3e7ce1c6a16d02ba859a5f3a84..a988004078a5c74e9d4ea1ea45e046b585313281 100644 (file)
--- a/src/viewproperties.h
+++ b/src/viewproperties.h
@@ -54,8 +54,11 @@ public:
     void setViewMode(DolphinView::Mode mode);
     DolphinView::Mode viewMode() const;
 
     void setViewMode(DolphinView::Mode mode);
     DolphinView::Mode viewMode() const;
 

-    void setShowHiddenFilesEnabled(bool show);
-    bool isShowHiddenFilesEnabled() const;
+    void setShowPreview(bool show);
+    bool showPreview() const;
+
+    void setShowHiddenFiles(bool show);
+    bool showHiddenFiles() const;

 
     void setSorting(DolphinView::Sorting sorting);
     DolphinView::Sorting sorting() const;
 
     void setSorting(DolphinView::Sorting sorting);
     DolphinView::Sorting sorting() const;

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index b13b3d4a6cb2bbcf9b235ed6bac4a60af92dc736..8393401c763bde4c70050865a9414a5b53d43afd 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -40,7 +40,14 @@
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     KDialog(dolphinView),
     m_isDirty(false),
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     KDialog(dolphinView),
     m_isDirty(false),

-    m_dolphinView(dolphinView)
+    m_dolphinView(dolphinView),
+    m_viewProps(0),
+    m_viewMode(0),
+    m_sorting(0),
+    m_sortOrder(0),
+    m_showPreview(0),
+    m_showHiddenFiles(0),
+    m_applyToSubFolders(0)

 {
     assert(dolphinView != 0);
 
 {
     assert(dolphinView != 0);
 


@@ -61,7 +68,6 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_viewMode = new QComboBox(propsBox);
     m_viewMode->addItem(SmallIcon("view_icon"), i18n("Icons"));
     m_viewMode->addItem(SmallIcon("view_text"), i18n("Details"));
     m_viewMode = new QComboBox(propsBox);
     m_viewMode->addItem(SmallIcon("view_icon"), i18n("Icons"));
     m_viewMode->addItem(SmallIcon("view_text"), i18n("Details"));

-    m_viewMode->addItem(SmallIcon("gvdirpart"), i18n("Previews"));

     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);
 
     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);
 


@@ -86,8 +92,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1;
     m_sortOrder->setCurrentIndex(sortOrderIdx);
 
     const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1;
     m_sortOrder->setCurrentIndex(sortOrderIdx);
 

+    m_showPreview = new QCheckBox(i18n("Show preview"), propsBox);
+    m_showPreview->setChecked(m_viewProps->showPreview());
+

     m_showHiddenFiles = new QCheckBox(i18n("Show hidden files"), propsBox);
     m_showHiddenFiles = new QCheckBox(i18n("Show hidden files"), propsBox);

-    m_showHiddenFiles->setChecked(m_viewProps->isShowHiddenFilesEnabled());
+    m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles());

 
     QGridLayout* propsBoxLayout = new QGridLayout(propsBox);
     propsBoxLayout->addWidget(viewModeLabel, 0, 0);
 
     QGridLayout* propsBoxLayout = new QGridLayout(propsBox);
     propsBoxLayout->addWidget(viewModeLabel, 0, 0);


@@ -97,7 +106,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     propsBoxLayout->addWidget(m_sorting, 1, 1);
     propsBoxLayout->addWidget(sortOrderLabel, 2, 0);
     propsBoxLayout->addWidget(m_sortOrder, 2, 1);
     propsBoxLayout->addWidget(m_sorting, 1, 1);
     propsBoxLayout->addWidget(sortOrderLabel, 2, 0);
     propsBoxLayout->addWidget(m_sortOrder, 2, 1);

-    propsBoxLayout->addWidget(m_showHiddenFiles, 3, 0);
+    propsBoxLayout->addWidget(m_showPreview, 3, 0);
+    propsBoxLayout->addWidget(m_showHiddenFiles, 4, 0);

 
     m_applyToSubFolders = new QCheckBox(i18n("Apply changes to all sub folders"), main);
     topLayout->addWidget(propsBox);
 
     m_applyToSubFolders = new QCheckBox(i18n("Apply changes to all sub folders"), main);
     topLayout->addWidget(propsBox);


@@ -109,6 +119,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
             this, SLOT(slotSortingChanged(int)));
     connect(m_sortOrder, SIGNAL(activated(int)),
             this, SLOT(slotSortOrderChanged(int)));
             this, SLOT(slotSortingChanged(int)));
     connect(m_sortOrder, SIGNAL(activated(int)),
             this, SLOT(slotSortOrderChanged(int)));

+    connect(m_showPreview, SIGNAL(clicked()),
+            this, SLOT(slotShowPreviewChanged()));

     connect(m_showHiddenFiles, SIGNAL(clicked()),
             this, SLOT(slotShowHiddenFilesChanged()));
 
     connect(m_showHiddenFiles, SIGNAL(clicked()),
             this, SLOT(slotShowHiddenFilesChanged()));
 


@@ -166,10 +178,17 @@ void ViewPropertiesDialog::slotSortOrderChanged(int index)
     m_isDirty = true;
 }
 
     m_isDirty = true;
 }
 

+void ViewPropertiesDialog::slotShowPreviewChanged()
+{
+    const bool show = m_showPreview->isChecked();
+    m_viewProps->setShowPreview(show);
+    m_isDirty = true;
+}
+

 void ViewPropertiesDialog::slotShowHiddenFilesChanged()
 {
     const bool show = m_showHiddenFiles->isChecked();
 void ViewPropertiesDialog::slotShowHiddenFilesChanged()
 {
     const bool show = m_showHiddenFiles->isChecked();

-    m_viewProps->setShowHiddenFilesEnabled(show);
+    m_viewProps->setShowHiddenFiles(show);

     m_isDirty = true;
 }
 
     m_isDirty = true;
 }
 

diff --git a/src/viewpropertiesdialog.h b/src/viewpropertiesdialog.h
index d3cca8616a9d410b43b2123e2d652dc247b7173a..f6da4561aea9f4d3cecb42322d7625a31e423863 100644 (file)
--- a/src/viewpropertiesdialog.h
+++ b/src/viewpropertiesdialog.h
@@ -49,6 +49,7 @@ private slots:
     void slotViewModeChanged(int index);
     void slotSortingChanged(int index);
     void slotSortOrderChanged(int index);
     void slotViewModeChanged(int index);
     void slotSortingChanged(int index);
     void slotSortOrderChanged(int index);

+    void slotShowPreviewChanged();

     void slotShowHiddenFilesChanged();
     void markAsDirty();
 
     void slotShowHiddenFilesChanged();
     void markAsDirty();
 


@@ -60,6 +61,7 @@ private:
     QComboBox* m_viewMode;
     QComboBox* m_sorting;
     QComboBox* m_sortOrder;
     QComboBox* m_viewMode;
     QComboBox* m_sorting;
     QComboBox* m_sortOrder;

+    QCheckBox* m_showPreview;

     QCheckBox* m_showHiddenFiles;
     QCheckBox* m_applyToSubFolders;
 
     QCheckBox* m_showHiddenFiles;
     QCheckBox* m_applyToSubFolders;
 

diff --git a/src/viewpropsprogressinfo.cpp b/src/viewpropsprogressinfo.cpp
index 79ebb9a0b6525281c72044a998c5eadf00367801..2d0b1a8f8c79f682820dfbda444a18a7fe72eb78 100644 (file)
--- a/src/viewpropsprogressinfo.cpp
+++ b/src/viewpropsprogressinfo.cpp
@@ -49,7 +49,7 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
 
     m_viewProps = new ViewProperties(dir);
     m_viewProps->setViewMode(viewProps.viewMode());
 
     m_viewProps = new ViewProperties(dir);
     m_viewProps->setViewMode(viewProps.viewMode());

-    m_viewProps->setShowHiddenFilesEnabled(viewProps.isShowHiddenFilesEnabled());
+    m_viewProps->setShowHiddenFiles(viewProps.showHiddenFiles());

     m_viewProps->setSorting(viewProps.sorting());
     m_viewProps->setSortOrder(viewProps.sortOrder());
 
     m_viewProps->setSorting(viewProps.sorting());
     m_viewProps->setSortOrder(viewProps.sortOrder());
 

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index ee817a06a4881fd28c2280c33f92fee9335e01d3..a052d84f653ffd611e47cab3ddea2234dc000e94 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -33,25 +33,20 @@
 ViewSettingsPage::ViewSettingsPage(QWidget *parent) :
     SettingsPageBase(parent),
     m_iconsPage(0),
 ViewSettingsPage::ViewSettingsPage(QWidget *parent) :
     SettingsPageBase(parent),
     m_iconsPage(0),

-    m_detailsPage(0),
-    m_previewsPage(0)
+    m_detailsPage(0)

 {
     Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 0, KDialog::spacingHint());
 
     QTabWidget* tabWidget = new QTabWidget(this);
 
     // initialize 'Icons' tab
 {
     Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 0, KDialog::spacingHint());
 
     QTabWidget* tabWidget = new QTabWidget(this);
 
     // initialize 'Icons' tab

-    m_iconsPage = new IconsViewSettingsPage(/*DolphinIconsView::Icons,*/ tabWidget);
+    m_iconsPage = new IconsViewSettingsPage(tabWidget);

     tabWidget->addTab(m_iconsPage, SmallIcon("view_icon"), i18n("Icons"));
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(tabWidget);
     tabWidget->addTab(m_detailsPage, SmallIcon("view_text"), i18n("Details"));
 
     tabWidget->addTab(m_iconsPage, SmallIcon("view_icon"), i18n("Icons"));
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(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 );
 }
 
     topLayout->addWidget(tabWidget, 0, 0 );
 }
 


@@ -63,7 +58,6 @@ void ViewSettingsPage::applySettings()
 {
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();
 {
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();

-    m_previewsPage->applySettings();

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

diff --git a/src/viewsettingspage.h b/src/viewsettingspage.h
index 786abf0b15d8542bc6260851aa845b4c4ea5a588..baec5296e3053421259ec0c4d470182cadb9e01e 100644 (file)
--- a/src/viewsettingspage.h
+++ b/src/viewsettingspage.h
@@ -49,7 +49,6 @@ public:
 private:
     IconsViewSettingsPage* m_iconsPage;
     DetailsViewSettingsPage* m_detailsPage;
 private:
     IconsViewSettingsPage* m_iconsPage;
     DetailsViewSettingsPage* m_detailsPage;

-    IconsViewSettingsPage* m_previewsPage;

 };
 
 #endif
 };
 
 #endif