eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/corrados/jamulus

Browse source
This commit is contained in:
Volker Fischer 2020-04-22 21:20:25 +02:00
commit 8bded365d7
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main.cpp
View file

@ -560,10 +560,6 @@ int main ( int argc, char** argv )
eLicenceType ); eLicenceType );
if ( bUseGUI ) if ( bUseGUI )
{ {
// special case for the GUI mode: we want the licence type to be
// creative commons per default (if not given in the settings file)
Server.SetLicenceType ( LT_CREATIVECOMMONS );
// load settings from init-file // load settings from init-file
CSettings Settings ( &Server, strIniFileName ); CSettings Settings ( &Server, strIniFileName );
Settings.Load(); Settings.Load();

4
src/serverdlg.cpp
View file

@ -58,8 +58,8 @@ CServerDlg::CServerDlg ( CServer* pNServP,
// CC licence dialog switch // CC licence dialog switch
chbUseCCLicence->setWhatsThis ( tr ( "<b>Show Creative Commons Licence " chbUseCCLicence->setWhatsThis ( tr ( "<b>Show Creative Commons Licence "
"Dialog:</b> If enabled, a Creative Commons Licence dialog is shown " "Dialog:</b> If enabled, a Creative Commons BY-NC-SA 4.0 Licence "
"each time a new user connects the server." ) ); "dialog is shown each time a new user connects the server." ) );
// Make My Server Public flag // Make My Server Public flag
chbRegisterServer->setWhatsThis ( tr ( "<b>Make My Server Public:</b> If " chbRegisterServer->setWhatsThis ( tr ( "<b>Make My Server Public:</b> If "

2
src/serverdlgbase.ui
View file

@ -56,7 +56,7 @@
<item> <item>
<widget class="QCheckBox" name="chbUseCCLicence"> <widget class="QCheckBox" name="chbUseCCLicence">
<property name="text"> <property name="text">
<string>Show Creative Commons Licence Dialog</string> <string>Show Creative Commons BY-NC-SA 4.0 Licence Dialog</string>
</property> </property>
</widget> </widget>
</item> </item>