From 1a026f6397e47d75e59f2b5bb947b618a635d544 Mon Sep 17 00:00:00 2001 From: Serhii Hadzhilov Date: Wed, 5 May 2021 14:40:51 +0300 Subject: [PATCH] SYNERGY-936 Fix activation window --- src/gui/res/Synergy.qrc | 1 - src/gui/res/icons/16x16/money.png | Bin 738 -> 0 bytes src/gui/src/ActivationDialog.ui | 31 ++++++++---------- src/gui/src/MainWindowBase.ui | 51 +++++++++++++----------------- 4 files changed, 36 insertions(+), 47 deletions(-) delete mode 100644 src/gui/res/icons/16x16/money.png diff --git a/src/gui/res/Synergy.qrc b/src/gui/res/Synergy.qrc index 31f4d322db..345e6b7000 100644 --- a/src/gui/res/Synergy.qrc +++ b/src/gui/res/Synergy.qrc @@ -9,7 +9,6 @@ image/about.png image/about-dark.png lang/Languages.xml - icons/16x16/money.png image/spinning-wheel.gif icons/16x16/padlock.png icons/16x16/synergy-transfering.png diff --git a/src/gui/res/icons/16x16/money.png b/src/gui/res/icons/16x16/money.png deleted file mode 100644 index 42c52d05f6f8242e4de6fd953d9fcfcfcde81f3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 738 zcmV<80v-K{P)kKmx=vV@a|w4d?1G z{A&|1yzGF~TZ8KHTl_r*T3@s<=A;pUk6t|eFbv0%74?%+OlCdki0e@06yy3x1%Foo zZA8IP3kLWJ+!ohD8&$%-Xu;s38IP9-L1$fP3CnTSerf$50rgDty6Lr^*!3d)Z5bO| z-!b-f1e)3AZ8+nCGAzU8!LrRAB^VQ3$5hYdKYA07xLVs{S`MaSy~ut|Ll;xQn;C~< zTE=EZ#ZWme+JuKV0b`<5t|FFt=DRug$%=#6R&beFSRGVu!=XktGv>d{p(*$PrItbs zC%{@V&UayoG-zyPh^uwrJq0zft&6HKksgOU)PPF&4Gy0B97SX;1Yuth&KvTM@H8_D zI|j&k17#5C^Q5`mXHM}n5yer~ z1v@0vf}XSMShQ`!KZ;`Qm@#H#oe^ U8%xtYa{vGU07*qoM6N<$f()ing#Z8m diff --git a/src/gui/src/ActivationDialog.ui b/src/gui/src/ActivationDialog.ui index 86fea30d05..6f67e52b8e 100644 --- a/src/gui/src/ActivationDialog.ui +++ b/src/gui/src/ActivationDialog.ui @@ -30,7 +30,7 @@ - <html><head/><body><p>This can be found on your <a href="https://symless.com/account/?source=gui"><span style=" text-decoration: underline; color:#0000ff;">account</span></a> page.</p></body></html> + <html><head/><body><p>This can be found on your <a href="https://symless.com/account/?source=gui"><span style=" text-decoration: none; color: #4285F4;">account</span></a> page.</p></body></html> true @@ -49,8 +49,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> +</style></head><body style=" font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p></body></html> false @@ -73,20 +73,19 @@ p, li { white-space: pre-wrap; } 8 - + + + font-size: 13px; +font-weight: 700; +padding: 3px 5px; +border-radius: 3px; +background-color: #EC4C47; +color: #ffffff; +top: 3px; + - - :/res/icons/16x16/money.png - - - - - - - <html><head/><body><p>Your trial has expired. <a href="http://symless.com/pricing?src=gui"><span style=" text-decoration: underline; color:#0000ff;">Buy now!</span></a></p></body></html> - true @@ -123,9 +122,7 @@ p, li { white-space: pre-wrap; } m_pTextEditSerialKey - - - + buttonBox diff --git a/src/gui/src/MainWindowBase.ui b/src/gui/src/MainWindowBase.ui index f09b7977ad..a2067b0c73 100644 --- a/src/gui/src/MainWindowBase.ui +++ b/src/gui/src/MainWindowBase.ui @@ -277,36 +277,29 @@ - - - 6 + + + + 0 + 0 + - - - - - 0 - 0 - - - - - 16777215 - 20 - - - - <html><head/><body><p>TLS/SSL active - <a href="#" style="text-decoration:none; color: #4285F4;">view</a></p></body></html> - - - Qt::RichText - - - 20 - - - - + + + 16777215 + 20 + + + + <html><head/><body><p>TLS/SSL active - <a href="#" style="text-decoration:none; color: #4285F4;">view</a></p></body></html> + + + Qt::RichText + + + 20 + +