Context-menu cleanups:

- KNewMenu has been deprecated by KNewFileMenu. Reflect this in the names of related Dolphin classes.
- Provide context-sensitive actions also when a context-menu is opened on the viewport

BUG: 191938
FIXED-IN: 4.6.0

svn path=/trunk/KDE/kdebase/apps/; revision=1168586

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 09e58b720a84e00b551440d78b4c3e6ae7b6b20e..b6b9410ab0bb027885993ea243dff6ed1fc62189 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,7 +33,7 @@ set(dolphinprivate_LIB_SRCS
     views/dolphincolumnview.cpp
     views/dolphincolumnviewcontainer.cpp
     views/dolphinmodel.cpp
     views/dolphincolumnview.cpp
     views/dolphincolumnviewcontainer.cpp
     views/dolphinmodel.cpp

-    views/dolphinnewmenuobserver.cpp
+    views/dolphinnewfilemenuobserver.cpp

     views/dolphinremoteencoding.cpp
     views/dolphinsortfilterproxymodel.cpp
     views/dolphinviewactionhandler.cpp
     views/dolphinremoteencoding.cpp
     views/dolphinsortfilterproxymodel.cpp
     views/dolphinviewactionhandler.cpp


@@ -97,7 +97,7 @@ install(FILES views/versioncontrol/fileviewversioncontrolplugin.desktop DESTINAT
 set(dolphin_SRCS
     dolphinapplication.cpp
     dolphinmainwindow.cpp
 set(dolphin_SRCS
     dolphinapplication.cpp
     dolphinmainwindow.cpp

-    dolphinnewmenu.cpp
+    dolphinnewfilemenu.cpp

     dolphinviewcontainer.cpp
     dolphincontextmenu.cpp
     filterbar/filterbar.cpp
     dolphinviewcontainer.cpp
     dolphincontextmenu.cpp
     filterbar/filterbar.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 57cef97df799557c8dd835033e009c9b64d8e856..d76cd8d23ebd17441d18e3cad5bdd4c6e0021dcf 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -21,7 +21,7 @@
 #include "dolphincontextmenu.h"
 
 #include "dolphinmainwindow.h"
 #include "dolphincontextmenu.h"
 
 #include "dolphinmainwindow.h"

-#include "dolphinnewmenu.h"
+#include "dolphinnewfilemenu.h"

 #include "settings/dolphinsettings.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 #include "settings/dolphinsettings.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"


@@ -37,7 +37,7 @@
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kmimetypetrader.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kmimetypetrader.h>

-#include <knewmenu.h>
+#include <knewfilemenu.h>

 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <kfileitemactions.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <kfileitemactions.h>


@@ -189,17 +189,17 @@ void DolphinContextMenu::openItemContextMenu()
     KMenu* popup = new KMenu(m_mainWindow);
     if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
         // setup 'Create New' menu
     KMenu* popup = new KMenu(m_mainWindow);
     if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
         // setup 'Create New' menu

-        DolphinNewMenu* newMenu = new DolphinNewMenu(popup, m_mainWindow);
+        DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(popup, m_mainWindow);

         const DolphinView* view = m_mainWindow->activeViewContainer()->view();
         const DolphinView* view = m_mainWindow->activeViewContainer()->view();

-        newMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
-        newMenu->checkUpToDate();
-        newMenu->setPopupFiles(m_fileInfo.url());
-        newMenu->setEnabled(capabilities().supportsWriting());
+        newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+        newFileMenu->checkUpToDate();
+        newFileMenu->setPopupFiles(m_fileInfo.url());
+        newFileMenu->setEnabled(capabilities().supportsWriting());

 
 

-        KMenu* menu = newMenu->menu();
+        KMenu* menu = newFileMenu->menu();

         menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
         menu->setIcon(KIcon("document-new"));
         menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
         menu->setIcon(KIcon("document-new"));

-        popup->addMenu(newMenu->menu());
+        popup->addMenu(menu);

         popup->addSeparator();
 
         // insert 'Open in new window' and 'Open in new tab' entries
         popup->addSeparator();
 
         // insert 'Open in new window' and 'Open in new tab' entries


@@ -212,30 +212,10 @@ void DolphinContextMenu::openItemContextMenu()
 
     popup->addSeparator();
 
 
     popup->addSeparator();
 

-    // insert 'Bookmark This Folder' entry if exactly one item is selected
-    QAction* addToPlacesAction = 0;
-    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
-        addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
-                                             i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
-        // Don't show if url is already in places
-        if (placeExists(m_fileInfo.url())) {
-            addToPlacesAction->setVisible(false);
-        }
-    }
+    KFileItemActions fileItemActions;
+    fileItemActions.setItemListProperties(capabilities());
+    addServiceActions(popup, fileItemActions);

 
 

-    KFileItemActions menuActions;
-    menuActions.setParentWidget(m_mainWindow);
-    menuActions.setItemListProperties(m_selectedItems);
-
-    // insert 'Open With...' action or sub menu
-    menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'");
-
-    // insert 'Actions' sub menu
-    if (menuActions.addServiceActionsTo(popup)) {
-        popup->addSeparator();
-    }
-
-    // insert version control actions

     addVersionControlActions(popup);
 
     // insert 'Copy To' and 'Move To' sub menus
     addVersionControlActions(popup);
 
     // insert 'Copy To' and 'Move To' sub menus


@@ -246,6 +226,13 @@ void DolphinContextMenu::openItemContextMenu()
         popup->addSeparator();
     }
 
         popup->addSeparator();
     }
 

+    // insert 'Add to Places' entry if exactly one item is selected
+    QAction* addToPlacesAction = 0;
+    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1) && !placeExists(m_fileInfo.url())) {
+        addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
+                                             i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
+    }
+

     // insert 'Properties...' entry
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     popup->addAction(propertiesAction);
     // insert 'Properties...' entry
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     popup->addAction(propertiesAction);


