sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style improve

Browse Source
This commit is contained in:
xueyan hu
2021-12-24 16:06:03 +08:00
parent d36fc118f8
commit 32500542af
10 changed files with 102 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/imageswitch.cpp
View File

@@ -7,11 +7,7 @@
ImageSwitch::ImageSwitch(QWidget* parent) : QWidget(parent) ImageSwitch::ImageSwitch(QWidget* parent) : QWidget(parent)
{ {
isChecked = false; isChecked = false;
buttonStyle = ButtonStyle_2; setButtonStyle(ButtonStyle_1);
imgOffFile = ":/image/imageswitch/btncheckoff2.png";
imgOnFile = ":/image/imageswitch/btncheckon2.png";
imgFile = imgOffFile;
} }
void ImageSwitch::mousePressEvent(QMouseEvent*) void ImageSwitch::mousePressEvent(QMouseEvent*)
@@ -19,7 +15,7 @@ void ImageSwitch::mousePressEvent(QMouseEvent*)
imgFile = isChecked ? imgOffFile : imgOnFile; imgFile = isChecked ? imgOffFile : imgOnFile;
isChecked = !isChecked; isChecked = !isChecked;
this->update(); this->update();
emit clicked(); emit clicked();
} }
void ImageSwitch::paintEvent(QPaintEvent*) void ImageSwitch::paintEvent(QPaintEvent*)
@@ -48,12 +44,12 @@ ImageSwitch::ButtonStyle ImageSwitch::getButtonStyle() const
QSize ImageSwitch::sizeHint() const QSize ImageSwitch::sizeHint() const
{ {
return QSize(87, 28); return QSize(220, 64);
} }
QSize ImageSwitch::minimumSizeHint() const QSize ImageSwitch::minimumSizeHint() const
{ {
return QSize(87, 28); return sizeHint();
} }
void ImageSwitch::setChecked(bool isChecked) void ImageSwitch::setChecked(bool isChecked)
@@ -73,17 +69,17 @@ void ImageSwitch::setButtonStyle(const ImageSwitch::ButtonStyle& buttonStyle)
if (buttonStyle == ButtonStyle_1) { if (buttonStyle == ButtonStyle_1) {
imgOffFile = ":/icons/imageswitch/btncheckoff1.png"; imgOffFile = ":/icons/imageswitch/btncheckoff1.png";
imgOnFile = ":/icons/imageswitch/btncheckon1.png"; imgOnFile = ":/icons/imageswitch/btncheckon1.png";
this->resize(87, 28); this->resize(sizeHint());
} }
else if (buttonStyle == ButtonStyle_2) { else if (buttonStyle == ButtonStyle_2) {
imgOffFile = ":/icons/imageswitch/btncheckoff2.png"; imgOffFile = ":/icons/imageswitch/btncheckoff2.png";
imgOnFile = ":/icons/imageswitch/btncheckon2.png"; imgOnFile = ":/icons/imageswitch/btncheckon2.png";
this->resize(87, 28); this->resize(sizeHint());
} }
else if (buttonStyle == ButtonStyle_3) { else if (buttonStyle == ButtonStyle_3) {
imgOffFile = ":/icons/imageswitch/btncheckoff3.png"; imgOffFile = ":/icons/imageswitch/btncheckoff3.png";
imgOnFile = ":/icons/imageswitch/btncheckon3.png"; imgOnFile = ":/icons/imageswitch/btncheckon3.png";
this->resize(96, 38); this->resize(sizeHint());
} }
imgFile = isChecked ? imgOnFile : imgOffFile; imgFile = isChecked ? imgOnFile : imgOffFile;

BIN
src/icons/imageswitch/btncheckoff1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
src/icons/imageswitch/btncheckon1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

