Skip to content

Commit dff4199

Browse files
KangLinKangLin
committed
Plugin: modify UI
1 parent 00b6b33 commit dff4199

30 files changed

Lines changed: 206 additions & 448 deletions

‎App/Client/ParameterDlgSettings.ui‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>600</width>
10-
<height>450</height>
10+
<height>473</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -114,7 +114,7 @@
114114
<property name="sizeHint" stdset="0">
115115
<size>
116116
<width>20</width>
117-
<height>40</height>
117+
<height>0</height>
118118
</size>
119119
</property>
120120
</spacer>
@@ -141,7 +141,7 @@
141141
<property name="sizeHint" stdset="0">
142142
<size>
143143
<width>20</width>
144-
<height>66</height>
144+
<height>0</height>
145145
</size>
146146
</property>
147147
</spacer>

‎App/Client/Recent/RecentModel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Qt::ItemFlags CRecentModel::flags(const QModelIndex &index) const
3232
bool bExist = false;
3333
QFileInfo fi(szFile);
3434
if(m_pParameterApp->GetGlobalParameters()->GetSaveSettingsType()
35-
== CParameterGlobal::SaveSettingsType::Local) {
35+
== CParameterGlobal::SaveSettingsType::File) {
3636
bExist = fi.exists();
3737
} else {
3838
bExist = m_pDatabase->HasFileContents(item);

‎App/Client/Resource/Translations/RabbitRemoteControlApp_zh_CN.ts‎

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -601,84 +601,6 @@ File: %1</source>
601601
<translation>文件</translation>
602602
</message>
603603
</context>
604-
<context>
605-
<name>CVirtualKeyboardSettingsDialog</name>
606-
<message>
607-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="13"/>
608-
<source>虚拟键盘设置</source>
609-
<translation type="unfinished"></translation>
610-
</message>
611-
<message>
612-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="41"/>
613-
<source>输入语言</source>
614-
<translation type="unfinished"></translation>
615-
</message>
616-
<message>
617-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="56"/>
618-
<source>选择输入语言:</source>
619-
<translation type="unfinished"></translation>
620-
</message>
621-
<message>
622-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="61"/>
623-
<source>外观设置</source>
624-
<translation type="unfinished"></translation>
625-
</message>
626-
<message>
627-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="66"/>
628-
<source>键盘主题:</source>
629-
<translation type="unfinished"></translation>
630-
</message>
631-
<message>
632-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="77"/>
633-
<source>按键大小:</source>
634-
<translation type="unfinished"></translation>
635-
</message>
636-
<message>
637-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="95"/>
638-
<source>显示按键辅助小文本</source>
639-
<translation type="unfinished"></translation>
640-
</message>
641-
<message>
642-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="96"/>
643-
<source>自动大写</source>
644-
<translation type="unfinished"></translation>
645-
</message>
646-
<message>
647-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="101"/>
648-
<source>按键反馈</source>
649-
<translation type="unfinished"></translation>
650-
</message>
651-
<message>
652-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="104"/>
653-
<source>启用按键音</source>
654-
<translation type="unfinished"></translation>
655-
</message>
656-
<message>
657-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="105"/>
658-
<source>启用震动反馈</source>
659-
<translation type="unfinished"></translation>
660-
</message>
661-
<message>
662-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="112"/>
663-
<source>恢复默认</source>
664-
<translation type="unfinished"></translation>
665-
</message>
666-
<message>
667-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="113"/>
668-
<source>应用</source>
669-
<translation type="unfinished"></translation>
670-
</message>
671-
<message>
672-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="114"/>
673-
<source>确定</source>
674-
<translation type="unfinished"></translation>
675-
</message>
676-
<message>
677-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="115"/>
678-
<source>取消</source>
679-
<translation type="unfinished"></translation>
680-
</message>
681-
</context>
682604
<context>
683605
<name>MainWindow</name>
684606
<message>

‎App/Client/Resource/Translations/RabbitRemoteControlApp_zh_TW.ts‎

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -601,84 +601,6 @@ File: %1</source>
601601
<translation>文件</translation>
602602
</message>
603603
</context>
604-
<context>
605-
<name>CVirtualKeyboardSettingsDialog</name>
606-
<message>
607-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="13"/>
608-
<source>虚拟键盘设置</source>
609-
<translation type="unfinished"></translation>
610-
</message>
611-
<message>
612-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="41"/>
613-
<source>输入语言</source>
614-
<translation type="unfinished"></translation>
615-
</message>
616-
<message>
617-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="56"/>
618-
<source>选择输入语言:</source>
619-
<translation type="unfinished"></translation>
620-
</message>
621-
<message>
622-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="61"/>
623-
<source>外观设置</source>
624-
<translation type="unfinished"></translation>
625-
</message>
626-
<message>
627-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="66"/>
628-
<source>键盘主题:</source>
629-
<translation type="unfinished"></translation>
630-
</message>
631-
<message>
632-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="77"/>
633-
<source>按键大小:</source>
634-
<translation type="unfinished"></translation>
635-
</message>
636-
<message>
637-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="95"/>
638-
<source>显示按键辅助小文本</source>
639-
<translation type="unfinished"></translation>
640-
</message>
641-
<message>
642-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="96"/>
643-
<source>自动大写</source>
644-
<translation type="unfinished"></translation>
645-
</message>
646-
<message>
647-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="101"/>
648-
<source>按键反馈</source>
649-
<translation type="unfinished"></translation>
650-
</message>
651-
<message>
652-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="104"/>
653-
<source>启用按键音</source>
654-
<translation type="unfinished"></translation>
655-
</message>
656-
<message>
657-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="105"/>
658-
<source>启用震动反馈</source>
659-
<translation type="unfinished"></translation>
660-
</message>
661-
<message>
662-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="112"/>
663-
<source>恢复默认</source>
664-
<translation type="unfinished"></translation>
665-
</message>
666-
<message>
667-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="113"/>
668-
<source>应用</source>
669-
<translation type="unfinished"></translation>
670-
</message>
671-
<message>
672-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="114"/>
673-
<source>确定</source>
674-
<translation type="unfinished"></translation>
675-
</message>
676-
<message>
677-
<location filename="../../VirtualKeyboardSettingsDialog.cpp" line="115"/>
678-
<source>取消</source>
679-
<translation type="unfinished"></translation>
680-
</message>
681-
</context>
682604
<context>
683605
<name>MainWindow</name>
684606
<message>

‎App/Client/mainwindow.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,15 +490,15 @@ int MainWindow::Initial()
490490
m_pRecentMenu->addRecentFile(it->GetFile(), it->szName, it->icon);
491491
}
492492
m_pRecentMenu->slotShowFileEixst(
493-
m_Parameter.GetGlobalParameters()->GetSaveSettingsType() == CParameterGlobal::Local);
493+
m_Parameter.GetGlobalParameters()->GetSaveSettingsType() == CParameterGlobal::File);
494494
bool check = connect(
495495
m_Parameter.GetGlobalParameters(),
496496
&CParameterGlobal::sigSaveSettingsTypeChanged,
497497
m_pRecentMenu, [this]() {
498498
if(!(m_pRecentMenu && m_Parameter.GetGlobalParameters()))
499499
return;
500500
m_pRecentMenu->slotShowFileEixst(
501-
m_Parameter.GetGlobalParameters()->GetSaveSettingsType() == CParameterGlobal::Local);
501+
m_Parameter.GetGlobalParameters()->GetSaveSettingsType() == CParameterGlobal::File);
502502
});
503503
Q_ASSERT(check);
504504
}

