修改了下样式和修复了些交互功能

View/die-bonder-ui/CameraMaterialGroupWnd/Group.cpp

@@ -116,21 +116,22 @@ void Group::initForm()
 
     // MainWnd *mainWindow = new MainWnd();
     // connect(mainWindow,&MainWnd::styleChanged,this,&Group::Changedstyle);
-    // QTimer *timer = new QTimer(this);
-    // connect(timer, &QTimer::timeout, this, &Group::Changedstyle);
-    // timer->start(100);
+    QTimer *timer = new QTimer(this);
+    connect(timer, &QTimer::timeout, this, &Group::Changedstyle);
+    timer->start(100);
 }
 
 void Group::Changedstyle()
 {
     QSettings settings("YourCompany", "YourApplication_style");
-    int flag = settings.value("Flag_Style", 0).toInt();
+    int flag = settings.value("Flag_Style").toInt();
 
     if (flag == 0) {
-        ui->DatacomboBox->setStyleSheet("background-color: #FFFFFF;");
+       ui->DatacomboBox->setStyleSheet("background-color: #FFFFFF;");
     } else {
-        ui->DatacomboBox->setStyleSheet("background-color: #4C4FA6;");
+       ui->DatacomboBox->setStyleSheet("background-color: #4C4FA6;");
     }
+ 
 }
 
 bool Group::eventFilter(QObject *obj, QEvent *event)

View/die-bonder-ui/MainWnd.cpp

@@ -310,7 +310,7 @@ bool MainWnd::eventFilter(QObject* obj, QEvent* event)
 
     QSettings settings("YourCompany", "YourApplication_style");
     int flag = settings.value("Flag_Style", 0).toInt();
-
+/*
     switch (event->type())
     {
     case QEvent::MouseButtonPress:
@@ -765,7 +765,7 @@ bool MainWnd::eventFilter(QObject* obj, QEvent* event)
     default:
         break;
     }
-
+*/
     return QWidget::eventFilter(obj, event);
 }
 
@@ -793,7 +793,6 @@ void MainWnd::onCurrentWidgetChanged() {
             }
 
             ui->tabHomeBtn->setDisabled(true);
-            ui->tabHomeBtn->setIcon(QIcon(":/images/light/home.png"));
             ui->tabHomeBtn->setStyleSheet(styleSheet);
             ui->tabProductionBtn->setDisabled(true);
             ui->tabProductionBtn->setStyleSheet(styleSheet);
