openkylin
/
kylin-music
mirror of https://gitee.com/openkylin/kylin-music.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

fix bug I8BZYP/I8C1LT/I8C1LK

This commit is contained in:
denghao 2023-11-09 09:15:51 +08:00
parent d1a96c0538
commit 79510f8f13
11 changed files with 109 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
UI/base/allpupwindow.cpp
View File

@ -145,6 +145,7 @@ void AllPupWindow::inpupdialog()
connect(enterLineEdit,SIGNAL(textChanged(QString)),this,SLOT(slotTextChanged(QString))); connect(enterLineEdit,SIGNAL(textChanged(QString)),this,SLOT(slotTextChanged(QString)));
connect(closeBtn,SIGNAL(clicked(bool)),this,SLOT(closeDialog())); connect(closeBtn,SIGNAL(clicked(bool)),this,SLOT(closeDialog()));
connect(cancelBtn,SIGNAL(clicked(bool)),this,SLOT(closeDialog())); connect(cancelBtn,SIGNAL(clicked(bool)),this,SLOT(closeDialog()));
connect(enterLineEdit, &QLineEdit::textChanged, this, &AllPupWindow::checkInput);
//限制应用内字体固定大小 //限制应用内字体固定大小
// QFont sizeFont; // QFont sizeFont;
@ -155,6 +156,14 @@ void AllPupWindow::inpupdialog()
// enterLineEdit->setFont(sizeFont); // enterLineEdit->setFont(sizeFont);
} }
void AllPupWindow::checkInput()
{
if (enterLineEdit->text().isEmpty()) {
confirmBtn->setDisabled(true);
} else {
confirmBtn->setDisabled(false);
}
}
void AllPupWindow::slotLableSetFontSize(int size) void AllPupWindow::slotLableSetFontSize(int size)
{ {

1
UI/base/allpupwindow.h
View File

@ -67,6 +67,7 @@ public Q_SLOTS:
void closeDialog(); void closeDialog();
void slotTextChanged(QString text); void slotTextChanged(QString text);
void slotLableSetFontSize(int size); void slotLableSetFontSize(int size);
void checkInput();
private: private:
void inpupdialog(); void inpupdialog();

1
UI/sidebar/sidebarwidget.cpp
View File

@ -280,6 +280,7 @@ void SideBarWidget::getPlayListName()
void SideBarWidget::addPlayList() void SideBarWidget::addPlayList()
{ {
newSonglistPup->confirmBtn->setDisabled(true);
newSonglistPup->enterLineEdit->clear(); newSonglistPup->enterLineEdit->clear();
QRect availableGeometry = Widget::mutual->geometry(); QRect availableGeometry = Widget::mutual->geometry();
newSonglistPup->move(availableGeometry.center() - newSonglistPup->rect().center()); newSonglistPup->move(availableGeometry.center() - newSonglistPup->rect().center());

18
UI/tableview/tablehistory.cpp
View File

@ -59,12 +59,12 @@ void TableHistory::initSetModel()
nullIconLabel = new QLabel(this); nullIconLabel = new QLabel(this);
if (WidgetStyle::themeColor == 1) { if (WidgetStyle::themeColor == 1) {
// black theme // black theme
nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.png").scaled(128,128)); nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.svg").scaled(96, 96));
} else { } 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 = new QLabel(this);
nullTextLabel->setFixedHeight(30); //nullTextLabel->setFixedHeight(30);
nullTextLabel->setText(tr("The playlist has no songs")); nullTextLabel->setText(tr("The playlist has no songs"));
nullPageLayout = new QVBoxLayout(); nullPageLayout = new QVBoxLayout();
nullPageLayout->addStretch(1); nullPageLayout->addStretch(1);
@ -73,7 +73,7 @@ void TableHistory::initSetModel()
nullPageLayout->addWidget(nullTextLabel); nullPageLayout->addWidget(nullTextLabel);
nullTextLabel->setAlignment(Qt::AlignHCenter); nullTextLabel->setAlignment(Qt::AlignHCenter);
nullPageLayout->addStretch(1); nullPageLayout->addStretch(1);
nullPageLayout->setSpacing(20); nullPageLayout->setSpacing(0);
nullPageLayout->setAlignment(Qt::AlignCenter); nullPageLayout->setAlignment(Qt::AlignCenter);
nullPageWidget->setLayout(nullPageLayout); nullPageWidget->setLayout(nullPageLayout);
@ -105,6 +105,12 @@ void TableHistory::initStyle()
listCountLabel->setStyleSheet("font-weight: 400;color:#8C8C8C;\ listCountLabel->setStyleSheet("font-weight: 400;color:#8C8C8C;\
line-height: 14px;"); line-height: 14px;");
deleteAllBtn->setStyleSheet("color:#8F9399;background:transparent;"); 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) void TableHistory::slotLableSetFontSize(int size)
@ -347,9 +353,9 @@ void TableHistory::setHighlight(int index)
{ {
if (WidgetStyle::themeColor == 1) { if (WidgetStyle::themeColor == 1) {
// black theme // black theme
nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.png").scaled(128, 128)); nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.svg").scaled(96, 96));
} else { } else {
nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.png").scaled(128, 128)); nullIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.svg").scaled(96, 96));
} }
//播放历史模块高亮 //播放历史模块高亮

