packages/kylin-nm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!16 Change window opacity in function paintEvent

Browse Source 
From: @hua_yadong 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2022-03-29 07:27:51 +00:00 committed by Gitee
commit dff8f8f267
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 4 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
0001-fix-bug-closing-settings-window-causes-the-main-proc.patch
View File

@ -1,198 +0,0 @@
From bec5f07f273ec5427730c13a9c64cd5b24d2c3ac Mon Sep 17 00:00:00 2001
From: dou33 <johnwo3396@hotmail.com>
Date: Thu, 28 Oct 2021 14:48:57 +0800
Subject: [PATCH] fix bug closing settings window causes the main process to
exit
---
src/confform.cpp | 14 +++++++++++++-
src/confform.h | 3 ++-
src/confform.ui | 3 +++
src/mainwindow.cpp | 5 ++++-
wireless-security/dlgconnhidwifi.cpp | 6 ++++--
wireless-security/dlgconnhidwifiwpa.cpp | 4 +++-
6 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/confform.cpp b/src/confform.cpp
index a83fc34..d62cbb4 100755
--- a/src/confform.cpp
+++ b/src/confform.cpp
@@ -30,7 +30,7 @@
extern QString llname, lwname;
ConfForm::ConfForm(QWidget *parent) :
- QWidget(parent),
+ QDialog(parent),
ui(new Ui::ConfForm)
{
ui->setupUi(this);
@@ -92,6 +92,12 @@ ConfForm::ConfForm(QWidget *parent) :
// ui->btnCancel->setStyleSheet(btnOffQss);
// ui->btnOk->setStyleSheet(btnOnQss);
// ui->btnCreate->setStyleSheet(btnOnQss);
+ ui->leAddr->setContextMenuPolicy(Qt::NoContextMenu);
+ ui->leName->setContextMenuPolicy(Qt::NoContextMenu);
+ ui->leDns->setContextMenuPolicy(Qt::NoContextMenu);
+ ui->leDns2->setContextMenuPolicy(Qt::NoContextMenu);
+ ui->leGateway->setContextMenuPolicy(Qt::NoContextMenu);
+
ui->lineUp->setStyleSheet(lineQss);
ui->lineDown->setStyleSheet(lineQss);
ui->lineUp->hide();
@@ -148,6 +154,7 @@ void ConfForm::mousePressEvent(QMouseEvent *event)
this->dragPos = event->globalPos();
event->accept();
}
+ return QDialog::mousePressEvent(event);
}
void ConfForm::mouseReleaseEvent(QMouseEvent *event)
{
@@ -159,6 +166,7 @@ void ConfForm::mouseMoveEvent(QMouseEvent *event)
this->move(this->winPos - (this->dragPos - event->globalPos()));
event->accept();
}
+ return QDialog::mouseMoveEvent(event);
}
//网络配置参数设置界面的显示内容
@@ -213,6 +221,7 @@ void ConfForm::on_btnCreate_clicked()
if (mIfname == "") {
QString tip(tr("Can not create new wired network for without wired card"));
kylindbus.showDesktopNotify(tip);
+ //this->close();
this->hide();
return;
}
@@ -231,6 +240,7 @@ void ConfForm::on_btnCreate_clicked()
kylindbus.showDesktopNotify(txt);
}
+ //this->close();
this->hide();
}
@@ -265,6 +275,7 @@ void ConfForm::on_btnOk_clicked()
KylinDBus kylindbus;
+ //this->close();
this->hide();
QString txt(tr("New network settings already finished"));
@@ -293,6 +304,7 @@ void ConfForm::on_btnOk_clicked()
//点击取消按钮
void ConfForm::on_btnCancel_clicked()
{
+ //this->close();
this->hide();
}
diff --git a/src/confform.h b/src/confform.h
index e29cdd2..b40d2c2 100755
--- a/src/confform.h
+++ b/src/confform.h
@@ -25,13 +25,14 @@
#include <QPoint>
#include <QPainter>
#include <QPainterPath>
+#include <QDialog>
#include <QListView>
namespace Ui {
class ConfForm;
}
-class ConfForm : public QWidget
+class ConfForm : public QDialog
{
Q_OBJECT
diff --git a/src/confform.ui b/src/confform.ui
index 3b117a5..a312a94 100755
--- a/src/confform.ui
+++ b/src/confform.ui
@@ -13,6 +13,9 @@
<property name="windowTitle">
<string/>
</property>
+ <property name="toolTip">
+ <string/>
+ </property>
<widget class="QWidget" name="centralWidget" native="true">
<property name="geometry">
<rect>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 78fa74f..7d9bfdf 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -84,6 +84,7 @@ MainWindow::MainWindow(QWidget *parent) :
objNetSpeed = new NetworkSpeed();
+ QApplication::setQuitOnLastWindowClosed(false);
this->confForm = new ConfForm();
this->ksnm = new KSimpleNM();
@@ -1868,10 +1869,12 @@ void MainWindow::onBtnCreateNetClicked()
primaryGeometry = qApp->primaryScreen()->geometry();
}
+ QApplication::setQuitOnLastWindowClosed(false);
ConfForm *m_cf = new ConfForm();
+ m_cf->setAttribute(Qt::WA_DeleteOnClose);
m_cf->cbTypeChanged(3);
m_cf->move(primaryGeometry.width() / 2 - m_cf->width() / 2, primaryGeometry.height() / 2 - m_cf->height() / 2);
- m_cf->show();
+ m_cf->exec();
}
diff --git a/wireless-security/dlgconnhidwifi.cpp b/wireless-security/dlgconnhidwifi.cpp
index 7cb1f75..f38a88f 100755
--- a/wireless-security/dlgconnhidwifi.cpp
+++ b/wireless-security/dlgconnhidwifi.cpp
@@ -230,7 +230,8 @@ void DlgConnHidWifi::changeWindow(){
void DlgConnHidWifi::on_btnCancel_clicked()
{
- this->close();
+ //this->close();
+ this->hide();
}
void DlgConnHidWifi::on_btnConnect_clicked()
@@ -276,7 +277,8 @@ void DlgConnHidWifi::on_btnConnect_clicked()
connect(this, SIGNAL(sendMessage()), this,SLOT(emitSignal() ));
QTimer::singleShot(4*1000, this, SLOT(emitSignal() ));
}
- this->close();
+ //this->close();
+ this->hide();
}
void DlgConnHidWifi::on_leNetName_textEdited(const QString &arg1)
diff --git a/wireless-security/dlgconnhidwifiwpa.cpp b/wireless-security/dlgconnhidwifiwpa.cpp
index 022df7f..6457463 100755
--- a/wireless-security/dlgconnhidwifiwpa.cpp
+++ b/wireless-security/dlgconnhidwifiwpa.cpp
@@ -244,7 +244,8 @@ void DlgConnHidWifiWpa::changeWindow()
void DlgConnHidWifiWpa::on_btnCancel_clicked()
{
- this->close();
+ //this->close();
+ this->hide();
}
void DlgConnHidWifiWpa::on_btnConnect_clicked()
@@ -289,6 +290,7 @@ void DlgConnHidWifiWpa::on_btnConnect_clicked()
QTimer::singleShot(4*1000, this, SLOT(emitSignal() ));
}
this->close();
+ this->hide();
}
void DlgConnHidWifiWpa::on_checkBoxPwd_stateChanged(int arg1)
--
2.24.3 (Apple Git-128)

