fix cacheconfirmwidget error
This commit is contained in:
parent
e91803379b
commit
33be23b581
|
@ -8,8 +8,8 @@ MainWindow::MainWindow(QWidget *parent)
|
||||||
m_bridge = Bridge::getInstance();
|
m_bridge = Bridge::getInstance();
|
||||||
FileProcess();
|
FileProcess();
|
||||||
m_bridge->createSavePathConfig();
|
m_bridge->createSavePathConfig();
|
||||||
initUI();
|
|
||||||
m_titlebar = new TitleBar(this);
|
m_titlebar = new TitleBar(this);
|
||||||
|
initUI();
|
||||||
QVBoxLayout *layout = new QVBoxLayout(this);
|
QVBoxLayout *layout = new QVBoxLayout(this);
|
||||||
layout->setContentsMargins(0, 0, 0,0 );
|
layout->setContentsMargins(0, 0, 0,0 );
|
||||||
layout->setSpacing(0);
|
layout->setSpacing(0);
|
||||||
|
@ -181,7 +181,7 @@ void MainWindow::initUI()
|
||||||
m_stackedWidget = new QStackedWidget(this);
|
m_stackedWidget = new QStackedWidget(this);
|
||||||
m_stackedWidget->addWidget(scrollArea);
|
m_stackedWidget->addWidget(scrollArea);
|
||||||
m_stackedWidget->addWidget(m_maininterface);
|
m_stackedWidget->addWidget(m_maininterface);
|
||||||
|
m_titlebar->setGoHomeBtn(false);
|
||||||
QVBoxLayout* mainLayout = new QVBoxLayout;
|
QVBoxLayout* mainLayout = new QVBoxLayout;
|
||||||
mainLayout->addWidget(m_stackedWidget);
|
mainLayout->addWidget(m_stackedWidget);
|
||||||
|
|
||||||
|
@ -198,6 +198,7 @@ void MainWindow::initUI()
|
||||||
buttonGroup->addButton(m_grubbtn);
|
buttonGroup->addButton(m_grubbtn);
|
||||||
|
|
||||||
connect(m_historywidget,&HistoryWidget::startSecondEdit,[=](HistoryInfo InfoData){
|
connect(m_historywidget,&HistoryWidget::startSecondEdit,[=](HistoryInfo InfoData){
|
||||||
|
m_titlebar->setGoHomeBtn(true);
|
||||||
m_maininterface->isHistory(true);
|
m_maininterface->isHistory(true);
|
||||||
m_stackedWidget->setCurrentWidget(m_maininterface);
|
m_stackedWidget->setCurrentWidget(m_maininterface);
|
||||||
|
|
||||||
|
@ -210,6 +211,8 @@ void MainWindow::initUI()
|
||||||
|
|
||||||
connect(buttonGroup, QOverload<QAbstractButton*>::of(&QButtonGroup::buttonClicked), [=](QAbstractButton* button) {
|
connect(buttonGroup, QOverload<QAbstractButton*>::of(&QButtonGroup::buttonClicked), [=](QAbstractButton* button) {
|
||||||
m_stackedWidget->setCurrentWidget(m_maininterface);
|
m_stackedWidget->setCurrentWidget(m_maininterface);
|
||||||
|
m_ishistory = false;
|
||||||
|
m_titlebar->setGoHomeBtn(true);
|
||||||
m_maininterface->isHistory(false);
|
m_maininterface->isHistory(false);
|
||||||
if (button == m_globalbtn) {
|
if (button == m_globalbtn) {
|
||||||
m_maininterface->setGlobalTheme();
|
m_maininterface->setGlobalTheme();
|
||||||
|
@ -361,6 +364,7 @@ void MainWindow::onGoHomeClicked()
|
||||||
GrubThemeWidget::g_themeChange = false;
|
GrubThemeWidget::g_themeChange = false;
|
||||||
GlobalThemeWidget::g_themeChange = false;
|
GlobalThemeWidget::g_themeChange = false;
|
||||||
m_ishistory = false;
|
m_ishistory = false;
|
||||||
|
m_titlebar->setGoHomeBtn(false);
|
||||||
});
|
});
|
||||||
connect(m_cacheConfirmedWidget, &cacheConfirmedWidget::cacheSave, this, [=](){
|
connect(m_cacheConfirmedWidget, &cacheConfirmedWidget::cacheSave, this, [=](){
|
||||||
m_historywidget->updateHistoryDir();
|
m_historywidget->updateHistoryDir();
|
||||||
|
@ -377,6 +381,10 @@ void MainWindow::onGoHomeClicked()
|
||||||
GrubThemeWidget::g_themeChange = false;
|
GrubThemeWidget::g_themeChange = false;
|
||||||
GlobalThemeWidget::g_themeChange = false;
|
GlobalThemeWidget::g_themeChange = false;
|
||||||
m_ishistory = false;
|
m_ishistory = false;
|
||||||
|
m_titlebar->setGoHomeBtn(false);
|
||||||
|
});
|
||||||
|
connect(m_cacheConfirmedWidget, &cacheConfirmedWidget::cacheCancel, this, [=](){
|
||||||
|
m_titlebar->setGoHomeBtn(true);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
if(!m_ishistory){
|
if(!m_ishistory){
|
||||||
|
@ -398,6 +406,7 @@ void MainWindow::onGoHomeClicked()
|
||||||
m_ishistory = false;
|
m_ishistory = false;
|
||||||
m_stackedWidget->setCurrentIndex(0);
|
m_stackedWidget->setCurrentIndex(0);
|
||||||
}
|
}
|
||||||
|
m_titlebar->setGoHomeBtn(false);
|
||||||
} else {
|
} else {
|
||||||
m_stackedWidget->setCurrentIndex(0);
|
m_stackedWidget->setCurrentIndex(0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,6 +46,7 @@ cacheConfirmedWidget::cacheConfirmedWidget(QWidget *parent)
|
||||||
this->close();
|
this->close();
|
||||||
});
|
});
|
||||||
QObject::connect(m_cancel,&QPushButton::clicked,this,[=](){
|
QObject::connect(m_cancel,&QPushButton::clicked,this,[=](){
|
||||||
|
emit cacheCancel();
|
||||||
this->close();
|
this->close();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@ public:
|
||||||
signals:
|
signals:
|
||||||
void cacheSave();
|
void cacheSave();
|
||||||
void cacheClean();
|
void cacheClean();
|
||||||
|
void cacheCancel();
|
||||||
private:
|
private:
|
||||||
QVBoxLayout *m_cacheConfirmedWidget;
|
QVBoxLayout *m_cacheConfirmedWidget;
|
||||||
QLabel *m_questionMessage;
|
QLabel *m_questionMessage;
|
||||||
|
|
|
@ -95,19 +95,6 @@ void GlobalThemeWidget::eidtInitWidget(const HistoryInfo &InfoData)
|
||||||
*/
|
*/
|
||||||
void GlobalThemeWidget::refresh()
|
void GlobalThemeWidget::refresh()
|
||||||
{
|
{
|
||||||
|
|
||||||
this->setRadiusSetting(6);
|
|
||||||
this->setAccentColor("#3790FA");
|
|
||||||
this->setWindowRadius(6);
|
|
||||||
this->setTransparency(65);
|
|
||||||
this->setCover(":/resource/background/custom-preview.png");
|
|
||||||
this->setWallpaper(":/resource/background/1-openkylin.jpg");
|
|
||||||
this->setStyle("light");
|
|
||||||
m_preview->updateWidgetBackgroundColor(QColor(255, 255, 255));
|
|
||||||
m_preview->updateOverlayImage(":/resource/background/panel-light.png");
|
|
||||||
m_preview->updateWallpaper(":/resource/background/background-light.png");
|
|
||||||
m_preview->updatescale1();
|
|
||||||
|
|
||||||
m_info.coverpath = ":/resource/background/custom-preview.png";
|
m_info.coverpath = ":/resource/background/custom-preview.png";
|
||||||
m_info.wallpaperpath = ":/resource/background/1-openkylin.jpg";
|
m_info.wallpaperpath = ":/resource/background/1-openkylin.jpg";
|
||||||
m_info.widgetstyle = "light";
|
m_info.widgetstyle = "light";
|
||||||
|
@ -116,6 +103,18 @@ void GlobalThemeWidget::refresh()
|
||||||
m_info.transparency = 65;
|
m_info.transparency = 65;
|
||||||
m_info.windowradius = 6;
|
m_info.windowradius = 6;
|
||||||
|
|
||||||
|
this->setRadiusSetting(m_info.radius);
|
||||||
|
this->setAccentColor(m_info.accentcolor);
|
||||||
|
this->setWindowRadius(m_info.windowradius);
|
||||||
|
this->setTransparency(m_info.transparency);
|
||||||
|
this->setCover(m_info.coverpath);
|
||||||
|
this->setWallpaper(m_info.wallpaperpath);
|
||||||
|
this->setStyle(m_info.widgetstyle);
|
||||||
|
m_preview->updateWidgetBackgroundColor(QColor(255, 255, 255));
|
||||||
|
m_preview->updateOverlayImage(":/resource/background/panel-light.png");
|
||||||
|
m_preview->updateWallpaper(":/resource/background/background-light.png");
|
||||||
|
m_preview->updatescale1();
|
||||||
|
|
||||||
m_globalPresenceMap->clear();
|
m_globalPresenceMap->clear();
|
||||||
m_globalPresenceMap->insert("cover",false);
|
m_globalPresenceMap->insert("cover",false);
|
||||||
m_globalPresenceMap->insert("wallpaper",false);
|
m_globalPresenceMap->insert("wallpaper",false);
|
||||||
|
|
|
@ -136,3 +136,13 @@ void TitleBar::toggleMaximize()
|
||||||
m_maximumbtn->setIcon(QIcon::fromTheme("window-maximize-symbolic"));
|
m_maximumbtn->setIcon(QIcon::fromTheme("window-maximize-symbolic"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TitleBar::setGoHomeBtn(bool isable)
|
||||||
|
{
|
||||||
|
if(isable){
|
||||||
|
m_gohomebtn->setDisabled(false);
|
||||||
|
}else{
|
||||||
|
m_gohomebtn->setDisabled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -22,6 +22,7 @@ public:
|
||||||
void toggleMaximize();
|
void toggleMaximize();
|
||||||
QPushButton *m_gohomebtn = nullptr;
|
QPushButton *m_gohomebtn = nullptr;
|
||||||
|
|
||||||
|
void setGoHomeBtn(bool isable);
|
||||||
signals:
|
signals:
|
||||||
void gohomesignal(); // 声明自定义信号
|
void gohomesignal(); // 声明自定义信号
|
||||||
void savePathUpdate(const QString& filePath);
|
void savePathUpdate(const QString& filePath);
|
||||||
|
|
Loading…
Reference in New Issue