Mercurial > octave-nkf

changeset 14727:f34984656658 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added crystal project icons. * artsbuilderexecute.png: Added. * configure.png: Added. * editcopy.png: Added. * editcut.png: Added. * editpaste.png: Added. * filenew.png: Added. * fileopen.png: Added. * filesave.png: Added. * filesaveas.png: Added. * redo.png: Added. * search.png: Added. * undo.png: Added. * up.png: Added. * resource.qrc: New resource file that compiles into the executable. * file-editor.cc: Retrieving new icons from resource file. * main-window.cc: Retrieving new icons from resource file. * src.pro: Added resource file to project.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Tue, 05 Jun 2012 16:17:59 +0200
parents e94a54ee0f46
children ddd9c2a91de5
files gui/src/icons/artsbuilderexecute.png gui/src/icons/configure.png gui/src/icons/editcopy.png gui/src/icons/editcut.png gui/src/icons/editpaste.png gui/src/icons/filenew.png gui/src/icons/fileopen.png gui/src/icons/filesave.png gui/src/icons/filesaveas.png gui/src/icons/redo.png gui/src/icons/search.png gui/src/icons/undo.png gui/src/icons/up.png gui/src/m-editor/file-editor.cc gui/src/main-window.cc gui/src/octave-adapter/octave-link.cc gui/src/resource.qrc gui/src/src.pro
diffstat 18 files changed, 42 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
Binary file gui/src/icons/artsbuilderexecute.png has changed
Binary file gui/src/icons/configure.png has changed
Binary file gui/src/icons/editcopy.png has changed
Binary file gui/src/icons/editcut.png has changed
Binary file gui/src/icons/editpaste.png has changed
Binary file gui/src/icons/filenew.png has changed
Binary file gui/src/icons/fileopen.png has changed
Binary file gui/src/icons/filesave.png has changed
Binary file gui/src/icons/filesaveas.png has changed
Binary file gui/src/icons/redo.png has changed
Binary file gui/src/icons/search.png has changed
Binary file gui/src/icons/undo.png has changed
Binary file gui/src/icons/up.png has changed
--- a/gui/src/m-editor/file-editor.cc	Tue Jun 05 14:41:22 2012 +0200
+++ b/gui/src/m-editor/file-editor.cc	Tue Jun 05 16:17:59 2012 +0200
@@ -284,34 +284,30 @@
   _tab_widget->setTabsClosable (true);
 
   // Theme icons with QStyle icons as fallback
