From 8906baeca6f4d36da6217635919b49fbe3c53f18 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sun, 20 Mar 2011 13:25:06 +0000
Subject: [PATCH] some cleanup, added logopicture to about dialog

---
 src/aboutdlgbase.ui     | 281 ++++++++++++++++++++++------------------
 src/audiomixerboard.cpp |  38 +-----
 src/llconclientdlg.cpp  |  92 +------------
 3 files changed, 158 insertions(+), 253 deletions(-)

diff --git a/src/aboutdlgbase.ui b/src/aboutdlgbase.ui
index d885ac7d..8617952d 100755
--- a/src/aboutdlgbase.ui
+++ b/src/aboutdlgbase.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>630</width>
-    <height>397</height>
+    <height>465</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -25,149 +25,172 @@
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="PixmapLabelDreamLogo" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="pixmap" >
-        <pixmap/>
-       </property>
-       <property name="scaledContents" >
-        <bool>true</bool>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="TextLabelVersion" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>TextLabelVersion</string>
-       </property>
-       <property name="alignment" >
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
-     </property>
      <item>
       <layout class="QVBoxLayout" >
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <property name="leftMargin" >
-        <number>0</number>
-       </property>
-       <property name="topMargin" >
-        <number>0</number>
-       </property>
-       <property name="rightMargin" >
-        <number>0</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>0</number>
-       </property>
        <item>
-        <widget class="QLabel" name="TextLabelAuthorNames" >
-         <property name="text" >
-          <string>Author: Volker Fischer</string>
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>6</number>
          </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
+         <property name="leftMargin" >
+          <number>0</number>
          </property>
-        </widget>
+         <property name="topMargin" >
+          <number>0</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="PixmapLabelDreamLogo" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="pixmap" >
+            <pixmap/>
+           </property>
+           <property name="scaledContents" >
+            <bool>true</bool>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="TextLabelVersion" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text" >
+            <string>TextLabelVersion</string>
+           </property>
+           <property name="alignment" >
+            <set>Qt::AlignCenter</set>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
        <item>
-        <widget class="QLabel" name="TextLabelCopyright" >
-         <property name="text" >
-          <string>Copyright (C) 2005 - 2011</string>
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>6</number>
          </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
+         <property name="leftMargin" >
+          <number>0</number>
          </property>
-        </widget>
+         <property name="topMargin" >
+          <number>0</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>0</number>
+         </property>
+         <item>
+          <layout class="QVBoxLayout" >
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <property name="leftMargin" >
+            <number>0</number>
+           </property>
+           <property name="topMargin" >
+            <number>0</number>
+           </property>
+           <property name="rightMargin" >
+            <number>0</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="TextLabelAuthorNames" >
+             <property name="text" >
+              <string>Author: Volker Fischer</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="TextLabelCopyright" >
+             <property name="text" >
+              <string>Copyright (C) 2005 - 2011</string>
+             </property>
+             <property name="wordWrap" >
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType" >
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" >
+            <size>
+             <width>20</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
        </item>
       </layout>
      </item>
      <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
+      <layout class="QVBoxLayout" >
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string/>
+         </property>
+         <property name="pixmap" >
+          <pixmap resource="resources.qrc" >:/png/main/res/logopicture.png</pixmap>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Minimum</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>1</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp
index 350de14b..8219509a 100755
--- a/src/audiomixerboard.cpp
+++ b/src/audiomixerboard.cpp
@@ -152,13 +152,6 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
         pFader->setStyleSheet  ( "" );
         pcbMute->setStyleSheet ( "" );
         pcbSolo->setStyleSheet ( "" );
-
-/*
-// TEST
-        pFader->setStyleSheet (
-            "QSlider::handle { image: url(:/png/fader/res/faderhandle.png); }" );
-*/
-
         pcbMute->setText       ( "Mute" );
         pcbSolo->setText       ( "Solo" );
         break;
