mac build fixes

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@1022 34ebc366-c3a9-4b3c-9f84-69acf7962910

9 files changed, 21 insertions, 9 deletions

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 @@
         <file alias="gpg4usb-logo.png">release/icons/gpg4usb-logo.png</file>
         <file alias="banner.png">release/icons/wizard_banner.png</file>
         <file alias="logo_small.png">release/icons/gpg4usb-logo_small.png</file>
-        <file alias="keys2.jpg">release/icons/keys12.jpg</file>
-        <file alias="keys3.jpg">release/icons/keys13.jpg</file>
+        <file alias="wizard_keys.png">release/icons/wizard_keys.png</file>
         <file alias="error.png">release/icons/error.png</file>
         <file alias="button_cancel.png">release/icons/button_cancel.png</file>
         <file alias="button_cut.png">release/icons/button_cut.png</file>
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
--- a/release/icons/keys12.jpg
+++ /dev/null
diff --git a/release/icons/keys13.jpg b/release/icons/keys13.jpg
deleted file mode 100644
index 0b76c5c..0000000
--- a/release/icons/keys13.jpg
+++ /dev/null
diff --git a/release/icons/keys12.png b/release/icons/wizard_keys.png
index 5dd639b..5dd639b 100644
--- a/release/icons/keys12.png
+++ b/release/icons/wizard_keys.png
diff --git a/settingsdialog.cpp b/settingsdialog.cpp
index 637ba35..973a147 100755
--- a/settingsdialog.cpp
+++ b/settingsdialog.cpp
@@ -97,9 +97,13 @@ QHash<QString, QString> SettingsDialog::listLanguages()
     QHash<QString, QString> 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"));