diff --git a/src/aboutdlgbase.ui b/src/aboutdlgbase.ui
index 98e1e39b..398f30f8 100755
--- a/src/aboutdlgbase.ui
+++ b/src/aboutdlgbase.ui
@@ -29,135 +29,135 @@
-
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ :/png/main/res/fronticon.png
+
+
+ Qt::AlignCenter
+
+
+
-
+
+ 0
+
-
-
-
- 6
+
+
+ TextLabelVersion
-
- 0
+
+ false
-
- 0
+
+ 2
-
- 0
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
-
-
-
- true
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- TextLabelVersion
-
-
- Qt::AlignCenter
-
-
- false
-
-
-
-
+
-
-
-
- 6
+
+
+ Copyright (C) 2005-2020 Volker Fischer and others
-
- 0
+
+ false
-
- 0
+
+ 2
-
- 0
-
-
- 0
-
-
-
-
-
- 6
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Copyright (C) 2005-2020 Volker Fischer and others
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Expanding
-
-
-
- 20
- 20
-
-
-
-
-
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
-
-
+
+
+ 0
+
+
+
+ A&bout
+
+
+
-
+
+
+ true
+
+
+
+
+
+
+
+ &Libraries
+
+
+ -
+
+
+ true
+
+
+
+
+
+
+
+ &Contributors
+
+
+ -
+
+
+ true
+
+
+
+
+
+
+
+ &Translation
+
+
+ -
+
+
+ true
+
+
+
+
+
+
-
@@ -211,7 +211,6 @@
buttonOk
- txvCredits
diff --git a/src/util.cpp b/src/util.cpp
index ec2a90ff..ca3cf90a 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -348,16 +348,14 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
{
setupUi ( this );
- // set the text for the about dialog html text control
- txvCredits->setOpenExternalLinks ( true );
- txvCredits->setText (
- "
" // general description of software
- "" + tr ( "The " ) + APP_NAME +
+ // general description of software
+ txvAbout->setText (
+ "
" + tr ( "The " ) + APP_NAME +
tr ( " software enables musicians to perform real-time jam sessions "
- "over the internet. There is a " ) + APP_NAME + tr ( " "
+ "over the internet." ) + "
" + tr ( "There is a " ) + APP_NAME + tr ( " "
"server which collects the audio data from each " ) +
APP_NAME + tr ( " client, mixes the audio data and sends the mix back "
- "to each client." ) + "
"
+ "to each client." ) + "
"
"" // GPL header text
"This program is free software; you can redistribute it and/or modify "
"it under the terms of the GNU General Public License as published by "
@@ -370,10 +368,11 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
"License along with his program; if not, write to the Free Software "
"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 "
"USA"
- "
"
- "" + APP_NAME + // libraries used by this compilation
+ "
" );
+
+ // libraries used by this compilation
+ txvLibraries->setText ( APP_NAME +
tr ( " uses the following libraries, resources or code snippets:" ) +
- ""
""
- "We would like to acknowledge the contributors listed in the "
+ "" );
+
+ // contributors list
+ txvContributors->setText ( "We would like to acknowledge the contributors listed in the "
"Github Contributors list"
- "
");
+ "
" );
// set version number in about dialog
lblVersion->setText ( GetVersionAndNameStr() );
@@ -406,7 +407,7 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml )
// name, short description and GPL hint
if ( bWithHtml )
{
- strVersionText += "";
+ strVersionText += "";
}
else
{
@@ -424,24 +425,14 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml )
strVersionText += "\n *** ";
}
- strVersionText += tr ( "Internet Jam Session Software" );
-
- if ( bWithHtml )
- {
- strVersionText += "
";
- }
- else
+ if ( !bWithHtml )
{
+ strVersionText += tr ( "Internet Jam Session Software" );
strVersionText += "\n *** ";
}
strVersionText += tr ( "Under the GNU General Public License (GPL)" );
- if ( bWithHtml )
- {
- strVersionText += "";
- }
-
return strVersionText;
}