qslider (no allin possible) bugfix, fadeout android bugfix, gui tweaks

for android
This commit is contained in:
doitux
2012-05-22 00:48:35 +02:00
parent 93aaabdef3
commit 4bb22ff89c
14 changed files with 920 additions and 775 deletions
@@ -971,7 +971,14 @@
</size>
</property>
<property name="styleSheet">
<string notr="true">QObject {color:rgb(255, 255, 255); font: 14px}</string>
<string notr="true">QObject {font: 14px}</string>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Nimbus Sans L'; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
+32 -53
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1024</width>
<height>600</height>
<width>800</width>
<height>424</height>
</rect>
</property>
<property name="minimumSize">
@@ -4211,57 +4211,30 @@ p, li { white-space: pre-wrap; }
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="verticalSpacer_9">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>47</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
<item>
<spacer name="verticalSpacer_15">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="tabsButton">
<property name="minimumSize">
<size>
<width>50</width>
<height>50</height>
<width>60</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>50</width>
<height>50</height>
<width>60</width>
<height>60</height>
</size>
</property>
<property name="text">
<string/>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="icon">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/preferences-desktop_50x50.png</normaloff>:/gfx/preferences-desktop_50x50.png</iconset>
<property name="styleSheet">
<string notr="true">QPushButton { border:none; background-image: url(&quot;:/gfx/tab-new-background.png&quot;); background-repeat: no-repeat; background-position: center center;}</string>
</property>
<property name="iconSize">
<size>
<width>50</width>
<height>50</height>
<width>48</width>
<height>48</height>
</size>
</property>
</widget>
@@ -4273,9 +4246,12 @@ p, li { white-space: pre-wrap; }
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>20</width>
<height>20</height>
</size>
</property>
@@ -4299,9 +4275,12 @@ p, li { white-space: pre-wrap; }
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>22</width>
<width>40</width>
<height>57</height>
</size>
</property>
@@ -4396,7 +4375,7 @@ p, li { white-space: pre-wrap; }
<string/>
</property>
<property name="icon">
<iconset resource="../resources/pokerth_android.qrc">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/view-fullscreen_50x50.png</normaloff>:/gfx/view-fullscreen_50x50.png</iconset>
</property>
<property name="iconSize">
@@ -4495,7 +4474,7 @@ p, li { white-space: pre-wrap; }
<widget class="Slider" name="horizontalSlider_bet">
<property name="minimumSize">
<size>
<width>220</width>
<width>160</width>
<height>60</height>
</size>
</property>
@@ -4563,7 +4542,7 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>1024</width>
<width>800</width>
<height>26</height>
</rect>
</property>
@@ -4631,7 +4610,7 @@ p, li { white-space: pre-wrap; }
</action>
<action name="actionFullScreen">
<property name="icon">
<iconset resource="../resources/pokerth_android.qrc">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/view-fullscreen.png</normaloff>:/gfx/view-fullscreen.png</iconset>
</property>
<property name="text">
@@ -4689,7 +4668,7 @@ p, li { white-space: pre-wrap; }
</action>
<action name="actionConfigure_PokerTH">
<property name="icon">
<iconset resource="../resources/pokerth_android.qrc">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/systemsettings.png</normaloff>:/gfx/systemsettings.png</iconset>
</property>
<property name="text">
@@ -4698,7 +4677,7 @@ p, li { white-space: pre-wrap; }
</action>
<action name="actionClose">
<property name="icon">
<iconset resource="../resources/pokerth_android.qrc">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/application_exit.png</normaloff>:/gfx/application_exit.png</iconset>
</property>
<property name="text">
@@ -4718,6 +4697,11 @@ p, li { white-space: pre-wrap; }
</action>
</widget>
<customwidgets>
<customwidget>
<class>Slider</class>
<extends>QSlider</extends>
<header>myslider.h</header>
</customwidget>
<customwidget>
<class>MySetLabel</class>
<extends>QLabel</extends>
@@ -4758,11 +4742,6 @@ p, li { white-space: pre-wrap; }
<extends>QLabel</extends>
<header>mynamelabel.h</header>
</customwidget>
<customwidget>
<class>Slider</class>
<extends>QSlider</extends>
<header>myslider.h</header>
</customwidget>
<customwidget>
<class>MyCashLabel</class>
<extends>QLabel</extends>
@@ -4770,7 +4749,7 @@ p, li { white-space: pre-wrap; }
</customwidget>
</customwidgets>
<resources>
<include location="../resources/pokerth_android.qrc"/>
<include location="../resources/pokerth.qrc"/>
</resources>
<connections/>
</ui>
File diff suppressed because it is too large Load Diff