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

replace const number with macro definition

This commit is contained in:
chenlelin 2020-03-17 15:18:49 +08:00
parent 9818a2af84
commit 588a7c998f
8 changed files with 1297 additions and 1171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kylin-nm.pro
View File

@ -19,7 +19,10 @@ CONFIG += release
#PKGCONFIG += libnm glib-2.0 gio-2.0 dbus-glib-1
#PKGCONFIG += Qt5Svg
LIBS += -L/usr/lib/ -lgsettings-qt
CONFIG += link_pkgconfig
PKGCONFIG += gsettings-qt
#LIBS += -L/usr/lib/ -lgsettings-qt
target.path = /usr/bin
target.source += $$TARGET

7
main.cpp
View File

@ -31,17 +31,14 @@
int main(int argc, char *argv[])
{
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication a(argc, argv);
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
openlog(LOG_IDENT, LOG_NDELAY | LOG_NOWAIT | LOG_PID, LOG_USER);
syslog(LOG_DEBUG, "Kylin Network Manager Is Already Launched");
syslog(LOG_DEBUG, "Using the icon theme named 'ukui-icon-theme-default'");
QIcon::setThemeName("ukui-icon-theme-default");
// 国际化
QString locale = QLocale::system().name();
QTranslator trans_global;

2331
mainwindow.cpp
View File

File diff suppressed because it is too large Load Diff

43
mainwindow.h
View File

@ -60,6 +60,43 @@
#include "kylin-dbus-interface.h"
#include "kylin-network-interface.h"
#define W_LEFT_AREA 41
#define W_VERTICAL_LINE 1 //左边竖线宽度
#define W_RIGHT_AREA 438 //41 + 1 + 438 = 480
#define L_VERTICAL_LINE_TO_ITEM 4 //竖线到item左侧的距离
#define X_LEFT_WIFI_BALL 412 //白色小球在左边
#define X_RIGHT_WIFI_BALL 438 //白色小球在右边
#define Y_WIFI_BALL 22 //白色小球y坐标
#define X_ITEM 46 //item到窗口左侧的距离 41 + 1 + 4 = 46
#define W_ITEM 424
#define Y_TOP_ITEM 57 //顶部item、topLanListWidget、topWifiListWidget的y坐标
#define H_NORMAL_ITEM 60
#define H_GAP_UP 10
#define H_MIDDLE_WORD 46 //"显示‘可用网络列表’的label"
#define H_GAP_DOWN 5 //57 + 60 + 10 + 46 + 5 = 178
#define X_MIDDLE_WORD 19
#define W_MIDDLE_WORD 260
#define H_LAN_ITEM_EXTEND 108
#define H_WIFI_ITEM_EXTEND 88
#define Y_SCROLL_AREA 178
#define W_SCROLL_AREA 440
#define H_SCROLL_AREA 360
#define W_TOP_LIST_WIDGET 435
#define W_LIST_WIDGET 440
#define W_BTN_FUN 57
#define H_BTN_FUN 14
#define X_BTN_FUN 365
#define Y_BTN_FUN 87 //新建网络，加入网络按钮的宽高、x坐标、y坐标
#define W_NO_ITEM_TIP 220
#define H_NO_ITEM_TIP 20
class OneConnForm;
class ConfForm;
@ -75,8 +112,12 @@ public:
explicit MainWindow(QWidget *parent = 0);
~MainWindow();
void editQssString();
void createTopLanUI();
void createTopWifiUI();
void createOtherUI();
void createListAreaUI();
void createLeftAreaUI();
void startLoading();
void stopLoading();
@ -241,7 +282,7 @@ private slots:
void launchLanDone();
void disWifiDone();
void disWifiStateKeep();
void disWifiDoneUI();
void disWifiDoneChangeUI();
void connLanDone(int connFlag);
void connWifiDone(int connFlag);

30
oneconnform.cpp
View File

@ -22,8 +22,6 @@
#include "wireless-security/dlgconnhidwifi.h"
extern int currentActWifiSignalLv;
#define FRAMESPEED 150
#define ALLTIME 30*1000
OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *confForm, KSimpleNM *ksnm) :
QWidget(parent),
@ -195,13 +193,13 @@ void OneConnForm::setLePassword()
//点击窗口最上面的item时
void OneConnForm::setTopItem(bool isSelected){
if(isSelected){
resize(422, 148);
resize(W_ITEM, H_ITEM_BIG_EXTEND);
ui->wbg_3->show();
ui->lbInfo->show();
this->isSelected = true;
}else{
resize(422, 60);
resize(W_ITEM, H_ITEM);
ui->lePassword->setText("");
ui->wbg_3->hide();
ui->lbInfo->hide();
@ -235,8 +233,8 @@ void OneConnForm::setTopItem(bool isSelected){
// 点击窗口下面的item时
void OneConnForm::setSelected(bool isSelected, bool isCurrName){
if(isSelected){
resize(422, 148);
ui->line->move(0, 146);
resize(W_ITEM, H_ITEM_BIG_EXTEND);
ui->line->move(X_LINE_BIG_EXTEND, Y_LINE_BIG_EXTEND);
ui->wbg->hide();
ui->wbg_2->hide();
ui->wbg_3->show();
@ -246,14 +244,14 @@ void OneConnForm::setSelected(bool isSelected, bool isCurrName){
this->isSelected = true;
}else{
resize(422, 60);
resize(W_ITEM, H_ITEM);
ui->lePassword->setText(tr("Input Password..."));//"输入密码..."
ui->lePassword->setStyleSheet("QLineEdit{border:1px solid rgba(61,107,229,1);border-radius:4px;"
"background:rgba(0,0,0,0.2);color:rgba(255,255,255,0.35);font-size:14px;}");
ui->lePassword->setEchoMode(QLineEdit::Normal);
ui->checkBoxPwd->setChecked(true);
ui->line->move(0, 58);
ui->line->move(X_LINE, Y_LINE);
ui->wbg->show();
ui->wbg_2->hide();
ui->wbg_3->hide();
@ -579,9 +577,9 @@ void OneConnForm::slotConnWifiResult(int connFlag){
if(connFlag == 2){
mw->currSelNetName = "";
emit selectedOneWifiForm(ui->lbName->text(),58);
emit selectedOneWifiForm(ui->lbName->text(), Y_LINE);
resize(422, 118);
resize(W_ITEM, H_ITEM_SMALL_EXTEND);
ui->wbg->hide();
ui->wbg_2->show();
ui->wbg_3->hide();
@ -591,7 +589,7 @@ void OneConnForm::slotConnWifiResult(int connFlag){
ui->btnConn->hide();
ui->btnConnSub->hide();
ui->lbInfo->hide();
ui->line->move(0, 116);
ui->line->move(X_LINE_SMALL_EXTEND, Y_LINE_SMALL_EXTEND);
ui->lePassword->show();
ui->checkBoxPwd->show();
@ -626,10 +624,10 @@ void OneConnForm::waitAnimStep(){
this->waitPage --;
if(this->waitPage < 1){
this->waitPage = 8;
this->waitPage = TOTAL_PAGE;
}
this->countCurrentTime += FRAMESPEED;
if (this->countCurrentTime >= ALLTIME){
this->countCurrentTime += FRAME_SPEED;
if (this->countCurrentTime >= LIMIT_TIME){
this->stopWaiting();
}
}
@ -643,8 +641,8 @@ void OneConnForm::startWaiting(bool isConn){
ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);}");
}
this->countCurrentTime = 0;
this->waitPage = 8;
this->waitTimer->start(FRAMESPEED);
this->waitPage = TOTAL_PAGE;
this->waitTimer->start(FRAME_SPEED);
ui->lbWaiting->show();
ui->lbWaitingIcon->show();

15
oneconnform.h
View File

@ -32,6 +32,21 @@
#include "backthread.h"
#include "ksimplenm.h"
#define FRAME_SPEED 150
#define LIMIT_TIME 30*1000
#define TOTAL_PAGE 8
#define W_ITEM 424
#define H_ITEM 60
#define H_ITEM_BIG_EXTEND 148
#define H_ITEM_SMALL_EXTEND 118
#define Y_LINE 58
#define X_LINE 0
#define Y_LINE_SMALL_EXTEND 116
#define X_LINE_SMALL_EXTEND 0
#define Y_LINE_BIG_EXTEND 146
#define X_LINE_BIG_EXTEND 0
class MainWindow;
namespace Ui {

25
onelancform.cpp
View File

@ -22,9 +22,6 @@
#include <time.h>
#define FRAMESPEED 150
#define ALLTIME 30*1000
OneLancForm::OneLancForm(QWidget *parent, MainWindow *mainWindow, ConfForm *confForm, KSimpleNM *ksnm) :
QWidget(parent),
ui(new Ui::OneLancForm)
@ -150,19 +147,19 @@ void OneLancForm::setAct(bool isAct){
void OneLancForm::setSelected(bool isSelected, bool isCurrName)
{
if(isSelected){
resize(422, 168);
resize(W_ITEM, H_ITEM_EXTEND);
ui->wbg->show();
ui->wbg_2->hide();
ui->line->move(0, 166);
ui->line->move(X_LINE_EXTEND, Y_LINE_EXTEND);
ui->btnConn->hide();
ui->btnConnSub->show();
this->isSelected = true;
}else{
resize(422, 60);
resize(W_ITEM, H_ITEM);
ui->wbg->hide();
ui->wbg_2->show();
ui->line->move(0, 58);
ui->line->move(X_LINE, Y_LINE);
if(isCurrName){
ui->btnConn->show();
}else{
@ -181,12 +178,12 @@ void OneLancForm::setSelected(bool isSelected, bool isCurrName)
void OneLancForm::setTopItem(bool isSelected)
{
if(isSelected){
resize(422, 168);
resize(W_ITEM, H_ITEM_EXTEND);
ui->wbg->show();
ui->btnConnSub->hide();
this->isSelected = true;
}else{
resize(422, 60);
resize(W_ITEM, H_ITEM);
ui->wbg->hide();
ui->btnConnSub->hide();
this->isSelected = false;
@ -354,11 +351,11 @@ void OneLancForm::waitAnimStep(){
this->waitPage --;
if(this->waitPage < 1){
this->waitPage = 8;
this->waitPage = TOTAL_PAGE;
}
this->countCurrentTime += FRAMESPEED;
if (this->countCurrentTime >= ALLTIME){
this->countCurrentTime += FRAME_SPEED;
if (this->countCurrentTime >= LIMIT_TIME){
this->stopWaiting();
}
}
@ -371,8 +368,8 @@ void OneLancForm::startWaiting(bool isConn){
ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);}");
}
this->countCurrentTime = 0;
this->waitPage = 8;
this->waitTimer->start(FRAMESPEED);
this->waitPage = TOTAL_PAGE;
this->waitTimer->start(FRAME_SPEED);
ui->lbWaiting->show();
ui->lbWaitingIcon->show();

12
onelancform.h
View File

@ -29,6 +29,18 @@
#include "backthread.h"
#include "ksimplenm.h"
#define FRAME_SPEED 150
#define LIMIT_TIME 30*1000
#define TOTAL_PAGE 8
#define W_ITEM 424
#define H_ITEM 60
#define H_ITEM_EXTEND 168
#define Y_LINE 58
#define X_LINE 0
#define Y_LINE_EXTEND 166
#define X_LINE_EXTEND 0
class MainWindow;
namespace Ui {