[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.

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 @@
     <x>0</x>
     <y>0</y>
     <width>356</width>
-    <height>434</height>
+    <height>457</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,8 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset theme="lumina">
-    <normaloff/>
-   </iconset>
+    <normaloff>.</normaloff>.</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
@@ -60,201 +59,214 @@
        <attribute name="title">
         <string>General</string>
        </attribute>
-       <layout class="QFormLayout" name="formLayout">
-        <property name="labelAlignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <property name="leftMargin">
+         <number>0</number>
         </property>
-        <property name="formAlignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        <property name="topMargin">
+         <number>0</number>
         </property>
-        <item row="0" column="0">
-         <widget class="QLabel" name="label">
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>Desktop Version:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QLabel" name="label_version">
-          <property name="text">
-           <string notr="true"/>
-          </property>
-          <property name="textInteractionFlags">
-           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>OS Build:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QLabel" name="label_OS">
-          <property name="text">
-           <string notr="true"/>
-          </property>
-          <property name="textInteractionFlags">
-           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_5">
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>Qt Version:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <widget class="QPushButton" name="tool_aboutQt">
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="2" column="1">
+           <widget class="QToolButton" name="tool_sources">
+            <property name="whatsThis">
+             <string notr="true">https://github.com/trueos/lumina</string>
             </property>
             <property name="text">
-             <string>View Information</string>
+             <string>Source Repository</string>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>32</width>
+              <height>32</height>
+             </size>
+            </property>
+            <property name="toolButtonStyle">
+             <enum>Qt::ToolButtonTextBesideIcon</enum>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item>
-           <spacer name="horizontalSpacer_2">
+          <item row="1" column="0" colspan="2">
+           <widget class="Line" name="line">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0">
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QToolButton" name="tool_website">
+            <property name="whatsThis">
+             <string notr="true">http://lumina-desktop.org</string>
+            </property>
+            <property name="text">
+             <string>Lumina Website</string>
+            </property>
+            <property name="iconSize">
              <size>
-              <width>40</width>
-              <height>20</height>
+              <width>32</width>
+              <height>32</height>
              </size>
             </property>
-           </spacer>
+            <property name="toolButtonStyle">
+             <enum>Qt::ToolButtonTextBesideIcon</enum>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QToolButton" name="tool_bugs">
+            <property name="whatsThis">
+             <string notr="true">https://bugs.pcbsd.org/projects/pcbsd</string>
+            </property>
+            <property name="text">
+             <string>Bug Reports</string>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>32</width>
+              <height>32</height>
+             </size>
+            </property>
+            <property name="toolButtonStyle">
+             <enum>Qt::ToolButtonTextBesideIcon</enum>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" colspan="2">
+           <layout class="QFormLayout" name="formLayout_3">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Desktop Version:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLabel" name="label_version">
+              <property name="text">
+               <string notr="true"/>
+              </property>
+              <property name="textInteractionFlags">
+               <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_2">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>OS Build:</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_5">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Qt Version:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_2">
+              <item>
+               <widget class="QPushButton" name="tool_aboutQt">
+                <property name="font">
+                 <font>
+                  <weight>75</weight>
+                  <bold>true</bold>
+                 </font>
+                </property>
+                <property name="text">
+                 <string>View Information</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_2">
+                <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 row="1" column="1">
+             <widget class="QLabel" name="label_OS">
+              <property name="text">
+               <string notr="true"/>
+              </property>
+              <property name="textInteractionFlags">
+               <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="3" column="0">
+           <widget class="QToolButton" name="tool_irc">
+            <property name="whatsThis">
+             <string notr="true">https://webchat.freenode.net/?channels=%23lumina-desktop</string>
+            </property>
+            <property name="text">
+             <string>Ask the Community</string>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>32</width>
+              <height>32</height>
+             </size>
+            </property>
+            <property name="toolButtonStyle">
+             <enum>Qt::ToolButtonTextBesideIcon</enum>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
           </item>
          </layout>
         </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_6">
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>Lumina Website:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1">
-         <widget class="QLabel" name="label_doc">
-          <property name="text">
-           <string>&lt;a href=&quot;http://lumina-desktop.org&quot;&gt;Open in web browser&lt;/a&gt;</string>
-          </property>
-          <property name="openExternalLinks">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="0">
-         <widget class="QLabel" name="label_3">
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>Source Repository:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="1">
-         <widget class="QLabel" name="label_source">
-          <property name="text">
-           <string notr="true">&lt;a href=&quot;https://github.com/pcbsd/lumina&quot;&gt;Open in web browser&lt;/a&gt;</string>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="0">
-         <widget class="QLabel" name="label_4">
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>Report a Bug:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="1">
-         <widget class="QLabel" name="label_7">
-          <property name="text">
-           <string>&lt;a href=&quot;https://bugs.pcbsd.org/projects/pcbsd&quot;&gt;Open in Web Browser&lt;/a&gt;</string>
-          </property>
-          <property name="openExternalLinks">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0" colspan="2">
-         <widget class="Line" name="line">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="7" column="0">
-         <widget class="QLabel" name="label_9">
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>Community Support:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="7" column="1">
-         <widget class="QLabel" name="label_11">
-          <property name="text">
-           <string>&lt;a href=&quot;https://webchat.freenode.net/?channels=%23lumina-desktop&quot;&gt;Open in web browser&lt;/a&gt;</string>
-          </property>
-          <property name="openExternalLinks">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
       <widget class="QWidget" name="tab_2">