diff --git a/network-service-plugin/dde-network-secret-dialog/CMakeLists.txt b/network-service-plugin/dde-network-secret-dialog/CMakeLists.txt index d142dcbfc..d655b1ccd 100644 --- a/network-service-plugin/dde-network-secret-dialog/CMakeLists.txt +++ b/network-service-plugin/dde-network-secret-dialog/CMakeLists.txt @@ -30,6 +30,7 @@ set(Dnetwork_Secret_Dialog_Libraries add_executable(${Dnetwork_Secret_Dialog_Name} ${Dnetwork_Secret_Dialog_SRCS} main.cpp + qrc/dde-network-secret-dialog.qrc ) target_include_directories(${Dnetwork_Secret_Dialog_Name} PUBLIC diff --git a/network-service-plugin/dde-network-secret-dialog/networksecretdialog.cpp b/network-service-plugin/dde-network-secret-dialog/networksecretdialog.cpp index ada90ccae..837b0131c 100644 --- a/network-service-plugin/dde-network-secret-dialog/networksecretdialog.cpp +++ b/network-service-plugin/dde-network-secret-dialog/networksecretdialog.cpp @@ -82,9 +82,9 @@ void NetworkSecretDialog::initUI() auto envType = qEnvironmentVariable("XDG_SESSION_TYPE"); bool bWayland = envType.contains("wayland"); if (bWayland) { - setWindowFlags(Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::Dialog); + setWindowFlags(Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::Tool); } else { - setWindowFlags(Qt::WindowStaysOnTopHint | Qt::Dialog); + setWindowFlags(Qt::WindowStaysOnTopHint | Qt::Tool); } setOnButtonClickedClose(false); diff --git a/network-service-plugin/dde-network-secret-dialog/qrc/dde-network-secret-dialog.qrc b/network-service-plugin/dde-network-secret-dialog/qrc/dde-network-secret-dialog.qrc new file mode 100644 index 000000000..62787ac1a --- /dev/null +++ b/network-service-plugin/dde-network-secret-dialog/qrc/dde-network-secret-dialog.qrc @@ -0,0 +1,8 @@ + + + icons/network-vpn_64px.svg + icons/network-wired_64px.svg + icons/notification-network-wireless-full_48px.svg + + + diff --git a/network-service-plugin/dde-network-secret-dialog/qrc/icons/network-vpn_64px.svg b/network-service-plugin/dde-network-secret-dialog/qrc/icons/network-vpn_64px.svg new file mode 100755 index 000000000..be1366777 --- /dev/null +++ b/network-service-plugin/dde-network-secret-dialog/qrc/icons/network-vpn_64px.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/network-service-plugin/dde-network-secret-dialog/qrc/icons/network-wired_64px.svg b/network-service-plugin/dde-network-secret-dialog/qrc/icons/network-wired_64px.svg new file mode 100755 index 000000000..1aaf9220d --- /dev/null +++ b/network-service-plugin/dde-network-secret-dialog/qrc/icons/network-wired_64px.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/network-service-plugin/dde-network-secret-dialog/qrc/icons/notification-network-wireless-full_48px.svg b/network-service-plugin/dde-network-secret-dialog/qrc/icons/notification-network-wireless-full_48px.svg new file mode 100755 index 000000000..0d997ec25 --- /dev/null +++ b/network-service-plugin/dde-network-secret-dialog/qrc/icons/notification-network-wireless-full_48px.svg @@ -0,0 +1,37 @@ + + + status/48/notification-network-wireless-full + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file