-  QAction *new_action = new QAction (
-        QIcon::fromTheme("document-new",style->standardIcon (QStyle::SP_FileIcon)),
+  QAction *new_action = new QAction (QIcon(":/actions/icons/filenew.png"),
         tr("&New File"), _tool_bar);
 
-  QAction *open_action = new QAction (
-        QIcon::fromTheme("document-open",style->standardIcon (QStyle::SP_DirOpenIcon)),
+  QAction *open_action = new QAction (QIcon(":/actions/icons/fileopen.png"),
         tr("&Open File"), _tool_bar);
 
-  QAction *save_action = new QAction (
-        QIcon::fromTheme("document-save",style->standardIcon (QStyle::SP_DriveHDIcon)),
+  QAction *save_action = new QAction (QIcon(":/actions/icons/filesave.png"),
         tr("&Save File"), _tool_bar);
 
-  QAction *save_as_action = new QAction (
-        QIcon::fromTheme("document-save-as",style->standardIcon (QStyle::SP_DriveFDIcon)),
+  QAction *save_as_action = new QAction (QIcon(":/actions/icons/filesaveas.png"),
         tr("Save File &As"), _tool_bar);
 
-  QAction *undo_action = new QAction (
-        QIcon::fromTheme("edit-undo",style->standardIcon (QStyle::SP_ArrowLeft)),
+  QAction *undo_action = new QAction (QIcon(":/actions/icons/undo.png"),
         tr("&Undo"), _tool_bar);
 
-  QAction *redo_action = new QAction (
-        QIcon::fromTheme("edit-redo",style->standardIcon (QStyle::SP_ArrowRight)),
+  QAction *redo_action = new QAction (QIcon(":/actions/icons/redo.png"),
         tr("&Redo"), _tool_bar);
 
   _copy_action = new QAction (QIcon::fromTheme ("edit-copy"), tr ("&Copy"), _tool_bar);
   _cut_action  = new QAction (QIcon::fromTheme ("edit-cut"), tr ("Cu&t"), _tool_bar);
 
-  QAction *paste_action               = new QAction (QIcon::fromTheme ("edit-paste"), tr ("&Paste"),_tool_bar);
+  QAction *paste_action
+      = new QAction (QIcon (":/actions/icons/editpaste.png"),
+                     tr("Paste"), _tool_bar);
   QAction *next_bookmark_action       = new QAction (tr ("&Next Bookmark"),_tool_bar);
   QAction *previous_bookmark_action   = new QAction (tr ("Pre&vious Bookmark"),_tool_bar);
   QAction *toggle_bookmark_action     = new QAction (tr ("Toggle &Bookmark"),_tool_bar);
@@ -319,8 +315,7 @@
   QAction *comment_selection_action   = new QAction (tr ("&Comment Selected Text"),_tool_bar);
   QAction *uncomment_selection_action = new QAction (tr ("&Uncomment Selected Text"),_tool_bar);
 
-  QAction *run_action = new QAction (
-        QIcon::fromTheme ("media-play", style->standardIcon (QStyle::SP_MediaPlay)),
+  QAction *run_action = new QAction (QIcon(":/actions/icons/artsbuilderexecute.png"),
         tr("&Run File"), _tool_bar);
 
   // some actions are disabled from the beginning
--- a/gui/src/main-window.cc	Tue Jun 05 14:41:22 2012 +0200
+++ b/gui/src/main-window.cc	Tue Jun 05 16:17:59 2012 +0200
@@ -290,10 +290,10 @@
   _current_directory_combo_box->setMaxVisibleItems (14);
 
   _current_directory_tool_button = new QToolButton (this);
-  _current_directory_tool_button->setIcon (style->standardIcon (QStyle::SP_DirOpenIcon));
+  _current_directory_tool_button->setIcon (QIcon(":/actions/icons/search.png"));
 
   _current_directory_up_tool_button = new QToolButton (this);
-  _current_directory_up_tool_button->setIcon (style->standardIcon (QStyle::SP_FileDialogToParent));
+  _current_directory_up_tool_button->setIcon (QIcon(":/actions/icons/up.png"));
 
   // Octave Terminal subwindow.
   _terminal = new QTerminal (this);
@@ -311,41 +311,35 @@
 
   QMenu *file_menu = menuBar ()->addMenu (tr ("&File"));
   QAction *new_file_action
-    = file_menu->addAction (QIcon::fromTheme ("document-new",
-      style->standardIcon (QStyle::SP_FileIcon)), tr ("New File"));
+      = file_menu->addAction (QIcon(":/actions/icons/filenew.png"), tr ("New File"));
 
   QAction *open_file_action
-      = file_menu->addAction (QIcon::fromTheme ("document-open",
-        style->standardIcon (QStyle::SP_FileIcon)), tr ("Open File"));
+      = file_menu->addAction (QIcon(":/actions/icons/fileopen.png"), tr ("Open File"));
 
-  QAction *settings_action = file_menu->addAction (tr ("Settings"));
+  QAction *settings_action
+      = file_menu->addAction (QIcon(":/actions/icons/configure.png"), tr ("Settings"));
   file_menu->addSeparator ();
   QAction *exit_action = file_menu->addAction (tr ("Exit"));
 
   QMenu *edit_menu = menuBar ()->addMenu (tr ("&Edit"));
   QAction *cut_action
-      = edit_menu->addAction (QIcon::fromTheme ("edit-cut",
-        style->standardIcon (QStyle::SP_FileIcon)), tr ("Cut"));
+      = edit_menu->addAction (QIcon(":/actions/icons/editcut.png"), tr ("Cut"));
   cut_action->setShortcut (QKeySequence::Cut);
 
   QAction *copy_action
-      = edit_menu->addAction (QIcon::fromTheme ("edit-copy",
-        style->standardIcon (QStyle::SP_FileIcon)), tr ("Copy"));
+      = edit_menu->addAction (QIcon(":/actions/icons/editcopy.png"), tr ("Copy"));
   copy_action->setShortcut (QKeySequence::Copy);
 
   QAction *paste_action
-      = edit_menu->addAction (QIcon::fromTheme ("edit-paste",
-        style->standardIcon (QStyle::SP_FileIcon)), tr ("Paste"));
+      = edit_menu->addAction (QIcon(":/actions/icons/editpaste.png"), tr ("Paste"));
   paste_action->setShortcut (QKeySequence::Paste);
 
   QAction *undo_action
-      = edit_menu->addAction (QIcon::fromTheme ("edit-undo",
-        style->standardIcon (QStyle::SP_FileIcon)), tr ("Undo"));
+      = edit_menu->addAction (QIcon(":/actions/icons/undo.png"), tr ("Undo"));
   undo_action->setShortcut (QKeySequence::Undo);
 
   QAction *redo_action
-      = edit_menu->addAction (QIcon::fromTheme ("edit-redo",
-        style->standardIcon (QStyle::SP_FileIcon)), tr ("Redo"));
+      = edit_menu->addAction (QIcon(":/actions/icons/redo.png"), tr ("Redo"));
   redo_action->setShortcut (QKeySequence::Redo);
 
   //QMenu *debugMenu = menuBar ()->addMenu (tr ("De&bug"));
@@ -459,8 +453,6 @@
            _terminal,                   SLOT   (copyClipboard ()));
   connect (paste_action,                SIGNAL (triggered()),
            _terminal,                   SLOT   (pasteClipboard ()));
-//  connect (octave_link::instance (),    SIGNAL (working_directory_changed (QString)),
-//           this,                        SLOT (update_current_working_directory (QString)));
   connect (_current_directory_combo_box, SIGNAL (activated (QString)),
            this,                        SLOT (change_current_working_directory (QString)));
 
--- a/gui/src/octave-adapter/octave-link.cc	Tue Jun 05 14:41:22 2012 +0200
+++ b/gui/src/octave-adapter/octave-link.cc	Tue Jun 05 16:17:59 2012 +0200
@@ -37,6 +37,7 @@
 {
   _event_queue_mutex = new octave_mutex ();
   _last_working_directory = "";
+  _debugging_mode_active = false;
 }
 
 octave_link::~octave_link ()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gui/src/resource.qrc	Tue Jun 05 16:17:59 2012 +0200
@@ -0,0 +1,17 @@
+<RCC>
+    <qresource prefix="/actions">
+        <file>icons/artsbuilderexecute.png</file>
+        <file>icons/editcopy.png</file>
+        <file>icons/editcut.png</file>
+        <file>icons/editpaste.png</file>
+        <file>icons/filenew.png</file>
+        <file>icons/fileopen.png</file>
+        <file>icons/filesave.png</file>
+        <file>icons/redo.png</file>
+        <file>icons/search.png</file>
+        <file>icons/undo.png</file>
+        <file>icons/up.png</file>
+        <file>icons/configure.png</file>
+        <file>icons/filesaveas.png</file>
+    </qresource>
+</RCC>
--- a/gui/src/src.pro	Tue Jun 05 14:41:22 2012 +0200
+++ b/gui/src/src.pro	Tue Jun 05 16:17:59 2012 +0200
@@ -116,3 +116,6 @@
 FORMS += \
     settings-dialog.ui \
     welcome-wizard.ui
+
+RESOURCES += \
+    resource.qrc