Merge pull request #128 from mirabilos/licence-1

Address part of the licence dialogue
This commit is contained in:
corrados 2020-04-22 16:15:25 +02:00 committed by GitHub
commit 6c2a4c7483
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions

View file

@ -560,10 +560,6 @@ int main ( int argc, char** argv )
eLicenceType );
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
CSettings Settings ( &Server, strIniFileName );
Settings.Load();

View file

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

View file

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