22
UI/tableview/tableone.cpp
View File

@ -36,26 +36,23 @@ void TableOne::initStyle()
if (WidgetStyle::themeColor == 1) 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;}"); this->setStyleSheet("#TableOne{background:#252526;border:none;}");
titleWid->setStyleSheet("#titleWid{background:#252526;}"); titleWid->setStyleSheet("#titleWid{background:#252526;}");
nullPageWidget->setStyleSheet("#nullPageWidget{background:#252526;}"); nullPageWidget->setStyleSheet("#nullPageWidget{background:#252526;}");
tableView->setStyleSheet("#tableView{background:#252526;border:none;}"); tableView->setStyleSheet("#tableView{background:#252526;border:none;}");
//tableView->setAlternatingRowColors(false); //tableView->setAlternatingRowColors(false);
nullPageTextLabel->setStyleSheet("font-size: 14px; color:#8F9399; opacity: 1;");
} }
else if(WidgetStyle::themeColor == 0) 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;}"); this->setStyleSheet("#TableOne{background:#FFFFFF;border:none;}");
titleWid->setStyleSheet("#titleWid{background:#FFFFFF;}"); titleWid->setStyleSheet("#titleWid{background:#FFFFFF;}");
nullPageWidget->setStyleSheet("#nullPageWidget{background:#FFFFFF;}"); nullPageWidget->setStyleSheet("#nullPageWidget{background:#FFFFFF;}");
tableView->setStyleSheet("#tableView{background:#FFFFFF;border:none;}"); tableView->setStyleSheet("#tableView{background:#FFFFFF;border:none;}");
// // 整个表格样式 nullPageTextLabel->setStyleSheet("font-size: 14px; color:#8C8C8C; opacity: 1;");
// 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; }");
} }
} }
@ -190,24 +187,23 @@ void TableOne::initUI()
n_addMusicButton = new QPushButton(this); n_addMusicButton = new QPushButton(this);
n_addMusicButton->setFixedSize(190,36); n_addMusicButton->setFixedSize(190,36);
nullPageTextLabel->setText(tr("There are no songs!")); nullPageTextLabel->setText(tr("There are no songs!"));
nullPageTextLabel->setStyleSheet("color:#8F9399;");
n_addMusicButton->setText(tr("Add Local Songs")); n_addMusicButton->setText(tr("Add Local Songs"));
n_addDirMusicButton->setText(tr("Add Local Folder")); n_addDirMusicButton->setText(tr("Add Local Folder"));
if (WidgetStyle::themeColor == 1) { if (WidgetStyle::themeColor == 1) {
// black theme // black theme
nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.png").scaled(128,128)); nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconDark.svg").scaled(96,96));
} else { } else {
nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.png").scaled(128,128)); nullPageIconLabel->setPixmap(QPixmap(":/img/default/defaultIconLight.svg").scaled(96,96));
} }
nullPageWidget->setLayout(nullPageVLayout); nullPageWidget->setLayout(nullPageVLayout);
nullPageVLayout->addStretch(); nullPageVLayout->addStretch();
nullPageVLayout->addWidget(nullPageIconLabel); nullPageVLayout->addWidget(nullPageIconLabel);
nullPageIconLabel->setAlignment(Qt::AlignHCenter); nullPageIconLabel->setAlignment(Qt::AlignHCenter);
nullPageVLayout->addSpacing(10); nullPageVLayout->addSpacing(0);
nullPageVLayout->addWidget(nullPageTextLabel); nullPageVLayout->addWidget(nullPageTextLabel);
nullPageVLayout->addSpacing(20); nullPageVLayout->addSpacing(24);
nullPageTextLabel->setAlignment(Qt::AlignHCenter); nullPageTextLabel->setAlignment(Qt::AlignHCenter);
nullPageVLayout->addLayout(nullPageHLayout); nullPageVLayout->addLayout(nullPageHLayout);
nullPageVLayout->addStretch(); nullPageVLayout->addStretch();

