basic 初始界面推进

Change-Id: Ie1ed8aa01332991633bc4a6cc6c201521cdc41a6

Login.cpp

@@ -1,5 +1,8 @@
 #include "Login.h"
+#include "OriginalWnd/OriginalWnd.h"
 #include "ui_Login.h"
+#include <QStackedWidget>
+#include <qDebug>
 
 Login::Login(QWidget *parent)
     : QMainWindow(parent)
@@ -24,6 +27,10 @@ void Login::initForm()
 
 void Login::on_pushButton_clicked()
 {
-    this->hide();
+    if (QStackedWidget *parent = qobject_cast<QStackedWidget*>(this->parentWidget())) {
+        OriginalWnd *originalWnd = new OriginalWnd(this);
+        parent->addWidget(originalWnd);
+        parent->setCurrentIndex(parent->indexOf(originalWnd));
+    }
 }
 

Login.ui

@@ -112,26 +112,26 @@
      <property name="geometry">
       <rect>
        <x>123</x>
-       <y>180</y>
+       <y>266</y>
        <width>1</width>
        <height>24</height>
       </rect>
      </property>
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Vertical</enum>
      </property>
     </widget>
-    <widget class="Line" name="line_2">
+    <widget class="Line" name="line_3">
      <property name="geometry">
       <rect>
        <x>123</x>
-       <y>266</y>
+       <y>180</y>
        <width>1</width>
        <height>24</height>
       </rect>
      </property>
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Vertical</enum>
      </property>
     </widget>
    </widget>
@@ -139,9 +139,9 @@
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>0</y>
+      <y>-120</y>
       <width>1768</width>
-      <height>1049</height>
+      <height>1271</height>
      </rect>
     </property>
    </widget>

MainWnd.cpp

@@ -11,6 +11,7 @@ MainWnd::MainWnd(QWidget *parent)
 {
     ui->setupUi(this);
 
+    // connect(ui->stackedWidget_3, &QStackedWidget::currentChanged,this, &MainWnd::onCurrentWidgetChanged);
     initForm();
 }
 
@@ -39,6 +40,8 @@ void MainWnd::initForm()
     //登录监听
     ui->label_logo->installEventFilter(this);
 
+    ui->stackedWidget_3->installEventFilter(this);
+
     //安装监听事件,点击左侧按钮图标变化
     ui->tabBondBtn->installEventFilter(this);
     ui->tabBondBtn_2->installEventFilter(this);
@@ -53,6 +56,10 @@ void MainWnd::initForm()
 
 bool MainWnd::eventFilter(QObject *obj, QEvent *event)
 {
+    if (obj == this->ui->stackedWidget_3)
+    {
+        onCurrentWidgetChanged();
+    }
 
     if (obj == this->ui->label_logo)
     {
@@ -152,34 +159,32 @@ bool MainWnd::eventFilter(QObject *obj, QEvent *event)
     return QWidget::eventFilter(obj, event); // 如果没有处理返回默认事件处理
 }
 
-// void MainWnd::on_pushButton_4_clicked()
-// {
-//     Demo001_1 *demo001_1 = new Demo001_1;
-//     ui->switchShowPageUI->addWidget(demo001_1);
-//     ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(demo001_1));
-// }
-
-
-// void MainWnd::on_pushButton_5_clicked()
-// {
-//     Demo001_2 *demo001_2 = new Demo001_2;
-//     ui->switchShowPageUI->addWidget(demo001_2);
-//     ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(demo001_2));
-// }
-
-
-// void MainWnd::on_pushButton_6_clicked()
-// {
-//     Demo001_3 *demo001_3 = new Demo001_3;
-//     ui->switchShowPageUI->addWidget(demo001_3);
-//     ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(demo001_3));
-// }
-
+void MainWnd::onCurrentWidgetChanged() {
+    QWidget *currentWidget = ui->stackedWidget_3->currentWidget();
+    if (currentWidget) {
+        QString currentWidgetName = currentWidget->objectName();
+
+        if (currentWidgetName == "OriginalWnd") {
+            ui->tabBondBtn->setIcon(QIcon(":/images/deep/home.png"));
+            ui->tabBondBtn->setChecked(true);
+            ui->tabBondBtn->setStyleSheet("background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #949FE8,stop:1 #2D309B);color:#FFFFFF;");
+            ui->tabBondBtn->update();
+        } else {
+            ui->tabBondBtn->setStyleSheet(""); // 恢复默认样式
+        }
+    }
+}
 
 void MainWnd::on_tabBondBtn_clicked()
 {
-    OriginalWnd *originalWnd = new OriginalWnd;
+    OriginalWnd *originalWnd = new OriginalWnd(this);
     ui->stackedWidget_3->addWidget(originalWnd);
     ui->stackedWidget_3->setCurrentIndex(ui->stackedWidget_3->indexOf(originalWnd));
 }
 
+
+void MainWnd::on_pushButton_clicked()
+{
+    qApp->quit();
+}
+

MainWnd.h

@@ -23,11 +23,14 @@ protected:
     bool eventFilter(QObject *obj,QEvent *event);
 
 private slots:
+    void onCurrentWidgetChanged();
 
 
     void on_tabBondBtn_clicked();
 
 
+    void on_pushButton_clicked();
+
 private:
     Ui::MainWnd *ui;
 };

