From 1c70cbc48a0b5779015f39970e18662d916049bf Mon Sep 17 00:00:00 2001 From: Sergio Costas Date: Sun, 3 Dec 2017 11:42:14 +0100 Subject: [PATCH] Now shows the icon in wayland --- ...{devedeng.desktop => devede_ng.py.desktop} | 2 +- data/devedeng_icon.svg | 273 ++++++++++++++++++ data/interface/wmain.ui | 8 +- data/interface/wselect_disk.ui | 17 +- setup.py | 8 +- 5 files changed, 296 insertions(+), 12 deletions(-) rename data/{devedeng.desktop => devede_ng.py.desktop} (97%) create mode 100644 data/devedeng_icon.svg diff --git a/data/devedeng.desktop b/data/devede_ng.py.desktop similarity index 97% rename from data/devedeng.desktop rename to data/devede_ng.py.desktop index c4dc97a..0ee037d 100644 --- a/data/devedeng.desktop +++ b/data/devede_ng.py.desktop @@ -15,7 +15,7 @@ Comment[es]=Permite crear video CDs y DVDs, que pueden reproducirse en reproduct Comment[gl]=Permite crear video CDs e DVDs, que poden reproducirse en reproductores domésticos Comment[pl]=Pozwala stworzyć wideo na płytach CD lub DVD, do otwarzania w domowych odtwarzaczach DVD Comment[it]=Permette di creare video CD e DVD che possono essere riprodotti con lettori DVD +Icon=devedeng_icon.svg TryExec=devede_ng.py Exec=devede_ng.py Categories=AudioVideo; -Icon=devedeng diff --git a/data/devedeng_icon.svg b/data/devedeng_icon.svg new file mode 100644 index 0000000..5057da1 --- /dev/null +++ b/data/devedeng_icon.svg @@ -0,0 +1,273 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +DeVeDe + \ No newline at end of file diff --git a/data/interface/wmain.ui b/data/interface/wmain.ui index 2a9d15b..dc17c92 100644 --- a/data/interface/wmain.ui +++ b/data/interface/wmain.ui @@ -1,5 +1,5 @@ - + @@ -46,9 +46,8 @@ 1000 560 False - Devede center - devedeng.svg + devedeng_icon.svg @@ -772,5 +771,8 @@ + + + diff --git a/data/interface/wselect_disk.ui b/data/interface/wselect_disk.ui index 9577927..5918bba 100644 --- a/data/interface/wselect_disk.ui +++ b/data/interface/wselect_disk.ui @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@ False True center - devedeng.svg + icon_mkv.png @@ -43,7 +43,7 @@ True False - icon_dvd.png + icon_mkv.png False @@ -90,7 +90,7 @@ Creates a video DVD suitable for all DVD home players True False - icon_vcd.png + icon_mkv.png False @@ -137,7 +137,7 @@ Creates a VideoCD, with a picture quality equivalent to VHS True False - icon_svcd.png + icon_mkv.png False @@ -184,7 +184,7 @@ Creates a VideoCD with better picture quality True False - icon_cvd.png + icon_mkv.png False @@ -231,7 +231,7 @@ Another kind of Super VideoCD True False - icon_divx.png + icon_mkv.png False @@ -355,5 +355,8 @@ Creates H.264 files in a MKV container + + + diff --git a/setup.py b/setup.py index 160b478..25a88d3 100755 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import os +import sys from glob import glob from distutils.core import setup @@ -12,11 +13,13 @@ except: def get_data_files(): data_files = [ - (os.path.join('share', 'applications'), ['data/devedeng.desktop']), + (os.path.join('share', 'applications'), ['data/devede_ng.py.desktop']), (os.path.join('share', 'pixmaps'), ['data/devedeng.svg']), + (os.path.join('share', 'icons', 'hicolor', 'scalable', 'apps'), ['data/devedeng_icon.svg']), (os.path.join('share', 'devedeng'), glob("data/interface/*")), (os.path.join('share', 'devedeng'), glob('data/pixmaps/*g')), (os.path.join('share', 'devedeng'), ['data/devedeng.svg']), + (os.path.join('share', 'devedeng'), ['data/devedeng_icon.svg']), (os.path.join('share', 'devedeng'), ['data/codepages.lst']), (os.path.join('share', 'devedeng'), ['data/languages.lst']), (os.path.join('share', 'devedeng', 'backgrounds'), @@ -118,3 +121,6 @@ setup( data_files=get_data_files(), scripts=['src/devede_ng.py', 'src/copy_files_verbose.py'], ) + +if (len(sys.argv) == 2) and (sys.argv[1] == "install"): + os.system("gtk-update-icon-cache")