@@ -815,7 +814,7 @@ void MainWnd::onCurrentWidgetChanged() {
         else {
             ui->tabHomeBtn->setDisabled(false);
             if (!initialIconSet) {
-                ui->tabHomeBtn->setIcon(QIcon(":/images/deep/home.png"));
+               // ui->tabHomeBtn->setIcon(QIcon(":/images/deep/home.png"));
                 initialIconSet = true;
             }
             ui->tabProductionBtn->setDisabled(false);
@@ -839,18 +838,21 @@ void MainWnd::Init()
 
 
     int themeValue = gen_if.getThemeValue();
+    QSettings settings("YourCompany", "YourApplication_style");
     applyTheme(themeValue);
-
+    settings.setValue("Flag_Style", themeValue);
     if (gen_if.getLanguageValue() == 0)
     {
         translator.load(":/SBT_en.qm");
         qApp->installTranslator(&translator);
+        
     }
     else
     {
         //setChineseMode(this);
         translator.load(":/SBT_zh_CN.qm");
         qApp->installTranslator(&translator);
+        
     }
 
 

View/die-bonder-ui/OriginalWnd/ChartsAndCamerasWnd.cpp

@@ -41,6 +41,7 @@ ChartsAndCamerasWnd::ChartsAndCamerasWnd(QWidget* parent) :
     chartLine2->setGeometry(0, 490, 560, 280);
     chartLine2->setChartLabels("Theta placement", "Number of samples", "Theta device align");
 
+
     // 初始化系列信息
     initializeSeriesInfo();
 

View/die-bonder-ui/OriginalWnd/DbTreeViewManager.cpp

@@ -176,7 +176,7 @@ bool DbTreeViewManager::hasPrivilege(const int &UserGrade, const int &userPrivil
 {
     bool hasPriv;
     // UserGrade 是以逗号分隔的字符串，如 "1,2,3"
-    if(UserGrade==userPrivilege){
+    if((UserGrade&userPrivilege) == 1){
         hasPriv = true;
     }else{
         hasPriv = false;

View/die-bonder-ui/OriginalWnd/OriginalWnd.cpp

@@ -212,9 +212,12 @@ bool OriginalWnd::eventFilter(QObject* obj, QEvent* event)
             {
                 if (QStackedWidget* parent = qobject_cast<QStackedWidget*>(this->parentWidget()))
                 {
-                    Login* loginWnd = new Login(this);
-                    parent->addWidget(loginWnd);
-                    parent->setCurrentIndex(parent->indexOf(loginWnd));
+                    //Login* loginWnd = new Login(this);
+                    QPointer<Login> login = Login::instance();
+                    parent->addWidget(login);
+                    parent->setCurrentIndex(parent->indexOf(login));
+
+                    
                 }
             }
         }

View/die-bonder-ui/OriginalWnd/OriginalWnd.ui

@@ -200,7 +200,7 @@ production</string>
       <bool>true</bool>
      </property>
     </widget>
-    <widget class="Line" name="line_2">
+    <widget class="Line" name="line">
      <property name="geometry">
       <rect>
        <x>16</x>

View/die-bonder-ui/OriginalWnd/SingleCameraOperationWnd.ui

@@ -20,12 +20,12 @@
    <enum>Qt::LeftToRight</enum>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="Line" name="line_2">
+   <widget class="Line" name="line">
     <property name="geometry">
      <rect>
       <x>826</x>
       <y>20</y>
-      <width>1</width>
+      <width>2</width>
       <height>953</height>
      </rect>
     </property>
@@ -62,7 +62,7 @@
    <widget class="ControlOperationPage" name="viewwidgetgroup" native="true">
     <property name="geometry">
      <rect>
-      <x>10</x>
+      <x>0</x>
       <y>10</y>
       <width>810</width>
       <height>920</height>

View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.cpp

@@ -9,7 +9,6 @@ ControlOperationPage::ControlOperationPage(QWidget* parent)
     ui->setupUi(this);
     m_isEnable = false;
     m_bRuler = false;
-
     updateOperateWidget(QPixmap());
     InitWnd();
     initForm();
@@ -623,26 +622,23 @@ void ControlOperationPage::setEnableControls(bool enable) {
     ui->DataSources->setEnabled(enable);
     ui->RulerButton->setEnabled(enable);
     ui->PenButton->setEnabled(enable);
-    if (enable == true) {
-        ui->LiveButton->setStyleSheet(
-            "QPushButton:hover {"
-            "   background-color: #45a049;"
-            "}"
-            "QPushButton:pressed {"
-            "   background-color: #3e8e41;"
-            "}"
-        );
-        ui->RulerButton->setStyleSheet("background-color: #CBD0FF;");
-        ui->PenButton->setStyleSheet("background-color: #CBD0FF;");
+    // if (enable == true) {
+    //     ui->LiveButton->setStyleSheet(
+    //         "QPushButton:hover {"
+    //         "   background-color: #45a049;"
+    //         "}"
+    //         "QPushButton:pressed {"
+    //         "   background-color: #3e8e41;"
+    //         "}"
+    //     );
+     
 
         
     
-    }
-    else {
-        ui->LiveButton->setStyleSheet("background-color: lightgray;");
-        ui->RulerButton->setStyleSheet("background-color: lightgray;");
-        ui->PenButton->setStyleSheet("background-color: lightgray;");
-    }
+    // }
+    // else {
+    //     ui->LiveButton->setStyleSheet("background-color: lightgray;");
+    // }
 
 }
 
@@ -667,14 +663,12 @@ void ControlOperationPage::on_RulerButton_clicked()
         if (ui->PenButton->isChecked()) {
             ui->PenButton->setChecked(false);
             m_currentImageView->setIsDrawing(false);
-            //ui->PenButton->setStyleSheet("QPushButton { background-color: none; }");
-            ui->PenButton->setStyleSheet("QPushButton { background-color: #CBD0FF; }");
+
         }
-        ui->RulerButton->setStyleSheet("QPushButton { background-color: #808FFF; }");
     }
     else {
         m_currentImageView->cancelRuler();
-        ui->RulerButton->setStyleSheet("QPushButton { background-color: #CBD0FF; }");
+
     }
 }
 
@@ -690,20 +684,20 @@ void ControlOperationPage::on_PenButton_clicked() {
         
     }
     if (ui->PenButton->isChecked()) {
-        ui->PenButton->setStyleSheet("QPushButton { background-color: #808FFF; }");
+        
         //ui->Operatewidget->setIsDrawing(true);
         m_currentImageView->setIsDrawing(true);
         
         if (ui->RulerButton->isChecked()) {
             ui->RulerButton->setChecked(false);
             m_currentImageView->cancelRuler();
-            ui->RulerButton->setStyleSheet("QPushButton { background-color: #CBD0FF; }");
+            
         }
     }
     else {
         //ui->Operatewidget->setIsDrawing(false);
         m_currentImageView->setIsDrawing(false);
-        ui->PenButton->setStyleSheet("QPushButton { background-color: #CBD0FF; }");
+        
         
     }
 }

View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.ui

@@ -78,12 +78,21 @@
     </item>
     <item>
      <widget class="QLabel" name="label_Percentage">
+      <property name="maximumSize">
+       <size>
+        <width>16777215</width>
+        <height>21</height>
+       </size>
+      </property>
       <property name="layoutDirection">
        <enum>Qt::LeftToRight</enum>
       </property>
       <property name="text">
        <string>100%</string>
       </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
      </widget>
     </item>
     <item>

View/die-bonder-ui/Src/SystemInfoPage/PageWnd/LanguageSwitchWnd.cpp

@@ -43,6 +43,8 @@ LanguageSwitchWnd::LanguageSwitchWnd(QWidget *parent)
                 qssFile.close();
             }
             gen_if.setThemeValue(0);
+            QSettings settings("YourCompany", "YourApplication_style");
+            settings.setValue("Flag_Style", 0);
         }
         });
     connect(ui->darkRadioButton, &QRadioButton::toggled, this, [this](bool checked) {
@@ -54,6 +56,8 @@ LanguageSwitchWnd::LanguageSwitchWnd(QWidget *parent)
                 qApp->setStyleSheet(qssContent);
                 qssFile.close();
             }
+            QSettings settings("YourCompany", "YourApplication_style");
+            settings.setValue("Flag_Style", 1);
             gen_if.setThemeValue(1);
         }
         });