‎Plugins/FreeRDP/Client/DlgGetUserPasswordFreeRDP.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<property name="sizeHint" stdset="0">
8181
<size>
8282
<width>20</width>
83-
<height>40</height>
83+
<height>0</height>
8484
</size>
8585
</property>
8686
</spacer>

‎Plugins/FreeRDP/Client/DlgSetFreeRDP.ui‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>600</width>
10-
<height>500</height>
10+
<height>528</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -249,7 +249,7 @@
249249
<property name="sizeHint" stdset="0">
250250
<size>
251251
<width>20</width>
252-
<height>40</height>
252+
<height>0</height>
253253
</size>
254254
</property>
255255
</spacer>
@@ -293,7 +293,7 @@
293293
<property name="sizeHint" stdset="0">
294294
<size>
295295
<width>20</width>
296-
<height>131</height>
296+
<height>0</height>
297297
</size>
298298
</property>
299299
</spacer>
@@ -448,9 +448,9 @@
448448
<property name="geometry">
449449
<rect>
450450
<x>0</x>
451-
<y>0</y>
451+
<y>-100</y>
452452
<width>544</width>
453-
<height>485</height>
453+
<height>524</height>
454454
</rect>
455455
</property>
456456
<layout class="QGridLayout" name="gridLayout_12">
@@ -623,7 +623,7 @@
623623
</property>
624624
<property name="sizeHint" stdset="0">
625625
<size>
626-
<width>40</width>
626+
<width>20</width>
627627
<height>20</height>
628628
</size>
629629
</property>

