Mercurial > hg > 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
+++ b/libgui/src/files-dock-widget.cc
@@ -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));
-        }
     }
 }
 
new file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1b2e691c8a564d007b29d5d7af5a04098b4f56a5
GIT binary patch
literal 2552
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
O0000<MNUMnLSTY)1k%C)
new file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cf189f4696a1d30580c10e6850ce6e5d95a71ed0
GIT binary patch
literal 1713
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
Hu0mjfM9NfX
--- a/libgui/src/module.mk
+++ b/libgui/src/module.mk
@@ -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
+++ b/libgui/src/resource.qrc
@@ -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>