|
@@ -1,5 +1,6 @@
|
|
#include "MainWindow.h"
|
|
#include "MainWindow.h"
|
|
|
|
|
|
|
|
+#include "CustomTitleBar.h"
|
|
#include "HomeView.h"
|
|
#include "HomeView.h"
|
|
#include "ProjectView.h"
|
|
#include "ProjectView.h"
|
|
#include "ExpertView.h"
|
|
#include "ExpertView.h"
|
|
@@ -8,7 +9,6 @@
|
|
#include "AboutView.h"
|
|
#include "AboutView.h"
|
|
|
|
|
|
#include <QFramelessWindow.h>
|
|
#include <QFramelessWindow.h>
|
|
-#include <TitleBar.h>
|
|
|
|
|
|
|
|
#include <Navigation/NavigationInterface.h>
|
|
#include <Navigation/NavigationInterface.h>
|
|
#include <Widgets/StackedWidget.h>
|
|
#include <Widgets/StackedWidget.h>
|
|
@@ -25,6 +25,11 @@ StackedWidget::StackedWidget(QWidget *parent) : QFrame(parent)
|
|
|
|
|
|
connect(m_view, &PopUpAniStackedWidget::currentChanged, this,
|
|
connect(m_view, &PopUpAniStackedWidget::currentChanged, this,
|
|
[this](int index) { emit currentWidgetChanged(m_view->widget(index)); });
|
|
[this](int index) { emit currentWidgetChanged(m_view->widget(index)); });
|
|
|
|
+
|
|
|
|
+ QPalette pal(palette());
|
|
|
|
+ pal.setColor(QPalette::Background, QColor("#fffff8"));
|
|
|
|
+ setAutoFillBackground(true);
|
|
|
|
+ setPalette(pal);
|
|
}
|
|
}
|
|
|
|
|
|
void StackedWidget::addWidget(QWidget *widget)
|
|
void StackedWidget::addWidget(QWidget *widget)
|
|
@@ -67,7 +72,8 @@ MainWindow::~MainWindow() { }
|
|
|
|
|
|
void MainWindow::initialize()
|
|
void MainWindow::initialize()
|
|
{
|
|
{
|
|
- m_titleBar = new StandardTitleBar(this);
|
|
|
|
|
|
+ m_titleBar = new CustomTitleBar(this);
|
|
|
|
+
|
|
m_widgetLayout = new QHBoxLayout();
|
|
m_widgetLayout = new QHBoxLayout();
|
|
m_stackWidget = new StackedWidget(this);
|
|
m_stackWidget = new StackedWidget(this);
|
|
m_naviInterface = new NavigationInterface(true, true, this);
|
|
m_naviInterface = new NavigationInterface(true, true, this);
|