Merge branch 'master' of ssh://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice

This commit is contained in:
Max-Wilhelm Bruker 2010-11-15 19:23:29 +01:00
commit 0b0bd73db5
10 changed files with 2727 additions and 83 deletions

View file

@ -160,7 +160,8 @@ SOURCES += src/counter.cpp \
TRANSLATIONS += \
translations/cockatrice_de.ts \
translations/cockatrice_en.ts \
translations/cockatrice_es.ts
translations/cockatrice_es.ts \
translations/cockatrice_pt.ts
win32 {
RC_FILE = cockatrice.rc
}

View file

@ -27,6 +27,7 @@
<file>translations/cockatrice_de.qm</file>
<file>translations/cockatrice_en.qm</file>
<file>translations/cockatrice_es.qm</file>
<file>translations/cockatrice_pt.qm</file>
<file>resources/appicon.svg</file>
<file>resources/add_to_sideboard.svg</file>
<file>resources/decrement.svg</file>

View file

@ -8,6 +8,7 @@ extern CardDatabase *db;
extern QTranslator *translator;
const QString translationPrefix = "cockatrice";
const QString versionString = "0.20101115";
void installNewTranslator();

View file

@ -17,16 +17,16 @@ SettingsCache::SettingsCache()
playerBgPath = settings->value("zonebg/playerarea").toString();
cardBackPicturePath = settings->value("paths/cardbackpicture").toString();
picDownload = settings->value("personal/picturedownload", false).toBool();
picDownload = settings->value("personal/picturedownload", true).toBool();
doubleClickToPlay = settings->value("interface/doubleclicktoplay", true).toBool();
cardInfoMinimized = settings->value("interface/cardinfominimized", false).toBool();
horizontalHand = settings->value("hand/horizontal", false).toBool();
horizontalHand = settings->value("hand/horizontal", true).toBool();
economicalGrid = settings->value("table/economic", false).toBool();
invertVerticalCoordinate = settings->value("table/invert_vertical", false).toBool();
tapAnimation = settings->value("cards/tapanimation", true).toBool();
zoneViewSortByName = settings->value("zoneview/sortbyname", false).toBool();
zoneViewSortByType = settings->value("zoneview/sortbytype", false).toBool();
zoneViewSortByName = settings->value("zoneview/sortbyname", true).toBool();
zoneViewSortByType = settings->value("zoneview/sortbytype", true).toBool();
}
void SettingsCache::setLang(const QString &_lang)

View file

@ -25,6 +25,7 @@
#include <QPixmapCache>
#include <QInputDialog>
#include "main.h"
#include "window_main.h"
#include "dlg_connect.h"
#include "dlg_settings.h"
@ -43,7 +44,7 @@ void MainWindow::updateTabMenu(QMenu *menu)
menuBar()->removeAction(tabMenu->menuAction());
tabMenu = menu;
if (menu)
menuBar()->addMenu(menu);
menuBar()->insertMenu(helpMenu->menuAction(), menu);
}
void MainWindow::statusChanged(ClientStatus _status)
@ -147,6 +148,11 @@ void MainWindow::actExit()
close();
}
void MainWindow::actAbout()
{
QMessageBox::about(this, tr("About Cockatrice"), trUtf8("<font size=\"8\"><b>Cockatrice</b></font><br>Version %1<br><br><br><b>Authors:</b><br>Max-Wilhelm Bruker<br>Marcus Schütz<br>Marius van Zundert<br><br><b>Translators:</b><br>Spanish: Gocho<br>Portugese: Milton Gonçalves<br>").arg(versionString));
}
void MainWindow::serverTimeout()
{
QMessageBox::critical(this, tr("Error"), tr("Server timeout"));
@ -195,6 +201,9 @@ void MainWindow::retranslateUi()
cockatriceMenu->setTitle(tr("&Cockatrice"));
aAbout->setText(tr("&About Cockatrice"));
helpMenu->setTitle(tr("&Help"));
tabSupervisor->retranslateUi();
}
@ -216,6 +225,9 @@ void MainWindow::createActions()
connect(aSettings, SIGNAL(triggered()), this, SLOT(actSettings()));
aExit = new QAction(this);
connect(aExit, SIGNAL(triggered()), this, SLOT(actExit()));
aAbout = new QAction(this);
connect(aAbout, SIGNAL(triggered()), this, SLOT(actAbout()));
}
void MainWindow::createMenus()
@ -232,6 +244,9 @@ void MainWindow::createMenus()
cockatriceMenu->addAction(aSettings);
cockatriceMenu->addSeparator();
cockatriceMenu->addAction(aExit);
helpMenu = menuBar()->addMenu(QString());
helpMenu->addAction(aAbout);
}
MainWindow::MainWindow(QWidget *parent)

View file

@ -47,14 +47,17 @@ private slots:
void actFullScreen(bool checked);
void actSettings();
void actExit();
void actAbout();
private:
static const QString appName;
void setClientStatusTitle();
void retranslateUi();
void createActions();
void createMenus();
QMenu *cockatriceMenu, *tabMenu;
QAction *aConnect, *aDisconnect, *aSinglePlayer, *aDeckEditor, *aFullScreen, *aSettings, *aExit;
QMenu *cockatriceMenu, *tabMenu, *helpMenu;
QAction *aConnect, *aDisconnect, *aSinglePlayer, *aDeckEditor, *aFullScreen, *aSettings, *aExit,
*aAbout;
TabSupervisor *tabSupervisor;
RemoteClient *client;

View file

@ -1575,86 +1575,106 @@
<context>
<name>MainWindow</name>
<message>
<location filename="../src/window_main.cpp" line="92"/>
<location filename="../src/window_main.cpp" line="93"/>
<source>Number of players</source>
<translation>Spieleranzahl</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="92"/>
<location filename="../src/window_main.cpp" line="93"/>
<source>Please enter the number of players.</source>
<translation>Bitte die Spieleranzahl eingeben:</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="101"/>
<location filename="../src/window_main.cpp" line="107"/>
<location filename="../src/window_main.cpp" line="102"/>
<location filename="../src/window_main.cpp" line="108"/>
<source>Player %1</source>
<translation>Spieler %1</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="152"/>
<location filename="../src/window_main.cpp" line="153"/>
<source>About Cockatrice</source>
<translation type="unfinished"></translation>
</message>
<message utf8="true">
<location filename="../src/window_main.cpp" line="153"/>
<source>&lt;font size=&quot;8&quot;&gt;&lt;b&gt;Cockatrice&lt;/b&gt;&lt;/font&gt;&lt;br&gt;Version %1&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Authors:&lt;/b&gt;&lt;br&gt;Max-Wilhelm Bruker&lt;br&gt;Marcus Schütz&lt;br&gt;Marius van Zundert&lt;br&gt;&lt;br&gt;&lt;b&gt;Translators:&lt;/b&gt;&lt;br&gt;Spanish: Gocho&lt;br&gt;Portugese: Milton Gonçalves&lt;br&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="158"/>
<location filename="../src/window_main.cpp" line="165"/>
<location filename="../src/window_main.cpp" line="170"/>
<location filename="../src/window_main.cpp" line="164"/>
<location filename="../src/window_main.cpp" line="171"/>
<location filename="../src/window_main.cpp" line="176"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="152"/>
<location filename="../src/window_main.cpp" line="158"/>
<source>Server timeout</source>
<translation>Server Zeitüberschreitung</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="158"/>
<location filename="../src/window_main.cpp" line="164"/>
<source>Invalid login data.</source>
<translation>Ungültige Anmeldedaten.</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="165"/>
<location filename="../src/window_main.cpp" line="171"/>
<source>Socket error: %1</source>
<translation>Netzwerkfehler: %1</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="170"/>
<location filename="../src/window_main.cpp" line="176"/>
<source>Protocol version mismatch. Local version: %1, remote version: %2.</source>
<translation>Protokollversionen stimmen nicht überein. Lokale Version: %1, Serverversion: %2.</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="176"/>
<location filename="../src/window_main.cpp" line="182"/>
<source>Connecting to %1...</source>
<translation>Verbinde zu %1...</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="177"/>
<location filename="../src/window_main.cpp" line="183"/>
<source>Disconnected</source>
<translation>nicht verbunden</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="178"/>
<location filename="../src/window_main.cpp" line="184"/>
<source>Logged in at %1</source>
<translation>Angemeldet bei %1</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="187"/>
<location filename="../src/window_main.cpp" line="193"/>
<source>&amp;Connect...</source>
<translation>&amp;Verbinden...</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="188"/>
<location filename="../src/window_main.cpp" line="194"/>
<source>&amp;Disconnect</source>
<translation>Verbindung &amp;trennen</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="189"/>
<location filename="../src/window_main.cpp" line="195"/>
<source>Start &amp;local game...</source>
<translation>&amp;Lokales Spiel starten...</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="266"/>
<location filename="../src/window_main.cpp" line="204"/>
<source>&amp;About Cockatrice</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="205"/>
<source>&amp;Help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="281"/>
<source>Are you sure?</source>
<translation>Sind Sie sicher?</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="266"/>
<location filename="../src/window_main.cpp" line="281"/>
<source>There are still open games. Are you sure you want to quit?</source>
<translation>Es gibt noch offene Spiele. Wollen Sie das Programm wirklich beenden?</translation>
</message>
@ -1671,27 +1691,27 @@
<translation type="obsolete">Spiel ver&amp;lassen</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="190"/>
<location filename="../src/window_main.cpp" line="196"/>
<source>&amp;Deck editor</source>
<translation>&amp;Deck-Editor</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="191"/>
<location filename="../src/window_main.cpp" line="197"/>
<source>&amp;Full screen</source>
<translation>&amp;Vollbild</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="192"/>
<location filename="../src/window_main.cpp" line="198"/>
<source>Ctrl+F</source>
<translation>Ctrl+F</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="193"/>
<location filename="../src/window_main.cpp" line="199"/>
<source>&amp;Settings...</source>
<translation>&amp;Einstellungen...</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="194"/>
<location filename="../src/window_main.cpp" line="200"/>
<source>&amp;Exit</source>
<translation>&amp;Beenden</translation>
</message>
@ -1704,7 +1724,7 @@
<translation type="obsolete">Esc</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="196"/>
<location filename="../src/window_main.cpp" line="202"/>
<source>&amp;Cockatrice</source>
<translation>&amp;Cockatrice</translation>
</message>

View file

@ -1044,116 +1044,136 @@
<context>
<name>MainWindow</name>
<message>
<location filename="../src/window_main.cpp" line="92"/>
<location filename="../src/window_main.cpp" line="93"/>
<source>Number of players</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="92"/>
<location filename="../src/window_main.cpp" line="93"/>
<source>Please enter the number of players.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="101"/>
<location filename="../src/window_main.cpp" line="107"/>
<location filename="../src/window_main.cpp" line="102"/>
<location filename="../src/window_main.cpp" line="108"/>
<source>Player %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="152"/>
<location filename="../src/window_main.cpp" line="153"/>
<source>About Cockatrice</source>
<translation type="unfinished"></translation>
</message>
<message utf8="true">
<location filename="../src/window_main.cpp" line="153"/>
<source>&lt;font size=&quot;8&quot;&gt;&lt;b&gt;Cockatrice&lt;/b&gt;&lt;/font&gt;&lt;br&gt;Version %1&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Authors:&lt;/b&gt;&lt;br&gt;Max-Wilhelm Bruker&lt;br&gt;Marcus Schütz&lt;br&gt;Marius van Zundert&lt;br&gt;&lt;br&gt;&lt;b&gt;Translators:&lt;/b&gt;&lt;br&gt;Spanish: Gocho&lt;br&gt;Portugese: Milton Gonçalves&lt;br&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="158"/>
<location filename="../src/window_main.cpp" line="165"/>
<location filename="../src/window_main.cpp" line="170"/>
<location filename="../src/window_main.cpp" line="164"/>
<location filename="../src/window_main.cpp" line="171"/>
<location filename="../src/window_main.cpp" line="176"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="152"/>
<location filename="../src/window_main.cpp" line="158"/>
<source>Server timeout</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="158"/>
<location filename="../src/window_main.cpp" line="164"/>
<source>Invalid login data.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="165"/>
<location filename="../src/window_main.cpp" line="171"/>
<source>Socket error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="170"/>
<location filename="../src/window_main.cpp" line="176"/>
<source>Protocol version mismatch. Local version: %1, remote version: %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="176"/>
<location filename="../src/window_main.cpp" line="182"/>
<source>Connecting to %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="177"/>
<location filename="../src/window_main.cpp" line="183"/>
<source>Disconnected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="178"/>
<location filename="../src/window_main.cpp" line="184"/>
<source>Logged in at %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="187"/>
<location filename="../src/window_main.cpp" line="193"/>
<source>&amp;Connect...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="188"/>
<location filename="../src/window_main.cpp" line="194"/>
<source>&amp;Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="189"/>
<location filename="../src/window_main.cpp" line="195"/>
<source>Start &amp;local game...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="190"/>
<location filename="../src/window_main.cpp" line="196"/>
<source>&amp;Deck editor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="191"/>
<location filename="../src/window_main.cpp" line="197"/>
<source>&amp;Full screen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="192"/>
<location filename="../src/window_main.cpp" line="198"/>
<source>Ctrl+F</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="193"/>
<location filename="../src/window_main.cpp" line="199"/>
<source>&amp;Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="194"/>
<location filename="../src/window_main.cpp" line="200"/>
<source>&amp;Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="196"/>
<location filename="../src/window_main.cpp" line="202"/>
<source>&amp;Cockatrice</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="266"/>
<location filename="../src/window_main.cpp" line="204"/>
<source>&amp;About Cockatrice</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="205"/>
<source>&amp;Help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="281"/>
<source>Are you sure?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="266"/>
<location filename="../src/window_main.cpp" line="281"/>
<source>There are still open games. Are you sure you want to quit?</source>
<translation type="unfinished"></translation>
</message>

View file

@ -1190,116 +1190,136 @@
<context>
<name>MainWindow</name>
<message>
<location filename="../src/window_main.cpp" line="92"/>
<location filename="../src/window_main.cpp" line="93"/>
<source>Number of players</source>
<translation>Número de jugadores</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="92"/>
<location filename="../src/window_main.cpp" line="93"/>
<source>Please enter the number of players.</source>
<translation>Por favor, introduzca el número de jugadores.</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="101"/>
<location filename="../src/window_main.cpp" line="107"/>
<location filename="../src/window_main.cpp" line="102"/>
<location filename="../src/window_main.cpp" line="108"/>
<source>Player %1</source>
<translation>Jugador %1</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="152"/>
<location filename="../src/window_main.cpp" line="153"/>
<source>About Cockatrice</source>
<translation type="unfinished"></translation>
</message>
<message utf8="true">
<location filename="../src/window_main.cpp" line="153"/>
<source>&lt;font size=&quot;8&quot;&gt;&lt;b&gt;Cockatrice&lt;/b&gt;&lt;/font&gt;&lt;br&gt;Version %1&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Authors:&lt;/b&gt;&lt;br&gt;Max-Wilhelm Bruker&lt;br&gt;Marcus Schütz&lt;br&gt;Marius van Zundert&lt;br&gt;&lt;br&gt;&lt;b&gt;Translators:&lt;/b&gt;&lt;br&gt;Spanish: Gocho&lt;br&gt;Portugese: Milton Gonçalves&lt;br&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="158"/>
<location filename="../src/window_main.cpp" line="165"/>
<location filename="../src/window_main.cpp" line="170"/>
<location filename="../src/window_main.cpp" line="164"/>
<location filename="../src/window_main.cpp" line="171"/>
<location filename="../src/window_main.cpp" line="176"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="152"/>
<location filename="../src/window_main.cpp" line="158"/>
<source>Server timeout</source>
<translation>Tiempo de espera del servidor agotado</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="158"/>
<location filename="../src/window_main.cpp" line="164"/>
<source>Invalid login data.</source>
<translation>Datos de conexión invalidos.</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="165"/>
<location filename="../src/window_main.cpp" line="171"/>
<source>Socket error: %1</source>
<translation>Error del Socket: %1</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="170"/>
<location filename="../src/window_main.cpp" line="176"/>
<source>Protocol version mismatch. Local version: %1, remote version: %2.</source>
<translation>La versión del protocolo es diferente. Version local: %1, version remota: %2.</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="176"/>
<location filename="../src/window_main.cpp" line="182"/>
<source>Connecting to %1...</source>
<translation>Conectando a %1...</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="177"/>
<location filename="../src/window_main.cpp" line="183"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="178"/>
<location filename="../src/window_main.cpp" line="184"/>
<source>Logged in at %1</source>
<translation>Conectado en %1</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="187"/>
<location filename="../src/window_main.cpp" line="193"/>
<source>&amp;Connect...</source>
<translation>&amp;Conectar...</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="188"/>
<location filename="../src/window_main.cpp" line="194"/>
<source>&amp;Disconnect</source>
<translation>&amp;Desconectar</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="189"/>
<location filename="../src/window_main.cpp" line="195"/>
<source>Start &amp;local game...</source>
<translation>Empezar partida &amp;local...</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="190"/>
<location filename="../src/window_main.cpp" line="196"/>
<source>&amp;Deck editor</source>
<translation>Editor de &amp;mazos</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="191"/>
<location filename="../src/window_main.cpp" line="197"/>
<source>&amp;Full screen</source>
<translation>&amp;Pantalla completa</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="192"/>
<location filename="../src/window_main.cpp" line="198"/>
<source>Ctrl+F</source>
<translation>CTRL+F</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="193"/>
<location filename="../src/window_main.cpp" line="199"/>
<source>&amp;Settings...</source>
<translation>&amp;Preferencias...</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="194"/>
<location filename="../src/window_main.cpp" line="200"/>
<source>&amp;Exit</source>
<translation>&amp;Salir</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="196"/>
<location filename="../src/window_main.cpp" line="202"/>
<source>&amp;Cockatrice</source>
<translation>&amp;Cockatrice</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="266"/>
<location filename="../src/window_main.cpp" line="204"/>
<source>&amp;About Cockatrice</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="205"/>
<source>&amp;Help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="281"/>
<source>Are you sure?</source>
<translation>¿Estás seguro?</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="266"/>
<location filename="../src/window_main.cpp" line="281"/>
<source>There are still open games. Are you sure you want to quit?</source>
<translation>Todavía hay partidas abiertas. ¿Estás seguro que quieres salir?</translation>
</message>

File diff suppressed because it is too large Load diff