MainWnd.ui

@@ -524,6 +524,19 @@
       <enum>Qt::ToolButtonTextUnderIcon</enum>
      </property>
     </widget>
+    <widget class="QPushButton" name="pushButton">
+     <property name="geometry">
+      <rect>
+       <x>13</x>
+       <y>810</y>
+       <width>92</width>
+       <height>28</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>CLOSE</string>
+     </property>
+    </widget>
    </widget>
    <widget class="QStackedWidget" name="stackedWidget_3">
     <property name="geometry">

OriginalWnd/Demo001_3.cpp

@@ -6,9 +6,19 @@ Demo001_3::Demo001_3(QWidget *parent)
     , ui(new Ui::Demo001_3)
 {
     ui->setupUi(this);
+
+    initFrom();
 }
 
 Demo001_3::~Demo001_3()
 {
     delete ui;
 }
+
+void Demo001_3::initFrom()
+{
+    // ui->toolBar->setFloatable(true);
+    // QAction *action1 = ui->toolBar->addAction(QIcon(":/images/light/zoom up.png"), "Action 1");
+    // QAction *action2 = ui->toolBar->addAction(QIcon(":/images/light/zoom out.png"), "Action 2");
+    // QAction *action3 = ui->toolBar->addAction(QIcon(":/path/to/your/icon3.png"), "Action 3");
+}

OriginalWnd/Demo001_3.h

@@ -15,6 +15,8 @@ public:
     explicit Demo001_3(QWidget *parent = nullptr);
     ~Demo001_3();
 
+    void initFrom();
+
 private:
     Ui::Demo001_3 *ui;
 };

OriginalWnd/Demo001_3.ui

@@ -6,15 +6,359 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>600</height>
+    <width>1102</width>
+    <height>988</height>
    </rect>
   </property>
