Commit graph

151 commits

Author SHA1 Message Date
Volker Fischer
eeeaafdcf5 remove some more SLOT() 2020-06-11 09:48:03 +02:00
Volker Fischer
44e883900b fixed Free Software Foundation address (see #341) 2020-06-08 22:58:11 +02:00
Volker Fischer
af0f9510f8 resolve outstanding: using Qt5 connections instead of the old Qt4 ones 2020-06-07 09:01:52 +02:00
Volker Fischer
8edb3185b0 using Qt5 connections instead of the old Qt4 ones (just a subset converted right now, more TODO) 2020-06-06 22:15:33 +02:00
Volker Fischer
cb48d6fb85 prepare for #316 2020-06-05 13:39:54 +02:00
Volker Fischer
b11b4024fe merge fixes 2020-06-05 13:10:59 +02:00
ignotus
bab77e4695
Merge pull request #2 from corrados/master
update
2020-06-05 12:01:27 +02:00
Volker Fischer
7c7c0ad930 merge fixes 2020-06-05 11:19:04 +02:00
ignotus
b36097eba4
Added contributors back who got deleted for some reason 2020-06-04 22:52:02 +02:00
ignotus
c68b943812
Update util.cpp 2020-06-04 12:28:28 +02:00
ignotus
7b7f65f4b3
Update util.cpp 2020-06-04 12:25:07 +02:00
ignotus
8fa4b8472b
Update util.cpp 2020-06-04 12:20:23 +02:00
daryl
e38e8d6f08 update 2020-06-04 11:53:04 +02:00
Sebastian Krzyszkowiak
a123498cbf
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
2020-06-02 19:36:25 +02:00
Volker Fischer
cbdd93f36e merge fix 2020-06-01 22:28:47 +02:00
Volker Fischer
16187529ea merge fixes 2020-05-28 19:05:35 +02:00
Volker Fischer
43b709d6c2 update change log 2020-05-28 07:29:36 +02:00
Adam Sampson
d908bf1363 Add banjo and mandolin as instruments.
The icons banjo.png and mandolin.png are based on photos I took myself,
and are available under CC0 as well as Jamulus's normal license.
2020-05-25 01:44:14 +01:00
Volker Fischer
0aa5c91560 update name 2020-05-24 11:48:41 +02:00
Volker Fischer
9fe14589ab add dzpex to the about dialog 2020-05-24 09:12:09 +02:00
Volker Fischer
d26aba788c added an additional central server list -> split rock/jazz in separate servers 2020-05-23 21:23:20 +02:00
Volker Fischer
92548290cd change server list genres, fix German translations 2020-05-22 09:48:58 +02:00
Volker Fischer
4708c204f3 some cleanup for the server list selection 2020-05-22 06:25:38 +02:00
ignotus
4ec4646147
Update util.cpp 2020-05-21 15:23:30 +02:00
Volker Fischer
78413826a5 Merge branch 'master' into feature_panning
# Conflicts:
#	src/protocol.h
2020-05-18 19:03:40 +02:00
Volker Fischer
a42302393f remove the "instr" from the instrument picture names since it is no longer needed because all pictures are now in a separate instrument directory 2020-05-18 17:54:49 +02:00
Volker Fischer
da9e8e61d8 update contributers list and changelog 2020-05-17 18:27:29 +02:00
Volker Fischer
641eaec426 added vocal bass/tenor/alto/soprano instrument icons created by Alberstein8 (Ticket #131) 2020-05-17 18:12:03 +02:00
Volker Fischer
75b8a05257 introduce genre-based server lists (Ticket #139), adjust some values in global.h to adjust to heavier usage of Jamulus 2020-05-17 11:00:56 +02:00
Volker Fischer
6977a17156 some central server address clean up 2020-05-16 11:24:50 +02:00
Volker Fischer
d9008d1541 get rid of LLCON 2020-05-15 21:00:41 +02:00
Volker Fischer
d1a3dd9c22 merge fixes 2020-05-15 15:55:40 +02:00
Volker Fischer
ea04c932f2 merge fixes, updates 2020-05-14 22:19:32 +02:00
Geerzen, Jeroen (ELS-AMS)
eb3e507a1e Added Dutch translation 2020-05-14 21:40:01 +02:00
Volker Fischer
3ede779ca7 fixes for the German translation 2020-05-13 21:52:52 +02:00
Volker Fischer
c80d62e45e Update contributor name (#189) 2020-05-12 16:42:53 +02:00
Volker Fischer
dd451dc868 added bongo instrument icon created by bspeer (Ticket #131) 2020-05-10 22:32:36 +02:00
ignotus
dd367bae76
Added translator name 2020-05-09 23:56:38 +02:00
Volker Fischer
b56912b2b3 added missing tr() functions, WIP German translation, changed --translation in --notranslation so that the translation is on per default 2020-05-09 23:09:56 +02:00
Volker Fischer
fc099ec828 update a name in the About dialog 2020-05-09 21:15:45 +02:00
Volker Fischer
17dcd941b4 add the names of the contributors in the about dialog 2020-05-09 15:27:07 +02:00
Volker Fischer
136d99ecf0 Merge branch 'master' into new_about_dialog 2020-05-09 10:01:51 +02:00
Volker Fischer
1c4e3edda6 added congas instrument icon created by bspeer (Ticket #131) 2020-05-08 17:51:44 +02:00
Volker Fischer
b76e1934f6 first tests of new about dialog 2020-05-08 17:09:54 +02:00
Volker Fischer
48bfa02bb3 some more removing html code from translation strings 2020-05-07 09:38:20 +02:00
Volker Fischer
da30aeae09 some more removing html code from translation strings 2020-05-07 09:30:43 +02:00
Volker Fischer
61f36c1723 added tr() for some strings in the code, added spanish translation file 2020-05-06 19:33:27 +02:00
Volker Fischer
72302ae6a0 added instrument viola (Ticket #131) 2020-05-03 19:59:59 +02:00
Volker Fischer
cd8e1cb670 added harp instrument icon, created by dszgit (Ticket #131) 2020-05-02 13:34:12 +02:00
Volker Fischer
78b61cf01b in my profile combo box: sort instruments alphabetical and show category by background color 2020-05-02 11:02:09 +02:00