Use fixed size for the Wizard dialog.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3813 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/wizard/BProject.py b/wizard/BProject.py
index 4564f79d418bbf2561164809c6b0fd62e020b6bb..366e9a7525058b504d94c60c69b859df4f9b598b 100644 (file)
--- a/wizard/BProject.py
+++ b/wizard/BProject.py
@@ -368,10 +368,6 @@ class BProject(object):
         # Copyt the new *_user.mk file
         self._writeUserMkFileFromPreset()
 
-        if self.infos["EMPTY_MAIN"]:
-            # Create and empty main.c file only if the user check the box
-            self._writeMainFile(self.prjdir + "/main.c")
-
         # Create project files for selected plugins
         self._createProjectFiles()
 

diff --git a/wizard/BWizard.py b/wizard/BWizard.py
index 55f913d65339bc8fb6998debc56a2a377b13e896..56d379437c3047e023033911f4e7356020deeeca 100644 (file)
--- a/wizard/BWizard.py
+++ b/wizard/BWizard.py
@@ -60,6 +60,7 @@ class BWizard(QWizard):
 
     def __init__(self, page_list):
         QWizard.__init__(self)
+        self.setFixedSize(800, 500)
         self.setWindowTitle(self.tr("Create a BeRTOS project - rev.%1").arg(wizard_version))
         self.setWindowIcon(QIcon(":/images/appicon.png"))
         self.setOption(QWizard.DisabledBackButtonOnLastPage, True)

diff --git a/wizard/ui/bertos_versions.ui b/wizard/ui/bertos_versions.ui
index 7336a614308aca771d6e66b129d425832a350e0b..59a103737712c6d024fa4729ac679aef0f479363 100644 (file)
--- a/wizard/ui/bertos_versions.ui
+++ b/wizard/ui/bertos_versions.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>Form</class>
- <widget class="QWidget" name="Form" >
-  <property name="geometry" >
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,45 +10,52 @@
     <height>371</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2" >
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout" >
+    <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0">
      <item>
-      <widget class="QListWidget" name="versionList" />
+      <widget class="QListWidget" name="versionList">
+       <property name="minimumSize">
+        <size>
+         <width>300</width>
+         <height>100</height>
+        </size>
+       </property>
+      </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout" >
+      <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
-        <widget class="QToolButton" name="addButton" >
-         <property name="minimumSize" >
+        <widget class="QToolButton" name="addButton">
+         <property name="minimumSize">
           <size>
            <width>26</width>
            <height>26</height>
           </size>
          </property>
-         <property name="maximumSize" >
+         <property name="maximumSize">
           <size>
            <width>26</width>
            <height>26</height>
           </size>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>+</string>
          </property>
-         <property name="icon" >
-          <iconset resource="bertos.qrc" >
+         <property name="icon">
+          <iconset resource="../bertos.qrc">
            <normaloff>:/images/listadd.png</normaloff>:/images/listadd.png</iconset>
          </property>
-         <property name="iconSize" >
+         <property name="iconSize">
           <size>
            <width>16</width>
            <height>16</height>
@@ -56,27 +64,27 @@
         </widget>
        </item>
        <item>
-        <widget class="QToolButton" name="removeButton" >
-         <property name="minimumSize" >
+        <widget class="QToolButton" name="removeButton">
+         <property name="minimumSize">
           <size>
            <width>26</width>
            <height>26</height>
           </size>
          </property>
-         <property name="maximumSize" >
+         <property name="maximumSize">
           <size>
            <width>26</width>
            <height>26</height>
           </size>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>-</string>
          </property>
-         <property name="icon" >
-          <iconset resource="bertos.qrc" >
+         <property name="icon">
+          <iconset resource="../bertos.qrc">
            <normaloff>:/images/listremove.png</normaloff>:/images/listremove.png</iconset>
          </property>
-         <property name="iconSize" >
+         <property name="iconSize">
           <size>
            <width>16</width>
            <height>16</height>
@@ -85,11 +93,11 @@
         </widget>
        </item>
        <item>
-        <spacer name="horizontalSpacer" >
-         <property name="orientation" >
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
            <height>20</height>
@@ -98,20 +106,20 @@
         </spacer>
        </item>
        <item>
-        <widget class="QToolButton" name="updateButton" >
-         <property name="minimumSize" >
+        <widget class="QToolButton" name="updateButton">
+         <property name="minimumSize">
           <size>
            <width>0</width>
            <height>26</height>
           </size>
          </property>
-         <property name="maximumSize" >
+         <property name="maximumSize">
           <size>
            <width>16777215</width>
            <height>26</height>
           </size>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>Update</string>
          </property>
         </widget>
@@ -123,7 +131,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="bertos.qrc" />
+  <include location="../bertos.qrc"/>
  </resources>
  <connections/>
 </ui>

diff --git a/wizard/ui/board_select.ui b/wizard/ui/board_select.ui
index 9994953105337508a89265a06a8f7fc1a525d227..70f028520b3aa3ee29ed6908e555be7be247d765 100644 (file)
--- a/wizard/ui/board_select.ui
+++ b/wizard/ui/board_select.ui
@@ -13,35 +13,44 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="2,3">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
-      <widget class="QListWidget" name="boardList"/>
+      <widget class="QListWidget" name="boardList">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
+    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
      <item>
       <widget class="QLabel" name="imageLabel">
        <property name="text">
         <string/>
        </property>
-      </widget>
-     </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 name="wordWrap">
+        <bool>true</bool>
        </property>
-      </spacer>
+      </widget>
      </item>
      <item>
       <widget class="QLabel" name="descriptionLabel">

diff --git a/wizard/ui/cpu_select.ui b/wizard/ui/cpu_select.ui
index 5d40d0aad7b8a5817c2631ddd588c508ef577646..0b4fab051d02f1508f45a9eea0134c77c8219f45 100644 (file)
--- a/wizard/ui/cpu_select.ui
+++ b/wizard/ui/cpu_select.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>459</width>
-    <height>246</height>
+    <width>579</width>
+    <height>452</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,33 +19,57 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0">
+  <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,0">
    <item>
-    <widget class="QSplitter" name="splitter">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <widget class="QListWidget" name="cpuList">
-      <property name="maximumSize">
-       <size>
-        <width>150</width>
-        <height>16777215</height>
-       </size>
-      </property>
-     </widget>
-     <widget class="QLabel" name="descriptionLabel">
-      <property name="text">
-       <string>Select a CPU from the list...</string>
-      </property>
-     </widget>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="2,3">
+     <item>
+      <widget class="QListWidget" name="cpuList">
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="descriptionLabel">
+         <property name="text">
+          <string>Select a CPU from the list...</string>
+         </property>
+        </widget>
+       </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>
+      </layout>
+     </item>
+    </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,1">
      <item>
       <widget class="QLabel" name="frequencyLabel">
        <property name="text">
-        <string>CPU frequency</string>
+        <string>CPU frequency:</string>
        </property>
        <property name="buddy">
         <cstring>frequencySpinBox</cstring>
@@ -71,6 +95,19 @@
        </property>
       </widget>
      </item>
+     <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>
     </layout>
    </item>
   </layout>

diff --git a/wizard/ui/dir_select.ui b/wizard/ui/dir_select.ui
index 6e60aab99efd3df2640e2ee2a6f5f624e5010ba7..030ef28645b48146b7d8d195d7c48669ff4385d4 100644 (file)
--- a/wizard/ui/dir_select.ui
+++ b/wizard/ui/dir_select.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>401</width>
-    <height>250</height>
+    <width>558</width>
+    <height>314</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,97 +19,95 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1,0">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>Project Name</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>Destination directory</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
+    <layout class="QGridLayout" name="gridLayout" columnstretch="0,10,1">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Project Name</string>
+       </property>
+      </widget>
      </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <widget class="QLineEdit" name="nameEdit"/>
-         </item>
-         <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>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QLineEdit" name="directoryEdit"/>
-         </item>
-         <item>
-          <widget class="QToolButton" name="directoryButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>26</horstretch>
-             <verstretch>26</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>26</width>
-             <height>26</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>26</width>
-             <height>26</height>
-            </size>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="icon">
-            <iconset resource="../bertos.qrc">
-             <normaloff>:/images/folderopen.png</normaloff>:/images/folderopen.png</iconset>
-           </property>
-           <property name="iconSize">
-            <size>
-             <width>26</width>
-             <height>26</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="nameEdit">
+       <property name="minimumSize">
+        <size>
+         <width>300</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <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 row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Destination directory</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="directoryEdit">
+       <property name="minimumSize">
+        <size>
+         <width>300</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QToolButton" name="directoryButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>26</horstretch>
+         <verstretch>26</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>26</width>
+         <height>26</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>26</width>
+         <height>26</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../bertos.qrc">
+         <normaloff>:/images/folderopen.png</normaloff>:/images/folderopen.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>26</width>
+         <height>26</height>
+        </size>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,1">
      <item>
       <widget class="QLabel" name="label_3">
        <property name="maximumSize">