144
Fix-bug-closing-the-settings-window-causes-the-main-process-to-exit-2.patch
View File

@ -1,144 +0,0 @@
From f70832dd27e37657c19b1d8002c460cfa034eb3c Mon Sep 17 00:00:00 2001
From: huayadong <huayadong@kylinos.cn>
Date: Tue, 7 Dec 2021 17:40:44 +0800
Subject: [PATCH] xxxxxx
---
debian/changelog | 6 ------
debian/source/format | 2 +-
src/confform.cpp | 10 +---------
src/confform.h | 3 +--
src/confform.ui | 3 ---
src/mainwindow.cpp | 3 +--
src/utils.cpp | 2 +-
7 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d0582f3..c4b66aa 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-kylin-nm (3.0.1-1+1026) focal; urgency=medium
-
- * Daily build.
-
- -- liuliang <liuliang@ubuntukylin.com> Mon, 27 May 2019 15:48:18 +0800
-
kylin-nm (3.0.1-1) unstable; urgency=medium
* New upstream bugfix release.
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100755
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff --git a/src/confform.cpp b/src/confform.cpp
index d62cbb4..f0c04ce 100755
--- a/src/confform.cpp
+++ b/src/confform.cpp
@@ -30,7 +30,7 @@
extern QString llname, lwname;
ConfForm::ConfForm(QWidget *parent) :
- QDialog(parent),
+ QWidget(parent),
ui(new Ui::ConfForm)
{
ui->setupUi(this);
@@ -92,12 +92,6 @@ ConfForm::ConfForm(QWidget *parent) :
// ui->btnCancel->setStyleSheet(btnOffQss);
// ui->btnOk->setStyleSheet(btnOnQss);
// ui->btnCreate->setStyleSheet(btnOnQss);
- ui->leAddr->setContextMenuPolicy(Qt::NoContextMenu);
- ui->leName->setContextMenuPolicy(Qt::NoContextMenu);
- ui->leDns->setContextMenuPolicy(Qt::NoContextMenu);
- ui->leDns2->setContextMenuPolicy(Qt::NoContextMenu);
- ui->leGateway->setContextMenuPolicy(Qt::NoContextMenu);
-
ui->lineUp->setStyleSheet(lineQss);
ui->lineDown->setStyleSheet(lineQss);
ui->lineUp->hide();
@@ -154,7 +148,6 @@ void ConfForm::mousePressEvent(QMouseEvent *event)
this->dragPos = event->globalPos();
event->accept();
}
- return QDialog::mousePressEvent(event);
}
void ConfForm::mouseReleaseEvent(QMouseEvent *event)
{
@@ -166,7 +159,6 @@ void ConfForm::mouseMoveEvent(QMouseEvent *event)
this->move(this->winPos - (this->dragPos - event->globalPos()));
event->accept();
}
- return QDialog::mouseMoveEvent(event);
}
//网络配置参数设置界面的显示内容
diff --git a/src/confform.h b/src/confform.h
index b40d2c2..e29cdd2 100755
--- a/src/confform.h
+++ b/src/confform.h
@@ -25,14 +25,13 @@
#include <QPoint>
#include <QPainter>
#include <QPainterPath>
-#include <QDialog>
#include <QListView>
namespace Ui {
class ConfForm;
}
-class ConfForm : public QDialog
+class ConfForm : public QWidget
{
Q_OBJECT
diff --git a/src/confform.ui b/src/confform.ui
index a312a94..3b117a5 100755
--- a/src/confform.ui
+++ b/src/confform.ui
@@ -13,9 +13,6 @@
<property name="windowTitle">
<string/>
</property>
- <property name="toolTip">
- <string/>
- </property>
<widget class="QWidget" name="centralWidget" native="true">
<property name="geometry">
<rect>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7d9bfdf..6461855 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1871,10 +1871,9 @@ void MainWindow::onBtnCreateNetClicked()
QApplication::setQuitOnLastWindowClosed(false);
ConfForm *m_cf = new ConfForm();
- m_cf->setAttribute(Qt::WA_DeleteOnClose);
m_cf->cbTypeChanged(3);
m_cf->move(primaryGeometry.width() / 2 - m_cf->width() / 2, primaryGeometry.height() / 2 - m_cf->height() / 2);
- m_cf->exec();
+ m_cf->show();
}
diff --git a/src/utils.cpp b/src/utils.cpp
index f5b2bd2..7821508 100755
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -83,7 +83,7 @@ void Utils::onRequestSendDesktopNotify(QString message)
QList<QVariant> args;
args<<(QCoreApplication::applicationName())
<<((unsigned int) 0)
- <<QString("/usr/share/icons/ukui-icon-theme-default/22x22/devices/network-wired.png")
+ <<QString("qweq")
<<tr("kylin network applet desktop message") //显示的是什么类型的信息
<<message //显示的具体信息
<<QStringList()
--
2.30.0

