openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix bug tray memu show wrong position when right click tray icon

This commit is contained in:
chenlelin 2020-03-28 21:21:29 +08:00
parent 751cc69db9
commit 113d7657d0
19 changed files with 100 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kylin-dbus-interface.cpp
View File

@ -33,7 +33,7 @@ KylinDBus::KylinDBus(MainWindow *mainWindow, QObject *parent) :QObject(parent)
getPhysicalCarrierState(0); //初始化获取网线插入状态
getLanHwAddressState(); //获取有线网Mac地址
getWiredCardName();
// getWifiSwitchState();
getWifiSwitchState();
QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
QString("/org/freedesktop/NetworkManager"),
@ -188,7 +188,7 @@ void KylinDBus::getLanIp(QString netName)
if (search_key == "id"){
//const QDBusArgument &dbusArg2nd = innerMap.value(inner_key).value<QDBusArgument>();
if (netName == outsideMap.value(search_key).toString()){
qDebug()<<"aaaaaa"<<outsideMap.value(search_key).toString();
// qDebug()<<"aaaaaa"<<outsideMap.value(search_key).toString();
for(QString key : map.keys() ){
QMap<QString,QVariant> innerMap = map.value(key);

89
mainwindow.cpp
View File

@ -54,6 +54,13 @@ MainWindow::MainWindow(QWidget *parent) :
setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
this->setStyleSheet("QWidget{border:none;border-radius:6px;}");
// this->setStyleSheet("QToolTip{background:rgba(26,26,26,0.7);"
// "font: 14px;"
// "color:rgba(255,255,255,1);"
// "border-radius: 3px;"
// "border:1px solid rgba(255,255,255,0.2);"
// "padding: 0px 4px;"
// "outline:none;}");
ui->centralWidget->setStyleSheet("#centralWidget{border:1px solid rgba(255,255,255,0.05);"
"border-radius:6px;background:rgba(19,19,20,0.7);}");
@ -101,15 +108,15 @@ MainWindow::MainWindow(QWidget *parent) :
connect(ui->btnNetList, &QPushButton::clicked, this, &MainWindow::onBtnNetListClicked);
connect(ui->btnWifi, &QPushButton::clicked, this, &MainWindow::onBtnWifiClicked);
auto app = static_cast<QApplication*>(QCoreApplication::instance());
app->setStyle(new CustomStyle());
// auto app = static_cast<QApplication*>(QCoreApplication::instance());
// app->setStyle(new CustomStyle());
ui->btnNetList->setAttribute(Qt::WA_Hover,true);
ui->btnNetList->installEventFilter(this);
ui->btnWifiList->setAttribute(Qt::WA_Hover,true);
ui->btnWifiList->installEventFilter(this);
KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
// KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
}
MainWindow::~MainWindow()
@ -137,7 +144,6 @@ void MainWindow::checkSingle()
bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, long *result)
{
Q_UNUSED(result);
if(eventType != "xcb_generic_event_t"){
return false;
}
@ -559,9 +565,9 @@ void MainWindow::createTrayIcon()
trayIconMenu = new QMenu(this);
trayIconMenu->setAttribute(Qt::WA_TranslucentBackground);//设置窗口背景透明
trayIconMenu->setStyleSheet("QMenu {background-color: rgba(19,19,20,0.95);"
trayIconMenu->setStyleSheet("QMenu {background-color: rgba(19,19,20,0.7);"
"border:1px solid rgba(255, 255, 255, 0.05);"
"padding: 6px 1px;"
"padding: 6px 2px;"
"border-radius: 6px;}"
"QMenu::item {font-size: 14px;color: #ffffff;"
"height: 36px;width: 248px;}"
@ -646,7 +652,6 @@ void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason)
switch(reason){
case QSystemTrayIcon::Trigger:
case QSystemTrayIcon::MiddleClick:
//这里右键点击托盘图标无效
handleIconClicked();
if(this->isHidden()){
this->showNormal();
@ -654,6 +659,13 @@ void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason)
this->hide();
}
break;
case QSystemTrayIcon::DoubleClick:
this->hide();
break;
case QSystemTrayIcon::Context:
//右键点击托盘图标弹出菜单
showTrayIconMenu();
break;
default:
break;
}
@ -682,7 +694,7 @@ void MainWindow::handleIconClicked()
int n = objKyDBus->getTaskbarPos("position");
int m = objKyDBus->getTaskbarHeight("height");
int d = 3; //窗口边沿到任务栏距离
int d = 2; //窗口边沿到任务栏距离
if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()){
if(n == 0){
@ -725,6 +737,55 @@ void MainWindow::handleIconClicked()
}
}
void MainWindow::showTrayIconMenu()
{
QRect availableGeometry = qApp->primaryScreen()->availableGeometry();
QRect screenGeometry = qApp->primaryScreen()->geometry();
QDesktopWidget* desktopWidget = QApplication::desktop();
// QRect deskMainRect = desktopWidget->availableGeometry(0);//获取可用桌面大小
QRect screenMainRect = desktopWidget->screenGeometry(0);//获取设备屏幕大小
// QRect deskDupRect = desktopWidget->availableGeometry(1);//获取可用桌面大小
QRect screenDupRect = desktopWidget->screenGeometry(1);//获取设备屏幕大小
int n = objKyDBus->getTaskbarPos("position");
int m = objKyDBus->getTaskbarHeight("height");
int d = 2; //窗口边沿到任务栏距离
int s = 80; //窗口边沿到屏幕边沿距离
if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()){
if(n == 0){ //任务栏在下侧
trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width(), screenMainRect.y() + availableGeometry.height() - trayIconMenu->height() - m - d);
}else if(n == 1){ //任务栏在上侧
trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width(), screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + m + d);
} else if (n == 2){ //任务栏在左侧
if (screenGeometry.x() == 0){//主屏在左侧
trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + m + d, screenMainRect.y() + screenMainRect.height() - trayIconMenu->height() - s);
}else{//主屏在右侧
trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + m + d,screenDupRect.y() + screenDupRect.height() - trayIconMenu->height() - s);
}
} else if (n == 3){ //任务栏在右侧
if (screenGeometry.x() == 0){//主屏在左侧
trayIconMenu->move(screenMainRect.width() + screenDupRect.width() - trayIconMenu->width() - m - d, screenDupRect.y() + screenDupRect.height() - trayIconMenu->height() - s);
}else{//主屏在右侧
trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width() - m - d, screenMainRect.y() + screenMainRect.height() - trayIconMenu->height() - s);
}
}
} else if(screenGeometry.width() == availableGeometry.width() ){
if (trayIcon->geometry().y() > availableGeometry.height()/2){ //任务栏在下侧
trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width(), screenMainRect.y() + availableGeometry.height() - trayIconMenu->height() - d);
}else{ //任务栏在上侧
trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width(), screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + d);
}
} else if (screenGeometry.height() == availableGeometry.height()){
if (trayIcon->geometry().x() > availableGeometry.width()/2){ //任务栏在右侧
trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width() - d, screenMainRect.y() + screenGeometry.height() - trayIconMenu->height() - s);
} else { //任务栏在左侧
trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + d, screenMainRect.y() + screenGeometry.height() - trayIconMenu->height() - s);
}
}
}
void MainWindow::on_showWindowAction()
{
handleIconClicked();
@ -733,7 +794,7 @@ void MainWindow::on_showWindowAction()
void MainWindow::init_widget_action(QWidget *wid, QString iconstr, QString textstr)
{
QString style="QWidget{background:transparent;border:0px;border-radius: 0px;}\
QString style="QWidget{background:transparent;border:0px;border-radius: 4px;}\
QWidget:hover{background-color:#34bed8ef;}\
QWidget:pressed{background-color:#3abed8ef;}";
@ -1048,7 +1109,7 @@ void MainWindow::onBtnWifiClicked(int flag)
// 网络开关关闭时，点击Wifi开关时，程序先打开有线开关
if (flag == 0) {
if(checkWlOn()){
// objKyDBus->setWifiSwitchState(false);
objKyDBus->setWifiSwitchState(false);
lbTopWifiList->hide();
btnAddNet->hide();
@ -1065,8 +1126,8 @@ void MainWindow::onBtnWifiClicked(int flag)
if (is_fly_mode_on == 0){
on_btnWifiList_clicked();
is_stop_check_net_state = 1;
// objKyDBus->setWifiCardState(true);
// objKyDBus->setWifiSwitchState(true);
objKyDBus->setWifiCardState(true);
objKyDBus->setWifiSwitchState(true);
lbTopWifiList->show();
btnAddNet->show();
@ -1123,8 +1184,8 @@ void MainWindow::onBtnWifiClicked(int flag)
btnAddNet->hide();
if (flag == 0) {
// objKyDBus->setWifiSwitchState(false);
// objKyDBus->setWifiCardState(false);
objKyDBus->setWifiSwitchState(false);
objKyDBus->setWifiCardState(false);
}
QString txt(tr("please insert the wireless network adapter"));

1
mainwindow.h
View File

@ -183,6 +183,7 @@ private:
void initNetwork();
void createTrayIcon();
void handleIconClicked();
void showTrayIconMenu();
bool checkLanOn();
bool checkWlOn();
void getLanList();

6
oneconnform.cpp
View File

@ -41,7 +41,7 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
ui->lePassword->setEchoMode(QLineEdit::Normal);
ui->btnConnPWD->setEnabled(false);
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.85);}");
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.57);line-height:24px;}");
ui->btnInfo->setStyleSheet("QPushButton{border:none;background:transparent;}");
ui->wbg->setStyleSheet("#wbg{border-radius:4px;background-color:rgba(255,255,255,0);}");
ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(255,255,255,0.1);}");
@ -135,10 +135,10 @@ bool OneConnForm::eventFilter(QObject *obj, QEvent *event)
{
if (obj == ui->btnInfo){
if(event->type() == QEvent::HoverEnter) {
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.97);}");
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.91);line-height:24px;}");
return true;
} else if(event->type() == QEvent::HoverLeave){
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.85);}");
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.57);line-height:24px;}");
return true;
}
}else if (obj == this){

6
oneconnform.h
View File

@ -42,11 +42,11 @@
#define H_ITEM_MIDDLE 106
#define H_WIFI_ITEM_BIG_EXTEND 78 //138 - 60
#define H_WIFI_ITEM_SMALL_EXTEND 46 //106 - 60
#define Y_LINE 58
#define Y_LINE 59
#define X_LINE 0
#define Y_LINE_SMALL_EXTEND 104
#define Y_LINE_SMALL_EXTEND 105
#define X_LINE_SMALL_EXTEND 0
#define Y_LINE_BIG_EXTEND 136
#define Y_LINE_BIG_EXTEND 137
#define X_LINE_BIG_EXTEND 0
class MainWindow;

2
oneconnform.ui
View File

@ -190,7 +190,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>58</y>
<y>59</y>
<width>424</width>
<height>1</height>
</rect>

6
onelancform.cpp
View File

@ -34,7 +34,7 @@ OneLancForm::OneLancForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
ui->lbConned->setAlignment(Qt::AlignLeft);
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.97);}");
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.57);}");
ui->btnInfo->setStyleSheet("QPushButton{border:none;background:transparent;}");
ui->wbg->setStyleSheet("#wbg{border-radius:4px;background-color:rgba(255,255,255,0.1);}");
ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(255,255,255,0);}");
@ -102,10 +102,10 @@ bool OneLancForm::eventFilter(QObject *obj, QEvent *event)
{
if (obj == ui->btnInfo){
if(event->type() == QEvent::HoverEnter) {
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.97);}");
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.91);}");
return true;
} else if(event->type() == QEvent::HoverLeave){
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.85);}");
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.57);}");
return true;
}
}else if (obj == this){

4
onelancform.h
View File

@ -36,9 +36,9 @@
#define W_ITEM 424
#define H_ITEM 60
#define H_ITEM_EXTEND 162
#define Y_LINE 58
#define Y_LINE 59
#define X_LINE 0
#define Y_LINE_EXTEND 160
#define Y_LINE_EXTEND 161
#define X_LINE_EXTEND 0
class MainWindow;

2
onelancform.ui
View File

@ -131,7 +131,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>58</y>
<y>59</y>
<width>424</width>
<height>1</height>
</rect>

10
qss/style.qss
View File

@ -1,13 +1,3 @@
QToolTip{
background:rgba(26,26,26,0.7);
font: 14px;
color:rgba(255,255,255,1);
border-radius: 3px;
border:1px solid rgba(255,255,255,0.2);
padding: 0px 4px;
outline:none;
}
QScrollBar:vertical{margin:0px 2px 0px 2px;width:10px;background:rgba(48,48,51,0);border-radius:6px;}
QScrollBar::up-arrow:vertical{height:0px;}
QScrollBar::sub-line:vertical{border:0px solid;height:0px}

2
wireless-security/dlgconnhidwifileap.cpp
View File

@ -38,7 +38,7 @@ DlgConnHidWifiLeap::DlgConnHidWifiLeap(QWidget *parent) :
path.addRoundedRect(rect, 6, 6);
setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.9);border:1px solid rgba(255, 255, 255, 0.05);}");
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
MyQss objQss;

