aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

changed some config defaults, added about box

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-11-15 16:02:51 +01:00
parent 0fdc01f6dd
commit bcf92fc510
4 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/main.h
View file

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

8
cockatrice/src/settingscache.cpp
View file

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

17
cockatrice/src/window_main.cpp
View file

@ -25,6 +25,7 @@
#include <QPixmapCache> #include <QPixmapCache>
#include <QInputDialog> #include <QInputDialog>
#include "main.h"
#include "window_main.h" #include "window_main.h"
#include "dlg_connect.h" #include "dlg_connect.h"
#include "dlg_settings.h" #include "dlg_settings.h"
@ -43,7 +44,7 @@ void MainWindow::updateTabMenu(QMenu *menu)
menuBar()->removeAction(tabMenu->menuAction()); menuBar()->removeAction(tabMenu->menuAction());
tabMenu = menu; tabMenu = menu;
if (menu) if (menu)
menuBar()->addMenu(menu); menuBar()->insertMenu(helpMenu->menuAction(), menu);
} }
void MainWindow::statusChanged(ClientStatus _status) void MainWindow::statusChanged(ClientStatus _status)
@ -147,6 +148,11 @@ void MainWindow::actExit()
close(); 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>").arg(versionString));
}
void MainWindow::serverTimeout() void MainWindow::serverTimeout()
{ {
QMessageBox::critical(this, tr("Error"), tr("Server timeout")); QMessageBox::critical(this, tr("Error"), tr("Server timeout"));
@ -195,6 +201,9 @@ void MainWindow::retranslateUi()
cockatriceMenu->setTitle(tr("&Cockatrice")); cockatriceMenu->setTitle(tr("&Cockatrice"));
aAbout->setText(tr("&About Cockatrice"));
helpMenu->setTitle(tr("&Help"));
tabSupervisor->retranslateUi(); tabSupervisor->retranslateUi();
} }
@ -216,6 +225,9 @@ void MainWindow::createActions()
connect(aSettings, SIGNAL(triggered()), this, SLOT(actSettings())); connect(aSettings, SIGNAL(triggered()), this, SLOT(actSettings()));
aExit = new QAction(this); aExit = new QAction(this);
connect(aExit, SIGNAL(triggered()), this, SLOT(actExit())); connect(aExit, SIGNAL(triggered()), this, SLOT(actExit()));
aAbout = new QAction(this);
connect(aAbout, SIGNAL(triggered()), this, SLOT(actAbout()));
} }
void MainWindow::createMenus() void MainWindow::createMenus()
@ -232,6 +244,9 @@ void MainWindow::createMenus()
cockatriceMenu->addAction(aSettings); cockatriceMenu->addAction(aSettings);
cockatriceMenu->addSeparator(); cockatriceMenu->addSeparator();
cockatriceMenu->addAction(aExit); cockatriceMenu->addAction(aExit);
helpMenu = menuBar()->addMenu(QString());
helpMenu->addAction(aAbout);
} }
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)

7
cockatrice/src/window_main.h
View file

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