Merge pull request #53 from nuttyartist/dev

Merge dev to master

.gitignore

@@ -9,3 +9,7 @@ bin*
 .DS_Store*
 ehthumbs.db
 Thumbs.db
+Makefile
+Notes
+qrc_images.cpp
+*.autosave

src/Notes.pro

@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui
+QT       += core gui network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
@@ -14,10 +14,18 @@ TEMPLATE = app
 
 SOURCES += main.cpp\
         mainwindow.cpp \
-    notedata.cpp
+    notedata.cpp \
+    notewidgetdelegate.cpp \
+    notemodel.cpp \
+    noteview.cpp \
+    singleinstance.cpp
 
 HEADERS  += mainwindow.h \
-    notedata.h
+    notedata.h \
+    notewidgetdelegate.h \
+    notemodel.h \
+    noteview.h \
+    singleinstance.h
 
 FORMS    += mainwindow.ui
 
@@ -26,7 +34,21 @@ RESOURCES += \
 
 CONFIG   += c++11
 
-DESTDIR = ../bin
+win32|mac {
+    DESTDIR = ../bin
+}
+
+unix {
+    isEmpty(PREFIX) {
+        PREFIX = /usr
+    }
+
+    BINDIR = $$PREFIX/bin
+    DATADIR =$$PREFIX/share
+
+    target.path = $$BINDIR
+    INSTALLS += target
+}
 
 win32:RC_FILE = images\notes.rc
 

src/main.cpp

@@ -6,14 +6,38 @@
 
 #include "mainwindow.h"
 #include <QApplication>
+#include "singleinstance.h"
 
 int main(int argc, char *argv[])
 {
     QApplication::setDesktopSettingsAware(false);
     QApplication a(argc, argv);
 
+    // Prevent many instances of the app to be launched
+    QString name = "com.awsomeness.notes";
+    SingleInstance instance;
+    if(instance.hasPrevious(name)){
+        return 0;
+    }
+
+    instance.listen(name);
+
+    // Create and Show the app
     MainWindow w;
     w.show();
 
+    // Bring the Notes window to the front
+    QObject::connect(&instance, &SingleInstance::newInstance, [&](){
+
+        (&w)->hide();
+        (&w)->setWindowState(Qt::WindowMinimized);
+        qApp->processEvents();
+        (&w)->setWindowState(Qt::WindowNoState);
+        qApp->processEvents();
+        (&w)->show();
+        (&w)->setWindowState(Qt::WindowActive);
+
+    });
+
     return a.exec();
 }