From e44473e5d1c48f98fb9b2942d0a7e680d7b2835c Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 15:43:27 +0200 Subject: [PATCH 01/27] Added xdg icons Signed-off-by: Blagovest Petrov --- .../128-apps-org.petrovs_info.tangraplay.png | Bin 0 -> 3364 bytes .../16-apps-org.petrovs_info.tangraplay.png | Bin 0 -> 784 bytes .../32-apps-org.petrovs_info.tangraplay.png | Bin 0 -> 1222 bytes .../48-apps-org.petrovs_info.tangraplay.png | Bin 0 -> 1474 bytes .../64-apps-org.petrovs_info.tangraplay.png | Bin 0 -> 1861 bytes Resources/CMakeLists.txt | 11 +++++++++++ 6 files changed, 11 insertions(+) create mode 100644 Resources/128-apps-org.petrovs_info.tangraplay.png create mode 100644 Resources/16-apps-org.petrovs_info.tangraplay.png create mode 100644 Resources/32-apps-org.petrovs_info.tangraplay.png create mode 100644 Resources/48-apps-org.petrovs_info.tangraplay.png create mode 100644 Resources/64-apps-org.petrovs_info.tangraplay.png create mode 100644 Resources/CMakeLists.txt diff --git a/Resources/128-apps-org.petrovs_info.tangraplay.png b/Resources/128-apps-org.petrovs_info.tangraplay.png new file mode 100644 index 0000000000000000000000000000000000000000..84534a67f2439e6fe8f61c6ac7cd357397f70275 GIT binary patch literal 3364 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 D83H2R literal 0 HcmV?d00001 diff --git a/Resources/16-apps-org.petrovs_info.tangraplay.png b/Resources/16-apps-org.petrovs_info.tangraplay.png new file mode 100644 index 0000000000000000000000000000000000000000..b11e561e616b9a56afcb51806a97c85f60f5e084 GIT binary patch literal 784 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>)GnY!Km#GVK%^YR1fXJM8$p&r zWD(8)8wD1Gsf6nN1#&q^7A6ieAM8|!Al!K%V~@%MyPpV|g`K61ne30RK7VT3Ti+i%fAZG-JGI+?{{8;@_xHa)qpy3< zUhH}{nLYff`^<%or(?@Q{qM5|2kK9ps>}KP_HXXJ`I@_c7BD7xySp%Su*!M>IqW5# zzOL*~xa4@1nWymAZ3GIf@^ork(+~q zi}UagrA0}PgoGv~1zj>=l#GnDw2X|b6r9npp{Z%nqNXOH7>7t#*U(T`S6;mZ>(;DU zxNyxHPVom9nN|tW jU|_CmU>;&*1XO2bYzWbieCEPIpaup{S3j3^P6!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+081LOVxpAgso|Ns9wCjaZG z9Ee0kKaU{kRd<8Bv?C8BSbx%gj))c z0&zh`K{TQ}6(|cc8SFfWBcV=(nvCXbs8LYcLAt;;0?j`v2Xq)zFVr-s;a~>?WkJ>< zxgVq+#Dxe#gA42=u+>2IF!zA10GkO>57q(|gxQFs1`<9X66RWP2!NaiF%xV)Fz%d} znf(FA@#K;qzhFkr>6+{3oA&x$NPzYmnI;6BH>59f=!S)1)u!PLi-em`lT|0K} zp5v8^*G}F%diCtxV~5#d52lzjEIe?Tn`g&P#VzJ-Okx~wA2TnkH5B>rv)R#sp=H{^ z009XWwu1)+tXfL6oem#RP+)LMjuMn(WV>@mz-m&7cFW=e2X0F{xlfjxWVo^L<3`TO z!jsk5cl)pv8Hn6aTVA2Q+|SQ@{+x-DbEd9oJUa2_Lmtb?#h=xli?diK7OKo@aw=i{ z6Q{w|)g^gR#9+!4C2b9D_vz^?K5+91tYpz#v1*;C$hxBe2NHtS3g9j{Y9awW^ESBE3w%T3vc^7MyPNBvN-g!1V*Vlh~(#B~a;?vW5 zMEJXk3b2$o-f?R4md;baI8ZHdjVMV;EJ?LWE=mPb3`Pb<2D*j@x(22phQ?M#=2oT# z+6D$z1_lSs7lO(egofPwl+3hBhz0|5T?6wFBO{5 literal 0 HcmV?d00001 diff --git a/Resources/48-apps-org.petrovs_info.tangraplay.png b/Resources/48-apps-org.petrovs_info.tangraplay.png new file mode 100644 index 0000000000000000000000000000000000000000..e7537ce98adc051fd0d81f354fb7afbcb3809295 GIT binary patch literal 1474 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)pT}UnMXwSj}Ky5HFasE6|34fr&l9C&cyt|Np;^$zw-H z<$fNM2cloccO+mQ?b z2OZRHAg_TP40R#Ioe0-LTnIK9BnWa9)XiWn)Uyya$S#O=Q1zhTf@*>L3n_3w9t4{Y zF%!y#8Ui%xs5~$Y2$;Uw157KcN`m}?8C4t2ML)iEt(4{L^-V43cJJ+u&q0CR~n{#dL4JDHeCrh&LWEOsJ7=53gU0Yn% zdF#yh_ob~T^^IGbS5EYm|EZ~(-rc!&dhOEQ#}B{${`&Xn+WVJJic2qlzx*OAr>LSk z=hW@Im!GfRKJ%`yp1!W^Pq^fGm6@mT*KGtQbS6(1#}JR>N3Z-2=Sh@d`|v*R z?XD>S*>5&@Z`SDQF?-^=*70Q929NHJHv)?$RPPjdE%rJ{<@@W$^G%9pSzi2d?i_#h zo6o0ho}c+%eD3$TGuAHGcHFVtDW~r{)2eq)iq%uacy{9e2jk1<&(HF0eZ1hr^t`%0 zgYWqd#Gfx^{4B_!ci>QxCx`B#M-PN{8&+Ln6KPrf z;r*lyw>G!g@4ptkH%}?y^-bLnvY9*b?%{{ZZc&Y4o5RyT9hJ3BTf&=R{QKjYyj!)0JghI|eVZKlcaQKZ zO^;Pt4jw9gi=BDrJ5H{;#%AzT#!B?5jb2IV=^ZPM=p9^pBxnAm)DteYAL4gPIdnXV zd+RQ6UTMX{hOTUxfcurTMg@zXtFd2Ld(Te$#lE-C&IW%uceh&Daew^-JMjz6Dic2Z zd}4Uvb@dCzS8@}5(wwZt`|BqgyV)hf9t6-Y4{85kMp8XD*tn1&b{TN#;KnHp#t z7+4t?95i2e3`Ik3eoAIqB}9XPxvqhEh>;Ocot3d6L__kK3kQK37(8A5T-G@yGywqB Cqu}oV literal 0 HcmV?d00001 diff --git a/Resources/64-apps-org.petrovs_info.tangraplay.png b/Resources/64-apps-org.petrovs_info.tangraplay.png new file mode 100644 index 0000000000000000000000000000000000000000..e77a91fe4c9efec0583decaab7e2b7b6bec2f9c9 GIT binary patch literal 1861 zcmZ9L3pA8j9Kf#`Z>I6slFBQq$99Hq2HBmkMxNslW7Z>_SVW6z!nTr{$(Ch35|YTH z$YM*Ato5j2HOWyX$L7(bDO0FSLn;l)e&07Ur9J1)z5n&6joG%o-SZ2*AzD**Gbi8%>C5(L1D zFaXGB0MOfC+Ujcy04B%BlkU8&|IW1 z$}D9=t_hbyEr?yZK6gRqfOzMZ0m}JPpmfSkStng9KF!eco5r*HQ@I&x0#rg5cOS>sDbbm z6@K(^bppRB8MwiUN}{`$v&vI-L!2qL0DpuH|2g~JohbCcuF)Y$K$h=1<>?ZutEW93 z^L!mWi;K_tX1Wlwg|&hJ7CQuS{Nc{5w{2b>2|YWkj+ zK9`76`fSUK6U3?F;v%hd#>>avWQ?KHU{C%v<8y5l^#+qCUfGq#rzGo&%d(j}EY{B@ zT@>&ecpL}8k&jc0%#ZK!tC4ZoJ3fu z5mq^or0KB2ZWZSEoAw(7W&w^~z&urELjv|Ce@rUa*`@!*HIIAbSgpG0{KO@5wgx}5 z_Fpl^t_T7rM06^PcBn7r_t0T>ekR7}USp5h&z1K(E|1db%*--^IitF1&2ZOj3QM(2 z(7Y=Il<`)jW7{dXbx$QE<;N$Dt1`P?wH|W$RUuj{u&z1k-8tBeich}gZ@s8cqqU>>2x4TB+m)d&&rDG4oD}{n2T7JO7gGkc#{$bX`<}t1J-mkcU&Cjln#EsWY zb)*L}-cNeAnUve}Sr(oRY9hQF^~%mdTwBG`Pfde^->Mz%y)xRlwZfj Date: Fri, 30 Oct 2020 16:34:07 +0200 Subject: [PATCH 02/27] Added flatpak files Signed-off-by: Blagovest Petrov --- org.petrovs_info.tangraplay.appdata.xml | 32 +++++++++++++++++++++++++ org.petrovs_info.tangraplay.desktop | 10 ++++++++ org.petrovs_info.tangraplay.json | 27 +++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 org.petrovs_info.tangraplay.appdata.xml create mode 100644 org.petrovs_info.tangraplay.desktop create mode 100644 org.petrovs_info.tangraplay.json diff --git a/org.petrovs_info.tangraplay.appdata.xml b/org.petrovs_info.tangraplay.appdata.xml new file mode 100644 index 0000000..48dfb88 --- /dev/null +++ b/org.petrovs_info.tangraplay.appdata.xml @@ -0,0 +1,32 @@ + + + org.petrovs_info.tangraplay + org.petrovs_info.tangraplay.desktop + CC0-1.0 + LGPL-2.0+ + TangraPlay + TangraPlay + +

Application for Radio Tangra

+

Приложение за радио Тангра

+ + + + + + + https://tangraplay.petrovs.info/screenshot.png + + + + Multimedia + + https://tangraplay.petrovs.info + https://code.petrovs.info/blago/TangraPlay/issues + petrovs_info + blagovest_AT_petrovs.info + + tangraplay + + + diff --git a/org.petrovs_info.tangraplay.desktop b/org.petrovs_info.tangraplay.desktop new file mode 100644 index 0000000..0b8f4bd --- /dev/null +++ b/org.petrovs_info.tangraplay.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=TangraPlay +GenericName=TangraPlay +Comment=TangraPlay +Exec=tangraplay +Terminal=false +Icon=org.petrovs_info.tangraplay +Type=Application +X-KDE-PluginInfo-Website=http://tangraplay.petrovs.info +Categories=Multimedia diff --git a/org.petrovs_info.tangraplay.json b/org.petrovs_info.tangraplay.json new file mode 100644 index 0000000..a881b71 --- /dev/null +++ b/org.petrovs_info.tangraplay.json @@ -0,0 +1,27 @@ +{ + "app-id": "org.petrovs_info.tangraplay", + "runtime": "org.kde.Platform", + "runtime-version": "5.11", + "sdk": "org.kde.Sdk", + "command": "tangraplay", + "finish-args": [ + "--share=ipc", + "--socket=x11", + "--socket=wayland", + "--filesystem=host", + "--device=dri" + ], + "modules": [ + { + "name": "tangraplay", + "buildsystem": "cmake-ninja", + "config-opts": ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"], + "sources": [ + { + "type": "git", + "url": "http://code.petrovs.info/blago/TangraPlay.git" + } + ] + } + ] +} From dd67a5868dd167980d03f0da9e0a8b49ad0ba86c Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 16:54:02 +0200 Subject: [PATCH 03/27] Added CMakeLists Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 46 ++++++++++++++++++++++++++++++++ org.petrovs_info.tangraplay.json | 4 +-- 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..8d67ab5 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,46 @@ +project(tangraplay) + +cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) + +set(QT_MIN_VERSION "5.15.0") + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick ) + + +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) + +include(ECMInstallIcons) +include(ECMPackageConfigHelpers) +include(ECMOptionalAddSubdirectory) + +include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) + +include_directory(.) + +add_subdiretory(Resources) + +SET(SOURCES + main.cpp + fetchsnowid.cpp + ) + +qt5_add_resources(qml.qrc) + +add_executable(TangraPlay ${SOURCES}) + + + +set_target_properties(flatpak-demo PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/flatpak-demo) + +target_link_libraries(flatpak-demo LINK_PUBLIC Qt5::QuickControls2 Qt5::Widgets Qt5::Quick Qt5::DBus Qt5::Core KF5::Notifications) + +install(TARGETS flatpak-demo ${INSTALL_TARGETS_DEFAULT_ARGS}) + +install(PROGRAMS org.petrovs_info.tangraplay.desktop DESTINATION ${KDE_INSTALL_APPDIR}) +install(FILES org.petrovs_info.tangraplay.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) diff --git a/org.petrovs_info.tangraplay.json b/org.petrovs_info.tangraplay.json index a881b71..b75bd3c 100644 --- a/org.petrovs_info.tangraplay.json +++ b/org.petrovs_info.tangraplay.json @@ -1,7 +1,7 @@ { "app-id": "org.petrovs_info.tangraplay", "runtime": "org.kde.Platform", - "runtime-version": "5.11", + "runtime-version": "5.12", "sdk": "org.kde.Sdk", "command": "tangraplay", "finish-args": [ @@ -19,7 +19,7 @@ "sources": [ { "type": "git", - "url": "http://code.petrovs.info/blago/TangraPlay.git" + "url": "https://code.petrovs.info/blago/TangraPlay.git" } ] } From 41a193621753d90c2383abd24b366285a5982839 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 17:07:25 +0200 Subject: [PATCH 04/27] test Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 12 ++++++------ org.petrovs_info.tangraplay.json | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d67ab5..fbc6e31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,13 +11,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_D find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick ) -include(KDEInstallDirs) -include(KDECMakeSettings) -include(KDECompilerSettings NO_POLICY_SCOPE) +#include(KDEInstallDirs) +#include(KDECMakeSettings) +#include(KDECompilerSettings NO_POLICY_SCOPE) -include(ECMInstallIcons) -include(ECMPackageConfigHelpers) -include(ECMOptionalAddSubdirectory) +#include(ECMInstallIcons) +#include(ECMPackageConfigHelpers) +#include(ECMOptionalAddSubdirectory) include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) diff --git a/org.petrovs_info.tangraplay.json b/org.petrovs_info.tangraplay.json index b75bd3c..f678185 100644 --- a/org.petrovs_info.tangraplay.json +++ b/org.petrovs_info.tangraplay.json @@ -1,7 +1,7 @@ { "app-id": "org.petrovs_info.tangraplay", "runtime": "org.kde.Platform", - "runtime-version": "5.12", + "runtime-version": "5.15", "sdk": "org.kde.Sdk", "command": "tangraplay", "finish-args": [ @@ -19,7 +19,8 @@ "sources": [ { "type": "git", - "url": "https://code.petrovs.info/blago/TangraPlay.git" + "url": "https://code.petrovs.info/blago/TangraPlay.git", + "branch": "flatpak-cmake" } ] } From 7a72e1fdcd9dc6737e7eef9eaffa64e8cd60aa5f Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 17:08:56 +0200 Subject: [PATCH 05/27] test2 Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fbc6e31..70d8d60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick ) include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) -include_directory(.) +include_directories(.) add_subdiretory(Resources) From ea54b4314369bfeb0a1e4e9c57b0afa24bda9b6e Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 17:11:38 +0200 Subject: [PATCH 06/27] Fixed typo Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70d8d60..e17bf01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) include_directories(.) -add_subdiretory(Resources) +add_subdirectory(Resources) SET(SOURCES main.cpp From f25c21babd394273f987dc66c60ce7ade79b08f5 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 17:30:30 +0200 Subject: [PATCH 07/27] testt Signed-off-by: Blagovest Petrov --- org.petrovs_info.tangraplay.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.petrovs_info.tangraplay.json b/org.petrovs_info.tangraplay.json index f678185..efadf4d 100644 --- a/org.petrovs_info.tangraplay.json +++ b/org.petrovs_info.tangraplay.json @@ -14,7 +14,7 @@ "modules": [ { "name": "tangraplay", - "buildsystem": "cmake-ninja", + "buildsystem": "cmake", "config-opts": ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"], "sources": [ { From 71940f57d0a74f43da2942096ee685c309035366 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 17:36:54 +0200 Subject: [PATCH 08/27] rollback Signed-off-by: Blagovest Petrov --- org.petrovs_info.tangraplay.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.petrovs_info.tangraplay.json b/org.petrovs_info.tangraplay.json index efadf4d..f678185 100644 --- a/org.petrovs_info.tangraplay.json +++ b/org.petrovs_info.tangraplay.json @@ -14,7 +14,7 @@ "modules": [ { "name": "tangraplay", - "buildsystem": "cmake", + "buildsystem": "cmake-ninja", "config-opts": ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"], "sources": [ { From ab76eced560e5c3c85314e82527361e4d7e05ca3 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 17:42:10 +0200 Subject: [PATCH 09/27] and test Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e17bf01..350c538 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,18 +12,17 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick ) #include(KDEInstallDirs) -#include(KDECMakeSettings) +include(KDECMakeSettings) #include(KDECompilerSettings NO_POLICY_SCOPE) -#include(ECMInstallIcons) -#include(ECMPackageConfigHelpers) -#include(ECMOptionalAddSubdirectory) +include(ECMInstallIcons) +include(ECMOptionalAddSubdirectory) include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) include_directories(.) -add_subdirectory(Resources) +ecm_add_subdirectory(Resources) SET(SOURCES main.cpp From 206c34134e07df005fdf034074416d006c494e37 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 17:44:16 +0200 Subject: [PATCH 10/27] test Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 350c538..5ce9ce1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ project(tangraplay) -cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) set(QT_MIN_VERSION "5.15.0") @@ -22,7 +22,7 @@ include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) include_directories(.) -ecm_add_subdirectory(Resources) +add_subdirectory(Resources) SET(SOURCES main.cpp From 2ce262e8fdc201ce1cc0a6897761b5ad1f9d97b2 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 17:51:23 +0200 Subject: [PATCH 11/27] changed cmake Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ce9ce1..3bf5485 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,12 +11,15 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_D find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick ) -#include(KDEInstallDirs) -include(KDECMakeSettings) -#include(KDECompilerSettings NO_POLICY_SCOPE) +set(CMAKE_AUTORCC ON) + +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) +include(KDEInstallDirs) +include(KDECMakeSettings)) -include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) +include(ECMAddAppIcon) +include(ECMInstallIcons) include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) @@ -29,8 +32,6 @@ SET(SOURCES fetchsnowid.cpp ) -qt5_add_resources(qml.qrc) - add_executable(TangraPlay ${SOURCES}) From 669b138cde1cbf51766da9e62ce637b3baf0191e Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 17:52:31 +0200 Subject: [PATCH 12/27] Typo Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bf5485..ee020da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ set(CMAKE_AUTORCC ON) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDEInstallDirs) -include(KDECMakeSettings)) +include(KDECMakeSettings) include(ECMOptionalAddSubdirectory) include(ECMAddAppIcon) From d65df25c279a235750ff5cf92ddbbd44004e8392 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 18:18:41 +0200 Subject: [PATCH 13/27] Some changes in cmakelists Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 11 ++++++++--- org.petrovs_info.tangraplay.json | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee020da..575df73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,11 +2,16 @@ project(tangraplay) cmake_minimum_required(VERSION 3.1 FATAL_ERROR) -set(QT_MIN_VERSION "5.15.0") +set(QT_MIN_VERSION "5.10.0") +set(KF5_DEP_VERSION "5.40.0") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +# We need some parts of the ECM CMake helpers. +find_package(ECM ${KF5_DEP_VERSION} QUIET REQUIRED NO_MODULE) + +# We append to the module path so modules can be overridden from the command line. +list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick ) diff --git a/org.petrovs_info.tangraplay.json b/org.petrovs_info.tangraplay.json index f678185..054e71b 100644 --- a/org.petrovs_info.tangraplay.json +++ b/org.petrovs_info.tangraplay.json @@ -15,7 +15,7 @@ { "name": "tangraplay", "buildsystem": "cmake-ninja", - "config-opts": ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"], + // "config-opts": ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"], "sources": [ { "type": "git", From a4aefd3f742b4f353eda5158f8a5eeb08095eaa7 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 18:28:37 +0200 Subject: [PATCH 14/27] Some changes in cmakelists Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 575df73..b9ab8d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,9 +41,9 @@ add_executable(TangraPlay ${SOURCES}) -set_target_properties(flatpak-demo PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/flatpak-demo) +set_target_properties(tangraplay PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/tangraplay) -target_link_libraries(flatpak-demo LINK_PUBLIC Qt5::QuickControls2 Qt5::Widgets Qt5::Quick Qt5::DBus Qt5::Core KF5::Notifications) +target_link_libraries(tangraplay LINK_PUBLIC Qt5::QuickControls2 Qt5::Quick Qt5::Core ) install(TARGETS flatpak-demo ${INSTALL_TARGETS_DEFAULT_ARGS}) From d0e5cf6ab8f88db99314708f4ca723af4f8c83f9 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 18:39:48 +0200 Subject: [PATCH 15/27] Some changes in cmakelists Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9ab8d5..f3b97c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick ) +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick Multimedia ) set(CMAKE_AUTORCC ON) @@ -41,9 +41,11 @@ add_executable(TangraPlay ${SOURCES}) -set_target_properties(tangraplay PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/tangraplay) - -target_link_libraries(tangraplay LINK_PUBLIC Qt5::QuickControls2 Qt5::Quick Qt5::Core ) +target_link_libraries(tangraplay + Qt5::QuickControls2 + Qt5::Quick + Qt5::Core + Qt5::Multimedia ) install(TARGETS flatpak-demo ${INSTALL_TARGETS_DEFAULT_ARGS}) From 7a02bcf2ae75b74deedaa0677022e15a37c74678 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 18:40:57 +0200 Subject: [PATCH 16/27] Fixed executable name Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3b97c0..5147d85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ SET(SOURCES fetchsnowid.cpp ) -add_executable(TangraPlay ${SOURCES}) +add_executable(tangraplay ${SOURCES}) @@ -47,7 +47,7 @@ target_link_libraries(tangraplay Qt5::Core Qt5::Multimedia ) -install(TARGETS flatpak-demo ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS tangraplay ${INSTALL_TARGETS_DEFAULT_ARGS}) install(PROGRAMS org.petrovs_info.tangraplay.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.petrovs_info.tangraplay.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) From aaf64980516cb09e151aa8748fa075a6e519291a Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 18:51:25 +0200 Subject: [PATCH 17/27] removed qtquickcontrold dependency Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5147d85..4142f2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick Multimedia ) +include_directories(.) +include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) set(CMAKE_AUTORCC ON) @@ -26,15 +28,11 @@ include(ECMOptionalAddSubdirectory) include(ECMAddAppIcon) include(ECMInstallIcons) -include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) - -include_directories(.) add_subdirectory(Resources) SET(SOURCES main.cpp - fetchsnowid.cpp ) add_executable(tangraplay ${SOURCES}) @@ -42,7 +40,6 @@ add_executable(tangraplay ${SOURCES}) target_link_libraries(tangraplay - Qt5::QuickControls2 Qt5::Quick Qt5::Core Qt5::Multimedia ) From df2adab3d54089f2991e512aec48ecde107fa99f Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 18:58:26 +0200 Subject: [PATCH 18/27] added manually resources Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4142f2e..edb6789 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,7 @@ include(ECMInstallIcons) add_subdirectory(Resources) +qt5_add_resources(QT_RESOURCES qml.qrc) SET(SOURCES main.cpp From aca952a50d02169510efa23b77666cd46471e503 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 18:59:35 +0200 Subject: [PATCH 19/27] removed hicolor theme Signed-off-by: Blagovest Petrov --- Resources/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/CMakeLists.txt b/Resources/CMakeLists.txt index 7b3f357..73d7cfe 100644 --- a/Resources/CMakeLists.txt +++ b/Resources/CMakeLists.txt @@ -7,5 +7,4 @@ ecm_install_icons( 32-apps-org.petrovs_info.tangraplay.png 16-apps-org.petrovs_info.tangraplay.png DESTINATION ${ICON_INSTALL_DIR} - THEME hicolor ) From 860ca4d68fd60874badbf59ff70706a144c48cc0 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 19:12:53 +0200 Subject: [PATCH 20/27] cmake Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index edb6789..fb86fb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick Multimedia ) +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick QuickControls2 Multimedia ) include_directories(.) include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) @@ -34,6 +34,7 @@ qt5_add_resources(QT_RESOURCES qml.qrc) SET(SOURCES main.cpp + qml.qrc ) add_executable(tangraplay ${SOURCES}) @@ -42,6 +43,7 @@ add_executable(tangraplay ${SOURCES}) target_link_libraries(tangraplay Qt5::Quick + Qt5::QuickControls2 Qt5::Core Qt5::Multimedia ) From 871e325741d9e15442b9cb9ef24403a87520887b Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 19:23:31 +0200 Subject: [PATCH 21/27] :) Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb86fb2..0e2d7e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,8 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick QuickCo include_directories(.) include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) @@ -47,7 +49,7 @@ target_link_libraries(tangraplay Qt5::Core Qt5::Multimedia ) -install(TARGETS tangraplay ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS tangraplay DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(PROGRAMS org.petrovs_info.tangraplay.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.petrovs_info.tangraplay.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) From b125a63dbcc386dc5651c9050380388ba3667f3b Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 20:04:46 +0200 Subject: [PATCH 22/27] ... Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e2d7e4..7ff846c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) +#set(CMAKE_AUTORCC ON) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDEInstallDirs) @@ -32,16 +32,18 @@ include(ECMInstallIcons) add_subdirectory(Resources) -qt5_add_resources(QT_RESOURCES qml.qrc) +qt5_add_resources(RESOURCES qml.qrc) SET(SOURCES main.cpp - qml.qrc ) -add_executable(tangraplay ${SOURCES}) - +add_executable(tangraplay + ${SOURCES} + ${RESOURCES} + ) +qt5_use_modules(tangraplay Quick QuickControls2 Core Multimedia ) target_link_libraries(tangraplay Qt5::Quick From fba191e9c8f6721c40748f14ec46e0cb0c7f31b1 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 20:29:01 +0200 Subject: [PATCH 23/27] Added App Title Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 1 - main.qml | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ff846c..4c6a8b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,6 @@ include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -#set(CMAKE_AUTORCC ON) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDEInstallDirs) diff --git a/main.qml b/main.qml index b343020..c615b8b 100644 --- a/main.qml +++ b/main.qml @@ -107,12 +107,21 @@ Window { } MenuButton { - id: buttonMinimize - anchors.left: buttonExit.right - caption: "_" - onClicked: mainWindow.hide() + id: buttonMinimize + anchors.left: buttonExit.right + caption: "_" + onClicked: mainWindow.hide() } + + Text { + id: appTitle + anchors.left: buttonMinimize.right + text: qsTr("TangraPlay") + font.pixelSize: 20 + font.bold: true + color: "#f9c620" + } } } From b2db258fd6d7cb48a10121980bf6f9cf3bd24c1d Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Fri, 30 Oct 2020 20:40:25 +0200 Subject: [PATCH 24/27] Switched from QGuiapplication to QApplication Signed-off-by: Blagovest Petrov --- CMakeLists.txt | 4 +++- TangraPlay.pro | 2 +- main.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c6a8b2..dc5ec1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick QuickControls2 Multimedia ) +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Quick QuickControls2 Multimedia Widgets Gui ) include_directories(.) include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) @@ -48,6 +48,8 @@ target_link_libraries(tangraplay Qt5::Quick Qt5::QuickControls2 Qt5::Core + Qt5::Widgets + Qt5::Gui Qt5::Multimedia ) install(TARGETS tangraplay DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/TangraPlay.pro b/TangraPlay.pro index bf3e4c8..5913411 100644 --- a/TangraPlay.pro +++ b/TangraPlay.pro @@ -1,4 +1,4 @@ -QT += quick +QT += quick gui core widgets CONFIG += c++11 diff --git a/main.cpp b/main.cpp index db8d3b8..068ac16 100644 --- a/main.cpp +++ b/main.cpp @@ -1,11 +1,12 @@ #include +#include #include int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QGuiApplication app(argc, argv); + QApplication app(argc, argv); QQmlApplicationEngine engine; const QUrl url(QStringLiteral("qrc:/main.qml")); From 864322b5618345af6eb56d5abf2cc31f4e7ac2df Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Sat, 31 Oct 2020 01:01:40 +0200 Subject: [PATCH 25/27] Added more permissios to flatpak Signed-off-by: Blagovest Petrov --- org.petrovs_info.tangraplay.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.petrovs_info.tangraplay.json b/org.petrovs_info.tangraplay.json index 054e71b..5a10025 100644 --- a/org.petrovs_info.tangraplay.json +++ b/org.petrovs_info.tangraplay.json @@ -9,7 +9,10 @@ "--socket=x11", "--socket=wayland", "--filesystem=host", - "--device=dri" + "--device=dri", + "--socket=pulseaudio", + "--share=network" + ], "modules": [ { From cd6c86379b3a80d2c809753c43f17ac1544a034f Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Sat, 31 Oct 2020 01:06:53 +0200 Subject: [PATCH 26/27] Edited desktop file Signed-off-by: Blagovest Petrov --- org.petrovs_info.tangraplay.desktop | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org.petrovs_info.tangraplay.desktop b/org.petrovs_info.tangraplay.desktop index 0b8f4bd..aa52ece 100644 --- a/org.petrovs_info.tangraplay.desktop +++ b/org.petrovs_info.tangraplay.desktop @@ -1,10 +1,11 @@ [Desktop Entry] Name=TangraPlay GenericName=TangraPlay -Comment=TangraPlay +Comment=Плеър за Рок Радио Тангра Exec=tangraplay Terminal=false Icon=org.petrovs_info.tangraplay Type=Application X-KDE-PluginInfo-Website=http://tangraplay.petrovs.info -Categories=Multimedia +Categories=AudioVideo;Player +Keywords=Player;Radio;Tangra;Rock;Broadcast From 8d22651c8ba11dd2034718d64116259f85c7bc24 Mon Sep 17 00:00:00 2001 From: Blagovest Petrov Date: Sat, 31 Oct 2020 01:09:56 +0200 Subject: [PATCH 27/27] Added shell script for testing flatpak Signed-off-by: Blagovest Petrov --- make-flatpak.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 make-flatpak.sh diff --git a/make-flatpak.sh b/make-flatpak.sh new file mode 100644 index 0000000..4ac2148 --- /dev/null +++ b/make-flatpak.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +flatpak-builder --user --install build-dir org.petrovs_info.tangraplay.json + +flatpak run org.petrovs_info.tangraplay