Mercurial > octave-nkf
changeset 20144:5a4717862648
annotation-dialog: default linestyle to none
* libgui/graphics/annotation-dialog.cc
(annotation_dialog::get_gui_props): set linestyle to none
* libgui/graphics/annotation-dialog.ui:
set cb_line_style combo value to none
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Mon, 20 Apr 2015 22:48:11 -0400 |
parents | de1377a638d7 |
children | 82b4fb8b8a28 |
files | libgui/graphics/annotation-dialog.cc libgui/graphics/annotation-dialog.ui |
diffstat | 2 files changed, 2 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/annotation-dialog.cc Tue Apr 21 00:24:35 2015 +0200 +++ b/libgui/graphics/annotation-dialog.cc Mon Apr 20 22:48:11 2015 -0400 @@ -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 Tue Apr 21 00:24:35 2015 +0200 +++ b/libgui/graphics/annotation-dialog.ui Mon Apr 20 22:48:11 2015 -0400 @@ -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>