diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-27 12:27:54 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-27 12:27:54 +0200 |
| commit | 18a3f6169bb8a763366003d92b8013950578c79f (patch) | |
| tree | e39fa00a9511410fea9be35a6130007e43719ad8 /examples/graphicsview/embeddeddialogs/embeddeddialog.ui | |
| parent | 371d398f70e10408e0eaba7b5f05e638a0048599 (diff) | |
| parent | a06c8405d053b16327d65415f3335eceb37abd3b (diff) | |
| download | qtbase-18a3f6169bb8a763366003d92b8013950578c79f.tar.gz | |
Merge remote-tracking branch 'base/master' into refactor
Conflicts:
demos/demos.pro
demos/embedded/digiflip/digiflip.pro
examples/examples.pro
examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
src/gui/kernel/qplatformglcontext_qpa.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
Diffstat (limited to 'examples/graphicsview/embeddeddialogs/embeddeddialog.ui')
| -rw-r--r-- | examples/graphicsview/embeddeddialogs/embeddeddialog.ui | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/examples/graphicsview/embeddeddialogs/embeddeddialog.ui b/examples/graphicsview/embeddeddialogs/embeddeddialog.ui new file mode 100644 index 0000000000..f967b10085 --- /dev/null +++ b/examples/graphicsview/embeddeddialogs/embeddeddialog.ui @@ -0,0 +1,87 @@ +<ui version="4.0" > + <class>embeddedDialog</class> + <widget class="QDialog" name="embeddedDialog" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>407</width> + <height>134</height> + </rect> + </property> + <property name="windowTitle" > + <string>Embedded Dialog</string> + </property> + <layout class="QFormLayout" name="formLayout" > + <item row="0" column="0" > + <widget class="QLabel" name="label" > + <property name="text" > + <string>Layout Direction:</string> + </property> + <property name="buddy" > + <cstring>layoutDirection</cstring> + </property> + </widget> + </item> + <item row="0" column="1" > + <widget class="QComboBox" name="layoutDirection" > + <item> + <property name="text" > + <string>Left to Right</string> + </property> + </item> + <item> + <property name="text" > + <string>Right to Left</string> + </property> + </item> + </widget> + </item> + <item row="1" column="0" > + <widget class="QLabel" name="label_2" > + <property name="text" > + <string>Select Font:</string> + </property> + <property name="buddy" > + <cstring>fontComboBox</cstring> + </property> + </widget> + </item> + <item row="1" column="1" > + <widget class="QFontComboBox" name="fontComboBox" /> + </item> + <item row="2" column="0" > + <widget class="QLabel" name="label_3" > + <property name="text" > + <string>Style:</string> + </property> + <property name="buddy" > + <cstring>style</cstring> + </property> + </widget> + </item> + <item row="2" column="1" > + <widget class="QComboBox" name="style" /> + </item> + <item row="3" column="0" > + <widget class="QLabel" name="label_4" > + <property name="text" > + <string>Layout spacing:</string> + </property> + <property name="buddy" > + <cstring>spacing</cstring> + </property> + </widget> + </item> + <item row="3" column="1" > + <widget class="QSlider" name="spacing" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> |