!38 add fix-kylin-music-border-space.patch

From: @dou33 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

0001-kylin-music-fix-null-pointer-widget-error.patch

@@ -0,0 +1,49 @@
+From a2aa3aacc458cf3fa23bbe5b928233cdc51612fa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
+Date: Tue, 16 Apr 2024 13:54:44 +0800
+Subject: [PATCH] kylin-music: fix null pointer widget error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
+---
+ UI/player/searchresult.cpp | 4 ++--
+ UI/player/searchresult.h   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/UI/player/searchresult.cpp b/UI/player/searchresult.cpp
+index a8946c3..8f56e05 100644
+--- a/UI/player/searchresult.cpp
++++ b/UI/player/searchresult.cpp
+@@ -85,10 +85,10 @@ SearchResult::SearchResult(QWidget *parent) : QWidget(parent)
+ 
+     vlayout->addWidget(m_MusicLabel, 1);
+     vlayout->addWidget(m_MusicView, 0);
+-    vlayout->addWidget(m_SingerFrame);
++    //vlayout->addWidget(m_SingerFrame);
+     vlayout->addWidget(m_SingerLabel, 1);
+     vlayout->addWidget(m_SingerView, 0);
+-    vlayout->addWidget(m_AlbumFrame);
++    //vlayout->addWidget(m_AlbumFrame);
+     vlayout->addWidget(m_AlbumLabel, 1);
+     vlayout->addWidget(m_AlbumView, 0);
+ 
+diff --git a/UI/player/searchresult.h b/UI/player/searchresult.h
+index 6427af5..8f54373 100644
+--- a/UI/player/searchresult.h
++++ b/UI/player/searchresult.h
+@@ -84,8 +84,8 @@ private:
+ 
+     int               m_CurrentIndex  = -1;
+     int               m_Count         = 0;
+-    QFrame *m_SingerFrame = nullptr;
+-    QFrame *m_AlbumFrame  = nullptr;
++    //QFrame *m_SingerFrame = nullptr;
++    //QFrame *m_AlbumFrame  = nullptr;
+ 
+     SearchEdit          *m_searchEdit = nullptr;
+ 
+-- 
+2.43.0
+

0001-kylin-music-fix-wrong-mouse-style-of-some-title-bar-.patch

@@ -0,0 +1,56 @@
+From 9fbe32146356de5a76f3f51d7b212443f3f2e022 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
+Date: Mon, 15 Apr 2024 15:12:54 +0800
+Subject: [PATCH] kylin-music: fix wrong mouse style of some title bar buttons
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
+---
+ UI/titlebar/titlebar.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/UI/titlebar/titlebar.cpp b/UI/titlebar/titlebar.cpp
+index e5bcf86..6c63217 100644
+--- a/UI/titlebar/titlebar.cpp
++++ b/UI/titlebar/titlebar.cpp
+@@ -173,7 +173,7 @@ void TitleBar::initTitle()
+     nullLabel->setPixmap(QPixmap(":/images/TitleBar/line.png"));
+ 
+     miniBtn = new QPushButton;
+-    miniBtn->setCursor(Qt::PointingHandCursor);
++    //miniBtn->setCursor(Qt::PointingHandCursor);
+     miniBtn->setFixedSize(30,30);
+ //    miniBtn->setToolTip("精简模式");
+     miniBtn->setToolTip(tr("mini model"));
+@@ -183,7 +183,7 @@ void TitleBar::initTitle()
+     miniBtn->setFlat(true);
+ 
+     minimumBtn = new QPushButton;
+-    minimumBtn->setCursor(Qt::PointingHandCursor);
++    //minimumBtn->setCursor(Qt::PointingHandCursor);
+ //    minimumBtn->setToolTip(tr("最小化"));
+     minimumBtn->setToolTip(tr("To minimize the"));
+     minimumBtn->setFixedSize(30,30);
+@@ -193,7 +193,7 @@ void TitleBar::initTitle()
+     minimumBtn->setFlat(true);
+ 
+     maximumBtn = new QPushButton;
+-    maximumBtn->setCursor(Qt::PointingHandCursor);
++    //maximumBtn->setCursor(Qt::PointingHandCursor);
+     maximumBtn->setFixedSize(30,30);
+ //    maximumBtn->setToolTip(tr("最大化"));
+     maximumBtn->setToolTip(tr("maximize"));
+@@ -204,7 +204,7 @@ void TitleBar::initTitle()
+ 
+ 
+     closeBtn = new QPushButton;
+-    closeBtn->setCursor(Qt::PointingHandCursor);
++    //closeBtn->setCursor(Qt::PointingHandCursor);
+     closeBtn->setFixedSize(30,30);
+ //    closeBtn->setToolTip("关闭");
+     closeBtn->setToolTip(tr("close"));
+-- 
+2.43.0
+

