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

[Barth Netterfield]

SVN commit 958274 by netterfield:

More accelerators
fix a crash case.



 M  +2 -2      devel-docs/Kst2Specs/Bugs  
 M  +1 -1      src/libkstapp/curvetab.ui  
 M  +10 -8     src/libkstapp/histogramdialog.cpp  
 M  +5 -9      src/libkstapp/histogramtab.ui  
 M  +2 -2      src/widgets/curveappearance.ui  
 M  +1 -1      src/widgets/curveplacement.ui  


--- branches/work/kst/portto4/kst/devel-docs/Kst2Specs/Bugs #958273:958274
@@ -16,11 +16,11 @@
 
 -------------
 
-Loading a kst file does not seem to work at all:
+Loading a kst files does not seem to work:
   -run kst
   -with the wizard, make a plot with three curves
   -save it.
-  -restart kst, loading the file from the command line (./run-kst tmp.kst)
+  -restart kst and load the kst file you just created.
  kst gives an 'invalid Tag' error, and no plots are shown.
 
 ---------------TO BE DONE AFTER BETA--------------------------------
--- branches/work/kst/portto4/kst/src/libkstapp/curvetab.ui #958273:958274
@@ -186,7 +186,7 @@
        <item>
         <widget class="QCheckBox" name="_ignoreAutoScale" >
          <property name="text" >
-          <string>Ign&amp;ore in automatic axes range calculations</string>
+          <string>I&amp;gnore in automatic axes range calculations</string>
          </property>
         </widget>
        </item>
--- branches/work/kst/portto4/kst/src/libkstapp/histogramdialog.cpp #958273:958274
@@ -91,15 +91,17 @@
 
   VectorPtr selectedVector = vector();
 
-  selectedVector->readLock(); // Hmm should we really lock here?  AutoBin should I think
-  int n;
-  double max, min;
-  Histogram::AutoBin(selectedVector, &n, &max, &min);
-  selectedVector->unlock();
+  if (selectedVector) {
+    selectedVector->readLock(); // Hmm should we really lock here?  AutoBin should I think
+    int n;
+    double max, min;
+    Histogram::AutoBin(selectedVector, &n, &max, &min);
+    selectedVector->unlock();
 
-  _numberOfBins->setValue(n);
-  _min->setText(QString::number(min));
-  _max->setText(QString::number(max));
+    _numberOfBins->setValue(n);
+    _min->setText(QString::number(min));
+    _max->setText(QString::number(max));
+  }
 }
 
 
--- branches/work/kst/portto4/kst/src/libkstapp/histogramtab.ui #958273:958274
@@ -69,7 +69,7 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>Bins from:</string>
+         <string>Bins from&amp;:</string>
         </property>
         <property name="alignment" >
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -142,7 +142,7 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>Num bins:</string>
+         <string>Num bin&amp;s:</string>
         </property>
         <property name="alignment" >
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -201,7 +201,7 @@
         <item>
          <widget class="QCheckBox" name="_realTimeAutoBin" >
           <property name="text" >
-           <string>&amp;Real-time auto bin</string>
+           <string>Real&amp;-time auto bin</string>
           </property>
          </widget>
         </item>
@@ -228,7 +228,7 @@
          <string>The Y axis of the histogram reports the percent of the samples in the bin.</string>
         </property>
         <property name="text" >
-         <string>&amp;Percent in bin</string>
+         <string>Percent&amp; in bin</string>
         </property>
        </widget>
       </item>
@@ -248,7 +248,7 @@
          <string>The Y axis of the histogram reports the number of samples in the bin.</string>
         </property>
         <property name="text" >
-         <string>&amp;Number in bin</string>
+         <string>Numbe&amp;r in bin</string>
         </property>
         <property name="checked" >
          <bool>true</bool>
@@ -278,10 +278,6 @@
     <widget class="Kst::CurvePlacement" native="1" name="_curvePlacement" />
    </item>
   </layout>
-  <zorder>ButtonGroup1_3</zorder>
-  <zorder>ButtonGroup5</zorder>
-  <zorder>_curveAppearance</zorder>
-  <zorder>_curvePlacement</zorder>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
--- branches/work/kst/portto4/kst/src/widgets/curveappearance.ui #958273:958274
@@ -232,7 +232,7 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>Type&amp;:</string>
+         <string>&amp;Type:</string>
         </property>
         <property name="wordWrap" >
          <bool>false</bool>
@@ -324,7 +324,7 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>Ty&amp;pe:</string>
+         <string>&amp;Type:</string>
         </property>
         <property name="wordWrap" >
          <bool>false</bool>
--- branches/work/kst/portto4/kst/src/widgets/curveplacement.ui #958273:958274
@@ -123,7 +123,7 @@
          <item>
           <widget class="QRadioButton" name="_autoLayout" >
            <property name="text" >
-            <string>Au&amp;tomatic Layout</string>
+            <string>Automati&amp;c Layout</string>
            </property>
            <property name="checked" >
             <bool>true</bool>