# HG changeset patch # User Torsten # Date 1389526899 -3600 # Node ID 09ef57c61b3b9665749dded8b75f3876f80b8739 # Parent cae24b7cfaf4ffb8d4122c416a6ae481e8edc51b update some icnons of the gui * files-dock-widget.cc (constructor): new icons for new folder selection and for searching in/for files * file-editor.cc (construct): new icons for file open and find actions * find-dialog.cc (constructor): new widget icons * main-window.cc (construct_file_menu): new icons for file open action; (construct_toolbar): new icon for selecting new octave directory * libgui/src/module.mk, resource.qrc: removed icons: chat.png, help_index.png, jabber_protocol.png, question.png, star.png, stop.png, terminal.png new icons: findf.png, folder_documents.png, folder.png * icon_files: update list of icons used from the Crystal Project, update link to its license, add a list of icons created by the octave developpers * chat.png, help_index.png, jabber_protocol.png, question.png, star.png, stop.png, terminal.png: removed icon files * findf.png, folder_documents.png, folder.png: new icon files diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/files-dock-widget.cc --- a/libgui/src/files-dock-widget.cc Sat Jan 11 22:29:52 2014 +0100 +++ b/libgui/src/files-dock-widget.cc Sun Jan 12 12:41:39 2014 +0100 @@ -126,10 +126,11 @@ _navigation_tool_bar)); popdown_menu->addSeparator (); - popdown_menu->addAction (tr ("Search Directory..."), + popdown_menu->addAction (QIcon (":/actions/icons/folder.png"), + tr ("Search Directory..."), this, SLOT (popdownmenu_search_dir (bool))); popdown_menu->addSeparator (); - popdown_menu->addAction (QIcon (":/actions/icons/search.png"), + popdown_menu->addAction (QIcon (":/actions/icons/findf.png"), tr ("Find Files..."), this, SLOT (popdownmenu_findfiles (bool))); popdown_menu->addSeparator (); diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/chat.png Binary file libgui/src/icons/chat.png has changed diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/findf.png Binary file libgui/src/icons/findf.png has changed diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/folder.png Binary file libgui/src/icons/folder.png has changed diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/folder_documents.png Binary file libgui/src/icons/folder_documents.png has changed diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/folder_new.png diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/gear.png Binary file libgui/src/icons/gear.png has changed diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/help_index.png Binary file libgui/src/icons/help_index.png has changed diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/icons_license --- a/libgui/src/icons/icons_license Sat Jan 11 22:29:52 2014 +0100 +++ b/libgui/src/icons/icons_license Sun Jan 12 12:41:39 2014 +0100 @@ -1,7 +1,83 @@ -Icons license for: chat.png help_index.png terminal.png -jabber_protocol.png +======================================== +Icons created by the Octave developpers: +======================================== + +bp_next.png +bp_prev.png +bp_rm_all.png +bp_toggle.png +db_cont.png +db_step_in.png +db_step_out.png +db_step.png +db_stop.png +graphic_logo_DocumentationDockWidget.png +graphic_logo_FileEditor.png +graphic_logo_FilesDockWidget.png +graphic_logo_HistoryDockWidget.png +graphic_logo_NewsDockWidget.png +graphic_logo_ReleaseWidget.png +graphic_logo_TerminalDockWidget.png +graphic_logo_WorkspaceView.png +letter_logo_DocumentationDockWidget.png +letter_logo_FileEditor.png +letter_logo_FilesDockWidget.png +letter_logo_HistoryDockWidget.png +letter_logo_NewsDockWidget.png +letter_logo_ReleaseWidget.png +letter_logo_TerminalDockWidget.png +letter_logo_WorkspaceView.png +logo.png +widget-close.png +widget-dock.png +widget-undock.png +zoom-in.png +zoom-out.png + +======================================== +Icons taken from the Crystal Project: +======================================== -by http://www.everaldo.com/ on 17.07.2011: +artsbuilderexecute.png +configure.png +editcopy.png +editcut.png +editdelete.png +editpaste.png +fileclose.png +filenew.png +fileopen.png +fileprint.png +filesaveas.png +filesave.png +findf.png +find.png +folder_documents.png +folder_new.png +folder.png +gear.png +home.png +ok.png +redled.png +redo.png +reload.png +search.png +undo.png +up.png + derived icons from up.png: + arrow_down.png + arrow_left.png + arrow_right.png + arrow_up.png + bookmark.png +warning.png + + +License of the Crystal Project +======================================== + +by http://www.everaldo.com/ on 17.07.2011 (not more available) +by http://www.softicons.com/free-icons/system-icons/crystal-project-icons-by-everaldo-coelho on 12.01.2014 The Crystal Project are released under LGPL. GNU General Public License. diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/jabber_protocol.png Binary file libgui/src/icons/jabber_protocol.png has changed diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/question.png Binary file libgui/src/icons/question.png has changed diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/star.png Binary file libgui/src/icons/star.png has changed diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/stop.png Binary file libgui/src/icons/stop.png has changed diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/icons/terminal.png Binary file libgui/src/icons/terminal.png has changed diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/m-editor/file-editor.cc --- a/libgui/src/m-editor/file-editor.cc Sat Jan 11 22:29:52 2014 +0100 +++ b/libgui/src/m-editor/file-editor.cc Sun Jan 12 12:41:39 2014 +0100 @@ -875,7 +875,7 @@ QAction *new_action = new QAction (QIcon (":/actions/icons/filenew.png"), tr ("&New File"), _tool_bar); - QAction *open_action = new QAction (QIcon (":/actions/icons/fileopen.png"), + QAction *open_action = new QAction (QIcon (":/actions/icons/folder_documents.png"), tr ("&Open File..."), _tool_bar); _save_action = new QAction (QIcon (":/actions/icons/filesave.png"), @@ -933,7 +933,7 @@ _uncomment_selection_action = new QAction (tr ("&Uncomment"), _tool_bar); - _find_action = new QAction (QIcon (":/actions/icons/search.png"), + _find_action = new QAction (QIcon (":/actions/icons/find.png"), tr ("&Find and Replace..."), _tool_bar); _run_action = new QAction (QIcon (":/actions/icons/artsbuilderexecute.png"), diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/m-editor/find-dialog.cc --- a/libgui/src/m-editor/find-dialog.cc Sat Jan 11 22:29:52 2014 +0100 +++ b/libgui/src/m-editor/find-dialog.cc Sun Jan 12 12:41:39 2014 +0100 @@ -72,7 +72,7 @@ : QDialog (p) { setWindowTitle ("Find and Replace"); - setWindowIcon (QIcon(":/actions/icons/search.png")); + setWindowIcon (QIcon(":/actions/icons/find.png")); _search_label = new QLabel (tr ("Find &what:")); _search_line_edit = new QLineEdit; diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/main-window.cc --- a/libgui/src/main-window.cc Sat Jan 11 22:29:52 2014 +0100 +++ b/libgui/src/main-window.cc Sun Jan 12 12:41:39 2014 +0100 @@ -1353,7 +1353,7 @@ construct_new_menu (file_menu); _open_action - = file_menu->addAction (QIcon (":/actions/icons/fileopen.png"), + = file_menu->addAction (QIcon (":/actions/icons/folder_documents.png"), tr ("Open...")); _open_action->setShortcutContext (Qt::ApplicationShortcut); @@ -1973,7 +1973,7 @@ QIcon (":/actions/icons/up.png"), tr ("One directory up")); QAction *current_dir_search = _main_tool_bar->addAction ( - QIcon (":/actions/icons/search.png"), + QIcon (":/actions/icons/folder.png"), tr ("Browse directories")); connect (_current_directory_combo_box, SIGNAL (activated (QString)), diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/module.mk --- a/libgui/src/module.mk Sat Jan 11 22:29:52 2014 +0100 +++ b/libgui/src/module.mk Sun Jan 12 12:41:39 2014 +0100 @@ -15,7 +15,6 @@ src/icons/bp_prev.png \ src/icons/bp_rm_all.png \ src/icons/bp_toggle.png \ - src/icons/chat.png \ src/icons/configure.png \ src/icons/db_cont.png \ src/icons/db_step_in.png \ @@ -33,8 +32,11 @@ src/icons/filesaveas.png \ src/icons/filesave.png \ src/icons/find.png \ + src/icons/findf.png \ src/icons/gear.png \ + src/icons/folder_documents.png \ src/icons/folder_new.png \ + src/icons/folder.png \ src/icons/graphic_logo_DocumentationDockWidget.png \ src/icons/graphic_logo_FileEditor.png \ src/icons/graphic_logo_FilesDockWidget.png \ @@ -43,10 +45,8 @@ src/icons/graphic_logo_TerminalDockWidget.png \ src/icons/graphic_logo_WorkspaceView.png \ src/icons/graphic_logo_ReleaseWidget.png \ - src/icons/help_index.png \ src/icons/home.png \ src/icons/icons_license \ - src/icons/jabber_protocol.png \ src/icons/letter_logo_DocumentationDockWidget.png \ src/icons/letter_logo_FileEditor.png \ src/icons/letter_logo_FilesDockWidget.png \ @@ -57,14 +57,10 @@ src/icons/letter_logo_ReleaseWidget.png \ src/icons/logo.png \ src/icons/ok.png \ - src/icons/question.png \ src/icons/redled.png \ src/icons/redo.png \ src/icons/reload.png \ src/icons/search.png \ - src/icons/star.png \ - src/icons/stop.png \ - src/icons/terminal.png \ src/icons/undo.png \ src/icons/up.png \ src/icons/warning.png \ diff -r cae24b7cfaf4 -r 09ef57c61b3b libgui/src/resource.qrc --- a/libgui/src/resource.qrc Sat Jan 11 22:29:52 2014 +0100 +++ b/libgui/src/resource.qrc Sun Jan 12 12:41:39 2014 +0100 @@ -10,6 +10,8 @@ icons/fileopen.png icons/filesave.png icons/fileprint.png + icons/folder.png + icons/folder_documents.png icons/folder_new.png icons/home.png icons/ok.png @@ -26,18 +28,12 @@ icons/arrow_up.png icons/arrow_down.png icons/bookmark.png - icons/question.png - icons/star.png - icons/stop.png icons/zoom-in.png icons/zoom-out.png icons/find.png + icons/findf.png icons/gear.png - icons/chat.png - icons/help_index.png - icons/jabber_protocol.png icons/logo.png - icons/terminal.png icons/bp_toggle.png icons/bp_rm_all.png icons/bp_prev.png