resources changes

This commit is contained in:
Rafael 2016-03-29 14:29:15 +02:00
parent 9bb40f47cb
commit 7384f39c7d
10 changed files with 16 additions and 3 deletions

View file

@ -37,7 +37,6 @@ PictureDialog::PictureDialog(ProfileDatabase *profileDB, QWidget *parent) :
ui(new Ui::PictureDialog) ui(new Ui::PictureDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
this->setWindowIcon(QIcon(":/img/5sync.png"));
windowTitleStr = this->windowTitle(); windowTitleStr = this->windowTitle();
jsonDrawString = ui->labJSON->text(); jsonDrawString = ui->labJSON->text();
ui->cmdExport->setEnabled(0); ui->cmdExport->setEnabled(0);

View file

@ -69,7 +69,7 @@ TRANSLATIONS += \
gta5sync_de.ts gta5sync_de.ts
RESOURCES += \ RESOURCES += \
app.qrc res/app.qrc
OTHER_FILES += \ OTHER_FILES += \
app.rc app.rc
@ -97,3 +97,9 @@ isEqual(QT_MAJOR_VERSION, 4): SOURCES += qjson4/QJsonArray.cpp \
qjson4/QJsonValueRef.cpp \ qjson4/QJsonValueRef.cpp \
qjson4/QJsonParser.cpp qjson4/QJsonParser.cpp
# UNIX SYSTEM STUFF
unix: !macx: appfiles.path = $$(INSTALL_PATH)/share/applications
unix: !macx: appfiles.files = $$PWD/res/5sync.desktop
unix: !macx: target.path = $$(INSTALL_PATH)/bin
unix: !macx: INSTALLS += target appfiles

View file

@ -32,6 +32,7 @@
#include <QString> #include <QString>
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#include <QDir>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -39,6 +40,10 @@ int main(int argc, char *argv[])
a.setApplicationName("gta5sync"); a.setApplicationName("gta5sync");
a.setApplicationVersion("1.0.0"); a.setApplicationVersion("1.0.0");
QDir pluginsDir = QFileInfo(a.applicationFilePath()).absoluteDir();
pluginsDir.cd("plugins");
a.addLibraryPath(pluginsDir.path());
// Loading translation settings // Loading translation settings
QSettings settings("Syping", "gta5sync"); QSettings settings("Syping", "gta5sync");
settings.beginGroup("Interface"); settings.beginGroup("Interface");
@ -238,6 +243,7 @@ int main(int argc, char *argv[])
bool readOk = picture.readingPictureFromFile(arg1); bool readOk = picture.readingPictureFromFile(arg1);
picDialog->setWindowFlags(picDialog->windowFlags()^Qt::WindowContextHelpButtonHint); picDialog->setWindowFlags(picDialog->windowFlags()^Qt::WindowContextHelpButtonHint);
picDialog->setWindowIcon(QIcon(":/img/5sync-48.png"));
picDialog->setSnapmaticPicture(&picture, readOk); picDialog->setSnapmaticPicture(&picture, readOk);
int crewID = picture.getCrewNumber(); int crewID = picture.getCrewNumber();
@ -259,6 +265,7 @@ int main(int argc, char *argv[])
bool readOk = savegame.readingSavegameFromFile(arg1); bool readOk = savegame.readingSavegameFromFile(arg1);
savegameDialog->setWindowFlags(savegameDialog->windowFlags()^Qt::WindowContextHelpButtonHint); savegameDialog->setWindowFlags(savegameDialog->windowFlags()^Qt::WindowContextHelpButtonHint);
savegameDialog->setWindowIcon(QIcon(":/img/5sync-48.png"));
savegameDialog->setSavegameData(&savegame, readOk); savegameDialog->setSavegameData(&savegame, readOk);
if (!readOk) { return 1; } if (!readOk) { return 1; }
@ -276,6 +283,7 @@ int main(int argc, char *argv[])
threadDB->start(); threadDB->start();
UserInterface *uiWindow = new UserInterface(profileDB, crewDB, threadDB); UserInterface *uiWindow = new UserInterface(profileDB, crewDB, threadDB);
uiWindow->setWindowIcon(QIcon(":/img/5sync-48.png"));
uiWindow->show(); uiWindow->show();
return a.exec(); return a.exec();

View file

Before

Width:  |  Height:  |  Size: 963 B

After

Width:  |  Height:  |  Size: 963 B

View file

@ -7,6 +7,6 @@
<qresource prefix="/img"> <qresource prefix="/img">
<file>savegame.png</file> <file>savegame.png</file>
<file>5sync.ico</file> <file>5sync.ico</file>
<file>5sync.png</file> <file>5sync-48.png</file>
</qresource> </qresource>
</RCC> </RCC>

View file

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB