modify skin and add png

src/Dyt.qrc

@@ -25,6 +25,7 @@
 		<file>res/default/menu_setting.png</file>
 		<file>res/default/menu_uisetting.png</file>
 		<file>res/default/menu_window_manager.png</file>
+		<file>res/default/menu_window_setting.png</file>
     </qresource>
     <qresource prefix="/qss">
     </qresource>

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;
-}

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;
 }

src/translations/Dyt_zh_CN.ts

@@ -444,17 +444,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/FrameTitleBar.cpp" line="136"/>
+        <location filename="../ui/FrameTitleBar.cpp" line="138"/>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/FrameTitleBar.cpp" line="136"/>
+        <location filename="../ui/FrameTitleBar.cpp" line="138"/>
         <source>silver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/FrameTitleBar.cpp" line="136"/>
+        <location filename="../ui/FrameTitleBar.cpp" line="138"/>
         <source>blue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1609,6 +1609,10 @@
     </message>
     <message>
         <location filename="../ui/Menu/SystemManagerMenu.ui" line="40"/>
+        <source>windows setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../ui/Menu/SystemManagerMenu.ui" line="50"/>
         <source>ui setting</source>
         <translation type="unfinished"></translation>

src/ui/FrameTitleBar.cpp

@@ -9,6 +9,8 @@
 #include <qDebug>
 
 #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() {

src/ui/MainFrame.h

@@ -37,8 +37,7 @@ protected:
 
 protected:
     void OnMenuTrigged();
-    void SetCurrentMenu(int index);
-    
+    void SetCurrentMenu(int index);    
 
 private:
     void InitUI();

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())

src/ui/Menu/SystemManagerMenu.ui

@@ -37,7 +37,7 @@
    <item>
     <widget class="QToolButton" name="menu_window_manager">
      <property name="toolTip">
-      <string>ui setting</string>
+      <string>windows setting</string>
      </property>
      <property name="text">
       <string/>