+  <property name="mouseTracking">
+   <bool>false</bool>
+  </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
-  <widget class="QWidget" name="centralwidget"/>
-  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QWidget" name="centralwidget">
+   <widget class="QComboBox" name="comboBox">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>20</y>
+      <width>174</width>
+      <height>32</height>
+     </rect>
+    </property>
+   </widget>
+   <widget class="QWidget" name="widget" native="true">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>72</y>
+      <width>786</width>
+      <height>786</height>
+     </rect>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">background-color: rgb(0, 170, 127);</string>
+    </property>
+   </widget>
+   <widget class="Line" name="line_2">
+    <property name="geometry">
+     <rect>
+      <x>826</x>
+      <y>20</y>
+      <width>1</width>
+      <height>953</height>
+     </rect>
+    </property>
+    <property name="orientation">
+     <enum>Qt::Vertical</enum>
+    </property>
+   </widget>
+   <widget class="QWidget" name="widget_2" native="true">
+    <property name="geometry">
+     <rect>
+      <x>972</x>
+      <y>68</y>
+      <width>114</width>
+      <height>114</height>
+     </rect>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">background-color: rgb(0, 170, 127);</string>
+    </property>
+   </widget>
+   <widget class="QComboBox" name="comboBox_2">
+    <property name="geometry">
+     <rect>
+      <x>842</x>
+      <y>20</y>
+      <width>172</width>
+      <height>32</height>
+     </rect>
+    </property>
+   </widget>
+   <widget class="QPushButton" name="pushButton">
+    <property name="geometry">
+     <rect>
+      <x>1026</x>
+      <y>20</y>
+      <width>60</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
+   <widget class="QComboBox" name="comboBox_3">
+    <property name="geometry">
+     <rect>
+      <x>842</x>
+      <y>198</y>
+      <width>172</width>
+      <height>32</height>
+     </rect>
+    </property>
+   </widget>
+   <widget class="QPushButton" name="pushButton_2">
+    <property name="geometry">
+     <rect>
+      <x>1026</x>
+      <y>198</y>
+      <width>60</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
+   <widget class="QWidget" name="widget_3" native="true">
+    <property name="geometry">
+     <rect>
+      <x>842</x>
+      <y>68</y>
+      <width>114</width>
+      <height>114</height>
+     </rect>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">background-color: rgb(0, 170, 127);</string>
+    </property>
+   </widget>
+   <widget class="QWidget" name="widget_4" native="true">
+    <property name="geometry">
+     <rect>
+      <x>842</x>
+      <y>246</y>
+      <width>114</width>
+      <height>114</height>
+     </rect>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">background-color: rgb(0, 170, 127);</string>
+    </property>
+   </widget>
+   <widget class="QWidget" name="widget_5" native="true">
+    <property name="geometry">
+     <rect>
+      <x>972</x>
+      <y>246</y>
+      <width>114</width>
+      <height>114</height>
+     </rect>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">background-color: rgb(0, 170, 127);</string>
+    </property>
+   </widget>
+   <widget class="QWidget" name="widget_6" native="true">
+    <property name="geometry">
+     <rect>
+      <x>842</x>
+      <y>732</y>
+      <width>114</width>
+      <height>114</height>
+     </rect>
+    </property>
+    <widget class="QSlider" name="verticalSlider">
+     <property name="geometry">
+      <rect>
+       <x>30</x>
+       <y>12</y>
+       <width>18</width>
+       <height>56</height>
+      </rect>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+    </widget>
+    <widget class="QSlider" name="verticalSlider_2">
+     <property name="geometry">
+      <rect>
+       <x>65</x>
+       <y>12</y>
+       <width>18</width>
+       <height>56</height>
+      </rect>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+    </widget>
+    <widget class="QLineEdit" name="lineEdit">
+     <property name="geometry">
+      <rect>
+       <x>6</x>
+       <y>78</y>
+       <width>40</width>
+       <height>24</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QLineEdit" name="lineEdit_2">
+     <property name="geometry">
+      <rect>
+       <x>68</x>
+       <y>78</y>
+       <width>40</width>
+       <height>24</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label">
+     <property name="geometry">
+      <rect>
+       <x>50</x>
+       <y>83</y>
+       <width>14</width>
+       <height>14</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>%</string>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QWidget" name="widget_7" native="true">
+    <property name="geometry">
+     <rect>
+      <x>972</x>
+      <y>732</y>
+      <width>114</width>
+      <height>114</height>
+     </rect>
+    </property>
+    <widget class="QSlider" name="verticalSlider_3">
+     <property name="geometry">
+      <rect>
+       <x>30</x>
+       <y>12</y>
+       <width>18</width>
+       <height>56</height>
+      </rect>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+    </widget>
+    <widget class="QSlider" name="verticalSlider_4">
+     <property name="geometry">
+      <rect>
+       <x>65</x>
+       <y>12</y>
+       <width>18</width>
+       <height>56</height>
+      </rect>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+    </widget>
+    <widget class="QLineEdit" name="lineEdit_3">
+     <property name="geometry">
+      <rect>
+       <x>6</x>
+       <y>78</y>
+       <width>40</width>
+       <height>24</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QLineEdit" name="lineEdit_4">
+     <property name="geometry">
+      <rect>
+       <x>68</x>
+       <y>78</y>
+       <width>40</width>
+       <height>24</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_2">
+     <property name="geometry">
+      <rect>
+       <x>50</x>
+       <y>83</y>
+       <width>14</width>
+       <height>14</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>%</string>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QWidget" name="widget_8" native="true">
+    <property name="geometry">
+     <rect>
+      <x>842</x>
+      <y>858</y>
+      <width>114</width>
+      <height>114</height>
+     </rect>
+    </property>
+    <widget class="QSlider" name="verticalSlider_5">
+     <property name="geometry">
+      <rect>
+       <x>30</x>
+       <y>12</y>
+       <width>18</width>
+       <height>56</height>
+      </rect>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+    </widget>
+    <widget class="QSlider" name="verticalSlider_6">
+     <property name="geometry">
+      <rect>
+       <x>65</x>
+       <y>12</y>
+       <width>18</width>
+       <height>56</height>
+      </rect>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+    </widget>
+    <widget class="QLineEdit" name="lineEdit_5">
+     <property name="geometry">
+      <rect>
+       <x>6</x>
+       <y>78</y>
+       <width>40</width>
+       <height>24</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QLineEdit" name="lineEdit_6">
+     <property name="geometry">
+      <rect>
+       <x>68</x>
+       <y>78</y>
+       <width>40</width>
+       <height>24</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_3">
+     <property name="geometry">
+      <rect>
+       <x>50</x>
+       <y>83</y>
+       <width>14</width>
+       <height>14</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>%</string>
+     </property>
+    </widget>
+   </widget>
+  </widget>
  </widget>
  <resources/>
  <connections/>