1
UI/titlebar/titlebar.cpp
View File

@ -74,6 +74,7 @@ void TitleBar::initTitle()
searchEdit = new SearchEdit(this); searchEdit = new SearchEdit(this);
searchEdit->setWidget(m_parent); searchEdit->setWidget(m_parent);
searchEdit->setFixedSize(QSize(240, 32)); searchEdit->setFixedSize(QSize(240, 32));
searchEdit->setClearButtonEnabled(true);
// searchEdit->setPlaceholderText(tr("Search")); // searchEdit->setPlaceholderText(tr("Search"));

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
kylin-music (1.1.0.47-ok7.2) yangtze; urgency=medium
* BUG: #I8BZYP 【设计走查】【音乐】空白页，空状态提示不符合规范要求
#I8C1LT【设计走查】【音乐】输入流程不符合规范要求
#I8C1LK【设计走查】【音乐】搜索流程不符合规范要求
* 任务号：无
* 需求号：无
* 其他改动说明：无
* 其他改动影响域：无
-- denghao <denghao@kylinos.cn> Thu, 09 Nov 2023 09:13:49 +0800
kylin-music (1.1.0.47-ok7.1) yangtze; urgency=medium kylin-music (1.1.0.47-ok7.1) yangtze; urgency=medium
* BUG: #137164 【wayland】【音乐】迷你/正常模式切换，切换后位置不断变化，不能固定在一个位置显示； * BUG: #137164 【wayland】【音乐】迷你/正常模式切换，切换后位置不断变化，不能固定在一个位置显示；

