diff --git a/src/Dyt.qrc b/src/Dyt.qrc
index 74ebcf16..53582c31 100644
--- a/src/Dyt.qrc
+++ b/src/Dyt.qrc
@@ -25,6 +25,7 @@
res/default/menu_setting.png
res/default/menu_uisetting.png
res/default/menu_window_manager.png
+ res/default/menu_window_setting.png
diff --git a/src/config/skin/default.css b/src/config/skin/default.css
index fc0dc916..fb9a94e8 100644
--- a/src/config/skin/default.css
+++ b/src/config/skin/default.css
@@ -226,6 +226,12 @@ QWidget#SystemManagerMenu > QToolButton#menu_logs {
QWidget#SystemManagerMenu > QToolButton#menu_logs_clean {
qproperty-icon: url(:/res/default/menu_logs_clean.png);
}
+QWidget#SystemManagerMenu > QToolButton#menu_window_manager {
+ qproperty-icon: url(:/res/default/menu_window_manager.png);
+}
+QWidget#SystemManagerMenu > QToolButton#menu_uisetting {
+ qproperty-icon: url(:/res/default/menu_window_setting.png);
+}
QWidget#viewDisplay {
border: 5 solid #1C1D1F;
@@ -293,7 +299,3 @@ QDockWidget DockTitleWidget QPushButton::menu-indicator,
QDockWidget DockTitleWidget QToolButton::menu-indicator {
image: none;
}
-
-QListWidget {
- border: none;
-}
\ No newline at end of file
diff --git a/src/config/skin/default.qss b/src/config/skin/default.qss
index 8167ebcb..d4c2f311 100644
--- a/src/config/skin/default.qss
+++ b/src/config/skin/default.qss
@@ -91,17 +91,7 @@ QPushButton#sys_max {
border: none;
background: transparent;
image: url(:/res/sys_max.png);
- padding: 0;
-}
-
-QPushButton#sys_restore {
- max-width:48px;
- min-width:48px;
- max-height:28px;
- min-height:28px;
- border: none;
- background: transparent;
- image: url(:/res/sys_restore.png);
+
padding: 0;
}
@@ -125,7 +115,6 @@ QPushButton#sys_close::hover, QPushButton#sys_close::pressed {
QPushButton#sys_min::hover, QPushButton#sys_min::pressed,
QPushButton#sys_max::hover, QPushButton#sys_max::pressed,
-QPushButton#sys_restore::hover, QPushButton#sys_restore::pressed,
QToolButton#sys_skin::hover, QToolButton#sys_skin::pressed {
background: #38C0C0C0;
border: 1 solid #C0C0C0;
@@ -255,6 +244,12 @@ QWidget#SystemManagerMenu > QToolButton#menu_logs {
QWidget#SystemManagerMenu > QToolButton#menu_logs_clean {
qproperty-icon: url(:/res/default/menu_logs_clean.png);
}
+QWidget#SystemManagerMenu > QToolButton#menu_window_manager {
+ qproperty-icon: url(:/res/default/menu_window_manager.png);
+}
+QWidget#SystemManagerMenu > QToolButton#menu_uisetting {
+ qproperty-icon: url(:/res/default/menu_window_setting.png);
+}
QWidget#viewDisplay {
border: 5 solid #1C1D1F;
@@ -323,6 +318,26 @@ QDockWidget DockTitleWidget QToolButton::menu-indicator {
image: none;
}
-QListWidget {
- border: none;
+QMenu {
+ background: #212F3C;
+ color: #e0e0e0;
+ padding: 4px;
+}
+QMenu::item {
+ padding: 6px 30px 6px 20px;
+ margin: 2px;
+ border-radius: 3px;
+}
+
+QMenu::item:selected {
+ background:rgb(41, 59, 75);
+ color: white;
+}
+QMenu::item:checked {
+ background:rgb(41, 59, 75);
+}
+QMenu::separator {
+ height: 1px;
+ background: #555;
+ margin: 5px 10px;
}
diff --git a/src/res/default/menu_window_setting.png b/src/res/default/menu_window_setting.png
new file mode 100644
index 00000000..62ab9725
Binary files /dev/null and b/src/res/default/menu_window_setting.png differ
diff --git a/src/translations/Dyt_zh_CN.ts b/src/translations/Dyt_zh_CN.ts
index 7e0390fa..170d314f 100644
--- a/src/translations/Dyt_zh_CN.ts
+++ b/src/translations/Dyt_zh_CN.ts
@@ -444,17 +444,17 @@
-
+
default
-
+
silver
-
+
blue
@@ -1609,6 +1609,10 @@
+ windows setting
+
+
+
ui setting
diff --git a/src/ui/FrameTitleBar.cpp b/src/ui/FrameTitleBar.cpp
index 06ab88b0..bf46a0e1 100644
--- a/src/ui/FrameTitleBar.cpp
+++ b/src/ui/FrameTitleBar.cpp
@@ -9,6 +9,8 @@
#include
#include "common/RecourceHelper.h"
+#include "common/SpdLogger.h"
+#include "config.h"
#include "ui_FrameTitleBar.h"
@@ -137,15 +139,17 @@ void FrameTitleBar::InitSkinMemu() {
QStringList values;
values << "default" << "silver" << "blue";
- assert(values.count() == names.count());
+ dyt_check(values.count() == names.count());
ui->sys_skin->setPopupMode(QToolButton::InstantPopup);
for (int i = 0; i < names.count(); ++i) {
QAction* action = new QAction(names[i], this);
+ action->setCheckable(true);
action->setData(values[i]);
ui->sys_skin->addAction(action);
connect(action, &QAction::triggered, &RecourceHelper::Get(), &RecourceHelper::OnChangeStyle);
}
+ ui->sys_skin->actions().first()->setChecked(true);
}
void FrameTitleBar::InitMenuWidget() {
diff --git a/src/ui/MainFrame.h b/src/ui/MainFrame.h
index 9b139c0d..1e6de9fd 100644
--- a/src/ui/MainFrame.h
+++ b/src/ui/MainFrame.h
@@ -37,8 +37,7 @@ protected:
protected:
void OnMenuTrigged();
- void SetCurrentMenu(int index);
-
+ void SetCurrentMenu(int index);
private:
void InitUI();
diff --git a/src/ui/MainWindow.cpp b/src/ui/MainWindow.cpp
index 5c6e913d..81da8cb9 100644
--- a/src/ui/MainWindow.cpp
+++ b/src/ui/MainWindow.cpp
@@ -80,7 +80,7 @@ void MainWindow::InitUI() {
qtOsgViewWidget_ = new OsgWidget;
qtOsgViewWidget_->Initialize();
- m_mapDockWidget.insert("PropertyBrowser", attribte);
+ //m_mapDockWidget.insert("PropertyBrowser", attribte);
QString wavePath ="", speedPath = "", rdPath = "", matlabParam="";
if (WorkSpaceManager::Get().GetCurrent())
diff --git a/src/ui/Menu/SystemManagerMenu.ui b/src/ui/Menu/SystemManagerMenu.ui
index fa31b6ce..f63f8931 100644
--- a/src/ui/Menu/SystemManagerMenu.ui
+++ b/src/ui/Menu/SystemManagerMenu.ui
@@ -37,7 +37,7 @@
-
- ui setting
+ windows setting