Merge pull request #724 from Susurrus/dataplot_ui2

Plotting data now defaults to drawing a line with no symbols.

src/ui/QGCDataPlot2D.ui

@@ -36,9 +36,12 @@
    </item>
    <item row="0" column="5" colspan="2">
     <widget class="QComboBox" name="style">
+     <property name="toolTip">
+      <string>Set line style</string>
+     </property>
      <item>
       <property name="text">
-       <string>Style..</string>
+       <string>Only lines</string>
       </property>
      </item>
      <item>
@@ -58,11 +61,6 @@
      </item>
      <item>
       <property name="text">
-       <string>Only symbols</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
        <string>Lines and crosses</string>
       </property>
      </item>
@@ -78,11 +76,6 @@
      </item>
      <item>
       <property name="text">
-       <string>Lines and symbols</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
        <string>Dotted lines and crosses</string>
       </property>
      </item>