70
src/networkcfgdialog.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>863</width> <width>819</width>
<height>678</height> <height>662</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@@ -20,18 +20,19 @@
<string>Network Settings</string> <string>Network Settings</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QTabWidget::pane { <string notr="true">
QTabWidget::pane {
border-top: 0px; border-top: 0px;
} }
QTabBar::tab { QTabBar::tab {
font-size:30px; font-size:25px;
height:50px; height:40px;
width:150px; width:120px;
background:#4d4d4d; background:#4d4d4d;
border: 0px; border: 0px;
border-top-left-radius: 20%; border-top-left-radius: 0%;
border-top-right-radius: 20%; border-top-right-radius: 0%;
border-bottom-left-radius:0%; border-bottom-left-radius:0%;
border-bottom-right-radius:0%; border-bottom-right-radius:0%;
padding: 2px; padding: 2px;
@@ -45,13 +46,23 @@ background: #505050;}</string>
<item> <item>
<widget class="QWidget" name="formWidget" native="true"> <widget class="QWidget" name="formWidget" native="true">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="title">
<property name="text">
<string>Network Setting</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@@ -420,25 +431,28 @@ background: #505050;}</string>
<attribute name="title"> <attribute name="title">
<string>Result</string> <string>Result</string>
</attribute> </attribute>
<widget class="QWidget" name="widget_3" native="true"> <layout class="QVBoxLayout" name="verticalLayout_5">
<property name="geometry"> <item>
<rect> <widget class="QWidget" name="widget_3" native="true">
<x>30</x> <layout class="QVBoxLayout" name="verticalLayout_4">
<y>20</y> <item>
<width>781</width> <widget class="Line" name="line">
<height>541</height> <property name="orientation">
</rect> <enum>Qt::Horizontal</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_6"> </widget>
<item> </item>
<widget class="QPlainTextEdit" name="output"> <item>
<property name="enabled"> <widget class="QPlainTextEdit" name="output">
<bool>false</bool> <property name="enabled">
</property> <bool>false</bool>
</widget> </property>
</item> </widget>
</layout> </item>
</widget> </layout>
</widget>
</item>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>

2
src/stylesheet/Dark.qss
View File

@@ -1 +1 @@
*{background-color:#3c3c3c; color:white;margin:0;font-size:16px;} *{background-color:#3c3c3c; color:white;margin:0;font-size:16px;}

4
src/translations/en_US.ts
View File

@@ -600,6 +600,10 @@ parameters
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Network Setting</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>systemSettingForm</name> <name>systemSettingForm</name>

4
src/translations/en_US.ts.bak
View File

@@ -600,6 +600,10 @@ parameters
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Network Setting</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>systemSettingForm</name> <name>systemSettingForm</name>

BIN
src/translations/zh_CN.qm
View File

Binary file not shown.

39
src/translations/zh_CN.ts
View File

@@ -680,76 +680,81 @@ parameters
<context> <context>
<name>networkCfgDialog</name> <name>networkCfgDialog</name>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="361"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="383"/>
<source>Network Settings</source> <source>Network Settings</source>
<translation>网络配置</translation> <translation>网络配置</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="371"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="394"/>
<source>Address</source> <source>Address</source>
<translation>IP配置</translation> <translation>IP配置</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="362"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="385"/>
<location filename="../network/networkcfgdialog.cpp" line="34"/> <location filename="../network/networkcfgdialog.cpp" line="34"/>
<source>IP Address</source> <source>IP Address</source>
<translation>IP地址</translation> <translation>IP地址</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="363"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="384"/>
<source>Network Setting</source>
<translation type="unfinished">网络配置</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="386"/>
<source>Dynamic Address</source> <source>Dynamic Address</source>
<translation>动态地址</translation> <translation>动态地址</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="364"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="387"/>
<source>Dev</source> <source>Dev</source>
<translation>设备</translation> <translation>设备</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="366"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="389"/>
<source>Subnet Mask</source> <source>Subnet Mask</source>
<translation>子网掩码</translation> <translation>子网掩码</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="367"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="390"/>
<source>Additional Address</source> <source>Additional Address</source>
<translation>额外地址</translation> <translation>额外地址</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="368"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="391"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="375"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="398"/>
<source>Add</source> <source>Add</source>
<translation>新增</translation> <translation>新增</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="369"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="392"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="376"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="399"/>
<source>Edit</source> <source>Edit</source>
<translation>编辑</translation> <translation>编辑</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="370"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="393"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="377"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="400"/>
<source>Delete</source> <source>Delete</source>
<translation>删除</translation> <translation>删除</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="378"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="401"/>
<source>Routing</source> <source>Routing</source>
<translation>路由配置</translation> <translation>路由配置</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="373"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="396"/>
<source>Default IPv4 Gateway</source> <source>Default IPv4 Gateway</source>
<translation>默认网关</translation> <translation>默认网关</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="374"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="397"/>
<source>Routing Table</source> <source>Routing Table</source>
<translation>路由表</translation> <translation>路由表</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="379"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="402"/>
<source>Result</source> <source>Result</source>
<translation>结果</translation> <translation>结果</translation>
</message> </message>

39
src/translations/zh_CN.ts.bak
View File

@@ -680,76 +680,81 @@ parameters
<context> <context>
<name>networkCfgDialog</name> <name>networkCfgDialog</name>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="361"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="383"/>
<source>Network Settings</source> <source>Network Settings</source>
<translation>网络配置</translation> <translation>网络配置</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="371"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="394"/>
<source>Address</source> <source>Address</source>
<translation>IP配置</translation> <translation>IP配置</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="362"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="385"/>
<location filename="../network/networkcfgdialog.cpp" line="34"/> <location filename="../network/networkcfgdialog.cpp" line="34"/>
<source>IP Address</source> <source>IP Address</source>
<translation>IP地址</translation> <translation>IP地址</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="363"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="384"/>
<source>Network Setting</source>
<translation type="unfinished">网络配置</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="386"/>
<source>Dynamic Address</source> <source>Dynamic Address</source>
<translation>动态地址</translation> <translation>动态地址</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="364"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="387"/>
<source>Dev</source> <source>Dev</source>
<translation>设备</translation> <translation>设备</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="366"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="389"/>
<source>Subnet Mask</source> <source>Subnet Mask</source>
<translation>子网掩码</translation> <translation>子网掩码</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="367"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="390"/>
<source>Additional Address</source> <source>Additional Address</source>
<translation>额外地址</translation> <translation>额外地址</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="368"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="391"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="375"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="398"/>
<source>Add</source> <source>Add</source>
<translation>新增</translation> <translation>新增</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="369"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="392"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="376"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="399"/>
<source>Edit</source> <source>Edit</source>
<translation>编辑</translation> <translation>编辑</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="370"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="393"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="377"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="400"/>
<source>Delete</source> <source>Delete</source>
<translation>删除</translation> <translation>删除</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="378"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="401"/>
<source>Routing</source> <source>Routing</source>
<translation>路由配置</translation> <translation>路由配置</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="373"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="396"/>
<source>Default IPv4 Gateway</source> <source>Default IPv4 Gateway</source>
<translation>默认网关</translation> <translation>默认网关</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="374"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="397"/>
<source>Routing Table</source> <source>Routing Table</source>
<translation>路由表</translation> <translation>路由表</translation>
</message> </message>
<message> <message>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="379"/> <location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="402"/>
<source>Result</source> <source>Result</source>
<translation>结果</translation> <translation>结果</translation>
</message> </message>