[Kst] kdeextragear-2/kst/kst

[Barth Netterfield]

CVS commit by netterfield: 

Starting to limit vectorDialog when used to create a new vector...


  M +20 -10    kstvectordialog_i.cpp   1.29
  M +1 -1      kstvectordialog_i.h   1.11
  M +5 -2      vectordialog.ui   1.11


--- kdeextragear-2/kst/kst/kstvectordialog_i.cpp  #1.28:1.29
@@ -90,19 +90,27 @@ void KstVectorDialogI::updateCompletion(
 }
 
-void KstVectorDialogI::show_I() {
-  update();
-  show();
-  raise();
+void KstVectorDialogI::show_I(const QString &field) {
+  int i = kstObjectSubList<KstVector,KstRVector>(KST::vectorList).findIndexTag(field);
+  show_I(i);
 }
 
-void KstVectorDialogI::show_New() {
-  update(-2);
+void KstVectorDialogI::show_I(int i) {
+  update(i);
+
+  Delete->show();
+  Edit->show();
+  Select->setEnabled(true);
+  SelectLabel->setEnabled(true);
+
   show();
   raise();
 }
 
-void KstVectorDialogI::show_I(const QString &field) {
-  int i = kstObjectSubList<KstVector,KstRVector>(KST::vectorList).findIndexTag(field);
-  update(i);
+void KstVectorDialogI::show_New() {
+  update(-2);
+  Delete->hide();
+  Edit->hide();
+  Select->setEnabled(false);
+  SelectLabel->setEnabled(false);
   show();
   raise();
@@ -218,5 +226,7 @@ void KstVectorDialogI::update(int new_in
     Delete->setEnabled(false);
   } else {
-    Delete->setEnabled(vector->getUsage() == 2);
+    if (vector->getUsage() == 2) {
+      Delete->setEnabled(true);
+    }
   }
 }

--- kdeextragear-2/kst/kst/kstvectordialog_i.h  #1.10:1.11
@@ -37,5 +37,5 @@ public slots:
 
   /** Calls update(), then shows/raises the dialog */
-  void show_I();
+  void show_I(int i = -1);
   void show_I(const QString &field);
   void show_New();

--- kdeextragear-2/kst/kst/vectordialog.ui  #1.10:1.11
@@ -10,5 +10,5 @@
             <y>0</y>
             <width>466</width>
-            <height>271</height>
+            <height>275</height>
         </rect>
     </property>
@@ -41,5 +41,5 @@
                 <widget class="QLabel">
                     <property name="name">
-                        <cstring>textLabel1</cstring>
+                        <cstring>SelectLabel</cstring>
                     </property>
                     <property name="sizePolicy">
@@ -481,4 +481,7 @@
                         <string>A&amp;pply Edits</string>
                     </property>
+                    <property name="accel">
+                        <string>Alt+P</string>
+                    </property>
                     <property name="default">
                         <bool>true</bool>