OriginalWnd/OriginalWnd.cpp

@@ -1,5 +1,9 @@
 #include "OriginalWnd.h"
 #include "ui_OriginalWnd.h"
+#include "OriginalWnd/Demo001_1.h"
+#include "OriginalWnd/Demo001_2.h"
+#include "OriginalWnd/Demo001_3.h"
+#include <qDebug>
 
 OriginalWnd::OriginalWnd(QWidget *parent)
     : QMainWindow(parent)
@@ -24,4 +28,31 @@ void OriginalWnd::initForm()
 
 
     ui->label_6->setPixmap(QPixmap(":/images/light/user.png").scaled(20, 20, Qt::KeepAspectRatio));
+
+    Demo001_3 *demo001_3 = new Demo001_3;
+    ui->switchShowPageUI->addWidget(demo001_3);
+    ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(demo001_3));
+}
+
+void OriginalWnd::on_pushButton_4_clicked()
+{
+    Demo001_1 *demo001_1 = new Demo001_1;
+    ui->switchShowPageUI->addWidget(demo001_1);
+    ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(demo001_1));
+}
+
+
+void OriginalWnd::on_pushButton_5_clicked()
+{
+    Demo001_2 *demo001_2 = new Demo001_2;
+    ui->switchShowPageUI->addWidget(demo001_2);
+    ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(demo001_2));
+}
+
+
+void OriginalWnd::on_pushButton_6_clicked()
+{
+    Demo001_3 *demo001_3 = new Demo001_3;
+    ui->switchShowPageUI->addWidget(demo001_3);
+    ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(demo001_3));
 }

OriginalWnd/OriginalWnd.h

@@ -17,6 +17,13 @@ public:
 
     void initForm();
 
