Merge pull request #6992 from symless/SYNERGY-936-UI-issues-and-use-cases

SYNERGY-936 UI issues and use cases
2026-07-07 21:07:23 +08:00 · 2021-05-13 03:41:38 +03:00 · 2021-05-13 03:41:38 +03:00 · fbf8331b25
commit fbf8331b25
parent 0e38ea900d 91c3d2b6da
14 changed files with 823 additions and 990 deletions
--- a/1
+++ b/1
@ -11,6 +11,7 @@ Bug fixes:
 - #6976 Fix windows builds
 - #6979 Manual config error in client mode
 - #6983 Fix that mac client listens on ipv4 only
+- #6992 UI issues and use cases

 Enhancements:
 - #6954 Move language selection to advanced section
--- a/src/gui/res/Synergy.qrc
+++ b/src/gui/res/Synergy.qrc
@ -9,7 +9,6 @@
        <file>image/about.png</file>
        <file>image/about-dark.png</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>
@ -21,5 +20,6 @@
        <file>icons/64x64/synergy-light-connected.png</file>
        <file>image/welcome.png</file>
        <file>icons/64x64/folder.png</file>
+        <file>fonts/Arial.ttf</file>
    </qresource>
 </RCC>
--- a/src/gui/res/fonts/Arial.ttf
+++ b/src/gui/res/fonts/Arial.ttf
--- a/src/gui/res/icons/16x16/money.png
+++ b/src/gui/res/icons/16x16/money.png
--- a/src/gui/src/ActivationDialog.ui
+++ b/src/gui/src/ActivationDialog.ui
@ -30,7 +30,7 @@
   <item>
    <widget class="QLabel" name="label_5">
     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This can be found on your &lt;a href=&quot;https://symless.com/account/?source=gui&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;account&lt;/span&gt;&lt;/a&gt; page.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This can be found on your &lt;a href=&quot;https://symless.com/account/?source=gui&quot;&gt;&lt;span style=&quot; text-decoration: none; color: #4285F4;&quot;&gt;account&lt;/span&gt;&lt;/a&gt; page.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
     <property name="openExternalLinks">
      <bool>true</bool>
@ -49,8 +49,8 @@
      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
     <property name="acceptRichText">
      <bool>false</bool>
@ -73,20 +73,19 @@ p, li { white-space: pre-wrap; }
       <number>8</number>
      </property>
      <item>
-       <widget class="QLabel" name="label_3">
+       <widget class="QLabel" name="m_trialLabel">
+        <property name="styleSheet">
+         <string notr="true">font-size: 13px;
+font-weight: 700;
+padding: 3px 5px;
+border-radius: 3px;
+background-color: #EC4C47;
+color: #ffffff;
+top: 3px;</string>
+        </property>
        <property name="text">
         <string/>
        </property>
-        <property name="pixmap">
-         <pixmap resource="Synergy.qrc">:/res/icons/16x16/money.png</pixmap>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="m_trialLabel">
-        <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your trial has expired. &lt;a href=&quot;http://symless.com/pricing?src=gui&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Buy now!&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>
@ -123,9 +122,7 @@ p, li { white-space: pre-wrap; }
 <tabstops>
  <tabstop>m_pTextEditSerialKey</tabstop>
 </tabstops>
- <resources>
-  <include location="Synergy.qrc"/>
- </resources>
+ <resources/>
 <connections>
  <connection>
   <sender>buttonBox</sender>
