This commit is contained in:
Max-Wilhelm Bruker 2009-10-22 18:25:07 +02:00
parent 8a919e572f
commit 3d1052f54c
3 changed files with 3 additions and 6 deletions

View file

@ -8,7 +8,6 @@ Counter::Counter(Player *_player, int _id, const QString &_name, QColor _color,
{ {
if (radius > Player::counterAreaWidth / 2) if (radius > Player::counterAreaWidth / 2)
radius = Player::counterAreaWidth / 2; radius = Player::counterAreaWidth / 2;
if (player->getLocal()) { if (player->getLocal()) {
menu = new QMenu(name); menu = new QMenu(name);
aSet = new QAction(this); aSet = new QAction(this);

View file

@ -46,7 +46,7 @@ int main(int argc, char *argv[])
{ {
// qInstallMsgHandler(myMessageOutput); // qInstallMsgHandler(myMessageOutput);
QApplication app(argc, argv); QApplication app(argc, argv);
app.addLibraryPath("plugins"); app.addLibraryPath(app.applicationDirPath() + "/plugins");
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
QCoreApplication::setOrganizationName("Cockatrice"); QCoreApplication::setOrganizationName("Cockatrice");
@ -73,10 +73,8 @@ int main(int argc, char *argv[])
MainWindow ui(&translator); MainWindow ui(&translator);
qDebug("main(): MainWindow constructor finished"); qDebug("main(): MainWindow constructor finished");
//set Icon QIcon icon(":/resources/icon.svg");
QIcon icon("resources/icon.svg");
ui.setWindowIcon(icon); ui.setWindowIcon(icon);
//
ui.show(); ui.show();
qDebug("main(): ui.show() finished"); qDebug("main(): ui.show() finished");

View file

@ -5,7 +5,7 @@
WindowMain::WindowMain(QWidget *parent) WindowMain::WindowMain(QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)
{ {
importer = new OracleImporter("../oracle", this); importer = new OracleImporter(qApp->applicationDirPath() + "../oracle", this);
QVBoxLayout *checkboxLayout = new QVBoxLayout; QVBoxLayout *checkboxLayout = new QVBoxLayout;
QList<SetToDownload> &sets = importer->getSets(); QList<SetToDownload> &sets = importer->getSets();