From 682fe1cfa3505c2e6b1e329f43d8027f6bba8f68 Mon Sep 17 00:00:00 2001
From: Xinyu Hou <xinyu@boltonsoftware.com>
Date: Tue, 29 May 2018 09:45:38 -0400
Subject: [PATCH] #6301 Add clipboard size limit option to GUI

---
 src/gui/src/ServerConfigDialogBase.ui | 61 +++++++++++++++++++++------
 1 file changed, 49 insertions(+), 12 deletions(-)

diff --git a/src/gui/src/ServerConfigDialogBase.ui b/src/gui/src/ServerConfigDialogBase.ui
index e4e988cf..ccd2e781 100644
--- a/src/gui/src/ServerConfigDialogBase.ui
+++ b/src/gui/src/ServerConfigDialogBase.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="m_pTabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="m_pTabScreens">
       <attribute name="title">
@@ -408,6 +408,53 @@ Double click on a screen to edit its settings.</string>
           <string>&amp;Options</string>
          </property>
          <layout class="QGridLayout">
+          <item row="8" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QCheckBox" name="m_pCheckBoxEnableClipboard">
+              <property name="text">
+               <string>Enable clipboard sharing</string>
+              </property>
+              <property name="checked">
+               <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>
+            <item>
+             <widget class="QSpinBox" name="m_pSpinBoxClipboardSizeLimit">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="maximum">
+               <number>50</number>
+              </property>
+              <property name="value">
+               <number>3</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_4">
+              <property name="text">
+               <string>MB</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
           <item row="5" column="0">
            <widget class="QCheckBox" name="m_pCheckBoxEnableDragAndDrop">
             <property name="text">
@@ -435,7 +482,7 @@ Double click on a screen to edit its settings.</string>
             </property>
            </widget>
           </item>
-          <item row="8" column="0">
+          <item row="12" column="0">
            <spacer>
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -448,16 +495,6 @@ Double click on a screen to edit its settings.</string>
             </property>
            </spacer>
           </item>
-          <item row="7" column="0">
-           <widget class="QCheckBox" name="m_pCheckBoxEnableClipboard">
-            <property name="text">
-             <string>Enable clipboard sharing</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
           <item row="4" column="0">
            <widget class="QCheckBox" name="m_pCheckBoxIgnoreAutoConfigClient">
             <property name="text">