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

first tests of new about dialog

Browse source
This commit is contained in:
Volker Fischer 2020-05-08 17:09:54 +02:00
parent 84d53914b9
commit b76e1934f6
2 changed files with 129 additions and 139 deletions

165
src/aboutdlgbase.ui
View file

@ -30,98 +30,42 @@
<item> <item>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<item> <item>
<layout class="QVBoxLayout"> <widget class="QLabel" name="pxlLogo">
<item>
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="PixmapLabelDreamLogo">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="pixmap">
<pixmap/>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblVersion">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>TextLabelVersion</string> <string/>
</property>
<property name="pixmap">
<pixmap resource="resources.qrc">:/png/main/res/fronticon.png</pixmap>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item>
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
<property name="spacing"> <property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <item>
<number>0</number> <widget class="QLabel" name="lblVersion">
<property name="text">
<string>TextLabelVersion</string>
</property> </property>
<property name="rightMargin"> <property name="wordWrap">
<number>0</number> <bool>false</bool>
</property> </property>
<property name="bottomMargin"> <property name="margin">
<number>0</number> <number>2</number>
</property> </property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="lblCopyright"> <widget class="QLabel" name="lblCopyright">
<property name="text"> <property name="text">
@ -130,21 +74,21 @@
<property name="wordWrap"> <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="margin">
<number>2</number>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<spacer> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>40</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@ -152,12 +96,68 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</item>
</layout>
</item>
<item> <item>
<widget class="QTextBrowser" name="txvCredits"/> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>A&amp;bout</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QTextBrowser" name="txvAbout">
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>&amp;Libraries</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QTextBrowser" name="txvLibraries">
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
<attribute name="title">
<string>&amp;Contributors</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QTextBrowser" name="txvContributors">
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_4">
<attribute name="title">
<string>&amp;Translation</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QTextBrowser" name="txvTranslation">
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
@ -211,7 +211,6 @@
</widget> </widget>
<tabstops> <tabstops>
<tabstop>buttonOk</tabstop> <tabstop>buttonOk</tabstop>
<tabstop>txvCredits</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="resources.qrc"/> <include location="resources.qrc"/>

43
src/util.cpp
View file

@ -348,16 +348,14 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
{ {
setupUi ( this ); setupUi ( this );
// set the text for the about dialog html text control // general description of software
txvCredits->setOpenExternalLinks ( true ); txvAbout->setText (
txvCredits->setText ( "<p>" + tr ( "The " ) + APP_NAME +
"<p>" // general description of software
"<big>" + tr ( "The " ) + APP_NAME +
tr ( " software enables musicians to perform real-time jam sessions " tr ( " software enables musicians to perform real-time jam sessions "
"over the internet. There is a " ) + APP_NAME + tr ( " " "over the internet." ) + "<br>" + tr ( "There is a " ) + APP_NAME + tr ( " "
"server which collects the audio data from each " ) + "server which collects the audio data from each " ) +
APP_NAME + tr ( " client, mixes the audio data and sends the mix back " APP_NAME + tr ( " client, mixes the audio data and sends the mix back "
"to each client." ) + "</big></p><br>" "to each client." ) + "</p>"
"<p><font face=\"courier\">" // GPL header text "<p><font face=\"courier\">" // GPL header text
"This program is free software; you can redistribute it and/or modify " "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 " "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 " "License along with his program; if not, write to the Free Software "
"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 " "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 "
"USA" "USA"
"</font></p><br>" "</font></p>" );
"<p><b>" + 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:" ) + tr ( " uses the following libraries, resources or code snippets:" ) +
"</b></p>"
"<ul>" "<ul>"
"<li>Qt cross-platform application framework: " "<li>Qt cross-platform application framework: "
"<i><a href=""http://www.qt.io"">http://www.qt.io</a></i></li>" "<i><a href=""http://www.qt.io"">http://www.qt.io</a></i></li>"
@ -387,10 +386,12 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
"<i><a href=""http://openclipart.org"">http://openclipart.org</a></i></li>" "<i><a href=""http://openclipart.org"">http://openclipart.org</a></i></li>"
"<li>Country flag icons from Mark James: " "<li>Country flag icons from Mark James: "
"<i><a href=""http://www.famfamfam.com"">http://www.famfamfam.com</a></i></li>" "<i><a href=""http://www.famfamfam.com"">http://www.famfamfam.com</a></i></li>"
"</ul>" "</ul>" );
"We would like to acknowledge the contributors listed in the "
// contributors list
txvContributors->setText ( "We would like to acknowledge the contributors listed in the "
"<a href=""https://github.com/corrados/jamulus/graphs/contributors"">Github Contributors list</a>" "<a href=""https://github.com/corrados/jamulus/graphs/contributors"">Github Contributors list</a>"
"</center><br>"); "</center><br>" );
// set version number in about dialog // set version number in about dialog
lblVersion->setText ( GetVersionAndNameStr() ); lblVersion->setText ( GetVersionAndNameStr() );
@ -406,7 +407,7 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml )
// name, short description and GPL hint // name, short description and GPL hint
if ( bWithHtml ) if ( bWithHtml )
{ {
strVersionText += "<center><b>"; strVersionText += "<b>";
} }
else else
{ {
@ -424,24 +425,14 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml )
strVersionText += "\n *** "; strVersionText += "\n *** ";
} }
if ( !bWithHtml )
{
strVersionText += tr ( "Internet Jam Session Software" ); strVersionText += tr ( "Internet Jam Session Software" );
if ( bWithHtml )
{
strVersionText += "<br>";
}
else
{
strVersionText += "\n *** "; strVersionText += "\n *** ";
} }
strVersionText += tr ( "Under the GNU General Public License (GPL)" ); strVersionText += tr ( "Under the GNU General Public License (GPL)" );
if ( bWithHtml )
{
strVersionText += "</center>";
}
return strVersionText; return strVersionText;
} }