diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index 52536981..32457348 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -829,7 +829,7 @@ QTabWidget::Rounded - 1 + 0 @@ -6068,9 +6068,18 @@ 0 0 1000 - 23 + 30 + + + View + + + + + + Game @@ -6082,15 +6091,6 @@ - - - View - - - - - - @@ -6125,18 +6125,24 @@ Create Network Game ... + + Ctrl+O + Join Network Game ... + + Ctrl+J + Fullscreen - ⌘F + Ctrl+F @@ -6144,7 +6150,7 @@ Show/Hide Chat Window - ⌘C + Ctrl+T @@ -6158,7 +6164,7 @@ Show/Hide Hands Window - ⌘H + Ctrl+H @@ -6166,7 +6172,7 @@ Show/Hide Log Window - ⌘L + Ctrl+L diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 75866ff2..7c7ed980 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -2565,7 +2565,7 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) { if (event->key() == Qt::Key_F1) { pushButton_FoldAllin->click(); } if (event->key() == Qt::Key_F2) { pushButton_CallCheckSet->click(); } if (event->key() == Qt::Key_F3) { pushButton_BetRaise->click(); } - if (event->key() == Qt::Key_S) { setLabelArray[0]->startTimeOutAnimation(myConfig->readConfigInt("NetTimeOutPlayerAction"),TRUE); } //s +// if (event->key() == Qt::Key_S) { setLabelArray[0]->startTimeOutAnimation(myConfig->readConfigInt("NetTimeOutPlayerAction"),TRUE); } //s if (event->key() == 16777249) { pushButton_break->click(); ctrlPressed = TRUE; diff --git a/src/gui/qt/resources/translations/pokerth_de.qm b/src/gui/qt/resources/translations/pokerth_de.qm index 6ecd86fd..bcf70f3b 100644 Binary files a/src/gui/qt/resources/translations/pokerth_de.qm and b/src/gui/qt/resources/translations/pokerth_de.qm differ diff --git a/ts/pokerth_de.ts b/ts/pokerth_de.ts index 3ff046cc..8fb04266 100644 --- a/ts/pokerth_de.ts +++ b/ts/pokerth_de.ts @@ -776,12 +776,12 @@ p, li { white-space: pre-wrap; } Stop - + View Ansicht - + Game Spiel @@ -811,12 +811,12 @@ p, li { white-space: pre-wrap; } Netzwerkspiel erstellen ... - + Join Network Game ... Netzwerkspiel beitreten ... - + Fullscreen Vollbild @@ -853,38 +853,68 @@ p, li { white-space: pre-wrap; } ⌘F - ⌘F + ⌘F - + Show/Hide Chat Window Zeige/Verstecke Chat-Fenster ⌘C - ⌘C + ⌘C ⌘H - ⌘H + ⌘H - + Show/Hide Log Window Zeige/Verstecke Log-Fenster ⌘L - ⌘L + ⌘L - + Show/Hide Hands Window Zeige/Verstecke Blätter-Fenster + + + Ctrl+O + Ctrl+O + + + + Ctrl+J + Ctrl+J + + + + Ctrl+F + Ctrl+F + + + + Ctrl+T + Ctrl+T + + + + Ctrl+H + Ctrl+H + + + + Ctrl+L + Ctrl+L + mainWindowImpl diff --git a/ts/pokerth_es.ts b/ts/pokerth_es.ts index 65c89b98..35e5adbf 100644 --- a/ts/pokerth_es.ts +++ b/ts/pokerth_es.ts @@ -1120,12 +1120,12 @@ p, li { white-space: pre-wrap; } Detener - + View Ver - + Game Partida @@ -1155,12 +1155,12 @@ p, li { white-space: pre-wrap; } Crear partida en red... - + Join Network Game ... Unirse a partida en red... - + Fullscreen Pantalla completa @@ -1197,38 +1197,68 @@ p, li { white-space: pre-wrap; } ⌘F - ⌘F + ⌘F - + Show/Hide Chat Window ⌘C - ⌘C + ⌘C ⌘H - ⌘H + ⌘H - + Show/Hide Log Window ⌘L - ⌘L + ⌘L - + Show/Hide Hands Window + + + Ctrl+O + + + + + Ctrl+J + + + + + Ctrl+F + + + + + Ctrl+T + + + + + Ctrl+H + + + + + Ctrl+L + + mainWindowImpl diff --git a/ts/pokerth_fr.ts b/ts/pokerth_fr.ts index b0fe0d3d..384e9ca7 100644 --- a/ts/pokerth_fr.ts +++ b/ts/pokerth_fr.ts @@ -1121,12 +1121,12 @@ p, li { white-space: pre-wrap; } Arrêter - + View Visualiser - + Game Partie @@ -1156,12 +1156,12 @@ p, li { white-space: pre-wrap; } Créer une partie en réseau ... - + Join Network Game ... Se joindre à une partie en réseau ... - + Fullscreen Plein écran @@ -1198,38 +1198,68 @@ p, li { white-space: pre-wrap; } ⌘F - ⌘F + ⌘F - + Show/Hide Chat Window ⌘C - ⌘C + ⌘C ⌘H - ⌘H + ⌘H - + Show/Hide Log Window ⌘L - ⌘L + ⌘L - + Show/Hide Hands Window + + + Ctrl+O + + + + + Ctrl+J + + + + + Ctrl+F + + + + + Ctrl+T + + + + + Ctrl+H + + + + + Ctrl+L + + mainWindowImpl diff --git a/ts/pokerth_nl.ts b/ts/pokerth_nl.ts index 313b1ebc..ba364bd8 100644 --- a/ts/pokerth_nl.ts +++ b/ts/pokerth_nl.ts @@ -1088,12 +1088,12 @@ p, li { white-space: pre-wrap; } Stop - + View Scherm - + Game Spel @@ -1123,12 +1123,12 @@ p, li { white-space: pre-wrap; } Netwerkspel aanmaken ... - + Join Network Game ... Meedoen met netwerkspel ... - + Fullscreen Volledig scherm @@ -1165,38 +1165,68 @@ p, li { white-space: pre-wrap; } ⌘F - ⌘F + ⌘F - + Show/Hide Chat Window ⌘C - ⌘C + ⌘C ⌘H - ⌘H + ⌘H - + Show/Hide Log Window ⌘L - ⌘L + ⌘L - + Show/Hide Hands Window + + + Ctrl+O + + + + + Ctrl+J + + + + + Ctrl+F + + + + + Ctrl+T + + + + + Ctrl+H + + + + + Ctrl+L + + mainWindowImpl diff --git a/ts/pokerth_no.ts b/ts/pokerth_no.ts index 0fdd1377..951a89bd 100644 --- a/ts/pokerth_no.ts +++ b/ts/pokerth_no.ts @@ -726,12 +726,12 @@ p, li { white-space: pre-wrap; } Stopp - + View Vis - + Game Spill @@ -761,12 +761,12 @@ p, li { white-space: pre-wrap; } Start nettverks-spill... - + Join Network Game ... Bli med i et nettverksspill... - + Fullscreen Fullskjerm @@ -803,38 +803,68 @@ p, li { white-space: pre-wrap; } ⌘F - ⌘F + ⌘F - + Show/Hide Chat Window ⌘C - ⌘C + ⌘C ⌘H - ⌘H + ⌘H - + Show/Hide Log Window ⌘L - ⌘L + ⌘L - + Show/Hide Hands Window + + + Ctrl+O + + + + + Ctrl+J + + + + + Ctrl+F + + + + + Ctrl+T + + + + + Ctrl+H + + + + + Ctrl+L + + mainWindowImpl diff --git a/ts/pokerth_ru.ts b/ts/pokerth_ru.ts index b89f9a50..11feb0f3 100644 --- a/ts/pokerth_ru.ts +++ b/ts/pokerth_ru.ts @@ -797,12 +797,12 @@ p, li { white-space: pre-wrap; } Лог - + View Вид - + Game Игра @@ -842,50 +842,80 @@ p, li { white-space: pre-wrap; } Создать сетевую игру ... - + Join Network Game ... Присоединиться к сетевой игре ... - + Fullscreen Полноэкранный режим ⌘F - ⌘F + ⌘F - + Show/Hide Chat Window ⌘C - ⌘C + ⌘C ⌘H - ⌘H + ⌘H - + Show/Hide Log Window ⌘L - ⌘L + ⌘L - + Show/Hide Hands Window + + + Ctrl+O + + + + + Ctrl+J + + + + + Ctrl+F + + + + + Ctrl+T + + + + + Ctrl+H + + + + + Ctrl+L + + mainWindowImpl diff --git a/ts/pokerth_sk.ts b/ts/pokerth_sk.ts index 7413350f..aa913df7 100644 --- a/ts/pokerth_sk.ts +++ b/ts/pokerth_sk.ts @@ -765,12 +765,12 @@ p, li { white-space: pre-wrap; } Zastaviť - + View Pohľad - + Game Hra @@ -810,50 +810,80 @@ p, li { white-space: pre-wrap; } Vytvoriť sieťovú hru... - + Join Network Game ... Pripojiť sa k sieťovej hre... - + Fullscreen Celá obrazovka ⌘F - ⌘F + ⌘F - + Show/Hide Chat Window ⌘C - ⌘C + ⌘C ⌘H - ⌘H + ⌘H - + Show/Hide Log Window ⌘L - ⌘L + ⌘L - + Show/Hide Hands Window + + + Ctrl+O + + + + + Ctrl+J + + + + + Ctrl+F + + + + + Ctrl+T + + + + + Ctrl+H + + + + + Ctrl+L + + mainWindowImpl