From a9a851d2f02b1e5585769550e8df776668246a2b Mon Sep 17 00:00:00 2001
From: Daniel Winzen <d@winzen4.de>
Date: Fri, 21 Nov 2014 16:29:32 +0100
Subject: [PATCH] About dialog: Move involved tab into .ui file

---
 src/gui/about_dialog.cpp        |  15 +--
 src/gui/dialogs/about_dialog.ui | 178 +++++++++++++++++++-------------
 2 files changed, 105 insertions(+), 88 deletions(-)

diff --git a/src/gui/about_dialog.cpp b/src/gui/about_dialog.cpp
index 9eee88cc8..61102109d 100644
--- a/src/gui/about_dialog.cpp
+++ b/src/gui/about_dialog.cpp
@@ -52,18 +52,5 @@ aboutDialog::aboutDialog() :
 
 	licenseLabel->setPlainText( embed::getText( "COPYING" ) );
 
-	QString contText = embed::getText( "CONTRIBUTORS" );
-	if ( contText.length() >= 2 )
-	{
-		QWidget *widget = new QWidget();
-		QVBoxLayout *layout = new QVBoxLayout();
-		QTextEdit *contWidget = new QTextEdit();
-		contWidget->setReadOnly(true);
-		contWidget->setText( contText );
-
-		layout->addWidget( new QLabel( tr("Contributors ordered by number of commits:"), this ) );
-		layout->addWidget( contWidget );
-		widget->setLayout( layout );
-		tabWidget->insertTab( 2, widget, tr("Involved") );
-	}
+	involvedLabel->setPlainText( embed::getText( "CONTRIBUTORS" ) );
 }
diff --git a/src/gui/dialogs/about_dialog.ui b/src/gui/dialogs/about_dialog.ui
index 2fdd91054..6d9a11337 100644
--- a/src/gui/dialogs/about_dialog.ui
+++ b/src/gui/dialogs/about_dialog.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0" >
+<ui version="4.0">
  <class>AboutDialog</class>
- <widget class="QDialog" name="AboutDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="AboutDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -10,46 +10,55 @@
     <height>357</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>About LMMS</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="spacing">
     <number>8</number>
    </property>
-   <property name="margin" >
+   <property name="leftMargin">
+    <number>8</number>
+   </property>
+   <property name="topMargin">
+    <number>8</number>
+   </property>
+   <property name="rightMargin">
+    <number>8</number>
+   </property>
+   <property name="bottomMargin">
     <number>8</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" >
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="iconLabel" >
-       <property name="minimumSize" >
+      <widget class="QLabel" name="iconLabel">
+       <property name="minimumSize">
         <size>
          <width>64</width>
          <height>64</height>
         </size>
        </property>
-       <property name="text" >
+       <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2" >
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="QLabel" name="label" >
-         <property name="styleSheet" >
-          <string notr="true" >font:12pt; font-weight:bold;</string>
+        <widget class="QLabel" name="label">
+         <property name="styleSheet">
+          <string notr="true">font:12pt; font-weight:bold;</string>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>LMMS</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="versionLabel" >
-         <property name="text" >
+        <widget class="QLabel" name="versionLabel">
+         <property name="text">
           <string>Version %1 (%2/%3, Qt %4, %5)</string>
          </property>
         </widget>
@@ -57,11 +66,11 @@
       </layout>
      </item>
      <item>
-      <spacer name="horizontalSpacer" >
-       <property name="orientation" >
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -72,24 +81,24 @@
     </layout>
    </item>
    <item>
-    <widget class="QTabWidget" name="tabWidget" >
-     <property name="currentIndex" >
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
        <string>About</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout" >
+      <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <spacer name="verticalSpacer_3" >
-         <property name="orientation" >
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeType" >
+         <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>10</height>
@@ -98,24 +107,24 @@
         </spacer>
        </item>
        <item>
-        <widget class="QLabel" name="label_2" >
-         <property name="text" >
+        <widget class="QLabel" name="label_2">
+         <property name="text">
           <string>LMMS - easy music production for everyone</string>
          </property>
-         <property name="wordWrap" >
+         <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer_2" >
-         <property name="orientation" >
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeType" >
+         <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>10</height>
@@ -124,24 +133,24 @@
         </spacer>
        </item>
        <item>
-        <widget class="QLabel" name="label_3" >
-         <property name="text" >
+        <widget class="QLabel" name="label_3">
+         <property name="text">
           <string>Copyright (c) 2004-2014, LMMS developers</string>
          </property>
-         <property name="wordWrap" >
+         <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer_4" >
-         <property name="orientation" >
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeType" >
+         <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>10</height>
@@ -150,21 +159,21 @@
         </spacer>
        </item>
        <item>
-        <widget class="QLabel" name="label_4" >
-         <property name="text" >
+        <widget class="QLabel" name="label_4">
+         <property name="text">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://lmms.io&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://lmms.io&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
-         <property name="wordWrap" >
+         <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer" >
-         <property name="orientation" >
+        <spacer name="verticalSpacer">
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
@@ -174,31 +183,52 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
        <string>Authors</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_4" >
+      <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
-        <widget class="QTextEdit" name="authorLabel" >
-         <property name="readOnly" >
+        <widget class="QTextEdit" name="authorLabel">
+         <property name="readOnly">
           <bool>true</bool>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="Seite" >
-      <attribute name="title" >
-       <string>Translation</string>
+     <widget class="QWidget" name="tab_3">
+      <attribute name="title">
+       <string>Involved</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_5" >
+      <layout class="QVBoxLayout" name="verticalLayout_7">
        <item>
-        <widget class="QTextEdit" name="translationLabel" >
-         <property name="readOnly" >
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Contributors ordered by number of commits:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QTextEdit" name="involvedLabel">
+         <property name="readOnly">
           <bool>true</bool>
          </property>
-         <property name="plainText" >
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="Seite">
+      <attribute name="title">
+       <string>Translation</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <item>
+        <widget class="QTextEdit" name="translationLabel">
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+         <property name="plainText">
           <string>Current language not translated (or native English).
 
 If you're interested in translating LMMS in another language or want to improve existing translations, you're welcome to help us! Simply contact the maintainer!</string>
@@ -207,14 +237,14 @@ If you're interested in translating LMMS in another language or want to improve
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="Seite_2" >
-      <attribute name="title" >
+     <widget class="QWidget" name="Seite_2">
+      <attribute name="title">
        <string>License</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_6" >
+      <layout class="QVBoxLayout" name="verticalLayout_6">
        <item>
-        <widget class="QTextEdit" name="licenseLabel" >
-         <property name="readOnly" >
+        <widget class="QTextEdit" name="licenseLabel">
+         <property name="readOnly">
           <bool>true</bool>
          </property>
         </widget>
@@ -224,11 +254,11 @@ If you're interested in translating LMMS in another language or want to improve
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Close</set>
      </property>
     </widget>
@@ -243,11 +273,11 @@ If you're interested in translating LMMS in another language or want to improve
    <receiver>AboutDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -259,11 +289,11 @@ If you're interested in translating LMMS in another language or want to improve
    <receiver>AboutDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>