Commit Graph

642 Commits

Author SHA1 Message Date
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
Andrew Nelless 9ae146add0 Merge branding changes into v1.8.4 2016-10-06 13:04:28 +01:00
Andrew Nelless ef3b79e585 Merge activation dialog branch into v1.8.4 2016-10-06 13:01:18 +01:00
Andrew Nelless 9837c982cd #5640 About dialog tweaks 2016-10-06 12:58:57 +01:00
Andrew Nelless 742cd70f98 #5627 Toggle fingerprint visibility when toggling SSL state 2016-10-06 11:29:34 +01:00
Andrew Nelless 03b8788660 #5640 About dialog tweaks 2016-10-05 21:53:58 +01:00
Andrew Nelless 833c73f1bd #5640 Update icon to the new hotness 2016-10-05 21:53:54 +01:00
Andrew Nelless f1cd215f28 Restore safe reinterpret_cast in Synergy GUI 2016-10-05 12:46:16 +01:00
Andrew Nelless f3d1470e58 Brutally replace all reinterpret_casts with static_casts 2016-10-05 12:46:16 +01:00
Andrew Nelless d99bd8e031 Merge fix for #5329 2016-10-04 15:23:27 +01:00
Andrew Nelless c288918d68 #5629 Fix height of settings dialog 2016-10-04 15:12:27 +01:00
Andrew Nelless 002bcebbd2 #5629 Fix main window AppConfig naming conventions 2016-10-04 13:47:28 +01:00
Andrew Nelless 783056f7cc #5629 Ensure setEdition signals main UI 2016-10-04 13:41:27 +01:00
Andrew Nelless 15f2e27d18 #5629 Show the main window behind the activation dialog 2016-10-04 11:48:47 +01:00
Andrew Nelless 16ef224ba8 #5629 Save activation dialog seen state on reject 2016-10-04 11:15:53 +01:00
Andrew Nelless 603b12dc59 #5629 Trigger main window show event before opening activation dialog 2016-10-04 10:45:27 +01:00
Andrew Nelless 15a6a27dc6 #5629 Show activation dialog only after main window 2016-10-03 19:48:05 +01:00
Andrew Nelless 912ed9be9c #5629 Ensure settings are saved when AppConfig updates them 2016-10-03 19:47:45 +01:00
Andrew Nelless d1a180f652 #5627 Automatically generate SSL cert when enabling SSL 2016-10-03 19:47:38 +01:00
Andrew Nelless 32f143f52b #5627 Update Main Window fingerprint after SSL cert gen 2016-10-03 19:47:32 +01:00
Andrew Nelless d6bcdcbea7 #5629 Change activation failure to a QDialog 2016-10-03 19:47:24 +01:00
Andrew Nelless c799041ce8 #5627 Only generate an SSL certificate when it doesn't exist 2016-10-03 19:47:18 +01:00
Andrew Nelless 4924f2faff #5627 Save settings after creating MainWindow 2016-10-03 19:47:06 +01:00
Andrew Nelless d6b7d8e357 #5627 Enable encryption for Pro users 2016-10-03 19:46:52 +01:00
Andrew Nelless 2809530793 #5629 Remove 'Run Wizard' from file menu 2016-10-03 19:46:48 +01:00
Andrew Nelless bcf2d5de0d #5629 Trigger activation dialog if previously unseen 2016-10-03 19:46:43 +01:00
Andrew Nelless 02d75cd370 #5603 Ignore exceptions in getOSInformation() 2016-10-03 19:46:41 +01:00
Andrew Nelless 088ac82e18 #5629 Remove activation from the wizard 2016-10-03 19:46:25 +01:00
Andrew Nelless 6033f0c946 #5629 Minor grammar tweaks 2016-10-03 19:46:20 +01:00
Andrew Nelless 0f95c6e941 #5629 Complete activation support for activation dialog 2016-10-03 19:46:06 +01:00
Andrew Nelless 60a4e62779 #5629 Enable activation cancellation dialog 2016-09-29 16:17:38 +01:00
Andrew Nelless 0d5d7e11c0 #5629 Simplify Activation dialog 2016-09-29 16:16:49 +01:00
Andrew Nelless d4646b1cc6 #5629 Add activation cancellation dialog 2016-09-29 16:14:09 +01:00
Andrew Nelless 81ae0c211a #5629 Move activation widgets to new activation dialog 2016-09-29 13:53:44 +01:00
Andrew Nelless 663e3f5854 #5629 Add rudimentary activation dialog 2016-09-29 13:45:06 +01:00
Andrew Nelless 964e6d2f12 #5617 Remove PluginManager from SettingsDialog 2016-09-29 13:11:09 +01:00
Andrew Nelless 1fceb2b646 #5617 Remove PluginManager from MainWindow 2016-09-29 13:11:05 +01:00
Andrew Nelless 5f5153f450 #5617 Remove the plugin wizard from GUI 2016-09-29 13:05:04 +01:00
Andrew Nelless 76b2558f1a #5617 Delete the plugin infrastructure 2016-09-29 13:05:03 +01:00
Andrew Nelless a70a2bf864 #5329 Fix build date in about dialog 2016-09-27 11:37:16 +01:00
Andrew Nelless cb20fdcc97 Merge bonjour branch 2016-09-26 15:39:53 +01:00
Andrew Nelless c7bf59e6c1 Merge changes from v1.8.3 2016-09-26 15:33:57 +01:00
Xinyu Hou 59e31c3f05 #123 Made clipboard name convention consistent 2016-09-26 11:58:33 +01:00
Xinyu Hou 130458f77a #123 Added enable clipboard option in GUI 2016-09-26 11:58:33 +01:00
Cédric Picard 11d5691bca Fixed memory leak in IpcReader.cpp 2016-09-26 11:58:33 +01:00
Andrew Nelless c3c0913633 Update company copyright notice 2016-09-26 11:58:33 +01:00
Andrew Nelless 36be2051c2 Change company domain name 2016-09-26 11:58:33 +01:00
Andrew Nelless e72e86c9b2 #4323 Fix build wrt ElevateMode on non-Windows platforms 2016-09-26 11:58:33 +01:00
Andrew Nelless 21df3290c2 #4323 Refactored ElevateMode into its own header 2016-09-26 11:58:33 +01:00
Andrew Nelless 9c26c7ea94 #4323 Implement Elevate tristrate in GUI 2016-09-26 11:58:33 +01:00
Andrew Nelless 3cd58f7c7d #4323 Prepare settings dialog for elevation tristate 2016-09-26 11:58:33 +01:00
Andrew Nelless bb3be59c91 #4978 Link Bonjour statically 2016-08-09 10:04:32 +01:00
Jerry (Xinyu Hou) 9897711967 #4978 Increased wizard version 2016-08-08 16:42:34 +01:00
Jerry (Xinyu Hou) cf1e5239cb #5389 Output GUI binary to release folder on Windows 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 76a776ef86 #4978 Fixed warning 2016-08-08 16:41:01 +01:00
Andrew Nelless 70bdbe2736 #4978 Removed hack causing problems with VS2015 2016-08-08 16:41:01 +01:00
Andrew Nelless cd09a36286 #4978 Fixed orphaned appendLogInfo slot 2016-08-08 16:41:01 +01:00
Andrew Nelless 38db630816 #5389 Added missing header under Qt5 2016-08-08 16:41:01 +01:00
Andrew Nelless 79a61b28f4 #5389 Added Qt5 compatibility for default file paths 2016-08-08 16:41:01 +01:00
Andrew Nelless 64dbae8918 #4978 Resolved conflict between interface macro in VS2015 2016-08-08 16:41:01 +01:00
Andrew Nelless 6c58913899 #5389 Support for building GUI with VS2015 2016-08-08 16:41:01 +01:00
Andrew Nelless 1bb1b21f77 #4978 Renamed conflicting 'Unknown' EditionType 2016-08-08 16:41:01 +01:00
Andrew Nelless e1e1199a57 #4323 Fix build wrt ElevateMode on non-Windows platforms 2016-08-08 16:41:01 +01:00
Andrew Nelless d42ea08a1d #4323 Refactored ElevateMode into its own header 2016-08-08 16:41:01 +01:00
Andrew Nelless fa9f30ff81 #4323 Implement Elevate tristrate in GUI 2016-08-08 16:41:01 +01:00
Andrew Nelless d1e80c668e #4323 Prepare settings dialog for elevation tristate 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 7fa92869a4 #5471 Wrapped skip explanation in wizard activation page 2016-08-08 14:38:26 +01:00
Jerry (Xinyu Hou) 03d22c3746 #5471 Fixed typo in activation wizard page 2016-08-08 14:38:26 +01:00
Jerry (Xinyu Hou) 804b482c5e #5471 Added some tips and size restrictions 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 2a3d34983f #4715 Increased wizard version number due to serial key support 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 62c9ca0a7f #5471 Redesigned serial key input 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) fd39c73bcd #5471 Made serial key form layout align to left 2016-08-08 14:36:43 +01:00
Will Tinsdeall 47d6d1c5bc Improved grammar in connection notification dialog #4894 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 7f786cc884 Refactor KeyResource into own files #2765 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 60b56f9e58 Switch translator back only when it's been changed #4836 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 48d24d72e6 Proofread internal information after retranslating UI #4836 2016-08-08 14:27:13 +01:00
Amanda McGlothlin aa178a356f Updated mac app icon to match the website icon #5299 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 0034ca4b76 #5461 Caught all exceptions for activation 2016-07-12 06:51:09 -07:00
Jerry (Xinyu Hou) fbd2c1413e Merge branch 'jerry-sandbox2' 2015-11-23 09:54:05 -08:00
j2gl 5a03ece50b Update MacOS warning 2015-11-20 01:35:23 -06:00
Jerry (Xinyu Hou) 66335cd6f8 Pass resolution and center into core on Windows #5030 2015-11-19 13:46:45 -08:00
Jerry (Xinyu Hou) 4be852c2f2 Move notify into thread #4932 2015-11-19 10:48:11 -08:00
Jerry (Xinyu Hou) 4b2fc8c4c9 Refactor function name #4715 2015-11-18 16:05:08 -08:00
Jerry (Xinyu Hou) cab8a99233 Persist Profile folder #4715 2015-11-18 16:03:32 -08:00
Jerry (Xinyu Hou) 0e58bfc5fe Remove user token #4715 2015-11-18 15:09:09 -08:00
Jerry (Xinyu Hou) b1c5a83bfb Uthe edition value in app config as default #4715 2015-11-18 15:05:05 -08:00
Jerry (Xinyu Hou) 20d4d47648 Save edition type to settings after wizard finish #4715 2015-11-18 15:03:06 -08:00
Jerry (Xinyu Hou) 5f73d339aa Refactor purchase url #4716 2015-11-17 15:20:22 -08:00
Jerry (Xinyu Hou) 7ecc0457e0 Show subscription warning once a day #4716 2015-11-17 14:51:04 -08:00
Jerry (Xinyu Hou) f8e9047c36 Rephrase and refactor serial warning message #4716 2015-11-17 14:17:00 -08:00
Jerry (Xinyu Hou) 18d23d6f89 Rephrase using serial recommendation #5020 2015-11-17 10:41:24 -08:00
Jerry (Xinyu Hou) 97809f9040 Revert "Modify regex to recognize edition from jason #4933"
This reverts commit 2fd0d5c68f.
2015-11-16 09:24:49 -08:00
Jerry (Xinyu Hou) 2fd0d5c68f Modify regex to recognize edition from jason #4933 2015-11-13 11:04:23 -08:00
Jerry (Xinyu Hou) ad16599fa5 Fix code style 2015-11-12 12:05:37 -08:00
Jerry (Xinyu Hou) 9eec299278 Check user type from serial key #4715 2015-11-12 09:50:30 -08:00
Jerry (Xinyu Hou) bdc02677ec Add trial edition type #4716 2015-10-30 11:57:12 -07:00
Jerry (Xinyu Hou) 0a1c439535 Only send notify request on wizard finish #4932 2015-10-29 16:50:23 -07:00
Jerry (Xinyu Hou) f03b453c6f Pass Linux OS info during notification #4932 2015-10-29 15:55:55 -07:00
Jerry (Xinyu Hou) 27f83e1801 Refactor duplicated code #4933 2015-10-29 11:42:16 -07:00
XinyuHou 2535f3466c Check OS info from GUI #4933 2015-10-28 17:15:16 -07:00
Jerry (Xinyu Hou) d4d5d83bb6 Check OS info from GUI #4933 2015-10-28 14:09:04 -07:00
Xinyu Hou a4c799c285 Notify activation when skipping or using serial #4932 2015-10-27 16:31:09 -07:00
Jerry (Xinyu Hou) 19835b6aaa Allow software to be time limited with serial key #4716 2015-10-23 15:37:16 -07:00
Jerry (Xinyu Hou) 75adb5aa8d Recommend using serial key when online activation fails #5020 2015-10-23 12:13:16 -07:00
Jerry (Xinyu Hou) 98385c06e9 Use local variable instead of function parameter #5020 2015-10-23 11:59:28 -07:00
Jerry (Xinyu Hou) bc768cbca3 Add serial key in app settings #4715 2015-10-22 16:31:46 -07:00
Jerry (Xinyu Hou) 3bc46dca2d Use core interface to activate subscription in wizard #4715 2015-10-22 16:14:37 -07:00
Jerry (Xinyu Hou) 1f54dd2d3b Remove unused code 2015-10-22 16:03:27 -07:00
Jerry (Xinyu Hou) a29858c439 Add subscription section in activation page #4715 2015-10-21 17:06:38 -07:00
Jerry (Xinyu Hou) 83876ebed4 Removed legacy class #4696 2015-10-20 14:36:28 -07:00
Jerry (Xinyu Hou) 084e2c1e05 Refactor FileSysClient into PluginManager #4696 2015-10-19 18:07:08 -07:00
Jerry (Xinyu Hou) 6c4ee29649 Remove unused functions in WebClient #4696 2015-10-19 17:02:59 -07:00
Jerry (Xinyu Hou) 4197fb7a0e Remove unused viable #4696 2015-10-19 16:59:25 -07:00
Jerry (Xinyu Hou) d61b532705 Add built date #4893 2015-10-19 16:06:02 -07:00
Xinyu Hou 6320156279 Add stage and revision info in about page #4893 2015-10-19 15:15:03 -07:00
Jerry (Xinyu Hou) 5da7290242 Stopped process before showing the fingerprint message #4901 2015-08-10 10:11:51 -07:00
Jerry (Xinyu Hou) c55cf1936b Added plugin version header in GUI project #4866 2015-08-03 16:28:13 -07:00
Jerry (Xinyu Hou) bfabd436d7 Increased wizard version to force plugin download #4866 2015-08-03 15:48:44 -07:00
Jerry (Xinyu Hou) a249c38b96 Only loaded matching plugin on Windows #4866
Conflicts:
	src/gui/gui.pro
	src/gui/src/PluginManager.cpp
	src/lib/arch/win32/ArchPluginWindows.cpp