@@ -130,8 +128,34 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </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>159</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <widget class="QLabel" name="warningLabel">
      <property name="text">

diff --git a/wizard/ui/final_page.ui b/wizard/ui/final_page.ui
index 5b59df9f1930daf7e5324815706c52a51e62f089..c3c554ff991ad8dde72df3ba70018ed1e6c4eef6 100644 (file)
--- a/wizard/ui/final_page.ui
+++ b/wizard/ui/final_page.ui
@@ -6,16 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>483</width>
-    <height>206</height>
+    <width>584</width>
+    <height>321</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
      <item>
       <widget class="QLabel" name="iconLabel">
        <property name="sizePolicy">
@@ -63,7 +63,7 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>455</width>
+        <width>556</width>
         <height>76</height>
        </rect>
       </property>

diff --git a/wizard/ui/module_select.ui b/wizard/ui/module_select.ui
index 6efa7741d1ed2944f75b07baaa25cb17f527e270..54e4580c5d710aeb812d131a7bae300319290748 100644 (file)
--- a/wizard/ui/module_select.ui
+++ b/wizard/ui/module_select.ui
@@ -19,28 +19,23 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="2,0,3">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_3">
+    <layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,0">
      <item>
       <widget class="QTreeWidget" name="moduleTree">
        <property name="minimumSize">
         <size>
-         <width>175</width>
+         <width>150</width>
          <height>0</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>175</width>
+         <width>16777215</width>
          <height>16777215</height>
         </size>
        </property>
-       <column>
-        <property name="text">
-         <string>1</string>
-        </property>
-       </column>
       </widget>
      </item>
      <item>
@@ -80,7 +75,7 @@ dependecies</string>
     </layout>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2">
+    <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1,0">
      <item>
       <widget class="QLabel" name="moduleLabel">
        <property name="text">
@@ -90,6 +85,12 @@ dependecies</string>
      </item>
      <item>
       <widget class="QTableWidget" name="propertyTable">
+       <property name="minimumSize">
+        <size>
+         <width>200</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="editTriggers">
         <set>QAbstractItemView::NoEditTriggers</set>
        </property>

diff --git a/wizard/ui/preset_page.ui b/wizard/ui/preset_page.ui
index 3418f1200c0df12dcd788921ee1fb7ae7790157b..a7c6c5078a3482be862478b3d2ebdb472989a105 100644 (file)
--- a/wizard/ui/preset_page.ui
+++ b/wizard/ui/preset_page.ui
@@ -13,9 +13,16 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="2,3">
    <item>
-    <widget class="QListWidget" name="presetList"/>
+    <widget class="QListWidget" name="presetList">
+     <property name="minimumSize">
+      <size>
+       <width>150</width>
+       <height>0</height>
+      </size>
+     </property>
+    </widget>
    </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">

diff --git a/wizard/ui/project_creation.ui b/wizard/ui/project_creation.ui
index 19ffc2f660cea50e4cfdf68f1ab9c6eaf62f78a5..af4f585b68c7a36e0e5ae24de948afa3030174c6 100644 (file)
--- a/wizard/ui/project_creation.ui
+++ b/wizard/ui/project_creation.ui
@@ -15,13 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QTreeWidget" name="summaryTree">
-     <column>
-      <property name="text">
-       <string>1</string>
-      </property>
-     </column>
-    </widget>
+    <widget class="QTreeWidget" name="summaryTree"/>
    </item>
   </layout>
  </widget>

diff --git a/wizard/ui/project_type_select.ui b/wizard/ui/project_type_select.ui
index be438c286a81ec9e6221972b1329a3599d57a9d7..67c27bebf45377655af2e1220d66e1a751c4e340 100644 (file)
--- a/wizard/ui/project_type_select.ui
+++ b/wizard/ui/project_type_select.ui
@@ -13,11 +13,11 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>Project type</string>
+      <string/>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
@@ -40,6 +40,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>194</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>