View/die-bonder-ui/dark.qss

@@ -73,6 +73,15 @@ ChartsAndCamerasWnd QFrame#line_2
     background-color: rgba(186, 189, 220, 0.6);
 }
 
+SingleCameraOperationWnd QWidget#centralwidget,
+MainAndSecondaryCamerasWnd QWidget#centralwidget,
+ChartsAndCamerasWnd QWidget#Leftwidget,
+ChartsAndCamerasWnd QWidget#Rightwidget
+{
+    border-radius: 10px;
+    background: #2F3297;
+}
+
 MainWnd QWidget#TabSideBar QToolButton
 {
     color: #FFFFFF;
@@ -304,6 +313,11 @@ ChartsAndCamerasWnd QWidget#BackGround
     border-radius: 0px;
 }
 
+
+
+
+
+
 QProgressBar {
     border: 2px solid grey;
     border-radius: 5px;
@@ -530,6 +544,9 @@ ChartsAndCamerasWnd QLabel#PurpleVerticalBar
 
 
 
+
+
+
 /* ControlOperationPage 类的样式封装 */
 ControlOperationPage QHBoxLayout#horizontalLayout_2
 {
@@ -567,42 +584,42 @@ ControlOperationPage QPushButton#LiveButton
 
 ControlOperationPage QPushButton#ZoomUpButton
 {
-    image: url(:/images/light/zoom up.png);
+    image: url(:/images/deep/zoom up.png);
     border-radius: 6px;
-    background: #CBD0FF;
+    background: #4E53B8;
     border: none;
 }
 
 ControlOperationPage QPushButton#ZoomOutButton
 {
-    image: url(:/images/light/zoom out.png);
+    image: url(:/images/deep/zoom out.png);
     border-radius: 6px;
-    background: #CBD0FF;
+    background: #4E53B8;
     border: none;
 }
 
 
 ControlOperationPage QPushButton#RulerButton
 {
-    image: url(:/images/light/ruler.png);
+    image: url(:/images/deep/ruler.png);
     border-radius: 6px;
-    background: #CBD0FF;
+    background: #4E53B8;
     border: none;
 }
 
 
 ControlOperationPage QPushButton#PenButton
 {
-    image: url(:/images/light/pen.png);
+    image: url(:/images/deep/pen.png);
     border-radius: 6px;
-    background: #CBD0FF;
+    background: #4E53B8;
     border: none;
 }
 
 ControlOperationPage QPushButton#switchJoystickBut
 {
     border-radius: 6px;
-    background: #CBD0FF;
+    background: #4E53B8;
     border: none;
 
 }
@@ -613,7 +630,21 @@ ControlOperationPage QPushButton#ZoomOutButton:pressed,
 ControlOperationPage QPushButton#ZoomUpButton:pressed,
 ControlOperationPage QPushButton#switchJoystickBut:pressed
 {
-    background: #808FFF; /* 点击时的背景颜色 */
+    background: #E17D07; /* 点击时的背景颜色 */
+}
+
+ControlOperationPage QPushButton#PenButton:checked,
+ControlOperationPage QPushButton#RulerButton:checked{
+    background: #E17D07;
+}
+
+ControlOperationPage QPushButton#PenButton:disabled{
+    background: #7276AA;
+    image: url(:/images/forbid_pen.png);
+}
+ControlOperationPage QPushButton#RulerButton:disabled{
+    background: #7276AA;
+    image: url(:/images/forbid_ruler.png);
 }
 
 
