diff --git a/src/translations/Dyt_zh_CN.ts b/src/translations/Dyt_zh_CN.ts
index 32055334..0c4f5de4 100644
--- a/src/translations/Dyt_zh_CN.ts
+++ b/src/translations/Dyt_zh_CN.ts
@@ -444,17 +444,17 @@
-
+
default
-
+
silver
-
+
blue
diff --git a/src/ui/FrameTitleBar.cpp b/src/ui/FrameTitleBar.cpp
index 8188a43d..06ab88b0 100644
--- a/src/ui/FrameTitleBar.cpp
+++ b/src/ui/FrameTitleBar.cpp
@@ -21,11 +21,12 @@ FrameTitleBar::FrameTitleBar(QWidget* parent)
connect(ui->sys_close, &QPushButton::clicked, this, &FrameTitleBar::OnCloseBtnClicked);
connect(ui->sys_min, &QPushButton::clicked, this, &FrameTitleBar::OnMinBtnClicked);
connect(ui->sys_max, &QPushButton::clicked, this, &FrameTitleBar::OnMaxBtnClicked);
- connect(ui->sys_restore, &QPushButton::clicked, this, &FrameTitleBar::OnRestorClicked);
+ //connect(ui->sys_restore, &QPushButton::clicked, this, &FrameTitleBar::OnRestorClicked);
//connect(this, &FrameTitleBar::doubleClick, this, &FrameTitleBar::OnDoubleClicked);
- ui->sys_restore->hide();
- ui->sys_max->hide();
+ /*ui->sys_close->setIcon(style()->standardPixmap(QStyle::SP_TitleBarCloseButton));
+ ui->sys_min->setIcon(style()->standardPixmap(QStyle::SP_TitleBarMinButton));
+ ui->sys_max->setIcon(style()->standardPixmap(QStyle::SP_TitleBarMaxButton));*/
SetSysButton(0);
@@ -51,7 +52,6 @@ void FrameTitleBar::SetMainWidget(QWidget* widget) {
}
}
void FrameTitleBar::OnMaximized(bool maximized) {
- ui->sys_restore->setVisible(maximized);
ui->sys_max->setVisible(!maximized);
}
@@ -115,32 +115,11 @@ void FrameTitleBar::OnMaxBtnClicked() {
if (mainWidget_->isMaximized()) {
mainWidget_->showNormal();
+ ui->sys_max->setIcon(QPixmap(":/res/sys_max.png"));
} else {
mainWidget_->showMaximized();
+ ui->sys_max->setIcon(QPixmap(":/res/sys_restore.png"));
}
- ui->sys_max->hide();
- ui->sys_restore->show();
-
- ui->sys_restore->setFocusPolicy(Qt::NoFocus);
-}
-
-void FrameTitleBar::OnRestorClicked() {
- if (nullptr == mainWidget_) {
- qDebug() << __FUNCTION__ << "mainWidget is nullptr";
- return;
- }
-
- if (!mainWidget_->isMaximized()) {
- mainWidget_->showMaximized();
- }
- else {
- mainWidget_->showNormal();
- }
-
- ui->sys_max->show();
- ui->sys_restore->hide();
-
- ui->sys_max->setFocusPolicy(Qt::NoFocus);
}
void FrameTitleBar::OnCloseBtnClicked() {
diff --git a/src/ui/FrameTitleBar.h b/src/ui/FrameTitleBar.h
index 75ec9b84..ffde0227 100644
--- a/src/ui/FrameTitleBar.h
+++ b/src/ui/FrameTitleBar.h
@@ -48,7 +48,6 @@ protected:
protected:
void OnMinBtnClicked();
void OnMaxBtnClicked();
- void OnRestorClicked();
void OnCloseBtnClicked();
private:
diff --git a/src/ui/FrameTitleBar.ui b/src/ui/FrameTitleBar.ui
index 2cda3fc2..0f54f920 100644
--- a/src/ui/FrameTitleBar.ui
+++ b/src/ui/FrameTitleBar.ui
@@ -89,19 +89,6 @@
- -
-
-
-
- 32
- 32
-
-
-
-
-
-
-
-