Merge remote-tracking branch 'git.irl/master'
diff --git a/gui/chronosharegui.cpp b/gui/chronosharegui.cpp
index f252370..5b49909 100644
--- a/gui/chronosharegui.cpp
+++ b/gui/chronosharegui.cpp
@@ -22,7 +22,7 @@
ChronoShareGui::ChronoShareGui(QWidget *parent) :
QWidget(parent),
- m_settingsFilePath(QDir::homePath() + ".cronoShare")
+ m_settingsFilePath(QDir::homePath() + "/.cronoshare")
{
// load settings
if(!loadSettings())
@@ -95,8 +95,7 @@
// create the "quit program" action
m_quitProgram = new QAction(tr("&Quit"), this);
- connect(m_quitProgram, SIGNAL(triggered()), this, SLOT(quit()));
-
+ connect(m_quitProgram, SIGNAL(triggered()), qApp, SLOT(quit()));
}
void ChronoShareGui::createTrayIcon()
@@ -191,6 +190,9 @@
// Load Settings
QSettings settings(m_settingsFilePath, QSettings::NativeFormat);
+
+ qDebug() << settings.allKeys();
+
if(settings.contains("dirPath"))
{
m_dirPath = settings.value("dirPath", QDir::homePath()).toString();
@@ -201,12 +203,17 @@
m_dirPath = QDir::homePath();
successful = false;
}
+
+ qDebug() << "success: " << successful;
return successful;
}
void ChronoShareGui::saveSettings()
{
+ qDebug() << m_settingsFilePath;
+ qDebug() << m_dirPath;
+
// Save Settings
QSettings settings(m_settingsFilePath, QSettings::NativeFormat);
settings.setValue("dirPath", m_dirPath);
@@ -221,5 +228,4 @@
#if WAF
#include "chronosharegui.moc"
#include "chronosharegui.cpp.moc"
-#endif
-
+#endif
\ No newline at end of file
diff --git a/gui/chronosharegui.h b/gui/chronosharegui.h
index 48e2bc3..76b73ba 100644
--- a/gui/chronosharegui.h
+++ b/gui/chronosharegui.h
@@ -31,6 +31,7 @@
#include <QFileDialog>
#include <QCloseEvent>
#include <QMessageBox>
+#include <QApplication>
class ChronoShareGui : public QWidget
{
diff --git a/wscript b/wscript
index f46e331..fb4b75b 100644
--- a/wscript
+++ b/wscript
@@ -108,7 +108,7 @@
target = "chronoshare-gui",
features = "qt4 cxx cxxprogram",
defines = "WAF",
- source = bld.path.ant_glob(['gui/*.cpp']),
+ source = 'gui/main.cpp gui/chronosharegui.cpp gui/images.qrc',
includes = "gui . ",
use = "QTCORE QTGUI"
)