30
img/default/defaultIconDark.svg Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="96px" height="96px" viewBox="0 0 96 96" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>音乐占位图-深色模式</title>
<defs>
<linearGradient x1="41.0822114%" y1="56.284396%" x2="23.5601505%" y2="100%" id="linearGradient-1">
<stop stop-color="#4D5C6C" offset="0%"></stop>
<stop stop-color="#879EB9" stop-opacity="0.6" offset="100%"></stop>
</linearGradient>
<linearGradient x1="81.7645003%" y1="16.2583593%" x2="21.8610042%" y2="90.9381955%" id="linearGradient-2">
<stop stop-color="#D4E8FF" stop-opacity="0" offset="0%"></stop>
<stop stop-color="#D4E8FF" stop-opacity="0.4" offset="52.6857415%"></stop>
<stop stop-color="#D4E8FF" stop-opacity="0" offset="100%"></stop>
</linearGradient>
</defs>
<g id="SP2音乐" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="麒麟影音_空页面-深色" transform="translate(-1003.000000, -434.000000)">
<g id="音乐占位图-深色模式" transform="translate(1003.000000, 434.000000)">
<rect id="矩形" x="0" y="0" width="96" height="96"></rect>
<ellipse id="椭圆形备份" fill-opacity="0.05" fill="#425369" opacity="0.8" cx="48" cy="49.875" rx="36.75" ry="37.125"></ellipse>
<ellipse id="椭圆形" stroke-opacity="0.05" stroke="#425369" stroke-width="1.5" cx="48" cy="49.875" rx="36" ry="36.375"></ellipse>
<circle id="椭圆形备份-2" fill="#D4E8FF" opacity="0.120977493" cx="48" cy="49.5" r="18"></circle>
<g id="路径" transform="translate(38.250000, 4.499730)">
<path d="M23.3833297,8.8132369e-05 C27.788237,0.175784598 31.7544263,1.79323313 34.5,5.25027043 C39.3894955,11.8160886 45.8716016,15.1112661 50.25,15.0002704 C48.2822762,17.5617079 40.9991427,19.236857 37.4129448,18.9294845 C35.343019,18.6973132 33.3681609,17.9325895 31.6801391,16.7095719 C28.4687457,14.5152738 26.4374669,14.9639281 25.4487048,15.1318197 C22.1659796,32.6167051 20.2784127,42.6129388 19.7860039,45.1205208 L19.7535628,45.2850887 C19.6882945,45.6147037 19.6556604,45.7691516 19.6556604,45.7484324 C19.6569545,45.1381977 19.5838322,44.5491645 19.4470173,43.9819345 C19.4821977,44.3166756 19.5,44.656394 19.5,45.0002704 C19.5,50.3850467 15.1347763,54.7502704 9.75,54.7502704 C4.36522369,54.7502704 0,50.3850467 0,45.0002704 C0,39.6154941 4.36522369,35.2502704 9.75,35.2502704 C12.0942285,35.2502704 14.2452272,36.0775857 15.9269509,37.4561712 L21.9096664,1.25556561 C22.0200425,0.527471133 22.6486365,-0.00789610399 23.3833297,8.8132369e-05 Z" id="形状结合" fill="url(#linearGradient-1)"></path>
<path d="M37.105803,18.8131468 C40.2349257,19.0921192 46.0716229,18.1457807 48.8351144,16.1232307 C49.0714921,15.9358977 49.3985894,15.6162658 49.8164062,15.1643349 C47.9651358,15.1644352 45.8438414,14.6434683 44.1518968,13.8731357 C35.3512392,20.1151433 31.3222708,9.59886186 24.0351562,15.335232 C26.339483,14.8383124 27.6050657,14.4219768 31.2079191,16.4336487 C32.9036399,17.6922749 35.0240576,18.5865873 37.105803,18.8131468 Z" fill="#33445A" fill-rule="nonzero"></path>
</g>
<path d="M48,12.75 C68.2964646,12.75 84.75,29.3714287 84.75,50.25 C84.75,70.3785713 68.2964646,87 48,87 C27.7035354,87 11.25,70.3785713 11.25,50.25 C11.25,29.3714287 27.7035354,12.75 48,12.75 Z M48,39.75 C42.6152237,39.75 38.25,44.1152237 38.25,49.5 C38.25,54.8847763 42.6152237,59.25 48,59.25 C53.3847763,59.25 57.75,54.8847763 57.75,49.5 C57.75,44.1152237 53.3847763,39.75 48,39.75 Z" id="形状结合" fill="url(#linearGradient-2)" opacity="0.593308222"></path>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

