Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修改代码结构。 #48

Open
wants to merge 63 commits into
base: feature-refactor
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
76ff9a6
增加.qm文件
fengyongfan Jan 29, 2021
1d39620
优化历史列表拖动
fengyongfan Jan 30, 2021
6237c0e
优化历史播放列表拖拽
fengyongfan Jan 30, 2021
7504b0b
由于QMediaPlayer类初始化时间过长
loveptong Jan 30, 2021
025bee2
无法添加歌曲弹窗
fengyongfan Jan 30, 2021
b7e34cd
添加大括号
fengyongfan Jan 30, 2021
4749745
Merge pull request #25 from liujialina/dev
loveptong Jan 30, 2021
b1573c7
Merge branch 'dev' into dev
loveptong Jan 30, 2021
0941679
Merge pull request #26 from loveptong/dev
loveptong Jan 30, 2021
63b646b
判断歌曲右键只有添加成功才播放、增加历史歌单初始化Music
fengyongfan Jan 30, 2021
077edca
更改mainwid.cpp冲突
fengyongfan Jan 30, 2021
8a86fd7
Merge https://github.com/UbuntuKylin/kylin-music into dev
fengyongfan Jan 30, 2021
f6beb92
Merge branch 'dev' of https://github.com/UbuntuKylin/kylin-music into…
fengyongfan Jan 30, 2021
d0b9db9
Merge branch 'dev' into dev
liujialina Jan 30, 2021
c729aea
Merge pull request #27 from liujialina/dev
loveptong Jan 30, 2021
08aa487
990
YouYuFei Jan 30, 2021
3b28bd0
Merge pull request #28 from YouYuFei/dev
loveptong Jan 30, 2021
a2faa5a
合并UbuntuKylin的dev分支
fengyongfan Jan 31, 2021
6a4659a
增加s3、s4,适配麒麟990
fengyongfan Feb 1, 2021
e9af5b5
解决bug:26911 36344 重写侧边栏歌单按钮,在切换页面时同时切换按钮底色.
fengyongfan Feb 1, 2021
4cdeacf
Merge pull request #30 from fengyongfan/dev
loveptong Feb 2, 2021
cb3f7d3
Merge pull request #29 from liujialina/dev
loveptong Feb 2, 2021
68e8c34
解决bug:31426,35306 隐藏主题颜色设置菜单
fengyongfan Feb 2, 2021
eebd7d0
添加音量功能
fengyongfan Feb 2, 2021
eb439e3
Merge pull request #31 from fengyongfan/dev
loveptong Feb 2, 2021
5f52e53
解决添加音量功能遗留的问题
fengyongfan Feb 3, 2021
7f24bd8
暂时隐藏历史播放列表,去掉ape格式支持
YouYuFei Feb 3, 2021
a6c4a7a
Merge pull request #32 from liujialina/dev
loveptong Feb 3, 2021
df9e2e3
Merge pull request #33 from YouYuFei/dev
loveptong Feb 3, 2021
4e00d26
合并UbuntuKylin的dev分支
fengyongfan Feb 3, 2021
429728d
歌曲列表歌曲全部删除后显示插画
YouYuFei Feb 3, 2021
f645f81
修改歌单歌曲无法右键(偏移120px)、解决初始化滑动条滑动闪退的问题
fengyongfan Feb 3, 2021
b95cbdd
解决BUG#37612,新增单击选中播放功能
YouYuFei Feb 3, 2021
93871be
Merge pull request #34 from YouYuFei/dev
loveptong Feb 3, 2021
e7621a7
Merge branch 'dev' into dev
loveptong Feb 3, 2021
4d1f50b
Merge pull request #36 from YouYuFei/dev
loveptong Feb 3, 2021
9b4e34a
Merge branch 'dev' into dev
loveptong Feb 3, 2021
3d59679
Merge pull request #35 from liujialina/dev
loveptong Feb 4, 2021
9beff36
解决bug35370 35065 优化界面.
fengyongfan Feb 4, 2021
fa58fd8
解决bug35370 35065 优化界面.
loveptong Feb 4, 2021
2afc6e8
解决程序打开时点击播放按钮没有默认播放歌曲、去掉运行依赖gstreamer1.0-plugins-bad、去掉.wav的音频格式
fengyongfan Feb 4, 2021
860edc2
解决程序打开时点击播放按钮没有 默认播放歌曲、去掉运行依赖gstreamer1.0-plugins-bad、去掉.wav的音频格式
fengyongfan Feb 4, 2021
712a7bf
解决程序打开时点击播放按钮没有 默认播放歌曲、去掉运行依赖gstreamer1.0-plugins-bad、去掉.wav的音频格式
loveptong Feb 5, 2021
1b42f7c
合并UbuntuKylin分支dev的代码
fengyongfan Feb 5, 2021
15e3414
更改关于界面的版本号、更改程序开启时,双击我喜欢按钮样式未改变
fengyongfan Feb 5, 2021
d6b715f
修改changelog,修改版本号
loveptong Feb 5, 2021
336da9e
解决bug38417
fengyongfan Feb 6, 2021
dabb422
解决bug38417
loveptong Feb 6, 2021
688ef7d
解决双击播放按钮状态不对、英文模式主界面有我喜欢、删除本地歌曲,再次点击歌曲应用闪退、修改用户手册
fengyongfan Feb 7, 2021
aaeb002
更改我喜欢界面的我喜欢Label未汉化
fengyongfan Feb 7, 2021
5b66325
数据库增加‘歌单重命名’功能
LinKuiyi Feb 19, 2021
ab684fa
数据库增加‘歌单重命名’功能
loveptong Feb 19, 2021
b9e6528
添加缺少changelog的kylin-music 1.0.52kord~rc5版本号
fengyongfan Feb 20, 2021
e16644b
解决歌曲信息乱码问题
YouYuFei Feb 20, 2021
4e58abf
解决歌曲信息乱码问题
YouYuFei Feb 20, 2021
21503ab
解决歌曲信息乱码问题
YouYuFei Feb 20, 2021
337a9d2
Merge pull request #43 from YouYuFei/dev 解决歌曲信息乱码问题
loveptong Feb 20, 2021
9aec0c2
Fix bugs from zentao;add translations
loveptong Feb 20, 2021
8e849dd
增加数据库字段,增加更改顺序功能,添加优化一些错误打印输出
LinKuiyi Feb 21, 2021
0dfe0a3
Merge pull request #44 from LinKuiyi/dev
loveptong Feb 22, 2021
a962f94
Add Player class .
Mar 1, 2021
116170f
Modify directories.
loveptong Mar 29, 2021
6d780e5
Modify directories.
loveptong Mar 29, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 77 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
cmake_minimum_required(VERSION 3.5)
#Set Project Name
set(project_name kylin-music)
project(${project_name} LANGUAGES CXX)

