Mercurial > octave-antonio

changeset 20111:82b4fb8b8a28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge away accidental head.
author Rik <rik@octave.org>
date Mon, 20 Apr 2015 20:49:22 -0700
parents 5a4717862648 (diff) 248f2f2e7d48 (current diff)
children 043dcb4da5fc
files
diffstat 2 files changed, 2 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/annotation-dialog.cc	Mon Apr 20 20:46:54 2015 -0700
+++ b/libgui/graphics/annotation-dialog.cc	Mon Apr 20 20:49:22 2015 -0700
@@ -138,6 +138,7 @@
   props.append (ovl ("fontweight", ui->cb_font_bold->isChecked() ? "bold" : "normal" ));
   props.append (ovl ("fontangle", ui->cb_font_italic->isChecked() ? "italic" : "normal" ));
   props.append (ovl ("color", Utils::toRgb (ui->btn_color->palette ().color (QPalette::Button))));
+  props.append (ovl ("linestyle", ui->cb_line_style->currentText ().toStdString ()));
 }
 
 void
--- a/libgui/graphics/annotation-dialog.ui	Mon Apr 20 20:46:54 2015 -0700
+++ b/libgui/graphics/annotation-dialog.ui	Mon Apr 20 20:49:22 2015 -0700
@@ -1317,17 +1317,7 @@
        <widget class="QComboBox" name="cb_line_style">
         <item>
          <property name="text">
-          <string>left</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>middle</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>right</string>
+          <string>none</string>
          </property>
         </item>
        </widget>