modify aurora for taurus

diff --git a/aurora/.gitmodules b/.gitmodules
similarity index 72%
rename from aurora/.gitmodules
rename to .gitmodules
index ccecbd2..5c2c9e4 100644 (file)
--- a/aurora/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "gnupg"]
-       path = gnupg
+       path = aurora/gnupg
        url = git://git.gnupg.org/gnupg.git
 [submodule "libassuan"]
-       path = libassuan
+       path = aurora/libassuan
        url = git://git.gnupg.org/libassuan.git
 [submodule "gpgme"]
-       path = gpgme
+       path = aurora/gpgme
        url = git://git.gnupg.org/gpgme.git
 [submodule "libgpg-error"]
-       path = libgpg-error
+       path = aurora/libgpg-error
        url = git://git.gnupg.org/libgpg-error.git

diff --git a/aurora/aurora.pro b/aurora/aurora.pro
new file mode 100644 (file)
index 0000000..566187c
--- /dev/null
+++ b/aurora/aurora.pro
@@ -0,0 +1,19 @@
+TEMPLATE = lib
+TARGET = Aurora
+DESTDIR = $$PWD/../lib
+QT -= gui
+QT += network xml
+CONFIG += dll create_prl hide_symbols separate_debug_info
+
+OBJECTS_DIR = .ctmp
+MOC_DIR = .ctmp
+RCC_DIR = .ctmp
+
+VERSION = 0.2.0
+
+SOURCES += src/aurora.cpp
+
+HEADERS += src/aurora.h
+
+INCLUDEPATH += src
+DEPENDPATH += $$INCLUDEPATH
\ No newline at end of file

diff --git a/aurora/src/aurora.cpp b/aurora/src/aurora.cpp
index ea5de4c..6489e94 100644 (file)
--- a/aurora/src/aurora.cpp
+++ b/aurora/src/aurora.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "aurora.h"
-#include "aurora_p.h"
 
 #include <QDebug>
 #include <QSettings>
@@ -25,7 +24,9 @@ struct AuroraPrivate
 
 Aurora::Aurora(QObject* parent):QObject(parent)
 {
-        d=new AuroraPrivate(this);
+        d=new AuroraPrivate;
+        //make sure the timer triggers
+        startPoll();
 }
 
 Aurora::~Aurora()
@@ -37,12 +38,13 @@ Aurora::~Aurora()
 
 static const QString AuroraGroup("aurora_updater");
 
-AuroraPrivate::AuroraPrivate(QObject* parent)
+AuroraPrivate::AuroraPrivate()
         :state(Aurora::Initializing),pollint(0),polltmr(0)
 {
         QSettings cfg;
         cfg.beginGroup(AuroraGroup);
         url=cfg.value("baseurl").toUrl();
+        pollint=cfg.value("pollintervall",0).toInt();
 }
 
 void Aurora::setBaseUrl(QUrl u)
@@ -76,8 +78,12 @@ void Aurora::setPollIntervall(int seconds)
 
 void Aurora::startPoll(int intervalInSeconds)
 {
-        if(intervalInSeconds>=0)
+        if(intervalInSeconds>=0){
                 d->pollint=intervalInSeconds;
+                QSettings cfg;
+                cfg.beginGroup(AuroraGroup);
+                cfg.setValue("pollintervall",d->pollint);
+        }
         if(d->polltmr){
                 delete d->polltmr;
                 d->polltmr=0;
@@ -121,4 +127,3 @@ void Aurora::startInstallation()
 {
 
 }
-

diff --git a/aurora/src/aurora.pro b/aurora/src/aurora.pro
deleted file mode 100644 (file)
index 6ed1973..0000000
--- a/aurora/src/aurora.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TEMPLATE = lib
-TARGET = Aurora
-DESTDIR = ..
-QT -= gui
-QT += network xml
-CONFIG += dll create_prl
-
-OBJECTS_DIR = .ctmp
-MOC_DIR = .ctmp
-RCC_DIR = .ctmp
-
-VERSION = 0.2.0
-
-SOURCES += aurora.cpp
-
-HEADERS += aurora.h
\ No newline at end of file

diff --git a/taurus.pro b/taurus.pro
index 6874a24..9eb0d1b 100644 (file)
--- a/taurus.pro
+++ b/taurus.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS = zip elam
+SUBDIRS = zip elam aurora