# HG changeset patch # User Torsten # Date 1424941583 -3600 # Node ID ded81845c597f8a86083088c6d7b1b0ff3d1ad22 # Parent a8a5415b05cb311253f4844a2c2a7f7212a929f2 omit icons for breakpoint markers and in documentation viewer * arrow_down.png, arrow_left.png, arrow_right.png, arrow_up.png bookmark.png, redled.png, up.png: removed obsolete icons * file-editor-tab.cc (file_editor_tab): Use qscintilla internal markers instead of icons * module.mk, resource.qrc: removed entries of obsolete icons, sort entries * parser.cc (replace_links, node_text_to_html, global_search): replace icons by html characters diff -r a8a5415b05cb -r ded81845c597 libgui/src/icons/arrow_down.png Binary file libgui/src/icons/arrow_down.png has changed diff -r a8a5415b05cb -r ded81845c597 libgui/src/icons/arrow_left.png Binary file libgui/src/icons/arrow_left.png has changed diff -r a8a5415b05cb -r ded81845c597 libgui/src/icons/arrow_right.png Binary file libgui/src/icons/arrow_right.png has changed diff -r a8a5415b05cb -r ded81845c597 libgui/src/icons/arrow_up.png Binary file libgui/src/icons/arrow_up.png has changed diff -r a8a5415b05cb -r ded81845c597 libgui/src/icons/bookmark.png Binary file libgui/src/icons/bookmark.png has changed diff -r a8a5415b05cb -r ded81845c597 libgui/src/icons/redled.png Binary file libgui/src/icons/redled.png has changed diff -r a8a5415b05cb -r ded81845c597 libgui/src/icons/up.png Binary file libgui/src/icons/up.png has changed diff -r a8a5415b05cb -r ded81845c597 libgui/src/m-editor/file-editor-tab.cc --- a/libgui/src/m-editor/file-editor-tab.cc Fri Feb 27 08:41:59 2015 +0100 +++ b/libgui/src/m-editor/file-editor-tab.cc Thu Feb 26 10:06:23 2015 +0100 @@ -116,10 +116,11 @@ _edit_area->setMarginType (1, QsciScintilla::SymbolMargin); _edit_area->setMarginSensitivity (1, true); _edit_area->markerDefine (QsciScintilla::RightTriangle, bookmark); - _edit_area->markerDefine (QPixmap (":/actions/icons/redled.png"), - breakpoint); - _edit_area->markerDefine (QPixmap (":/actions/icons/bookmark.png"), - debugger_position); + _edit_area->setMarkerBackgroundColor (QColor (0,0,232), bookmark); + _edit_area->markerDefine (QsciScintilla::Circle, breakpoint); + _edit_area->setMarkerBackgroundColor (QColor (192,0,0), breakpoint); + _edit_area->markerDefine (QsciScintilla::RightTriangle, debugger_position); + _edit_area->setMarkerBackgroundColor (QColor (255,255,0), debugger_position); connect (_edit_area, SIGNAL (marginClicked (int, int, Qt::KeyboardModifiers)), diff -r a8a5415b05cb -r ded81845c597 libgui/src/module.mk --- a/libgui/src/module.mk Fri Feb 27 08:41:59 2015 +0100 +++ b/libgui/src/module.mk Thu Feb 26 10:06:23 2015 +0100 @@ -5,11 +5,7 @@ $(octave_gui_ICONS) octave_gui_ICONS = \ - src/icons/arrow_right.png \ - src/icons/arrow_left.png \ - src/icons/arrow_up.png \ - src/icons/arrow_down.png \ - src/icons/bookmark.png \ + src/icons/applications-system.png \ src/icons/bp-next.png \ src/icons/bp-prev.png \ src/icons/bp-rm-all.png \ @@ -19,7 +15,6 @@ 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 \ @@ -38,12 +33,6 @@ 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 \ @@ -62,15 +51,18 @@ src/icons/letter_logo_WorkspaceView.png \ src/icons/letter_logo_ReleaseWidget.png \ src/icons/logo.png \ - src/icons/redled.png \ - src/icons/up.png \ - src/icons/warning.png \ + src/icons/preferences-system.png \ + src/icons/system-run.png \ + src/icons/user-home.png \ + src/icons/view-refresh.png \ src/icons/widget-close.png \ src/icons/widget-dock.png \ 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/widget-undock-light.png \ + src/icons/zoom-in.png \ + src/icons/zoom-out.png octave_gui_MOC = diff -r a8a5415b05cb -r ded81845c597 libgui/src/qtinfo/parser.cc --- a/libgui/src/qtinfo/parser.cc Fri Feb 27 08:41:59 2015 +0100 +++ b/libgui/src/qtinfo/parser.cc Thu Feb 26 10:06:23 2015 +0100 @@ -345,7 +345,7 @@ url_link.replace ("",""); url_link = QUrl::toPercentEncoding (url_link, "", "'"); - href += ""; + href += "»"; href += " " + note + "" + term; f = re.matchedLength (); text.replace (i,f,href); @@ -408,7 +408,7 @@ info_to_html (text2); text = text1 + "
 " + + "'/>♦
 " + text2; } else @@ -420,9 +420,9 @@ QString navigationLinks = QString ( "Section: %1
