[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdevplatform/plugins/projectmanagerview
From:       Aleix Pol Gonzalez <aleixpol () gmail ! com>
Date:       2009-10-28 21:47:27
Message-ID: 1256766447.349408.30515.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1041962 by apol:

Merge the rename actions.


 M  +16 -26    projectmanagerviewplugin.cpp  
 M  +1 -2      projectmanagerviewplugin.h  


--- trunk/KDE/kdevplatform/plugins/projectmanagerview/projectmanagerviewplugin.cpp \
#1041961:1041962 @@ -225,6 +225,7 @@
     bool fileItemsAdded = false;
     bool folderWithParentAdded = false;
     bool targetAdded = false;
+    bool renameAdded = false;
     foreach( ProjectBaseItem* item, items )
     {
         d->ctxProjectItemList << item;
@@ -284,11 +285,6 @@
             action->setIcon(KIcon("user-trash"));
             connect( action, SIGNAL(triggered()), this, \
SLOT(removeFolderFromContextMenu()) );  menuExt.addAction( \
                ContextMenuExtension::FileGroup, action );
-            
-            action = new KAction( i18n( "Rename Folder" ), this );
-            action->setIcon(KIcon("edit-rename"));
-            connect( action, SIGNAL(triggered()), this, \
                SLOT(renameFolderFromContextMenu()) );
-            menuExt.addAction( ContextMenuExtension::FileGroup, action );
         }
         
         if ( !fileItemsAdded && item->file() )
@@ -298,11 +294,6 @@
             action->setIcon(KIcon("user-trash"));
             connect( action, SIGNAL(triggered()), this, \
SLOT(removeFileFromContextMenu()) );  menuExt.addAction( \
                ContextMenuExtension::FileGroup, action );
-            
-            action = new KAction( i18n( "Rename File" ), this );
-            action->setIcon(KIcon("edit-rename"));
-            connect( action, SIGNAL(triggered()), this, \
                SLOT(renameFileFromContextMenu()) );
-            menuExt.addAction( ContextMenuExtension::FileGroup, action );
         }
         else if ( !targetAdded && item->target() )
         {
@@ -313,6 +304,15 @@
             menuExt.addAction( ContextMenuExtension::FileGroup, action );
         }
         
+        if( !renameAdded && (item->file() || item->folder()) )
+        {
+            renameAdded = true;
+            KAction* action = new KAction( i18n( "Rename" ), this );
+            action->setIcon(KIcon("edit-rename"));
+            connect( action, SIGNAL(triggered()), this, \
SLOT(renameItemFromContextMenu()) ); +            menuExt.addAction( \
ContextMenuExtension::FileGroup, action ); +        }
+        
         //TODO: Port to launch framework
 //         if(!hasTargets && item->executable())
 //         {
@@ -532,14 +532,16 @@
     }
 }
 
-void ProjectManagerViewPlugin::renameFileFromContextMenu()
+void ProjectManagerViewPlugin::renameItemFromContextMenu()
 {
+    QWidget* window=ICore::self()->uiController()->activeMainWindow()->window();
+    
     foreach( KDevelop::ProjectBaseItem* item, d->ctxProjectItemList )
     {
         KDevelop::ProjectFileItem* file=item->file();
+        KDevelop::ProjectFolderItem* folder=item->folder();
+        
         if(file) {
-            QWidget* \
                window(ICore::self()->uiController()->activeMainWindow()->window());
-            
             //Change QInputDialog->KFileSaveDialog?
             QString name = QInputDialog::getText( window, i18n("Rename File"), \
i18n("New name for '%1'", item->text()) );  if (!name.isEmpty()) {
@@ -553,19 +555,7 @@
                 }
                 item->project()->projectFileManager()->renameFile(file, url);
             }
-            
-        }
-    }
-}
-
-void ProjectManagerViewPlugin::renameFolderFromContextMenu()
-{
-    foreach( KDevelop::ProjectBaseItem* item, d->ctxProjectItemList )
-    {
-        KDevelop::ProjectFolderItem* folder=item->folder();
-        if(folder) {
-            QWidget* \
                window(ICore::self()->uiController()->activeMainWindow()->window());
-            
+        } else if(folder) {
             //Change QInputDialog->KFileSaveDialog?
             QString name = QInputDialog::getText( window, i18n("Rename Folder"), \
i18n("New name for '%1'", item->text()) );  if (!name.isEmpty()) {
--- trunk/KDE/kdevplatform/plugins/projectmanagerview/projectmanagerviewplugin.h \
#1041961:1041962 @@ -81,9 +81,8 @@
     void createFileFromContextMenu();
     void createFileInTargetFromContextMenu();
     void removeFolderFromContextMenu();
-    void renameFolderFromContextMenu();
+    void renameItemFromContextMenu();
     void removeFileFromContextMenu();
-    void renameFileFromContextMenu();
     void updateActionState( KDevelop::Context* ctx );
     void updateFromBuildSetChange();
     void projectToBeOpened();


[prev in list] [next in list] [prev in thread] [next in thread]