Portable support: Packet Sender looks for local settings file before …

…loading default.
dannagle · Apr 19, 2015 · bef1a94 · bef1a94
1 parent 398e1cc
commit bef1a94
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 33 deletions.
diff --git a/src/globals.h b/src/globals.h
@@ -17,10 +17,12 @@
 
 #define TEMPPATH  QDir::toNativeSeparators(QDir::temp().absolutePath()) + QDir::separator() + "PacketSender" + QDir::separator()
 #define SETTINGSPATH QStandardPaths::writableLocation( QStandardPaths::GenericDataLocation )+ QDir::separator() +"PacketSender" + QDir::separator()
-#define SETTINGSFILE SETTINGSPATH  + "ps_settings.ini"
-#define PACKETSFILE SETTINGSPATH + "packets.ini"
-#define TRAFFICFILE SETTINGSPATH + "traffic.ini"
-#define LOGFILE SETTINGSPATH + "packetsender.log"
+
+//Load local file if it exists
+#define SETTINGSFILE ((QFile::exists("ps_settings.ini")) ? ("ps_settings.ini") : ((SETTINGSPATH)  + "ps_settings.ini"))
+#define PACKETSFILE ((QFile::exists("packets.ini")) ? ("packets.ini") : ((SETTINGSPATH)  + "packets.ini"))
+#define TRAFFICFILE ((QFile::exists("traffic.ini")) ? ("traffic.ini") : ((SETTINGSPATH)  + "traffic.ini"))
+
 
 #define NAMEINIKEY "NAMES"
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -16,28 +16,6 @@
 #include "mainwindow.h"
 #define DEBUGMODE 0
 
-void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
-{
-    static QFile logfile(LOGFILE);
-    Q_UNUSED(context);
-    if(!logfile.isOpen())
-    {
-        logfile.open(QFile::Append);
-    } else {
-//        logfile.flush();
-    }
-    switch (type) {
-      default:
-        logfile.write("\n");
-        logfile.write(msg.toLatin1());
-        break;
-      case QtFatalMsg:
-         logfile.flush();
-         abort();
-      }
-}
-
-
 
 void myMessageOutputDisable(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -280,6 +280,11 @@ MainWindow::MainWindow(QWidget *parent) :
 
 
     QDEBUG() << "Load time:" <<  timeSinceLaunch();
+
+    QDEBUG() << "Settings file loaded" << SETTINGSFILE;
+    QDEBUG() << "Packets file loaded" << PACKETSFILE;
+    QDEBUG() << "Traffic file loaded" << TRAFFICFILE;
+
 }
 
 QPushButton * MainWindow::generatePSLink()

diff --git a/src/packet.cpp b/src/packet.cpp
@@ -390,12 +390,6 @@ void Packet::saveToDB()
 }
 
 
-Packet Packet::fetchFromDB(QString thename, QList<Packet> allPackets)
-{
-    Packet fromPacket;
-    return fromPacket;
-}
-
 Packet Packet::fetchFromDB(QString thename)
 {
     QList<Packet> packets =  Packet::fetchAllfromDB("");

diff --git a/src/packet.h b/src/packet.h
@@ -57,7 +57,6 @@ class Packet
     void saveToDB();
 
 
-    static Packet fetchFromDB(QString thename, QList<Packet> allPackets);
     static Packet fetchFromDB(QString thename);
     static QList<Packet> fetchAllfromDB(QString importFile);
     static bool removeFromDB(QString thename);