diff options
-rw-r--r-- | demos/embedded/styledemo/stylewidget.ui | 305 | ||||
-rw-r--r-- | examples/examples.pro | 1 | ||||
-rw-r--r-- | projects.pro | 2 | ||||
-rw-r--r-- | tools/designer/src/src.pro | 1 | ||||
-rw-r--r-- | tools/tools.pro | 1 |
5 files changed, 165 insertions, 145 deletions
diff --git a/demos/embedded/styledemo/stylewidget.ui b/demos/embedded/styledemo/stylewidget.ui index 9c5f253..a084dde 100644 --- a/demos/embedded/styledemo/stylewidget.ui +++ b/demos/embedded/styledemo/stylewidget.ui @@ -1,138 +1,139 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>StyleWidget</class> - <widget class="QWidget" name="StyleWidget" > - <property name="geometry" > + <widget class="QWidget" name="StyleWidget"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>172</width> + <width>174</width> <height>220</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Form</string> </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <property name="spacing" > + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> <number>4</number> </property> - <property name="margin" > + <property name="margin"> <number>4</number> </property> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Expanding" > + <widget class="QGroupBox" name="groupBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="title" > + <property name="title"> <string>Styles</string> </property> - <layout class="QGridLayout" name="gridLayout_2" > - <property name="margin" > + <layout class="QGridLayout" name="gridLayout_2"> + <property name="margin"> <number>4</number> </property> - <property name="spacing" > + <property name="spacing"> <number>4</number> </property> - <item row="0" column="0" > - <widget class="QPushButton" name="transparentStyle" > - <property name="sizePolicy" > - <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" > + <item row="0" column="0"> + <widget class="QPushButton" name="transparentStyle"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="focusPolicy" > + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="text" > + <property name="text"> <string>Transp.</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="checked" > + <property name="checked"> <bool>false</bool> </property> - <property name="autoExclusive" > + <property name="autoExclusive"> <bool>true</bool> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QPushButton" name="blueStyle" > - <property name="sizePolicy" > - <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" > + <item row="2" column="0"> + <widget class="QPushButton" name="blueStyle"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="focusPolicy" > + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="text" > + <property name="text"> <string>Blue</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="checked" > + <property name="checked"> <bool>false</bool> </property> - <property name="autoExclusive" > + <property name="autoExclusive"> <bool>true</bool> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QPushButton" name="khakiStyle" > - <property name="sizePolicy" > - <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" > + <item row="0" column="1"> + <widget class="QPushButton" name="khakiStyle"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="focusPolicy" > + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="text" > + <property name="text"> <string>Khaki</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="checked" > + <property name="checked"> <bool>false</bool> </property> - <property name="autoExclusive" > + <property name="autoExclusive"> <bool>true</bool> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QPushButton" name="noStyle" > - <property name="sizePolicy" > - <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" > + <item row="2" column="1"> + <widget class="QPushButton" name="noStyle"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="focusPolicy" > + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="text" > + <property name="text"> <string>None</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> - <property name="autoExclusive" > + <property name="autoExclusive"> <bool>true</bool> </property> </widget> @@ -141,11 +142,11 @@ </widget> </item> <item> - <spacer name="verticalSpacer_3" > - <property name="orientation" > + <spacer name="verticalSpacer_3"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>0</width> <height>0</height> @@ -154,56 +155,56 @@ </spacer> </item> <item> - <widget class="QFrame" name="frame" > - <property name="sizePolicy" > - <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" > + <widget class="QFrame" name="frame"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="frameShape" > + <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Raised</enum> </property> - <layout class="QVBoxLayout" name="frameLayout" > - <property name="margin" > + <layout class="QVBoxLayout" name="frameLayout"> + <property name="margin"> <number>0</number> </property> <item> - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QLabel" name="label" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" > + <widget class="QLabel" name="label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text" > + <property name="text"> <string>My Value is:</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </item> <item> - <widget class="QSpinBox" name="spinBox" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <widget class="QSpinBox" name="spinBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="focusPolicy" > + <property name="focusPolicy"> <enum>Qt::WheelFocus</enum> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> </property> - <property name="keyboardTracking" > + <property name="keyboardTracking"> <bool>false</bool> </property> </widget> @@ -211,88 +212,88 @@ </layout> </item> <item> - <layout class="QGridLayout" name="gridLayout" > - <property name="spacing" > + <layout class="QGridLayout" name="gridLayout"> + <property name="spacing"> <number>4</number> </property> - <item row="0" column="0" > - <widget class="QScrollBar" name="horizontalScrollBar" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="0" column="0"> + <widget class="QScrollBar" name="horizontalScrollBar"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize" > + <property name="minimumSize"> <size> <width>0</width> <height>24</height> </size> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QPushButton" name="pushButton_2" > - <property name="sizePolicy" > - <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" > + <item row="1" column="0"> + <widget class="QPushButton" name="pushButton_2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="focusPolicy" > + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="text" > + <property name="text"> <string>Show</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> - <property name="flat" > + <property name="flat"> <bool>false</bool> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QScrollBar" name="horizontalScrollBar_2" > - <property name="minimumSize" > + <item row="0" column="1"> + <widget class="QScrollBar" name="horizontalScrollBar_2"> + <property name="minimumSize"> <size> <width>0</width> <height>24</height> </size> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QPushButton" name="pushButton" > - <property name="sizePolicy" > - <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" > + <item row="1" column="1"> + <widget class="QPushButton" name="pushButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="focusPolicy" > + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="text" > + <property name="text"> <string>Enable</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> - <property name="flat" > + <property name="flat"> <bool>false</bool> </property> </widget> @@ -303,14 +304,14 @@ </widget> </item> <item> - <spacer name="verticalSpacer" > - <property name="orientation" > + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>0</width> <height>0</height> @@ -319,13 +320,13 @@ </spacer> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> <spacer> - <property name="orientation" > + <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> @@ -334,11 +335,11 @@ </spacer> </item> <item> - <widget class="QPushButton" name="close" > - <property name="focusPolicy" > + <widget class="QPushButton" name="close"> + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="text" > + <property name="text"> <string>Close</string> </property> </widget> @@ -348,7 +349,7 @@ </layout> </widget> <resources> - <include location="StyleDemo.qrc" /> + <include location="StyleDemo.qrc"/> </resources> <connections> <connection> @@ -357,13 +358,13 @@ <receiver>horizontalScrollBar_2</receiver> <slot>setValue(int)</slot> <hints> - <hint type="sourcelabel" > - <x>134</x> - <y>196</y> + <hint type="sourcelabel"> + <x>84</x> + <y>147</y> </hint> - <hint type="destinationlabel" > - <x>523</x> - <y>193</y> + <hint type="destinationlabel"> + <x>166</x> + <y>147</y> </hint> </hints> </connection> @@ -373,13 +374,13 @@ <receiver>horizontalScrollBar</receiver> <slot>setValue(int)</slot> <hints> - <hint type="sourcelabel" > - <x>577</x> - <y>199</y> + <hint type="sourcelabel"> + <x>166</x> + <y>147</y> </hint> - <hint type="destinationlabel" > - <x>127</x> - <y>207</y> + <hint type="destinationlabel"> + <x>84</x> + <y>147</y> </hint> </hints> </connection> @@ -389,13 +390,13 @@ <receiver>horizontalScrollBar_2</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > - <x>566</x> - <y>241</y> + <hint type="sourcelabel"> + <x>166</x> + <y>175</y> </hint> - <hint type="destinationlabel" > - <x>492</x> - <y>207</y> + <hint type="destinationlabel"> + <x>166</x> + <y>147</y> </hint> </hints> </connection> @@ -405,13 +406,13 @@ <receiver>horizontalScrollBar</receiver> <slot>setVisible(bool)</slot> <hints> - <hint type="sourcelabel" > - <x>123</x> - <y>239</y> + <hint type="sourcelabel"> + <x>84</x> + <y>175</y> </hint> - <hint type="destinationlabel" > - <x>123</x> - <y>184</y> + <hint type="destinationlabel"> + <x>84</x> + <y>147</y> </hint> </hints> </connection> @@ -421,13 +422,29 @@ <receiver>horizontalScrollBar_2</receiver> <slot>setValue(int)</slot> <hints> - <hint type="sourcelabel" > - <x>603</x> - <y>136</y> + <hint type="sourcelabel"> + <x>166</x> + <y>115</y> </hint> - <hint type="destinationlabel" > - <x>575</x> - <y>199</y> + <hint type="destinationlabel"> + <x>166</x> + <y>147</y> + </hint> + </hints> + </connection> + <connection> + <sender>horizontalScrollBar_2</sender> + <signal>valueChanged(int)</signal> + <receiver>spinBox</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>132</x> + <y>132</y> + </hint> + <hint type="destinationlabel"> + <x>135</x> + <y>110</y> </hint> </hints> </connection> diff --git a/examples/examples.pro b/examples/examples.pro index 218cf9b..42a3aa3 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -36,6 +36,7 @@ symbian: SUBDIRS = \ mainwindows \ script \ sql \ + uitools \ xml contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon diff --git a/projects.pro b/projects.pro index 389ec71..a1f2dd1 100644 --- a/projects.pro +++ b/projects.pro @@ -29,7 +29,7 @@ isEmpty(QT_BUILD_PARTS) { #defaults } symbian { - QT_BUILD_PARTS = libs examples demos + QT_BUILD_PARTS = libs tools examples demos } #process the projects diff --git a/tools/designer/src/src.pro b/tools/designer/src/src.pro index e7ce55f..e1710b8 100644 --- a/tools/designer/src/src.pro +++ b/tools/designer/src/src.pro @@ -10,4 +10,5 @@ SUBDIRS = \ CONFIG(shared,shared|static):SUBDIRS += plugins wince*: SUBDIRS -= designer plugins +symbian: SUBDIRS = uitools contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= lib components
\ No newline at end of file diff --git a/tools/tools.pro b/tools/tools.pro index d034dcd..a978227 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -13,6 +13,7 @@ no-png { SUBDIRS += designer } SUBDIRS += linguist + symbian: SUBDIRS = designer wince*: SUBDIRS = qtestlib designer unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig win32:!wince*:SUBDIRS += activeqt |