diff --git a/wizard/ui/route_select.ui b/wizard/ui/route_select.ui
index 3c24bbe888e46c803d30baeadc5a376ebfd70fa4..9dc6ec2e0f4dc4406e8dde6eab00fd5e6c301c34 100644 (file)
--- a/wizard/ui/route_select.ui
+++ b/wizard/ui/route_select.ui
@@ -13,23 +13,45 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
    <item>
-    <widget class="QRadioButton" name="baseButton">
-     <property name="text">
-      <string>Base</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string/>
      </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QRadioButton" name="baseButton">
+        <property name="text">
+         <string>Base</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="advancedButton">
+        <property name="text">
+         <string>Advanced</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>
-    <widget class="QRadioButton" name="advancedButton">
-     <property name="text">
-      <string>Advanced</string>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-    </widget>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>194</height>
+      </size>
+     </property>
+    </spacer>
    </item>
   </layout>
  </widget>

diff --git a/wizard/ui/toolchain_search.ui b/wizard/ui/toolchain_search.ui
index bb16650295e9b0bf62c887cffc693b6e06d750c4..eeb5af0192783db363d72346e56c0813e2edc937 100644 (file)
--- a/wizard/ui/toolchain_search.ui
+++ b/wizard/ui/toolchain_search.ui
@@ -1,94 +1,102 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>Form</class>
- <widget class="QWidget" name="Form" >
-  <property name="geometry" >
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>350</width>
-    <height>290</height>
+    <width>618</width>
+    <height>372</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2" >
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="QCheckBox" name="pathBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+    <widget class="QCheckBox" name="pathBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Search in PATH</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Custom directories</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout" >
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QListWidget" name="customDirList" />
+       <widget class="QListWidget" name="customDirList">
+        <property name="minimumSize">
+         <size>
+          <width>200</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout" >
+       <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
-         <widget class="QToolButton" name="addButton" >
-          <property name="minimumSize" >
+         <widget class="QToolButton" name="addButton">
+          <property name="minimumSize">
            <size>
             <width>26</width>
             <height>26</height>
            </size>
           </property>
-          <property name="maximumSize" >
+          <property name="maximumSize">
            <size>
             <width>26</width>
             <height>26</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string/>
           </property>
-          <property name="icon" >
-           <iconset resource="bertos.qrc" >
+          <property name="icon">
+           <iconset resource="../bertos.qrc">
             <normaloff>:/images/listadd.png</normaloff>:/images/listadd.png</iconset>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QToolButton" name="removeButton" >
-          <property name="minimumSize" >
+         <widget class="QToolButton" name="removeButton">
+          <property name="minimumSize">
            <size>
             <width>26</width>
             <height>26</height>
            </size>
           </property>
-          <property name="maximumSize" >
+          <property name="maximumSize">
            <size>
             <width>26</width>
             <height>26</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string/>
           </property>
-          <property name="icon" >
-           <iconset resource="bertos.qrc" >
+          <property name="icon">
+           <iconset resource="../bertos.qrc">
             <normaloff>:/images/listremove.png</normaloff>:/images/listremove.png</iconset>
           </property>
          </widget>
         </item>
         <item>
-         <spacer name="horizontalSpacer" >
-          <property name="orientation" >
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
@@ -102,13 +110,13 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2" >
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <spacer name="horizontalSpacer_2" >
-       <property name="orientation" >
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -117,15 +125,15 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="cancelButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
         <string>Cancel</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="searchButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="searchButton">
+       <property name="text">
         <string>Search</string>
        </property>
       </widget>
@@ -135,7 +143,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="bertos.qrc" />
+  <include location="../bertos.qrc"/>
  </resources>
  <connections/>
 </ui>

diff --git a/wizard/ui/toolchain_select.ui b/wizard/ui/toolchain_select.ui
index 50371804dbee6bd900e15b8cf05eaa530a53fd49..b9223fee42f8af54ea6be43ba33c5663ab8a50c0 100644 (file)
--- a/wizard/ui/toolchain_select.ui
+++ b/wizard/ui/toolchain_select.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>321</width>
-    <height>298</height>
+    <width>643</width>
+    <height>459</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,7 +15,14 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QListWidget" name="toolchainList"/>
+    <widget class="QListWidget" name="toolchainList">
+     <property name="minimumSize">
+      <size>
+       <width>200</width>
+       <height>0</height>
+      </size>
+     </property>
+    </widget>
    </item>
    <item>
     <widget class="QLabel" name="infoLabel">