From 110bfca6d1cc091d5a5ba4e09ea9958ef56c5971 Mon Sep 17 00:00:00 2001 From: baydam Date: Thu, 13 Oct 2016 11:12:55 +0000 Subject: [PATCH] Add librairies to about dialog --- AboutDialog.cpp | 35 +++++++++++++++++++++++++---------- AboutDialog.h | 7 +++++-- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/AboutDialog.cpp b/AboutDialog.cpp index 1cc8e1a..b3bc840 100644 --- a/AboutDialog.cpp +++ b/AboutDialog.cpp @@ -26,7 +26,8 @@ MM_BEGIN_NAMESPACE AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) { // Defines fixed size - setFixedSize(ABOUT_WINDOW_WIDTH, ABOUT_WINDOW_HEIGHT); + resize(ABOUT_WINDOW_WIDTH, ABOUT_WINDOW_HEIGHT); + setMinimumSize(ABOUT_WINDOW_WIDTH, ABOUT_WINDOW_HEIGHT); // Set title setWindowTitle(tr("About %1").arg(MM::APPLICATION_NAME)); @@ -36,26 +37,27 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) // Set icon label _iconLabel = new QLabel; - _iconLabel->setPixmap(QPixmap(":/mapmap-logo").scaled(64, 64)); - _mainLayout->addWidget(_iconLabel, 0, 0, 1, 1, Qt::AlignCenter); + _iconLabel->setPixmap(QPixmap(":/mapmap-logo").scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation)); + _iconLabel->setContentsMargins(0, 20, 0, 20); + _mainLayout->addWidget(_iconLabel, 0, 0, 1, 1, Qt::AlignRight); // Set title label _textLabel = new QLabel; - _textLabel->setPixmap(QPixmap(":/mapmap-title")); - _mainLayout->addWidget(_textLabel, 0, 1, 1, 1); + _textLabel->setPixmap(QPixmap(":/mapmap-title-light").scaled(200, 40, Qt::KeepAspectRatio, Qt::SmoothTransformation)); + _mainLayout->addWidget(_textLabel, 0, 2); // Set version label _versionLabel = new QLabel; _versionLabel->setText(QString("

%1

").arg(MM::VERSION)); - _versionLabel->setContentsMargins(7, 0, 0, 7); - _mainLayout->addWidget(_versionLabel, 0, 2, 1, 1, Qt::AlignBottom); + _versionLabel->setContentsMargins(7, 20, 0, 0); + _mainLayout->addWidget(_versionLabel, 0, 3); // Add tab widget _tabWidget = new QTabWidget; - _mainLayout->addWidget(_tabWidget, 1, 0, 1, 3); + _mainLayout->addWidget(_tabWidget, 1, 0, 1, 4); // Close button _buttonBox = new QDialogButtonBox(QDialogButtonBox::Close); connect(_buttonBox, SIGNAL(rejected()), this, SLOT(close())); - _mainLayout->addWidget(_buttonBox, 2, 0, 1, 3); + _mainLayout->addWidget(_buttonBox, 2, 0, 1, 4); // Create and fill different tabs createAboutTab(); @@ -75,7 +77,7 @@ void AboutDialog::createAboutTab() { _aboutTextBrowser = new QTextBrowser; _aboutTextBrowser->setOpenExternalLinks(true); - QString aboutText; + // Software description QString aboutSoftwareText = "

" + tr("MapMap is a free/open source video mapping software.") + "

"; // Copyright and software owners @@ -92,6 +94,7 @@ void AboutDialog::createAboutTab() QString projectWebsiteText = "

" + tr("See the ") + QString("").arg(MM::ORGANIZATION_DOMAIN) + tr("%1 website").arg(MM::APPLICATION_NAME) + " for more information on this software.

"; // Append texts + QString aboutText; aboutText.append(aboutSoftwareText); aboutText.append(copyrightText); aboutText.append(licenseNoticeText); @@ -121,6 +124,18 @@ void AboutDialog::createLibrairiesTab() _librariesTextBrowser = new QTextBrowser; _librariesTextBrowser->setOpenExternalLinks(true); + QString qtVersionText = QString("

Qt %1

").arg(QT_VERSION_STR); + QString gstreamerVersionText = QString("

%1

").arg(gst_version_string()); + //QString libloVersionText = QString("

%1

").arg(lo_version('str', 0, 0, 0, 0, 0, 0, 0, 0)); + + QString librairiesText; + librairiesText.append(qtVersionText); + librairiesText.append(gstreamerVersionText); + //librairiesText.append(libloVersionText); + + // Set librairies main text + _librariesTextBrowser->setText(librairiesText); + _tabWidget->addTab(_librariesTextBrowser, tr("Librairies")); } diff --git a/AboutDialog.h b/AboutDialog.h index 8eea159..1d4708b 100644 --- a/AboutDialog.h +++ b/AboutDialog.h @@ -22,6 +22,9 @@ #include +#include +#include "lo/lo.h" + #include "GuiForward.h" #include "MM.h" @@ -57,8 +60,8 @@ private: QDialogButtonBox *_buttonBox; // Constantes - static const int ABOUT_WINDOW_WIDTH = 540; - static const int ABOUT_WINDOW_HEIGHT = 720; + static const int ABOUT_WINDOW_WIDTH = 560; + static const int ABOUT_WINDOW_HEIGHT = 640; };