openkylin
/
ukui-theme-customizer
mirror of https://gitee.com/openkylin/ukui-theme-customizer.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix some error

This commit is contained in:
likehomedream 2023-12-22 17:46:34 +08:00
parent 3d8797bff5
commit 86a8cf5301
6 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainwindow.cpp
View File

@ -99,7 +99,7 @@ MainWindow::MainWindow(QWidget *parent)
FileProcess::g_debPath = path;
m_bridge->savePathConfigChanged(path);
});
this->setContentsMargins(0,2,0,0);
this->setContentsMargins(5,5,5,0);
}
MainWindow::~MainWindow()

10
src/module/cursorthemewidget.cpp
View File

@ -40,8 +40,14 @@ void CursorThemeWidget::eidtInitWidget(const HistoryInfo &InfoData)
m_preview2->updateIconMap(m_historytimeiconpathmap);
updateCustomPathMap(m_historyiconpathmap,"cursor");
updateCustomPathMap(m_historytimeiconpathmap,"timecursor");
m_preview->updateImage(m_info.wallpaperpath);
m_preview2->updateImage(m_info.wallpaperpath);
if(m_info.wallpaperpath != nullptr){
m_preview->updateImage(m_info.wallpaperpath);
m_preview2->updateImage(m_info.wallpaperpath);
}else{
m_preview->updateImage(":/resource/background/1-openkylin.jpg");
m_preview2->updateImage(":/resource/background/1-openkylin.jpg");
}
}
/**

24
src/module/historywidget.cpp
View File

@ -247,6 +247,7 @@ void HistoryButton::initUI()
}
m_typebutton = new QPushButton(buttonText, this);
m_typebutton->setProperty("useButtonPalette", true);
m_typebutton->setProperty("setRadius", 18);
m_menubutton = new QToolButton(this);
m_menubutton->setProperty("useButtonPalette", true);
@ -265,6 +266,11 @@ void HistoryButton::initUI()
QAction* action1 = m_menu->addAction("删除");
QAction* action2 = m_menu->addAction("导出");
m_menubutton->setMenu(m_menu);
if(m_themename != nullptr){
action2->setDisabled(false);
}else{
action2->setDisabled(true);
}
// connect(btn_menu, &QPushButton::clicked, this, [=]() {
// m_menu->exec(btn_menu->mapToGlobal(btn_menu->rect().bottomLeft()));
// });
@ -304,15 +310,15 @@ void HistoryButton::initUI()
});
});
//FIX ME:现在是三个button，当historybutton hover的时候，button和btn_menu没有悬浮，导致有色差，用qss的话一样会出现这个问题。暂时没有好的解决方式
// connect(this, &HistoryButton::hoverStateChanged, this, [&](bool ishover) {
// if(ishover){
// button->setStyleSheet("background-color: #DADADA;");
// btn_menu->setStyleSheet("background-color: #DADADA;");
// }else{
// button->setStyleSheet("");
// btn_menu->setStyleSheet("");
// }
// });
connect(this, &HistoryButton::hoverStateChanged, this, [&](bool ishover) {
if(ishover){
m_typebutton->setAttribute(Qt::WA_UnderMouse, true);
m_menubutton->setAttribute(Qt::WA_UnderMouse, true);
}else{
m_typebutton->setAttribute(Qt::WA_UnderMouse, false);
m_menubutton->setAttribute(Qt::WA_UnderMouse, false);
}
});
}
bool HistoryButton::eventFilter(QObject *obj, QEvent *event)

7
src/module/iconthemewidget.cpp
View File

@ -547,7 +547,12 @@ void IconThemeWidget::eidtInitWidget(const HistoryInfo &InfoData)
m_systempreview->updateIconMap(m_historysystemiconmap);
updateCustomIconPathMap(m_historyiconmap);
updateCustomSyetemIconPathMap(m_historysystemiconmap);
m_preview->updateImage(m_info.wallpaperpath);
if(m_info.wallpaperpath != nullptr){
m_preview->updateImage(m_info.wallpaperpath);
}else{
m_preview->updateImage(":/resource/background/1-openkylin.jpg");
}
}
/**

2
src/module/infocreatewidget.cpp
View File

@ -89,6 +89,8 @@ void InfoCreateWidget::InitInfoBtn(const QString &m_state){
m_createDebBtn->setText(tr("Create"));
QShortcut *shortcut = new QShortcut(QKeySequence(Qt::Key_Return), m_recogniseBtn);
QObject::connect(shortcut, &QShortcut::activated, m_recogniseBtn, &QPushButton::click);
QShortcut *shortcut1 = new QShortcut(QKeySequence(Qt::Key_Return), m_createDebBtn);
QObject::connect(shortcut1, &QShortcut::activated, m_createDebBtn, &QPushButton::click);
m_infoBtnLayout->addWidget(m_exitBtn);
m_infoBtnLayout->addWidget(m_recogniseBtn);
m_infoBtnLayout->addWidget(m_createDebBtn);

6
src/titlebar.cpp
View File

@ -31,24 +31,29 @@ TitleBar::TitleBar(QWidget *parent) : QWidget(parent)
m_gohomebtn->setIcon(QIcon::fromTheme("go-home-symbolic"));
m_gohomebtn->setToolTip(tr("Return"));
m_gohomebtn->setFlat(true);
m_gohomebtn->setProperty("isWindowButton", 0x01);
m_minimumbtn = new QPushButton();
m_minimumbtn->setFixedSize(30,30);
m_minimumbtn->setIcon(QIcon::fromTheme("window-minimize-symbolic"));
m_minimumbtn->setToolTip(tr("Minimize"));
m_minimumbtn->setFlat(true);
m_minimumbtn->setProperty("isWindowButton", 0x01);
m_maximumbtn = new QPushButton();
m_maximumbtn->setFixedSize(30,30);
m_maximumbtn->setIcon(QIcon::fromTheme("window-maximize-symbolic"));
m_maximumbtn->setToolTip(tr("Maximize"));
m_maximumbtn->setFlat(true);
m_maximumbtn->setProperty("isWindowButton", 0x01);
m_closebtn = new QPushButton();
m_closebtn->setFixedSize(30, 30);
m_closebtn->setIcon(QIcon::fromTheme("window-close-symbolic"));
m_closebtn->setToolTip(tr("Close"));
m_closebtn->setFlat(true);
m_closebtn->setProperty("isWindowButton", 0x02);
connect(m_gohomebtn, &QPushButton::clicked, this,[=](){
emit gohomesignal();
@ -63,6 +68,7 @@ TitleBar::TitleBar(QWidget *parent) : QWidget(parent)
m_optionbtn->setFixedSize(30,30);
m_optionbtn->setIcon(QIcon::fromTheme("application-menu"));
m_optionbtn->setAutoRaise(true);
m_optionbtn->setProperty("isWindowButton", 0x01);
QMenu* menu = new QMenu(m_optionbtn);