set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets X11Extras Network DBus Multimedia Sql REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets X11Extras Network DBus Multimedia Sql REQUIRED)
find_package(KF5WindowSystem REQUIRED)
#Gsettting
find_package(PkgConfig REQUIRED)
pkg_check_modules(gsettings REQUIRED IMPORTED_TARGET gsettings-qt)

#add include
include_directories(${PROJECT_SOURCE_DIR}/playcontroller/)
include_directories(${PROJECT_SOURCE_DIR}/qtsingleapplication/)
include_directories(${PROJECT_SOURCE_DIR}/taglib/)
include_directories(${PROJECT_SOURCE_DIR}/dbcontroller/)
include_directories(${PROJECT_SOURCE_DIR}/ui/)
include_directories(${PROJECT_SOURCE_DIR}/dbus/)


file(GLOB controller_SRC
"playcontroller/player.cpp"
"playcontroller/player.h"
)

file(GLOB db_controller_SRC
"dbcontroller/musicDataBase.cpp"
"dbcontroller/musicDataBase.h"
)

file(GLOB ui_SRC
"ui/*.cpp"
"ui/*.h"
)

file(GLOB singleapp
"qtsingleapplication/qtlocalpeer.cpp"
"qtsingleapplication/qtsingleapplication.cpp"
"qtsingleapplication/qtlocalpeer.h"
"qtsingleapplication/qtsingleapplication.h"
)

file(GLOB dbus_SRC
"dbus/daemonipcdbus.cpp"
"dbus/daemonipcdbus.h"
)

SET(ui_RESOURCE ${PROJECT_SOURCE_DIR}/res.qrc)