12
fix-desktop-notification-window-show-error.patch
View File

@ -1,12 +0,0 @@
diff -Naur kylin-nm-3.0.2/src/utils.cpp kylin-nm-3.0.2~/src/utils.cpp
--- kylin-nm-3.0.2/src/utils.cpp 2019-05-27 15:48:18.000000000 +0800
+++ kylin-nm-3.0.2~/src/utils.cpp 2021-10-26 14:59:00.660899943 +0800
@@ -83,7 +83,7 @@
QList<QVariant> args;
args<<(QCoreApplication::applicationName())
<<((unsigned int) 0)
- <<QString("qweq")
+ <<QString("/usr/share/icons/ukui-icon-theme-default/22x22/devices/network-wired.png")
<<tr("kylin network applet desktop message") //显示的是什么类型的信息
<<message //显示的具体信息
<<QStringList()

BIN
kylin-nm-3.0.2.tar.gz
View File

Binary file not shown.

135
kylin-nm-right-click-menu-in-Chinese-editing-network-settings.patch
View File

@ -1,135 +0,0 @@
From e7bc75d3a9334f56ff0906ad98cbff148b0a5c57 Mon Sep 17 00:00:00 2001
From: huayadong <huayadong@kylinos.cn>
Date: Fri, 10 Dec 2021 10:37:51 +0800
Subject: [PATCH] right click menu in Chinese editing network settings
---
src/confform.cpp | 10 +++++++++-
src/confform.h | 3 ++-
src/confform.ui | 3 +++
src/mainwindow.cpp | 3 ++-
src/oneconnform.cpp | 2 +-
src/onelancform.cpp | 2 +-
6 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/confform.cpp b/src/confform.cpp
index f0c04ce..d62cbb4 100755
--- a/src/confform.cpp
+++ b/src/confform.cpp
@@ -30,7 +30,7 @@
extern QString llname, lwname;
ConfForm::ConfForm(QWidget *parent) :
- QWidget(parent),
+ QDialog(parent),
ui(new Ui::ConfForm)
{
ui->setupUi(this);
@@ -92,6 +92,12 @@ ConfForm::ConfForm(QWidget *parent) :
// ui->btnCancel->setStyleSheet(btnOffQss);
// ui->btnOk->setStyleSheet(btnOnQss);
// ui->btnCreate->setStyleSheet(btnOnQss);
+ ui->leAddr->setContextMenuPolicy(Qt::NoContextMenu);
+ ui->leName->setContextMenuPolicy(Qt::NoContextMenu);
+ ui->leDns->setContextMenuPolicy(Qt::NoContextMenu);
+ ui->leDns2->setContextMenuPolicy(Qt::NoContextMenu);
+ ui->leGateway->setContextMenuPolicy(Qt::NoContextMenu);
+
ui->lineUp->setStyleSheet(lineQss);
ui->lineDown->setStyleSheet(lineQss);
ui->lineUp->hide();
@@ -148,6 +154,7 @@ void ConfForm::mousePressEvent(QMouseEvent *event)
this->dragPos = event->globalPos();
event->accept();
}
+ return QDialog::mousePressEvent(event);
}
void ConfForm::mouseReleaseEvent(QMouseEvent *event)
{
@@ -159,6 +166,7 @@ void ConfForm::mouseMoveEvent(QMouseEvent *event)
this->move(this->winPos - (this->dragPos - event->globalPos()));
event->accept();
}
+ return QDialog::mouseMoveEvent(event);
}
//网络配置参数设置界面的显示内容
diff --git a/src/confform.h b/src/confform.h
index e29cdd2..b40d2c2 100755
--- a/src/confform.h
+++ b/src/confform.h
@@ -25,13 +25,14 @@
#include <QPoint>
#include <QPainter>
#include <QPainterPath>
+#include <QDialog>
#include <QListView>
namespace Ui {
class ConfForm;
}
-class ConfForm : public QWidget
+class ConfForm : public QDialog
{
Q_OBJECT
diff --git a/src/confform.ui b/src/confform.ui
index 3b117a5..a312a94 100755
--- a/src/confform.ui
+++ b/src/confform.ui
@@ -13,6 +13,9 @@
<property name="windowTitle">
<string/>
</property>
+ <property name="toolTip">
+ <string/>
+ </property>
<widget class="QWidget" name="centralWidget" native="true">
<property name="geometry">
<rect>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6461855..7d9bfdf 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1871,9 +1871,10 @@ void MainWindow::onBtnCreateNetClicked()
QApplication::setQuitOnLastWindowClosed(false);
ConfForm *m_cf = new ConfForm();
+ m_cf->setAttribute(Qt::WA_DeleteOnClose);
m_cf->cbTypeChanged(3);
m_cf->move(primaryGeometry.width() / 2 - m_cf->width() / 2, primaryGeometry.height() / 2 - m_cf->height() / 2);
- m_cf->show();
+ m_cf->exec();
}
diff --git a/src/oneconnform.cpp b/src/oneconnform.cpp
index aa6a97d..fde19c4 100755
--- a/src/oneconnform.cpp
+++ b/src/oneconnform.cpp
@@ -653,7 +653,7 @@ void OneConnForm::on_btnInfo_clicked()
cf->setProp(ui->lbName->text(), v4method, addr, mask, gateway, dns, this->isActive);
cf->move(primaryGeometry.width() / 2 - cf->width() / 2, primaryGeometry.height() / 2 - cf->height() / 2);
- cf->show();
+ cf->exec();
cf->raise();
bt->deleteLater();
diff --git a/src/onelancform.cpp b/src/onelancform.cpp
index 5dd6634..3d03baf 100755
--- a/src/onelancform.cpp
+++ b/src/onelancform.cpp
@@ -373,7 +373,7 @@ void OneLancForm::on_btnInfo_clicked()
connect(cf, SIGNAL(requestRefreshLanList(int)), mw, SLOT(onBtnNetListClicked(int)));
cf->move(primaryGeometry.width() / 2 - cf->width() / 2, primaryGeometry.height() / 2 - cf->height() / 2);
- cf->show();
+ cf->exec();
cf->raise();
cf->activateWindow();
}
--
2.30.0

