From fe28d4c1262f8006985b6727a3e50455c1b30ab1 Mon Sep 17 00:00:00 2001 From: Serhii Hadzhilov Date: Thu, 15 Apr 2021 14:53:28 +0300 Subject: [PATCH] SYNERGY-799 Update browse buttons --- src/gui/res/Synergy.qrc | 1 + src/gui/res/icons/64x64/folder.png | Bin 0 -> 919 bytes src/gui/src/ServerConfigDialogBase.ui | 43 +- src/gui/src/SettingsDialogBase.ui | 810 ++++++++++++++------------ 4 files changed, 484 insertions(+), 370 deletions(-) create mode 100644 src/gui/res/icons/64x64/folder.png diff --git a/src/gui/res/Synergy.qrc b/src/gui/res/Synergy.qrc index f1f2e2c56..001e0fc2c 100644 --- a/src/gui/res/Synergy.qrc +++ b/src/gui/res/Synergy.qrc @@ -20,5 +20,6 @@ icons/64x64/synergy-light-disconnected.png icons/64x64/synergy-light-connected.png image/welcome.png + icons/64x64/folder.png diff --git a/src/gui/res/icons/64x64/folder.png b/src/gui/res/icons/64x64/folder.png new file mode 100644 index 0000000000000000000000000000000000000000..fb96ebdfe9f8ab1b0de979ff60afbcbee7764e3e GIT binary patch literal 919 zcmV;I18Dq-P)@~0drDELIAGL9O(c600d`2O+f$vv5yP*Al(5=FmwZS1;7d*k5!9ER8bzGD`;3j=>~$Azz)a`h*YXxOwQ?y z6GMDU6FZRDo=-v~zC7@04s&KaiNYApryq{idIzu$y=~yJ(5lsa|Duf&pn?}$CqIv1 zYzt3CNhJCLpIlx*2_!1#RrV<-{kk3Pqv@VoD}UiUF4)YkE>MfG5T7sm72B(sMcEY}i#I@alDSJ&&; z&gWk{$U#*F-lOfH!zC;-Qh9+4)&F0e*3CLHAOd}CqgJaq$bbkOVKWvKA}~PfSIB?} z%!vrhi3rSz2+WBH%!vrh$y~ZI*21NZ#CNSs-x$?H5n1ti$UqK(whx0ZW^i{l&-PH! z$R^NO7T2n>xPaLOS~RTDDR{y*;?uDSer zdV$8a>84KfFt>s9v(X^ERgvNExPw6MgW);~)!}rCCBI3go5BPp)D& znbk`O%*8~3%GmR0^wDF`-KCjkSSYs7!IdhIqpurD9RAXUD(oQ8T%jtAgDW))lfd}W zwe@|8zVNOjEdo34hwz5kk3Ne72%+Fg6quMe?CL25LS2jpS6m=h97&18+HD9FTz{M6 z??VFpZOh=U6TeLohYxk3qQMmv7>_=GUQZIoD7a!>C_R2bV&WJ!2`W!ga4`=86YAa3 z0D6^cU7w`j3J3(o>s{*Y(XU+yEbv|0Ih|VXLVbh4@SgZ8?WC4^cM`*TchVIqdSLj; zCGNI}K;9E~6B^0m#A;!wcZZ~P;iH81fl}{2kkm{`A|z1i-GFetJBj-x>y^B%e zXij^z3>QT(P|aCBd~+|5$263Ji^@WgXYA&*OE(}Cfdl33arQx_;2|m7Hs0NvVA^07 tRMNrWmrs;?D`O1$7}T%a*7F{6@DD%Je2PPL64U?y002ovPDHLkV1kKHqu>Al literal 0 HcmV?d00001 diff --git a/src/gui/src/ServerConfigDialogBase.ui b/src/gui/src/ServerConfigDialogBase.ui index 186a77782..edc2113e9 100644 --- a/src/gui/src/ServerConfigDialogBase.ui +++ b/src/gui/src/ServerConfigDialogBase.ui @@ -17,7 +17,7 @@ - 0 + 3 @@ -823,7 +823,7 @@ Double click on a screen to edit its settings. - 95 + 40 0 @@ -866,6 +866,22 @@ Double click on a screen to edit its settings. + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + @@ -898,12 +914,31 @@ Double click on a screen to edit its settings. - 40 + 0 0 + + PointingHandCursor + + + margin: 0px; padding: 0px; + - &Browse... + + + + + :/res/icons/64x64/folder.png:/res/icons/64x64/folder.png + + + + 20 + 13 + + + + true diff --git a/src/gui/src/SettingsDialogBase.ui b/src/gui/src/SettingsDialogBase.ui index f21820257..0d6bba8e4 100644 --- a/src/gui/src/SettingsDialogBase.ui +++ b/src/gui/src/SettingsDialogBase.ui @@ -6,8 +6,8 @@ 0 0 - 400 - 757 + 404 + 737 @@ -45,229 +45,6 @@ - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 6 - - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 10 - - - - - - - - 0 - - - 1 - - - 0 - - - 6 - - - - - false - - - - 0 - 0 - - - - Enable Auto Config - - - - - - - - 0 - 0 - - - - <html><head/><body><p><a href="#"><span style=" text-decoration: underline; color:#007af4;">Install Bonjour</span></a></p></body></html> - - - Qt::RichText - - - - - - - - - - true - - - - QGroupBox::title { - left: -3px; - top: -2px; -} - - - Use &settings profile from - - - - - - All users - - - true - - - - - - - Current user - - - - - - - false - - - - 50 - false - - - - Note: Only Admins can edit settings for all users. - - - - - - - - - - - true - - - - QGroupBox::title { - left: 0px; - top: -2px; -} - - - Advanced - - - - - - - 0 - 0 - - - - - 75 - 0 - - - - &Language - - - m_pComboLanguage - - - - - - - Specify when the Synergy service should run at an elevated privilege level - - - 0 - - - - As Needed - - - - - Always - - - - - Never - - - - - - - - Elevate - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - @@ -295,7 +72,7 @@ - 2 + 6 9 @@ -307,7 +84,7 @@ 9 - 3 + 9 @@ -397,12 +174,38 @@ - + + + + 0 + 0 + + + + + PointingHandCursor + + + margin: 0px; padding: 0px; + - Browse + + + + + :/res/icons/64x64/folder.png:/res/icons/64x64/folder.png + + + + 20 + 13 + + + + true @@ -438,130 +241,37 @@ - - - - - 0 - 0 - + + + + Qt::Vertical - - - true - + + QSizePolicy::Minimum - - QGroupBox::title { - left: 0px; - top: -2px; -} + + + 20 + 8 + - - Logs + + + + + + Qt::Vertical - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + QSizePolicy::Minimum - - false + + + 20 + 10 + - - - 6 - - - 16 - - - 6 - - - - - Log path - - - - - - - - Info - - - - - Debug - - - - - Debug1 - - - - - Debug2 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - - - - - - 0 - 0 - - - - &Level - - - m_pComboLogLevel - - - - - - - false - - - Browse... - - - - - - - Log to file - - - - - + @@ -579,22 +289,6 @@ - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 8 - - - - @@ -621,7 +315,7 @@ 9 - 6 + 9 @@ -768,14 +462,398 @@ font-weight: bold; + + + + 0 + + + 1 + + + 0 + + + 6 + + + + + false + + + + 0 + 0 + + + + Enable Auto Config + + + + + + + + 0 + 0 + + + + <html><head/><body><p><a href="#"><span style=" text-decoration: underline; color:#007af4;">Install Bonjour</span></a></p></body></html> + + + Qt::RichText + + + + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 6 + + + + + + + + + true + + + + QGroupBox::title { + left: -3px; + top: -2px; +} + + + Use &settings profile from + + + + + + All users + + + true + + + + + + + Current user + + + + + + + false + + + + 50 + false + + + + Note: Only Admins can edit settings for all users. + + + + + + + + + + + true + + + + QGroupBox::title { + left: 0px; + top: -2px; +} + + + Advanced + + + + + + + 0 + 0 + + + + + 75 + 0 + + + + &Language + + + m_pComboLanguage + + + + + + + Specify when the Synergy service should run at an elevated privilege level + + + 0 + + + + As Needed + + + + + Always + + + + + Never + + + + + + + + Elevate + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + 0 + 0 + + + + + true + + + + QGroupBox::title { + left: 0px; + top: -2px; +} + + + Logs + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + 6 + + + 16 + + + 6 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + &Level + + + m_pComboLogLevel + + + + + + + + Info + + + + + Debug + + + + + Debug1 + + + + + Debug2 + + + + + + + + Log to file + + + + + + + 3 + + + 0 + + + + + Log path + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 30 + 20 + + + + + + + + false + + + + 0 + 0 + + + + + + + + false + + + PointingHandCursor + + + margin: 0px; padding: 0px; + + + + + + + :/res/icons/64x64/folder.png:/res/icons/64x64/folder.png + + + + 20 + 13 + + + + true + + + + + + + + m_pRadioUserScope m_pCheckBoxAutoConfig - m_pLineEditLogFilename - + + + buttonBox