first tests of new about dialog
This commit is contained in:
Volker Fischer
parent
84d53914b9
commit
b76e1934f6
2 changed files with 129 additions and 139 deletions
|
|
@ -29,135 +29,135 @@
|
|||
<layout class="QVBoxLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="pxlLogo">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="resources.qrc">:/png/main/res/fronticon.png</pixmap>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout">
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QHBoxLayout">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
<widget class="QLabel" name="lblVersion">
|
||||
<property name="text">
|
||||
<string>TextLabelVersion</string>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
<property name="margin">
|
||||
<number>2</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">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<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>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>TextLabelVersion</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
<widget class="QLabel" name="lblCopyright">
|
||||
<property name="text">
|
||||
<string>Copyright (C) 2005-2020 Volker Fischer and others</string>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
<property name="margin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QVBoxLayout">
|
||||
<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="lblCopyright">
|
||||
<property name="text">
|
||||
<string>Copyright (C) 2005-2020 Volker Fischer and others</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Expanding</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</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&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>&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>&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>&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>
|
||||
<layout class="QHBoxLayout">
|
||||
|
|
@ -211,7 +211,6 @@
|
|||
</widget>
|
||||
<tabstops>
|
||||
<tabstop>buttonOk</tabstop>
|
||||
<tabstop>txvCredits</tabstop>
|
||||
</tabstops>
|
||||
<resources>
|
||||
<include location="resources.qrc"/>
|
||||
|
|
|
|||
43
src/util.cpp
43
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 (
|
||||
"<p>" // general description of software
|
||||
"<big>" + tr ( "The " ) + APP_NAME +
|
||||
// general description of software
|
||||
txvAbout->setText (
|
||||
"<p>" + 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." ) + "<br>" + 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." ) + "</big></p><br>"
|
||||
"to each client." ) + "</p>"
|
||||
"<p><font face=\"courier\">" // 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"
|
||||
"</font></p><br>"
|
||||
"<p><b>" + APP_NAME + // libraries used by this compilation
|
||||
"</font></p>" );
|
||||
|
||||
// libraries used by this compilation
|
||||
txvLibraries->setText ( APP_NAME +
|
||||
tr ( " uses the following libraries, resources or code snippets:" ) +
|
||||
"</b></p>"
|
||||
"<ul>"
|
||||
"<li>Qt cross-platform application framework: "
|
||||
"<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>"
|
||||
"<li>Country flag icons from Mark James: "
|
||||
"<i><a href=""http://www.famfamfam.com"">http://www.famfamfam.com</a></i></li>"
|
||||
"</ul>"
|
||||
"We would like to acknowledge the contributors listed in the "
|
||||
"</ul>" );
|
||||
|
||||
// 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>"
|
||||
"</center><br>");
|
||||
"</center><br>" );
|
||||
|
||||
// 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 += "<center><b>";
|
||||
strVersionText += "<b>";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -424,24 +425,14 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml )
|
|||
strVersionText += "\n *** ";
|
||||
}
|
||||
|
||||
strVersionText += tr ( "Internet Jam Session Software" );
|
||||
|
||||
if ( bWithHtml )
|
||||
{
|
||||
strVersionText += "<br>";
|
||||
}
|
||||
else
|
||||
if ( !bWithHtml )
|
||||
{
|
||||
strVersionText += tr ( "Internet Jam Session Software" );
|
||||
strVersionText += "\n *** ";
|
||||
}
|
||||
|
||||
strVersionText += tr ( "Under the GNU General Public License (GPL)" );
|
||||
|
||||
if ( bWithHtml )
|
||||
{
|
||||
strVersionText += "</center>";
|
||||
}
|
||||
|
||||
return strVersionText;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue