diff --git a/cockatrice/src/main.h b/cockatrice/src/main.h index 0c59e9a1..36393496 100644 --- a/cockatrice/src/main.h +++ b/cockatrice/src/main.h @@ -8,6 +8,7 @@ extern CardDatabase *db; extern QTranslator *translator; const QString translationPrefix = "cockatrice"; +const QString versionString = "0.20101115"; void installNewTranslator(); diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp index d44270f9..604766cd 100644 --- a/cockatrice/src/settingscache.cpp +++ b/cockatrice/src/settingscache.cpp @@ -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) diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp index 94f2bdbc..8be0cb05 100644 --- a/cockatrice/src/window_main.cpp +++ b/cockatrice/src/window_main.cpp @@ -25,6 +25,7 @@ #include #include +#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("Cockatrice
Version %1


Authors:
Max-Wilhelm Bruker
Marcus Schütz
Marius van Zundert

Translators:
Spanish: Gocho
").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) diff --git a/cockatrice/src/window_main.h b/cockatrice/src/window_main.h index a85d4182..adb4e20e 100644 --- a/cockatrice/src/window_main.h +++ b/cockatrice/src/window_main.h @@ -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;