@@ -270,41 +257,37 @@ void DolphinContextMenu::openViewportContextMenu()
     addShowMenubarAction(popup);
 
     // setup 'Create New' menu
     addShowMenubarAction(popup);
 
     // setup 'Create New' menu

-    KNewFileMenu* newMenu = m_mainWindow->newMenu();
+    KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();

     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();

-    newMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
-    newMenu->checkUpToDate();
-    newMenu->setPopupFiles(m_baseUrl);
-    popup->addMenu(newMenu->menu());
+    newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+    newFileMenu->checkUpToDate();
+    newFileMenu->setPopupFiles(m_baseUrl);
+    popup->addMenu(newFileMenu->menu());
+    popup->addSeparator();
+
+    // insert 'Open in new window' and 'Open in new tab' entries
+    popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
+    popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));

     popup->addSeparator();
 
     QAction* pasteAction = createPasteAction();
     popup->addAction(pasteAction);
     popup->addSeparator();
 
     QAction* pasteAction = createPasteAction();
     popup->addAction(pasteAction);

-
-    // setup 'View Mode' menu
-    KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"), popup);
-
-    QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
-    viewModeMenu->addAction(iconsMode);
-
-    QAction* detailsMode = m_mainWindow->actionCollection()->action("details");
-    viewModeMenu->addAction(detailsMode);
-
-    QAction* columnsMode = m_mainWindow->actionCollection()->action("columns");
-    viewModeMenu->addAction(columnsMode);
-
-    popup->addMenu(viewModeMenu);
-

     popup->addSeparator();
 
     popup->addSeparator();
 

-    addVersionControlActions(popup);
+    // insert service actions
+    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
+    const KFileItemListProperties baseUrlProperties(KFileItemList() << item);
+    KFileItemActions fileItemActions;
+    fileItemActions.setItemListProperties(baseUrlProperties);
+    addServiceActions(popup, fileItemActions);

 
 