--- a/src/gui/src/LicenseManager.cpp
+++ b/src/gui/src/LicenseManager.cpp
@ -174,27 +174,19 @@ LicenseManager::getTrialNotice() const
    QString Notice;

    if (m_serialKey.isExpired(::time(0))){
-        Notice = "<html><head/><body><p>Your %1 trial has expired. <a href="
-                 "\"https://members.symless.com/purchase\">"
-                 "<span style=\"text-decoration: underline;color:#0000ff;\">"
-                 "Buy now!</span></a></p></body></html>";
-        Notice = Notice.arg(LicenseManager::getEditionName(activeEdition()));
+        Notice = "<html><head/><body><p>"
+                 "Trial expired - "
+                 "<a href=\"https://members.symless.com/purchase\" style=\"color: #FFFFFF;\">Buy now</a>"
+                 "</p></body></html>";
    }
    else{
-        Notice = "<html><head/><body><p><span style=\""
-                 "font-weight:600;\">%1</span> day%3 of "
-                 "your %2 trial remain%5. <a href="
-                 "\"https://members.symless.com/purchase\">"
-                 "<span style=\"text-decoration: underline;"
-                 " color:#0000ff;\">Buy now!</span></a>"
+        Notice = "<html><head/><body><p>"
+                 "Trial expires in %1 day%2 - "
+                 "<a href=\"https://members.symless.com/purchase\" style=\"color: #FFFFFF;\">Buy now</a>"
                 "</p></body></html>";

        time_t daysLeft = m_serialKey.daysLeft(::time(0));
-        Notice = Notice
-                .arg (daysLeft)
-                .arg (LicenseManager::getEditionName(activeEdition()))
-                .arg ((daysLeft == 1) ? "" : "s")
-                .arg ((daysLeft == 1) ? "s" : "");
+        Notice = Notice.arg (daysLeft).arg ((daysLeft == 1) ? "" : "s");
    }

    return Notice;
