Plugins::FreeRDP: modify settings dialog

Author: KangLin

Plugins/FreeRDP/Client/DlgSetFreeRDP.cpp

@@ -235,7 +235,7 @@ CDlgSetFreeRDP::~CDlgSetFreeRDP()
 }
 
 // [Check validity and accept]
-void CDlgSetFreeRDP::on_pbOk_clicked()
+void CDlgSetFreeRDP::accept()
 {
     int nRet = 0;
 
@@ -367,15 +367,10 @@ void CDlgSetFreeRDP::on_pbOk_clicked()
         performanceFlags |= PERF_ENABLE_DESKTOP_COMPOSITION;
     m_pSettings->SetPerformanceFlags(performanceFlags);
 
-    accept();
+    QDialog::accept();
 }
 // [Check validity and accept]
 
-void CDlgSetFreeRDP::on_pbCancel_clicked()
-{
-    reject();
-}
-
 void CDlgSetFreeRDP::on_rbLocalScreen_clicked(bool checked)
 {
     if(!checked) return;

Plugins/FreeRDP/Client/DlgSetFreeRDP.h

@@ -25,8 +25,9 @@ class CDlgSetFreeRDP : public QDialog
     explicit CDlgSetFreeRDP(CParameterFreeRDP* pSettings, QWidget *parent = nullptr);
     ~CDlgSetFreeRDP();
 
-private slots:
-    void on_pbOk_clicked();
+public Q_SLOTS:
+    // QDialog interface
+    virtual void accept() override;
     void on_pbCancel_clicked();
     void on_rbLocalScreen_clicked(bool checked);
 

Plugins/FreeRDP/Client/DlgSetFreeRDP.ui

@@ -615,35 +615,14 @@
     </widget>
    </item>
    <item row="1" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pbOk">
-       <property name="text">
-        <string>OK(&amp;O)</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pbCancel">
-       <property name="text">
-        <string>Cancel(&amp;C)</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -668,5 +647,38 @@
   <tabstop>tabWidget</tabstop>
  </tabstops>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CDlgSetFreeRDP</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CDlgSetFreeRDP</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

Plugins/FreeRDP/Client/ParameterFreeRDP.h

@@ -1,5 +1,6 @@
-#ifndef CPARAMETERFREERDP_H
-#define CPARAMETERFREERDP_H
+// Author: Kang Lin <kl222@126.com>
+
+#pragma once
 
 #include "ParameterDesktop.h"
 #include "ParameterProxy.h"
@@ -131,5 +132,3 @@ class CParameterFreeRDP : public CParameterDesktop
     UINT32 m_ConnectType;
     UINT32 m_PerformanceFlags;
 };
-
-#endif // CPARAMETERFREERDP_H

Plugins/LibVNCServer/Client/DlgSettingsLibVnc.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>600</width>
-    <height>400</height>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle">

Plugins/Template/Desktop/DlgSettingsTemplateDesktop.h

@@ -15,7 +15,7 @@ class CDlgSettingsTemplateDesktop : public QDialog
 
 public:
     explicit CDlgSettingsTemplateDesktop(CParameterTemplateDesktop* pPara,
-                                      QWidget *parent = nullptr);
+                                         QWidget *parent = nullptr);
     virtual ~CDlgSettingsTemplateDesktop();
 
     // QDialog interface

Plugins/Template/Desktop/ParameterTemplateDesktop.h

@@ -8,7 +8,7 @@ class CParameterTemplateDesktop : public CParameterDesktop
     Q_OBJECT
 public:
     explicit CParameterTemplateDesktop(CParameterOperate *parent = nullptr,
-                                    const QString& szPrefix = QString());
+                                       const QString& szPrefix = QString());
 
     // CParameter interface
 protected:

Plugins/Template/QtEvent/ParameterTemplateQtEvent.h

@@ -8,7 +8,7 @@ class CParameterTemplateQtEvent : public CParameterOperate
     Q_OBJECT
 public:
     explicit CParameterTemplateQtEvent(QObject *parent = nullptr,
-                                    const QString& szPrefix = QString());
+                                       const QString& szPrefix = QString());
 
     // CParameter interface
 protected:

Plugins/Template/Server/ParameterTemplateServer.h

@@ -8,7 +8,7 @@ class CParameterTemplateServer : public CParameterServer
     Q_OBJECT
 public:
     explicit CParameterTemplateServer(QObject *parent = nullptr,
-                                    const QString& szPrefix = QString());
+                                      const QString& szPrefix = QString());
 
 protected:
     virtual int OnLoad(QSettings &set) override;