14
kylin-nm.spec
View File

@ -1,16 +1,11 @@
Name: kylin-nm Name: kylin-nm
Version: 3.0.2 Version: 3.0.2
Release: 6 Release: 7
Summary: Gui Applet tool for display and edit network simply Summary: Gui Applet tool for display and edit network simply
License: GPL-3+ License: GPL-3+
URL: https://github.com/ukui/kylin-nm/ URL: https://github.com/ukui/kylin-nm/
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch0: fix-desktop-notification-window-show-error.patch
Patch1: 0001-fix-bug-closing-settings-window-causes-the-main-proc.patch
Patch2: Fix-bug-closing-the-settings-window-causes-the-main-process-to-exit-2.patch
Patch3: kylin-nm-right-click-menu-in-Chinese-editing-network-settings.patch
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
BuildRequires: qtchooser BuildRequires: qtchooser
BuildRequires: qt5-qtscript-devel BuildRequires: qt5-qtscript-devel
@ -29,10 +24,6 @@ Requires: network-manager-applet
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build %build
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-nm.pro %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-nm.pro
@ -59,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/kylin-nm.1.gz %{_mandir}/man1/kylin-nm.1.gz
%changelog %changelog
* Tue Mar 29 2022 huayadong <huayadong@kylinos.cn> - 3.0.2-7
- Change window opacity in function paintEvent
* Fri Dec 10 2021 huayadong <huayadong@kylinos.cn> - 3.0.2-6 * Fri Dec 10 2021 huayadong <huayadong@kylinos.cn> - 3.0.2-6
- add patch:kylin-nm-right-click-menu-in-Chinese-editing-network-settings.patch - add patch:kylin-nm-right-click-menu-in-Chinese-editing-network-settings.patch