sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:/pokerth/pokerth

Browse Source
This commit is contained in:
lotodore
2013-10-05 12:49:41 +02:00
parent bc7f34a2a6 c4209fd5c0
commit 38de2754e3
2 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog.ui
+11 -11
View File
@@ -222,17 +222,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QPushButton" name="pushButton_JoinGame">
<property name="text">
<string>&amp;Join Game</string>
</property>
<property name="icon">
<iconset resource="resources/pokerth.qrc">
<normaloff>:/gfx/go-next-view.png</normaloff>:/gfx/go-next-view.png</iconset>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="label_spectate"> <widget class="QLabel" name="label_spectate">
<property name="openExternalLinks"> <property name="openExternalLinks">
@@ -267,6 +256,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="pushButton_JoinGame">
<property name="text">
<string>&amp;Join Game</string>
</property>
<property name="icon">
<iconset resource="resources/pokerth.qrc">
<normaloff>:/gfx/go-next-view.png</normaloff>:/gfx/go-next-view.png</iconset>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="3" column="1" rowspan="2"> <item row="3" column="1" rowspan="2">
src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui
+26 -27
View File
@@ -327,32 +327,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QPushButton" name="pushButton_JoinGame">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string>
</property>
<property name="text">
<string>&amp;Join Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/go-next-view.png</normaloff>:/gfx/go-next-view.png</iconset>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="label_spectate"> <widget class="QLabel" name="label_spectate">
<property name="openExternalLinks"> <property name="openExternalLinks">
@@ -399,6 +373,32 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="pushButton_JoinGame">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string>
</property>
<property name="text">
<string>&amp;Join Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/go-next-view.png</normaloff>:/gfx/go-next-view.png</iconset>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
@@ -1203,7 +1203,6 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>pushButton_CreateGame</tabstop>
<tabstop>textBrowser_ChatDisplay</tabstop> <tabstop>textBrowser_ChatDisplay</tabstop>
<tabstop>lineEdit_ChatInput</tabstop> <tabstop>lineEdit_ChatInput</tabstop>
<tabstop>treeWidget_connectedPlayers</tabstop> <tabstop>treeWidget_connectedPlayers</tabstop>