Merge pull request #124 from sieren/refactor-folders

Restructure Folder Structure

CMakeLists.txt

@@ -44,16 +44,52 @@ include_directories(${Qt5Widgets_INCLUDES})
 # We need add -DQT_WIDGETS_LIB when using QtWidgets in Qt 5.
 add_definitions(${Qt5Widgets_DEFINITIONS})
 
-# qt5_wrap_ui(UI_HEADERS mainwindow.ui)
-qt5_add_resources(UI_RESOURCES src/qsyncthing.qrc)
+#  ____  _       _    __
+# |  _ \| | __ _| |_ / _| ___  _ __ _ __ ___
+# | |_) | |/ _` | __| |_ / _ \| '__| '_ ` _ \
+# |  __/| | (_| | |_|  _| (_) | |  | | | | | |
+# |_|   |_|\__,_|\__|_|  \___/|_|  |_| |_| |_|
+#
+
+set(qst_platform_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/includes/platforms)
+set(qst_platform_SOURCES)
+if(APPLE)
+  set(qst_platform_SOURCES
+    ${qst_platform_SOURCES}
+    ${qst_platform_ROOT}/darwin/macUtils.hpp
+)
+elseif(WIN32)
+  set(qst_platform_SOURCES
+    ${qst_platform_SOURCES}
+    ${qst_platform_ROOT}/windows/winUtils.hpp
+)
+elseif(UNIX)
+  set(qst_platform_SOURCES
+    ${qst_platform_SOURCES}
+    ${qst_platform_ROOT}/linux/posixUtils.hpp
+)
+endif()
+set(qst_platform_SOURCES
+  ${qst_platform_SOURCES}
+)
 