0001-use-QRandomGenerator-to-generate-random-numbers.patch

@@ -0,0 +1,42 @@
+From 64e868be8ff42979c955a38b34678b9e24a18dcf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
+Date: Mon, 6 May 2024 10:00:18 +0800
+Subject: [PATCH] use QRandomGenerator to generate random numbers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
+---
+ UIControl/player/coreplayer/mmediaplaylist.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/UIControl/player/coreplayer/mmediaplaylist.cpp b/UIControl/player/coreplayer/mmediaplaylist.cpp
+index 9aa1c03..38f93a5 100644
+--- a/UIControl/player/coreplayer/mmediaplaylist.cpp
++++ b/UIControl/player/coreplayer/mmediaplaylist.cpp
+@@ -16,6 +16,7 @@
+  */
+ 
+ #include "mmediaplaylist.h"
++#include <QRandomGenerator>
+ 
+ MMediaPlaylist::MMediaPlaylist(QObject *parent)
+     : QObject(parent)
+@@ -223,11 +224,10 @@ MMediaPlaylist::PlaybackMode MMediaPlaylist::playbackMode() const
+ 
+ int MMediaPlaylist::randomIndex()
+ {
+-    qsrand(QDateTime::currentDateTime().toMSecsSinceEpoch());
+-    return qrand()%(m_playerList.length());
++    QRandomGenerator rnd(QDateTime::currentDateTime().toMSecsSinceEpoch());
++    return rnd.generate()%(m_playerList.length());
+ }
+ 
+-
+ MMediaContent::MMediaContent(QUrl url)
+ {
+     m_url = url;
+-- 
+2.43.0
+

fix-kylin-music-border-space.patch

@@ -0,0 +1,30 @@
+diff -Naur kylin-music-1.1.3/UI/sidebar/sidebarwidget.cpp kylin-music-1.1.3~/UI/sidebar/sidebarwidget.cpp
+--- kylin-music-1.1.3/UI/sidebar/sidebarwidget.cpp	2022-03-03 17:05:57.000000000 +0800
++++ kylin-music-1.1.3~/UI/sidebar/sidebarwidget.cpp	2024-05-09 17:59:58.015452869 +0800
+@@ -93,7 +93,7 @@
+     myPlayListLayout->addWidget(myPlayListLabel);
+     myPlayListLayout->addStretch();
+     myPlayListLayout->addWidget(myPlayListBtn);
+-    myPlayListLayout->setContentsMargins(38,0,38,0);
++    myPlayListLayout->setContentsMargins(38-13,0,38-27,0);
+ 
+     QScrollArea *scrollArea = new QScrollArea(this);
+     scrollArea->setFrameStyle(0);
+diff -Naur kylin-music-1.1.3/UI/tableview/tableone.cpp kylin-music-1.1.3~/UI/tableview/tableone.cpp
+--- kylin-music-1.1.3/UI/tableview/tableone.cpp	2022-03-03 17:05:57.000000000 +0800
++++ kylin-music-1.1.3~/UI/tableview/tableone.cpp	2024-05-09 18:00:39.313778080 +0800
+@@ -88,12 +88,12 @@
+     if(WidgetStyle::themeColor == 0) {
+         horizonHeader->setStyleSheet("QHeaderView::section,QTableCornerButton::section {padding-left: 25px;\
+                                                                 border: none;border-bottom: 1px solid white;\
+-                                                                border-right: 1px solid white;border-bottom: 1px transparent;\
++                                                                border-right: 5px solid white;border-bottom: 1px transparent;\
+                                                                 background-color:white;color:#8F9399;}");
+     } else {
+         horizonHeader->setStyleSheet("QHeaderView::section,QTableCornerButton::section {padding-left: 25px;\
+                                                         border: none;border-bottom: 1px solid #252526;\
+-                                                        border-right: 1px solid #252526;border-bottom: 1px transparent;\
++                                                        border-right: 5px solid #252526;border-bottom: 1px transparent;\
+                                                         background-color:#252526;color:#8F9399;}");
+     }
+ 

fix-kylin-music-mini-mode-stay-on-top-hint.patch

@@ -0,0 +1,13 @@
+diff -Naur kylin-music-1.1.3/UI/player/miniwidget.cpp kylin-music-1.1.3~/UI/player/miniwidget.cpp
+--- kylin-music-1.1.3/UI/player/miniwidget.cpp	2022-03-03 17:05:57.000000000 +0800
++++ kylin-music-1.1.3~/UI/player/miniwidget.cpp	2024-05-06 20:42:34.813768730 +0800
+@@ -28,8 +28,7 @@
+     this->setObjectName("miniWidget");
+ 
+     m_mouseState = false;
+-    setWindowFlags(Qt::WindowStaysOnTopHint);
+-//    setWindowFlags(Qt::FramelessWindowHint|Qt::Tool|Qt::WindowStaysOnTopHint);
++    setWindowFlags(Qt::WindowStaysOnTopHint);    //置顶显示
+     this->setAttribute(Qt::WA_TranslucentBackground, true);     //窗体透明
+ //    this->setWindowTitle(tr("音乐"));
+     this->setWindowTitle(tr("Music Player"));

kylin-music.spec

@@ -1,6 +1,6 @@
 Name:           kylin-music
 Version:        1.1.3
-Release:        3
+Release:        8
 Summary:        kylin-music
 License:        GPL-3.0-or-later and MIT
 URL:            https://github.com/UbuntuKylin/kylin-music
@@ -9,6 +9,11 @@ Source0:        %{name}-%{version}.tar.gz
 patch0:         0001-fix-compile-error-of-kylin-music.patch
 patch1:         0002-modify-version-is-error.patch
 Patch2:		kylin-music-1.1.3_kylin_fix_install_the_repair_file_in_the_bin_directory.patch
+Patch3:		0001-kylin-music-fix-wrong-mouse-style-of-some-title-bar-.patch
+Patch4:		0001-kylin-music-fix-null-pointer-widget-error.patch
+Patch5:		0001-use-QRandomGenerator-to-generate-random-numbers.patch
+Patch6:         fix-kylin-music-mini-mode-stay-on-top-hint.patch
+Patch7:        fix-kylin-music-border-space.patch
 
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qtchooser
@@ -34,6 +39,11 @@ kylin-music
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 export PATH=%{_qt5_bindir}:$PATH
@@ -78,6 +88,24 @@ cp -r %{_builddir}/%{name}-%{version}/data/kylin-music %{buildroot}/usr/share/ky
 %{_datadir}/kylin-user-guide/data/guide/*
 
 %changelog
+* Thu May 09 2024 douyan <douyan@kylinos.cn> - 1.1.3-8
+- add fix-kylin-music-border-space.patch
+
+* Tue May 07 2024 douyan <douyan@kylinos.cn> - 1.1.3-7
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: add fix-kylin-music-mini-mode-stay-on-top-hint.patch
+
+* Mon May 06 2024 houhongxun <houhongxun@kylinos.cn> - 1.1.3-6
+- add Patch5: 0001-use-QRandomGenerator-to-generate-random-numbers.patch
+
+* Tue Apr 16 2024 houhongxun <houhongxun@kylinos.cn> - 1.1.3-5
+- add Patch4: 0001-kylin-music-fix-null-pointer-widget-error.patch
+
+* Mon Apr 15 2024 houhongxun <houhongxun@kylinos.cn> - 1.1.3-4
+- add Patch3: 0001-kylin-music-fix-wrong-mouse-style-of-some-title-bar-.patch
+
 * Wed Jun 14 2023 huayadong <huayadong@kylinos.cn> - 1.1.3-3
 - add Patch2：kylin-music-1.1.3_kylin_fix_install_the_repair_file_in_the_bin_directory.patch