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

[Adam Treat]

SVN commit 720205 by treat:

* Fix typo in databutton
* Fix typo in plotitem that was affecting topLabel


 M  +3 -3      curvedialog.cpp  
 M  +1 -1      databutton.cpp  
 M  +1 -1      plotitem.cpp  
 M  +0 -2      plotrenderitem.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/curvedialog.cpp #720204:720205
@@ -151,10 +151,10 @@
   KstRelationList relationList;
   relationList.append(kst_cast<KstRelation>(curve));
 
-  VectorCurveRenderItem *test = new VectorCurveRenderItem("cartesiantest", plotItem);
-  test->setRelationList(relationList);
+  VectorCurveRenderItem *vectorCurve = new VectorCurveRenderItem("vectorCurve", plotItem);
+  vectorCurve->setRelationList(relationList);
 
-  plotItem->addRenderItem(test);
+  plotItem->addRenderItem(vectorCurve);
 
   return KstObjectPtr(curve.data());
 }
--- branches/work/kst/portto4/kst/src/libkstapp/databutton.cpp #720204:720205
@@ -22,7 +22,7 @@
   setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
   setStyleSheet("QPushButton {"
-                  "border: 1px solid;"
+                  "border: 0px solid;"
                   "background-color: white;"
                   "text-align: left;"
                   "margin: 5;"
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #720204:720205
@@ -310,7 +310,7 @@
   painter->save();
   QRectF topLabelRect = horizontalLabelRect(false);
   topLabelRect.moveTopLeft(QPointF(marginWidth(), 0.0));
-  painter->drawText(topLabelRect, Qt::TextWordWrap | Qt::AlignCenter, bottomLabel());
+  painter->drawText(topLabelRect, Qt::TextWordWrap | Qt::AlignCenter, topLabel());
   painter->restore();
 }
 
--- branches/work/kst/portto4/kst/src/libkstapp/plotrenderitem.cpp #720204:720205
@@ -114,8 +114,6 @@
   foreach (KstRelationPtr relation, relationList()) {
     if (!relation->xLabel().isEmpty() && relation->xLabel() != bottom)
       return relation->xLabel();
-    if (!relation->topLabel().isEmpty())
-      return relation->topLabel();
   }
   return QString();
 }