30
img/default/defaultIconLight.svg Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="96px" height="96px" viewBox="0 0 96 96" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>音乐占位图-浅色模式</title>
<defs>
<linearGradient x1="50%" y1="7.99254464%" x2="23.5599782%" y2="100%" id="linearGradient-1">
<stop stop-color="#DCE2E9" offset="0%"></stop>
<stop stop-color="#9EA7B2" offset="100%"></stop>
</linearGradient>
<linearGradient x1="102.136737%" y1="-16.5567921%" x2="6.43996708%" y2="114.222129%" id="linearGradient-2">
<stop stop-color="#8A95A4" stop-opacity="0" offset="0%"></stop>
<stop stop-color="#E8EEF5" offset="52.6857415%"></stop>
<stop stop-color="#8A95A4" stop-opacity="0" offset="100%"></stop>
</linearGradient>
</defs>
<g id="SP2音乐" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="麒麟影音_空页面-深色" transform="translate(-1213.000000, -434.000000)">
<g id="音乐占位图-浅色模式" transform="translate(1213.000000, 434.000000)">
<rect id="矩形" x="0" y="0" width="96" height="96"></rect>
<ellipse id="椭圆形备份" fill-opacity="0.05" fill="#425369" opacity="0.8" cx="48.1054688" cy="49.9394531" rx="36.7382812" ry="37.0605469"></ellipse>
<ellipse id="椭圆形" stroke-opacity="0.05" stroke="#425369" stroke-width="1.5" cx="48.1054688" cy="49.9394531" rx="35.9882812" ry="36.3105469"></ellipse>
<circle id="椭圆形备份-2" stroke="#425369" stroke-width="3.2" fill="#425369" opacity="0.25" cx="48" cy="49.5" r="16.4"></circle>
<g id="路径" transform="translate(38.250000, 4.499908)">
<path d="M23.25,9.20709181e-05 C27.788237,0.175606241 31.8989285,2.26378936 34.5,6.00009207 C39.5339977,12.2866448 45.8716016,15.368908 50.25,15.0000921 C48.2822762,17.8193498 40.9991427,19.2366786 37.5,18.7500921 C35.343019,18.6971348 33.3681609,17.9324112 31.5,16.5000921 C28.4687457,14.5150954 26.4374669,14.9637497 25.5,15.0000921 C22.9674528,28.4278915 21.2360613,37.4582463 20.3058255,42.0911565 L20.222233,42.5063199 C19.7749896,44.7210252 19.5342453,45.8022826 19.5,45.7500921 C19.513828,45.5009118 19.5141273,45.2552755 19.5017237,45.0130541 C19.4929271,50.3919378 15.1304143,54.7500921 9.75,54.7500921 C4.36522369,54.7500921 0,50.3848684 0,45.0000921 C0,39.6153158 4.36522369,35.2500921 9.75,35.2500921 C12.0752338,35.2500921 14.2103564,36.0640546 15.8859788,37.4225905 L21.75,1.50009207 C22.0200425,0.527292777 22.6486365,-0.0080744604 23.25,9.20709181e-05 Z" id="形状结合" fill="url(#linearGradient-1)"></path>
<path d="M37.0023087,18.647851 C40.1314314,18.9268234 46.0716229,18.1456023 48.8351144,16.1230523 C49.0714921,15.9357194 49.3985894,15.6160875 49.8164062,15.1641566 C47.9651358,15.1642569 45.8438414,14.6432899 44.1518968,13.8729573 C35.3512392,20.114965 31.3222708,9.5986835 24.0351562,15.3350537 C26.339483,14.8381341 29.0689623,14.8817235 31.2372403,16.3812002 C32.9329611,17.6398264 34.9205633,18.4212916 37.0023087,18.647851 Z" fill="#425369" fill-rule="nonzero" opacity="0.30875651"></path>
</g>
<path d="M48,12.75 C68.2964646,12.75 84.75,29.3714287 84.75,50.25 C84.75,70.3785713 68.2964646,87 48,87 C27.7035354,87 11.25,70.3785713 11.25,50.25 C11.25,29.3714287 27.7035354,12.75 48,12.75 Z M48,39.75 C42.6152237,39.75 38.25,44.1152237 38.25,49.5 C38.25,54.8847763 42.6152237,59.25 48,59.25 C53.3847763,59.25 57.75,54.8847763 57.75,49.5 C57.75,44.1152237 53.3847763,39.75 48,39.75 Z" id="形状结合" fill="url(#linearGradient-2)" opacity="0.593308222"></path>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

2
res.qrc
View File

@ -159,5 +159,7 @@
<file>img/list-add-symbolic/list-add-symbolic-hover-black.png</file> <file>img/list-add-symbolic/list-add-symbolic-hover-black.png</file>
<file>img/list-add-symbolic/list-add-symbolic-hover-white.png</file> <file>img/list-add-symbolic/list-add-symbolic-hover-white.png</file>
<file>img/list-add-symbolic/list-add-symbolic.svg</file> <file>img/list-add-symbolic/list-add-symbolic.svg</file>
<file>img/default/defaultIconLight.svg</file>
<file>img/default/defaultIconDark.svg</file>
</qresource> </qresource>
</RCC> </RCC>

4
translations/kylin-music_zh_CN.ts
View File

@ -414,7 +414,7 @@
<message> <message>
<location filename="../UI/tableview/tablehistory.cpp" line="67"/> <location filename="../UI/tableview/tablehistory.cpp" line="67"/>
<source>The playlist has no songs</source> <source>The playlist has no songs</source>
<translation>播放列表还没有歌曲哦</translation> <translation>无音乐</translation>
</message> </message>
<message> <message>
<location filename="../UI/tableview/tablehistory.cpp" line="121"/> <location filename="../UI/tableview/tablehistory.cpp" line="121"/>
@ -499,7 +499,7 @@
<message> <message>
<location filename="../UI/tableview/tableone.cpp" line="191"/> <location filename="../UI/tableview/tableone.cpp" line="191"/>
<source>There are no songs!</source> <source>There are no songs!</source>
<translation>还没有歌曲！</translation> <translation>无音乐</translation>
</message> </message>
<message> <message>
<location filename="../UI/tableview/tableone.cpp" line="147"/> <location filename="../UI/tableview/tableone.cpp" line="147"/>