diff options
author | william <william.os4y@gmail.com> | 2015-03-14 21:34:39 +0100 |
---|---|---|
committer | william <william.os4y@gmail.com> | 2015-03-14 21:34:39 +0100 |
commit | 59bd42ae3da3da0181f6bbe53580fd741d17fae9 (patch) | |
tree | 258b5ac0db26d5553e1ed438cd993e0cab5ab38b /lumina-config/mainUI.ui | |
parent | spelling error (diff) | |
parent | Add a new favoriting system to the Lumina Utils library. This should make thi... (diff) | |
download | lumina-59bd42ae3da3da0181f6bbe53580fd741d17fae9.tar.gz lumina-59bd42ae3da3da0181f6bbe53580fd741d17fae9.tar.bz2 lumina-59bd42ae3da3da0181f6bbe53580fd741d17fae9.zip |
Merge remote-tracking branch 'upstream/master' into deskEditor
Diffstat (limited to 'lumina-config/mainUI.ui')
-rw-r--r-- | lumina-config/mainUI.ui | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/lumina-config/mainUI.ui b/lumina-config/mainUI.ui index fcebaff7..07abacab 100644 --- a/lumina-config/mainUI.ui +++ b/lumina-config/mainUI.ui @@ -109,7 +109,7 @@ <enum>QFrame::StyledPanel</enum> </property> <property name="currentIndex"> - <number>1</number> + <number>4</number> </property> <widget class="QWidget" name="page_desktop"> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -602,8 +602,8 @@ <rect> <x>0</x> <y>0</y> - <width>263</width> - <height>178</height> + <width>233</width> + <height>150</height> </rect> </property> <attribute name="label"> @@ -799,8 +799,8 @@ <rect> <x>0</x> <y>0</y> - <width>263</width> - <height>178</height> + <width>233</width> + <height>150</height> </rect> </property> <attribute name="label"> @@ -1634,6 +1634,26 @@ </property> </widget> </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_26"> + <property name="text"> + <string>Time Zone:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QComboBox" name="combo_session_timezone"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToMinimumContentsLength</enum> + </property> + </widget> + </item> </layout> </item> <item row="6" column="0" colspan="2"> |