Mercurial > octave
diff libgui/src/main-window.cc @ 19899:a8a5415b05cb
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
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Fri, 27 Feb 2015 08:41:59 +0100 |
| parents | 67cb2f421255 |
| children | 7d888f9e94eb |
line wrap: on
line diff
--- 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)),