" - " Previous Section: %3
" - " Next Section: %5
" - " Up: %7
\n" + "Previous Section: %3
" + "Next Section: %5
" + "Up: %7
\n" ) .arg (nodeName) .arg (QString (QUrl::toPercentEncoding (nodePrev, "", "'"))) @@ -645,7 +645,7 @@ if (founds == 0) { results.append( - "
\n "); results.append (node); diff -r a8a5415b05cb -r ded81845c597 libgui/src/resource.qrc --- a/libgui/src/resource.qrc Fri Feb 27 08:41:59 2015 +0100 +++ b/libgui/src/resource.qrc Thu Feb 26 10:06:23 2015 +0100 @@ -1,6 +1,15 @@ icons/applications-system.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/document-new.png icons/document-open.png icons/document-print.png @@ -19,29 +28,14 @@ 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/redled.png - icons/arrow_right.png - icons/arrow_left.png - icons/arrow_up.png - icons/arrow_down.png - icons/bookmark.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/system-run.png + icons/graphic_logo_FilesDockWidget.png + icons/graphic_logo_FileEditor.png + icons/graphic_logo_NewsDockWidget.png + icons/graphic_logo_TerminalDockWidget.png + icons/graphic_logo_HistoryDockWidget.png + icons/graphic_logo_WorkspaceView.png + icons/graphic_logo_DocumentationDockWidget.png + icons/graphic_logo_ReleaseWidget.png icons/letter_logo_FilesDockWidget.png icons/letter_logo_FileEditor.png icons/letter_logo_NewsDockWidget.png @@ -50,20 +44,18 @@ icons/letter_logo_WorkspaceView.png icons/letter_logo_DocumentationDockWidget.png icons/letter_logo_ReleaseWidget.png - icons/graphic_logo_FilesDockWidget.png - icons/graphic_logo_FileEditor.png - icons/graphic_logo_NewsDockWidget.png - icons/graphic_logo_TerminalDockWidget.png - icons/graphic_logo_HistoryDockWidget.png - icons/graphic_logo_WorkspaceView.png - icons/graphic_logo_DocumentationDockWidget.png - icons/graphic_logo_ReleaseWidget.png - icons/warning.png + icons/logo.png + icons/preferences-system.png + icons/system-run.png + icons/user-home.png + icons/view-refresh.png icons/widget-close.png icons/widget-dock.png icons/widget-undock.png icons/widget-close-light.png icons/widget-dock-light.png icons/widget-undock-light.png + icons/zoom-in.png + icons/zoom-out.png