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

[Nicolas Brisset]

SVN commit 1220718 by brisset:

More KDE HIG work in the dialogs called from the File menu:
- capitalization
- optimize/harmonize order of file size options between export to graphics and log entry

In the log entry dialog I don't see a lineedit to input the name of the script. I haven't checked before my changes, but I don't see anything in the 
code and I suspect it's not enabled yet. Otherwise, please fix it...


 M  +12 -12    exportgraphicsdialog.cpp  
 M  +6 -6      exportgraphicsdialog.ui  
 M  +12 -12    logdialog.cpp  
 M  +7 -7      logdialog.ui  


--- branches/work/kst/portto4/kst/src/libkstapp/exportgraphicsdialog.cpp #1220717:1220718
@@ -67,30 +67,30 @@
   int displayOption = _comboBoxSizeOption->currentIndex();
 
   switch (displayOption) {
-    case 0:
+  case 0: // Width and Maintain Aspect Ratio
       _xSize->setEnabled(true);
+    _ySize->setEnabled(false);
+    _widthLabel->setEnabled(true);
+    _heightLabel->setEnabled(false);
+    break;
+  case 1: // Height and Maintain Aspect Ratio
+    _xSize->setEnabled(false);
       _ySize->setEnabled(true);
-      _widthLabel->setEnabled(true);
+    _widthLabel->setEnabled(false);
       _heightLabel->setEnabled(true);
       break;
-    case 1:
+  case 2: // Width and Height
       _xSize->setEnabled(true);
-      _ySize->setEnabled(false);
+    _ySize->setEnabled(true);
       _widthLabel->setEnabled(true);
-      _heightLabel->setEnabled(false);
+    _heightLabel->setEnabled(true);
       break;
-    case 2:
+  case 3: // Size of Square
       _xSize->setEnabled(true);
       _ySize->setEnabled(false);
       _widthLabel->setEnabled(true);
       _heightLabel->setEnabled(false);
       break;
-    case 3:
-      _xSize->setEnabled(false);
-      _ySize->setEnabled(true);
-      _widthLabel->setEnabled(false);
-      _heightLabel->setEnabled(true);
-      break;
   }
 }
 
--- branches/work/kst/portto4/kst/src/libkstapp/exportgraphicsdialog.ui #1220717:1220718
@@ -83,7 +83,7 @@
          <string>Do not autosave.  Instead, on OK or Apply, save once.</string>
         </property>
         <property name="text">
-         <string>Sa&amp;ve Once</string>
+         <string>Sa&amp;ve once</string>
         </property>
         <property name="checked">
          <bool>true</bool>
@@ -296,22 +296,22 @@
          <widget class="QComboBox" name="_comboBoxSizeOption">
           <item>
            <property name="text">
-            <string>width and height</string>
+            <string>Width and Maintain Aspect Ratio</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>size of square</string>
+            <string>Height and Maintain Aspect Ratio</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>width, maintaining aspect ratio</string>
+            <string>Width and Height</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>height, maintaining aspect ratio</string>
+            <string>Size of Square</string>
            </property>
           </item>
          </widget>
@@ -340,7 +340,7 @@
    <item row="2" column="0" colspan="2">
     <widget class="QCheckBox" name="_autoExtension">
      <property name="text">
-      <string>Automatic &amp;Extension</string>
+      <string>Automatic &amp;extension</string>
      </property>
      <property name="checked">
       <bool>true</bool>
--- branches/work/kst/portto4/kst/src/libkstapp/logdialog.cpp #1220717:1220718
@@ -176,30 +176,30 @@
   int size_option_index = _sizeOption->currentIndex();
 
   switch (size_option_index) {
-    case 1:
+  case 0: // Width and Maintain Aspect Ratio
       _xSize->setEnabled(true);
+    _ySize->setEnabled(false);
+    _widthLabel->setEnabled(true);
+    _heightLabel->setEnabled(false);
+    break;
+  case 1: // Height and Maintain Aspect Ratio
+    _xSize->setEnabled(false);
       _ySize->setEnabled(true);
-      _widthLabel->setEnabled(true);
+    _widthLabel->setEnabled(false);
       _heightLabel->setEnabled(true);
       break;
-    case 3:
+  case 2: // Width and Height
       _xSize->setEnabled(true);
-      _ySize->setEnabled(false);
+    _ySize->setEnabled(true);
       _widthLabel->setEnabled(true);
-      _heightLabel->setEnabled(false);
+    _heightLabel->setEnabled(true);
       break;
-    case 0:
+  case 3: // Size of Square
       _xSize->setEnabled(true);
       _ySize->setEnabled(false);
       _widthLabel->setEnabled(true);
       _heightLabel->setEnabled(false);
       break;
-    case 2:
-      _xSize->setEnabled(false);
-      _ySize->setEnabled(true);
-      _widthLabel->setEnabled(false);
-      _heightLabel->setEnabled(true);
-      break;
   }
 }
 
--- branches/work/kst/portto4/kst/src/libkstapp/logdialog.ui #1220717:1220718
@@ -101,7 +101,7 @@
        <item row="2" column="0">
         <widget class="QLabel" name="label_4">
          <property name="text">
-          <string>Script Output:</string>
+          <string>Script output:</string>
          </property>
         </widget>
        </item>
@@ -157,22 +157,22 @@
            <widget class="QComboBox" name="_sizeOption">
             <item>
              <property name="text">
-              <string>width, maintaining aspect ratio</string>
+              <string>Width and Maintain Aspect Ratio</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>width and height</string>
+              <string>Height and Maintain Aspect Ratio</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>height, maintaining aspect ratio</string>
+              <string>Width and Height</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>size of square</string>
+              <string>Size of Square</string>
              </property>
             </item>
            </widget>
@@ -292,7 +292,7 @@
             </sizepolicy>
            </property>
            <property name="text">
-            <string>Local Log Directory:</string>
+            <string>Local log directory:</string>
            </property>
            <property name="wordWrap">
             <bool>false</bool>
@@ -325,7 +325,7 @@
          <item row="2" column="0">
           <widget class="QLabel" name="label">
            <property name="text">
-            <string>&amp;User Name:</string>
+            <string>&amp;User name:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>