///////////////////////////////////////////////////////////////////////////////
// LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2013 LoRd_MuldeR <MuldeR2@GMX.de>
//
// 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
#include "Dialog_About.h"
+#include "../tmp/UIC_AboutDialog.h"
+
#include "Global.h"
#include "Resource.h"
#include "Model_Settings.h"
#define TRIM_RIGHT(STR) do { while(STR.endsWith(QChar(' ')) || STR.endsWith(QChar('\t')) || STR.endsWith(QChar('\r')) || STR.endsWith(QChar('\n'))) STR.chop(1); } while(0)
#define MAKE_TRANSPARENT(WIDGET) do { QPalette _p = (WIDGET)->palette(); _p.setColor(QPalette::Background, Qt::transparent); (WIDGET)->setPalette(_p); } while(0)
-
//Constants
const char *AboutDialog::neroAacUrl = "http://www.nero.com/eng/technologies-aac-codec.html";
-const char *AboutDialog::disqueUrl = "http://mulder.brhack.net/?player_url=38X-MXOB014"; //http://mulder.brhack.net/?player_url=yF6W-w0iAMM; http://www.youtube.com/watch_popup?v=yF6W-w0iAMM&vq=large
+const char *AboutDialog::disqueUrl = "http://muldersoft.com/?player_url=38X-MXOB014"; //http://mulder.brhack.net/?player_url=yF6W-w0iAMM; http://www.youtube.com/watch_popup?v=yF6W-w0iAMM&vq=large
//Contributors
static const struct
AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstStart)
:
QDialog(parent),
+ ui(new Ui::AboutDialog),
m_settings(settings),
m_initFlags(new QMap<QWidget*,bool>),
m_disque(NULL),
m_lastTab(0)
{
//Init the dialog, from the .ui file
- setupUi(this);
+ ui->setupUi(this);
setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
resize(this->minimumSize());
}
//Init tab widget
- connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
+ connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
//Make transparent
- QStyle *style = qApp->style();
- if((dynamic_cast<QWindowsVistaStyle*>(style)) || (dynamic_cast<QWindowsXPStyle*>(style)))
+ const type_info &styleType = typeid(*qApp->style());
+ if((typeid(QWindowsVistaStyle) == styleType) || (typeid(QWindowsXPStyle) == styleType))
{
- MAKE_TRANSPARENT(infoScrollArea);
- MAKE_TRANSPARENT(contributorsScrollArea);
- MAKE_TRANSPARENT(softwareScrollArea);
- MAKE_TRANSPARENT(licenseScrollArea);
+ MAKE_TRANSPARENT(ui->infoScrollArea);
+ MAKE_TRANSPARENT(ui->contributorsScrollArea);
+ MAKE_TRANSPARENT(ui->softwareScrollArea);
+ MAKE_TRANSPARENT(ui->licenseScrollArea);
}
//Show about dialog for the first time?
if(!firstStart)
{
- acceptButton->hide();
- declineButton->hide();
- aboutQtButton->show();
- closeButton->show();
-
+ lamexp_seed_rand();
+
+ ui->acceptButton->hide();
+ ui->declineButton->hide();
+ ui->aboutQtButton->show();
+ ui->closeButton->show();
+
QPixmap disque(":/images/Disque.png");
- QRect screenGeometry = QApplication::desktop()->availableGeometry();
m_disque = new QLabel(this, Qt::Window | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
- m_disque->installEventFilter(this);
+ m_disque->resize(disque.size());
m_disque->setStyleSheet("background:transparent;");
m_disque->setAttribute(Qt::WA_TranslucentBackground);
- m_disque->setGeometry(qrand() % (screenGeometry.width() - disque.width()), qrand() % (screenGeometry.height() - disque.height()), disque.width(), disque.height());
m_disque->setPixmap(disque);
- m_disque->setWindowOpacity(0.01);
+ m_disque->installEventFilter(this);
+
+ connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), this, SLOT(geometryUpdated()));
+ geometryUpdated();
+
+ m_discOpacity = 0.01;
+ m_disquePos.setX(static_cast<int>(lamexp_rand() % static_cast<unsigned int>(m_disqueBound.right() - disque.width() - m_disqueBound.left())) + m_disqueBound.left());
+ m_disquePos.setY(static_cast<int>(lamexp_rand() % static_cast<unsigned int>(m_disqueBound.bottom() - disque.height() - m_disqueBound.top())) + m_disqueBound.top());
+ m_disqueFlags[0] = (lamexp_rand() > (UINT_MAX/2));
+ m_disqueFlags[1] = (lamexp_rand() > (UINT_MAX/2));
+ m_disque->move(m_disquePos);
+ m_disque->setWindowOpacity(m_discOpacity);
m_disque->show();
- m_disqueFlags[0] = (qrand() > (RAND_MAX/2));
- m_disqueFlags[1] = (qrand() > (RAND_MAX/2));
+
m_disqueTimer = new QTimer;
connect(m_disqueTimer, SIGNAL(timeout()), this, SLOT(moveDisque()));
- m_disqueTimer->setInterval(10);
- m_disqueTimer->start();
+ m_disqueTimer->start(10);
- connect(aboutQtButton, SIGNAL(clicked()), this, SLOT(showAboutQt()));
+ connect(ui->aboutQtButton, SIGNAL(clicked()), this, SLOT(showAboutQt()));
}
else
{
- acceptButton->show();
- declineButton->show();
- aboutQtButton->hide();
- closeButton->hide();
+ ui->acceptButton->show();
+ ui->declineButton->show();
+ ui->aboutQtButton->hide();
+ ui->closeButton->hide();
}
//Activate "show license" button
- showLicenseButton->show();
- connect(showLicenseButton, SIGNAL(clicked()), this, SLOT(gotoLicenseTab()));
+ ui->showLicenseButton->show();
+ connect(ui->showLicenseButton, SIGNAL(clicked()), this, SLOT(gotoLicenseTab()));
m_firstShow = firstStart;
}
LAMEXP_DELETE(m_cartoon[i]);
}
LAMEXP_DELETE(m_initFlags);
+ LAMEXP_DELETE(ui);
}
////////////////////////////////////////////////////////////
// Slots
////////////////////////////////////////////////////////////
-#define TEMP_HIDE_DISQUE(CMD) \
-if(m_disque) { bool _tmp = m_disque->isVisible(); if(_tmp) m_disque->hide(); {CMD}; if(_tmp) { m_disque->show(); m_disque->setWindowOpacity(0.01); } } else {CMD}
+#define TEMP_HIDE_DISQUE(CMD) do \
+{ \
+ bool _tmp = (m_disque) ? m_disque->isVisible() : false; \
+ if(_tmp) m_disque->hide(); \
+ { CMD } \
+ if(_tmp) \
+ { \
+ m_discOpacity = 0.01; \
+ m_disque->setWindowOpacity(m_discOpacity); \
+ m_disque->show(); \
+ } \
+} \
+while(0)
void AboutDialog::tabChanged(int index)
{
- bool bInitialized = m_initFlags->value(tabWidget->widget(index), false);
+ bool bInitialized = m_initFlags->value(ui->tabWidget->widget(index), false);
if(!bInitialized)
{
qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
- if(QWidget *tab = tabWidget->widget(index))
+ if(QWidget *tab = ui->tabWidget->widget(index))
{
bool ok = false;
- if(tab == infoTab) { initInformationTab(); ok = true; }
- if(tab == contributorsTab) { initContributorsTab(); ok = true; }
- if(tab == softwareTab) { initSoftwareTab(); ok = true; }
- if(tab == licenseTab) { initLicenseTab(); ok = true; }
+ if(tab == ui->infoTab) { initInformationTab(); ok = true; }
+ if(tab == ui->contributorsTab) { initContributorsTab(); ok = true; }
+ if(tab == ui->softwareTab) { initSoftwareTab(); ok = true; }
+ if(tab == ui->licenseTab) { initLicenseTab(); ok = true; }
if(ok)
{
}
- tabWidget->widget(index)->update();
+ ui->tabWidget->widget(index)->update();
qApp->processEvents();
qApp->restoreOverrideCursor();
}
//Scroll to the top
- if(QWidget *tab = tabWidget->widget(index))
+ if(QWidget *tab = ui->tabWidget->widget(index))
{
- if(tab == infoTab) infoScrollArea->verticalScrollBar()->setSliderPosition(0);
- if(tab == contributorsTab) contributorsScrollArea->verticalScrollBar()->setSliderPosition(0);
- if(tab == softwareTab) softwareScrollArea->verticalScrollBar()->setSliderPosition(0);
- if(tab == licenseTab) licenseScrollArea->verticalScrollBar()->setSliderPosition(0);
+ if(tab == ui->infoTab) ui->infoScrollArea->verticalScrollBar()->setSliderPosition(0);
+ if(tab == ui->contributorsTab) ui->contributorsScrollArea->verticalScrollBar()->setSliderPosition(0);
+ if(tab == ui->softwareTab) ui->softwareScrollArea->verticalScrollBar()->setSliderPosition(0);
+ if(tab == ui->licenseTab) ui->licenseScrollArea->verticalScrollBar()->setSliderPosition(0);
}
//Update license button
- showLicenseButton->setChecked(tabWidget->widget(index) == licenseTab);
- if(tabWidget->widget(index) != licenseTab) m_lastTab = index;
+ ui->showLicenseButton->setChecked(ui->tabWidget->widget(index) == ui->licenseTab);
+ if(ui->tabWidget->widget(index) != ui->licenseTab) m_lastTab = index;
}
void AboutDialog::enableButtons(void)
{
- acceptButton->setEnabled(true);
- declineButton->setEnabled(true);
+ ui->acceptButton->setEnabled(true);
+ ui->declineButton->setEnabled(true);
setCursor(QCursor(Qt::ArrowCursor));
}
void AboutDialog::gotoLicenseTab(void)
{
- tabWidget->setCurrentIndex(tabWidget->indexOf(showLicenseButton->isChecked() ? licenseTab : tabWidget->widget(m_lastTab)));
+ ui->tabWidget->setCurrentIndex(ui->tabWidget->indexOf(ui->showLicenseButton->isChecked() ? ui->licenseTab : ui->tabWidget->widget(m_lastTab)));
}
void AboutDialog::moveDisque(void)
if(m_disque)
{
- QRect screenGeometry = QApplication::desktop()->availableGeometry();
- const int minX = screenGeometry.left();
- const int maxX = screenGeometry.width() - m_disque->width() + screenGeometry.left();
- const int minY = screenGeometry.top();
- const int maxY = screenGeometry.height() - m_disque->height() + screenGeometry.top();
+ if(m_disquePos.x() <= m_disqueBound.left()) { m_disqueFlags[0] = true; m_rotateNext = true; }
+ if(m_disquePos.x() >= m_disqueBound.right()) { m_disqueFlags[0] = false; m_rotateNext = true; }
+ if(m_disquePos.y() <= m_disqueBound.top()) { m_disqueFlags[1] = true; m_rotateNext = true; }
+ if(m_disquePos.y() >= m_disqueBound.bottom()) { m_disqueFlags[1] = false; m_rotateNext = true; }
- QPoint pos = m_disque->pos();
- pos.setX(m_disqueFlags[0] ? pos.x() + delta : pos.x() - delta);
- pos.setY(m_disqueFlags[1] ? pos.y() + delta : pos.y() - delta);
-
- if(pos.x() <= minX)
- {
- m_disqueFlags[0] = true;
- pos.setX(minX);
- m_rotateNext = true;
- }
- else if(pos.x() >= maxX)
- {
- m_disqueFlags[0] = false;
- pos.setX(maxX);
- m_rotateNext = true;
- }
- if(pos.y() <= minY)
- {
- m_disqueFlags[1] = true;
- pos.setY(minY);
- m_rotateNext = true;
- }
- else if(pos.y() >= maxY)
- {
- m_disqueFlags[1] = false;
- pos.setY(maxY);
- m_rotateNext = true;
- }
-
- m_disque->move(pos);
+ m_disquePos.setX(m_disqueFlags[0] ? (m_disquePos.x() + delta) : (m_disquePos.x() - delta));
+ m_disquePos.setY(m_disqueFlags[1] ? (m_disquePos.y() + delta) : (m_disquePos.y() - delta));
+ m_disque->move(m_disquePos);
+
if(m_rotateNext)
{
QPixmap *cartoon = NULL;
if(cartoon)
{
m_disque->setPixmap(*cartoon);
- m_disque->resize(cartoon->size());
+ if(m_disque->size() != cartoon->size())
+ {
+ m_disque->resize(cartoon->size());
+ geometryUpdated();
+ }
}
m_rotateNext = false;
}
- if(m_disque->windowOpacity() < 0.9)
+ if(m_discOpacity != 1.0)
{
- m_disque->setWindowOpacity(m_disque->windowOpacity() + 0.01);
+ m_discOpacity = m_discOpacity + 0.01;
+ if(qFuzzyCompare(m_discOpacity, 1.0) || (m_discOpacity > 1.0))
+ {
+ m_discOpacity = 1.0;
+ }
+ m_disque->setWindowOpacity(m_discOpacity);
+ m_disque->update();
}
}
}
+
+void AboutDialog::geometryUpdated(void)
+{
+ if(m_disque)
+ {
+ QRect screenGeometry = QApplication::desktop()->availableGeometry();
+ m_disqueBound.setLeft(screenGeometry.left());
+ m_disqueBound.setRight(screenGeometry.width() - m_disque->width() + screenGeometry.left());
+ m_disqueBound.setTop(screenGeometry.top());
+ m_disqueBound.setBottom(screenGeometry.height() - m_disque->height() + screenGeometry.top());
+ }
+ else
+ {
+ m_disqueBound = QApplication::desktop()->availableGeometry();
+ }
+}
+
+void AboutDialog::adjustSize(void)
+{
+ int maximumHeight = QApplication::desktop()->availableGeometry().height();
+
+ int delta = ui->infoScrollArea->widget()->height() - ui->infoScrollArea->viewport()->height();
+ if(delta > 0)
+ {
+ this->resize(this->width(), qMin(this->height() + delta, maximumHeight));
+ this->move(this->x(), this->y() - (delta/2));
+ this->setMinimumHeight(qMax(this->minimumHeight(), this->height()));
+ }
+}
+
////////////////////////////////////////////////////////////
// Protected Functions
////////////////////////////////////////////////////////////
{
QDialog::showEvent(e);
- tabWidget->setCurrentIndex(tabWidget->indexOf(infoTab));
- tabChanged(m_lastTab = tabWidget->currentIndex());
+ ui->tabWidget->setCurrentIndex(ui->tabWidget->indexOf(ui->infoTab));
+ tabChanged(m_lastTab = ui->tabWidget->currentIndex());
if(m_firstShow)
{
- acceptButton->setEnabled(false);
- declineButton->setEnabled(false);
+ ui->acceptButton->setEnabled(false);
+ ui->declineButton->setEnabled(false);
QTimer::singleShot(5000, this, SLOT(enableButtons()));
setCursor(QCursor(Qt::WaitCursor));
}
+
+ QTimer::singleShot(0, this, SLOT(adjustSize()));
}
void AboutDialog::closeEvent(QCloseEvent *e)
const QString copyrightStr = QString().sprintf
(
"Copyright (C) 2004-%04d LoRd_MuldeR <MuldeR2@GMX.de>. Some rights reserved.",
- qMax(lamexp_version_date().year(), QDate::currentDate().year())
+ qMax(lamexp_version_date().year(), lamexp_current_date_safe().year())
);
QString aboutText;
aboutText += QString("%1<br>").arg(NOBR(tr("Please visit %1 for news and updates!").arg(LINK(lamexp_website_url()))));
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+ const QDate currentDate = lamexp_current_date_safe();
if(LAMEXP_DEBUG)
{
- int daysLeft = qMax(QDate::currentDate().daysTo(lamexp_version_expires()), 0);
+ int daysLeft = qMax(currentDate.daysTo(lamexp_version_expires()), 0);
aboutText += QString("<hr><font color=\"crimson\">%1</font>").arg(NOBR(QString("!!! --- DEBUG BUILD --- Expires at: %1 · Days left: %2 --- DEBUG BUILD --- !!!").arg(lamexp_version_expires().toString(Qt::ISODate), QString::number(daysLeft))));
}
else if(lamexp_version_demo())
{
- int daysLeft = qMax(QDate::currentDate().daysTo(lamexp_version_expires()), 0);
+ int daysLeft = qMax(currentDate.daysTo(lamexp_version_expires()), 0);
aboutText += QString("<hr><font color=\"crimson\">%1</font>").arg(NOBR(tr("Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left.").arg(lamexp_version_expires().toString(Qt::ISODate), QString::number(daysLeft))));
}
#else
+ const QDate currentDate = lamexp_current_date_safe();
if(LAMEXP_DEBUG)
{
- int daysLeft = qMax(QDate::currentDate().daysTo(lamexp_version_expires()), 0i64);
+ int daysLeft = qMax(currentDate.daysTo(lamexp_version_expires()), 0i64);
aboutText += QString("<hr><font color=\"crimson\">%1</font>").arg(NOBR(QString("!!! --- DEBUG BUILD --- Expires at: %1 · Days left: %2 --- DEBUG BUILD --- !!!").arg(lamexp_version_expires().toString(Qt::ISODate), QString::number(daysLeft))));
}
else if(lamexp_version_demo())
{
- int daysLeft = qMax(QDate::currentDate().daysTo(lamexp_version_expires()), 0i64);
+ int daysLeft = qMax(currentDate.daysTo(lamexp_version_expires()), 0i64);
aboutText += QString("<hr><font color=\"crimson\">%1</font>").arg(NOBR(tr("Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left.").arg(lamexp_version_expires().toString(Qt::ISODate), QString::number(daysLeft))));
}
#endif
aboutText += "</tr></table>";
//aboutText += QString("%1<br>").arg(NOBR(tr("Special thanks go out to \"John33\" from %1 for his continuous support.")).arg(LINK("http://www.rarewares.org/")));
- infoLabel->setText(aboutText);
- infoIcon->setPixmap(lamexp_app_icon().pixmap(QSize(72,72)));
- connect(infoLabel, SIGNAL(linkActivated(QString)), this, SLOT(openURL(QString)));
+ ui->infoLabel->setText(aboutText);
+ ui->infoIcon->setPixmap(lamexp_app_icon().pixmap(QSize(72,72)));
+ connect(ui->infoLabel, SIGNAL(linkActivated(QString)), this, SLOT(openURL(QString)));
}
void AboutDialog::initContributorsTab(void)
contributorsAboutText += QString("<td valign=\"middle\">%1</td><td>%2</td><td valign=\"middle\" colspan=\"3\"><a href=\"%3\">%3</td></tr>").arg(tr("Qt Developer Network"), spaces, "http://qt-project.org/");
contributorsAboutText += QString("<tr><td valign=\"middle\">%1</td><td>%2</td>").arg(webIcon, spaces);
contributorsAboutText += QString("<td valign=\"middle\">%1</td><td>%2</td><td valign=\"middle\" colspan=\"3\"><a href=\"%3\">%3</td></tr>").arg(tr("Marius Hudea"), spaces, "http://savedonthe.net/");
+ contributorsAboutText += QString("<tr><td valign=\"middle\">%1</td><td>%2</td>").arg(webIcon, spaces);
+ contributorsAboutText += QString("<td valign=\"middle\">%1</td><td>%2</td><td valign=\"middle\" colspan=\"3\"><a href=\"%3\">%3</td></tr>").arg(tr("Codecs.com"), spaces, "http://www.codecs.com/");
contributorsAboutText += "</table><br><br><br>";
contributorsAboutText += QString("<i>%1</i><br>").arg(NOBR(tr("If you are willing to contribute a LameXP translation, feel free to contact us!")));
- contributorsLabel->setText(contributorsAboutText);
- contributorsIcon->setPixmap(QIcon(":/images/Logo_Contributors.png").pixmap(QSize(72,84)));
- connect(contributorsLabel, SIGNAL(linkActivated(QString)), this, SLOT(openURL(QString)));
+ ui->contributorsLabel->setText(contributorsAboutText);
+ ui->contributorsIcon->setPixmap(QIcon(":/images/Logo_Contributors.png").pixmap(QSize(72,84)));
+ connect(ui->contributorsLabel, SIGNAL(linkActivated(QString)), this, SLOT(openURL(QString)));
}
void AboutDialog::initSoftwareTab(void)
moreAboutText += makeToolText
(
tr("LAME - OpenSource mp3 Encoder"),
- "lame.exe", "v?.??, Final-?",
+ "lame.exe", "v?.??, #-?",
tr("Released under the terms of the GNU Lesser General Public License."),
"http://lame.sourceforge.net/"
);
moreAboutText += makeToolText
(
tr("OggEnc - Ogg Vorbis Encoder"),
- "oggenc2.exe", "v?.??, aoTuV Beta-?.??",
+ "oggenc2.exe", "v?.??, aoTuV #-?.??",
tr("Completely open and patent-free audio encoding technology."),
"http://www.vorbis.com/"
);
moreAboutText += makeToolText
(
tr("Opus Audio Codec"),
- "opusenc_std.exe", "????-??-??",
+ "opusenc.exe", "#, ????-??-??",
tr("Totally open, royalty-free, highly versatile audio codec."),
"http://www.opus-codec.org/"
);
);
moreAboutText += makeToolText
(
- tr("AC3Filter Tools - AC3/DTS Decoder"),
- "valdec.exe", "v?.??",
+ tr("Valdec from AC3Filter Tools - AC3/DTS Decoder"),
+ "valdec.exe", "v?.??#",
tr("Released under the terms of the GNU Lesser General Public License."),
"http://www.ac3filter.net/projects/tools"
);
tr("Released under the terms of the GNU Lesser General Public License."),
"http://tta.sourceforge.net/"
);
+ //moreAboutText += makeToolText
+ //(
+ // tr("ALAC Decoder"),
+ // "alac.exe", "v?.?.?",
+ // tr("Copyright (c) 2004 David Hammerton. Contributions by Cody Brocious."),
+ // "http://craz.net/programs/itunes/alac.html"
+ //);
moreAboutText += makeToolText
(
- tr("ALAC Decoder"),
- "alac.exe", "v?.?.?",
- tr("Copyright (c) 2004 David Hammerton. Contributions by Cody Brocious."),
- "http://craz.net/programs/itunes/alac.html"
+ tr("refalac - Win32 command line ALAC encoder/decoder"),
+ "refalac.exe", "v?.??",
+ tr("The ALAC reference implementation by Apple is available under the Apache license."),
+ "http://alac.macosforge.org/"
);
moreAboutText += makeToolText
(
);
moreAboutText += makeToolText
(
+ tr("UPX - The Ultimate Packer for eXecutables"),
+ QString(), "v3.09",
+ tr("Released under the terms of the GNU Lesser General Public License."),
+ "http://upx.sourceforge.net/"
+ );
+ moreAboutText += makeToolText
+ (
tr("Silk Icons - Over 700 icons in PNG format"),
QString(), "v1.3",
tr("By Mark James, released under the Creative Commons 'by' License."),
tr("The copyright of LameXP as a whole belongs to LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors.")
);
- softwareLabel->setText(moreAboutText);
- softwareIcon->setPixmap(QIcon(":/images/Logo_Software.png").pixmap(QSize(72,65)));
- connect(softwareLabel, SIGNAL(linkActivated(QString)), this, SLOT(openURL(QString)));
+ ui->softwareLabel->setText(moreAboutText);
+ ui->softwareIcon->setPixmap(QIcon(":/images/Logo_Software.png").pixmap(QSize(72,65)));
+ connect(ui->softwareLabel, SIGNAL(linkActivated(QString)), this, SLOT(openURL(QString)));
}
void AboutDialog::initLicenseTab(void)
if(!bIsBlank) licenseText += QString("<font size=\"+2\">%1</font><br>").arg(line.simplified());
break;
case 1:
- if(!bIsBlank) licenseText += QString("<font size=\"+1\">%1</font><br>").arg(line.simplified());
+ if(!bIsBlank) licenseText += QString("<font size=\"+1\">%1 − %2</font><br>").arg(line.simplified(), LINK("http://www.gnu.org/licenses/gpl-2.0.html"));
break;
default:
TRIM_RIGHT(line);
if(!bIsBlank) counter++;
}
- licenseText += QString("<br><br>%1").arg(LINK("http://www.gnu.org/licenses/gpl-2.0.html"));
+ licenseText += QString("<br>");
stream.device()->close();
}
else
licenseText += ("</tt>");
- licenseLabel->setText(licenseText);
- licenseIcon->setPixmap(QIcon(":/images/Logo_GNU.png").pixmap(QSize(72,65)));
- connect(licenseLabel, SIGNAL(linkActivated(QString)), this, SLOT(openURL(QString)));
+ ui->licenseLabel->setText(licenseText);
+ ui->licenseIcon->setPixmap(QIcon(":/images/Logo_GNU.png").pixmap(QSize(72,65)));
+ connect(ui->licenseLabel, SIGNAL(linkActivated(QString)), this, SLOT(openURL(QString)));
}
QString AboutDialog::makeToolText(const QString &toolName, const QString &toolBin, const QString &toolVerFmt, const QString &toolLicense, const QString &toolWebsite, const QString &extraInfo)
{
- QString toolText, verStr(toolVerFmt);
+ QString toolText, toolTag, verStr(toolVerFmt);
if(!toolBin.isEmpty())
{
- verStr = lamexp_version2string(toolVerFmt, lamexp_tool_version(toolBin), tr("n/a"));
+ const unsigned int version = lamexp_tool_version(toolBin, &toolTag);
+ verStr = lamexp_version2string(toolVerFmt, version, tr("n/a"), &toolTag);
}
toolText += QString("<li>%1<br>").arg(NOBR(QString("<b>%1 (%2)</b>").arg(toolName, verStr)));