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

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 8706316d835a2963a3afbd6d2d93de48e32294d5..6f6e2fb474da385458d267b0ab011a5f61ecf214 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -86,17 +86,20 @@ DolphinMainWindow::DolphinMainWindow() :
     m_view[PrimaryIdx] = 0;
     m_view[SecondaryIdx] = 0;
 
-    m_fileGroupActions.setAutoDelete(true);
-
     // TODO: the following members are not used yet. See documentation
     // of DolphinMainWindow::linkGroupActions() and DolphinMainWindow::linkToDeviceActions()
     // in the header file for details.
-    //m_linkGroupActions.setAutoDelete(true);
-    //m_linkToDeviceActions.setAutoDelete(true);
 }
 
 DolphinMainWindow::~DolphinMainWindow()
 {
+    qDeleteAll(m_fileGroupActions);
+    //qDeleteAll(m_linkToDeviceActions);
+    //qDeleteAll(m_linkGroupActions);
+    m_fileGroupActions.clear();
+    //m_linkGroupActions.clear();
+    //m_linkToDeviceActions.clear();
+
     /*
      * bye, bye managed window
      */
@@ -217,7 +220,7 @@ void DolphinMainWindow::refreshViews()
                                         m_splitter,
                                         url,
                                         props.viewMode(),
-                                        props.isShowHiddenFilesEnabled());
+                                        props.showHiddenFiles());
             connectViewSignals(i);
             m_view[i]->show();
         }
@@ -239,7 +242,7 @@ void DolphinMainWindow::slotShowHiddenFilesChanged()
 {
     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)
@@ -356,14 +359,14 @@ void DolphinMainWindow::readProperties(KConfig* config)
 {
     config->setGroup("Primary view");
     m_view[PrimaryIdx]->setUrl(config->readEntry("Url"));
-    m_view[PrimaryIdx]->setUrlEditable(config->readBoolEntry("Editable Url"));
+    m_view[PrimaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));
     if (config->hasGroup("Secondary view")) {
         config->setGroup("Secondary view");
         if (m_view[SecondaryIdx] == 0) {
             toggleSplitView();
         }
         m_view[SecondaryIdx]->setUrl(config->readEntry("Url"));
-        m_view[SecondaryIdx]->setUrlEditable(config->readBoolEntry("Editable Url"));
+        m_view[SecondaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));
     }
     else if (m_view[SecondaryIdx] != 0) {
         toggleSplitView();
@@ -458,7 +461,7 @@ void DolphinMainWindow::createFile()
     bool found = false;
     CreateFileEntry entry;
     while (!found && (it != end)) {
-        if ((*it).index() == senderName) {
+        if ((*it).key() == senderName) {
             entry = (*it).value();
             found = true;
         }
@@ -475,7 +478,7 @@ void DolphinMainWindow::createFile()
 
     // Get the source path of the template which should be copied.
     // The source path is part of the Url entry of the desktop file.
-    const int pos = entry.templatePath.findRev('/');
+    const int pos = entry.templatePath.lastIndexOf('/');
     QString sourcePath(entry.templatePath.left(pos + 1));
     sourcePath += KDesktopFile(entry.templatePath, true).readPathEntry("Url");
 
@@ -485,7 +488,7 @@ void DolphinMainWindow::createFile()
     name.replace("...", QString::null);
 
     // add the file extension to the name
-    name.append(sourcePath.right(sourcePath.length() - sourcePath.findRev('.')));
+    name.append(sourcePath.right(sourcePath.length() - sourcePath.lastIndexOf('.')));
 
     // Check whether a file with the current name already exists. If yes suggest automatically
     // a unique file name (e. g. "HTML File" will be replaced by "HTML File_1").
@@ -720,7 +723,7 @@ void DolphinMainWindow::updatePasteAction()
 
     QString text(i18n("Paste"));
     QClipboard* clipboard = QApplication::clipboard();
-    QMimeSource* data = clipboard->data();
+    const QMimeData* data = clipboard->mimeData();
     /* KDE4-TODO:
     if (KUrlDrag::canDecode(data)) {
         pasteAction->setEnabled(true);
@@ -783,11 +786,6 @@ void DolphinMainWindow::setDetailsView()
     m_activeView->setMode(DolphinView::DetailsView);
 }
 
-void DolphinMainWindow::setPreviewsView()
-{
-    m_activeView->setMode(DolphinView::PreviewsView);
-}
-
 void DolphinMainWindow::sortByName()
 {
     m_activeView->setSorting(DolphinView::SortByName);
@@ -820,7 +818,7 @@ void DolphinMainWindow::toggleSplitView()
                                                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);
@@ -858,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();
-    m_activeView->setShowHiddenFilesEnabled(show);
+    m_activeView->setShowHiddenFiles(show);
 }
 
 void DolphinMainWindow::showFilterBar()
@@ -1056,7 +1058,7 @@ void DolphinMainWindow::addUndoOperation(KJob* job)
                 while (sourceIt != sourceEnd) {
                     QMap<QString, QString>::ConstIterator metaIt = metaData.find("trashUrl-" + (*sourceIt).path());
                     if (metaIt != metaData.end()) {
-                        newSourceUrls.append(KUrl(metaIt.data()));
+                        newSourceUrls.append(KUrl(metaIt.value()));
                     }
                     ++sourceIt;
                 }
@@ -1120,7 +1122,7 @@ void DolphinMainWindow::init()
                                          m_splitter,
                                          homeUrl,
                                          props.viewMode(),
-                                         props.isShowHiddenFilesEnabled());
+                                         props.showHiddenFiles());
     connectViewSignals(PrimaryIdx);
     m_view[PrimaryIdx]->show();
 
@@ -1244,15 +1246,9 @@ void DolphinMainWindow::setupActions()
     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);
-    viewModeGroup->addAction(previewsView);
 
     KToggleAction* sortByName = new KToggleAction(i18n("By Name"), actionCollection(), "by_name");
     connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName()));
@@ -1271,9 +1267,13 @@ void DolphinMainWindow::setupActions()
     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 '.'?
-    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);
@@ -1527,9 +1527,9 @@ void DolphinMainWindow::updateViewActions()
         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;
     }
@@ -1548,7 +1548,7 @@ void DolphinMainWindow::updateViewActions()
 
     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);