@ -206,18 +198,15 @@ LicenseManager::getTemporaryNotice() const
    QString Notice;

    if (m_serialKey.isExpired(::time(0))) {
-        Notice = "<html><head/><body><p>Your license has expired. <a href="
-                 "\"https://members.symless.com/purchase\">"
-                 "<span style=\"text-decoration: underline;color:#0000ff;\">"
-                 "Renew now!</span></a></p></body></html>";
+        Notice = "<html><head/><body><p>"
+                 "License expired - "
+                 "<a href=\"https://members.symless.com/purchase\" style=\"color: #FFFFFF;\">Renew now</a>"
+                 "</p></body></html>";
    }
    else if (m_serialKey.isExpiring(::time(0))) {
-        Notice = "<html><head/><body><p><span style=\""
-                 "font-weight:600;\">%1</span> day%2 "
-                 "before your license expires.<a href="
-                 "\"https://members.symless.com/purchase\">"
-                 "<span style=\"text-decoration: underline;"
-                 " color:#0000ff;\">Renew now!</span></a>"
+        Notice = "<html><head/><body><p>"
+                 "License expires in %1 day%2 - "
+                 "<a href=\"https://members.symless.com/purchase\" style=\"color: #FFFFFF;\">Renew now</a>"
                 "</p></body></html>";

        time_t daysLeft = m_serialKey.daysLeft(::time(0));
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@ -130,9 +130,9 @@ MainWindow::MainWindow (AppConfig& appConfig,
    m_pWidgetUpdate->hide();
    m_VersionChecker.setApp(appPath(appConfig.synergycName()));

-    m_pLabelScreenName->setText(appConfig.screenName());
+    updateScreenName();
    connect(m_AppConfig, SIGNAL(screenNameChanged()), this, SLOT(updateScreenName()));
-    m_pLabelIpAddresses->setText(getIPAddresses());
+    m_pLabelIpAddresses->setText(tr("This computers IP addresses: %1").arg(getIPAddresses()));

 #if defined(Q_OS_WIN)
    // ipc must always be enabled, so that we can disable command when switching to desktop mode.
@ -151,7 +151,7 @@ MainWindow::MainWindow (AppConfig& appConfig,
    setMinimumSize(size());
 #endif

-    m_trialWidget->hide();
+    m_trialLabel->hide();

    // hide padlock icon
    secureSocket(false);
@ -1072,7 +1072,7 @@ QString MainWindow::getIPAddresses()
            // usually 192.168.x.x is a useful ip for the user, so indicate
            // this by making it bold.
            if (!hinted && address.isInSubnet(localnet)) {
-                QString format = "<b>%1</b>";
+                QString format = "<span style=\"color:#4285F4;\">%1</span>";
                result.append(format.arg(address.toString()));
                hinted = true;
            }
@ -1143,11 +1143,11 @@ void MainWindow::InvalidLicense()

 void MainWindow::showLicenseNotice(const QString& notice)
 {
-    this->m_trialWidget->hide();
+    this->m_trialLabel->hide();

    if (!notice.isEmpty()) {
        this->m_trialLabel->setText(notice);
-        this->m_trialWidget->show();
+        this->m_trialLabel->show();
    }

    setWindowTitle (m_LicenseManager->activeEditionName());
@ -1351,7 +1351,7 @@ void MainWindow::secureSocket(bool secureSocket)
    }
 }

-void MainWindow::on_m_pSettingsLink_linkActivated(const QString&)
+void MainWindow::on_m_pLabelComputerName_linkActivated(const QString&)
 {
   m_pActionSettings->trigger();
 }
@ -1374,7 +1374,7 @@ void MainWindow::windowStateChanged()

 void MainWindow::updateScreenName()
 {
-    m_pLabelScreenName->setText(appConfig().screenName());
+    m_pLabelComputerName->setText(tr("This computers name: %1 (<a href=\"#\" style=\"text-decoration: none; color: #4285F4;\">Preferences</a>)").arg(appConfig().screenName()));
    serverConfig().updateServerName();
 }

--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@ -252,7 +252,7 @@ private slots:
    void on_m_pButtonApply_clicked();
    void on_windowShown();

-    void on_m_pSettingsLink_linkActivated(const QString &link);
+    void on_m_pLabelComputerName_linkActivated(const QString &link);
    void on_m_pLabelFingerprint_linkActivated(const QString& link);
    void on_m_pComboServerList_currentIndexChanged(const QString &arg1);

--- a/src/gui/src/MainWindowBase.ui
+++ b/src/gui/src/MainWindowBase.ui
@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>720</width>
-    <height>797</height>
+    <height>658</height>
   </rect>
  </property>
  <property name="sizePolicy">
@ -19,7 +19,7 @@
  <property name="minimumSize">
   <size>
    <width>720</width>
-    <height>0</height>
+    <height>552</height>
   </size>
  </property>
  <property name="windowTitle">
@ -27,57 +27,12 @@
  </property>
  <widget class="QWidget" name="centralwidget">
   <layout class="QVBoxLayout" name="verticalLayout_2">
-    <item>
-     <widget class="QWidget" name="m_trialWidget" native="true">
-      <layout class="QHBoxLayout" name="horizontalLayout_5">
-       <property name="leftMargin">
-        <number>2</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>8</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="label_3">
-         <property name="text">
-          <string/>
-         </property>
-         <property name="pixmap">
-          <pixmap resource="../res/Synergy.qrc">:/res/icons/16x16/warning.png</pixmap>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="m_trialLabel">
-         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;%1&lt;/span&gt; days of your Synergy Pro trial remain. &lt;a href=&quot;http://symless.com/pricing?src=gui&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Buy now!&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="openExternalLinks">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </item>
+    <property name="spacing">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>20</number>
+    </property>
    <item>
     <widget class="QWidget" name="m_pWidgetUpdate" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout_2">
@ -133,192 +88,51 @@
     </widget>
    </item>
    <item>
-     <widget class="QWidget" name="m_pWidgetComputerName" native="true">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
+     <widget class="QLabel" name="m_pLabelComputerName">
      <property name="minimumSize">
       <size>
-        <width>582</width>
-        <height>15</height>
+        <width>0</width>
+        <height>0</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
-        <width>16777215</width>
-        <height>20</height>
+        <width>65535</width>
+        <height>65535</height>
       </size>
      </property>
-      <layout class="QHBoxLayout" name="horizontalLayout_7">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="m_pLabelComputerName">
-         <property name="minimumSize">
-          <size>
-           <width>135</width>
-           <height>15</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>135</width>
-           <height>20</height>
-          </size>
-         </property>
-         <property name="font">
-          <font>
-           <family>Arial</family>
-           <kerning>true</kerning>
-          </font>
-         </property>
-         <property name="text">
-          <string>This computers name:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="m_pLabelScreenName">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>15</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>20</height>
-          </size>
-         </property>
-         <property name="font">
-          <font>
-           <family>Arial</family>
-          </font>
-         </property>
-         <property name="text">
-          <string notr="true"/>
-         </property>
-         <property name="textFormat">
-          <enum>Qt::AutoText</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="m_pSettingsLink">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>15</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>20</height>
-          </size>
-         </property>
-         <property name="font">
-          <font>
-           <family>Arial</family>
-           <weight>50</weight>
-           <italic>false</italic>
-           <bold>false</bold>
-          </font>
-         </property>
-         <property name="styleSheet">
-          <string notr="true"/>
-         </property>
-         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style=&quot;margin-left: 5px;&quot;&gt;(&lt;a href=&quot;#&quot;&gt;&lt;span style=&quot; text-decoration: none; font-size: 13px; color:#007af4;&quot;&gt;Settings&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="margin">
-          <number>0</number>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <property name="font">
+       <font>
+        <family>Arial</family>
+        <kerning>true</kerning>
+       </font>
+      </property>
+      <property name="text">
+       <string notr="true">This computers name:</string>
+      </property>
     </widget>
    </item>
    <item>
-     <widget class="QWidget" name="m_pWidgetIPAddress" native="true">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
+     <spacer name="verticalSpacer_5">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
      </property>
-      <property name="minimumSize">
+      <property name="sizeType">
+       <enum>QSizePolicy::Fixed</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
       <size>
-        <width>0</width>
-        <height>20</height>
+        <width>20</width>
+        <height>14</height>
       </size>
      </property>
-      <layout class="QHBoxLayout" name="horizontalLayout_6">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="label_2">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>20</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>190</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>This computers IP addresses:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="m_pLabelIpAddresses">
-         <property name="text">
-          <string notr="true"/>
-         </property>
-        </widget>
-       </item>
-      </layout>
+     </spacer>
+    </item>
+    <item>
+     <widget class="QLabel" name="m_pLabelIpAddresses">
+      <property name="text">
+       <string notr="true">This computers IP addresses:</string>
+      </property>
     </widget>
    </item>
    <item>
@ -332,13 +146,13 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-        <height>270</height>
+        <height>0</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
        <width>16777215</width>
-        <height>270</height>
+        <height>16777215</height>
       </size>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_8">
@ -349,62 +163,45 @@
        <number>0</number>
       </property>
       <property name="topMargin">
-        <number>22</number>
+        <number>28</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
-        <number>0</number>
+        <number>8</number>
       </property>
       <item>
-        <widget class="QGroupBox" name="m_pGroupServer">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
+        <widget class="QFrame" name="m_pGroupServer">
         <property name="minimumSize">
          <size>
-           <width>340</width>
-           <height>248</height>
+           <width>0</width>
+           <height>250</height>
          </size>
         </property>
-         <property name="font">
-          <font>
-           <kerning>true</kerning>
-          </font>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>250</height>
+          </size>
         </property>
         <property name="styleSheet">
-          <string notr="true">QGroupBox::title {
-    subcontrol-origin: padding;
-    left: 7px;
-}
-</string>
+          <string notr="true">.QFrame{
+border: 1px solid  rgba(192,192,192, 0.2);;
+border-radius: 4px;
+background-color: rgba(192,192,192, 0.1);
+}</string>
         </property>
-         <property name="title">
-          <string/>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
         </property>
-         <property name="checkable">
-          <bool>false</bool>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <layout class="QVBoxLayout" name="ServerLayout">
-          <property name="spacing">
-           <number>9</number>
-          </property>
+         <layout class="QVBoxLayout" name="verticalLayout">
          <property name="topMargin">
           <number>11</number>
          </property>
-          <property name="rightMargin">
-           <number>5</number>
-          </property>
-          <property name="bottomMargin">
-           <number>5</number>
-          </property>
          <item>
           <widget class="QRadioButton" name="m_pRadioGroupServer">
            <property name="sizePolicy">
@ -463,36 +260,29 @@
           </widget>
          </item>
          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <property name="spacing">
-             <number>6</number>
+           <widget class="QLabel" name="m_pLabelFingerprint">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
            </property>
-            <item>
-             <widget class="QLabel" name="m_pLabelFingerprint">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>20</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;TLS/SSL active - &lt;a href=&quot;#&quot;&gt;view&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-              </property>
-              <property name="textFormat">
-               <enum>Qt::RichText</enum>
-              </property>
-              <property name="indent">
-               <number>20</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>20</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;TLS/SSL active - &lt;a href=&quot;#&quot; style=&quot;text-decoration:none; color: #4285F4;&quot;&gt;view&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::RichText</enum>
+            </property>
+            <property name="indent">
+             <number>20</number>
+            </property>
+           </widget>
          </item>
          <item>
           <spacer name="verticalSpacer_2">
@ -547,53 +337,33 @@
        </widget>
       </item>
       <item>
-        <widget class="QGroupBox" name="m_pGroupClient">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
+        <widget class="QFrame" name="m_pGroupClient">
         <property name="minimumSize">
-          <size>
-           <width>340</width>
-           <height>248</height>
-          </size>
-         </property>
-         <property name="baseSize">
          <size>
           <width>0</width>
-           <height>0</height>
+           <height>250</height>
          </size>
         </property>
-         <property name="font">
-          <font>
-           <kerning>true</kerning>
-          </font>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>250</height>
+          </size>
         </property>
         <property name="styleSheet">
-          <string notr="true">QGroupBox::title {
-    subcontrol-origin: padding;
-    left: 7px;
-}
-</string>
+          <string notr="true">.QFrame{
+border: 1px solid  rgba(192,192,192, 0.2);
+border-radius: 4px;
+background-color: rgba(192,192,192, 0.1);
+}</string>
         </property>
-         <property name="title">
-          <string/>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
         </property>
-         <property name="checkable">
-          <bool>false</bool>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <layout class="QVBoxLayout" name="ClientLayout">
-          <property name="spacing">
-           <number>9</number>
-          </property>
-          <property name="leftMargin">
-           <number>9</number>
-          </property>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
          <property name="topMargin">
           <number>11</number>
          </property>
@ -772,16 +542,65 @@
     </widget>
    </item>
    <item>
-     <widget class="QGroupBox" name="m_pGroupLog">
-      <property name="font">
-       <font>
-        <kerning>true</kerning>
-       </font>
+     <widget class="QLabel" name="m_pLabelLogs">
+      <property name="styleSheet">
+       <string notr="true"/>
      </property>
-      <property name="title">
-       <string>Log</string>
+      <property name="text">
+       <string>Logs</string>
      </property>
-      <layout class="QVBoxLayout" name="verticalLayout">
+     </widget>
+    </item>
+    <item>
+     <spacer name="verticalSpacer_7">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeType">
+       <enum>QSizePolicy::Fixed</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>20</width>
+        <height>5</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item>
+     <widget class="QFrame" name="m_pGroupLog">
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">.QFrame{
+border: 1px solid  rgba(192,192,192, 0.2);;
+border-radius: 4px;
+background-color: rgba(192,192,192, 0.1);
+}</string>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::StyledPanel</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="leftMargin">
+        <number>8</number>
+       </property>
+       <property name="topMargin">
+        <number>8</number>
+       </property>
+       <property name="rightMargin">
+        <number>8</number>
+       </property>
+       <property name="bottomMargin">
+        <number>8</number>
+       </property>
       <item>
        <widget class="QPlainTextEdit" name="m_pLogOutput">
         <property name="sizePolicy">
@ -818,9 +637,15 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
      <property name="sizeConstraint">
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
+      <property name="topMargin">
+       <number>16</number>
+      </property>
      <item>
       <widget class="QLabel" name="m_pLabelPadlock">
        <property name="enabled">
@ -854,6 +679,58 @@
        </property>
       </spacer>
      </item>
+      <item>
+       <widget class="QLabel" name="m_trialLabel">
+        <property name="font">
+         <font>
+          <family>Arial</family>
+          <pointsize>-1</pointsize>
+          <weight>87</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="autoFillBackground">
+         <bool>false</bool>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">font-size: 13px;
+font-weight: 700;
+padding: 3px 5px;
+border-radius: 3px;
+background-color: #EC4C47;
+color: #ffffff;
+top: 3px;</string>
+        </property>
+        <property name="text">
+         <string notr="true"/>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
+        <property name="openExternalLinks">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      <item>
       <widget class="QPushButton" name="m_pButtonApply">
        <property name="enabled">
--- a/src/gui/src/QSynergyApplication.cpp
+++ b/src/gui/src/QSynergyApplication.cpp
@ -29,6 +29,12 @@ QSynergyApplication::QSynergyApplication(int& argc, char** argv) :
    m_Translator(NULL)
 {
    s_Instance = this;
+
+    QFontDatabase::addApplicationFont(":/res/fonts/Arial.ttf");
+    QFont Arial("Arial");
+    Arial.setPixelSize(13);
+    Arial.setStyleHint(QFont::SansSerif);
+    setFont(Arial);
 }

 QSynergyApplication::~QSynergyApplication()
--- a/src/gui/src/ScreenSettingsDialog.cpp
+++ b/src/gui/src/ScreenSettingsDialog.cpp
@ -57,8 +57,6 @@ ScreenSettingsDialog::ScreenSettingsDialog(QWidget* parent, Screen* pScreen,cons
    m_pCheckBoxNumLock->setChecked(m_pScreen->fix(Screen::NumLock));
    m_pCheckBoxScrollLock->setChecked(m_pScreen->fix(Screen::ScrollLock));
    m_pCheckBoxXTest->setChecked(m_pScreen->fix(Screen::XTest));
-
-    resize(400, 625);
 }

 void ScreenSettingsDialog::accept()
--- a/src/gui/src/ScreenSettingsDialogBase.ui
+++ b/src/gui/src/ScreenSettingsDialogBase.ui
--- a/src/gui/src/main.cpp
+++ b/src/gui/src/main.cpp
@ -55,6 +55,7 @@ int main(int argc, char* argv[])
    /* Workaround for QTBUG-40332 - "High ping when QNetworkAccessManager is instantiated" */
    ::setenv ("QT_BEARER_POLL_TIMEOUT", "-1", 1);
 #endif
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
    QCoreApplication::setOrganizationName("Synergy");
    QCoreApplication::setOrganizationDomain("http://symless.com/");
    QCoreApplication::setApplicationName("Synergy");
--- a/src/gui/src/validators/ScreenNameValidator.cpp
+++ b/src/gui/src/validators/ScreenNameValidator.cpp
@ -29,7 +29,7 @@ namespace validators
 ScreenNameValidator::ScreenNameValidator(QLineEdit* parent, QLabel* errors, const ScreenList* pScreens) :
   LineEditValidator(parent, errors)
 {
-   addValidator(std::make_unique<EmptyStringValidator>("Computer name can't be empty"));
+   addValidator(std::make_unique<EmptyStringValidator>("Computer name is required"));
   addValidator(std::make_unique<SpacesValidator>("Remove spaces"));
   addValidator(std::make_unique<RegExpValidator>("Remove unsupported characters", QRegExp("[a-z0-9\\._-]{,255}", Qt::CaseInsensitive)));
   addValidator(std::make_unique<ScreenDuplicationsValidator>("A computer with this name already exists", parent ? parent->text() : "", pScreens));