-    QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
-                                                  i18nc("@action:inmenu Add current folder to places", "Add to Places"));
+    addVersionControlActions(popup);

 
 

-    // Don't show if url is already in places
-    if (placeExists(m_mainWindow->activeViewContainer()->url())) {
-        addToPlacesAction->setVisible(false);
+    // insert 'Add to Places' entry if exactly one item is selected
+    QAction* addToPlacesAction = 0;
+    if (!placeExists(m_mainWindow->activeViewContainer()->url())) {
+        addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
+                                             i18nc("@action:inmenu Add current folder to places", "Add to Places"));

     }
 
     addCustomActions(popup);
     }
 
     addCustomActions(popup);


@@ -318,7 +301,7 @@ void DolphinContextMenu::openViewportContextMenu()
         KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
         KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();

-    } else if (action == addToPlacesAction) {
+    } else if ((addToPlacesAction != 0) && (action == addToPlacesAction)) {

         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);


@@ -424,6 +407,19 @@ KFileItemListProperties& DolphinContextMenu::capabilities()
     return *m_capabilities;
 }
 
     return *m_capabilities;
 }
 

+void DolphinContextMenu::addServiceActions(KMenu* menu, KFileItemActions& fileItemActions)
+{
+    fileItemActions.setParentWidget(m_mainWindow);
+
+    // insert 'Open With...' action or sub menu
+    fileItemActions.addOpenWithActionsTo(menu, "DesktopEntryName != 'dolphin'");
+
+    // insert 'Actions' sub menu
+    if (fileItemActions.addServiceActionsTo(menu)) {
+        menu->addSeparator();
+    }
+}
+

 void DolphinContextMenu::addVersionControlActions(KMenu* menu)
 {
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
 void DolphinContextMenu::addVersionControlActions(KMenu* menu)
 {
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index e286e61d29bf36cab82245e2cad5b302a3ac0e18..ae0d1c336a0c432a4c88d0ef6d60b64881353f22 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -34,6 +34,7 @@ class KMenu;
 class KFileItem;
 class QAction;
 class DolphinMainWindow;
 class KFileItem;
 class QAction;
 class DolphinMainWindow;

+class KFileItemActions;

 class KFileItemListProperties;
 
 /**
 class KFileItemListProperties;
 
 /**


@@ -98,6 +99,7 @@ private:
 
 private:
     KFileItemListProperties& capabilities();
 
 private:
     KFileItemListProperties& capabilities();

+    void addServiceActions(KMenu* menu, KFileItemActions& fileItemActions);

     void addVersionControlActions(KMenu* menu);
     void addCustomActions(KMenu* menu);
 
     void addVersionControlActions(KMenu* menu);
     void addCustomActions(KMenu* menu);
 

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index bc0f9d65133966faed2505dae3be42af453d447e..e58b81740730e8566740dc0fb6c18e28913b2427 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -25,7 +25,7 @@
 
 #include "dolphinapplication.h"
 #include "dolphincontextmenu.h"
 
 #include "dolphinapplication.h"
 #include "dolphincontextmenu.h"

-#include "dolphinnewmenu.h"
+#include "dolphinnewfilemenu.h"

 #include "dolphinviewcontainer.h"
 #include "mainwindowadaptor.h"
 #include "panels/folders/folderspanel.h"
 #include "dolphinviewcontainer.h"
 #include "mainwindowadaptor.h"
 #include "panels/folders/folderspanel.h"


@@ -103,7 +103,7 @@ Q_DECLARE_METATYPE(ClosedTab)
 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),

-    m_newMenu(0),
+    m_newFileMenu(0),

     m_showMenuBar(0),
     m_tabBar(0),
     m_activeViewContainer(0),
     m_showMenuBar(0),
     m_tabBar(0),
     m_activeViewContainer(0),


@@ -630,16 +630,16 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group)
 
 void DolphinMainWindow::updateNewMenu()
 {
 
 void DolphinMainWindow::updateNewMenu()
 {

-    m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
-    m_newMenu->checkUpToDate();
-    m_newMenu->setPopupFiles(activeViewContainer()->url());
+    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
+    m_newFileMenu->checkUpToDate();
+    m_newFileMenu->setPopupFiles(activeViewContainer()->url());

 }
 
 void DolphinMainWindow::createDirectory()
 {
 }
 
 void DolphinMainWindow::createDirectory()
 {

-    m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
-    m_newMenu->setPopupFiles(activeViewContainer()->url());
-    m_newMenu->createDirectory();
+    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
+    m_newFileMenu->setPopupFiles(activeViewContainer()->url());
+    m_newFileMenu->createDirectory();

 }
 
 void DolphinMainWindow::quit()
 }
 
 void DolphinMainWindow::quit()


@@ -1177,7 +1177,7 @@ void DolphinMainWindow::slotCaptionStatFinished(KJob* job)
 
 void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
 {
 
 void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
 {

-    newMenu()->setEnabled(isFolderWritable);
+    newFileMenu()->setEnabled(isFolderWritable);

 }
 
 void DolphinMainWindow::openContextMenu(const KFileItem& item,
 }
 
 void DolphinMainWindow::openContextMenu(const KFileItem& item,


@@ -1327,8 +1327,8 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu

-    m_newMenu = new DolphinNewMenu(this, this);
-    KMenu* menu = m_newMenu->menu();
+    m_newFileMenu = new DolphinNewFileMenu(this, this);
+    KMenu* menu = m_newFileMenu->menu();

     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));
     connect(menu, SIGNAL(aboutToShow()),
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));
     connect(menu, SIGNAL(aboutToShow()),

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 4d993865f24ab1acf5afb4328cbf36bca6ab4df1..b9dbe9f9d1556d099ac0b2d3307870b506ac1945 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -114,7 +114,7 @@ public:
      * Returns the 'Create New...' sub menu which also can be shared
      * with other menus (e. g. a context menu).
      */
      * Returns the 'Create New...' sub menu which also can be shared
      * with other menus (e. g. a context menu).
      */

-    KNewFileMenu* newMenu() const;
+    KNewFileMenu* newFileMenu() const;

 
     /**
      * Returns the 'Show Menubar' action which can be shared with
 
     /**
      * Returns the 'Show Menubar' action which can be shared with


@@ -524,7 +524,7 @@ private:
         virtual void jobError(KIO::Job* job);
     };
 
         virtual void jobError(KIO::Job* job);
     };
 

-    KNewFileMenu* m_newMenu;
+    KNewFileMenu* m_newFileMenu;

     KActionMenu* m_recentTabsMenu;
     KAction* m_showMenuBar;
     KTabBar* m_tabBar;
     KActionMenu* m_recentTabsMenu;
     KAction* m_showMenuBar;
     KTabBar* m_tabBar;


@@ -562,9 +562,9 @@ inline bool DolphinMainWindow::isSplit() const
     return m_viewTab[m_tabIndex].secondaryView != 0;
 }
 
     return m_viewTab[m_tabIndex].secondaryView != 0;
 }
 

-inline KNewFileMenu* DolphinMainWindow::newMenu() const
+inline KNewFileMenu* DolphinMainWindow::newFileMenu() const

 {
 {

-    return m_newMenu;
+    return m_newFileMenu;

 }
 
 inline KAction* DolphinMainWindow::showMenuBarAction() const
 }
 
 inline KAction* DolphinMainWindow::showMenuBarAction() const

diff --git a/src/dolphinnewmenu.cpp b/src/dolphinnewfilemenu.cpp
similarity index 83%
rename from src/dolphinnewmenu.cpp
rename to src/dolphinnewfilemenu.cpp
index a6dec150e7e9cd183dcec8009d06ffdc898a374a..c7ffb788e395ae68deefefd3763a047b116aaf8f 100644 (file)
--- a/src/dolphinnewmenu.cpp
+++ b/src/dolphinnewfilemenu.cpp
@@ -18,30 +18,30 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#include "dolphinnewmenu.h"
+#include "dolphinnewfilemenu.h"

 
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
 #include "statusbar/dolphinstatusbar.h"
 
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
 #include "statusbar/dolphinstatusbar.h"

-#include "views/dolphinnewmenuobserver.h"
+#include "views/dolphinnewfilemenuobserver.h"

 #include "views/dolphinview.h"
 
 #include <kactioncollection.h>
 #include <kio/job.h>
 
 #include "views/dolphinview.h"
 
 #include <kactioncollection.h>
 #include <kio/job.h>
 

-DolphinNewMenu::DolphinNewMenu(QWidget* parent, DolphinMainWindow* mainWin) :
+DolphinNewFileMenu::DolphinNewFileMenu(QWidget* parent, DolphinMainWindow* mainWin) :

     KNewFileMenu(mainWin->actionCollection(), "create_new", parent),
     m_mainWin(mainWin)
 {
     KNewFileMenu(mainWin->actionCollection(), "create_new", parent),
     m_mainWin(mainWin)
 {

-    DolphinNewMenuObserver::instance().attach(this);
+    DolphinNewFileMenuObserver::instance().attach(this);

 }
 
 }
 

-DolphinNewMenu::~DolphinNewMenu()
+DolphinNewFileMenu::~DolphinNewFileMenu()

 {
 {

-    DolphinNewMenuObserver::instance().detach(this);
+    DolphinNewFileMenuObserver::instance().detach(this);

 }
 
 }
 

-void DolphinNewMenu::slotResult(KJob* job)
+void DolphinNewFileMenu::slotResult(KJob* job)

 {
     if (job->error()) {
         DolphinStatusBar* statusBar = m_mainWin->activeViewContainer()->statusBar();
 {
     if (job->error()) {
         DolphinStatusBar* statusBar = m_mainWin->activeViewContainer()->statusBar();


@@ -51,4 +51,4 @@ void DolphinNewMenu::slotResult(KJob* job)
     }
 }
 
     }
 }
 

-#include "dolphinnewmenu.moc"
+#include "dolphinnewfilemenu.moc"

diff --git a/src/dolphinnewmenu.h b/src/dolphinnewfilemenu.h
similarity index 89%
rename from src/dolphinnewmenu.h
rename to src/dolphinnewfilemenu.h
index 176c8464838855162066411d2b04a9d7badc039d..dae97d667480e0ec35249729fa574b82b800f365 100644 (file)
--- a/src/dolphinnewmenu.h
+++ b/src/dolphinnewfilemenu.h
@@ -18,10 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#ifndef DOLPHINNEWMENU_H
-#define DOLPHINNEWMENU_H
+#ifndef DOLPHINNEWFILEMENU_H
+#define DOLPHINNEWFILEMENU_H

 
 

-#include <knewmenu.h>
+#include <knewfilemenu.h>

 
 class DolphinMainWindow;
 class KJob;
 
 class DolphinMainWindow;
 class KJob;


@@ -34,13 +34,13 @@ class KJob;
  * All errors are shown in the status bar of Dolphin
  * instead as modal error dialog with an OK button.
  */
  * All errors are shown in the status bar of Dolphin
  * instead as modal error dialog with an OK button.
  */

-class DolphinNewMenu : public KNewFileMenu
+class DolphinNewFileMenu : public KNewFileMenu

 {
     Q_OBJECT
 
 public:
 {
     Q_OBJECT
 
 public:

-    DolphinNewMenu(QWidget* parent, DolphinMainWindow* mainWin);
-    virtual ~DolphinNewMenu();
+    DolphinNewFileMenu(QWidget* parent, DolphinMainWindow* mainWin);
+    virtual ~DolphinNewFileMenu();

 
 protected slots:
     /** @see KNewFileMenu::slotResult() */
 
 protected slots:
     /** @see KNewFileMenu::slotResult() */

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index a8254552ee89245ecb35b57200c27752c4c90c8b..3309f4b38dc339b7d3ac567358576fb29b71e26e 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -45,7 +45,7 @@
 #include "views/dolphinviewactionhandler.h"
 #include "views/dolphinsortfilterproxymodel.h"
 #include "views/dolphinmodel.h"
 #include "views/dolphinviewactionhandler.h"
 #include "views/dolphinsortfilterproxymodel.h"
 #include "views/dolphinmodel.h"

-#include "views/dolphinnewmenuobserver.h"
+#include "views/dolphinnewfilemenuobserver.h"

 #include "views/dolphinremoteencoding.h"
 
 #include <QActionGroup>
 #include "views/dolphinremoteencoding.h"
 
 #include <QActionGroup>


@@ -146,7 +146,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
 DolphinPart::~DolphinPart()
 {
     DolphinSettings::instance().save();
 DolphinPart::~DolphinPart()
 {
     DolphinSettings::instance().save();

-    DolphinNewMenuObserver::instance().detach(m_newMenu);
+    DolphinNewFileMenuObserver::instance().detach(m_newFileMenu);

     delete m_dirLister;
 }
 
     delete m_dirLister;
 }
 


@@ -154,10 +154,10 @@ void DolphinPart::createActions()
 {
     // Edit menu
 
 {
     // Edit menu
 

-    m_newMenu = new KNewFileMenu(actionCollection(), "new_menu", this);
-    m_newMenu->setParentWidget(widget());
-    DolphinNewMenuObserver::instance().attach(m_newMenu);
-    connect(m_newMenu->menu(), SIGNAL(aboutToShow()),
+    m_newFileMenu = new KNewFileMenu(actionCollection(), "new_menu", this);
+    m_newFileMenu->setParentWidget(widget());
+    DolphinNewFileMenuObserver::instance().attach(m_newFileMenu);
+    connect(m_newFileMenu->menu(), SIGNAL(aboutToShow()),

             this, SLOT(updateNewMenu()));
 
     KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );
             this, SLOT(updateNewMenu()));
 
     KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );


@@ -600,10 +600,10 @@ void DolphinPart::slotOpenTerminal()
 void DolphinPart::updateNewMenu()
 {
     // As requested by KNewFileMenu :
 void DolphinPart::updateNewMenu()
 {
     // As requested by KNewFileMenu :

-    m_newMenu->checkUpToDate();
-    m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles());
+    m_newFileMenu->checkUpToDate();
+    m_newFileMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles());

     // And set the files that the menu apply on :
     // And set the files that the menu apply on :

-    m_newMenu->setPopupFiles(url());
+    m_newFileMenu->setPopupFiles(url());

 }
 
 void DolphinPart::updateStatusBar()
 }
 
 void DolphinPart::updateStatusBar()


@@ -618,9 +618,9 @@ void DolphinPart::updateProgress(int percent)
 
 void DolphinPart::createDirectory()
 {
 
 void DolphinPart::createDirectory()
 {

-    m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles());
-    m_newMenu->setPopupFiles(url());
-    m_newMenu->createDirectory();
+    m_newFileMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles());
+    m_newFileMenu->setPopupFiles(url());
+    m_newFileMenu->createDirectory();

 }
 
 void DolphinPart::setFilesToSelect(const KUrl::List& files)
 }
 
 void DolphinPart::setFilesToSelect(const KUrl::List& files)

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 5629b9c2dfcbcea306b5ca1486f26e4a36a56028..dd5fe1e371cf4850af5fd73be09c577257da60a7 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -236,7 +236,7 @@ private:
     DolphinModel* m_dolphinModel;
     DolphinSortFilterProxyModel* m_proxyModel;
     DolphinPartBrowserExtension* m_extension;
     DolphinModel* m_dolphinModel;
     DolphinSortFilterProxyModel* m_proxyModel;
     DolphinPartBrowserExtension* m_extension;