@@ -624,44 +655,33 @@ ControlOperationPage QPushButton#ZoomOutButton:hover,
 ControlOperationPage QPushButton#ZoomUpButton:hover,
 ControlOperationPage QPushButton#switchJoystickBut:hover
 {
-    background: #A6AFFF; /* 悬停时的背景颜色 */
+    background: #E17D07; /* 悬停时的背景颜色 */
 }
 
 
 ControlOperationPage QLabel#label_Percentage
 {
-    color: #4E51CE;
+    color: #CBD0FF;
     border-radius: 6px;
-    background: #CBD0FF;
+    background: #4E53B8;
     border: none;
 }
 
-Group QComboBox
-{
-    border:1px solid #BABBDC;
-    border-radius:6px;
-    background:#4C4FA6;
-}
-
-Group QComboBox::down-arrow
-{
-    image: url(:/images/drop.png);
-    width: 30px;
-    height:30px;
-}
 
-Group QComboBox::drop-down
-{
-    width:20px;
-    border:none;
-    padding-right:5px;
-}
 ControlOperationPage QComboBox
 {
     border:1px solid #6D6FB6;
     border-radius:6px;
     background: #4C4FA6;
-    color: #4C4FA6;
+    color: #FFFFFF;
+}
+
+ControlOperationPage QComboBox QAbstractItemView
+{
+     background-color: #4C4FA6; /* 设置下拉列表的背景颜色 */
+    color: black; /* 设置下拉列表的字体颜色为白色 */
+    selection-background-color: #666699; /* 可选：设置选中项的背景颜色 */
+    selection-color: white; /* 可选：设置选中项的字体颜色 */
 }
 
 ControlOperationPage QComboBox::down-arrow
