From 571ed351fc4b728189f94f762d87db7660936408 Mon Sep 17 00:00:00 2001 From: huayadong Date: Wed, 29 Jun 2022 14:44:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BB=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E5=92=8C=E4=BB=BB=E5=8A=A1=E6=A0=8F=E4=B9=8B=E9=97=B4=E7=9A=84?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tance-between-mainwindow-and-taskbar.patch | 55 +++++++++++++++++++ kylin-nm.spec | 7 ++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 0001-Change-the-distance-between-mainwindow-and-taskbar.patch diff --git a/0001-Change-the-distance-between-mainwindow-and-taskbar.patch b/0001-Change-the-distance-between-mainwindow-and-taskbar.patch new file mode 100644 index 0000000..3d7c9ca --- /dev/null +++ b/0001-Change-the-distance-between-mainwindow-and-taskbar.patch @@ -0,0 +1,55 @@ +From a1b4df4311e6b75204aec067c716f38a9ad7a830 Mon Sep 17 00:00:00 2001 +From: chenlelin +Date: Tue, 13 Oct 2020 09:12:22 +0800 +Subject: [PATCH] Change the distance between mainwindow and taskbar + +--- + src/mainwindow.cpp | 2 +- + src/oneconnform.cpp | 3 --- + src/onelancform.cpp | 3 --- + 3 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp +index e1d7b74..d74cdb9 100644 +--- a/src/mainwindow.cpp ++++ b/src/mainwindow.cpp +@@ -684,7 +684,7 @@ void MainWindow::handleIconClicked() + + int n = objKyDBus->getTaskBarPos("position"); + int m = objKyDBus->getTaskBarHeight("height"); +- int d = 2; //窗口边沿到任务栏距离 ++ int d = 7; //窗口边沿到任务栏距离 + + if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()) { + if (n == 0) { +diff --git a/src/oneconnform.cpp b/src/oneconnform.cpp +index 05bd127..e6f6bbc 100644 +--- a/src/oneconnform.cpp ++++ b/src/oneconnform.cpp +@@ -83,9 +83,6 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf + // ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}" + // "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}" + // "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}"); +- ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(156,156,156,0.2);}" +- "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(156,156,156,0.3);}" +- "QPushButton:Pressed{border-radius:4px;background-color:rgba(156,156,156,0.1);}"); + ui->btnHideConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}" + "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}" + "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}"); +diff --git a/src/onelancform.cpp b/src/onelancform.cpp +index cf6d46b..b23e387 100644 +--- a/src/onelancform.cpp ++++ b/src/onelancform.cpp +@@ -57,9 +57,6 @@ OneLancForm::OneLancForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf + // ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}" + // "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}" + // "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}"); +- ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(156,156,156,0.2);}" +- "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(156,156,156,0.3);}" +- "QPushButton:Pressed{border-radius:4px;background-color:rgba(156,156,156,0.1);}"); + ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);}"); + ui->lbWaitingIcon->setStyleSheet("QLabel{border:0px;background-color:transparent;}"); + +-- +2.33.0 + diff --git a/kylin-nm.spec b/kylin-nm.spec index 45a422f..9f39f94 100644 --- a/kylin-nm.spec +++ b/kylin-nm.spec @@ -1,10 +1,11 @@ Name: kylin-nm Version: 3.0.2 -Release: 7 +Release: 8 Summary: Gui Applet tool for display and edit network simply License: GPL-3+ URL: https://github.com/ukui/kylin-nm/ Source0: %{name}-%{version}.tar.gz +Patch0: 0001-Change-the-distance-between-mainwindow-and-taskbar.patch BuildRequires: qt5-qtbase-devel BuildRequires: qtchooser @@ -24,6 +25,7 @@ Requires: network-manager-applet %prep %setup -q +%patch0 -p1 %build %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-nm.pro @@ -50,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/kylin-nm.1.gz %changelog +* Wed Jun 29 2022 huayadong - 3.0.2-8 +- Change the distance between mainwindow and taskbar + * Tue Mar 29 2022 huayadong - 3.0.2-7 - Change window opacity in function paintEvent