2
wireless-security/dlgconnhidwifisecfast.cpp
View File

@ -40,7 +40,7 @@ DlgConnHidWifiSecFast::DlgConnHidWifiSecFast(int type, QWidget *parent) :
path.addRoundedRect(rect, 6, 6);
setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.9);border:1px solid rgba(255, 255, 255, 0.05);}");
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
MyQss objQss;

2
wireless-security/dlgconnhidwifisecleap.cpp
View File

@ -40,7 +40,7 @@ DlgConnHidWifiSecLeap::DlgConnHidWifiSecLeap(int type, QWidget *parent) :
path.addRoundedRect(rect, 6, 6);
setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.9);border:1px solid rgba(255, 255, 255, 0.05);}");
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
MyQss objQss;

2
wireless-security/dlgconnhidwifisecpeap.cpp
View File

@ -40,7 +40,7 @@ DlgConnHidWifiSecPeap::DlgConnHidWifiSecPeap(int type, QWidget *parent) :
path.addRoundedRect(rect, 6, 6);
setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.9);border:1px solid rgba(255, 255, 255, 0.05);}");
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
MyQss objQss;

2
wireless-security/dlgconnhidwifisecpwd.cpp
View File

@ -40,7 +40,7 @@ DlgConnHidWifiSecPwd::DlgConnHidWifiSecPwd(int type, QWidget *parent) :
path.addRoundedRect(rect, 6, 6);
setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.9);border:1px solid rgba(255, 255, 255, 0.05);}");
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
MyQss objQss;

