Merge branch 'main' of https://github.com/ic005k/Knot

ic005k · Sep 3, 2024 · 7974a12 · 7974a12
2 parents b1590f5 + 93826aa
commit 7974a12
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -40,7 +40,7 @@ jobs:
       # 安装Qt
       - name: Install Qt
         # 使用外部action。这个action专门用来安装Qt
-        uses: jurplel/install-qt-action@v2.13.0
+        uses: jurplel/install-qt-action@v3
         with:
           # Version of Qt to install
           version: ${{ matrix.qt_ver }}

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http:// schemas.android.com/ tools" package="com.x" android:installLocation="auto"
-    android:versionCode="1" android:versionName="1.2.03">
+    android:versionCode="1" android:versionName="1.2.04">
     <!-- The following comment will be replaced upon deployment with default permissions based on
     the dependencies of the application.
          Remove the comment if you do not require these default permissions. -->

diff --git a/src/Comm/ShowMessage.cpp b/src/Comm/ShowMessage.cpp
@@ -70,8 +70,7 @@ bool ShowMessage::eventFilter(QObject* watch, QEvent* evn) {
   }
 
   if (evn->type() == QEvent::MouseButtonPress) {
-    if (ui->btnCancel->isHidden() && ui->btnCopy->isHidden() &&
-        ui->btnOk->isHidden()) {
+    if (btn_count == 0) {
       on_btnCancel_clicked();
     }
 
@@ -111,11 +110,8 @@ void ShowMessage::init() {
 
   int nEditH = mw_one->m_Todo->getEditTextHeight(ui->editMsg);
   int nH = 0;
-  if (!ui->btnCancel->isHidden())
-    nH = nEditH + ui->btnCancel->height() + ui->lblTitle->height() +
-         ui->hframe->height() + 40;
-  else
-    nH = nEditH + ui->lblTitle->height() + ui->hframe->height() + 50;
+  nH = nEditH + ui->btnCancel->height() + ui->lblTitle->height() +
+       ui->hframe->height() + 50;
 
   if (nH > mw_one->height()) nH = mw_one->height() - 10;
   ui->frame->setFixedHeight(nH);
@@ -138,7 +134,7 @@ bool ShowMessage::showMsg(QString title, QString msgtxt, int btnCount) {
   if (btnCount == 0) {
     ui->btnCancel->hide();
     ui->btnCopy->hide();
-    ui->btnOk->hide();
+    ui->btnOk->show();
     ui->btnDel->hide();
   }
   if (btnCount == 1) {
@@ -168,6 +164,8 @@ bool ShowMessage::showMsg(QString title, QString msgtxt, int btnCount) {
     ui->btnDel->show();
   }
 
+  btn_count = btnCount;
+
   ui->lblTitle->setText(title);
   ui->editMsg->setText(msgtxt);
 

diff --git a/src/Comm/ShowMessage.h b/src/Comm/ShowMessage.h
@@ -44,6 +44,7 @@ class ShowMessage : public QDialog {
 
  private:
   void init();
+  int btn_count = 0;
 };
 
 #endif  // SHOWMESSAGE_H
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -6,7 +6,7 @@
 QList<QPointF> PointList;
 QList<double> doubleList;
 
-QString ver = "1.2.03";
+QString ver = "1.2.04";
 QGridLayout *gl1;
 QTreeWidgetItem *parentItem;
 bool isrbFreq = true;

diff --git a/src/MainWindow.ui b/src/MainWindow.ui
@@ -7266,7 +7266,7 @@ QSlider::handle:horizontal:disabled {
      <x>0</x>
      <y>0</y>
      <width>687</width>
-     <height>24</height>
+     <height>27</height>
     </rect>
    </property>
    <property name="styleSheet">