add_executable(${project_name}
main.cpp
${controller_SRC}
${db_controller_SRC}
${dbus_SRC}
${ui_SRC}
${ui_RESOURCE}
${singleapp}
)

target_link_libraries(${project_name} Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::DBus Qt${QT_VERSION_MAJOR}::Multimedia Qt${QT_VERSION_MAJOR}::Sql)
#窗管
target_link_libraries(${project_name} Qt${QT_VERSION_MAJOR}::X11Extras KF5::WindowSystem -lX11)
#Gsettting
target_link_libraries(${project_name} PkgConfig::gsettings)
#taglib
target_link_libraries(${project_name} -ltag -ltag_c)
########### install ###############
#install(TARGETS kylin-music DESTINATION /usr/bin/)
#install(FILES ${PROJECT_SOURCE_DIR}/kylin-music.desktop DESTINATION /etc/xdg/autostart/)
Binary file modified data/kylin-music/en_US/image/list.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/kylin-music/en_US/image/mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/kylin-music/en_US/image/play.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/kylin-music/en_US/image/right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed data/kylin-music/en_US/image/setting.png
Binary file not shown.
26 changes: 3 additions & 23 deletions data/kylin-music/en_US/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Kylin Music
## Overview
Kylin Music is a simple to use, user-friendly, support.mp3,.ape,.ogg,.wav,.wma,.spx and other music formats music player. While playing local music, you can also group music by custom playlists according to your preferences. In addition to the regular mode, Kirin Music also has a small window mode to meet the different needs of users.
Kylin Music is a simple to use, user-friendly, support.mp3,.ogg,.wma,.spx,.flac and other music formats music player. While playing local music, you can also group music by custom playlists according to your preferences. In addition to the regular mode, Kirin Music also has a small window mode to meet the different needs of users.

<br>

Expand All @@ -22,26 +22,6 @@ The song list page after adding the songs is shown in the Fig.below.

<br>

## Set the window

<br>

It is divided into general Settings, quick Settings and version information.

<br>

### Feature introduction

<br>

You can operate the shortcut key play module, add songs, etc.

<br>

![Fig.3 Settings-big](image/setting.png)

<br>

## Right click on the song

<br>
Expand All @@ -58,14 +38,14 @@ Select the right button to add to your favorite playlist, delete songs, view son

<br>

![Fig.4 right-click-big](image/right.png)
![Fig.3 right-click-big](image/right.png)

<br>

## Toggle mini mode
You can switch the Mini window for better user experience.

![Fig.5 Mini](image/mini.png)
![Fig.4 Mini](image/mini.png)

<br>

Binary file modified data/kylin-music/zh_CN/image/list.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/kylin-music/zh_CN/image/mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/kylin-music/zh_CN/image/play.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/kylin-music/zh_CN/image/right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed data/kylin-music/zh_CN/image/setting.png
Binary file not shown.
26 changes: 3 additions & 23 deletions data/kylin-music/zh_CN/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 麒麟音乐
## 概 述
麒麟音乐是一款简单易用,界面友好,支持.mp3、.ape、.ogg、.wav、.wma、.spx等音乐格式的音乐播放器。在播放本地音乐的同时,还可以根据喜好将自定义歌单来对音乐进行分组。除了常规模式外,麒麟音乐还有小窗口模式来满足用户的不同需求。
麒麟音乐是一款简单易用,界面友好,支持.mp3、.ogg、.wma、.spx、.flac等音乐格式的音乐播放器。在播放本地音乐的同时,还可以根据喜好将自定义歌单来对音乐进行分组。除了常规模式外,麒麟音乐还有小窗口模式来满足用户的不同需求。

<br>

Expand All @@ -22,26 +22,6 @@

<br>

## 设置窗口

<br>

分为常规设置、快捷健设置以及版本信息。

<br>

### 功能介绍

<br>

可以快捷键操作播放模块、添加歌曲等。

<br>

![图 3 设置-big](image/setting.png)

<br>

## 歌曲右键

<br>
Expand All @@ -58,15 +38,15 @@

<br>

![图 4 歌曲右键-big](image/right.png)
![图 3 歌曲右键-big](image/right.png)

<br>

## 切换迷你模式

为了更好的体验您可以切换Mini窗口。

![图 5 迷你模式](image/mini.png)
![图 4 迷你模式](image/mini.png)

<br>

Loading