[Kst] branches/work/kst/portto4/kst/src

[Barth Netterfield]

SVN commit 1225051 by netterfield:

BUG:
Fix invisible point type in curveappearance in edit multiple mode.
Fix default font size for legends (but the default isn't sticky yet).



 M  +1 -1      libkstapp/legenditem.cpp  
 M  +5 -0      widgets/curveappearance.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/legenditem.cpp #1225050:1225051
@@ -254,7 +254,7 @@
   font.fromString(_dialogDefaults->value("legend/font",font.toString()).toString());
   setFont(font);
 
-  setFontScale(_dialogDefaults->value("legend/fontScale", 0.0).toDouble());
+  setFontScale(_dialogDefaults->value("legend/fontScale", 12.0).toDouble());
   _verticalDisplay = _dialogDefaults->value("legend/verticalDisplay",true).toBool();
 
    // set the pen
--- branches/work/kst/portto4/kst/src/widgets/curveappearance.cpp #1225050:1225051
@@ -75,6 +75,9 @@
 
 
 void CurveAppearance::populateSymbolCombo(QComboBox *combo, QColor symbolColor) {
+  if (symbolColor == Qt::transparent) {
+    symbolColor = Qt::black;
+  }
   QStyleOptionComboBox option;
   option.initFrom(combo);
   option.currentIcon = combo->itemIcon(combo->currentIndex());
@@ -361,7 +364,9 @@
 
 void CurveAppearance::clearValues() {
   _color->clearSelection();
+  _headColor->clearSelection();
   _spinBoxLineWidth->clear();
+  _comboHeadSymbol->setCurrentIndex(-1);
   _comboPointSymbol->setCurrentIndex(-1);
   _comboPointDensity->setCurrentIndex(-1);
   _comboLineStyle->setCurrentIndex(-1);