@@ -335,36 +328,7 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags f ) :
 
 void CAudioMixerBoard::SetGUIDesign ( const EGUIDesign eNewDesign )
 {
-    // apply GUI design to current window
-    switch ( eNewDesign )
-    {
-    case GD_ORIGINAL:
-/*
-        // group box
-        setStyleSheet (
-            "QGroupBox { border-image:  url(:/png/fader/res/mixerboardbackground.png) 34px 30px 40px 40px;"
-            "            border-top:    34px transparent;"
-            "            border-bottom: 40px transparent;"
-            "            border-left:   30px transparent;"
-            "            border-right:  40px transparent;"
-            "            padding:       -5px;"
-            "            margin:        -5px, -5px, 0px, 0px; }"
-            "QGroupBox::title { margin-top:       13px;"
-            "                   margin-left:      35px;"
-            "                   background-color: transparent;"
-            "                   color:            rgb(148, 148, 148); }" );
-        layout()->setMargin ( 3 );
-*/
-        break;
-
-    default:
-        // reset style sheet and set original paramters
-        setStyleSheet ( "" );
-        layout()->setMargin ( 9 );
-        break;
-    }
-
-    // also apply GUI design to child GUI controls
+    // apply GUI design to child GUI controls
     for ( int i = 0; i < USED_NUM_CHANNELS; i++ )
     {
         vecpChanFader[i]->SetGUIDesign ( eNewDesign );
diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp
index 6ed3bb43..2e081f05 100755
--- a/src/llconclientdlg.cpp
+++ b/src/llconclientdlg.cpp
@@ -823,98 +823,16 @@ void CLlconClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
             "                         border-right:  40px transparent;"
             "                         padding:       -5px;"
             "                         margin:        -5px, -5px, 0px, 0px; }"
-            "QLabel { color: rgb(148, 148, 148);"
-            "         font:  bold; }"
-            "QRadioButton { color: rgb(148, 148, 148);"
-            "               font:  bold; }"
-            "QGroupBox::title { color: rgb(148, 148, 148); }" );
-
-/*
-        // group box
-        groupBoxLocal->setStyleSheet (
-            "QGroupBox { border-image:  url(:/png/fader/res/mixerboardbackground.png) 34px 30px 40px 40px;"
-            "            border-top:    34px transparent;"
-            "            border-bottom: 40px transparent;"
-            "            border-left:   30px transparent;"
-            "            border-right:  40px transparent;"
-            "            padding:       -5px;"
-            "            margin:        -5px, -5px, 0px, 0px; }"
-            "QGroupBox::title { margin-top:       13px;"
-            "                   margin-left:      35px;"
-            "                   background-color: transparent;"
-            "                   color:            rgb(148, 148, 148); }" );
-        groupBoxLocal->layout()->setMargin ( 3 );
-*/
-/*
-        // audio fader
-        SliderAudInFader->setStyleSheet (
-            "QSlider { background-image: url(:/png/fader/res/faderbackground.png);"
-            "          width:            45px; }"
-            "QSlider::groove { image: url(); }"
-            "QSlider::handle { image: url(:/png/fader/res/faderhandlesmall.png); }" );
-        TextLabelAudFader->setStyleSheet (
-            "QLabel { color: rgb(148, 148, 148);"
-            "         font:  bold; }" );
-        TextAudInFader->setStyleSheet (
-            "QLabel { color: rgb(148, 148, 148);"
-            "         font:  bold; }" );
-
-        // Reverberation
-        SliderAudReverb->setStyleSheet (
-            "QSlider { background-image: url(:/png/fader/res/faderbackground.png);"
-            "          width:            45px; }"
-            "QSlider::groove { image: url(); }"
-            "QSlider::handle { image: url(:/png/fader/res/faderhandlesmall.png); }" );
-
-        RadioButtonRevSelL->setStyleSheet (
-            "QRadioButton { color: rgb(148, 148, 148);"
-            "               font:  bold; }" );
-        RadioButtonRevSelR->setStyleSheet (
-            "QRadioButton { color: rgb(148, 148, 148);"
-            "               font:  bold; }" );
-
-        TextLabelAudReverb->setStyleSheet (
-            "QLabel { color: rgb(148, 148, 148);"
-            "         font:  bold; }" );
-*/
+            "QLabel {                 color:          rgb(148, 148, 148);"
+            "                         font:           bold; }"
+            "QRadioButton {           color:          rgb(148, 148, 148);"
+            "                         font:           bold; }"
+            "QGroupBox::title {       color:          rgb(148, 148, 148); }" );
          break;
 
     default:
         // reset style sheet and set original paramters
-
-/*
-backgroundFrame->setStyleSheet ( "QFrame#backgroundFrame { border-image: url(:/png/fader/res/mixerboardbackground.png) 34px 30px 40px 40px;"
-                      "  border-top:    34px transparent;"
-                      "  border-bottom: 40px transparent;"
-                      "  border-left:   30px transparent;"
-                      "  border-right:  40px transparent;"
-                      "  padding:       -5px;"
-                      "  margin:        -5px, -5px, 0px, 0px; }"
-                      "QLabel { color: rgb(148, 148, 148);"
-                      "     font:  bold; }"
-                      "QRadioButton {color: rgb(148, 148, 148);"
-                      "     font:  bold; }");
-*/
-//        groupBoxLocal->setStyleSheet       ( "" );
-//        groupBoxLocal->layout()->setMargin ( 9 );
-
-
         backgroundFrame->setStyleSheet    ( "" );
-        SliderAudInFader->setStyleSheet   ( "" );
-        SliderAudReverb->setStyleSheet    ( "" );
-        RadioButtonRevSelL->setStyleSheet ( "" );
-        RadioButtonRevSelR->setStyleSheet ( "" );
-        TextLabelAudReverb->setStyleSheet ( "" );
-        TextLabelAudFader->setStyleSheet  ( "" );
-        TextAudInFader->setStyleSheet     ( "" );
-
-/*
-SliderAudInFader->setStyleSheet (
-    "QSlider { background-image: url(:/png/fader/res/faderbackground.png);"
-    "          width:            45px; }"
-    "QSlider::groove { image: url(); }"
-    "QSlider::handle { image: url(:/png/fader/res/faderhandlesmall.png); }" );
-*/
         break;
     }