kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Fix layout with Qt 4.2. 

BUG:  Fix help comments to match what this GUI does.
This commit is contained in:
Clinton Stimpson 2007-11-12 18:06:09 -05:00
parent b0ddb9c1b8
commit fa5f983651
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/QtDialog/CMakeSetupDialog.cxx
View File

@ -350,8 +350,8 @@ void CMakeSetupDialog::doHelp()
"sure the values are correct. For some projects the Configure process can " "sure the values are correct. For some projects the Configure process can "
"be iterative, so continue to press the Configure button until there are no " "be iterative, so continue to press the Configure button until there are no "
"longer red entries.\r\n\r\n4. Once there are no longer red entries, you " "longer red entries.\r\n\r\n4. Once there are no longer red entries, you "
"should click the OK button. This will write the build files to the build " "should click the Generate button. This will write the build files to the build "
"directory and exit CMake."); "directory.");
QDialog dialog; QDialog dialog;
dialog.setWindowTitle(tr("CMakeSetup Help")); dialog.setWindowTitle(tr("CMakeSetup Help"));

41
Source/QtDialog/CMakeSetupDialog.ui
View File

@ -10,8 +10,20 @@
</rect> </rect>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" > <item row="0" column="0" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label" > <widget class="QLabel" name="label" >
<property name="text" > <property name="text" >
@ -39,7 +51,9 @@
<item row="1" column="1" > <item row="1" column="1" >
<widget class="QComboBox" name="BinaryDirectory" > <widget class="QComboBox" name="BinaryDirectory" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -74,12 +88,23 @@
<property name="margin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" >
<number>6</number>
</property>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item> <item>
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" > <sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -92,7 +117,9 @@
<item> <item>
<widget class="QLineEdit" name="Search" > <widget class="QLineEdit" name="Search" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -116,7 +143,7 @@
</property> </property>
<property name="sizeHint" > <property name="sizeHint" >
<size> <size>
<width>61</width> <width>40</width>
<height>23</height> <height>23</height>
</size> </size>
</property> </property>
@ -168,6 +195,12 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item> <item>
<widget class="QPushButton" name="ConfigureButton" > <widget class="QPushButton" name="ConfigureButton" >
<property name="text" > <property name="text" >