diff --git a/src/components/imageswitch.cpp b/src/components/imageswitch.cpp
index 2241351..2b341ca 100644
--- a/src/components/imageswitch.cpp
+++ b/src/components/imageswitch.cpp
@@ -7,11 +7,7 @@
ImageSwitch::ImageSwitch(QWidget* parent) : QWidget(parent)
{
isChecked = false;
- buttonStyle = ButtonStyle_2;
-
- imgOffFile = ":/image/imageswitch/btncheckoff2.png";
- imgOnFile = ":/image/imageswitch/btncheckon2.png";
- imgFile = imgOffFile;
+ setButtonStyle(ButtonStyle_1);
}
void ImageSwitch::mousePressEvent(QMouseEvent*)
@@ -19,7 +15,7 @@ void ImageSwitch::mousePressEvent(QMouseEvent*)
imgFile = isChecked ? imgOffFile : imgOnFile;
isChecked = !isChecked;
this->update();
- emit clicked();
+ emit clicked();
}
void ImageSwitch::paintEvent(QPaintEvent*)
@@ -48,12 +44,12 @@ ImageSwitch::ButtonStyle ImageSwitch::getButtonStyle() const
QSize ImageSwitch::sizeHint() const
{
- return QSize(87, 28);
+ return QSize(220, 64);
}
QSize ImageSwitch::minimumSizeHint() const
{
- return QSize(87, 28);
+ return sizeHint();
}
void ImageSwitch::setChecked(bool isChecked)
@@ -73,17 +69,17 @@ void ImageSwitch::setButtonStyle(const ImageSwitch::ButtonStyle& buttonStyle)
if (buttonStyle == ButtonStyle_1) {
imgOffFile = ":/icons/imageswitch/btncheckoff1.png";
imgOnFile = ":/icons/imageswitch/btncheckon1.png";
- this->resize(87, 28);
+ this->resize(sizeHint());
}
else if (buttonStyle == ButtonStyle_2) {
imgOffFile = ":/icons/imageswitch/btncheckoff2.png";
imgOnFile = ":/icons/imageswitch/btncheckon2.png";
- this->resize(87, 28);
+ this->resize(sizeHint());
}
else if (buttonStyle == ButtonStyle_3) {
imgOffFile = ":/icons/imageswitch/btncheckoff3.png";
imgOnFile = ":/icons/imageswitch/btncheckon3.png";
- this->resize(96, 38);
+ this->resize(sizeHint());
}
imgFile = isChecked ? imgOnFile : imgOffFile;
diff --git a/src/icons/imageswitch/btncheckoff1.png b/src/icons/imageswitch/btncheckoff1.png
index bfa8ebb..7c4b9cc 100644
Binary files a/src/icons/imageswitch/btncheckoff1.png and b/src/icons/imageswitch/btncheckoff1.png differ
diff --git a/src/icons/imageswitch/btncheckon1.png b/src/icons/imageswitch/btncheckon1.png
index 2bab009..24835ba 100644
Binary files a/src/icons/imageswitch/btncheckon1.png and b/src/icons/imageswitch/btncheckon1.png differ
diff --git a/src/networkcfgdialog.ui b/src/networkcfgdialog.ui
index ac7f120..ba8d388 100644
--- a/src/networkcfgdialog.ui
+++ b/src/networkcfgdialog.ui
@@ -6,8 +6,8 @@
0
0
- 863
- 678
+ 819
+ 662
@@ -20,18 +20,19 @@
Network Settings
- QTabWidget::pane {
+
+QTabWidget::pane {
border-top: 0px;
}
QTabBar::tab {
-font-size:30px;
-height:50px;
-width:150px;
+font-size:25px;
+height:40px;
+width:120px;
background:#4d4d4d;
border: 0px;
-border-top-left-radius: 20%;
-border-top-right-radius: 20%;
+border-top-left-radius: 0%;
+border-top-right-radius: 0%;
border-bottom-left-radius:0%;
border-bottom-right-radius:0%;
padding: 2px;
@@ -45,13 +46,23 @@ background: #505050;}
-
+
-
+
+
+ Network Setting
+
+
+ Qt::AlignCenter
+
+
+
-
true
- 1
+ 2
@@ -420,25 +431,28 @@ background: #505050;}
Result
-
-
-
- 30
- 20
- 781
- 541
-
-
-
- -
-
-
- false
-
-
-
-
-
+
+ -
+
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ false
+
+
+
+
+
+
+
diff --git a/src/stylesheet/Dark.qss b/src/stylesheet/Dark.qss
index b1b0002..4a372ae 100644
--- a/src/stylesheet/Dark.qss
+++ b/src/stylesheet/Dark.qss
@@ -1 +1 @@
-*{background-color:#3c3c3c; color:white;margin:0;font-size:16px;}
QTabBar::tab {
height:60px;
width:300px;
font-size: 25px;
background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #333333, stop: 1.0 #555555);
border: 2px solid #505050;
border-bottom-left-radius: 50%;
border-bottom-right-radius: 50%;
min-width: 8ex;
padding: 2px;
}
QTabBar::tab:selected, QTabBar::tab:hover {
border-top:5px solid #4a88c7;
background: #505050;}
QTabWidget::pane{margin:0}
QLineEdit{min-height:36px;max-height:36px; border:1px solid silver}
QLineEdit:enabled{background-color: #515151}
QDateEdit{min-height:36px;max-height:36px; border:1px solid silver}
QDateEdit:enabled{background-color: #515151}
QTextEdit:enabled{background-color: #515151}
QComboBox{text-align:center;min-height:36px;max-height:36px; border:1px solid silver}
QComboBox:enabled{background-color: #515151}
QComboBox::drop-down{width:20px}
QComboBox QAbstractItemView{min-width:120px;}
QComboBox QAbstractItemView::item {min-height:60px;max-height:60px; border:1px solid white;}
QLabel{color:white; font-weight:bold; font-size:16px;}
QLabel#sliderPickerLabel{color:silver;padding:0;background:#505050;font-weight:normal;font-size:50px;}
QWidget#topbarWidget{min-height:36px;max-height:36px;}
QWidget#contentWidget{border-top:1px solid #515151;}
QWidget#commandWidget{min-height:123px;max-height:123px;border-top:1px solid #515151; border-bottom:1px solid #323232;}
QLabel#logo{min-width:30px;max-width:30px}
QLabel#company{min-width:150px;max-width:150px; }
QLabel#systemMsgBar{min-width:500px;}
QLabel#warn{color:#CCCC00;background:transparent;font-size:20px;}
QWidget QWidget#statusBarWidget{min-width:300px;}
QWidget QToolButton{border:none;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}
QToolButton#btn_main{border:2px solid #0078d8;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}
QWidget QToolButton:disabled{color:#606060 }
QWidget QToolButton:hover{background:#505050;}
QWidget QToolButton:checked{border:5px solid darkorange;padding:0px;}
QWidget#editcmdWidget{min-height:83px;max-height:83px;}
QWidget#verSpaceLine{ border-right:1px solid #0078d8;}
QWidget#topBottomLine{ border-top:2px solid #0078d8;border-bottom:2px solid #0078d8;background:transparent}
/*-----蒙版Dialog-----*/
QDialog QWidget#innerWidget{ background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);
border-radius:20px;border:5px solid #0078d8; }
QDialog#MessageDialog QWidget QWidget{ background:transparent;color:#3078d8}
QDialog#MessageDialog QWidget QWidget QLabel{ font-size:30px}
#spacer_1, #spacer_2{min-width:2px;max-width:2px;margin-top:6px;margin-bottom:6px;border-right:1px solid #0078d8;}
/*-----FormDialog-----*/
QPushButton{border:1px solid silver ;padding-left:50px;padding-right:50px; border-radius:5px; min-height:28px; max-height:28px; background:#4c5052}
QPushButton#btnOK{background:#365880; font-weight:bold}
QDialog#formDialog{border:3px solid silver; border-radius:8px}
QWidget#slider_one{border:1px solid silver; border-radius:8px}
QWidget#formWidget QLabel#endline{border-bottom:1px solid silver}
QWidget#formWidget QLabel#title{font-size:30px; border-bottom:1px solid #3078d8 }
QListView{border:none;margin:5px; font-weight:bold}
QListView::item{background:#4c5052;min-height:30px; border:1px solid silver; border-radius:5px}
QListView::item:selected{background:#365880; font-weight:bold;color:white}
QHeaderView::section{background-color:#595959;
min-height:50px;max-height:50px;
font-weight:Bold; font-size:16px; border:1px solid #323232;}
QHeaderView::section:horizontal{border-bottom: 1px solid rgb(0,170,255);}
QHeaderView::section:vertical{min-height:36px;max-height:36px;}
QWidget#edit_patient{min-width:300px;max-width:300px;}
QTableView{border:none}
QTableView{alternate-background-color: #595959;selection-color:white;selection-background-color:#0078d8}
QToolButton#sexBtn{min-width:120px;max-width:120px;font-size:20px;padding:2px;}
QToolButton#sexBtn:disabled{color:silver}
QWidget#sexpanelwidget{border:1px solid silver;}
QWidget#sexpanelwidget:enabled{background-color: #515151;}
QToolButton#sexBtn:checked{border:2px solid darkorange;padding:0px;}
\ No newline at end of file
+*{background-color:#3c3c3c; color:white;margin:0;font-size:16px;}
QTabBar::tab {
height:60px;
width:300px;
font-size: 25px;
background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #333333, stop: 1.0 #555555);
border: 2px solid #505050;
border-bottom-left-radius: 50%;
border-bottom-right-radius: 50%;
min-width: 8ex;
padding: 2px;
}
QTabBar::tab:selected, QTabBar::tab:hover {
border-top:5px solid #4a88c7;
background: #505050;}
QTabWidget::pane{margin:0}
QLineEdit{min-height:36px;max-height:36px; border:1px solid silver}
QLineEdit:enabled{background-color: #515151}
QDateEdit{min-height:36px;max-height:36px; border:1px solid silver}
QDateEdit:enabled{background-color: #515151}
QTextEdit:enabled{background-color: #515151}
QComboBox{text-align:center;min-height:36px;max-height:36px; border:1px solid silver}
QComboBox:enabled{background-color: #515151}
QComboBox::drop-down{width:20px}
QComboBox QAbstractItemView{min-width:120px;}
QComboBox QAbstractItemView::item {min-height:60px;max-height:60px; border:1px solid white;}
QLabel{color:white; font-weight:bold; font-size:16px;}
QLabel#sliderPickerLabel{color:silver;padding:0;background:#505050;font-weight:normal;font-size:50px;}
QWidget#topbarWidget{min-height:36px;max-height:36px;}
QWidget#contentWidget{border-top:1px solid #515151;}
QWidget#commandWidget{min-height:123px;max-height:123px;border-top:1px solid #515151; border-bottom:1px solid #323232;}
QLabel#logo{min-width:30px;max-width:30px}
QLabel#company{min-width:150px;max-width:150px; }
QLabel#systemMsgBar{min-width:500px;}
QLabel#warn{color:#CCCC00;background:transparent;font-size:20px;}
QWidget QWidget#statusBarWidget{min-width:300px;}
QWidget QToolButton{border:none;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}
QToolButton#btn_main{border:2px solid #0078d8;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}
QWidget QToolButton:disabled{color:#606060 }
QWidget QToolButton:hover{background:#505050;}
QWidget QToolButton:checked{border:5px solid darkorange;padding:0px;}
QWidget#editcmdWidget{min-height:83px;max-height:83px;}
QWidget#verSpaceLine{ border-right:1px solid #0078d8;}
QWidget#topBottomLine{ border-top:2px solid #0078d8;border-bottom:2px solid #0078d8;background:transparent}
/*-----蒙版Dialog-----*/
QDialog QWidget#innerWidget{ background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);
border-radius:20px;border:5px solid #0078d8; }
QDialog#MessageDialog QWidget QWidget{ background:transparent;color:#3078d8}
QDialog#MessageDialog QWidget QWidget QLabel{ font-size:30px}
#spacer_1, #spacer_2{min-width:2px;max-width:2px;margin-top:6px;margin-bottom:6px;border-right:1px solid #0078d8;}
/*-----FormDialog-----*/
QPushButton{border:1px solid silver ;padding-left:50px;padding-right:50px; border-radius:5px; min-height:28px; max-height:28px; background:#4c5052}
QPushButton#btnOK{background:#365880; font-weight:bold}
QDialog#formDialog{border:3px solid silver; border-radius:8px}
QWidget#slider_one{border:1px solid silver; border-radius:8px}
QWidget#formWidget QLabel#endline{border-bottom:1px solid silver}
QWidget#formWidget QLabel#title{font-size:30px; border-bottom:1px solid #3078d8 }
QListView{border:none;margin:5px; font-weight:bold}
QListView::item{background:#4c5052;min-height:30px; border:1px solid silver; border-radius:5px}
QListView::item:selected{background:#365880; font-weight:bold;color:white}
QHeaderView::section{background-color:#595959;
min-height:50px;max-height:50px;
font-weight:Bold; font-size:16px; border:1px solid #323232;}
QHeaderView::section:horizontal{border-bottom: 1px solid rgb(0,170,255);}
QHeaderView::section:vertical{min-height:36px;max-height:36px;}
QWidget#edit_patient{min-width:300px;max-width:300px;}
QTableView{border:none}
QTableView{alternate-background-color: #595959;selection-color:white;selection-background-color:#0078d8}
QToolButton#sexBtn{min-width:120px;max-width:120px;font-size:20px;padding:2px;}
QToolButton#sexBtn:disabled{color:silver}
QWidget#sexpanelwidget{border:1px solid silver;}
QWidget#sexpanelwidget:enabled{background-color: #515151;}
QToolButton#sexBtn:checked{border:2px solid darkorange;padding:0px;}
\ No newline at end of file
diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts
index 0d21815..c0d2d5f 100644
--- a/src/translations/en_US.ts
+++ b/src/translations/en_US.ts
@@ -600,6 +600,10 @@ parameters
Cancel
+
+ Network Setting
+
+
systemSettingForm
diff --git a/src/translations/en_US.ts.bak b/src/translations/en_US.ts.bak
index 0d21815..c0d2d5f 100644
--- a/src/translations/en_US.ts.bak
+++ b/src/translations/en_US.ts.bak
@@ -600,6 +600,10 @@ parameters
Cancel
+
+ Network Setting
+
+
systemSettingForm
diff --git a/src/translations/zh_CN.qm b/src/translations/zh_CN.qm
index 2f449df..6d58fb0 100644
Binary files a/src/translations/zh_CN.qm and b/src/translations/zh_CN.qm differ
diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts
index 5a20bd2..116838c 100644
--- a/src/translations/zh_CN.ts
+++ b/src/translations/zh_CN.ts
@@ -680,76 +680,81 @@ parameters
networkCfgDialog
-
+
Network Settings
网络配置
-
+
Address
IP配置
-
+
IP Address
IP地址
-
+
+ Network Setting
+ 网络配置
+
+
+
Dynamic Address
动态地址
-
+
Dev
设备
-
+
Subnet Mask
子网掩码
-
+
Additional Address
额外地址
-
-
+
+
Add
新增
-
-
+
+
Edit
编辑
-
-
+
+
Delete
删除
-
+
Routing
路由配置
-
+
Default IPv4 Gateway
默认网关
-
+
Routing Table
路由表
-
+
Result
结果
diff --git a/src/translations/zh_CN.ts.bak b/src/translations/zh_CN.ts.bak
index 5a20bd2..116838c 100644
--- a/src/translations/zh_CN.ts.bak
+++ b/src/translations/zh_CN.ts.bak
@@ -680,76 +680,81 @@ parameters
networkCfgDialog
-
+
Network Settings
网络配置
-
+
Address
IP配置
-
+
IP Address
IP地址
-
+
+ Network Setting
+ 网络配置
+
+
+
Dynamic Address
动态地址
-
+
Dev
设备
-
+
Subnet Mask
子网掩码
-
+
Additional Address
额外地址
-
-
+
+
Add
新增
-
-
+
+
Edit
编辑
-
-
+
+
Delete
删除
-
+
Routing
路由配置
-
+
Default IPv4 Gateway
默认网关
-
+
Routing Table
路由表
-
+
Result
结果