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

Torsten Rahn tackat at kde.org
Sun Aug 8 12:32:24 CEST 2010 

SVN commit 1160561 by rahn:


Added layout and a few fixes to the bookmark dialogs.



 M  +94 -93    BookmarkInfoDialog.ui  
 M  +55 -28    NameDialog.ui  


--- trunk/KDE/kdeedu/marble/src/lib/BookmarkInfoDialog.ui #1160560:1160561
@@ -6,132 +6,133 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>307</width>
-    <height>234</height>
+    <width>452</width>
+    <height>303</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::ExpandingFieldsGrow</enum>
+     </property>
+     <item row="0" column="0">
   <widget class="QLabel" name="name_lbl">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>20</y>
-     <width>62</width>
-     <height>18</height>
-    </rect>
+       <property name="text">
+        <string>&amp;Name</string>
    </property>
+       <property name="buddy">
+        <cstring>name</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="name">
    <property name="text">
-    <string>Name</string>
+        <string>Bookmark</string>
    </property>
+       <property name="cursorPosition">
+        <number>0</number>
+       </property>
   </widget>
+     </item>
+     <item row="1" column="0">
   <widget class="QLabel" name="description_lbl">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>50</y>
-     <width>81</width>
-     <height>18</height>
-    </rect>
-   </property>
    <property name="text">
-    <string>Description</string>
+        <string>&amp;Description</string>
    </property>
-  </widget>
-  <widget class="QLineEdit" name="name">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>20</y>
-     <width>151</width>
-     <height>21</height>
-    </rect>
+       <property name="buddy">
+        <cstring>description</cstring>
    </property>
-   <property name="text">
-    <string>Name</string>
-   </property>
   </widget>
+     </item>
+     <item row="1" column="1">
   <widget class="QTextEdit" name="description">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>50</y>
-     <width>151</width>
-     <height>91</height>
-    </rect>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
    </property>
    <property name="html">
     <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Description&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
+&lt;tr&gt;
+&lt;td style=&quot;border: none;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
   </widget>
-  <widget class="QPushButton" name="m_saveButton">
-   <property name="geometry">
-    <rect>
-     <x>120</x>
-     <y>190</y>
-     <width>71</width>
-     <height>28</height>
-    </rect>
-   </property>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="folder_lbl">
    <property name="text">
-    <string>Save</string>
+        <string>&amp;Folder</string>
    </property>
+       <property name="buddy">
+        <cstring>m_folders</cstring>
+       </property>
   </widget>
-  <widget class="QPushButton" name="m_cancelButton">
-   <property name="geometry">
-    <rect>
-     <x>210</x>
-     <y>190</y>
-     <width>71</width>
-     <height>28</height>
-    </rect>
+     </item>
+     <item row="2" column="1">
+      <widget class="QComboBox" name="m_folders"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
    </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="m_newFolderButton">
    <property name="text">
-    <string>Cancel</string>
+        <string>&amp;Add Folder</string>
    </property>
   </widget>
-  <widget class="QLabel" name="folder_lbl">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>150</y>
-     <width>62</width>
-     <height>18</height>
-    </rect>
-   </property>
+     </item>
+     <item>
+      <widget class="QPushButton" name="m_saveButton">
    <property name="text">
-    <string>Folder</string>
+        <string>&amp;OK</string>
    </property>
   </widget>
-  <widget class="QComboBox" name="m_folders">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>150</y>
-     <width>151</width>
-     <height>27</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="m_newFolderButton">
-   <property name="geometry">
-    <rect>
-     <x>21</x>
-     <y>190</y>
-     <width>81</width>
-     <height>28</height>
-    </rect>
-   </property>
+     </item>
+     <item>
+      <widget class="QPushButton" name="m_cancelButton">
    <property name="text">
-    <string>Add Folder</string>
+        <string>&amp;Cancel</string>
    </property>
   </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
  </widget>
+ <tabstops>
+  <tabstop>name</tabstop>
+  <tabstop>description</tabstop>
+  <tabstop>m_folders</tabstop>
+  <tabstop>m_newFolderButton</tabstop>
+  <tabstop>m_saveButton</tabstop>
+  <tabstop>m_cancelButton</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
@@ -141,8 +142,8 @@
    <slot>close()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>145</x>
-     <y>173</y>
+     <x>404</x>
+     <y>273</y>
     </hint>
     <hint type="destinationlabel">
      <x>139</x>
@@ -157,8 +158,8 @@
    <slot>close()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>225</x>
-     <y>173</y>
+     <x>441</x>
+     <y>273</y>
     </hint>
     <hint type="destinationlabel">
      <x>139</x>
--- trunk/KDE/kdeedu/marble/src/lib/NameDialog.ui #1160560:1160561
@@ -6,49 +6,76 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>237</width>
-    <height>94</height>
+    <width>302</width>
+    <height>67</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <widget class="QLineEdit" name="m_name">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>20</y>
-     <width>191</width>
-     <height>31</height>
-    </rect>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="m_namelbl">
+       <property name="text">
+        <string>&amp;Name</string>
    </property>
+       <property name="buddy">
+        <cstring>m_name</cstring>
+       </property>
   </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="m_name"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
   <widget class="QPushButton" name="m_save">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>60</y>
-     <width>81</width>
-     <height>28</height>
-    </rect>
-   </property>
    <property name="text">
-    <string>Ok</string>
+        <string>&amp;OK</string>
    </property>
   </widget>
+     </item>
+     <item>
   <widget class="QPushButton" name="m_cancel">
-   <property name="geometry">
-    <rect>
-     <x>130</x>
-     <y>60</y>
-     <width>81</width>
-     <height>28</height>
-    </rect>
-   </property>
    <property name="text">
-    <string>Cancel</string>
+        <string>&amp;Cancel</string>
    </property>
   </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections>

More information about the Marble-commits mailing list