Mercurial > octave-nkf

changeset 16507:8cb12cf9ca32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gui: add icons to the context menu of the the file browser * files-dock-widget.cc(contextmenu_requested): add icons to some menu actions, show all menu entries but disable entries that are not applicable * icons/editdelete.png, icons/folder_new.png: new files * libgui/src/module.mk,resource.qrc: added icons editdelete.png, folder_new.png
author Torsten <ttl@justmail.de>
date Fri, 12 Apr 2013 22:40:20 +0200
parents 8a4960f2c7c3
children f19e24c97b20
files libgui/src/files-dock-widget.cc libgui/src/icons/editdelete.png libgui/src/icons/folder_new.png libgui/src/module.mk libgui/src/resource.qrc
diffstat 5 files changed, 29 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/files-dock-widget.cc	Fri Apr 12 22:20:39 2013 +0200
+++ b/libgui/src/files-dock-widget.cc	Fri Apr 12 22:40:20 2013 +0200
@@ -285,19 +285,30 @@
     { 
       QFileInfo info = _file_system_model->fileInfo(index);
 
-      menu.addAction(tr("Open"), this, SLOT(contextmenu_open(bool)));
-      menu.addAction(QIcon(":/actions/icons/artsbuilderexecute.png"), tr("Run"), this, SLOT(contextmenu_run(bool)));
-      menu.addAction(tr("Load Data"), this, SLOT(contextmenu_load(bool)));
+      menu.addAction(QIcon(":/actions/icons/fileopen.png"), tr("Open"),
+                     this, SLOT(contextmenu_open(bool)));
+      QAction *run_action = menu.addAction(
+                     QIcon(":/actions/icons/artsbuilderexecute.png"), tr("Run"),
+                     this, SLOT(contextmenu_run(bool)));
+      run_action->setEnabled (info.isFile () && info.suffix () == "m");
+      QAction *load_action = menu.addAction(tr("Load Data"),
+                     this, SLOT(contextmenu_load(bool)));
+      load_action->setEnabled (info.isFile ());
+
       menu.addSeparator();
       menu.addAction(tr("Rename"), this, SLOT(contextmenu_rename(bool)));
-      menu.addAction(tr("Delete"), this, SLOT(contextmenu_delete(bool)));
+      menu.addAction(QIcon(":/actions/icons/editdelete.png"), tr("Delete"),
+                     this, SLOT(contextmenu_delete(bool)));
 
-      if(info.isDir())
-        {
-          menu.addSeparator();
-          menu.addAction(tr("New File"), this, SLOT(contextmenu_newfile(bool)));
-          menu.addAction(tr("New Directory"), this, SLOT(contextmenu_newdir(bool)));
-        }
+      menu.addSeparator();
+      QAction *new_file_action = menu.addAction(
+                   QIcon(":/actions/icons/filenew.png"),
+                   tr("New File"), this, SLOT(contextmenu_newfile(bool)));
+      new_file_action->setEnabled (info.isDir());
+      QAction *new_dir_action  = menu.addAction(
+                   QIcon(":/actions/icons/folder_new.png"),
+                   tr("New Directory"), this, SLOT(contextmenu_newdir(bool)));
+      new_dir_action->setEnabled (info.isDir());
 
       menu.exec(_file_tree_view->mapToGlobal(mpos));
 
@@ -345,14 +356,11 @@
 
       QFileInfo info = _file_system_model->fileInfo(index);
 
-      if (info.isFile() && info.suffix () == "m")
-        {
-          QString function_name = info.fileName ();
-          // We have to cut off the suffix, because octave appends it.
-          function_name.chop (info.suffix ().length () + 1);
-          emit run_file_signal (QString ("cd \'%1\'\n%2\n")
+      QString function_name = info.fileName ();
+      // We have to cut off the suffix, because octave appends it.
+      function_name.chop (info.suffix ().length () + 1);
+      emit run_file_signal (QString ("cd \'%1\'\n%2\n")
                             .arg(info.absolutePath ()).arg (function_name));
-        }
     }
 }
 
Binary file libgui/src/icons/editdelete.png has changed
Binary file libgui/src/icons/folder_new.png has changed
--- a/libgui/src/module.mk	Fri Apr 12 22:20:39 2013 +0200
+++ b/libgui/src/module.mk	Fri Apr 12 22:40:20 2013 +0200
@@ -21,6 +21,7 @@
   src/icons/db_stop.png \
   src/icons/editcopy.png \
   src/icons/editcut.png \
+  src/icons/editdelete.png \
   src/icons/editpaste.png \
   src/icons/filenew.png \
   src/icons/fileopen.png \
@@ -28,6 +29,7 @@
   src/icons/filesaveas.png \
   src/icons/filesave.png \
   src/icons/find.png \
+  src/icons/folder_new.png \
   src/icons/graphic_logo_DocumentationDockWidget.png \
   src/icons/graphic_logo_FileEditor.png \
   src/icons/graphic_logo_FilesDockWidget.png \
--- a/libgui/src/resource.qrc	Fri Apr 12 22:20:39 2013 +0200
+++ b/libgui/src/resource.qrc	Fri Apr 12 22:40:20 2013 +0200
@@ -3,11 +3,13 @@
         <file>icons/artsbuilderexecute.png</file>
         <file>icons/editcopy.png</file>
         <file>icons/editcut.png</file>
+        <file>icons/editdelete.png</file>
         <file>icons/editpaste.png</file>
         <file>icons/filenew.png</file>
         <file>icons/fileopen.png</file>
         <file>icons/filesave.png</file>
         <file>icons/fileprint.png</file>
+        <file>icons/folder_new.png</file>
         <file>icons/ok.png</file>
         <file>icons/redo.png</file>
         <file>icons/reload.png</file>