-    KNewFileMenu* m_newMenu;
+    KNewFileMenu* m_newFileMenu;

     QString m_nameFilter;
     Q_DISABLE_COPY(DolphinPart)
 };
     QString m_nameFilter;
     Q_DISABLE_COPY(DolphinPart)
 };

diff --git a/src/views/dolphinnewmenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
similarity index 75%
rename from src/views/dolphinnewmenuobserver.cpp
rename to src/views/dolphinnewfilemenuobserver.cpp
index def510c5394410b4f6f7b846c1613821adec43a8..50a755b9a6a42e67cb803a7c5dd2ed71c732442b 100644 (file)
--- a/src/views/dolphinnewmenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -17,24 +17,24 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#include "dolphinnewmenuobserver.h"
+#include "dolphinnewfilemenuobserver.h"

 
 #include <kglobal.h>
 #include <knewmenu.h>
 
 
 #include <kglobal.h>
 #include <knewmenu.h>
 

-class DolphinNewMenuObserverSingleton
+class DolphinNewFileMenuObserverSingleton

 {
 public:
 {
 public:

-    DolphinNewMenuObserver instance;
+    DolphinNewFileMenuObserver instance;

 };
 };

-K_GLOBAL_STATIC(DolphinNewMenuObserverSingleton, s_dolphinNewMenuObserver)
+K_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver)

 
 

