jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

oracle importer changes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-05-08 23:24:35 +02:00
parent 03132e2edd
commit 40fc77c646
9 changed files with 183 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cockatrice/src/main.cpp
View file

@ -26,10 +26,12 @@
#include <QDateTime>
#include <QSettings>
#include <QIcon>
#include <QDir>
#include <stdio.h>
#include "main.h"
#include "window_main.h"
#include "dlg_settings.h"
#include "carddatabase.h"
#include "settingscache.h"
#include "pingpixmapgenerator.h"
@ -80,20 +82,30 @@ int main(int argc, char *argv[])
qsrand(QDateTime::currentDateTime().toTime_t());
MainWindow ui;
qDebug("main(): MainWindow constructor finished");
bool startMainProgram = true;
if (!db->getLoadSuccess() || !QDir(settingsCache->getDeckPath()).exists() || !QDir(settingsCache->getPicsPath()).exists()) {
DlgSettings dlgSettings;
dlgSettings.show();
app.exec();
startMainProgram = (db->getLoadSuccess() && QDir(settingsCache->getDeckPath()).exists() && QDir(settingsCache->getPicsPath()).exists());
}
QIcon icon(":/resources/appicon.svg");
ui.setWindowIcon(icon);
ui.show();
qDebug("main(): ui.show() finished");
int retval = app.exec();
if (startMainProgram) {
MainWindow ui;
qDebug("main(): MainWindow constructor finished");
QIcon icon(":/resources/appicon.svg");
ui.setWindowIcon(icon);
ui.show();
qDebug("main(): ui.show() finished");
app.exec();
}
delete pingPixmapGenerator;
delete db;
delete settingsCache;
return retval;
return 0;
}