-add_subdirectory(src src-binary)
-set(SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/src)
-file(GLOB_RECURSE FILES_WP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${SRC_ROOT}/*.cpp ${SRC_ROOT}/*.h ${SRC_ROOT}/*.hpp)
+source_group("Platforms" ${qst_platform_SOURCES})
 
+#  ____       _   _
+# |  _ \ __ _| |_| |__  ___
+# | |_) / _` | __| '_ \/ __|
+# |  __/ (_| | |_| | | \__ \
+# |_|   \__,_|\__|_| |_|___/
+#
+
+# qt5_wrap_ui(UI_HEADERS mainwindow.ui)
+qt5_add_resources(UI_RESOURCES resources/qsyncthing.qrc)
 
+include_directories(includes)
+add_subdirectory(includes)
+add_subdirectory(sources)
 
-set(MACOSX_BUNDLE_ICON_FILE Syncthing.icns)
+set(MACOSX_BUNDLE_ICON_FILE resources/Syncthing.icns)
 SET_SOURCE_FILES_PROPERTIES(
   Syncthing.icns
   PROPERTIES
@@ -62,11 +98,12 @@ SET_SOURCE_FILES_PROPERTIES(
 
   if(APPLE)
     FIND_LIBRARY(COCOA_LIBRARY Cocoa)
-    add_executable(QSyncthingTray MACOSX_BUNDLE src/Syncthing.icns ${UI_HEADERS} ${UI_RESOURCES} ${FILES_WP})
+    add_executable(QSyncthingTray MACOSX_BUNDLE resources/Syncthing.icns ${UI_HEADERS} ${UI_RESOURCES} 
+    ${qst_platform_SOURCES} ${qst_HEADERS} ${qst_SOURCES})
   elseif(WIN32)
-    add_executable(QSyncthingTray WIN32 ${UI_HEADERS} ${UI_RESOURCES} ${FILES_WP})
+    add_executable(QSyncthingTray WIN32 ${UI_HEADERS} ${UI_RESOURCES} ${qst_platform_SOURCES} ${qst_HEADERS} ${qst_SOURCES})
   elseif(UNIX)
-    add_executable(QSyncthingTray ${UI_HEADERS} ${UI_RESOURCES} ${FILES_WP})
+    add_executable(QSyncthingTray ${UI_HEADERS} ${UI_RESOURCES} ${qst_platform_SOURCES} ${qst_HEADERS} ${qst_SOURCES})
   endif()
 
 if (APPLE)

QSyncthingTray.pro

@@ -0,0 +1,40 @@
+HEADERS       = includes/qst/window.h \
+                includes/qst/syncconnector.h \
+                includes/platforms/darwin/macUtils.hpp \
+                includes/platforms/windows/winUtils.hpp \
+                includes/platforms/linux/posixUtils.hpp \
+                includes/qst/processmonitor.hpp \
+                includes/qst/platforms.hpp \
+                includes/qst/apihandler.hpp \
+                includes/qst/startuptab.hpp \
+                includes/qst/utilities.hpp \
+                includes/qst/syncwebview.h \
+                includes/qst/syncwebpage.h
+SOURCES       = sources/qst/main.cpp \
+                sources/qst/window.cpp \
+                sources/qst/syncconnector.cpp \
+                sources/qst/processmonitor.cpp \
+                sources/qst/startuptab.cpp \
+                sources/qst/syncwebview.cpp \
+                sources/qst/syncwebpage.cpp
+RESOURCES     = \
+                resources/qsyncthing.qrc
+
+QT += widgets
+QT += network
+QT += webenginewidgets
+INCLUDEPATH += $$PWD/includes/
+# install
+target.path = binary/
+INSTALLS += target
+CONFIG += c++11
+macx {
+QMAKE_INFO_PLIST = Info.plist
+LIBS += -framework ApplicationServices
+}
+#QMAKE_CXXFLAGS += /wd4996
+ICON = resources/Syncthing.icns
+macx {
+APP_BINARY_FILES.path = Contents/Resources
+QMAKE_BUNDLE_DATA += APP_BINARY_FILES
+}

includes/CMakeLists.txt

@@ -0,0 +1,28 @@
+cmake_minimum_required(VERSION 3.0)
+project(QSyncthingTray)
+
+#   ____
+#  / ___|___  _ __ ___
+# | |   / _ \| '__/ _ \
+# | |__| (_) | | |  __/
+#  \____\___/|_|  \___|
+#
+
+set(qst_include_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/qst)
+set(qst_HEADERS
+  ${qst_include_ROOT}/apihandler.hpp
+  ${qst_include_ROOT}/platforms.hpp
+  ${qst_include_ROOT}/processmonitor.hpp
+  ${qst_include_ROOT}/startuptab.hpp
+  ${qst_include_ROOT}/syncconnector.h
+  ${qst_include_ROOT}/syncwebpage.h
+  ${qst_include_ROOT}/syncwebview.h
+  ${qst_include_ROOT}/utilities.hpp
+  ${qst_include_ROOT}/window.h
+)
+
+
+
+set(qst_HEADERS
+  ${qst_HEADERS}
+  PARENT_SCOPE)

src/window.h → includes/qst/window.h

@@ -137,8 +137,10 @@ private slots:
     QAction *mpPauseSyncthingAction;
     QAction *mpQuitAction;
 
-    std::list<QSharedPointer<QAction>> mCurrentFoldersActions;
-    std::list<QSharedPointer<QAction>> mCurrentSyncedFilesActions;
+    QList<QAction*> mCurrentFoldersActions;
+    QMenu *mpFolderMenu = nullptr;
+    QList<QAction*> mCurrentSyncedFilesActions;
+    QMenu *mpLastSyncedMenu = nullptr;
 
     std::list<FolderNameFullPath> mCurrentFoldersLocations;
     LastSyncedFileList mLastSyncedFiles;

src/build_linux.sh → scripts/build_linux.sh

@@ -5,6 +5,6 @@ if [ -z "$QTDIR" ];
   exit 1; 
 fi
 
-$QTDIR/qmake -config release .
+$QTDIR/qmake -config release ../
 make
 

src/build_project.sh → scripts/build_project.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 ./clean.sh
-~/Qt/5.5/clang_64/bin/qmake .
+~/Qt/5.5/clang_64/bin/qmake ../
 make
 ~/Qt/5.5/clang_64/bin/macdeployqt QSyncthingTray.app -dmg -verbose=2 

scripts/generate_msvc.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# For OS X
+
+./clean.sh
+/c/Qt/5.5/msvc2013_64/bin/qmake -tp vc ../QSyncthingTray.pro 

src/generate_xcode.sh → scripts/generate_xcode.sh

@@ -2,5 +2,5 @@
 # For OS X
 
 ./clean.sh
-~/Qt/5.5/clang_64/bin/qmake -spec macx-xcode .
+~/Qt/5.5/clang_64/bin/qmake -spec macx-xcode ../
 open QSyncthingTray.xcodeproj

sources/CMakeLists.txt

@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.0)
+project(QSyncthingTray)
+
+set(qst_src_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/qst)
+
+set(qst_SOURCES
+  ${qst_src_ROOT}/main.cpp
+  ${qst_src_ROOT}/processmonitor.cpp
+  ${qst_src_ROOT}/startuptab.cpp
+  ${qst_src_ROOT}/syncconnector.cpp
+  ${qst_src_ROOT}/syncwebpage.cpp
+  ${qst_src_ROOT}/syncwebview.cpp
+  ${qst_src_ROOT}/window.cpp
+  PARENT_SCOPE
+)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+source_group("Headers" FILES ${qst_HEADERS})
+source_group("Sources" FILES ${qst_SOURCES})

src/main.cpp → sources/qst/main.cpp

@@ -21,7 +21,7 @@
 #ifndef QT_NO_SYSTEMTRAYICON
 
 #include <QMessageBox>
-#include "window.h"
+#include <qst/window.h>
 
 
 int main(int argc, char *argv[])

src/processmonitor.cpp → sources/qst/processmonitor.cpp

@@ -17,7 +17,7 @@
  ******************************************************************************/
 
 
-#include "processmonitor.hpp"
+#include <qst/processmonitor.hpp>
 #include <QApplication>
 #include <QHeaderView>
 

src/startuptab.cpp → sources/qst/startuptab.cpp

@@ -16,7 +16,7 @@
  // License along with this library.
  ******************************************************************************/
 
-#include "startuptab.hpp"
+#include <qst/startuptab.hpp>
 #include <QFileDialog>
 
 namespace qst
@@ -152,7 +152,7 @@ void StartupTab::showFileBrowser()
 {
   QString filename = QFileDialog::getOpenFileName(this,
     tr("Open Syncthing"), "", tr(""));
-  if (filename.toStdString() != "")
+  if (!filename.isEmpty())
   {
     mCurrentSyncthingPath = filename.toStdString();
     mpFilePathLine->setText(filename);
@@ -253,7 +253,6 @@ void StartupTab::loadSettings()
 
 void StartupTab::pathEnterPressed()
 {
-  saveSettings();
   mCurrentSyncthingPath = mpFilePathLine->text().toStdString();
   mCurrentINotifyPath = mpINotifyFilePath->text().toStdString();
   if (mSettings.value("syncthingpath").toString().toStdString() != mCurrentSyncthingPath)

src/syncconnector.cpp → sources/qst/syncconnector.cpp

@@ -16,15 +16,15 @@
 // License along with this library.
 ******************************************************************************/
 
-#include "syncconnector.h"
+#include <qst/syncconnector.h>
 #include <QtGui>
 #include <QObject>
 #include <QMessageBox>
 #include <QStyleFactory>
 #include <cmath>
 #include <iostream>
-#include "platforms.hpp"
-#include "utilities.hpp"
+#include <qst/platforms.hpp>
+#include <qst/utilities.hpp>
 
 namespace qst
 {
@@ -167,6 +167,7 @@ void SyncConnector::checkConnectionHealth()
   QUrl lastSyncedListURL = mCurrentUrl;
   lastSyncedListURL.setPath(tr("/rest/stats/folder"));
   QNetworkRequest lastSyncedRequest(lastSyncedListURL);
+  lastSyncedRequest.setRawHeader(QByteArray("X-API-Key"), headerByte);
   QNetworkReply *lastSyncreply = network.get(lastSyncedRequest);
   requestMap[lastSyncreply] = kRequestMethod::getLastSyncedFiles;
 

src/syncwebpage.cpp → sources/qst/syncwebpage.cpp

@@ -17,7 +17,7 @@
  ******************************************************************************/
 
 #include <iostream>
-#include "syncwebpage.h"
+#include <qst/syncwebpage.h>
 
 //------------------------------------------------------------------------------------//
 #define UNUSED(x) (void)(x)

src/syncwebview.cpp → sources/qst/syncwebview.cpp

@@ -17,7 +17,7 @@
  ******************************************************************************/
 
 
-#include "syncwebview.h"
+#include <qst/syncwebview.h>
 #include <QContextMenuEvent>
 #include <QWebEngineProfile>
 #include <QWebEngineSettings>