-DolphinNewMenuObserver& DolphinNewMenuObserver::instance()
+DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance()

 {
 {

-    return s_dolphinNewMenuObserver->instance;
+    return s_DolphinNewFileMenuObserver->instance;

 }
 
 }
 

-void DolphinNewMenuObserver::attach(const KNewFileMenu* menu)
+void DolphinNewFileMenuObserver::attach(const KNewFileMenu* menu)

 {
     connect(menu, SIGNAL(fileCreated(const KUrl&)),
             this, SIGNAL(itemCreated(const KUrl&)));
 {
     connect(menu, SIGNAL(fileCreated(const KUrl&)),
             this, SIGNAL(itemCreated(const KUrl&)));


@@ -42,7 +42,7 @@ void DolphinNewMenuObserver::attach(const KNewFileMenu* menu)
             this, SIGNAL(itemCreated(const KUrl&)));
 }
 
             this, SIGNAL(itemCreated(const KUrl&)));
 }
 

-void DolphinNewMenuObserver::detach(const KNewFileMenu* menu)
+void DolphinNewFileMenuObserver::detach(const KNewFileMenu* menu)

 {
     disconnect(menu, SIGNAL(fileCreated(const KUrl&)),
                this, SIGNAL(itemCreated(const KUrl&)));
 {
     disconnect(menu, SIGNAL(fileCreated(const KUrl&)),
                this, SIGNAL(itemCreated(const KUrl&)));


@@ -50,13 +50,13 @@ void DolphinNewMenuObserver::detach(const KNewFileMenu* menu)
                this, SIGNAL(itemCreated(const KUrl&)));
 }
 
                this, SIGNAL(itemCreated(const KUrl&)));
 }
 

