From d8f236c8f5cdb049559b34276fa3154b28188205 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 20 Jul 2016 16:03:49 -0400 Subject: [INTERFACE CHANGE] As recommended by docs team, the lumina-info interface has been streamlined a bit so there are individual buttons for each of the external links instead of the label/URL pairings. --- src-qt5/core/lumina-info/MainUI.cpp | 21 +- src-qt5/core/lumina-info/MainUI.h | 8 +- src-qt5/core/lumina-info/MainUI.ui | 376 +++++++++++++++++++----------------- 3 files changed, 220 insertions(+), 185 deletions(-) diff --git a/src-qt5/core/lumina-info/MainUI.cpp b/src-qt5/core/lumina-info/MainUI.cpp index c44509bb..32c161ad 100644 --- a/src-qt5/core/lumina-info/MainUI.cpp +++ b/src-qt5/core/lumina-info/MainUI.cpp @@ -32,13 +32,15 @@ void MainUI::updateUI(){ //Load the UI from all the resources / library info this->setWindowIcon( LXDG::findIcon("lumina","") ); ui->label_icon->setPixmap( QPixmap(":Images/Lumina-logo.png").scaledToHeight(ui->label_icon->height(), Qt::SmoothTransformation) ); + ui->tool_bugs->setIcon( LXDG::findIcon("dialog-warning","")); + ui->tool_irc->setIcon( LXDG::findIcon("im-user","")); + ui->tool_sources->setIcon( LXDG::findIcon("documentation","")); + ui->tool_website->setIcon( LXDG::findIcon("go-home","")); connect(ui->push_close, SIGNAL(clicked()), this, SLOT(close()) ); //General Tab ui->label_version->setText( LUtils::LuminaDesktopVersion() ); ui->label_OS->setText( LOS::OSName() ); connect(ui->tool_aboutQt, SIGNAL(clicked()), this, SLOT(showQtInfo()) ); - connect(ui->label_doc, SIGNAL(linkActivated(const QString&)), this, SLOT(LinkClicked(QString)) ); - connect(ui->label_source, SIGNAL(linkActivated(const QString&)), this, SLOT(LinkClicked(QString)) ); //License Tab ui->text_license->setPlainText( LUtils::readFile(":LICENSE").join("\n") ); //Acknowledgements Tab @@ -61,3 +63,18 @@ void MainUI::showSponsor(QListWidgetItem *item){ void MainUI::LinkClicked(QString url){ QProcess::startDetached("lumina-open \""+url+"\""); } +void MainUI::on_tool_bugs_clicked(){ + LinkClicked(ui->tool_bugs->whatsThis()); +} + +void MainUI::on_tool_irc_clicked(){ + LinkClicked(ui->tool_irc->whatsThis()); +} + +void MainUI::on_tool_sources_clicked(){ + LinkClicked(ui->tool_sources->whatsThis()); +} + +void MainUI::on_tool_website_clicked(){ + LinkClicked(ui->tool_website->whatsThis()); +} diff --git a/src-qt5/core/lumina-info/MainUI.h b/src-qt5/core/lumina-info/MainUI.h index c9a9804a..f51e00ed 100644 --- a/src-qt5/core/lumina-info/MainUI.h +++ b/src-qt5/core/lumina-info/MainUI.h @@ -35,5 +35,11 @@ private slots: void showQtInfo(); void showSponsor(QListWidgetItem *item); void LinkClicked(QString url); + + //Simplification slots for the link buttons + void on_tool_bugs_clicked(); + void on_tool_irc_clicked(); + void on_tool_sources_clicked(); + void on_tool_website_clicked(); }; -#endif \ No newline at end of file +#endif diff --git a/src-qt5/core/lumina-info/MainUI.ui b/src-qt5/core/lumina-info/MainUI.ui index d5d229e7..29c8759c 100644 --- a/src-qt5/core/lumina-info/MainUI.ui +++ b/src-qt5/core/lumina-info/MainUI.ui @@ -7,7 +7,7 @@ 0 0 356 - 434 + 457 @@ -15,8 +15,7 @@ - - + .. @@ -60,201 +59,214 @@ General - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + 0 - - - - - 75 - true - - - - Desktop Version: - - - - - - - - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - 75 - true - - - - OS Build: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - 75 - true - - - - Qt Version: - - - - - - - - - - 75 - true - + + 0 + + + 0 + + + + + + + https://github.com/trueos/lumina - View Information + Source Repository + + + + 32 + 32 + + + + Qt::ToolButtonTextBesideIcon + + + true - - + + Qt::Horizontal - + + + + + + http://lumina-desktop.org + + + Lumina Website + + - 40 - 20 + 32 + 32 - + + Qt::ToolButtonTextBesideIcon + + + true + + + + + + + https://bugs.pcbsd.org/projects/pcbsd + + + Bug Reports + + + + 32 + 32 + + + + Qt::ToolButtonTextBesideIcon + + + true + + + + + + + + + + 75 + true + + + + Desktop Version: + + + + + + + + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + 75 + true + + + + OS Build: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 75 + true + + + + Qt Version: + + + + + + + + + + 75 + true + + + + View Information + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + + https://webchat.freenode.net/?channels=%23lumina-desktop + + + Ask the Community + + + + 32 + 32 + + + + Qt::ToolButtonTextBesideIcon + + + true + + - - - - - 75 - true - - - - Lumina Website: - - - - - - - <a href="http://lumina-desktop.org">Open in web browser</a> - - - false - - - - - - - - 75 - true - - - - Source Repository: - - - - - - - <a href="https://github.com/pcbsd/lumina">Open in web browser</a> - - - - - - - - 75 - true - - - - Report a Bug: - - - - - - - <a href="https://bugs.pcbsd.org/projects/pcbsd">Open in Web Browser</a> - - - true - - - - - - - Qt::Horizontal - - - - - - - - 75 - true - - - - Community Support: - - - - - - - <a href="https://webchat.freenode.net/?channels=%23lumina-desktop">Open in web browser</a> - - - true - - - -- cgit