[Kst] extragear/graphics/kst

[Barth Netterfield]

SVN commit 484574 by netterfield:

more viewlabel tweaks, and update ToDo.



 M  +3 -23     devel-docs/PlotUIFixes  
 M  +1 -1      kst/ksteditviewobjectdialog_i.cpp  
 M  +1 -0      kst/kstviewlabel.cpp  


--- trunk/extragear/graphics/kst/devel-docs/PlotUIFixes #484573:484574
@@ -15,29 +15,7 @@
  viewobject which fully contains it (could be the top level view).
 
 -Change text mode as follows:
-	-Add a Scalar Selection Combo box to the text dialog
-	-Change the order to: 
-		-Scalar list combo, Text, font, font size, 
-		 Resize label for text, H Justification,
-		 V Justification, data precision, Rotation,
-		 Transparent fill, Font colour, box properties
-	-on opening a text edit dialog, give focus to the text entry
 	-Set the icon to the text '|' icon.
-	-On single click open the text edit dialog with the following settings:
-		-Transparent fill selected
-		-Resize for label selected
-		-Horizontal Justification Left
-		-Vertical Justification Center
-		-Border width 0
-	 On OK, the label will be inserted at the click location.
-	-On a drag behave as it currently does (turn the mouse icon to the arrow during
-	 the drag), except change the label dialog defaults to:
-		-Transparent fill not selected 
-		-Resize for label not selected
-		-Horizontal Justification Center
-		-Vertical Justification Center
-		-Border width 2
-	 At the end of the drag, insert the label in the box.
 
 -View objects which are children of 2dplots need to be positioned relative to the
  axis box, not relative to the whole kst2dplot, so that if, eg, the axis label font
@@ -55,4 +33,6 @@
 - Dragging a view object and dropping it on the desktop crashes Kst
 - The mouse handler stuff needs to be genericized - it's too difficult to add
   new objects.
--
+- if 'cancel' is selected from the viewobjectdialogs when creating a new object,
+  the object is not deleted, and hangs around as an invisible, uneditable ghost.
+
--- trunk/extragear/graphics/kst/kst/ksteditviewobjectdialog_i.cpp #484573:484574
@@ -96,10 +96,10 @@
   if (_viewObject) {
     _customWidget = _viewObject->configWidget();
     if (_customWidget) {
-      _viewObject->fillConfigWidget(_customWidget);
       _grid = new QGridLayout(_propertiesFrame, 1, 1);
       _customWidget->reparent(_propertiesFrame, QPoint(0, 0));
       _grid->addWidget(_customWidget, 0, 0);
+      _viewObject->fillConfigWidget(_customWidget);
       return;
     }
     
--- trunk/extragear/graphics/kst/kst/kstviewlabel.cpp #484573:484574
@@ -580,6 +580,7 @@
     widget->_boxColors->setBackground(backgroundColor());
     widget->_margin->setValue(padding());
   }
+  widget->_text->setFocus();
   return true;
 }