From f6382666b60cf17c6a67fd22c32b135481248979 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Mon, 25 Sep 2017 16:31:51 +0200 Subject: [PATCH] Fix bug #46 (icons on Linux) --- YACReader.desktop | 2 +- YACReader/YACReader.pro | 7 ++----- YACReaderLibrary.desktop | 2 +- YACReaderLibrary/YACReaderLibrary.pro | 13 ++++++------- images/YACReader.png | Bin 0 -> 4957 bytes images/YACReaderLibrary.png | Bin 0 -> 5324 bytes 6 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 images/YACReader.png create mode 100644 images/YACReaderLibrary.png diff --git a/YACReader.desktop b/YACReader.desktop index 32d5caf3..196a8d3d 100644 --- a/YACReader.desktop +++ b/YACReader.desktop @@ -3,7 +3,7 @@ Name=YACReader GenericName=Yet Another Comic Reader Comment=A comic reader with support for .cb*, .pdf and whole directories. Exec=YACReader %f -Icon=/usr/share/yacreader/icon.png +Icon=YACReader Terminal=false Type=Application StartupNotify=true diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index f6412b5b..0b0e1338 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -245,15 +245,12 @@ docs.path = $$DATADIR/doc/yacreader docs.extra = cp ../README.txt ../README docs.files = ../README ../CHANGELOG.md -icon.path = $$DATADIR/yacreader -icon.files = ../images/icon.png +icon.path = $$DATADIR/icons/hicolor/48x48/apps +icon.files = ../YACReader.png desktop.path = $$DATADIR/applications -desktop.extra = desktop-file-edit --set-icon=$$DATADIR/yacreader/icon.png ../YACReader.desktop desktop.files = ../YACReader.desktop -#TODO: icons should be located at /usr/share/icons and have the same basename as their application - translation.path = $$DATADIR/yacreader/languages translation.files = ../release/languages/yacreader_* diff --git a/YACReaderLibrary.desktop b/YACReaderLibrary.desktop index 75f7a4a3..0bdf35d4 100644 --- a/YACReaderLibrary.desktop +++ b/YACReaderLibrary.desktop @@ -3,7 +3,7 @@ Name=YACReader Library GenericName=Yet Another Comic Reader - Library Comment=A comic library management application with server mode. Exec=YACReaderLibrary %f -Icon=/usr/share/yacreader/iconLibrary.png +Icon=YACReaderLibrary Terminal=false Type=Application StartupNotify=true diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index fa1f7a7e..274e1b0c 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -40,7 +40,7 @@ win32 { } else { LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32 } - + QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL QMAKE_LFLAGS_RELEASE += /LTCG CONFIG -= embed_manifest_exe @@ -156,7 +156,7 @@ HEADERS += comic_flow.h \ HEADERS += ../common/gl/yacreader_flow_gl.h } } - + SOURCES += comic_flow.cpp \ create_library_dialog.cpp \ library_creator.cpp \ @@ -231,7 +231,7 @@ SOURCES += comic_flow.cpp \ } } - + include(./server/server.pri) include(../custom_widgets/custom_widgets_yacreaderlibrary.pri) CONFIG(7zip){ @@ -257,7 +257,7 @@ macx { ICON = YACReaderLibrary.icns } -TRANSLATIONS = yacreaderlibrary_es.ts \ +TRANSLATIONS = yacreaderlibrary_es.ts \ yacreaderlibrary_ru.ts \ yacreaderlibrary_pt.ts \ yacreaderlibrary_fr.ts \ @@ -313,11 +313,10 @@ isEmpty(DESTDIR) { server.path = $$DATADIR/yacreader server.files = ../release/server -icon.path = $$DATADIR/yacreader -icon.files = ../images/iconLibrary.png ../images/db.png ../images/coversPackage.png +icon.path = $$DATADIR/icons/hicolor/48x48/apps +icon.files = ../YACReaderLibrary.png desktop.path = $$DATADIR/applications -desktop.extra = desktop-file-edit --set-icon=$$DATADIR/yacreader/iconLibrary.png $$PWD/../YACReaderLibrary.desktop desktop.files = ../YACReaderLibrary.desktop #TODO: icons should be located at /usr/share/icons and have the same basename as their application diff --git a/images/YACReader.png b/images/YACReader.png new file mode 100644 index 0000000000000000000000000000000000000000..32e007a355fc6c160f375b85f9e9e8fbf20cde2c GIT binary patch literal 4957 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 bGBqnOF*-0X5Ebl~00000NkvXXu0mjf_g8T_ literal 0 HcmV?d00001 diff --git a/images/YACReaderLibrary.png b/images/YACReaderLibrary.png new file mode 100644 index 0000000000000000000000000000000000000000..f52e5dea709713c2d8ef4ee3f2e97a92366bc7d6 GIT binary patch literal 5324 zcmV;-6f^6IP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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%0D^!Im_P<- zNhz!KT6JfAWkI`H+%R3oGZZbT1wt9jaDi-Liovl-vV|1LI@jmV@$!#fVtILyN@^W0Am9QhOtChye()G^b{AK0F+KN^wSJa)Is^Yl15{?a$A3Dt7$U!C! z%+i;Slj#fKxeAqPgK`TN*2`?|RH;{Yv2B}BD1`7Fws&gGFYh3g0MGu-cdnGT7rzFa z0UGb3^IZW1VC<*N-tVFP^V(i5O6j^zt5(_VZLBSOTQ@f;mA15v^>wAVv8A{!BvSoE z69a^!11!v6=Hl5GX;!!VfT{Sd>#MfVmEDHT@@9pl<#jI2uTdDD;kh6Dz?#4C($nC- zxF3E0-2mQekIVofZ#kxb!2XyBFbzxrx&4yMYnqmh#^Ql+Bo+>sX50*zhM^m(5Wcci zTvvo}+O4*|q-lCLo=D|~M#i%T4d(ZZ)n_mWA1?umi z@qIV>ZaI>%pMl6*Aar1OAHV|gz}WtnK26i|QlbgrdkQ$ZuKS+vZ%Zk+fHE)$#0|sj zkHzDCp05UK!H!UzTEi*7w zFf=+cGdeIiD=;!TFfgMZS*`#803~!qSaf7zbY(hiZ)9m^c>ppnF*PkQGA%MOR53F; eGBY|dH7hVNIxsL073`M)0000