2015-08-03 15:41:57 -07:00
Jerry (Xinyu Hou) 02902066a4 Removed the usage of old delay in GUI #4696 2015-07-31 14:15:28 -07:00
Xinyu Hou dbdc2a1e29 Solved fingerprint message box race condition #4901 2015-07-31 14:00:26 -07:00
Xinyu Hou 0612ba585d Stopped multiple fingerprint message boxes popping up #4910 2015-07-31 14:00:26 -07:00
Jerry d70c19b099 Stopped old process before start a new one #4908 2015-07-31 14:00:26 -07:00
Xinyu Hou e472e47815 Stopped old process on apply button clicked #4908 2015-07-31 14:00:26 -07:00
Xinyu Hou 20cb624c3b Used timer instead of delay #4901 2015-07-31 13:59:25 -07:00
Xinyu Hou 08effbcf99 Fixed code style #4901 2015-07-31 13:59:25 -07:00
Xinyu Hou 67fbecb825 Fixed auto restart sometimes cause GUI crash #4901 2015-07-31 13:59:01 -07:00
Xinyu Hou 94664e413b Rename update zeroconf mutex 2015-07-31 13:58:47 -07:00
Xinyu Hou fc600efdfe Restarted process from GUI in desktop mode #4901 2015-07-31 13:58:18 -07:00
Jerry (Xinyu Hou) 1369f46cee Show connected message box only when main GUI is visible #4850 2015-07-31 13:55:52 -07:00
Jerry (Xinyu Hou) 18a6f75371 Fixed dialog too big #4852 2015-07-31 13:54:26 -07:00
Jerry (Xinyu Hou) 516c692c94 Removed unused function #4745 2015-07-31 13:54:09 -07:00
Xinyu Hou 5a9cbc97e3 Fixed code style
Conflicts:
	src/lib/arch/win32/ArchPluginWindows.cpp
2015-07-31 13:51:48 -07:00
Jerry (Xinyu Hou) d8582d1093 Revert "Removed warning and error logging level in GUI #4745"
This reverts commit 756000d8a9.

Conflicts:
	src/gui/res/SettingsDialogBase.ui
	src/gui/src/AppConfig.cpp
	src/gui/src/MainWindow.cpp
2015-07-31 13:18:36 -07:00
Jerry (Xinyu Hou) c89dc68cd7 Revert "Added warning for enable encryption #4584"
This reverts commit 8e15b77db3.
2015-07-31 13:17:36 -07:00
Jerry (Xinyu Hou) 8ff44d276b Revert "Revert "Add drag and drop enable option to GUI settings""
This reverts commit 8676f64b96.
2015-07-09 17:05:43 -07:00
Jerry (Xinyu Hou) 8676f64b96 Revert "Add drag and drop enable option to GUI settings" 2015-07-09 09:54:57 -07:00
Jerry (Xinyu Hou) 260a7337d3 Added timestamp in log #4845 2015-07-06 15:50:21 -07:00