[Marble-commits] KDE/kdeedu/marble/src/lib

[Bernhard Beschow]

SVN commit 1224563 by beschow:

MapWizard: have metadata page rather than legend page appear after map source page

pros:
* map source is visualized in metadata page -> better feedback
* legend data is optional, and therefore not as critical as metadata

 M  +1 -1      MapWizard.cpp  
 M  +67 -67    MapWizard.ui  


--- trunk/KDE/kdeedu/marble/src/lib/MapWizard.cpp #1224562:1224563
@@ -590,7 +590,7 @@
         }
     }
 
-    if ( currentId() == 6 ) {
+    if ( currentId() == 5 ) {
         if ( d->uiWidget.lineEditTitle->text().isEmpty() ) {
             QMessageBox::information( this, tr( "Map Title" ), tr( "Please specify a map title." ) );
             d->uiWidget.lineEditTitle->setFocus();
--- trunk/KDE/kdeedu/marble/src/lib/MapWizard.ui #1224562:1224563
@@ -321,73 +321,6 @@
     </item>
    </layout>
   </widget>
-  <widget class="QWizardPage" name="wizardPageLegend">
-   <layout class="QGridLayout" name="gridLayout_3">
-    <item row="0" column="0">
-     <widget class="QLabel" name="labelLegend_2">
-      <property name="text">
-       <string>Legend Image:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QLineEdit" name="lineEditLegend_2"/>
-    </item>
-    <item row="0" column="2">
-     <widget class="QPushButton" name="pushButtonLegend_2">
-      <property name="text">
-       <string>...</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0" colspan="2">
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <widget class="QTextBrowser" name="textBrowserLegend"/>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_6">
-        <item>
-         <widget class="QCheckBox" name="checkBoxInterest">
-          <property name="text">
-           <string>Places of Interest</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="checkBoxPop">
-          <property name="text">
-           <string>Populated Places</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="checkBoxTer">
-          <property name="text">
-           <string>Terrain</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="checkBoxCoord">
-          <property name="text">
-           <string>Coordinate Grid</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="checkBoxBorder">
-          <property name="text">
-           <string>Border Lines</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
   <widget class="QWizardPage" name="wizardPageMetadata">
    <layout class="QGridLayout" name="gridLayout_2">
     <item row="0" column="0" colspan="2">
@@ -527,6 +460,73 @@
     </item>
    </layout>
   </widget>
+  <widget class="QWizardPage" name="wizardPageLegend">
+   <layout class="QGridLayout" name="gridLayout_3">
+    <item row="0" column="0">
+     <widget class="QLabel" name="labelLegend_2">
+      <property name="text">
+       <string>Legend Image:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <widget class="QLineEdit" name="lineEditLegend_2"/>
+    </item>
+    <item row="0" column="2">
+     <widget class="QPushButton" name="pushButtonLegend_2">
+      <property name="text">
+       <string>...</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0" colspan="2">
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QTextBrowser" name="textBrowserLegend"/>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout_6">
+        <item>
+         <widget class="QCheckBox" name="checkBoxInterest">
+          <property name="text">
+           <string>Places of Interest</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBoxPop">
+          <property name="text">
+           <string>Populated Places</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBoxTer">
+          <property name="text">
+           <string>Terrain</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBoxCoord">
+          <property name="text">
+           <string>Coordinate Grid</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBoxBorder">
+          <property name="text">
+           <string>Border Lines</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
   <widget class="QWizardPage" name="wizardPageSummary">
    <layout class="QVBoxLayout" name="verticalLayout_5">
     <item>