From e5971feb31867196891b510802cdb2b355142683 Mon Sep 17 00:00:00 2001 From: doitux Date: Mon, 17 Dec 2012 11:44:03 +0100 Subject: [PATCH] last string changes for string freeze --- src/gui/qt/gametable/gametableimpl.cpp | 10 +++---- src/gui/qt/gui_800x480/gametable_800x480.ui | 4 +-- src/gui/qt/gui_800x480/startwindow_800x480.ui | 28 ++++--------------- 3 files changed, 12 insertions(+), 30 deletions(-) diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 204daa30..f77ade8e 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -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; diff --git a/src/gui/qt/gui_800x480/gametable_800x480.ui b/src/gui/qt/gui_800x480/gametable_800x480.ui index 0b9dbe6a..0747eacc 100644 --- a/src/gui/qt/gui_800x480/gametable_800x480.ui +++ b/src/gui/qt/gui_800x480/gametable_800x480.ui @@ -4644,7 +4644,7 @@ p, li { white-space: pre-wrap; } - &Settings + Settings @@ -4756,7 +4756,7 @@ p, li { white-space: pre-wrap; } :/gfx/systemsettings.png:/gfx/systemsettings.png - Configure PokerTH ... + Configure PokerTH diff --git a/src/gui/qt/gui_800x480/startwindow_800x480.ui b/src/gui/qt/gui_800x480/startwindow_800x480.ui index a97db90b..2d4cdae6 100755 --- a/src/gui/qt/gui_800x480/startwindow_800x480.ui +++ b/src/gui/qt/gui_800x480/startwindow_800x480.ui @@ -79,7 +79,7 @@ Qt::NoFocus - &3 Create Network Game + Create Network Game @@ -105,7 +105,7 @@ Qt::NoFocus - &4 Join Network Game + Join Network Game @@ -151,7 +151,7 @@ Qt::NoFocus - &1 Start Local Game + Start Local Game @@ -183,7 +183,7 @@ Qt::NoFocus - Configure PokerTH ... + Configure PokerTH @@ -224,7 +224,7 @@ Qt::NoFocus - &2 Internet Game + Internet Game @@ -281,9 +281,6 @@ - - 0 - @@ -374,21 +371,6 @@ 56 - - - &PokerTH - - - - - - - &Settings - - - - -