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

last string changes for string freeze

Browse Source
This commit is contained in:
doitux
2012-12-17 11:44:03 +01:00
parent 975115723e
commit e5971feb31
3 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gametable/gametableimpl.cpp
+5 -5
View File
@@ -3232,11 +3232,11 @@ bool gameTableImpl::eventFilter(QObject *obj, QEvent *event)
if (/*obj == lineEdit_ChatInput && lineEdit_ChatInput->text() != "" && */event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Tab) {
myChat->nickAutoCompletition();
return true;
// CURRENTLY not possible in Android :( --> } else if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Back) {
// event->ignore();
// closeGameTable();
// return true;
} else if (event->type() == QEvent::Close) {
} else if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Back) {
event->ignore();
closeGameTable();
return true;
} else if (event->type() == QEvent::Close) {
event->ignore();
closeGameTable();
return true;
src/gui/qt/gui_800x480/gametable_800x480.ui
+2 -2
View File
@@ -4644,7 +4644,7 @@ p, li { white-space: pre-wrap; }
</property>
<widget class="QMenu" name="menuSettings">
<property name="title">
<string>&amp;Settings</string>
<string>Settings</string>
</property>
<addaction name="actionConfigure_PokerTH"/>
</widget>
@@ -4756,7 +4756,7 @@ p, li { white-space: pre-wrap; }
<normaloff>:/gfx/systemsettings.png</normaloff>:/gfx/systemsettings.png</iconset>
</property>
<property name="text">
<string>Configure PokerTH ...</string>
<string>Configure PokerTH</string>
</property>
</action>
<action name="actionClose">
src/gui/qt/gui_800x480/startwindow_800x480.ui
+5 -23
View File
@@ -79,7 +79,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>&amp;3 Create Network Game</string>
<string>Create Network Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
@@ -105,7 +105,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>&amp;4 Join Network Game</string>
<string>Join Network Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
@@ -151,7 +151,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>&amp;1 Start Local Game</string>
<string>Start Local Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
@@ -183,7 +183,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>Configure PokerTH ...</string>
<string>Configure PokerTH</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
@@ -224,7 +224,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>&amp;2 Internet Game</string>
<string>Internet Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
@@ -281,9 +281,6 @@
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@@ -374,21 +371,6 @@
<height>56</height>
</size>
</property>
<widget class="QMenu" name="menuPokerTH">
<property name="title">
<string>&amp;PokerTH</string>
</property>
<addaction name="actionAbout_PokerTH"/>
<addaction name="actionLogs"/>
</widget>
<widget class="QMenu" name="menuSettings">
<property name="title">
<string>&amp;Settings</string>
</property>
<addaction name="actionConfigure_PokerTH"/>
</widget>
<addaction name="menuPokerTH"/>
<addaction name="menuSettings"/>
</widget>
<action name="actionStart_Local_Game">
<property name="icon">