From 13f9fc07b20b4e6a2e72fed77ebb2dd3a3e7280b Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Wed, 11 Aug 2010 19:27:41 +0200 Subject: [PATCH] move icons to xdg standard dirs, add desktop files closes #359 --- desktop/qboobmsg.desktop | 9 ++++++ desktop/qhavesex.desktop | 9 ++++++ desktop/qvideoob.desktop | 9 ++++++ desktop/weboob-config-qt.desktop | 9 ++++++ .../aum/data/logo.png => icons/aum.png | Bin icons/bnporc.png | Bin 0 -> 5192 bytes .../data/logo.png => icons/canaltp.png | Bin .../cragr/data/logo.png => icons/cragr.png | Bin .../dlfp/data/logo.png => icons/dlfp.png | Bin .../data/logo.png => icons/fourchan.png | Bin .../data/logo.png => icons/gazelle.png | Bin .../ina/data/logo.png => icons/ina.png | Bin .../data/logo.png => icons/transilien.png | Bin .../yahoo/data/logo.png => icons/yahoo.png | Bin .../data/logo.png => icons/youjizz.png | Bin .../data/logo.png => icons/youporn.png | Bin .../data/logo.png => icons/youtube.png | Bin setup.py | 28 ++++++++++++++++-- weboob/backends/arte/backend.py | 2 -- weboob/backends/aum/backend.py | 1 - weboob/backends/bnporc/backend.py | 4 +-- weboob/backends/bnporc/data/logo.png | Bin 5089 -> 0 bytes weboob/backends/canaltp/backend.py | 1 - weboob/backends/cragr/backend.py | 4 +-- weboob/backends/dlfp/backend.py | 2 -- weboob/backends/fourchan/backend.py | 2 -- weboob/backends/gazelle/backend.py | 2 -- weboob/backends/geolocip/backend.py | 1 - weboob/backends/ina/backend.py | 2 -- weboob/backends/transilien/backend.py | 1 - weboob/backends/yahoo/backend.py | 2 -- weboob/backends/youjizz/backend.py | 2 -- weboob/backends/youporn/backend.py | 2 -- weboob/backends/youtube/backend.py | 2 -- weboob/core/backends.py | 3 ++ weboob/tools/backend.py | 2 +- 36 files changed, 70 insertions(+), 29 deletions(-) create mode 100644 desktop/qboobmsg.desktop create mode 100644 desktop/qhavesex.desktop create mode 100644 desktop/qvideoob.desktop create mode 100644 desktop/weboob-config-qt.desktop rename weboob/backends/aum/data/logo.png => icons/aum.png (100%) create mode 100644 icons/bnporc.png rename weboob/backends/canaltp/data/logo.png => icons/canaltp.png (100%) rename weboob/backends/cragr/data/logo.png => icons/cragr.png (100%) rename weboob/backends/dlfp/data/logo.png => icons/dlfp.png (100%) rename weboob/backends/fourchan/data/logo.png => icons/fourchan.png (100%) rename weboob/backends/gazelle/data/logo.png => icons/gazelle.png (100%) rename weboob/backends/ina/data/logo.png => icons/ina.png (100%) rename weboob/backends/transilien/data/logo.png => icons/transilien.png (100%) rename weboob/backends/yahoo/data/logo.png => icons/yahoo.png (100%) rename weboob/backends/youjizz/data/logo.png => icons/youjizz.png (100%) rename weboob/backends/youporn/data/logo.png => icons/youporn.png (100%) rename weboob/backends/youtube/data/logo.png => icons/youtube.png (100%) delete mode 100644 weboob/backends/bnporc/data/logo.png diff --git a/desktop/qboobmsg.desktop b/desktop/qboobmsg.desktop new file mode 100644 index 0000000000..d9f0f986ad --- /dev/null +++ b/desktop/qboobmsg.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=QBoobmsg +Comment=Send and receive messages from various websites +Exec=qboobmsg +# Icon=qboobmsg +Terminal=false +Type=Application +StartupNotify=true +Categories=Network;Qt; diff --git a/desktop/qhavesex.desktop b/desktop/qhavesex.desktop new file mode 100644 index 0000000000..ddad5cf87e --- /dev/null +++ b/desktop/qhavesex.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=QHavesex +Comment=Optimize your probabilities to have sex on dating websites +Exec=qhavesex +# Icon=qhavesex +Terminal=false +Type=Application +StartupNotify=true +Categories=Network;Chat;ContactManagement;Qt; diff --git a/desktop/qvideoob.desktop b/desktop/qvideoob.desktop new file mode 100644 index 0000000000..da645fc27e --- /dev/null +++ b/desktop/qvideoob.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=QVideoob +Comment=Search for videos on many websites, and get info about them +Exec=qvideoob +# Icon=qvideoob +Terminal=false +Type=Application +StartupNotify=true +Categories=Video;Qt; diff --git a/desktop/weboob-config-qt.desktop b/desktop/weboob-config-qt.desktop new file mode 100644 index 0000000000..719510a8f9 --- /dev/null +++ b/desktop/weboob-config-qt.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Weboob backends configuration +Comment=Configure Weboob backends +Exec=weboob-config-qt +# Icon=weboob-config-qt +Terminal=false +Type=Application +StartupNotify=true +Categories=Utility;Qt; diff --git a/weboob/backends/aum/data/logo.png b/icons/aum.png similarity index 100% rename from weboob/backends/aum/data/logo.png rename to icons/aum.png diff --git a/icons/bnporc.png b/icons/bnporc.png new file mode 100644 index 0000000000000000000000000000000000000000..7ed6ae895b62fd4b00d26cc933425c44c62f3ae8 GIT binary patch literal 5192 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 DGC%Kk diff --git a/weboob/backends/canaltp/backend.py b/weboob/backends/canaltp/backend.py index 04a73a7b23..d0603eda2e 100644 --- a/weboob/backends/canaltp/backend.py +++ b/weboob/backends/canaltp/backend.py @@ -33,7 +33,6 @@ class CanalTPBackend(BaseBackend, ICapTravel): VERSION = '0.1' LICENSE = 'GPLv3' DESCRIPTION = "French trains" - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') BROWSER = CanalTP def iter_station_search(self, pattern): diff --git a/weboob/backends/cragr/backend.py b/weboob/backends/cragr/backend.py index f8d5f78ce2..f69ba4f6aa 100644 --- a/weboob/backends/cragr/backend.py +++ b/weboob/backends/cragr/backend.py @@ -15,6 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + import os from weboob.capabilities.bank import ICapBank, AccountNotFound @@ -22,6 +23,7 @@ from .browser import Cragr + class CragrBackend(BaseBackend, ICapBank): NAME = 'cragr' MAINTAINER = 'Laurent Bachelier' @@ -29,8 +31,6 @@ class CragrBackend(BaseBackend, ICapBank): VERSION = '0.1' DESCRIPTION = 'Credit Agricole french bank\'s website' LICENSE = 'GPLv3' - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') - CONFIG = {'login': BaseBackend.ConfigField(description='Account ID'), 'password': BaseBackend.ConfigField(description='Password of account', is_masked=True), 'website': BaseBackend.ConfigField(description='What website to use', default='m.lefil.com'), diff --git a/weboob/backends/dlfp/backend.py b/weboob/backends/dlfp/backend.py index 1189fa6ff5..7f20aedb1c 100644 --- a/weboob/backends/dlfp/backend.py +++ b/weboob/backends/dlfp/backend.py @@ -37,8 +37,6 @@ class DLFPBackend(BaseBackend, ICapMessages, ICapMessagesReply): VERSION = '0.1' LICENSE = 'GPLv3' DESCRIPTION = "Da Linux French Page" - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') - CONFIG = {'username': BaseBackend.ConfigField(description='Username on website'), 'password': BaseBackend.ConfigField(description='Password of account', is_masked=True), 'get_news': BaseBackend.ConfigField(default=True, description='Get newspapers'), diff --git a/weboob/backends/fourchan/backend.py b/weboob/backends/fourchan/backend.py index cd544a9f35..fd8bab6b8e 100644 --- a/weboob/backends/fourchan/backend.py +++ b/weboob/backends/fourchan/backend.py @@ -37,8 +37,6 @@ class FourChanBackend(BaseBackend, ICapMessages): VERSION = '0.1' LICENSE = 'GPLv3' DESCRIPTION = "4chan website" - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') - CONFIG = {'boards': BaseBackend.ConfigField(description='Boards'), } STORAGE = {'boards': {}} diff --git a/weboob/backends/gazelle/backend.py b/weboob/backends/gazelle/backend.py index 096379e3f2..e2d2b5a63c 100644 --- a/weboob/backends/gazelle/backend.py +++ b/weboob/backends/gazelle/backend.py @@ -33,8 +33,6 @@ class GazelleBackend(BaseBackend, ICapTorrent): VERSION = '0.1' DESCRIPTION = 'gazelle bittorrent tracker' LICENSE = 'GPLv3' - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') - CONFIG = {'username': BaseBackend.ConfigField(description='Username on website'), 'password': BaseBackend.ConfigField(description='Password of account', is_masked=True), 'protocol': BaseBackend.ConfigField(description='Protocol to use ("http" or "https")', regexp='^(http|https)$'), diff --git a/weboob/backends/geolocip/backend.py b/weboob/backends/geolocip/backend.py index 7f3b3823cb..c683b932ef 100644 --- a/weboob/backends/geolocip/backend.py +++ b/weboob/backends/geolocip/backend.py @@ -34,7 +34,6 @@ class GeolocIpBackend(BaseBackend, ICapGeolocIp): VERSION = '0.1' LICENSE = 'GPLv3' DESCRIPTION = u"IP Adresses geolocalisation" - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') CONFIG = {'email': BaseBackend.ConfigField(description='Username on website'), 'password': BaseBackend.ConfigField(description='Password of account', is_masked=True), } diff --git a/weboob/backends/ina/backend.py b/weboob/backends/ina/backend.py index b807466269..fed8a27d2a 100644 --- a/weboob/backends/ina/backend.py +++ b/weboob/backends/ina/backend.py @@ -35,8 +35,6 @@ class InaBackend(BaseBackend, ICapVideo): VERSION = '0.1' DESCRIPTION = 'INA french video archives' LICENSE = 'GPLv3' - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') - BROWSER = InaBrowser def get_video(self, _id): diff --git a/weboob/backends/transilien/backend.py b/weboob/backends/transilien/backend.py index 870d57ea9b..572345c9e2 100644 --- a/weboob/backends/transilien/backend.py +++ b/weboob/backends/transilien/backend.py @@ -31,7 +31,6 @@ class TransilienBackend(BaseBackend, ICapTravel): VERSION = '0.1' LICENSE = 'GPLv3' DESCRIPTION = "Transports in Paris" - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') BROWSER = Transilien def iter_station_search(self, pattern): diff --git a/weboob/backends/yahoo/backend.py b/weboob/backends/yahoo/backend.py index 1022db93f0..1b92683832 100644 --- a/weboob/backends/yahoo/backend.py +++ b/weboob/backends/yahoo/backend.py @@ -37,8 +37,6 @@ class YahooBackend(BaseBackend, ICapWeather): VERSION = '0.1' DESCRIPTION = 'Yahoo' LICENSE = 'GPLv3' - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') - WEATHER_URL = 'http://weather.yahooapis.com/forecastrss?w=%s&u=%s' def iter_city_search(self, pattern): diff --git a/weboob/backends/youjizz/backend.py b/weboob/backends/youjizz/backend.py index f45a60ca43..90733da1ef 100644 --- a/weboob/backends/youjizz/backend.py +++ b/weboob/backends/youjizz/backend.py @@ -37,8 +37,6 @@ class YoujizzBackend(BaseBackend, ICapVideo): VERSION = '0.1' DESCRIPTION = 'Youjizz videos website' LICENSE = 'GPLv3' - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') - BROWSER = YoujizzBrowser def get_video(self, _id): diff --git a/weboob/backends/youporn/backend.py b/weboob/backends/youporn/backend.py index 6a0ad4a5a3..5fd0d319e7 100644 --- a/weboob/backends/youporn/backend.py +++ b/weboob/backends/youporn/backend.py @@ -37,8 +37,6 @@ class YoupornBackend(BaseBackend, ICapVideo): VERSION = '0.1' DESCRIPTION = 'Youporn videos website' LICENSE = 'GPLv3' - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') - BROWSER = YoupornBrowser def get_video(self, _id): diff --git a/weboob/backends/youtube/backend.py b/weboob/backends/youtube/backend.py index 102dbdb2ee..605e884aeb 100644 --- a/weboob/backends/youtube/backend.py +++ b/weboob/backends/youtube/backend.py @@ -38,8 +38,6 @@ class YoutubeBackend(BaseBackend, ICapVideo): VERSION = '0.1' DESCRIPTION = 'Youtube videos website' LICENSE = 'GPLv3' - ICON = os.path.join(os.path.dirname(__file__), 'data/logo.png') - BROWSER = YoutubeBrowser def get_video(self, _id): diff --git a/weboob/core/backends.py b/weboob/core/backends.py index ee41aa58eb..4b05dd8a0e 100644 --- a/weboob/core/backends.py +++ b/weboob/core/backends.py @@ -24,6 +24,7 @@ import os import re import stat +import xdg.IconTheme from weboob.capabilities.cap import ICap from weboob.tools.backend import BaseBackend @@ -69,6 +70,8 @@ def config(self): @property def icon_path(self): + if self.klass.ICON is None: + self.klass.ICON = xdg.IconTheme.getIconPath(self.klass.NAME) return self.klass.ICON def iter_caps(self): diff --git a/weboob/tools/backend.py b/weboob/tools/backend.py index c2c3fd2d0a..096ad964ec 100644 --- a/weboob/tools/backend.py +++ b/weboob/tools/backend.py @@ -66,7 +66,7 @@ class BaseBackend(object): # License of this backend. LICENSE = '' # Icon file path - ICON = '' + ICON = None # Configuration required for this backend. # Values must be ConfigField objects. CONFIG = {} -- GitLab