From de8c72767a52400307ce78eb93651144926c8a16 Mon Sep 17 00:00:00 2001 From: ubbo Date: Tue, 26 Mar 2013 22:51:52 +0000 Subject: mac build fixes git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@1022 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- gpg4usb.pro | 4 ++-- gpg4usb.qrc | 3 +-- kgpg/gpgproc.cpp | 6 ++++++ main.cpp | 9 ++++++--- release/icons/keys12.jpg | Bin 8130 -> 0 bytes release/icons/keys12.png | Bin 45952 -> 0 bytes release/icons/keys13.jpg | Bin 25883 -> 0 bytes release/icons/wizard_keys.png | Bin 0 -> 45952 bytes settingsdialog.cpp | 6 +++++- wizard.cpp | 2 +- 10 files changed, 21 insertions(+), 9 deletions(-) delete mode 100644 release/icons/keys12.jpg delete mode 100644 release/icons/keys12.png delete mode 100644 release/icons/keys13.jpg create mode 100644 release/icons/wizard_keys.png diff --git a/gpg4usb.pro b/gpg4usb.pro index bf53903..df00c13 100644 --- a/gpg4usb.pro +++ b/gpg4usb.pro @@ -12,9 +12,9 @@ INCLUDEPATH += . #DEFINES += GPG4USB_NON_PORTABLE -#CONFIG += release static +CONFIG += release static #CONFIG += release -CONFIG += debug +#CONFIG += debug QT += network # Input diff --git a/gpg4usb.qrc b/gpg4usb.qrc index 5948a09..1f376f1 100644 --- a/gpg4usb.qrc +++ b/gpg4usb.qrc @@ -6,8 +6,7 @@ release/icons/gpg4usb-logo.png release/icons/wizard_banner.png release/icons/gpg4usb-logo_small.png - release/icons/keys12.jpg - release/icons/keys13.jpg + release/icons/wizard_keys.png release/icons/error.png release/icons/button_cancel.png release/icons/button_cut.png diff --git a/kgpg/gpgproc.cpp b/kgpg/gpgproc.cpp index 10f2845..2281cb3 100644 --- a/kgpg/gpgproc.cpp +++ b/kgpg/gpgproc.cpp @@ -362,7 +362,13 @@ QString GPGProc::getGpgHome(const QString &binary) //KStandardDirs::makeDir(gpgHome, 0700);*/ QString appPath = qApp->applicationDirPath(); +#ifdef Q_WS_MAC + QString gpgHome = appPath + "/../../../keydb"; +#else QString gpgHome = appPath + "/keydb"; +#endif + + qDebug() << "gpghome set to: " << gpgHome; return gpgHome; } diff --git a/main.cpp b/main.cpp index 5afa441..7e4b012 100644 --- a/main.cpp +++ b/main.cpp @@ -32,6 +32,9 @@ int main(int argc, char *argv[]) // get application path QString appPath = qApp->applicationDirPath(); +#ifdef Q_WS_MAC + appPath.append("/../../../"); +#endif app.setApplicationVersion("0.3.2"); app.setApplicationName("gpg4usb"); @@ -56,8 +59,8 @@ int main(int argc, char *argv[]) putenv(QString("GNUPGHOME=" + appPath + "/keydb").toAscii().data()); // this may help with newer gpgme versions on windows - putenv(QString("GPGME_GPGPATH=" + appPath + "/gpg-mac").toAscii().data()); - qDebug() << appPath + "/gpg-mac"; +// putenv(QString("GPGME_GPGPATH=" + appPath + "/gpg-mac").toAscii().data()); +// qDebug() << appPath + "/gpg-mac"; // QSettings uses org-name for automatically setting path... app.setOrganizationName("conf"); @@ -75,7 +78,7 @@ int main(int argc, char *argv[]) }*/ // css - QFile file(qApp->applicationDirPath() + "/css/default.css"); + QFile file(appPath + "/css/default.css"); file.open(QFile::ReadOnly); QString styleSheet = QLatin1String(file.readAll()); qApp->setStyleSheet(styleSheet); diff --git a/release/icons/keys12.jpg b/release/icons/keys12.jpg deleted file mode 100644 index acf8f8d..0000000 Binary files a/release/icons/keys12.jpg and /dev/null differ diff --git a/release/icons/keys12.png b/release/icons/keys12.png deleted file mode 100644 index 5dd639b..0000000 Binary files a/release/icons/keys12.png and /dev/null differ diff --git a/release/icons/keys13.jpg b/release/icons/keys13.jpg deleted file mode 100644 index 0b76c5c..0000000 Binary files a/release/icons/keys13.jpg and /dev/null differ diff --git a/release/icons/wizard_keys.png b/release/icons/wizard_keys.png new file mode 100644 index 0000000..5dd639b Binary files /dev/null and b/release/icons/wizard_keys.png differ diff --git a/settingsdialog.cpp b/settingsdialog.cpp index 637ba35..973a147 100755 --- a/settingsdialog.cpp +++ b/settingsdialog.cpp @@ -97,9 +97,13 @@ QHash SettingsDialog::listLanguages() QHash languages; languages.insert("", tr("System Default")); - + QString appPath = qApp->applicationDirPath(); +#ifdef Q_WS_MAC + QDir qmDir = QDir(appPath + "/../../../ts/"); +#else QDir qmDir = QDir(appPath + "/ts/"); +#endif QStringList fileNames = qmDir.entryList(QStringList("gpg4usb_*.qm")); diff --git a/wizard.cpp b/wizard.cpp index 2d7ac18..1c05cf6 100644 --- a/wizard.cpp +++ b/wizard.cpp @@ -44,7 +44,7 @@ Wizard::Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent) setWindowTitle(tr("First Start Wizard")); // http://www.flickr.com/photos/laureenp/6141822934/ - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/keys2.jpg")); + setPixmap(QWizard::WatermarkPixmap, QPixmap(":/wizard_keys.png")); setPixmap(QWizard::LogoPixmap, QPixmap(":/logo_small.png")); setPixmap(QWizard::BannerPixmap, QPixmap(":/banner.png")); -- cgit v1.2.3