From a123498cbfad473fb757baa2c4f24420a0f7ba92 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Tue, 2 Jun 2020 19:36:25 +0200 Subject: [PATCH 1/4] instruments: Add ukulele and bass ukulele The icons are derived from an Openclipart image by qubodup: https://openclipart.org/detail/214439/simple-ukulele-no-outline --- src/res/instruments/bassuke.png | Bin 0 -> 981 bytes src/res/instruments/bassuke.svg | 386 ++++++++++++++++++++++++++++++ src/res/instruments/ukulele.png | Bin 0 -> 778 bytes src/res/instruments/ukulele.svg | 402 ++++++++++++++++++++++++++++++++ src/resources.qrc | 2 + src/util.cpp | 2 + 6 files changed, 792 insertions(+) create mode 100644 src/res/instruments/bassuke.png create mode 100644 src/res/instruments/bassuke.svg create mode 100644 src/res/instruments/ukulele.png create mode 100644 src/res/instruments/ukulele.svg diff --git a/src/res/instruments/bassuke.png b/src/res/instruments/bassuke.png new file mode 100644 index 0000000000000000000000000000000000000000..537ff9c0ec82a17eb643f1192ba5fbfe19e79610 GIT binary patch literal 981 zcmV;`11kK9P)o*(8{@_gl zX{at`E=rTsYC)*fR0N4JSGD*rl;T`!Lq94~ZislC{4 z_Psji``+{L^6_y90Qw`%oszIiGW7?sWp_g~8a;p#i28QjcP}~i7;#nC*EOvyO<&ro zKeBhSySqEPS~!DnHmfy_UR5uH-^*1^RZf|yWUpZuHLHe;2cCOqW$~KfuMXnI^*HLb zJQns%oozG>Be80@Wm(Z&YvcYuwmmSwsylMq;t>KtG66FyrLSE*AuNZO$Mg9M2jA)}7S3)j zMD}(K5>q~4T!EF(bqpQqeY<3E0Ql1$ctzFA&Pyq=lF4)p9oqkT$>4?ok-DDfR5d+L zoKZfLJ38F|#uFuh1Hh|CPb4H~dx$72A+>xaGdyT?hf4wnfES|!=M=5%fTAcMP(bI( zmjf?#_zH#pZ(Hu9ks}8`$t|b%*p?0EQGT46{-sSz$Dbq#jhB1B=ouO_?>f1w@vqN4 zuX^>Lg>YbHv)k&b>i;6pryv?}%>3xFryDAYh8wY%EhIgqYTiYUs)5wCRpqr!ZabVO zZ&%T90Ek~awe7~#Pkte6NC~LE5cG=reE=qzM2^bAMnyox-vWWCg(qG=Uf=NW7QPdA$Fb zmUj+ES^_|U+X4VbA}u=v$!`I8O$)eM)(X>-xWAU8uADGC`P;4bD-PJh1&`&-<>b`k z%~f9shLFlA9Arz_+*k|0#zDlO`>SB4lCHgiAcF-bzg2xZn~xLl+M0@LR0h|>wk!}4 z@|h*f$EQG$0I+ZuGruVYc^&}FR1(Xnd4LF#I7DSL1XS0SEeZ~Sarc;-orYvyELi1O z`29O@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/res/instruments/ukulele.png b/src/res/instruments/ukulele.png new file mode 100644 index 0000000000000000000000000000000000000000..3e8b2d9f8dc1ffb59b77aba805539f5471123bcd GIT binary patch literal 778 zcmV+l1NHogP)r~Gynhq8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10+&fd zK~y-6jnvI=R8<(q@$YlaJ-0J$XF9ehG+0-Vn4oMR5E2LzNeChk60JMq!sy1xf{n&P zxCw-}1shiU2P{Ar2-6x(0~_k1uwbDsdDarnFP0XL+7{^8C)L z&}Jk_((RnvwLjcBoqF9A8#%G<Jta%nzsDwR=9ia`=2M5*Izov`^nK#7R`N; zdE>5)KRp~NWXOt`FLhK!GTRtI<-$Kx>6u8$2b8^UcN9jG@`{VHIC1anfp>u&028$g zuS!psrN0<`BN7#XFI%tC2M6$M-gEnpY5tw5v!Q4g((GF`Y6xx$;KqX*n{mT)vF=dk`fKq>DqB9uBUZ}mEWN5Q0DFNZRklyluSHw^3rm~I6AuFmm#!LhLv zBSGKWerjZN#pZO|juQ*0o(5toY+m0<^kNYzW_~$(5mi22Y>(iB;#KL0p1*N1x@{Fm z4?wLRxL@sHx?yo<$;S{FSPlLF(A#Nv=d}h?&4@oImpcAx1tan9Sg`4v0(**i!`6HX zEOva71-;q|3V{iI5`in$*eEYXQ{?-cq5AYNGjXfKsukN^Mx literal 0 HcmV?d00001 diff --git a/src/res/instruments/ukulele.svg b/src/res/instruments/ukulele.svg new file mode 100644 index 00000000..7ed58894 --- /dev/null +++ b/src/res/instruments/ukulele.svg @@ -0,0 +1,402 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/resources.qrc b/src/resources.qrc index 82fbc20f..32a52995 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -80,6 +80,8 @@ res/instruments/vocalsoprano.png res/instruments/banjo.png res/instruments/mandolin.png + res/instruments/ukulele.png + res/instruments/bassuke.png res/fronticon.png diff --git a/src/util.cpp b/src/util.cpp index e2eda381..4ede90d0 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -1020,6 +1020,8 @@ CVector& CInstPictures::GetTable() vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Soprano" ), ":/png/instr/res/instruments/vocalsoprano.png", IC_OTHER_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Banjo" ), ":/png/instr/res/instruments/banjo.png", IC_PLUCKING_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Mandolin" ), ":/png/instr/res/instruments/mandolin.png", IC_PLUCKING_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Ukulele" ), ":/png/instr/res/instruments/ukulele.png", IC_PLUCKING_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bass Ukulele" ), ":/png/instr/res/instruments/bassuke.png", IC_PLUCKING_INSTRUMENT ) ); // now the table is initialized TableIsInitialized = true; From 4c2a5d1834001d519a3658969e2a35cbcec0d2f4 Mon Sep 17 00:00:00 2001 From: Adam Sampson Date: Thu, 4 Jun 2020 18:07:57 +0100 Subject: [PATCH 2/4] Install jamulus.desktop. Because this assumes the binary is called jamulus, and qmake doesn't have a mechanism for string expansion, only do so if noupcasename is set. --- Jamulus.pro | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Jamulus.pro b/Jamulus.pro index 345b1ef6..97f5b6f2 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -295,12 +295,24 @@ win32 { isEmpty(PREFIX) { PREFIX = /usr/local } + isEmpty(BINDIR) { BINDIR = bin } BINDIR = $$absolute_path($$BINDIR, $$PREFIX) - INSTALLS += target target.path = $$BINDIR + INSTALLS += target + + isEmpty(APPSDIR) { + APPSDIR = share/applications + } + APPSDIR = $$absolute_path($$APPSDIR, $$PREFIX) + desktop.path = $$APPSDIR + desktop.files = distributions/jamulus.desktop + # the .desktop file assumes the binary is called jamulus + contains(CONFIG, "noupcasename") { + INSTALLS += desktop + } } RCC_DIR = src/res From 6b1737e74c1c1014ce21b5c02a7b0565ce2770cf Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 5 Jun 2020 11:03:24 +0200 Subject: [PATCH 3/4] permanent server is now a server which is on for 2 days (was changed to 3 days previously but 2 should be sufficient) --- src/global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/global.h b/src/global.h index 5e2aeafd..69b3aa2e 100755 --- a/src/global.h +++ b/src/global.h @@ -206,7 +206,7 @@ LED bar: lbr #define SERVLIST_REGIST_INTERV_MINUTES 15 // minutes // defines the minimum time a server must run to be a permanent server -#define SERVLIST_TIME_PERMSERV_MINUTES 4320 // minutes, 4320 = 60 min * 24 h * 3 d +#define SERVLIST_TIME_PERMSERV_MINUTES 2880 // minutes, 2880 = 60 min * 24 h * 2 d // registration response timeout #define REGISTER_SERVER_TIME_OUT_MS 500 // ms From 7c7c0ad930f346e55f01124ee660b91e42ca7ec4 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 5 Jun 2020 11:19:04 +0200 Subject: [PATCH 4/4] merge fixes --- ChangeLog | 2 ++ Jamulus.pro | 4 ++++ .../instruments/{bassuke.png => bassukulele.png} | Bin .../instruments/{bassuke.svg => bassukulele.svg} | 0 src/resources.qrc | 2 +- src/util.cpp | 2 +- 6 files changed, 8 insertions(+), 2 deletions(-) rename src/res/instruments/{bassuke.png => bassukulele.png} (100%) rename src/res/instruments/{bassuke.svg => bassukulele.svg} (100%) diff --git a/ChangeLog b/ChangeLog index a8a167b8..8009c402 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ - make level meter LED black when off, by fleutot (#318) +- added ukulele/bass ukulele instrument icons created by dos1 (#319) + - added check in acknowledge message, coded by atsampson (#302) - bug fix: on MacOS declare an activity to ensure the process doesn't get throttled diff --git a/Jamulus.pro b/Jamulus.pro index 97f5b6f2..d626af4e 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -714,6 +714,10 @@ DISTFILES += ChangeLog \ src/res/instruments/congas.png \ src/res/instruments/bongo.svg \ src/res/instruments/bongo.png \ + src/res/instruments/ukulele.svg \ + src/res/instruments/ukulele.png \ + src/res/instruments/bassukulele.svg \ + src/res/instruments/bassukulele.png \ src/res/instruments/vocalbass.png \ src/res/instruments/vocaltenor.png \ src/res/instruments/vocalalto.png \ diff --git a/src/res/instruments/bassuke.png b/src/res/instruments/bassukulele.png similarity index 100% rename from src/res/instruments/bassuke.png rename to src/res/instruments/bassukulele.png diff --git a/src/res/instruments/bassuke.svg b/src/res/instruments/bassukulele.svg similarity index 100% rename from src/res/instruments/bassuke.svg rename to src/res/instruments/bassukulele.svg diff --git a/src/resources.qrc b/src/resources.qrc index 32a52995..15370a8a 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -81,7 +81,7 @@ res/instruments/banjo.png res/instruments/mandolin.png res/instruments/ukulele.png - res/instruments/bassuke.png + res/instruments/bassukulele.png res/fronticon.png diff --git a/src/util.cpp b/src/util.cpp index 4ede90d0..d506394f 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -1021,7 +1021,7 @@ CVector& CInstPictures::GetTable() vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Banjo" ), ":/png/instr/res/instruments/banjo.png", IC_PLUCKING_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Mandolin" ), ":/png/instr/res/instruments/mandolin.png", IC_PLUCKING_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Ukulele" ), ":/png/instr/res/instruments/ukulele.png", IC_PLUCKING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bass Ukulele" ), ":/png/instr/res/instruments/bassuke.png", IC_PLUCKING_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bass Ukulele" ), ":/png/instr/res/instruments/bassukulele.png", IC_PLUCKING_INSTRUMENT ) ); // now the table is initialized TableIsInitialized = true;