-DolphinNewMenuObserver::DolphinNewMenuObserver() :
+DolphinNewFileMenuObserver::DolphinNewFileMenuObserver() :

     QObject(0)
 {
 }
 
     QObject(0)
 {
 }
 

-DolphinNewMenuObserver::~DolphinNewMenuObserver()
+DolphinNewFileMenuObserver::~DolphinNewFileMenuObserver()

 {
 }
 
 {
 }
 

-#include "dolphinnewmenuobserver.moc"
+#include "dolphinnewfilemenuobserver.moc"

diff --git a/src/views/dolphinnewmenuobserver.h b/src/views/dolphinnewfilemenuobserver.h
similarity index 80%
rename from src/views/dolphinnewmenuobserver.h
rename to src/views/dolphinnewfilemenuobserver.h
index dc9010a43c4504fa2d6e2e909b6ea578ae281060..35fda11db625328386a82e3a577501de4d92484c 100644 (file)
--- a/src/views/dolphinnewmenuobserver.h
+++ b/src/views/dolphinnewfilemenuobserver.h
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#ifndef DOLPHINNEWMENUOBSERVER_H
-#define DOLPHINNEWMENUOBSERVER_H
+#ifndef DOLPHINNEWFILEMENUOBSERVER_H
+#define DOLPHINNEWFILEMENUOBSERVER_H

 
 #include <QObject>
 
 
 #include <QObject>
 