+private slots:
+    void on_pushButton_4_clicked();
+
+    void on_pushButton_5_clicked();
+
+    void on_pushButton_6_clicked();
+
 private:
     Ui::OriginalWnd *ui;
 };

light.qss

@@ -28,6 +28,7 @@ Login QPushButton
 Login QLineEdit#userNameLineEdit,
 Login QLineEdit#passLineEdit
 {
+    color:#FFFFFF;
     border-radius: 8px;
     padding-left:82px;
     border: 1px solid #9294FF;
@@ -62,7 +63,9 @@ MainWnd QWidget#centralwidget
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #E8EAFA, stop: 1 #D0D1EB);
 }
 
-QFrame#line
+QFrame#line,
+QFrame#line_3,
+Demo001_3 QFrame#line_2
 {
     background-color: #BABBDC;
 }
@@ -212,3 +215,79 @@ OriginalWnd QWidget#widget QPushButton#pushButton_6
     background: #CBD0FF;
     image: url(:/images/light/Demo001_3.png);
 }
+
+/* Demo001_3 */
+QComboBox
+{
+    border:1px solid #BABBDC;
+    border-radius:6px;
+    background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #FFFFFF,stop:1 #F2F2FA);
+}
+
+QComboBox::down-arrow
+{
+    image: url(:/images/drop.png);
+    width: 30px;
+    height:30px;
+}
+
+QComboBox::drop-down
+{
+    width:20px;
+    border:none;
+    padding-right:5px;
+}
+
+Demo001_3 QWidget#centralwidget
+{
+    border-radius: 10px;
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F1F4FD, stop: 1 #E5E4F6);
+}
+
+Demo001_3 QPushButton#pushButton,
+Demo001_3 QPushButton#pushButton_2
+{
+    image: url(:/images/unknown_1.png);
+    border-radius: 6px;
+    background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #949FE8,stop:1 #2D309B);
+}
+
+Demo001_3 QWidget#widget_6,
+Demo001_3 QWidget#widget_7,
+Demo001_3 QWidget#widget_8
+{
+    background: #D6D8ED;
+}
+
+Demo001_3 QLineEdit
+{
+    border-radius: 6px;
+    border: 1px solid #BABBDC;
+}
+
+Demo001_3 QWidget#widget_2,
+Demo001_3 QWidget#widget
+{
+    border-radius: 0px;
+}
+
+/* 为垂直滑块设置样式 */
+QSlider::groove:vertical {
+    height: 56px;
+    width: 3px;
+    background: rgba(78, 81, 206, 0.25);
+}
+
+QSlider::sub-page:vertical {
+    height: 56px;
+    width: 3px;
+    background: rgba(78, 81, 206, 0.25);
+}
+
+QSlider::handle:vertical {
+    border-image: url(:/images/slider.png);
+    height: 6px;
+    margin: 0px -5px 0px -5px;
+    border-radius: 4px;
+}
+

project01.pro

@@ -38,7 +38,8 @@ qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
-DISTFILES +=
+DISTFILES += \
+    images/drop.png
 
 RESOURCES += \
     res.qrc

project01.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 14.0.2, 2024-12-12T10:29:56. -->
+<!-- Written by QtCreator 14.0.2, 2024-12-16T18:03:04. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -85,6 +85,10 @@
     <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
     <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
    </valuemap>
+   <valuemap type="QVariantMap" key="ClangdSettings">
+    <value type="bool" key="blockIndexing">true</value>
+    <value type="bool" key="useGlobalSettings">true</value>
+   </valuemap>
   </valuemap>
  </data>
  <data>

res.qrc

@@ -33,5 +33,10 @@
         <file>images/logo.png</file>
         <file>images/login_user.png</file>
         <file>images/login_pass.png</file>
+        <file>images/drop.png</file>
+        <file>images/light/zoom up.png</file>
+        <file>images/light/zoom out.png</file>
+        <file>images/slider.png</file>
+        <file>images/unknown_1.png</file>
     </qresource>
 </RCC>