From 2e1a068be3645a283b4e0b49e7b0f53ea10b11ba Mon Sep 17 00:00:00 2001 From: dragondjf Date: Tue, 3 Nov 2015 10:20:59 +0800 Subject: [PATCH] set application name QMusic --- src/config/__init__.py | 10 +++++----- src/config/constants.py | 2 +- src/dwidgets/coverengine.py | 12 ------------ src/skin/images/{deepin-music.png => QMusic.png} | Bin test/song.py | 2 +- 5 files changed, 7 insertions(+), 19 deletions(-) rename src/skin/images/{deepin-music.png => QMusic.png} (100%) diff --git a/src/config/__init__.py b/src/config/__init__.py index 04b4740..9bb8454 100644 --- a/src/config/__init__.py +++ b/src/config/__init__.py @@ -4,12 +4,12 @@ import json from PyQt5.QtCore import qVersion -applicationName = 'Deepin Music' +applicationName = 'QMusic' applicationVersion = '3.0.0' -organizationDomain = 'linuxdeepin.com' -organizationName = "Deepin" -windowIcon = os.sep.join(['skin', 'images', 'deepin-music.png']) -windowTitle = u'Deepin Music' +organizationDomain = 'dragondjf.github.io' +organizationName = "dragondjf" +windowIcon = os.sep.join(['skin', 'images', 'QMusic.png']) +windowTitle = u'QMusic' if qVersion().startswith('5.3'): isWebengineUsed = False diff --git a/src/config/constants.py b/src/config/constants.py index 130c6fa..f458773 100644 --- a/src/config/constants.py +++ b/src/config/constants.py @@ -26,7 +26,7 @@ QStandardPaths.writableLocation(QStandardPaths.MusicLocation), 'download') LRCPath = os.path.join( QStandardPaths.writableLocation(QStandardPaths.MusicLocation), 'lyrics') -LogCachePath = os.path.join(Home, '.cache', 'deepin-muisc') +LogCachePath = os.path.join(Home, '.cache', 'qmuisc') LogPath = os.path.join(LogCachePath, 'main.log') paths = [ diff --git a/src/dwidgets/coverengine.py b/src/dwidgets/coverengine.py index 9efe2f5..5cef595 100644 --- a/src/dwidgets/coverengine.py +++ b/src/dwidgets/coverengine.py @@ -385,18 +385,6 @@ def downloadAlbumCover(self, artist, album): d = CoverRunnable(self, artist, album, qtype="artist") QThreadPool.globalInstance().start(d) - @classmethod - def getArtistCoverPath(cls, artist): - ArtistCoverPath = '/home/djf/.config/DeepinMusic3/cover/artist' - filepath = os.path.join(ArtistCoverPath, artist) - return filepath - - @classmethod - def getAlbumCoverPath(cls, artist, album): - ArtistCoverPath = '/home/djf/.config/DeepinMusic3/cover/album' - filepath = os.path.join(ArtistCoverPath, '%s-%s' % (artist, album)) - return filepath - if __name__ == '__main__': app = QGuiApplication(sys.argv) diff --git a/src/skin/images/deepin-music.png b/src/skin/images/QMusic.png similarity index 100% rename from src/skin/images/deepin-music.png rename to src/skin/images/QMusic.png diff --git a/test/song.py b/test/song.py index b900c5b..0c90845 100644 --- a/test/song.py +++ b/test/song.py @@ -79,7 +79,7 @@ """.split() class Song(dict, Logger): - ''' The deepin music song class. ''' + ''' The qmusic song class. ''' def init_from_dict(self, other_dict=None, cmp_key="uri"): ''' init from other dict. ''' if other_dict: