v9.29.1

优化粘贴等处理逻辑
aoyiduo · Oct 22, 2023 · c9b8694 · c9b8694
1 parent f3978ce
commit c9b8694
Show file tree

Hide file tree

Showing 21 changed files with 173 additions and 30 deletions.
diff --git a/README-zh.md b/README-zh.md
@@ -39,7 +39,7 @@
 
 
 ## 仓库模块说明
-客户端代码已经全部开源，其所依赖的第三方代码均来自GitHub或CodeProject或其它开放社区，部份模块来自[WoVNC](http://wovnc.com)。
+客户端代码已经全部开源(除kxver版本控制模块外)，其所依赖的第三方代码均来自GitHub或CodeProject或其它开放社区，部份模块来自[WoVNC](http://wovnc.com)。
 
 ## WoVNCServer
 推荐使用[WoVNCServer](http://www.wovnc.com)服务端，开启更多高级特性。
@@ -59,10 +59,9 @@
 <div>剧本<br><img src="doc/playbook.gif"></div>
 <div>选项卡合并及分离<br><img src="doc/merge.gif"></div>
 <div>云同步<br><img src="doc/sync.gif"></div>
-<div>管理员登录<br><img src="doc/main2.png"/></div>
-<div>关键字搜索<br><img src="doc/search.gif"/></div>
+<div>关键字搜索<br><img src="doc/filter.gif"/></div>
 <div>SFTP的上传下载<br><img src="doc/sftp.gif"/></div>
 <div>选项卡浮动<br><img src="doc/float.gif"/></div>
 <div>窗口分割<br><img src="doc/split.gif"/></div>
-<div>终端配色表<br><img src="doc/color.gif"/></div>
-<div>VNC终端<br><img src="doc/vnc.png"/></div>
+<div>终端配色表<br><img src="doc/patten.gif"/></div>
+<div>VNC终端<br><img src="doc/vnc.gif"/></div>
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Unlimited backup history and differential merging, addition, deletion, and repla
 
 
 ## Module description
-The client code has been completely open source, and the third-party code which comes from GitHub or CodeProject or other open communities. Some modules come from [WoVNC](http://wovnc.com).
+The client code has been completely open source(except for the kxver version control module), and the third-party code which comes from GitHub or CodeProject or other open communities. Some modules come from [WoVNC](http://wovnc.com).
 
 ## WoVNCServer
 [WoVNCServer](http://www.wovnc.com) is recommended, The server enables more advanced features.
@@ -60,10 +60,9 @@ The client code has been completely open source, and the third-party code which
 <div>Playbook<br><img src="doc/playbook.gif"></div>
 <div>Merge and seperate<br><img src="doc/merge.gif"></div>
 <div>Cloud sync<br><img src="doc/sync.gif"></div>
-<div>Administrator<br><img src="doc/main2.png"/></div>
-<div>Keyword filter<br><img src="doc/search.gif"/></div>
+<div>Keyword filter<br><img src="doc/filter.gif"/></div>
 <div>File transfer<br><img src="doc/sftp.gif"/></div>
 <div>Tab float<br><img src="doc/float.gif"/></div>
 <div>window split<br><img src="doc/split.gif"/></div>
-<div>terminal theme<br><img src="doc/color.gif"/></div>
-<div>VNC terminal<br><img src="doc/vnc.png"/></div>
+<div>terminal theme<br><img src="doc/patten.gif"/></div>
+<div>VNC terminal<br><img src="doc/vnc.gif"/></div>
diff --git a/doc/filter.gif b/doc/filter.gif
diff --git a/doc/float.gif b/doc/float.gif
diff --git a/doc/introduce.txt b/doc/introduce.txt
diff --git a/doc/merge.gif b/doc/merge.gif
diff --git a/doc/patten.gif b/doc/patten.gif
diff --git a/doc/playbook.gif b/doc/playbook.gif
diff --git a/doc/rdp.gif b/doc/rdp.gif
diff --git a/doc/sftp.gif b/doc/sftp.gif
diff --git a/doc/skins.png b/doc/skins.png
diff --git a/doc/split.gif b/doc/split.gif
diff --git a/doc/sync.gif b/doc/sync.gif
diff --git a/doc/vnc.gif b/doc/vnc.gif
diff --git a/kxterm/qkxtermitem.cpp b/kxterm/qkxtermitem.cpp
@@ -705,9 +705,32 @@ void QKxTermItem::tryToPaste()
     /***
      *    No longer trying to convert line breaks for different platforms.
      *    If there are any issues, the user will fix them themselves.
+     *
+     *       clipTxt = clipTxt.replace("\r\n", "\n");
+     *       clipTxt += "\r\naaaabbbb\r\nccccc\r1111\r2222\n3\n4\n\tdddddd5\r\n64541\r\r\n3\r\r\r";
+     *
      ***/
-    // clipTxt = clipTxt.replace("\r\n", "\n");
-    pastePlainText(clipTxt);
+
+    QString out;
+    for(int i = 0; i < clipTxt.length(); i++) {
+        QChar c = clipTxt[i];
+        if(c == '\r') {
+            if((i+1) < clipTxt.length()) {
+                if(clipTxt.at(i+1) != '\n') {
+                    out.append('\n');
+                }else{
+                    out.append(c);
+                }
+            }else if((i+1) == clipTxt.length()){
+                out.append('\n');
+            }else{
+                out.append(c);
+            }
+        }else{
+            out.append(c);
+        }
+    }
+    pastePlainText(out);
 #else
     //vim / vi:  it is very bad  on local terminal.
     clipTxt = clipTxt.replace("\r\n", "\n");

diff --git a/private/languages/woterm_zh.ts b/private/languages/woterm_zh.ts
@@ -1710,25 +1710,25 @@
 <context>
     <name>QKxLicense</name>
     <message>
-        <location filename="../../kxver/qkxlicense.cpp" line="98"/>
-        <location filename="../../kxver/qkxlicense.cpp" line="106"/>
-        <location filename="../../kxver/qkxlicense.cpp" line="112"/>
-        <location filename="../../kxver/qkxlicense.cpp" line="133"/>
+        <location filename="../../kxver/qkxlicense.cpp" line="101"/>
+        <location filename="../../kxver/qkxlicense.cpp" line="109"/>
+        <location filename="../../kxver/qkxlicense.cpp" line="115"/>
+        <location filename="../../kxver/qkxlicense.cpp" line="136"/>
         <source>failed to verify the license key</source>
         <translation>校验许可证失败</translation>
     </message>
     <message>
-        <location filename="../../kxver/qkxlicense.cpp" line="123"/>
+        <location filename="../../kxver/qkxlicense.cpp" line="126"/>
         <source>The current version is lower and does not support this license key. Please upgrade to the latest version.</source>
         <translation>当前版本较低，不支持该版本的许可证，请升级至最新版本。</translation>
     </message>
     <message>
-        <location filename="../../kxver/qkxlicense.cpp" line="129"/>
+        <location filename="../../kxver/qkxlicense.cpp" line="132"/>
         <source>failed to extract the license key information</source>
         <translation>无法提取许可证信息</translation>
     </message>
     <message>
-        <location filename="../../kxver/qkxlicense.cpp" line="178"/>
+        <location filename="../../kxver/qkxlicense.cpp" line="200"/>
         <source>the license key information is not match the local device.</source>
         <translation>许可证信息与本地设备不匹配。</translation>
     </message>
@@ -1966,12 +1966,12 @@
 <context>
     <name>QKxTermItem</name>
     <message>
-        <location filename="../../kxterm/qkxtermitem.cpp" line="591"/>
+        <location filename="../../kxterm/qkxtermitem.cpp" line="592"/>
         <source>In read-only mode, no commands can be executed.</source>
         <translation>在只读模式下，不能执行任何命令。</translation>
     </message>
     <message>
-        <location filename="../../kxterm/qkxtermitem.cpp" line="595"/>
+        <location filename="../../kxterm/qkxtermitem.cpp" line="596"/>
         <source>There are no conditions for executing commands in the current state.</source>
         <translation>在当前状态下不存在执行命令的条件。</translation>
     </message>
@@ -2910,7 +2910,12 @@
         <translation>最新版本：</translation>
     </message>
     <message>
-        <location filename="../../woterm/qwoaboutdialog.ui" line="207"/>
+        <location filename="../../woterm/qwoaboutdialog.ui" line="168"/>
+        <source>Build time:</source>
+        <translation>构建时间：</translation>
+    </message>
+    <message>
+        <location filename="../../woterm/qwoaboutdialog.ui" line="243"/>
         <source>C</source>
         <translation>C</translation>
     </message>
@@ -2924,12 +2929,12 @@
         <translation>官网：</translation>
     </message>
     <message>
-        <location filename="../../woterm/qwoaboutdialog.ui" line="197"/>
+        <location filename="../../woterm/qwoaboutdialog.ui" line="233"/>
         <source>OfficeWeb</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../woterm/qwoaboutdialog.ui" line="204"/>
+        <location filename="../../woterm/qwoaboutdialog.ui" line="240"/>
         <source>Check Version</source>
         <translation>检查版本</translation>
     </message>
@@ -7079,9 +7084,13 @@ Please input password to activate it.</source>
         <translation>按十六进制字符串分割</translation>
     </message>
     <message>
-        <location filename="../../woterm/qwoserialinput.cpp" line="254"/>
         <source>Latin1 hex string</source>
-        <translation>Latin1十六进制字符串</translation>
+        <translation type="vanished">Latin1十六进制字符串</translation>
+    </message>
+    <message>
+        <location filename="../../woterm/qwoserialinput.cpp" line="254"/>
+        <source>Ansi hex string</source>
+        <translation>Ansi十六进制字符串</translation>
     </message>
     <message>
         <location filename="../../woterm/qwoserialinput.cpp" line="255"/>

diff --git a/woterm/CMakeLists.txt b/woterm/CMakeLists.txt
@@ -15,6 +15,9 @@ if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()
 
+string(TIMESTAMP WOTERM_BUILD_TIME UTC)
+add_definitions(-DWOTERM_BUILD_TIME="${WOTERM_BUILD_TIME}")
+
 find_package(Qt5 COMPONENTS Core Gui Widgets Qml Quick QuickControls2 Xml Charts QuickWidgets SerialPort LinguistTools REQUIRED)
 find_package(Qt5Core CONFIG REQUIRED Private)
 find_package(Qt5Gui CONFIG REQUIRED Private)

diff --git a/woterm/qwoaboutdialog.cpp b/woterm/qwoaboutdialog.cpp
@@ -64,6 +64,7 @@ QWoAboutDialog::QWoAboutDialog(QWidget *parent) :
     http->get("http://down.woterm.com/.ver");
     adjustSize();
 
+    ui->buildTime->setText(WOTERM_BUILD_TIME);
 #ifdef QT_DEBUG
     ui->btnOfficeWeb->setEnabled(false);
 #else

diff --git a/woterm/qwoaboutdialog.ui b/woterm/qwoaboutdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>318</width>
-    <height>260</height>
+    <width>350</width>
+    <height>231</height>
    </rect>
   </property>
   <property name="maximumSize">
@@ -160,6 +160,42 @@
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_7">
+     <item>
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Build time:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="buildTime">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::RichText</enum>
+       </property>
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item>
     <widget class="Line" name="line">
      <property name="minimumSize">

diff --git a/woterm/qwoserialinput.cpp b/woterm/qwoserialinput.cpp
@@ -251,7 +251,7 @@ QWoSerialInput::QWoSerialInput(QWoTermWidget *term, QWidget *parent)
     {
         QStringList items;
         items.append(tr("No filter"));
-        items.append(tr("Latin1 hex string"));
+        items.append(tr("Ansi hex string"));
         items.append(tr("Unicode hex string"));
         ui->modeOutput->setModel(new QStringListModel(items, ui->modeOutput));
         int type = QWoSetting::value("serialPort/outputType", 0).toInt();

diff --git a/woterm/version.h b/woterm/version.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define WOTERM_VERSION     ("9.29.0")
+#define WOTERM_VERSION     ("9.29.1")
 #define NOISE