Mercurial > octave-nkf

changeset 19935:ded81845c597

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Torsten <ttl@justmail.de>
date Thu, 26 Feb 2015 10:06:23 +0100
parents a8a5415b05cb
children 26281bc8d23b
files libgui/src/icons/arrow_down.png libgui/src/icons/arrow_left.png libgui/src/icons/arrow_right.png libgui/src/icons/arrow_up.png libgui/src/icons/bookmark.png libgui/src/icons/redled.png libgui/src/icons/up.png libgui/src/m-editor/file-editor-tab.cc libgui/src/module.mk libgui/src/qtinfo/parser.cc libgui/src/resource.qrc
diffstat 11 files changed, 43 insertions(+), 58 deletions(-) [+]
line wrap: on
line diff
Binary file libgui/src/icons/arrow_down.png has changed
Binary file libgui/src/icons/arrow_left.png has changed
Binary file libgui/src/icons/arrow_right.png has changed
Binary file libgui/src/icons/arrow_up.png has changed
Binary file libgui/src/icons/bookmark.png has changed
Binary file libgui/src/icons/redled.png has changed
Binary file libgui/src/icons/up.png has changed
--- 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)),
--- 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 =
 
--- 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 ("</b>","");
       url_link = QUrl::toPercentEncoding (url_link, "", "'");
 
-      href += "<img src=':/actions/icons/bookmark.png' width=10/>";
+      href += "<font style=\"color:DarkGray; font-weight:bold;\">&raquo;</font>";
       href +=  "&nbsp;<a href='" + url_link + "'>" + note + "</a>" + term;
       f = re.matchedLength ();
       text.replace (i,f,href);
@@ -408,7 +408,7 @@
       info_to_html (text2);
 
       text = text1 + "<a name='" + anchor
-             + "'/><img src=':/actions/icons/arrow_down.png'><br>&nbsp;"
+             + "'/><font style=\"color:DarkBlue; font: bold monospace large;\">&diams;</font><br>&nbsp;"
              + text2;
     }
   else
@@ -420,9 +420,9 @@
 
   QString navigationLinks = QString (
         "<b>Section:</b> <font style=\"color:DarkRed\">%1</font><br>"
-        "<img src=':/actions/icons/arrow_left.png'/> <b>Previous Section:</b> <a href='%2'>%3</a><br>"
-        "<img src=':/actions/icons/arrow_right.png'/> <b>Next Section:</b> <a href='%4'>%5</a><br>"
-        "<img src=':/actions/icons/arrow_up.png'/> <b>Up:</b> <a href='%6'>%7</a><br>\n"
+        "<b>Previous Section:</b> <a href='%2'>%3</a><br>"
+        "<b>Next Section:</b> <a href='%4'>%5</a><br>"
+        "<b>Up:</b> <a href='%6'>%7</a><br>\n"
         )
       .arg (nodeName)
       .arg (QString (QUrl::toPercentEncoding (nodePrev, "", "'")))
@@ -645,7 +645,7 @@
               if (founds == 0)
                 {
                   results.append(
-                    "<br>\n<img src=':/actions/icons/bookmark.png' width=10> <a href='"
+                    "<br>\n<font style=\"color:DarkGray; font-weight:bold;\">&raquo;</font> <a href='"
                     + QString(QUrl::toPercentEncoding(node,"","'")) +
                     "'>");
                   results.append (node);
--- 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 @@
 <RCC>
     <qresource prefix="/actions">
         <file>icons/applications-system.png</file>
+        <file>icons/bp-toggle.png</file>
+        <file>icons/bp-rm-all.png</file>
+        <file>icons/bp-prev.png</file>
+        <file>icons/bp-next.png</file>
+        <file>icons/db-cont.png</file>
+        <file>icons/db-step.png</file>
+        <file>icons/db-step-in.png</file>
+        <file>icons/db-step-out.png</file>
+        <file>icons/db-stop.png</file>
         <file>icons/document-new.png</file>
         <file>icons/document-open.png</file>
         <file>icons/document-print.png</file>
@@ -19,29 +28,14 @@
         <file>icons/go-first.png</file>
         <file>icons/go-last.png</file>
         <file>icons/go-up.png</file>
-        <file>icons/preferences-system.png</file>
-        <file>icons/user-home.png</file>
-        <file>icons/view-refresh.png</file>
-        <file>icons/zoom-in.png</file>
-        <file>icons/zoom-out.png</file>
-        <file>icons/up.png</file>
-        <file>icons/redled.png</file>
-        <file>icons/arrow_right.png</file>
-        <file>icons/arrow_left.png</file>
-        <file>icons/arrow_up.png</file>
-        <file>icons/arrow_down.png</file>
-        <file>icons/bookmark.png</file>
-        <file>icons/logo.png</file>
-        <file>icons/bp-toggle.png</file>
-        <file>icons/bp-rm-all.png</file>
-        <file>icons/bp-prev.png</file>
-        <file>icons/bp-next.png</file>
-        <file>icons/db-cont.png</file>
-        <file>icons/db-step.png</file>
-        <file>icons/db-step-in.png</file>
-        <file>icons/db-step-out.png</file>
-        <file>icons/db-stop.png</file>
-        <file>icons/system-run.png</file>
+        <file>icons/graphic_logo_FilesDockWidget.png</file>
+        <file>icons/graphic_logo_FileEditor.png</file>
+        <file>icons/graphic_logo_NewsDockWidget.png</file>
+        <file>icons/graphic_logo_TerminalDockWidget.png</file>
+        <file>icons/graphic_logo_HistoryDockWidget.png</file>
+        <file>icons/graphic_logo_WorkspaceView.png</file>
+        <file>icons/graphic_logo_DocumentationDockWidget.png</file>
+        <file>icons/graphic_logo_ReleaseWidget.png</file>
         <file>icons/letter_logo_FilesDockWidget.png</file>
         <file>icons/letter_logo_FileEditor.png</file>
         <file>icons/letter_logo_NewsDockWidget.png</file>
@@ -50,20 +44,18 @@
         <file>icons/letter_logo_WorkspaceView.png</file>
         <file>icons/letter_logo_DocumentationDockWidget.png</file>
         <file>icons/letter_logo_ReleaseWidget.png</file>
-        <file>icons/graphic_logo_FilesDockWidget.png</file>
-        <file>icons/graphic_logo_FileEditor.png</file>
-        <file>icons/graphic_logo_NewsDockWidget.png</file>
-        <file>icons/graphic_logo_TerminalDockWidget.png</file>
-        <file>icons/graphic_logo_HistoryDockWidget.png</file>
-        <file>icons/graphic_logo_WorkspaceView.png</file>
-        <file>icons/graphic_logo_DocumentationDockWidget.png</file>
-        <file>icons/graphic_logo_ReleaseWidget.png</file>
-        <file>icons/warning.png</file>
+        <file>icons/logo.png</file>
+        <file>icons/preferences-system.png</file>
+        <file>icons/system-run.png</file>
+        <file>icons/user-home.png</file>
+        <file>icons/view-refresh.png</file>
         <file>icons/widget-close.png</file>
         <file>icons/widget-dock.png</file>
         <file>icons/widget-undock.png</file>
         <file>icons/widget-close-light.png</file>
         <file>icons/widget-dock-light.png</file>
         <file>icons/widget-undock-light.png</file>
+        <file>icons/zoom-in.png</file>
+        <file>icons/zoom-out.png</file>
     </qresource>
 </RCC>