summaryrefslogtreecommitdiffstats
path: root/demos/embedded/styledemo
diff options
context:
space:
mode:
Diffstat (limited to 'demos/embedded/styledemo')
-rw-r--r--demos/embedded/styledemo/files/application.qss2
-rw-r--r--demos/embedded/styledemo/files/blue.qss3
-rw-r--r--demos/embedded/styledemo/files/khaki.qss3
-rw-r--r--demos/embedded/styledemo/files/transparent.qss1
-rw-r--r--demos/embedded/styledemo/styledemo.pro4
-rw-r--r--demos/embedded/styledemo/stylewidget.ui64
6 files changed, 42 insertions, 35 deletions
diff --git a/demos/embedded/styledemo/files/application.qss b/demos/embedded/styledemo/files/application.qss
index a632ad1..432fe6b 100644
--- a/demos/embedded/styledemo/files/application.qss
+++ b/demos/embedded/styledemo/files/application.qss
@@ -6,7 +6,7 @@ QWidget#StyleWidget
QLabel, QAbstractButton
{
- font: 18px bold;
+ font: bold;
color: beige;
}
diff --git a/demos/embedded/styledemo/files/blue.qss b/demos/embedded/styledemo/files/blue.qss
index aa87277..ac8671b 100644
--- a/demos/embedded/styledemo/files/blue.qss
+++ b/demos/embedded/styledemo/files/blue.qss
@@ -5,7 +5,7 @@
QLabel, QAbstractButton
{
- font: 10pt bold;
+ font: bold;
color: yellow;
}
@@ -28,7 +28,6 @@ QAbstractButton
border-style: solid;
border-radius: 5;
padding: 3px;
- qproperty-focusPolicy: NoFocus;
}
QAbstractButton:pressed
diff --git a/demos/embedded/styledemo/files/khaki.qss b/demos/embedded/styledemo/files/khaki.qss
index 9c0f77c..b0d4a0f 100644
--- a/demos/embedded/styledemo/files/khaki.qss
+++ b/demos/embedded/styledemo/files/khaki.qss
@@ -16,7 +16,6 @@ QPushButton, QToolButton {
padding: 3px;
/* min-width: 96px; */
/* min-height: 48px; */
- qproperty-focusPolicy: NoFocus
}
QPushButton:hover, QToolButton:hover {
@@ -30,7 +29,7 @@ QPushButton:pressed, QToolButton:pressed {
}
QLabel, QAbstractButton {
- font: italic 11pt "Times New Roman";
+ font: italic "Times New Roman";
}
QFrame, QLabel#title {
diff --git a/demos/embedded/styledemo/files/transparent.qss b/demos/embedded/styledemo/files/transparent.qss
index e3a9912..b38eb36 100644
--- a/demos/embedded/styledemo/files/transparent.qss
+++ b/demos/embedded/styledemo/files/transparent.qss
@@ -6,7 +6,6 @@ QWidget#StyleWidget
QLabel, QAbstractButton
{
- font: 13pt;
color: beige;
}
diff --git a/demos/embedded/styledemo/styledemo.pro b/demos/embedded/styledemo/styledemo.pro
index ee5e4d6..e0ef202 100644
--- a/demos/embedded/styledemo/styledemo.pro
+++ b/demos/embedded/styledemo/styledemo.pro
@@ -10,3 +10,7 @@ target.path = $$[QT_INSTALL_DEMOS]/embedded/styledemo
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html
sources.path = $$[QT_INSTALL_DEMOS]/embedded/styledemo
INSTALLS += target sources
+
+include($$QT_SOURCE_TREE/demos/demobase.pri)
+
+symbian:TARGET.UID3 = 0xA000A63F
diff --git a/demos/embedded/styledemo/stylewidget.ui b/demos/embedded/styledemo/stylewidget.ui
index 586faea..9c5f253 100644
--- a/demos/embedded/styledemo/stylewidget.ui
+++ b/demos/embedded/styledemo/stylewidget.ui
@@ -5,16 +5,19 @@
<rect>
<x>0</x>
<y>0</y>
- <width>339</width>
- <height>230</height>
+ <width>172</width>
+ <height>220</height>
</rect>
</property>
<property name="windowTitle" >
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
+ <property name="spacing" >
+ <number>4</number>
+ </property>
<property name="margin" >
- <number>3</number>
+ <number>4</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox" >
@@ -27,15 +30,15 @@
<property name="title" >
<string>Styles</string>
</property>
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>3</number>
- </property>
+ <layout class="QGridLayout" name="gridLayout_2" >
<property name="margin" >
- <number>3</number>
+ <number>4</number>
</property>
- <item>
- <widget class="QPushButton" name="noStyle" >
+ <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" >
<horstretch>0</horstretch>
@@ -43,23 +46,23 @@
</sizepolicy>
</property>
<property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
+ <enum>Qt::StrongFocus</enum>
</property>
<property name="text" >
- <string>No-Style</string>
+ <string>Transp.</string>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
<property name="checked" >
- <bool>true</bool>
+ <bool>false</bool>
</property>
<property name="autoExclusive" >
<bool>true</bool>
</property>
</widget>
</item>
- <item>
+ <item row="2" column="0" >
<widget class="QPushButton" name="blueStyle" >
<property name="sizePolicy" >
<sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
@@ -68,7 +71,7 @@
</sizepolicy>
</property>
<property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
+ <enum>Qt::StrongFocus</enum>
</property>
<property name="text" >
<string>Blue</string>
@@ -84,7 +87,7 @@
</property>
</widget>
</item>
- <item>
+ <item row="0" column="1" >
<widget class="QPushButton" name="khakiStyle" >
<property name="sizePolicy" >
<sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
@@ -93,7 +96,7 @@
</sizepolicy>
</property>
<property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
+ <enum>Qt::StrongFocus</enum>
</property>
<property name="text" >
<string>Khaki</string>
@@ -109,8 +112,8 @@
</property>
</widget>
</item>
- <item>
- <widget class="QPushButton" name="transparentStyle" >
+ <item row="2" column="1" >
+ <widget class="QPushButton" name="noStyle" >
<property name="sizePolicy" >
<sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
<horstretch>0</horstretch>
@@ -118,16 +121,16 @@
</sizepolicy>
</property>
<property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
+ <enum>Qt::StrongFocus</enum>
</property>
<property name="text" >
- <string>Transparent</string>
+ <string>None</string>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
<property name="checked" >
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="autoExclusive" >
<bool>true</bool>
@@ -166,7 +169,7 @@
</property>
<layout class="QVBoxLayout" name="frameLayout" >
<property name="margin" >
- <number>3</number>
+ <number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout" >
@@ -195,7 +198,7 @@
</sizepolicy>
</property>
<property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
+ <enum>Qt::WheelFocus</enum>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -209,6 +212,9 @@
</item>
<item>
<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" >
@@ -237,10 +243,10 @@
</sizepolicy>
</property>
<property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
+ <enum>Qt::StrongFocus</enum>
</property>
<property name="text" >
- <string>Show Scroller</string>
+ <string>Show</string>
</property>
<property name="checkable" >
<bool>true</bool>
@@ -275,10 +281,10 @@
</sizepolicy>
</property>
<property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
+ <enum>Qt::StrongFocus</enum>
</property>
<property name="text" >
- <string>Enable Scroller</string>
+ <string>Enable</string>
</property>
<property name="checkable" >
<bool>true</bool>
@@ -330,7 +336,7 @@
<item>
<widget class="QPushButton" name="close" >
<property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
+ <enum>Qt::StrongFocus</enum>
</property>
<property name="text" >
<string>Close</string>