@@ -29,17 +29,17 @@ class KUrl;
 
 /**
  * @brief Allows to observe new file items that have been created
 
 /**
  * @brief Allows to observe new file items that have been created

- *        by a DolphinNewMenu instance.
+ *        by a DolphinNewFileMenu instance.

  *
  *

- * As soon as a DolphinNewMenu instance created a new item,
+ * As soon as a DolphinNewFileMenu instance created a new item,

  * the observer will emit the signal itemCreated().
  */
  * the observer will emit the signal itemCreated().
  */

-class LIBDOLPHINPRIVATE_EXPORT DolphinNewMenuObserver : public QObject
+class LIBDOLPHINPRIVATE_EXPORT DolphinNewFileMenuObserver : public QObject

 {
     Q_OBJECT
 
 public:
 {
     Q_OBJECT
 
 public:

-    static DolphinNewMenuObserver& instance();
+    static DolphinNewFileMenuObserver& instance();

     void attach(const KNewFileMenu* menu);
     void detach(const KNewFileMenu* menu);
 
     void attach(const KNewFileMenu* menu);
     void detach(const KNewFileMenu* menu);
 


@@ -47,10 +47,10 @@ signals:
     void itemCreated(const KUrl& url);
 
 private:
     void itemCreated(const KUrl& url);
 
 private:

-    DolphinNewMenuObserver();
-    virtual ~DolphinNewMenuObserver();
+    DolphinNewFileMenuObserver();
+    virtual ~DolphinNewFileMenuObserver();

 
 

-    friend class DolphinNewMenuObserverSingleton;
+    friend class DolphinNewFileMenuObserverSingleton;

 };
 
 #endif
 };
 
 #endif

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 9d42aad0cca61f89d5720805a01d73a295ba1abe..00751bf771168e0cd8332d761649b41838b5c3b5 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -55,7 +55,7 @@
 #include "dolphinviewcontroller.h"
 #include "dolphindetailsview.h"
 #include "dolphinfileitemdelegate.h"
 #include "dolphinviewcontroller.h"
 #include "dolphindetailsview.h"
 #include "dolphinfileitemdelegate.h"

-#include "dolphinnewmenuobserver.h"
+#include "dolphinnewfilemenuobserver.h"

 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphiniconsview.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphiniconsview.h"


@@ -149,7 +149,7 @@ DolphinView::DolphinView(QWidget* parent,
     // When a new item has been created by the "Create New..." menu, the item should
     // get selected and it must be assured that the item will get visible. As the
     // creation is done asynchronously, several signals must be checked:
     // When a new item has been created by the "Create New..." menu, the item should
     // get selected and it must be assured that the item will get visible. As the
     // creation is done asynchronously, several signals must be checked:

-    connect(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
+    connect(&DolphinNewFileMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),

             this, SLOT(observeCreatedItem(const KUrl&)));
 
     m_selectionChangedTimer = new QTimer(this);
             this, SLOT(observeCreatedItem(const KUrl&)));
 
     m_selectionChangedTimer = new QTimer(this);