@@ -1058,4 +1078,34 @@ QWidget#thirdLevelFieldWnd QPushButton[type="save"] {
 
 QWidget#thirdLevelFieldWnd QPushButton[type="save"]:hover {
     background-color: #5F80FF;
+}
+
+Group QComboBox
+{
+    border:1px solid #4C4FA6;
+    border-radius:6px;
+     background-color: #4C4FA6;
+     color: #FFFFFF;
+}
+
+Group QComboBox QAbstractItemView
+{
+     background-color: #4C4FA6; /* 设置下拉列表的背景颜色 */
+    color: black; /* 设置下拉列表的字体颜色为白色 */
+    selection-background-color: #666699; /* 可选：设置选中项的背景颜色 */
+    selection-color: white; /* 可选：设置选中项的字体颜色 */
+}
+
+Group QComboBox::down-arrow
+{
+    image: url(:/images/drop.png);
+    width: 30px;
+    height:30px;
+}
+
+Group QComboBox::drop-down
+{
+    width:20px;
+    border:none;
+    padding-right:5px;
 }

View/die-bonder-ui/light.qss

@@ -103,46 +103,130 @@ QWidget#TabSideBar>QToolButton#tabHomeBtn
     qproperty-icon:url(:/images/light/home.png);
 }
 
+QWidget#TabSideBar>QToolButton#tabHomeBtn::hover,
+QWidget#TabSideBar>QToolButton#tabHomeBtn::checked
+{
+    qproperty-icon:url(:/images/deep/home.png);
+}
+
 QWidget#TabSideBar>QToolButton#tabProductionBtn
 {
     qproperty-icon:url(:/images/light/Productionn assistance.png);
 }
 
+QWidget#TabSideBar>QToolButton#tabProductionBtn::hover,
+QWidget#TabSideBar>QToolButton#tabProductionBtn::checked
+{
+    qproperty-icon:url(:/images/deep/Productionn assistance.png);
+}
+
 QWidget#TabSideBar>QToolButton#tabProgramBtn
 {
     qproperty-icon:url(:/images/light/Program.png);
 }
+QWidget#TabSideBar>QToolButton#tabProgramBtn::hover,
+QWidget#TabSideBar>QToolButton#tabProgramBtn::checked
+{
+    qproperty-icon:url(:/images/deep/Program.png);
+}
+
 
 QWidget#TabSideBar>QToolButton#tabMessageBtn
 {
     qproperty-icon:url(:/images/light/Message.png);
 }
 
+QWidget#TabSideBar>QToolButton#tabMessageBtn::hover,
+QWidget#TabSideBar>QToolButton#tabMessageBtn::checked
+{
+    qproperty-icon:url(:/images/deep/Message.png);
+}
+
+
+
 QWidget#TabSideBar>QToolButton#tabModuleBtn
 {
     qproperty-icon:url(:/images/light/Module.png);
 }
 
+QWidget#TabSideBar>QToolButton#tabModuleBtn::hover,
+QWidget#TabSideBar>QToolButton#tabModuleBtn::checked
+{
+    qproperty-icon:url(:/images/deep/Module.png);
+}
+
+
+
 QWidget#TabSideBar>QToolButton#tabDispositionBtn
 {
     qproperty-icon:url(:/images/light/Disposition.png);
 }
 
