fix build btn test

This commit is contained in:
like 2024-04-28 16:15:58 +08:00
parent d8e861235c
commit a6331d3cd0
11 changed files with 87 additions and 24 deletions

View File

@ -453,3 +453,11 @@ void MainInterface::hideNavigation(bool isglobal)
{ {
m_navigationwidget->setHidden(!isglobal); m_navigationwidget->setHidden(!isglobal);
} }
void MainInterface::setBuildBtnText(bool isglobal)
{
m_iconthemewidget->setBuildBtnText(isglobal);
m_cursorthemewidget->setBuildBtnText(isglobal);
m_plymouththemewidget->setBuildBtnText(isglobal);
m_grubthemewidget->setBuildBtnText(isglobal);
}

View File

@ -58,6 +58,7 @@ public:
void hideNavigation(bool isglobal); void hideNavigation(bool isglobal);
void setBuildBtnText(bool isglobal);
signals: signals:
void wallpaperupdate(const QString& filePath); void wallpaperupdate(const QString& filePath);
void wallpaperPathChanged(QString path); void wallpaperPathChanged(QString path);

View File

@ -252,8 +252,12 @@ void MainWindow::initUI()
m_ishistory = true; m_ishistory = true;
if(InfoData.themetype == "globalTheme"){ if(InfoData.themetype == "globalTheme"){
m_maininterface->hideNavigation(true); m_maininterface->hideNavigation(true);
m_maininterface->setBuildBtnText(true);
}else{ }else{
m_maininterface->hideNavigation(false); m_maininterface->hideNavigation(false);
m_maininterface->setBuildBtnText(false);
} }
}); });
@ -283,6 +287,8 @@ void MainWindow::initUI()
m_maininterface->refresh("plymouth"); m_maininterface->refresh("plymouth");
m_maininterface->refresh("grub"); m_maininterface->refresh("grub");
m_maininterface->hideNavigation(true); m_maininterface->hideNavigation(true);
m_maininterface->setBuildBtnText(true);
m_maininterface->setBuildBtnText(false);
} else if (button == m_iconbtn) { } else if (button == m_iconbtn) {
m_maininterface->setIconTheme(); m_maininterface->setIconTheme();
@ -294,6 +300,8 @@ void MainWindow::initUI()
m_bridge->updateIconCache(m_maininterface->getDeviceIconsMap(),"deviceicon"); m_bridge->updateIconCache(m_maininterface->getDeviceIconsMap(),"deviceicon");
m_maininterface->refresh("icon"); m_maininterface->refresh("icon");
m_maininterface->hideNavigation(false); m_maininterface->hideNavigation(false);
m_maininterface->setBuildBtnText(false);
} else if (button == m_cursorbtn) { } else if (button == m_cursorbtn) {
m_maininterface->setCursorTheme(); m_maininterface->setCursorTheme();
m_fileProcess.FileCreate("cursorTheme"); m_fileProcess.FileCreate("cursorTheme");
@ -302,6 +310,8 @@ void MainWindow::initUI()
m_bridge->updateIconCache(m_maininterface->getTimeCurosrMap(),"timecursor"); m_bridge->updateIconCache(m_maininterface->getTimeCurosrMap(),"timecursor");
m_maininterface->refresh("cursor"); m_maininterface->refresh("cursor");
m_maininterface->hideNavigation(false); m_maininterface->hideNavigation(false);
m_maininterface->setBuildBtnText(false);
}else if (button == m_plymouthbtn) { }else if (button == m_plymouthbtn) {
m_maininterface->setPlymouthTheme(); m_maininterface->setPlymouthTheme();
m_fileProcess.FileCreate("plymouthTheme"); m_fileProcess.FileCreate("plymouthTheme");
@ -310,6 +320,8 @@ void MainWindow::initUI()
startShowPlymouth(); startShowPlymouth();
m_maininterface->refresh("plymouth"); m_maininterface->refresh("plymouth");
m_maininterface->hideNavigation(false); m_maininterface->hideNavigation(false);
m_maininterface->setBuildBtnText(false);
}else if (button == m_grubbtn) { }else if (button == m_grubbtn) {
m_maininterface->setGrubTheme(); m_maininterface->setGrubTheme();
m_fileProcess.FileCreate("grubTheme"); m_fileProcess.FileCreate("grubTheme");
@ -317,6 +329,8 @@ void MainWindow::initUI()
m_bridge->createGrub(); m_bridge->createGrub();
m_maininterface->refresh("grub"); m_maininterface->refresh("grub");
m_maininterface->hideNavigation(false); m_maininterface->hideNavigation(false);
m_maininterface->setBuildBtnText(false);
} }
if (false == m_historywidget->isVisible()) { if (false == m_historywidget->isVisible()) {

View File

@ -148,6 +148,15 @@ void CursorThemeWidget::useRestoreScale()
m_preview2->miniscale(); m_preview2->miniscale();
} }
void CursorThemeWidget::setBuildBtnText(bool isglobal)
{
if(isglobal){
m_buildButton->setText(tr("Start Global Theme Building"));
} else {
m_buildButton->setText(tr("Start Cursor Theme Building"));
}
}
/** /**
* @brief * @brief
* *
@ -464,13 +473,14 @@ void CursorThemeWidget::initBuildWidget()
m_batchimportdlg = new BatchImportDialog(); m_batchimportdlg = new BatchImportDialog();
m_buildwidget->setFixedHeight(70); m_buildwidget->setFixedHeight(70);
QPushButton *buildButton = new QPushButton(m_buildwidget); m_buildButton = new QPushButton(m_buildwidget);
QPushButton *bacthButton = new QPushButton(); QPushButton *bacthButton = new QPushButton();
bacthButton->setText(tr("Batch addition"));
// buildButton->setFixedSize(346,36); // buildButton->setFixedSize(346,36);
buildButton->setText(tr("Start Cursor Theme Building")); m_buildButton->setText(tr("Start Cursor Theme Building"));
QHBoxLayout *buildlayout = new QHBoxLayout(m_buildwidget); QHBoxLayout *buildlayout = new QHBoxLayout(m_buildwidget);
buildlayout->addWidget(bacthButton); buildlayout->addWidget(bacthButton);
buildlayout->addWidget(buildButton); buildlayout->addWidget(m_buildButton);
connect(m_batchimportdlg,&BatchImportDialog::startimport,this,[=](){ connect(m_batchimportdlg,&BatchImportDialog::startimport,this,[=](){
m_batchimportdlg->close(); m_batchimportdlg->close();
@ -537,7 +547,7 @@ void CursorThemeWidget::initBuildWidget()
connect(bacthButton,&QPushButton::clicked,this,[=](){ connect(bacthButton,&QPushButton::clicked,this,[=](){
m_batchimportdlg->show(); m_batchimportdlg->show();
}); });
connect(buildButton,&QPushButton::clicked,this,[=](){ connect(m_buildButton,&QPushButton::clicked,this,[=](){
emit build(); emit build();
}); });
} }
@ -663,7 +673,4 @@ void CursorThemeWidget::updateCustomPathMap(QMap<QString, QString> *historyMap,
} }
} }
} }
} }

View File

@ -35,7 +35,7 @@ public:
void useMaximumScale(); void useMaximumScale();
void useRestoreScale(); void useRestoreScale();
void setBuildBtnText(bool isglobal);
signals: signals:
void wallpaperupdate(const QString& filePath); void wallpaperupdate(const QString& filePath);
void newCursorMap(QMap<QString, QString> *cursormap); void newCursorMap(QMap<QString, QString> *cursormap);
@ -82,6 +82,7 @@ private:
HistoryInfo m_info; HistoryInfo m_info;
BatchImportDialog *m_batchimportdlg; BatchImportDialog *m_batchimportdlg;
QScrollArea *m_scrollArea; QScrollArea *m_scrollArea;
QPushButton *m_buildButton;
}; };
#endif // CURSORTHEMEWIDGET_H #endif // CURSORTHEMEWIDGET_H

View File

@ -182,12 +182,12 @@ void GrubThemeWidget::initBuildWidget()
{ {
m_buildwidget = new QWidget(); m_buildwidget = new QWidget();
m_buildwidget->setFixedHeight(70); m_buildwidget->setFixedHeight(70);
QPushButton *buildButton = new QPushButton(m_buildwidget); m_buildButton = new QPushButton(m_buildwidget);
buildButton->setFixedSize(346,36); m_buildButton->setFixedSize(346,36);
buildButton->setText(tr("Start Grub Theme Building")); m_buildButton->setText(tr("Start Grub Theme Building"));
QHBoxLayout *buildlayout = new QHBoxLayout(m_buildwidget); QHBoxLayout *buildlayout = new QHBoxLayout(m_buildwidget);
buildlayout->addWidget(buildButton); buildlayout->addWidget(m_buildButton);
connect(buildButton,&QPushButton::clicked,this,[=](){ connect(m_buildButton,&QPushButton::clicked,this,[=](){
emit build(); emit build();
}); });
} }
@ -220,6 +220,15 @@ void GrubThemeWidget::useRestoreScale()
m_preview->miniscale(); m_preview->miniscale();
} }
void GrubThemeWidget::setBuildBtnText(bool isglobal)
{
if(isglobal){
m_buildButton->setText(tr("Start Global Theme Building"));
} else {
m_buildButton->setText(tr("Start Grub Theme Building"));
}
}
void GrubThemeWidget::addspaceritem() void GrubThemeWidget::addspaceritem()
{ {
QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding); QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding);

View File

@ -28,6 +28,7 @@ public:
void refresh(); void refresh();
void useMaximumScale(); void useMaximumScale();
void useRestoreScale(); void useRestoreScale();
void setBuildBtnText(bool isglobal);
signals: signals:
void newGrubFilePath(const QString& path); void newGrubFilePath(const QString& path);
void build(); void build();
@ -40,6 +41,7 @@ private:
QWidget *m_buildwidget; QWidget *m_buildwidget;
QVBoxLayout *m_previewlayout; QVBoxLayout *m_previewlayout;
GrubEditButton *m_showBtn; GrubEditButton *m_showBtn;
QPushButton *m_buildButton;
}; };
#endif // GRUBTHEMEWIDGET_H #endif // GRUBTHEMEWIDGET_H

View File

@ -619,14 +619,14 @@ void IconThemeWidget::initBatchEditWidget()
QPushButton *bacthButton = new QPushButton(m_batchwidget); QPushButton *bacthButton = new QPushButton(m_batchwidget);
bacthButton->setText(tr("Batch addition")); bacthButton->setText(tr("Batch addition"));
QPushButton*buildButton = new QPushButton(m_batchwidget); m_buildButton = new QPushButton(m_batchwidget);
buildButton->setText(tr("Start Icon Theme Building")); m_buildButton->setText(tr("Start Icon Theme Building"));
m_batchimportdlg = new BatchImportDialog(); m_batchimportdlg = new BatchImportDialog();
QHBoxLayout *layout = new QHBoxLayout(m_batchwidget); QHBoxLayout *layout = new QHBoxLayout(m_batchwidget);
layout->addWidget(bacthButton); layout->addWidget(bacthButton);
layout->addWidget(buildButton); layout->addWidget(m_buildButton);
m_batchwidget->setFixedHeight(60); m_batchwidget->setFixedHeight(60);
@ -800,7 +800,7 @@ void IconThemeWidget::initBatchEditWidget()
connect(bacthButton,&QPushButton::clicked,this,[=](){ connect(bacthButton,&QPushButton::clicked,this,[=](){
m_batchimportdlg->show(); m_batchimportdlg->show();
}); });
connect(buildButton,&QPushButton::clicked,this,[=](){ connect(m_buildButton,&QPushButton::clicked,this,[=](){
emit build(); emit build();
}); });
} }
@ -1190,3 +1190,13 @@ void IconThemeWidget::useRestoreScale()
{ {
m_preview->miniscale(); m_preview->miniscale();
} }
void IconThemeWidget::setBuildBtnText(bool isglobal)
{
if(isglobal){
m_buildButton->setText(tr("Start Global Theme Building"));
} else {
m_buildButton->setText(tr("Start Icon Theme Building"));
}
}

View File

@ -69,7 +69,7 @@ public:
QMap<QString, bool> *m_iconPresenceMap; QMap<QString, bool> *m_iconPresenceMap;
void useMaximumScale(); void useMaximumScale();
void useRestoreScale(); void useRestoreScale();
void setBuildBtnText(bool isglobal);
signals: signals:
void wallpaperupdate(const QString& filePath); void wallpaperupdate(const QString& filePath);
@ -130,6 +130,7 @@ private:
QScrollArea *m_placescrollArea; QScrollArea *m_placescrollArea;
// QScrollArea *m_systemscrollArea; // QScrollArea *m_systemscrollArea;
BatchImportDialog *m_batchimportdlg; BatchImportDialog *m_batchimportdlg;
QPushButton*m_buildButton;
}; };
#endif // ICONTHEMEWIDGET_H #endif // ICONTHEMEWIDGET_H

View File

@ -240,12 +240,12 @@ void PlymouthThemeWidget::initBuildWidget()
{ {
m_buildwidget = new QWidget(); m_buildwidget = new QWidget();
m_buildwidget->setFixedHeight(70); m_buildwidget->setFixedHeight(70);
QPushButton *buildButton = new QPushButton(m_buildwidget); m_buildButton = new QPushButton(m_buildwidget);
buildButton->setFixedSize(346,36); m_buildButton->setFixedSize(346,36);
buildButton->setText(tr("Start Plymouth Theme Building")); m_buildButton->setText(tr("Start Plymouth Theme Building"));
QHBoxLayout *buildlayout = new QHBoxLayout(m_buildwidget); QHBoxLayout *buildlayout = new QHBoxLayout(m_buildwidget);
buildlayout->addWidget(buildButton); buildlayout->addWidget(m_buildButton);
connect(buildButton,&QPushButton::clicked,this,[=](){ connect(m_buildButton,&QPushButton::clicked,this,[=](){
emit build(); emit build();
}); });
} }
@ -304,6 +304,15 @@ void PlymouthThemeWidget::useRestoreScale()
m_preview->miniscale(); m_preview->miniscale();
} }
void PlymouthThemeWidget::setBuildBtnText(bool isglobal)
{
if(isglobal){
m_buildButton->setText(tr("Start Global Theme Building"));
} else {
m_buildButton->setText(tr("Start Plymouth Theme Building"));
}
}
void PlymouthThemeWidget::addspaceritem() void PlymouthThemeWidget::addspaceritem()
{ {
QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding); QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding);

View File

@ -31,7 +31,7 @@ public:
void refresh(); void refresh();
void useMaximumScale(); void useMaximumScale();
void useRestoreScale(); void useRestoreScale();
void setBuildBtnText(bool isglobal);
signals: signals:
void newPlymouthFilePath(const QString& path); void newPlymouthFilePath(const QString& path);
void refreshPlymouthDir(); void refreshPlymouthDir();
@ -49,6 +49,7 @@ private:
QLabel *pixLabel; QLabel *pixLabel;
QRadioButton *video; QRadioButton *video;
QLabel *videoLabel; QLabel *videoLabel;
QPushButton *m_buildButton;
}; };
#endif // PLYMOUTHMOUTHTHEMEWIDGET_H #endif // PLYMOUTHMOUTHTHEMEWIDGET_H