Revert "Removed v1 legacy config UI"

This reverts commit 956f071f20.

src/CMakeLists.txt

@@ -19,4 +19,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)
 
 add_subdirectory(lib)
 add_subdirectory(cmd)
-
+if (SYNERGY_BUILD_LEGACY_GUI)
+add_subdirectory(gui)
+endif (SYNERGY_BUILD_LEGACY_GUI)

src/gui/CMakeLists.txt

@@ -0,0 +1,46 @@
+cmake_minimum_required (VERSION 3.4)
+
+find_package (Qt5 COMPONENTS Core Widgets Network)
+set (CMAKE_AUTOMOC ON)
+set (CMAKE_AUTORCC ON)
+set (CMAKE_AUTOUIC ON)
+set (CMAKE_INCLUDE_CURRENT_DIR ON)
+
+file (GLOB LEGACY_GUI_SOURCE_FILES src/*.cpp src/*.h)
+file (GLOB LEGACY_GUI_UI_FILES src/*.ui)
+
+if (WIN32)
+    set (LEGACY_GUI_RC_FILES res/win/Synergy.rc)
+endif()
+
+add_executable (synergy WIN32
+    ${LEGACY_GUI_SOURCE_FILES}
+    ${LEGACY_GUI_UI_FILES}
+    ${LEGACY_GUI_RC_FILES}
+    res/Synergy.qrc
+)
+
+include_directories (./src)
+target_link_libraries (synergy shared)
+
+if (WIN32)
+    include_directories ($ENV{BONJOUR_SDK_HOME}/Include)
+    find_library (DNSSD_LIB dnssd.lib 
+                  HINTS ENV BONJOUR_SDK_HOME
+                  PATH_SUFFIXES "Lib/x64")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    target_link_libraries (synergy dns_sd)
+endif()
+
+qt5_use_modules (synergy Core Widgets Network)
+
+if (WIN32)
+    target_link_libraries (synergy ${DNSSD_LIB})
+    set_target_properties (synergy PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
+endif()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    install (TARGETS synergy DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    install (TARGETS synergy DESTINATION bin)
+endif()

src/gui/gui.pro

@@ -0,0 +1,162 @@
+QT += widgets \
+    network
+TEMPLATE = app
+TARGET = synergy
+DEFINES += VERSION_STAGE=\\\"$$QMAKE_VERSION_STAGE\\\"
+DEFINES += VERSION_REVISION=\\\"$$QMAKE_VERSION_REVISION\\\"
+DEFINES -= UNICODE
+DEFINES += _MBCS
+DEPENDPATH += . \
+    res
+INCLUDEPATH += . \
+    src \
+    ../lib/shared/
+FORMS += src/MainWindowBase.ui \
+    src/AboutDialogBase.ui \
+    src/ServerConfigDialogBase.ui \
+    src/ScreenSettingsDialogBase.ui \
+    src/ActionDialogBase.ui \
+    src/HotkeyDialogBase.ui \
+    src/SettingsDialogBase.ui \
+    src/SetupWizardBase.ui \
+    src/AddClientDialogBase.ui \
+    src/ActivationDialog.ui \
+    src/CancelActivationDialog.ui \
+    src/FailedLoginDialog.ui
+SOURCES += src/main.cpp \
+    src/MainWindow.cpp \
+    src/AboutDialog.cpp \
+    src/ServerConfig.cpp \
+    src/ServerConfigDialog.cpp \
+    src/ScreenSetupView.cpp \
+    src/Screen.cpp \
+    src/ScreenSetupModel.cpp \
+    src/NewScreenWidget.cpp \
+    src/TrashScreenWidget.cpp \
+    src/ScreenSettingsDialog.cpp \
+    src/BaseConfig.cpp \
+    src/HotkeyDialog.cpp \
+    src/ActionDialog.cpp \
+    src/Hotkey.cpp \
+    src/Action.cpp \
+    src/KeySequence.cpp \
+    src/KeySequenceWidget.cpp \
+    src/SettingsDialog.cpp \
+    src/AppConfig.cpp \
+    src/QSynergyApplication.cpp \
+    src/VersionChecker.cpp \
+    src/SetupWizard.cpp \
+    src/IpcClient.cpp \
+    src/IpcReader.cpp \
+    src/Ipc.cpp \
+    src/SynergyLocale.cpp \
+    src/QUtility.cpp \
+    src/ZeroconfServer.cpp \
+    src/ZeroconfThread.cpp \
+    src/ZeroconfRegister.cpp \
+    src/ZeroconfBrowser.cpp \
+    src/ZeroconfService.cpp \
+    src/DataDownloader.cpp \
+    src/AddClientDialog.cpp \
+    src/CommandProcess.cpp \
+    src/CoreInterface.cpp \
+    src/Fingerprint.cpp \
+    src/SslCertificate.cpp \
+    src/WebClient.cpp \
+    src/ActivationNotifier.cpp \
+    src/ActivationDialog.cpp \
+    src/CancelActivationDialog.cpp \
+    src/FailedLoginDialog.cpp \
+    ../lib/shared/SerialKey.cpp \
+    src/LicenseManager.cpp
+HEADERS += src/MainWindow.h \
+    src/AboutDialog.h \
+    src/ServerConfig.h \
+    src/ServerConfigDialog.h \
+    src/ScreenSetupView.h \
+    src/Screen.h \
+    src/ScreenSetupModel.h \
+    src/NewScreenWidget.h \
+    src/TrashScreenWidget.h \
+    src/ScreenSettingsDialog.h \
+    src/BaseConfig.h \
+    src/HotkeyDialog.h \
+    src/ActionDialog.h \
+    src/Hotkey.h \
+    src/Action.h \
+    src/KeySequence.h \
+    src/KeySequenceWidget.h \
+    src/SettingsDialog.h \
+    src/AppConfig.h \
+    src/QSynergyApplication.h \
+    src/VersionChecker.h \
+    src/SetupWizard.h \
+    src/IpcClient.h \
+    src/IpcReader.h \
+    src/Ipc.h \
+    src/SynergyLocale.h \
+    src/QUtility.h \
+    src/ZeroconfServer.h \
+    src/ZeroconfThread.h \
+    src/ZeroconfRegister.h \
+    src/ZeroconfRecord.h \
+    src/ZeroconfBrowser.h \
+    src/ZeroconfService.h \
+    src/DataDownloader.h \
+    src/AddClientDialog.h \
+    src/CommandProcess.h \
+    src/ProcessorArch.h \
+    src/CoreInterface.h \
+    src/Fingerprint.h \
+    src/SslCertificate.h \
+    src/WebClient.h \
+    src/ActivationNotifier.h \
+    src/ElevateMode.h \
+    src/ActivationDialog.h \
+    src/CancelActivationDialog.h \
+    src/FailedLoginDialog.h \
+    ../lib/shared/EditionType.h \
+    ../lib/shared/SerialKey.h \
+    src/LicenseManager.h
+RESOURCES += res/Synergy.qrc
+RC_FILE = res/win/Synergy.rc
+macx { 
+    QMAKE_INFO_PLIST = res/mac/Info.plist
+    TARGET = Synergy
+    QSYNERGY_ICON.files = res/mac/Synergy.icns
+    QSYNERGY_ICON.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += QSYNERGY_ICON
+    LIBS += $$MACX_LIBS
+}
+unix:!macx:LIBS += -ldns_sd
+debug { 
+    OBJECTS_DIR = tmp/debug
+    MOC_DIR = tmp/debug
+    RCC_DIR = tmp/debug
+}
+release { 
+    OBJECTS_DIR = tmp/release
+    MOC_DIR = tmp/release
+    RCC_DIR = tmp/release
+}
+win32-msvc2015 {
+    LIBS += -lAdvapi32
+    QMAKE_LFLAGS += /NODEFAULTLIB:LIBCMT
+}
+win32-msvc* {
+    contains(QMAKE_HOST.arch, x86):{
+        QMAKE_LFLAGS *= /MACHINE:X86
+        LIBS += -L"$$(BONJOUR_SDK_HOME)/Lib/Win32" -ldnssd
+    }
+
+    contains(QMAKE_HOST.arch, x86_64):{
+        QMAKE_LFLAGS *= /MACHINE:X64
+        LIBS += -L"$$(BONJOUR_SDK_HOME)/Lib/x64" -ldnssd
+    }
+}
+win32 { 
+    Debug:DESTDIR = ../../bin/Debug
+    Release:DESTDIR = ../../bin/Release
+    INCLUDEPATH += "$$(BONJOUR_SDK_HOME)/Include"
+}
+else:DESTDIR = ../../bin

src/gui/lang.cmd

@@ -0,0 +1 @@
+lupdate -noobsolete gui.pro -ts gui.ts

src/gui/langbuild.cmd

@@ -0,0 +1,2 @@
+cd res/lang
+lrelease *.ts

src/gui/res/Synergy.qrc

@@ -0,0 +1,58 @@
+<RCC>
+    <qresource prefix="/res">
+        <file>icons/16x16/synergy-connected.png</file>
+        <file>icons/16x16/synergy-disconnected.png</file>
+        <file>icons/64x64/video-display.png</file>
+        <file>icons/64x64/user-trash.png</file>
+        <file>icons/16x16/warning.png</file>
+        <file>icons/256x256/synergy.ico</file>
+        <file>image/about.png</file>
+        <file>lang/gui_ar.qm</file>
+        <file>lang/gui_bg-BG.qm</file>
+        <file>lang/gui_ca-AD.qm</file>
+        <file>lang/gui_cs-CZ.qm</file>
+        <file>lang/gui_cy.qm</file>
+        <file>lang/gui_da.qm</file>
+        <file>lang/gui_de.qm</file>
+        <file>lang/gui_es.qm</file>
+        <file>lang/gui_fi.qm</file>
+        <file>lang/gui_fr.qm</file>
+        <file>lang/gui_grk.qm</file>
+        <file>lang/gui_he.qm</file>
+        <file>lang/gui_hr-HR.qm</file>
+        <file>lang/gui_hu-HU.qm</file>
+        <file>lang/gui_id.qm</file>
+        <file>lang/gui_it.qm</file>
+        <file>lang/gui_ja-JP.qm</file>
+        <file>lang/gui_ko.qm</file>
+        <file>lang/gui_lt.qm</file>
+        <file>lang/gui_lv.qm</file>
+        <file>lang/gui_nl-NL.qm</file>
+        <file>lang/gui_no.qm</file>
+        <file>lang/gui_pes-IR.qm</file>
+        <file>lang/gui_pl-PL.qm</file>
+        <file>lang/gui_pt-BR.qm</file>
+        <file>lang/gui_pt-PT.qm</file>
+        <file>lang/gui_ro.qm</file>
+        <file>lang/gui_ru.qm</file>
+        <file>lang/gui_si.qm</file>
+        <file>lang/gui_sk-SK.qm</file>
+        <file>lang/gui_sl-SI.qm</file>
+        <file>lang/gui_sq-AL.qm</file>
+        <file>lang/gui_sr.qm</file>
+        <file>lang/gui_sv.qm</file>
+        <file>lang/gui_th-TH.qm</file>
+        <file>lang/gui_tr-TR.qm</file>
+        <file>lang/gui_uk.qm</file>
+        <file>lang/gui_ur.qm</file>
+        <file>lang/gui_mr.qm</file>
+        <file>lang/gui_vi.qm</file>
+        <file>lang/gui_zh-CN.qm</file>
+        <file>lang/gui_zh-TW.qm</file>
+        <file>lang/Languages.xml</file>
+        <file>icons/16x16/money.png</file>
+        <file>image/spinning-wheel.gif</file>
+        <file>icons/16x16/padlock.png</file>
+        <file>icons/16x16/synergy-transfering.png</file>
+    </qresource>
+</RCC>

src/gui/res/lang/Languages.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<languages>
+  <language ietfCode="en" name="English" />
+	<language ietfCode="ca-AD" name="Català (Andorra)" />
+	<language ietfCode="cs-CZ" name="Čeština" />
+	<language ietfCode="cy" name="Cymraeg" />
+	<language ietfCode="da" name="Dansk" />
+	<language ietfCode="de" name="Deutsch" />
+	<language ietfCode="es" name="Español" />
+	<language ietfCode="fr" name="Français" />
+	<language ietfCode="hr-HR" name="Hrvatski" />
+	<language ietfCode="id" name="Indonesia" />
+	<language ietfCode="it" name="Italiano" />
+	<language ietfCode="lv" name="Latvijas" />
+	<language ietfCode="lt" name="Lietuvos" />
+	<language ietfCode="hu-HU" name="Magyar" />
+	<language ietfCode="nl-NL" name="Nederlands" />
+	<language ietfCode="no" name="Norsk" />
+	<language ietfCode="pl-PL" name="Polski" />
+	<language ietfCode="pt-PT" name="Português" />
+	<language ietfCode="pt-BR" name="Português (Brasil)" />
+	<language ietfCode="ro" name="Română" />
+	<language ietfCode="sq-AL" name="Shqiptar" />
+	<language ietfCode="sl-SI" name="Slovenščina" />
+	<language ietfCode="sk-SK" name="Slovenčina" />
+	<language ietfCode="fi" name="Suomi" />
+	<language ietfCode="sv" name="Svenska" />
+	<language ietfCode="vi" name="Tiếng Việt" />
+	<language ietfCode="tr-TR" name="Türkçe" />
+	<language ietfCode="bg-BG" name="български" />
+	<language ietfCode="ru" name="Русский" />
+	<language ietfCode="sr" name="српски" />
+	<language ietfCode="uk" name="Український" />
+	<language ietfCode="grk" name="Ελληνικά" />
+	<language ietfCode="he" name="עברית" />
+	<language ietfCode="ar" name="العربية" />
+	<language ietfCode="pes-IR" name="فارسی" />
+	<language ietfCode="ur" name="اردو" />
+	<language ietfCode="mr" name="मराठी" />
+	<language ietfCode="si" name="Sඉන්හල" />
+	<language ietfCode="th-TH" name="ภาษาไทย" />
+	<language ietfCode="zh-CN" name="中文 (简体)" />
+	<language ietfCode="zh-TW" name="中文 (繁體)" />
+	<language ietfCode="ja-JP" name="日本語" />
+	<language ietfCode="ko" name="한국어" />
+</languages>

src/gui/res/lang/gui_af-ZA.qm

@@ -0,0 +1 @@
+<ｸdﾊ<>箆!ｿ`｡ｽﾝ

src/gui/res/lang/gui_is-IS.qm

@@ -0,0 +1 @@
+<ｸdﾊ<>箆!ｿ`｡ｽﾝ