# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1429584491 14400
# Node ID 5a47178626482b882f2c56eca2c028f1d7721e37
# Parent  de1377a638d7df0e6116febb1a149470d58ca6ca
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

diff -r de1377a638d7 -r 5a4717862648 libgui/graphics/annotation-dialog.cc
--- 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
diff -r de1377a638d7 -r 5a4717862648 libgui/graphics/annotation-dialog.ui
--- 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>