‎Plugins/FreeRDP/Client/Resource/Translations/FreeRDP_zh_CN.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,8 @@ Please look at the OpenSSL documentation on how to add a private CA to the store
257257
<context>
258258
<name>CConnectLayerQTcpSocket</name>
259259
<message>
260-
<location filename="../../ConnectLayerQTcpSocket.cpp" line="57"/>
261260
<source>The server is empty, please input it</source>
262-
<translation>服务器为空，请输入</translation>
261+
<translation type="vanished">服务器为空，请输入</translation>
263262
</message>
264263
</context>
265264
<context>
@@ -739,14 +738,12 @@ Please look at the OpenSSL documentation on how to add a private CA to the store
739738
<context>
740739
<name>ConnectLayerSSHTunnel</name>
741740
<message>
742-
<location filename="../../ConnectLayerSSHTunnel.cpp" line="46"/>
743741
<source>The server is empty, please input it</source>
744-
<translation>服务器为空，请输入</translation>
742+
<translation type="vanished">服务器为空，请输入</translation>
745743
</message>
746744
<message>
747-
<location filename="../../ConnectLayerSSHTunnel.cpp" line="48"/>
748745
<source>Error</source>
749-
<translation>错误</translation>
746+
<translation type="vanished">错误</translation>
750747
</message>
751748
</context>
752749
<context>

‎Plugins/FreeRDP/Client/Resource/Translations/FreeRDP_zh_TW.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,8 @@ Please look at the OpenSSL documentation on how to add a private CA to the store
257257
<context>
258258
<name>CConnectLayerQTcpSocket</name>
259259
<message>
260-
<location filename="../../ConnectLayerQTcpSocket.cpp" line="57"/>
261260
<source>The server is empty, please input it</source>
262-
<translation>服務器為空，請輸入</translation>
261+
<translation type="vanished">服務器為空，請輸入</translation>
263262
</message>
264263
</context>
265264
<context>
@@ -739,14 +738,12 @@ Please look at the OpenSSL documentation on how to add a private CA to the store
739738
<context>
740739
<name>ConnectLayerSSHTunnel</name>
741740
<message>
742-
<location filename="../../ConnectLayerSSHTunnel.cpp" line="46"/>
743741
<source>The server is empty, please input it</source>
744-
<translation>服務器為空，請輸入</translation>
742+
<translation type="vanished">服務器為空，請輸入</translation>
745743
</message>
746744
<message>
747-
<location filename="../../ConnectLayerSSHTunnel.cpp" line="48"/>
748745
<source>Error</source>
749-
<translation>錯誤</translation>
746+
<translation type="vanished">錯誤</translation>
750747
</message>
751748
</context>
752749
<context>

‎Plugins/FtpServer/DlgSettings.ui‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
</property>
140140
<property name="sizeHint" stdset="0">
141141
<size>
142-
<width>40</width>
142+
<width>20</width>
143143
<height>20</height>
144144
</size>
145145
</property>
@@ -198,7 +198,7 @@
198198
</property>
199199
<property name="sizeHint" stdset="0">
200200
<size>
201-
<width>40</width>
201+
<width>20</width>
202202
<height>20</height>
203203
</size>
204204
</property>

0 commit comments

Comments
 (0)