Commit graph

682 commits

Author SHA1 Message Date
Jnewbon
8b9722df25
Merge pull request #6359 from jpwhiting/build_against_qt_5.11
Add missing header includes to build against Qt 5.11.0
2019-04-30 10:14:23 +01:00
Jamie Newbon
de7c5ce6b7
Merge branch 'v1-dev' into v1-issue-6407-enterprise-autoconfig5 2019-04-30 09:26:31 +01:00
Jnewbon
9bccfb89cc
#6486 Added CI solution for automated builds
* Added Ubuntu Dockers for 16, 18, and 19
* Added Cirrus CI build task for gcloud instance with SSDs
* Added macOS instance build with brew Qt install
* Fixed Qt headers for 5.12.2 used in Ubuntu 19.04
* Consolidated version info into CMake file
2019-04-26 17:17:06 +01:00
Jamie Newbon
6870af8eb7 #6471 Stopped gui locking into retry loop 2019-04-08 15:20:56 +01:00
Jnewbon
2713b95af7 Fixed Hostname dialog box opening unnecessarily (#6468)
#6392 Added check for autoconfig mode
2019-04-05 18:37:59 +01:00
Jeremy Whiting
e3633d8a7b Add missing header includes to build against Qt 5.11.0
Some Qt gui headers are no longer included when including QtGui
adding these two missing headers makes Synergy build here on windows.
2018-10-03 17:32:30 -06:00
Nick Bolton
85c359693a #6407 Hide all auto config elements for enterprise build 2018-09-05 05:10:56 +08:00
Nick Bolton
2118c6647c #6397 Remember last used auto config host 2018-09-04 21:32:24 +01:00
Nick Bolton
4cf1ab8a25 #6338 Refactor auto restart logic, fixed debug level check, added some debug logging 2018-08-08 17:20:16 +01:00
Nick Bolton
934824433d #6338 Auto Config hint widget with link to open Settings dialog 2018-08-08 16:47:45 +01:00
Nick Bolton
aad0ac25d1 #6338 Only add server IPs when in client mode, and clear the IP list each time zeroconf restarts 2018-08-08 15:13:22 +01:00
Nick Bolton
87d8fc1e14 #6338 Use either manual or auto config in main window
Only enable/disable auto-config when saving settings, and only start the server/client when clicking Start/Stop/Apply.
2018-08-08 14:41:37 +01:00
Nick Bolton
aae43304c3 #6338 Tidy up settings screen layout 2018-08-06 06:05:58 +01:00
Nick Bolton
53d5c89851 #6338 Hide auto config setting for Enterprise build 2018-08-06 06:05:34 +01:00
Nick Bolton
c0452f0e61 #6338 Only use Zeroconf if non-enterprise build 2018-08-03 23:41:50 +01:00
Nick Bolton
d2d2a5e1d9 #6338 Only call Bonjour download if on Windows 2018-08-03 23:00:15 +01:00
Nick Bolton
918571b6e2 #6338 Part-done: Move Auto Config checkbox to settings screen
Also refactored Windows Bonjour code to new class, and moved some of the Zeroconf stuff to a new class
2018-08-03 16:58:23 +01:00
Nick Bolton
8dc868a206 #6380 Fixed warnings for VS2017 2018-08-01 13:03:41 +01:00
Nick Bolton
e555d5d651 Merge branch 'v1.x' into v1.10.1 2018-07-30 12:44:56 +01:00
Nick Bolton
7aa0553b57 Revert "Merge pull request #6358 from jpwhiting/build_with_newer_cmake"
This reverts commit 2b79608c44, reversing
changes made to 183403ceb7.
2018-07-30 12:27:51 +01:00
Nick Bolton
6d57630746 Revert "#6375 Add missing headers needed for Qt 5.11"
This reverts commit 85a8080339.
2018-07-30 12:27:35 +01:00
Nick Bolton
0ae87852e5 Merge branch 'v1.x' into v1.10.1 2018-07-29 18:05:03 +01:00
Nick Bolton
85a8080339 #6375 Add missing headers needed for Qt 5.11 2018-07-29 18:04:36 +01:00
Nick Bolton
2cde78ff54 #6372 More logging around client disconnect to make TLS state more clear 2018-07-28 03:11:45 +01:00
Nick Bolton
5f3dce8379 #6372 Make TLS UX more user friendly 2018-07-28 02:54:11 +01:00
Nick Bolton
0e0c701b61 #6372 Only show padlock when TLSv1.2 is detected
This is really crude and probably a bit fragile, but patches welcome! I also made the fingerprint dialog a bit friendlier while I was poking around.
2018-07-28 01:52:56 +01:00
Nick Bolton
60c0df5984 #6372 Remove log levels that can break log reader behavior 2018-07-28 01:35:10 +01:00
Jeremy Whiting
f9b83f9516 Use target_link_libraries instead of qt5_use_modules.
Since qt5_use_modules is deprecated in newer cmake versions
use target_link_libraries with Qt5:: targets instead.
see: http://doc.qt.io/qt-5/cmake-manual.html
2018-07-09 10:30:31 -06:00
Sarah Hebert
0f2306c9ac #6318 Hack to ignore TIS/TSM log line on macOS 2018-07-08 16:51:57 +01:00
Sarah Hebert
9b4d14e085 #4991 Removed Zeroconf string suffix from Zeroconf service name 2018-07-08 16:51:55 +01:00
Sarah Hebert
21edf3e7f4 #6319 Disabled default Bonjour auto-config setting 2018-07-08 16:51:53 +01:00
Sarah Hebert
491bb2de00 #6312 Removed CURL dependency and all code that uses it 2018-07-08 16:51:50 +01:00
Sarah Hebert
71953b5af8 #6306 Updated GUI title 2018-07-08 16:51:40 +01:00
Andrew Nelless
458d8e4778 #6301 Disable zeroconf for Enterprise builds 2018-07-08 16:51:38 +01:00
Andrew Nelless
b396b1092d #6301 Disable activation for Enterprise builds 2018-07-08 16:51:34 +01:00
Xinyu Hou
6c5c55a564 #6301 Set page 1 as default on server config dialog 2018-07-08 16:50:37 +01:00
Andrew Nelless
3cb7a5c101 #6345 Convert MainWindow::saveSettings to a slot 2018-07-08 16:50:09 +01:00
Andrew Nelless
88bf4b2e47 #6344 Restore default clipboard sharing size
When clipboard sharing is re-enabled, and the current size limit is 0,
make sure that the default size limit is restored
2018-07-08 16:50:05 +01:00
Andrew Nelless
8054bc51a5 #6344 Ensure setting clipboard size limit to 0 disables clipboard sharing 2018-07-08 16:50:01 +01:00
Andrew Nelless
3c133380f8 #6344 Auto Enable/disable clipboard size spinner 2018-07-08 16:49:54 +01:00
Andrew Nelless
36c81480d7 #6344 Fix clipboard size limit initialization order
Setting the clipboard sharing size to a value > 0 enables clipboard
sharing. Make sure we do this before applying the users actual
preference.
2018-07-08 16:49:50 +01:00
Andrew Nelless
dfcac4e90b #6344 Persist clipboard sharing size settings 2018-07-08 16:49:46 +01:00
Andrew Nelless
358641e58e #6344 Enable the clipboard size combobox 2018-07-08 16:49:42 +01:00
Andrew Nelless
7e7760668a #6344 Add clipboard sharing size limit config option 2018-07-08 16:49:16 +01:00
Xinyu Hou
682fe1cfa3 #6301 Add clipboard size limit option to GUI 2018-07-08 16:49:12 +01:00
XinyuHou
535627c871 #6346 Add disable lock to screen in server config and output it to config file 2018-07-08 16:48:07 +01:00
XinyuHou
46a5b7f9ae #6345 Let Mainwindow save settings before program quits
# Conflicts:
#	src/gui/src/main.cpp
2018-07-08 16:47:56 +01:00
XinyuHou
7da1d4f9cc #6347 made log to home directory by default 2018-07-08 16:47:32 +01:00
Jerry (Xinyu Hou)
1e8e48d65b
Use corresponding Bonjour libs for different versions of OS 2018-03-20 11:41:38 +00:00
Andrew Nelless
98a6b0421a Delete temporary config files on platforms other than Windows 2017-05-22 22:41:38 +01:00
Andrew Nelless
e608f8f081 #6037 Fix broken override in ZeroconfServer 2017-05-18 01:00:16 +01:00
Andrew Nelless
cc2f1146ea #6037 Fix broken override in ScreenSetupView 2017-05-18 00:55:46 +01:00
Andrew Nelless
b0c80b419a #6037 Unitialized pointer in DataDownloader 2017-05-18 00:46:02 +01:00
Andrew Nelless
bb726e6deb #4132 Disable Qt Bearer management 2017-05-10 15:25:21 +01:00
Andrew Nelless
54632e2ceb Fix appending revision to version number 2017-05-09 12:32:46 +01:00
Andrew Nelless
f38d86aeb0 Make ready v1.9.0-beta 2017-05-09 10:40:56 +01:00
Jerry (Xinyu Hou)
ab566bb5a4 Update synergy.ico file 2017-05-08 17:22:00 +01:00
Andrew Nelless
b5c24ec449 #5467 Fix Bonjour download URL 2017-05-02 16:46:12 +01:00
Andrew Nelless
876744ad2c Cleanup version number handling in CMake 2017-04-27 15:40:23 +01:00
Jerry (Xinyu Hou)
485a7fff03 #6012 Move gui v1 into bin for deb packaging 2017-04-25 14:15:15 +01:00
Andrew Nelless
fedbcb0f3a Remove ../ includes in src/lib 2017-03-09 15:16:08 +00:00
Andrew Nelless
bb73b1722a Link legacy GUI to Avahi on Linux 2017-03-08 18:20:18 +00:00
Andrew Nelless
20948522ea Install macOS binaries in to bundle 2017-03-07 16:50:02 +00:00
Andrew Nelless
5a355fe68f Add macOS folder to dist 2017-02-10 13:47:59 +00:00
Andrew Nelless
3ac4fe7723 Attempt to fix squashed main UI 2017-02-09 20:50:59 +00:00
Andrew Nelless
f90b537b01 Update macOS icon 2017-02-09 20:32:57 +00:00
Andrew Nelless
c6d5db77a9 Update icons 2017-02-09 20:24:02 +00:00
Andrew Nelless
ed29889f25 Add GUI resource files on Windows 2017-02-09 20:05:36 +00:00
Andrew Nelless
71f24c0664 Correct UI file path 2017-02-09 19:57:13 +00:00
Andrew Nelless
971f5bd1ed Update about dialog logo and GUI icon 2017-02-09 18:03:58 +00:00
Andrew Nelless
7bcd595da4 Tweak GUI CMakeLists 2017-02-09 16:06:34 +00:00
Andrew Nelless
31a7fb395c Restore GUI v1 executable name 2017-02-08 12:40:34 +00:00
Andrew Nelless
f9b3969f72 Fix up Synergy version number 2017-02-07 23:01:01 +00:00
Andrew Nelless
b52cadd1f7 Revert "Remove ugly Synergy version from about dialog"
This reverts commit 7cd4642e92.
2017-02-07 22:24:55 +00:00
Andrew Nelless
e3f3b7424c Fix bonjour linkage on non-Windows platforms 2017-02-07 01:35:07 +00:00
Andrew Nelless
7cd4642e92 Remove ugly Synergy version from about dialog 2017-02-07 01:29:27 +00:00
Andrew Nelless
1a536acdff Add Qt5 core module to GUI1 linkage 2017-02-07 01:27:15 +00:00
Andrew Nelless
ccda3a6e4f Add core to GUI1 linkage 2017-02-07 01:27:11 +00:00
Jerry (Xinyu Hou)
ed16db9df6 Ignore deprecated warning on Mac 2017-02-07 01:24:59 +00:00
XinyuHou
c960bdb6db Use Ascii rather than Unicode GUI project 2017-02-07 01:24:59 +00:00
XinyuHou
1d2932df4f Fix ui file using wrong path 2017-02-07 01:24:59 +00:00
XinyuHou
deea23f866 Apply tab to spaces filter to src folder 2017-02-07 01:24:59 +00:00
Andrew Nelless
a76ae31126 Fix OpenService buffer for building with narrow char type 2017-02-07 01:24:58 +00:00
Andrew Nelless
abeedf9bcc Add CMake build option for GUI 2017-02-07 01:24:58 +00:00
Andrew Nelless
b405f4e476 Remove unused GUI source files 2017-02-07 01:24:58 +00:00
Andrew Nelless
14aa1cfd82 Move Qt UI files to source directory 2017-02-07 01:24:58 +00:00
Andrew Nelless
680c9b4078 Merge changes from v1.8.8-rc1 2017-02-06 14:28:20 +00:00
Andrew Nelless
4b913b5599 v1.8.8-rc1 2017-01-31 12:39:18 +00:00
Andrew Nelless
b5a81579ed #5809 macOS: Add a version key to Info.plist 2017-01-25 20:46:59 +00:00
Jee-Yong Um
8e6bf53233 #4504 Improve Korean language description 2017-01-25 20:32:59 +00:00
伊冲
3bb833b798 #4193 System tray is unavailable on KDE5 2017-01-21 11:28:12 +00:00
Andrew Nelless
c27c094f9c Merge changes from v1.8.6 and v1.8.7 2017-01-20 23:18:03 +00:00
Jerry (Xinyu Hou)
b69570ec2c #5784 Fix using the wrong serial key 2016-12-28 15:57:15 +00:00
XinyuHou
c764e26144 Merge branch 'mac-msg' of https://github.com/j2gl/synergy into j2gl-mac-msg 2016-12-07 16:39:40 +00:00
XinyuHou
a49de58738 #5752 Correct tab order in settings dialog 2016-12-06 12:03:40 +00:00
Jerry (Xinyu Hou)
7c12608f20 Merge remote-tracking branch 'origin/issue5722-malformed-keys' into v1.8.6 2016-11-11 11:40:17 +00:00
Andrew Nelless
24a548273e #5722 Trim serial keys already stored 2016-11-02 11:28:04 +00:00
Andrew Nelless
1a7920f80d #5722 Make LicenseManager accept SerialKey object instead of string 2016-11-01 17:29:25 +00:00
Jerry (Xinyu Hou)
514e2475c3 Merge branch 'v1.8.6' into issue5186-different-dpi 2016-10-31 16:31:30 +00:00
Andrew Nelless
96efe5fb73 Merge changes from v1.8.5 2016-10-31 16:14:39 +00:00
Andrew Nelless
2f2dd7742f #5707 Don't send update notifications for new users 2016-10-28 17:45:58 +01:00
Andrew Nelless
3e9815dfdd #5707 Add newline to update notification string 2016-10-28 17:45:52 +01:00
Andrew Nelless
af62174b59 #5707 Only notify activation on user action 2016-10-28 17:45:42 +01:00
Andrew Nelless
af9037276c #5707 Prefer 'update' over 'upgrade' 2016-10-28 17:45:35 +01:00
Andrew Nelless
fa7daa48f7 Revert "Update buildbot to Qt 4.8.7"
This reverts commit b7e0473cb4.
2016-10-28 17:45:34 +01:00
Andrew Nelless
4206799ae3 #5707 Add from and to version numbers to version update notification 2016-10-28 17:45:26 +01:00
Andrew Nelless
2de06b9727 #5707 Add support for upgrade notifications 2016-10-28 17:45:20 +01:00
Andrew Nelless
906fd15b4a #5707 Store and update last version uses in settings 2016-10-28 17:45:13 +01:00
Jerry (Xinyu Hou)
cf397a0d6f #5186 Remove Dpi calculation code 2016-10-28 04:50:06 -07:00
Andrew Nelless
b7e0473cb4 Update buildbot to Qt 4.8.7 2016-10-26 15:34:36 +01:00
Andrew Nelless
f08f0b3f37 #5657 Fix activation dialog tab order 2016-10-25 16:40:33 +01:00
Andrew Nelless
492df1f3fd #5657 Stop service and refresh license when trial expires 2016-10-25 16:27:12 +01:00
Andrew Nelless
b66043e000 #5657 Tweak plurality of trial countdown 2016-10-20 17:59:03 +01:00
Andrew Nelless
a59c437fd3 Merge icon reversion 2016-10-20 14:55:55 +01:00
Andrew Nelless
1842a68a0e #5657 Always show trial counter, fix plurality 2016-10-20 14:55:21 +01:00
Jerry (Xinyu Hou)
e17130f060 Revert "#5640 Update icon to the new hotness"
This reverts commit 833c73f1bd.
2016-10-20 14:02:47 +01:00
Jerry (Xinyu Hou)
3048ca5fc6 Revert "#5640 About dialog tweaks"
This reverts commit 03b8788660.
2016-10-20 14:02:34 +01:00
Jerry (Xinyu Hou)
bdf5546058 Revert "#5640 About dialog tweaks"
This reverts commit 9837c982cd.
2016-10-20 14:02:01 +01:00
Andrew Nelless
868887155d #5657 Update buy now links 2016-10-20 11:30:02 +01:00
Andrew Nelless
ae590907a8 #5657 Remind users to activate all devices if they might be using SSL 2016-10-19 17:50:44 +01:00
Andrew Nelless
f2a1d962bc #5657 Fix skip activation loop 2016-10-19 17:40:34 +01:00
Andrew Nelless
e01d0ce4c7 #5657 Raise activation dialog when key expires 2016-10-19 16:01:15 +01:00
Andrew Nelless
f441c24a23 #5657 Minor activation UI tweaks 2016-10-19 11:36:48 +01:00
Andrew Nelless
6a7d1dd43c #5657 Merge core fixes for trial support 2016-10-19 10:46:52 +01:00
Andrew Nelless
47913e57b8 #5657 Raise activation dialog when trial expires 2016-10-18 18:45:15 +01:00
Andrew Nelless
02c23905d6 #5657 Handle expired keys properly 2016-10-18 17:01:44 +01:00
Jerry (Xinyu Hou)
dfc7c31d67 #5657 Delay auto client adding while activation dialog is shown 2016-10-18 15:43:15 +01:00
Andrew Nelless
020b7974df #5657 Fix trial warning label and serial key serialisation 2016-10-18 15:32:59 +01:00
Andrew Nelless
e5aae66ff7 #5657 Don't clear edition when appconfig contains an invalid serial key 2016-10-18 15:13:19 +01:00
Jerry (Xinyu Hou)
45f37c508c #5657 Make serial key argument for server only 2016-10-18 14:56:48 +01:00
Jerry (Xinyu Hou)
e48be9099d #5657 Remove whitespace for serial key input 2016-10-18 13:05:29 +01:00
Andrew Nelless
98610fabde #5657 Remove unused CoreInterfaces 2016-10-17 17:59:01 +01:00
Andrew Nelless
fc67cdf56e #5657 Rename SubscriptionManager to LicenseManager 2016-10-17 17:57:14 +01:00
Andrew Nelless
5a34da3ce0 #5657 Refresh UI when synergys reports trial expired 2016-10-17 17:49:14 +01:00
Andrew Nelless
8b4d7abfb0 #5657 Remove SerialKey::m_valid 2016-10-17 17:08:26 +01:00
Andrew Nelless
714b2f6440 #5657 Make trial expiry notification live 2016-10-17 15:26:42 +01:00
Andrew Nelless
e05ced287c #5657 Enable external links on trial label 2016-10-17 11:57:32 +01:00
Andrew Nelless
0dd0e65e2a #5657 Remove more C++11 enum qualifiers 2016-10-15 16:07:05 +01:00
Andrew Nelless
b20d04d80c #5657 Add missing include for runtime_error 2016-10-15 15:59:27 +01:00
Andrew Nelless
4ad7c7fe39 #5657 Rename edition to activeLicense. WSFs 2016-10-15 15:30:28 +01:00
Andrew Nelless
3b98a7b785 #5657 Add trial label to main window 2016-10-15 14:58:03 +01:00
Andrew Nelless
55414e4581 #5657 Make SubscriptionManager backward compatible 2016-10-14 17:38:31 +01:00
Andrew Nelless
727fc5c220 #5659 Move activation notification to SubscriptionManager 2016-10-14 12:16:23 +01:00
Andrew Nelless
540882056f #5657 Create a global SubscriptionManager instance 2016-10-14 11:59:25 +01:00
Andrew Nelless
743e96f277 #5657 Don't store activation email 2016-10-14 11:35:33 +01:00
Andrew Nelless
fd8e778b2a #5657 Fix serial key file path in GUI 2016-10-14 11:35:33 +01:00
Jerry (Xinyu Hou)
c7cd74ab5f Fixed code style 2016-10-13 11:11:56 +01:00
Jerry (Xinyu Hou)
a50ae2ad36 Fixed code style 2016-10-12 12:59:38 +01:00
Jerry (Xinyu Hou)
fc879323bc #5657 Removed password log in in activation window 2016-10-12 12:56:52 +01:00
Andrew Nelless
964f1aa093 Merge changes made in v1.8.4 2016-10-12 10:41:44 +01:00