# HG changeset patch # User Torsten # Date 1425022919 -3600 # Node ID a8a5415b05cb311253f4844a2c2a7f7212a929f2 # Parent 2eed41ae3b6474644dc5f793d83a215459c0a634 new gui icons * resource-manager.cc (do_icon): new function for getting an icon from or from the fallback icon set if desired * resource-manager.h (icon): new static function icon calling do_icon if instance is ok * QTerminal.h (QTerminal) * files-dock-widget.cc (files_dock_widget,contextmenu_requested) * main-window.cc (construct_file_menu, construct_new_menu, construct_edit_menu, construct_tool_bar, construct_debug_menu_item) * webinfo.cc (webinfo) * file-editor.cc (construct): use icons from theme or icon set, change order of prev/next breakpoint * find-files-dialog.cc (find_files_dialog): new window icon * applications-system.svg, bp-next.svg, bp-prev.svg, bp-rm-all.svg, bp-toggle.svg, db-step-in.svg, db-step-out.svg, db-step.svg, db-stop.svg, document-new.svg, document-open.svg, document-print.svg, document-save-as.svg, document-save.svg, edit-copy.svg, edit-cut.svg, edit-paste.svg, edit-delete.svg, edit-find.svg, edit-find-replace.svg, edit-undo.svg, edit-redo.svg, folder-new.svg, folder.svg, go-first.svg, go-last.svg, go-up.svg, media-playback-start.svg, preferences-system.svg, system-run.svg user-home.svg, view-refresh.svg, zoom-in.svg, zoom-out.svg: added new icon files together with created png files * artsbuilderexecute.png, bp_next.png, bp_prev.png, bp_rm_all.png, bp_toggle.png, db_step_in.png, db_step_out.png, db_step.png, db_stop.png, db_cont.png, configure.png, editcopy.png, editcut.png, editdelete.png, editpaste.png, fileclose.png, filenew.png, fileopen.png, fileprint.png, filesave.png, filesaveas.png, find.png, findf.png, folder.png, folder_documents.png, folder_new.png, gear.png, home.png, ok.png, redo.png, reload.png, search.png, undo.png, zoom-in.png, zoom-out.png: removed old icon files * icons_license: update to new icon set * module.mk * resource.qrc remove png icons and add svg/png icons diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/qterminal/libqterminal/QTerminal.h --- a/libgui/qterminal/libqterminal/QTerminal.h Tue Mar 03 18:25:16 2015 -0600 +++ b/libgui/qterminal/libqterminal/QTerminal.h Fri Feb 27 08:41:59 2015 +0100 @@ -127,11 +127,11 @@ _contextMenu = new QMenu (this); _copy_action = _contextMenu->addAction ( - QIcon (":/actions/icons/editcopy.png"), + QIcon::fromTheme ("edit-copy", QIcon (":/actions/icons/edit-copy.svg")), tr ("Copy"), this, SLOT (copyClipboard ())); _paste_action = _contextMenu->addAction ( - QIcon (":/actions/icons/editpaste.png"), + QIcon::fromTheme ("edit-paste", QIcon (":/actions/icons/edit-paste.svg")), tr ("Paste"), this, SLOT (pasteClipboard ())); _contextMenu->addSeparator (); diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/files-dock-widget.cc --- a/libgui/src/files-dock-widget.cc Tue Mar 03 18:25:16 2015 -0600 +++ b/libgui/src/files-dock-widget.cc Fri Feb 27 08:41:59 2015 +0100 @@ -93,19 +93,19 @@ QSizePolicy sizePol (QSizePolicy::Expanding, QSizePolicy::Preferred); _current_directory->setSizePolicy (sizePol); - QAction *directory_up_action = new QAction (QIcon (":/actions/icons/up.png"), + QAction *directory_up_action = new QAction (resource_manager::icon ("go-up"), "", _navigation_tool_bar); directory_up_action->setToolTip (tr ("Move up one directory")); _sync_browser_directory_action - = new QAction (QIcon (":/actions/icons/reload.png"), + = new QAction (resource_manager::icon ("go-first"), tr ("Show Octave directory"), _navigation_tool_bar); _sync_browser_directory_action->setToolTip ( tr ("Go to current Octave directory")); _sync_browser_directory_action->setEnabled ("false"); _sync_octave_directory_action - = new QAction (QIcon (":/actions/icons/ok.png"), + = new QAction (resource_manager::icon ("go-last"), tr ("Set Octave directory"), _navigation_tool_bar); _sync_octave_directory_action->setToolTip ( tr ("Set Octave directroy to current browser directory")); @@ -114,7 +114,7 @@ QToolButton * popdown_button = new QToolButton (); popdown_button->setToolTip (tr ("Actions on current directory")); QMenu * popdown_menu = new QMenu (); - popdown_menu->addAction (QIcon (":/actions/icons/home.png"), + popdown_menu->addAction (resource_manager::icon ("user-home"), tr ("Show Home Directory"), this, SLOT (popdownmenu_home (bool))); popdown_menu->addAction (_sync_browser_directory_action); @@ -122,22 +122,22 @@ popdown_button->setMenu (popdown_menu); popdown_button->setPopupMode (QToolButton::InstantPopup); popdown_button->setDefaultAction (new QAction ( - QIcon (":/actions/icons/gear.png"), "", - _navigation_tool_bar)); + resource_manager::icon ("applications-system"), "", + _navigation_tool_bar)); popdown_menu->addSeparator (); - popdown_menu->addAction (QIcon (":/actions/icons/folder.png"), + popdown_menu->addAction (resource_manager::icon ("folder"), tr ("Set Browser Directory..."), this, SLOT (popdownmenu_search_dir (bool))); popdown_menu->addSeparator (); - popdown_menu->addAction (QIcon (":/actions/icons/findf.png"), + popdown_menu->addAction (resource_manager::icon ("edit-find"), tr ("Find Files..."), this, SLOT (popdownmenu_findfiles (bool))); popdown_menu->addSeparator (); - popdown_menu->addAction (QIcon (":/actions/icons/filenew.png"), + popdown_menu->addAction (resource_manager::icon ("document-new"), tr ("New File..."), this, SLOT (popdownmenu_newfile (bool))); - popdown_menu->addAction (QIcon (":/actions/icons/folder_new.png"), + popdown_menu->addAction (resource_manager::icon ("folder-new"), tr ("New Directory..."), this, SLOT (popdownmenu_newdir (bool))); @@ -495,7 +495,7 @@ } // construct the context menu depending on item - menu.addAction (QIcon (":/actions/icons/fileopen.png"), tr ("Open"), + menu.addAction (resource_manager::icon ("document-open"), tr ("Open"), this, SLOT (contextmenu_open (bool))); menu.addAction (tr ("Open in Default Application"), @@ -505,7 +505,7 @@ this, SLOT (contextmenu_copy_selection (bool))); if (info.isFile () && info.suffix () == "m") - menu.addAction (QIcon (":/actions/icons/artsbuilderexecute.png"), + menu.addAction (resource_manager::icon ("media-playback-start"), tr ("Run"), this, SLOT (contextmenu_run (bool))); if (info.isFile ()) @@ -514,27 +514,27 @@ if (info.isDir ()) { menu.addSeparator (); - menu.addAction (QIcon (":/actions/icons/ok.png"), + menu.addAction (resource_manager::icon ("go-first"), tr ("Set Current Directory"), this, SLOT (contextmenu_setcurrentdir (bool))); menu.addSeparator (); - menu.addAction (QIcon (":/actions/icons/findf.png"), + menu.addAction (resource_manager::icon ("edit-find"), tr ("Find Files..."), this, SLOT (contextmenu_findfiles (bool))); } menu.addSeparator (); menu.addAction (tr ("Rename..."), this, SLOT (contextmenu_rename (bool))); - menu.addAction (QIcon (":/actions/icons/editdelete.png"), + menu.addAction (resource_manager::icon ("edit-delete"), tr ("Delete..."), this, SLOT (contextmenu_delete (bool))); if (info.isDir ()) { menu.addSeparator (); - menu.addAction (QIcon (":/actions/icons/filenew.png"), + menu.addAction (resource_manager::icon ("document-new"), tr ("New File..."), this, SLOT (contextmenu_newfile (bool))); - menu.addAction (QIcon (":/actions/icons/folder_new.png"), + menu.addAction (resource_manager::icon ("folder-new"), tr ("New Directory..."), this, SLOT (contextmenu_newdir (bool))); } diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/find-files-dialog.cc --- a/libgui/src/find-files-dialog.cc Tue Mar 03 18:25:16 2015 -0600 +++ b/libgui/src/find-files-dialog.cc Fri Feb 27 08:41:59 2015 +0100 @@ -50,7 +50,7 @@ : QDialog (p) { setWindowTitle (tr ("Find Files")); - setWindowIcon (QIcon (":/actions/icons/search.png")); + setWindowIcon (resource_manager::icon ("edit-find")); _dir_iterator = 0; diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/applications-system.png Binary file libgui/src/icons/applications-system.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/applications-system.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/applications-system.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + System Applications + + + Jakub Steiner + + + http://jimmac.musichall.cz/ + + + system + applications + group + category + admin + root + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/artsbuilderexecute.png Binary file libgui/src/icons/artsbuilderexecute.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp-next.png Binary file libgui/src/icons/bp-next.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp-next.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/bp-next.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,1072 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + + + + media + player + record + music + sound + video + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp-prev.png Binary file libgui/src/icons/bp-prev.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp-prev.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/bp-prev.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,1147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + + + + media + player + record + music + sound + video + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp-rm-all.png Binary file libgui/src/icons/bp-rm-all.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp-rm-all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/bp-rm-all.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,1243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + + + + media + player + record + music + sound + video + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp-toggle.png Binary file libgui/src/icons/bp-toggle.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp-toggle.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/bp-toggle.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,948 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + + + + media + player + record + music + sound + video + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp_next.png Binary file libgui/src/icons/bp_next.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp_prev.png Binary file libgui/src/icons/bp_prev.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp_rm_all.png Binary file libgui/src/icons/bp_rm_all.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/bp_toggle.png Binary file libgui/src/icons/bp_toggle.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/configure.png Binary file libgui/src/icons/configure.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db-cont.png Binary file libgui/src/icons/db-cont.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db-cont.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/db-cont.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,1162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Jakub Steiner + + + http://jimmac.musichall.cz/ + + + system + applications + group + category + admin + root + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db-step-in.png Binary file libgui/src/icons/db-step-in.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db-step-in.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/db-step-in.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,1185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + + + + media + stop + playback + video + music + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db-step-out.png Binary file libgui/src/icons/db-step-out.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db-step-out.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/db-step-out.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,1190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + + + + media + stop + playback + video + music + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db-step.png Binary file libgui/src/icons/db-step.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db-step.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/db-step.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,1197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + + + + media + stop + playback + video + music + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db-stop.png Binary file libgui/src/icons/db-stop.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db-stop.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/db-stop.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,677 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + + + + media + stop + playback + video + music + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db_cont.png Binary file libgui/src/icons/db_cont.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db_step.png Binary file libgui/src/icons/db_step.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db_step_in.png Binary file libgui/src/icons/db_step_in.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db_step_out.png Binary file libgui/src/icons/db_step_out.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/db_stop.png Binary file libgui/src/icons/db_stop.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/document-new.png Binary file libgui/src/icons/document-new.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/document-new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/document-new.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,448 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Document + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/document-open.png Binary file libgui/src/icons/document-open.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/document-open.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/document-open.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,535 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Folder Icon Accept + 2005-01-31 + + + Jakub Steiner + + + + http://jimmac.musichall.cz + Active state - when files are being dragged to. + + + Novell, Inc. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/document-print.png Binary file libgui/src/icons/document-print.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/document-print.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/document-print.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,532 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Print Document + + + Jakub Steiner + + + + http://jimmac.musichall.cz + + + document + lpr + print + local + laser + bubblejet + inkjet + print + output + cups + lpd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/document-save-as.png Binary file libgui/src/icons/document-save-as.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/document-save-as.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/document-save-as.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,663 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Save As + + + Jakub Steiner + + + + + hdd + hard drive + save as + io + store + + + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/document-save.png Binary file libgui/src/icons/document-save.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/document-save.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/document-save.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,619 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Save + + + Jakub Steiner + + + + + hdd + hard drive + save + io + store + + + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-copy.png Binary file libgui/src/icons/edit-copy.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-copy.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/edit-copy.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,328 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Edit Copy + 2005-10-15 + + + Andreas Nilsson + + + + + edit + copy + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-cut.png Binary file libgui/src/icons/edit-cut.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-cut.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/edit-cut.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,508 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Edit Cut + + + Garrett Le Sage + + + + + edit + cut + clipboard + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-delete.png Binary file libgui/src/icons/edit-delete.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-delete.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/edit-delete.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Delete + 2005-12-28 + + + Andreas Nilsson + + + http://tango-project.org + + + delete + remove + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-find-replace.png Binary file libgui/src/icons/edit-find-replace.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-find-replace.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/edit-find-replace.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,974 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Edit Find Replace + + + edit + find + locate + search + + + + + + Garrett LeSage + + + + + + Jakub Steiner, Steven Garrity + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-find.png Binary file libgui/src/icons/edit-find.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-find.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/edit-find.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,750 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Edit Find + + + edit + find + locate + search + + + + + + Steven Garrity + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-paste.png Binary file libgui/src/icons/edit-paste.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-paste.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/edit-paste.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,531 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Edit Paste + 2005-10-10 + + + Andreas Nilsson + + + + + edit + paste + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-redo.png Binary file libgui/src/icons/edit-redo.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-redo.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/edit-redo.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Edit Redo + + + edit + redo + again + reapply + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-undo.png Binary file libgui/src/icons/edit-undo.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/edit-undo.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/edit-undo.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Edit Undo + + + edit + undo + revert + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/editcopy.png Binary file libgui/src/icons/editcopy.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/editcut.png Binary file libgui/src/icons/editcut.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/editdelete.png Binary file libgui/src/icons/editdelete.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/editpaste.png Binary file libgui/src/icons/editpaste.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/fileclose.png Binary file libgui/src/icons/fileclose.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/filenew.png Binary file libgui/src/icons/filenew.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/fileopen.png Binary file libgui/src/icons/fileopen.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/fileprint.png Binary file libgui/src/icons/fileprint.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/filesave.png Binary file libgui/src/icons/filesave.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/filesaveas.png Binary file libgui/src/icons/filesaveas.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/find.png Binary file libgui/src/icons/find.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/findf.png Binary file libgui/src/icons/findf.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/folder-new.png Binary file libgui/src/icons/folder-new.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/folder-new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/folder-new.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,452 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Folder + + + + Jakub Steiner + + + + http://jimmac.musichall.cz + + + folder + directory + create + new + + + + + Tuomas Kuosmanen + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/folder.png Binary file libgui/src/icons/folder.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/folder.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/folder.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,424 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Folder Icon + + + + Jakub Steiner + + + + http://jimmac.musichall.cz + + + folder + directory + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/folder_documents.png Binary file libgui/src/icons/folder_documents.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/folder_new.png Binary file libgui/src/icons/folder_new.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/gear.png Binary file libgui/src/icons/gear.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/go-first.png Binary file libgui/src/icons/go-first.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/go-first.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/go-first.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Go Previous + + + go + previous + left + arrow + pointer + < + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/go-last.png Binary file libgui/src/icons/go-last.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/go-last.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/go-last.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Go Next + + + go + next + right + arrow + pointer + > + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/go-up.png Binary file libgui/src/icons/go-up.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/go-up.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/go-up.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Go Up + + + go + higher + up + arrow + pointer + > + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/home.png Binary file libgui/src/icons/home.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/icons_license --- a/libgui/src/icons/icons_license Tue Mar 03 18:25:16 2015 -0600 +++ b/libgui/src/icons/icons_license Fri Feb 27 08:41:59 2015 +0100 @@ -1,16 +1,50 @@ -======================================== -Icons created by the Octave developpers: -======================================== +=========================================== +Icons taken from the Tango-Desktop-Project +=========================================== + +Tango-Desktop-Project: +http://tango.freedesktop.org/Tango_Desktop_Project + +Archive with base icon set available at: +http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz + +License +=========================================== + +The Tango base icon theme is released to the Public Domain. + +Icons used for octave +=========================================== -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 +applications-system.svg +document-new.svg +document-open.svg +document-print.svg +document-save.svg +document-save-as.svg +edit-copy.svg +edit-cut.svg +edit-delete.svg +edit-find.svg +edit-find-replace.svg +edit-paste.svg +edit-redo.svg +edit-undo.svg +folder.svg +folder-new.svg +go-first.svg +go-last.svg +go-up.svg +preferences-system.svg +user-home.svg +view-refresh.svg + + + +=========================================== +Icons created by the Octave developpers +=========================================== + graphic_logo_DocumentationDockWidget.png graphic_logo_FileEditor.png graphic_logo_FilesDockWidget.png @@ -31,369 +65,17 @@ widget-close.png widget-dock.png widget-undock.png -zoom-in.png -zoom-out.png -======================================== -Icons taken from the Crystal Project: -======================================== - -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. - -This License Agreement applies to any software library or other program -which contains a notice placed by the copyright holder or other -authorized party saying it may be distributed under the terms of this -Lesser General Public License (also called "this License"). Each -licensee is addressed as "you". - -A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - -The "Library", below, refers to any such software library or work which -has been distributed under these terms. A "work based on the Library" -means either the Library or any derivative work under copyright law: -that is to say, a work containing the Library or a portion of it, either -verbatim or with modifications and/or translated straightforwardly into -another language. (Hereinafter, translation is included without -limitation in the term "modification".) - -"Source code" for a work means the preferred form of the work for making -modifications to it. For a library, complete source code means all the -source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and -installation of the library. - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of running -a program using the Library is not restricted, and output from such a -program is covered only if its contents constitute a work based on the -Library (independent of the use of the Library in a tool for writing -it). Whether that is true depends on what the Library does and what the -program that uses the Library does. - -You may copy and distribute verbatim copies of the Library's complete -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the notices -that refer to this License and to the absence of any warranty; and -distribute a copy of this License along with the Library. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - -You may modify your copy or copies of the Library or any portion of it, -thus forming a work based on the Library, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that -you also meet all of these conditions: - -The modified work must itself be a software library. You must cause the -files modified to carry prominent notices stating that you changed the -files and the date of any change. You must cause the whole of the work -to be licensed at no charge to all third parties under the terms of this -License. If a facility in the modified Library refers to a function or a -table of data to be supplied by an application program that uses the -facility, other than as an argument passed when the facility is invoked, -then you must make a good faith effort to ensure that, in the event an -application does not supply such function or table, the facility still -operates, and performs whatever part of its purpose remains meaningful. -(For example, a function in a library to compute square roots has a -purpose that is entirely well-defined independent of the application. -Therefore, Subsection 2d requires that any application-supplied function -or table used by this function must be optional: if the application does -not supply it, the square root function must still compute square -roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, and -can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based on -the Library, the distribution of the whole must be on the terms of this -License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of a -storage or distribution medium does not bring the other work under the -scope of this License. - -You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so that -they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in these -notices. - -Once this change is made in a given copy, it is irreversible for that -copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - -This option is useful when you wish to copy part of the code of the -Library into a program that is not a library. - -You may copy and distribute the Library (or a portion or derivative of -it, under Section 2) in object code or executable form under the terms -of Sections 1 and 2 above provided that you accompany it with the -complete corresponding machine-readable source code, which must be -distributed under the terms of Sections 1 and 2 above on a medium -customarily used for software interchange. - -If distribution of object code is made by offering access to copy from a -designated place, then offering equivalent access to copy the source -code from the same place satisfies the requirement to distribute the -source code, even though third parties are not compelled to copy the -source along with the object code. - -A program that contains no derivative of any portion of the Library, but -is designed to work with the Library by being compiled or linked with -it, is called a "work that uses the Library". Such a work, in isolation, -is not a derivative work of the Library, and therefore falls outside the -scope of this License. - -However, linking a "work that uses the Library" with the Library creates -an executable that is a derivative of the Library (because it contains -portions of the Library), rather than a "work that uses the library". -The executable is therefore covered by this License. Section 6 states -terms for distribution of such executables. When a "work that uses the -Library" uses material from a header file that is part of the Library, -the object code for the work may be a derivative work of the Library -even though the source code is not. Whether this is true is especially -significant if the work can be linked without the Library, or if the -work is itself a library. The threshold for this to be true is not -precisely defined by law. +Icons with elements from the Tango theme +=========================================== -If such an object file uses only numerical parameters, data structure -layouts and accessors, and small macros and small inline functions (ten -lines or less in length), then the use of the object file is -unrestricted, regardless of whether it is legally a derivative work. -(Executables containing this object code plus portions of the Library -will still fall under Section 6.) - -Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, whether -or not they are linked directly with the Library itself. - -As an exception to the Sections above, you may also combine or link a -"work that uses the Library" with the Library to produce a work -containing portions of the Library, and distribute that work under terms -of your choice, provided that the terms permit modification of the work -for the customer's own use and reverse engineering for debugging such -modifications. - -You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work during -execution displays copyright notices, you must include the copyright -notice for the Library among them, as well as a reference directing the -user to the copy of this License. Also, you must do one of these things: - -Accompany the work with the complete corresponding machine-readable -source code for the Library including whatever changes were used in the -work (which must be distributed under Sections 1 and 2 above); and, if -the work is an executable linked with the Library, with the complete -machine-readable "work that uses the Library", as object code and/or -source code, so that the user can modify the Library and then relink to -produce a modified executable containing the modified Library. (It is -understood that the user who changes the contents of definitions files -in the Library will not necessarily be able to recompile the application -to use the modified definitions.) . Use a suitable shared library -mechanism for linking with the Library. A suitable mechanism is one that -(1) uses at run time a copy of the library already present on the user's -computer system, rather than copying library functions into the -executable, and (2) will operate properly with a modified version of the -library, if the user installs one, as long as the modified version is -interface-compatible with the version that the work was made with. -Accompany the work with a written offer, valid for at least three years, -to give the same user the materials specified in Subsection 6a, above, -for a charge no more than the cost of performing this distribution. If -distribution of the work is made by offering access to copy from a -designated place, offer equivalent access to copy the above specified -materials from the same place. Verify that the user has already received -a copy of these materials or that you have already sent this user a -copy. For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, the -materials to be distributed need not include anything that is normally -distributed (in either source or binary form) with the major components -(compiler, kernel, and so on) of the operating system on which the -executable runs, unless that component itself accompanies the -executable. - -It may happen that this requirement contradicts the license restrictions -of other proprietary libraries that do not normally accompany the -operating system. Such a contradiction means you cannot use both them -and the Library together in an executable that you distribute. - -You may place library facilities that are a work based on the Library -side-by-side in a single library together with other library facilities -not covered by this License, and distribute such a combined library, -provided that the separate distribution of the work based on the Library -and of the other library facilities is otherwise permitted, and provided -that you do these two things: - -Accompany the combined library with a copy of the same work based on the -Library, uncombined with any other library facilities. This must be -distributed under the terms of the Sections above. - -Give prominent notice with the combined library of the fact that part of -it is a work based on the Library, and explaining where to find the -accompanying uncombined form of the same work. - -You may not copy, modify, sublicense, link with, or distribute the -Library except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense, link with, or distribute the -Library is void, and will automatically terminate your rights under this -License. However, parties who have received copies, or rights, from you -under this License will not have their licenses terminated so long as -such parties remain in full compliance. - -You are not required to accept this License, since you have not signed -it. However, nothing else grants you permission to modify or distribute -the Library or its derivative works. These actions are prohibited by law -if you do not accept this License. Therefore, by modifying or -distributing the Library (or any work based on the Library), you -indicate your acceptance of this License to do so, and all its terms and -conditions for copying, distributing or modifying the Library or works -based on it. - -Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - -If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot distribute -so as to satisfy simultaneously your obligations under this License and -any other pertinent obligations, then as a consequence you may not -distribute the Library at all. For example, if a patent license would -not permit royalty-free redistribution of the Library by all those who -receive copies directly or indirectly through you, then the only way you -could satisfy both it and this License would be to refrain entirely from -distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is implemented -by public license practices. Many people have made generous -contributions to the wide range of software distributed through that -system in reliance on consistent application of that system; it is up to -the author/donor to decide if he or she is willing to distribute -software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be -a consequence of the rest of this License. - -If the distribution and/or use of the Library is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Library under this License may add an -explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - -The Free Software Foundation may publish revised and/or new versions of -the Lesser General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in -detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a license -version number, you may choose any version ever published by the Free -Software Foundation. - -If you wish to incorporate parts of the Library into other free programs -whose distribution conditions are incompatible with these, write to the -author to ask for permission. For software which is copyrighted by the -Free Software Foundation, write to the Free Software Foundation; we -sometimes make exceptions for this. Our decision will be guided by the -two goals of preserving the free status of all derivatives of our free -software and of promoting the sharing and reuse of software generally. - -No Warranty - -Because the library is licensed free of charge, there is no warranty for -the library, to the extent permitted by applicable law. Except when -otherwise stated in writing the copyright holders and/or other parties -provide the library "as is" without warranty of any kind, either -expressed or implied, including, but not limited to, the implied -warranties of merchantability and fitness for a particular purpose. The -entire risk as to the quality and performance of the library is with -you. Should the library prove defective, you assume the cost of all -necessary servicing, repair or correction. - -In no event unless required by applicable law or agreed to in writing -will any copyright holder, or any other party who may modify and/or -redistribute the library as permitted above, be liable to you for -damages, including any general, special, incidental or consequential -damages arising out of the use or inability to use the library -(including but not limited to loss of data or data being rendered -inaccurate or losses sustained by you or third parties or a failure of -the library to operate with any other software), even if such holder or -other party has been advised of the possibility of such damages. +bp-next.svg +bp-prev.svg +bp-rm_all.svg +bp-toggle.svg +db-cont.svg +db-step-in.svg +db-step-out.svg +db-step.svg +db-stop.svg +system-run.svg diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/ok.png Binary file libgui/src/icons/ok.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/preferences-system.png Binary file libgui/src/icons/preferences-system.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/preferences-system.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/preferences-system.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,398 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Preferences System + + + preferences + settings + control panel + tweaks + system + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/redo.png Binary file libgui/src/icons/redo.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/reload.png Binary file libgui/src/icons/reload.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/search.png Binary file libgui/src/icons/search.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/system-run.png Binary file libgui/src/icons/system-run.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/system-run.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/system-run.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,1334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Jakub Steiner + + + http://jimmac.musichall.cz/ + + + system + applications + group + category + admin + root + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/undo.png Binary file libgui/src/icons/undo.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/user-home.png Binary file libgui/src/icons/user-home.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/user-home.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/user-home.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,529 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Home Folder Icon + + + + Jakub Steiner + + + + http://jimmac.musichall.cz + + + folder + directory + home + user + + + + + Garrett LeSage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/view-refresh.png Binary file libgui/src/icons/view-refresh.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/view-refresh.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/view-refresh.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,393 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + View Refresh + + + reload + refresh + view + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/zoom-in.png Binary file libgui/src/icons/zoom-in.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/zoom-in.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/zoom-in.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,436 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Add + 2006-01-04 + + + Andreas Nilsson + + + http://tango-project.org + + + add + plus + + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/zoom-out.png Binary file libgui/src/icons/zoom-out.png has changed diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/icons/zoom-out.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/zoom-out.svg Fri Feb 27 08:41:59 2015 +0100 @@ -0,0 +1,424 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Remove + 2006-01-04 + + + Andreas Nilsson + + + http://tango-project.org + + + remove + delete + + + + + + + + + + + + + + + + + diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/m-editor/file-editor.cc --- a/libgui/src/m-editor/file-editor.cc Tue Mar 03 18:25:16 2015 -0600 +++ b/libgui/src/m-editor/file-editor.cc Fri Feb 27 08:41:59 2015 +0100 @@ -1288,48 +1288,45 @@ _fileMenu->addSeparator (); - _save_action = add_action (_fileMenu, QIcon (":/actions/icons/filesave.png"), + _save_action = add_action (_fileMenu, resource_manager::icon ("document-save"), tr ("&Save File"), SLOT (request_save_file (bool))); - _save_as_action = add_action (_fileMenu, QIcon (":/actions/icons/filesaveas.png"), + _save_as_action = add_action (_fileMenu, resource_manager::icon ("document-save-as"), tr ("Save File &As..."), SLOT (request_save_file_as (bool))); _fileMenu->addSeparator (); - _close_action = add_action (_fileMenu, - QIcon::fromTheme("window-close",QIcon (":/actions/icons/fileclose.png")), + _close_action = add_action (_fileMenu, resource_manager::icon ("window-close",false), tr ("&Close"), SLOT (request_close_file (bool))); - _close_all_action = add_action (_fileMenu, - QIcon::fromTheme("window-close", QIcon (":/actions/icons/fileclose.png")), + _close_all_action = add_action (_fileMenu, resource_manager::icon ("window-close",false), tr ("Close All"), SLOT (request_close_all_files (bool))); - _close_others_action = add_action (_fileMenu, - QIcon::fromTheme("window-close", QIcon (":/actions/icons/fileclose.png")), + _close_others_action = add_action (_fileMenu, resource_manager::icon ("window-close",false), tr ("Close Other Files"), SLOT (request_close_other_files (bool))); _fileMenu->addSeparator (); - _print_action = add_action (_fileMenu, QIcon (":/actions/icons/fileprint.png"), + _print_action = add_action (_fileMenu, resource_manager::icon ("document-print"), tr ("Print..."), SLOT (request_print_file (bool))); // edit menu QMenu *editMenu = m_add_menu (_menu_bar, tr ("&Edit")); - _undo_action = add_action (editMenu, QIcon (":/actions/icons/undo.png"), + _undo_action = add_action (editMenu, resource_manager::icon ("edit-undo"), tr ("&Undo"), SLOT (request_undo (bool))); _undo_action->setEnabled (false); - _redo_action = add_action (editMenu, QIcon (":/actions/icons/redo.png"), + _redo_action = add_action (editMenu, resource_manager::icon ("edit-redo"), tr ("&Redo"), SLOT (request_redo (bool))); _redo_action->setEnabled (false); editMenu->addSeparator (); - _copy_action = add_action (editMenu, QIcon (":/actions/icons/editcopy.png"), + _copy_action = add_action (editMenu, resource_manager::icon ("edit-copy"), tr ("&Copy"), SLOT (request_copy (bool))); _copy_action->setEnabled (false); - _cut_action = add_action (editMenu, QIcon (":/actions/icons/editcut.png"), + _cut_action = add_action (editMenu, resource_manager::icon ("edit-cut"), tr ("Cu&t"), SLOT (request_cut (bool))); _cut_action->setEnabled (false); - _paste_action = add_action (editMenu, QIcon (":/actions/icons/editpaste.png"), + _paste_action = add_action (editMenu, resource_manager::icon ("edit-paste"), tr ("Paste"), SLOT (request_paste (bool))); editMenu->addSeparator (); @@ -1339,7 +1336,7 @@ editMenu->addSeparator (); - _find_action = add_action (editMenu, QIcon (":/actions/icons/find.png"), + _find_action = add_action (editMenu, resource_manager::icon ("edit-find-replace"), tr ("&Find and Replace..."), SLOT (request_find (bool))); editMenu->addSeparator (); @@ -1423,10 +1420,10 @@ _edit_nav_menu->addSeparator (); + _previous_bookmark_action = add_action (_edit_nav_menu, QIcon (), + tr ("Pre&vious Bookmark"), SLOT (request_previous_bookmark (bool))); _next_bookmark_action = add_action (_edit_nav_menu, QIcon (), tr ("&Next Bookmark"), SLOT (request_next_bookmark (bool))); - _previous_bookmark_action = add_action (_edit_nav_menu, QIcon (), - tr ("Pre&vious Bookmark"), SLOT (request_previous_bookmark (bool))); _toggle_bookmark_action = add_action (_edit_nav_menu, QIcon (), tr ("Toggle &Bookmark"), SLOT (request_toggle_bookmark (bool))); _remove_bookmark_action = add_action (_edit_nav_menu, QIcon (), @@ -1434,11 +1431,9 @@ editMenu->addSeparator (); - _preferences_action = add_action (editMenu, - QIcon (":/actions/icons/configure.png"), + _preferences_action = add_action (editMenu, resource_manager::icon ("preferences-system"), tr ("&Preferences..."), SLOT (request_preferences (bool))); - _styles_preferences_action = add_action (editMenu, - QIcon (":/actions/icons/configure.png"), + _styles_preferences_action = add_action (editMenu, resource_manager::icon ("preferences-system"), tr ("&Styles Preferences..."), SLOT (request_styles_preferences (bool))); // view menu @@ -1469,11 +1464,11 @@ view_menu->addSeparator (); - _zoom_in_action = add_action (view_menu, QIcon (), + _zoom_in_action = add_action (view_menu, resource_manager::icon ("zoom-in"), tr ("Zoom &In"), SLOT (zoom_in (bool))); - _zoom_out_action = add_action (view_menu, QIcon (), + _zoom_out_action = add_action (view_menu, resource_manager::icon ("zoom-out"), tr ("Zoom &Out"), SLOT (zoom_out (bool))); - _zoom_normal_action = add_action (view_menu, QIcon (), + _zoom_normal_action = add_action (view_menu, QIcon (), tr ("&Normal Size"), SLOT (zoom_normal (bool))); _menu_bar->addMenu (view_menu); @@ -1483,16 +1478,16 @@ _debug_menu = m_add_menu (_menu_bar, tr ("&Debug")); _toggle_breakpoint_action = add_action (_debug_menu, - QIcon (":/actions/icons/bp_toggle.png"), tr ("Toggle &Breakpoint"), + resource_manager::icon ("bp-toggle"), tr ("Toggle &Breakpoint"), SLOT (request_toggle_breakpoint (bool))); _next_breakpoint_action = add_action (_debug_menu, - QIcon (":/actions/icons/bp_next.png"), tr ("&Next Breakpoint"), + resource_manager::icon ("bp-next"), tr ("&Next Breakpoint"), SLOT (request_next_breakpoint (bool))); _previous_breakpoint_action = add_action (_debug_menu, - QIcon (":/actions/icons/bp_prev.png"), tr ("Pre&vious Breakpoint"), + resource_manager::icon ("bp-prev"), tr ("Pre&vious Breakpoint"), SLOT (request_previous_breakpoint (bool))); _remove_all_breakpoints_action = add_action (_debug_menu, - QIcon (":/actions/icons/bp_rm_all.png"), tr ("&Remove All Breakpoints"), + resource_manager::icon ("bp-rm-all"), tr ("&Remove All Breakpoints"), SLOT (request_remove_breakpoint (bool))); _debug_menu->addSeparator (); @@ -1503,7 +1498,7 @@ QMenu *_run_menu = m_add_menu (_menu_bar, tr ("&Run")); - _run_action = add_action (_run_menu, QIcon (":/actions/icons/artsbuilderexecute.png"), + _run_action = add_action (_run_menu, resource_manager::icon ("system-run"), tr ("Save File and Run"), SLOT (request_run_file (bool))); _run_selection_action = add_action (_run_menu, QIcon (), tr ("Run &Selection"), SLOT (request_context_run (bool))); @@ -1536,8 +1531,8 @@ _tool_bar->addAction (_run_action); _tool_bar->addSeparator (); _tool_bar->addAction (_toggle_breakpoint_action); + _tool_bar->addAction (_previous_breakpoint_action); _tool_bar->addAction (_next_breakpoint_action); - _tool_bar->addAction (_previous_breakpoint_action); _tool_bar->addAction (_remove_all_breakpoints_action); // layout diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/main-window.cc --- a/libgui/src/main-window.cc Tue Mar 03 18:25:16 2015 -0600 +++ b/libgui/src/main-window.cc Fri Feb 27 08:41:59 2015 +0100 @@ -1603,7 +1603,7 @@ construct_new_menu (file_menu); _open_action - = file_menu->addAction (QIcon (":/actions/icons/folder_documents.png"), + = file_menu->addAction (resource_manager::icon ("document-open"), tr ("Open...")); _open_action->setShortcutContext (Qt::ApplicationShortcut); _open_action->setToolTip (tr ("Open an existing file in editor")); @@ -1627,7 +1627,7 @@ file_menu->addSeparator (); _preferences_action - = file_menu->addAction (QIcon (":/actions/icons/configure.png"), + = file_menu->addAction (resource_manager::icon ("preferences-system"), tr ("Preferences...")); file_menu->addSeparator (); @@ -1659,7 +1659,7 @@ QMenu *new_menu = p->addMenu (tr ("New")); _new_script_action - = new_menu->addAction (QIcon (":/actions/icons/filenew.png"), + = new_menu->addAction (resource_manager::icon ("document-new"), tr ("New Script")); _new_script_action->setShortcutContext (Qt::ApplicationShortcut); @@ -1690,16 +1690,16 @@ QKeySequence ctrl_shift = Qt::ControlModifier + Qt::ShiftModifier; _undo_action - = edit_menu->addAction (QIcon (":/actions/icons/undo.png"), tr ("Undo")); + = edit_menu->addAction (resource_manager::icon ("edit-undo"), tr ("Undo")); edit_menu->addSeparator (); _copy_action - = edit_menu->addAction (QIcon (":/actions/icons/editcopy.png"), + = edit_menu->addAction (resource_manager::icon ("edit-copy"), tr ("Copy"), this, SLOT (copyClipboard ())); _paste_action - = edit_menu->addAction (QIcon (":/actions/icons/editpaste.png"), + = edit_menu->addAction (resource_manager::icon ("edit-paste"), tr ("Paste"), this, SLOT (pasteClipboard ())); _select_all_action @@ -1745,7 +1745,9 @@ main_window::construct_debug_menu_item (const char *icon, const QString& item, const char *member) { - QAction *action = add_action (_debug_menu, QIcon (icon), item, member); + QAction *action = add_action (_debug_menu, + resource_manager::icon (QString (icon)), + item, member); action->setEnabled (false); @@ -1762,20 +1764,20 @@ { _debug_menu = m_add_menu (p, tr ("De&bug")); - _debug_step_over = construct_debug_menu_item - (":/actions/icons/db_step.png", tr ("Step"), + _debug_step_over = construct_debug_menu_item ( + "db-step", tr ("Step"), SLOT (debug_step_over ())); - _debug_step_into = construct_debug_menu_item - (":/actions/icons/db_step_in.png", tr ("Step In"), + _debug_step_into = construct_debug_menu_item ( + "db-step-in", tr ("Step In"), SLOT (debug_step_into ())); - _debug_step_out = construct_debug_menu_item - (":/actions/icons/db_step_out.png", tr ("Step Out"), + _debug_step_out = construct_debug_menu_item ( + "db-step-out", tr ("Step Out"), SLOT (debug_step_out ())); - _debug_continue = construct_debug_menu_item - (":/actions/icons/db_cont.png", tr ("Continue"), + _debug_continue = construct_debug_menu_item ( + "db-cont", tr ("Continue"), SLOT (debug_continue ())); _debug_menu->addSeparator (); @@ -1783,8 +1785,8 @@ editor_window->debug_menu ()->addSeparator (); #endif - _debug_quit = construct_debug_menu_item - (":/actions/icons/db_stop.png", tr ("Quit Debug Mode"), + _debug_quit = construct_debug_menu_item ( + "db-stop", tr ("Quit Debug Mode"), SLOT (debug_quit ())); } @@ -1956,10 +1958,10 @@ _main_tool_bar->addWidget (new QLabel (tr ("Current Directory: "))); _main_tool_bar->addWidget (_current_directory_combo_box); QAction *current_dir_up = _main_tool_bar->addAction ( - QIcon (":/actions/icons/up.png"), + resource_manager::icon ("go-up"), tr ("One directory up")); QAction *current_dir_search = _main_tool_bar->addAction ( - QIcon (":/actions/icons/folder.png"), + resource_manager::icon ("folder"), tr ("Browse directories")); connect (_current_directory_combo_box, SIGNAL (activated (QString)), diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/module.mk --- a/libgui/src/module.mk Tue Mar 03 18:25:16 2015 -0600 +++ b/libgui/src/module.mk Fri Feb 27 08:41:59 2015 +0100 @@ -9,34 +9,41 @@ src/icons/arrow_left.png \ src/icons/arrow_up.png \ src/icons/arrow_down.png \ - src/icons/artsbuilderexecute.png \ src/icons/bookmark.png \ - src/icons/bp_next.png \ - src/icons/bp_prev.png \ - src/icons/bp_rm_all.png \ - src/icons/bp_toggle.png \ - src/icons/configure.png \ - src/icons/db_cont.png \ - src/icons/db_step_in.png \ - src/icons/db_step_out.png \ - src/icons/db_step.png \ - src/icons/db_stop.png \ - src/icons/editcopy.png \ - src/icons/editcut.png \ - src/icons/editdelete.png \ - src/icons/editpaste.png \ - src/icons/fileclose.png \ - src/icons/filenew.png \ - src/icons/fileopen.png \ - src/icons/fileprint.png \ - 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/bp-next.png \ + src/icons/bp-prev.png \ + src/icons/bp-rm-all.png \ + src/icons/bp-toggle.png \ + src/icons/db-cont.png \ + src/icons/db-step-in.png \ + src/icons/db-step-out.png \ + src/icons/db-step.png \ + src/icons/db-stop.png \ + src/icons/applications-system.png \ + src/icons/document-new.png \ + src/icons/document-open.png \ + src/icons/document-print.png \ + src/icons/document-save.png \ + src/icons/document-save-as.png \ + src/icons/edit-copy.png \ + src/icons/edit-cut.png \ + src/icons/edit-delete.png \ + src/icons/edit-find.png \ + src/icons/edit-find-replace.png \ + src/icons/edit-paste.png \ + src/icons/edit-redo.png \ + src/icons/edit-undo.png \ src/icons/folder.png \ + src/icons/folder-new.png \ + src/icons/go-first.png \ + src/icons/go-last.png \ + src/icons/go-up.png \ + src/icons/preferences-system.png \ + src/icons/system-run.png \ + src/icons/user-home.png \ + src/icons/view-refresh.png \ + src/icons/zoom-in.png \ + src/icons/zoom-out.png \ src/icons/graphic_logo_DocumentationDockWidget.png \ src/icons/graphic_logo_FileEditor.png \ src/icons/graphic_logo_FilesDockWidget.png \ @@ -45,7 +52,6 @@ src/icons/graphic_logo_TerminalDockWidget.png \ src/icons/graphic_logo_WorkspaceView.png \ src/icons/graphic_logo_ReleaseWidget.png \ - src/icons/home.png \ src/icons/icons_license \ src/icons/letter_logo_DocumentationDockWidget.png \ src/icons/letter_logo_FileEditor.png \ @@ -56,12 +62,7 @@ src/icons/letter_logo_WorkspaceView.png \ src/icons/letter_logo_ReleaseWidget.png \ src/icons/logo.png \ - src/icons/ok.png \ src/icons/redled.png \ - src/icons/redo.png \ - src/icons/reload.png \ - src/icons/search.png \ - src/icons/undo.png \ src/icons/up.png \ src/icons/warning.png \ src/icons/widget-close.png \ @@ -69,9 +70,7 @@ src/icons/widget-undock.png \ src/icons/widget-close-light.png \ src/icons/widget-dock-light.png \ - src/icons/widget-undock-light.png \ - src/icons/zoom-in.png \ - src/icons/zoom-out.png + src/icons/widget-undock-light.png octave_gui_MOC = diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/qtinfo/webinfo.cc --- a/libgui/src/qtinfo/webinfo.cc Tue Mar 03 18:25:16 2015 -0600 +++ b/libgui/src/qtinfo/webinfo.cc Fri Feb 27 08:41:59 2015 +0100 @@ -37,6 +37,7 @@ #include "file-ops.h" #include "help.h" #include "defaults.h" +#include "resource-manager.h" webinfo::webinfo (QWidget *p) @@ -63,11 +64,11 @@ hbox_layout->addWidget (_tab_bar); _zoom_in_button = new QToolButton (this); - _zoom_in_button->setIcon (QIcon (":/actions/icons/zoom-in.png")); + _zoom_in_button->setIcon (resource_manager::icon ("zoom-in")); hbox_layout->addWidget (_zoom_in_button); _zoom_out_button = new QToolButton (this); - _zoom_out_button->setIcon (QIcon (":/actions/icons/zoom-out.png")); + _zoom_out_button->setIcon (resource_manager::icon ("zoom-out")); hbox_layout->addWidget (_zoom_out_button); _stacked_widget = new QStackedWidget (this); diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/resource-manager.cc --- a/libgui/src/resource-manager.cc Tue Mar 03 18:25:16 2015 -0600 +++ b/libgui/src/resource-manager.cc Fri Feb 27 08:41:59 2015 +0100 @@ -305,3 +305,13 @@ { return QTerminal::default_colors (); } + +QIcon +resource_manager::do_icon (const QString& icon_name, bool fallback) +{ + if (fallback) + return QIcon::fromTheme (icon_name, + QIcon (":/actions/icons/" + icon_name + ".png")); + else + return QIcon::fromTheme (icon_name); +} diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/resource-manager.h --- a/libgui/src/resource-manager.h Tue Mar 03 18:25:16 2015 -0600 +++ b/libgui/src/resource-manager.h Fri Feb 27 08:41:59 2015 +0100 @@ -46,6 +46,14 @@ return instance_ok () ? instance->do_get_settings () : 0; } + static QIcon icon (const QString& icon_name, bool fallback = true) + { + if (instance_ok ()) + return instance->do_icon (icon_name, fallback); + + return QIcon (); + } + static QSettings *get_default_settings (void) { return instance_ok () ? instance->do_get_default_settings () : 0; @@ -129,6 +137,8 @@ bool do_is_first_run (void) const; + QIcon do_icon (const QString& icon, bool fallback); + }; #endif // RESOURCEMANAGER_H diff -r 2eed41ae3b64 -r a8a5415b05cb libgui/src/resource.qrc --- a/libgui/src/resource.qrc Tue Mar 03 18:25:16 2015 -0600 +++ b/libgui/src/resource.qrc Fri Feb 27 08:41:59 2015 +0100 @@ -1,48 +1,47 @@ - icons/artsbuilderexecute.png - icons/editcopy.png - icons/editcut.png - icons/editdelete.png - icons/editpaste.png - icons/fileclose.png - icons/filenew.png - icons/fileopen.png - icons/filesave.png - icons/fileprint.png + icons/applications-system.png + icons/document-new.png + icons/document-open.png + icons/document-print.png + icons/document-save.png + icons/document-save-as.png + icons/edit-copy.png + icons/edit-cut.png + icons/edit-delete.png + icons/edit-find.png + icons/edit-find-replace.png + icons/edit-paste.png + icons/edit-redo.png + icons/edit-undo.png icons/folder.png - icons/folder_documents.png - icons/folder_new.png - icons/home.png - icons/ok.png - icons/redo.png - icons/reload.png - icons/search.png - icons/undo.png + icons/folder-new.png + icons/go-first.png + icons/go-last.png + icons/go-up.png + icons/preferences-system.png + icons/user-home.png + icons/view-refresh.png + icons/zoom-in.png + icons/zoom-out.png icons/up.png - icons/configure.png - icons/filesaveas.png icons/redled.png icons/arrow_right.png icons/arrow_left.png icons/arrow_up.png icons/arrow_down.png icons/bookmark.png - icons/zoom-in.png - icons/zoom-out.png - icons/find.png - icons/findf.png - icons/gear.png icons/logo.png - icons/bp_toggle.png - icons/bp_rm_all.png - icons/bp_prev.png - icons/bp_next.png - icons/db_cont.png - icons/db_step.png - icons/db_step_in.png - icons/db_step_out.png - icons/db_stop.png + icons/bp-toggle.png + icons/bp-rm-all.png + icons/bp-prev.png + icons/bp-next.png + icons/db-cont.png + icons/db-step.png + icons/db-step-in.png + icons/db-step-out.png + icons/db-stop.png + icons/system-run.png icons/letter_logo_FilesDockWidget.png icons/letter_logo_FileEditor.png icons/letter_logo_NewsDockWidget.png