2
wireless-security/dlgconnhidwifisectls.cpp
View File

@ -39,7 +39,7 @@ DlgConnHidWifiSecTls::DlgConnHidWifiSecTls(int type, QWidget *parent) :
path.addRoundedRect(rect, 6, 6);
setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.9);border:1px solid rgba(255, 255, 255, 0.05);}");
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
MyQss objQss;

2
wireless-security/dlgconnhidwifisectunneltls.cpp
View File

@ -40,7 +40,7 @@ DlgConnHidWifiSecTunnelTLS::DlgConnHidWifiSecTunnelTLS(int type, QWidget *parent
path.addRoundedRect(rect, 6, 6);
setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.9);border:1px solid rgba(255, 255, 255, 0.05);}");
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
MyQss objQss;

2
wireless-security/dlgconnhidwifiwep.cpp
View File

@ -39,7 +39,7 @@ DlgConnHidWifiWep::DlgConnHidWifiWep(int type, QWidget *parent) :
path.addRoundedRect(rect, 6, 6);
setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.9);border:1px solid rgba(255, 255, 255, 0.05);}");
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
MyQss objQss;

2
wireless-security/dlgconnhidwifiwpa.cpp
View File

@ -43,7 +43,7 @@ DlgConnHidWifiWpa::DlgConnHidWifiWpa(int type, MainWindow *mainWindow, QWidget *
path.addRoundedRect(rect, 6, 6);
setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}");
this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
MyQss objQss;