From 79510f8f134c0a68d41bc8d8195726cbd8ab50e7 Mon Sep 17 00:00:00 2001 From: denghao Date: Thu, 9 Nov 2023 09:15:51 +0800 Subject: [PATCH] fix bug I8BZYP/I8C1LT/I8C1LK --- UI/base/allpupwindow.cpp | 9 +++++++++ UI/base/allpupwindow.h | 1 + UI/sidebar/sidebarwidget.cpp | 1 + UI/tableview/tablehistory.cpp | 18 ++++++++++++------ UI/tableview/tableone.cpp | 22 +++++++++------------- UI/titlebar/titlebar.cpp | 1 + debian/changelog | 12 ++++++++++++ img/default/defaultIconDark.svg | 30 ++++++++++++++++++++++++++++++ img/default/defaultIconLight.svg | 30 ++++++++++++++++++++++++++++++ res.qrc | 2 ++ translations/kylin-music_zh_CN.ts | 4 ++-- 11 files changed, 109 insertions(+), 21 deletions(-) create mode 100644 img/default/defaultIconDark.svg create mode 100644 img/default/defaultIconLight.svg diff --git a/UI/base/allpupwindow.cpp b/UI/base/allpupwindow.cpp index a8c22f6..f9b3ae8 100644 --- a/UI/base/allpupwindow.cpp +++ b/UI/base/allpupwindow.cpp @@ -145,6 +145,7 @@ void AllPupWindow::inpupdialog() connect(enterLineEdit,SIGNAL(textChanged(QString)),this,SLOT(slotTextChanged(QString))); connect(closeBtn,SIGNAL(clicked(bool)),this,SLOT(closeDialog())); connect(cancelBtn,SIGNAL(clicked(bool)),this,SLOT(closeDialog())); + connect(enterLineEdit, &QLineEdit::textChanged, this, &AllPupWindow::checkInput); //限制应用内字体固定大小 // QFont sizeFont; @@ -155,6 +156,14 @@ void AllPupWindow::inpupdialog() // enterLineEdit->setFont(sizeFont); } +void AllPupWindow::checkInput() +{ + if (enterLineEdit->text().isEmpty()) { + confirmBtn->setDisabled(true); + } else { + confirmBtn->setDisabled(false); + } +} void AllPupWindow::slotLableSetFontSize(int size) { diff --git a/UI/base/allpupwindow.h b/UI/base/allpupwindow.h index f354697..f02dc0e 100644 --- a/UI/base/allpupwindow.h +++ b/UI/base/allpupwindow.h @@ -67,6 +67,7 @@ public Q_SLOTS: void closeDialog(); void slotTextChanged(QString text); void slotLableSetFontSize(int size); + void checkInput(); private: void inpupdialog(); diff --git a/UI/sidebar/sidebarwidget.cpp b/UI/sidebar/sidebarwidget.cpp index 65dfbbe..0be3fd2 100644 --- a/UI/sidebar/sidebarwidget.cpp +++ b/UI/sidebar/sidebarwidget.cpp @@ -280,6 +280,7 @@ void SideBarWidget::getPlayListName() void SideBarWidget::addPlayList() { + newSonglistPup->confirmBtn->setDisabled(true); newSonglistPup->enterLineEdit->clear(); QRect availableGeometry = Widget::mutual->geometry(); newSonglistPup->move(availableGeometry.center() - newSonglistPup->rect().center()); diff --git a/UI/tableview/tablehistory.cpp b/UI/tableview/tablehistory.cpp index 4fc1cc5..84cddfa 100644 --- a/UI/tableview/tablehistory.cpp +++ b/UI/tableview/tablehistory.cpp @@ -59,12 +59,12 @@ void TableHistory::initSetModel() nullIconLabel = new QLabel(this); if (WidgetStyle::themeColor == 1) { // black theme - nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.png").scaled(128,128)); + nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.svg").scaled(96, 96)); } else { - nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.png").scaled(128,128)); + nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.svg").scaled(96, 96)); } nullTextLabel = new QLabel(this); - nullTextLabel->setFixedHeight(30); + //nullTextLabel->setFixedHeight(30); nullTextLabel->setText(tr("The playlist has no songs")); nullPageLayout = new QVBoxLayout(); nullPageLayout->addStretch(1); @@ -73,7 +73,7 @@ void TableHistory::initSetModel() nullPageLayout->addWidget(nullTextLabel); nullTextLabel->setAlignment(Qt::AlignHCenter); nullPageLayout->addStretch(1); - nullPageLayout->setSpacing(20); + nullPageLayout->setSpacing(0); nullPageLayout->setAlignment(Qt::AlignCenter); nullPageWidget->setLayout(nullPageLayout); @@ -105,6 +105,12 @@ void TableHistory::initStyle() listCountLabel->setStyleSheet("font-weight: 400;color:#8C8C8C;\ line-height: 14px;"); deleteAllBtn->setStyleSheet("color:#8F9399;background:transparent;"); + if (WidgetStyle::themeColor == 1) { + // black theme + nullTextLabel->setStyleSheet("font-size: 14px; color:#8F9399; opacity: 1;"); + } else { + nullTextLabel->setStyleSheet("font-size: 14px; color:#8C8C8C; opacity: 1;"); + } } void TableHistory::slotLableSetFontSize(int size) @@ -347,9 +353,9 @@ void TableHistory::setHighlight(int index) { if (WidgetStyle::themeColor == 1) { // black theme - nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.png").scaled(128, 128)); + nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.svg").scaled(96, 96)); } else { - nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.png").scaled(128, 128)); + nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.svg").scaled(96, 96)); } //播放历史模块高亮 diff --git a/UI/tableview/tableone.cpp b/UI/tableview/tableone.cpp index aad7709..3ae76a9 100644 --- a/UI/tableview/tableone.cpp +++ b/UI/tableview/tableone.cpp @@ -36,26 +36,23 @@ void TableOne::initStyle() if (WidgetStyle::themeColor == 1) { - nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.png").scaled(128,128)); + nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.svg").scaled(96,96)); this->setStyleSheet("#TableOne{background:#252526;border:none;}"); titleWid->setStyleSheet("#titleWid{background:#252526;}"); nullPageWidget->setStyleSheet("#nullPageWidget{background:#252526;}"); tableView->setStyleSheet("#tableView{background:#252526;border:none;}"); //tableView->setAlternatingRowColors(false); + nullPageTextLabel->setStyleSheet("font-size: 14px; color:#8F9399; opacity: 1;"); } else if(WidgetStyle::themeColor == 0) { - nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.png").scaled(128,128)); + nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.svg").scaled(96,96)); this->setStyleSheet("#TableOne{background:#FFFFFF;border:none;}"); titleWid->setStyleSheet("#titleWid{background:#FFFFFF;}"); nullPageWidget->setStyleSheet("#nullPageWidget{background:#FFFFFF;}"); tableView->setStyleSheet("#tableView{background:#FFFFFF;border:none;}"); -// // 整个表格样式 -// tableView->setStyleSheet("#tableView{color: white; " -// "background-color: #FFFFFF; alternate-background-color: #FFFFFF; " -// "selection-color: white; selection-background-color: rgb(77, 77, 77); " -// "border: 0px groove gray; border-radius: 0px; padding: 10px 2px 10px 2px;" -// "margin: 10px; }"); + nullPageTextLabel->setStyleSheet("font-size: 14px; color:#8C8C8C; opacity: 1;"); + } } @@ -190,24 +187,23 @@ void TableOne::initUI() n_addMusicButton = new QPushButton(this); n_addMusicButton->setFixedSize(190,36); nullPageTextLabel->setText(tr("There are no songs!")); - nullPageTextLabel->setStyleSheet("color:#8F9399;"); n_addMusicButton->setText(tr("Add Local Songs")); n_addDirMusicButton->setText(tr("Add Local Folder")); if (WidgetStyle::themeColor == 1) { // black theme - nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.png").scaled(128,128)); + nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.svg").scaled(96,96)); } else { - nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.png").scaled(128,128)); + nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.svg").scaled(96,96)); } nullPageWidget->setLayout(nullPageVLayout); nullPageVLayout->addStretch(); nullPageVLayout->addWidget(nullPageIconLabel); nullPageIconLabel->setAlignment(Qt::AlignHCenter); - nullPageVLayout->addSpacing(10); + nullPageVLayout->addSpacing(0); nullPageVLayout->addWidget(nullPageTextLabel); - nullPageVLayout->addSpacing(20); + nullPageVLayout->addSpacing(24); nullPageTextLabel->setAlignment(Qt::AlignHCenter); nullPageVLayout->addLayout(nullPageHLayout); nullPageVLayout->addStretch(); diff --git a/UI/titlebar/titlebar.cpp b/UI/titlebar/titlebar.cpp index 0b4d5e9..057954f 100644 --- a/UI/titlebar/titlebar.cpp +++ b/UI/titlebar/titlebar.cpp @@ -74,6 +74,7 @@ void TitleBar::initTitle() searchEdit = new SearchEdit(this); searchEdit->setWidget(m_parent); searchEdit->setFixedSize(QSize(240, 32)); + searchEdit->setClearButtonEnabled(true); // searchEdit->setPlaceholderText(tr("Search")); diff --git a/debian/changelog b/debian/changelog index c142f36..d8e3c2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +kylin-music (1.1.0.47-ok7.2) yangtze; urgency=medium + + * BUG: #I8BZYP 【设计走查】【音乐】空白页，空状态提示不符合规范要求 + #I8C1LT【设计走查】【音乐】输入流程不符合规范要求 + #I8C1LK【设计走查】【音乐】搜索流程不符合规范要求 + * 任务号：无 + * 需求号：无 + * 其他改动说明：无 + * 其他改动影响域：无 + + -- denghao Thu, 09 Nov 2023 09:13:49 +0800 + kylin-music (1.1.0.47-ok7.1) yangtze; urgency=medium * BUG: #137164 【wayland】【音乐】迷你/正常模式切换，切换后位置不断变化，不能固定在一个位置显示； diff --git a/img/default/defaultIconDark.svg b/img/default/defaultIconDark.svg new file mode 100644 index 0000000..61e6c58 --- /dev/null +++ b/img/default/defaultIconDark.svg @@ -0,0 +1,30 @@ + + + 音乐占位图-深色模式 + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/img/default/defaultIconLight.svg b/img/default/defaultIconLight.svg new file mode 100644 index 0000000..bdae155 --- /dev/null +++ b/img/default/defaultIconLight.svg @@ -0,0 +1,30 @@ + + + 音乐占位图-浅色模式 + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res.qrc b/res.qrc index e82d839..74067cb 100644 --- a/res.qrc +++ b/res.qrc @@ -159,5 +159,7 @@ img/list-add-symbolic/list-add-symbolic-hover-black.png img/list-add-symbolic/list-add-symbolic-hover-white.png img/list-add-symbolic/list-add-symbolic.svg + img/default/defaultIconLight.svg + img/default/defaultIconDark.svg diff --git a/translations/kylin-music_zh_CN.ts b/translations/kylin-music_zh_CN.ts index 81672a5..7d822a7 100644 --- a/translations/kylin-music_zh_CN.ts +++ b/translations/kylin-music_zh_CN.ts @@ -414,7 +414,7 @@ The playlist has no songs - 播放列表还没有歌曲哦 + 无音乐 @@ -499,7 +499,7 @@ There are no songs! - 还没有歌曲！ + 无音乐