+QWidget#TabSideBar>QToolButton#tabDispositionBtn::hover,
+QWidget#TabSideBar>QToolButton#tabDispositionBtn::checked
+{
+    qproperty-icon:url(:/images/deep/Disposition.png);
+}
+
 QWidget#TabSideBar>QToolButton#tabDiagnosisBtn
 {
     qproperty-icon:url(:/images/light/Diagnosis.png);
 }
 
+QWidget#TabSideBar>QToolButton#tabDiagnosisBtn::hover,
+QWidget#TabSideBar>QToolButton#tabDiagnosisBtn::checked
+{
+    qproperty-icon:url(:/images/deep/Diagnosis.png);
+}
+
 QWidget#TabSideBar>QToolButton#tabSystemBtn
 {
     qproperty-icon:url(:/images/light/System.png);
 }
 
+QWidget#TabSideBar>QToolButton#tabSystemBtn::hover,
+QWidget#TabSideBar>QToolButton#tabSystemBtn::checked
+{
+    qproperty-icon:url(:/images/deep/System.png);
+}
+
 QWidget#TabSideBar>QToolButton#tabHelpBtn
 {
     qproperty-icon:url(:/images/light/Help.png);
 }
 
+QWidget#TabSideBar>QToolButton#tabHelpBtn::hover,
+QWidget#TabSideBar>QToolButton#tabHelpBtn::checked
+{
+    qproperty-icon:url(:/images/deep/Help.png);
+}
+
+SingleCameraOperationWnd QWidget#centralwidget,
+MainAndSecondaryCamerasWnd QWidget#centralwidget,
+ChartsAndCamerasWnd QWidget#Leftwidget,
+ChartsAndCamerasWnd QWidget#Rightwidget
+{
+    border-radius: 10px;
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F1F4FD, stop: 1 #E5E4F6);
+}
+
+OriginalWnd QFrame#line,
+SingleCameraOperationWnd QFrame#line,
+MainAndSecondaryCamerasWnd QFrame#line,
+ChartsAndCamerasWnd QFrame#line
+{
+    border:none;
+    background-color: rgba(186, 189, 220, 0.6);
+}
+
+/*初始界面*/
+OriginalWnd QWidget#menuFunctionsSwitchWidget,
+OriginalWnd QWidget#widget
+{
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F1F4FD, stop: 1 #E5E4F6);
+    border-radius: 10px;
+}
+
 /*顶部*/
 QWidget#Toptitlebar
 {
@@ -459,6 +543,16 @@ ControlOperationPage QPushButton#LiveButton
 }
 
 
+ControlOperationPage QPushButton#PenButton:disabled{
+    background: #D6D8ED;
+    image: url(:/images/forbid_pen.png);
+}
+ControlOperationPage QPushButton#RulerButton:disabled{
+    background: #D6D8ED;
+    image: url(:/images/forbid_ruler.png);
+}
+
+
 ControlOperationPage QPushButton#ZoomUpButton
 {
     image: url(:/images/light/zoom up.png);
@@ -510,6 +604,22 @@ ControlOperationPage QPushButton#switchJoystickBut:pressed
     background: #808FFF; /* 点击时的背景颜色 */
 }
 
+ControlOperationPage QPushButton#PenButton:checked,
+ControlOperationPage QPushButton#RulerButton:checked{
+    background: #808FFF;
+}
+
+ControlOperationPage QPushButton#LiveButton:pressed,
+ControlOperationPage QPushButton#LiveButton:hover
+{
+    background-color: #45a049;
+}
+
+ControlOperationPage QPushButton#LiveButton:disabled
+{
+    background-color: darkgray;
+}
+
 
 ControlOperationPage QPushButton#switchJoystickBut:hover,
 ControlOperationPage QPushButton#PenButton:hover,

View/die-bonder-ui/res.qrc

@@ -103,5 +103,7 @@
         <file>images/deep/logo1.png</file>
         <file>SBT_en.qm</file>
         <file>SBT_zh_CN.qm</file>
+        <file>images/forbid_pen.png</file>
+        <file>images/forbid_ruler.png</file>
     </qresource>
 </RCC>