traverso-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Traverso-commit] traverso/src/traverso dialogs/settings/Pages.cp...


From: Remon Sijrier
Subject: [Traverso-commit] traverso/src/traverso dialogs/settings/Pages.cp...
Date: Fri, 20 Feb 2009 22:18:47 +0000

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/02/20 22:18:47

Modified files:
        src/traverso/dialogs/settings: Pages.cpp Pages.h 
                                       SettingsDialog.cpp 
        src/traverso/ui: AlsaDevicesPage.ui BehaviorConfigPage.ui 
                         DriverConfigPage.ui KeyboardConfigPage.ui 
                         PerformanceConfigPage.ui RecordingConfigPage.ui 
                         ThemeConfigPage.ui 

Log message:
        * cleanups in the settings pages, added Language selection dropdown 
box, though it's not storing the preference yet

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.h?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/SettingsDialog.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/AlsaDevicesPage.ui?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/BehaviorConfigPage.ui?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/DriverConfigPage.ui?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/KeyboardConfigPage.ui?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/PerformanceConfigPage.ui?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/RecordingConfigPage.ui?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ThemeConfigPage.ui?cvsroot=traverso&r1=1.9&r2=1.10

Patches:
Index: dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- dialogs/settings/Pages.cpp  9 Feb 2009 18:53:12 -0000       1.46
+++ dialogs/settings/Pages.cpp  20 Feb 2009 22:18:45 -0000      1.47
@@ -54,59 +54,26 @@
 AudioDriverPage::AudioDriverPage(QWidget *parent)
     : ConfigPage(parent)
 {
-       // AudioDriverPage manages it's own layout
-       // perhaps, should be done like the other pages as well
-       // anyhow, the created layout should be deleted before
-       // the new one is set.
-       delete layout();
-       
-       
-       QGroupBox* selectionGroup = new QGroupBox(tr("Driver Selection"));
        m_driverConfigPage = new DriverConfigPage(this);
+       mainLayout->addWidget(m_driverConfigPage);
        
-       QLabel* driverLabel = new QLabel(tr("Driver:"));
-       m_driverCombo = new QComboBox;
+       m_mainLayout = qobject_cast<QVBoxLayout*>(m_driverConfigPage->layout());
        
        QStringList drivers = audiodevice().get_available_drivers();
        foreach(const QString &name, drivers) {
-               m_driverCombo->addItem(name);
+               m_driverConfigPage->driverCombo->addItem(name);
        }
        
-       QHBoxLayout* driverLayout = new QHBoxLayout;
-       driverLayout->addWidget(driverLabel);
-       driverLayout->addWidget(m_driverCombo);
-       
-       QVBoxLayout* selectionLayout = new QVBoxLayout;
-       selectionLayout->addLayout(driverLayout);
-       selectionGroup->setLayout(selectionLayout);
-
-       QPushButton* restartDriverButton = new QPushButton(tr("Restart 
Driver"));
-       QHBoxLayout* restartDriverButtonLayout = new QHBoxLayout;
-       restartDriverButtonLayout->addStretch(1);
-       restartDriverButtonLayout->addWidget(restartDriverButton);
        
-       
-       m_mainLayout = new QVBoxLayout;
-       m_mainLayout->addWidget(selectionGroup);
-
-#if defined (PORTAUDIO_SUPPORT)
        m_portaudiodrivers = new PaDriverPage(this);
        m_mainLayout->addWidget(m_portaudiodrivers);
-#endif
        
-       m_mainLayout->addWidget(m_driverConfigPage);
-#if defined (ALSA_SUPPORT)
        m_alsadevices = new AlsaDevicesPage(this);
+       m_alsadevices->layout()->setMargin(0);
        m_mainLayout->addWidget(m_alsadevices);
-#endif
        
-       m_mainLayout->addLayout(restartDriverButtonLayout);
-       m_mainLayout->addStretch(1);
-       m_mainLayout->setSpacing(12);
-       setLayout(m_mainLayout);
-       
-       connect(m_driverCombo, SIGNAL(currentIndexChanged(QString)), this, 
SLOT(driver_combobox_index_changed(QString)));
-       connect(restartDriverButton, SIGNAL(clicked()), this, 
SLOT(restart_driver_button_clicked()));
+       connect(m_driverConfigPage->driverCombo, 
SIGNAL(currentIndexChanged(QString)), this, 
SLOT(driver_combobox_index_changed(QString)));
+       connect(m_driverConfigPage->restartDriverButton, SIGNAL(clicked()), 
this, SLOT(restart_driver_button_clicked()));
        
        load_config();
 }
@@ -121,7 +88,7 @@
        }
        config().set_property("Hardware", "buffersize", buffersize);
        
-       config().set_property("Hardware", "drivertype", 
m_driverCombo->currentText());
+       config().set_property("Hardware", "drivertype", 
m_driverConfigPage->driverCombo->currentText());
        
        int playback=1, capture=1;
        if(m_driverConfigPage->duplexComboBox->currentIndex() == 1) {
@@ -203,9 +170,9 @@
        bool playback = config().get_property("Hardware", "playback", 
1).toInt();
 
 
-       int driverTypeIndex = m_driverCombo->findText(driverType);
+       int driverTypeIndex = 
m_driverConfigPage->driverCombo->findText(driverType);
        if (driverTypeIndex >= 0) {
-               m_driverCombo->setCurrentIndex(driverTypeIndex);
+               
m_driverConfigPage->driverCombo->setCurrentIndex(driverTypeIndex);
        }
        
        driver_combobox_index_changed(driverType);
@@ -301,7 +268,7 @@
 
 void AudioDriverPage::restart_driver_button_clicked()
 {
-       QString driver = m_driverCombo->currentText();
+       QString driver = m_driverConfigPage->driverCombo->currentText();
        int rate = m_driverConfigPage->rateComboBox->currentText().toInt();
        int buffersize =  
m_driverConfigPage->periodBufferSizesList.at(m_driverConfigPage->latencyComboBox->currentIndex());
        
@@ -354,41 +321,33 @@
 
 void AudioDriverPage::driver_combobox_index_changed(QString driver)
 {
-       if (driver == "ALSA" || driver == "PortAudio" || driver == "Null 
Driver") {
-               m_driverConfigPage->driverConfigGroupBox->show();
-       } else {
-               m_driverConfigPage->driverConfigGroupBox->hide();
-       }
+       m_mainLayout->removeWidget(m_alsadevices);
+       m_mainLayout->removeWidget(m_portaudiodrivers);
+       m_mainLayout->removeWidget(m_driverConfigPage->jackGroupBox);
        
-#if defined (ALSA_SUPPORT)
        if (driver == "ALSA") {
                m_alsadevices->show();
-               
m_mainLayout->insertWidget(m_mainLayout->indexOf(m_driverConfigPage) + 1, 
m_alsadevices);
+               
m_mainLayout->insertWidget(m_mainLayout->indexOf(m_driverConfigPage->driverConfigGroupBox)
 + 1, m_alsadevices);
        } else {
                m_alsadevices->hide();
                m_mainLayout->removeWidget(m_alsadevices);
        }
-#endif
 
-#if defined (PORTAUDIO_SUPPORT)
        if (driver == "PortAudio") {
                m_portaudiodrivers->show();
-               
m_mainLayout->insertWidget(m_mainLayout->indexOf(m_driverConfigPage), 
m_portaudiodrivers);
+               
m_mainLayout->insertWidget(m_mainLayout->indexOf(m_driverConfigPage->driverConfigGroupBox),
 m_portaudiodrivers);
        } else {
                m_portaudiodrivers->hide();
                m_mainLayout->removeWidget(m_portaudiodrivers);
        }
-#endif
        
-#if defined(JACK_SUPPORT)
-       if (libjack_is_present && driver == "Jack") {
+       if (driver == "Jack") {
                m_driverConfigPage->jackGroupBox->show();
+               
m_mainLayout->insertWidget(m_mainLayout->indexOf(m_driverConfigPage->driverConfigGroupBox)
 + 1, m_driverConfigPage->jackGroupBox);
        } else {
                m_driverConfigPage->jackGroupBox->hide();
+               m_mainLayout->removeWidget(m_driverConfigPage->jackGroupBox);
        }
-#else
-       m_driverConfigPage->jackGroupBox->hide();
-#endif
 }
 
 
@@ -422,22 +381,18 @@
        update_latency_combobox();
 }
 
-#if defined (ALSA_SUPPORT)
 AlsaDevicesPage::AlsaDevicesPage(QWidget * parent)
        : QWidget(parent)
 {
        setupUi(this);
 }
-#endif
 
 
-#if defined (PORTAUDIO_SUPPORT)
 PaDriverPage::PaDriverPage(QWidget * parent)
        : QWidget(parent)
 {
        setupUi(this);
 }
-#endif
 
 
 ConfigPage::ConfigPage(QWidget * parent)
@@ -445,6 +400,7 @@
 {
        mainLayout = new QVBoxLayout;
        setLayout(mainLayout);
+       mainLayout->setMargin(0);
 }
 
 
@@ -552,7 +508,11 @@
 {
        m_themepage = new ThemeConfigPage(this);
        mainLayout->addWidget(m_themepage);
-       mainLayout->addStretch(1);
+       
+
+       foreach(const QString &lang, find_qm_files()) {
+               
m_themepage->languageComboBox->addItem(language_name_from_qm_file(lang), lang);
+       }
        
        load_config();
        m_themepage->create_connections();
@@ -796,7 +756,6 @@
 {
        m_configpage = new KeyboardConfigPage(this);
        mainLayout->addWidget(m_configpage);
-       mainLayout->addStretch(5);
        
        load_config();
 }
@@ -920,7 +879,6 @@
 {
        m_configpage = new PerformanceConfigPage(this);
        mainLayout->addWidget(m_configpage);
-       mainLayout->addStretch(5);
        
        load_config();
 }
@@ -959,6 +917,8 @@
 {
        setupUi(this);
 
+       // don't show it for now, it's not making sense with current opengl 
support
+       useOpenGLCheckBox->hide();
 #if defined (QT_OPENGL_SUPPORT)
        useOpenGLCheckBox->setEnabled(true);
 #else
@@ -978,7 +938,6 @@
 {
        m_config = new RecordingConfigPage(this);
        mainLayout->addWidget(m_config);
-       mainLayout->addStretch(5);
        
        load_config();
 }

Index: dialogs/settings/Pages.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- dialogs/settings/Pages.h    6 Aug 2008 16:47:21 -0000       1.11
+++ dialogs/settings/Pages.h    20 Feb 2009 22:18:46 -0000      1.12
@@ -30,14 +30,8 @@
 #include "ui_RecordingConfigPage.h"
 #include "ui_ThemeConfigPage.h"
 #include "ui_PerformanceConfigPage.h"
-
-#if defined (ALSA_SUPPORT)
 #include "ui_AlsaDevicesPage.h"
-#endif
-
-#if defined (PORTAUDIO_SUPPORT)
 #include "ui_PaDriverPage.h"
-#endif
 
 class PerformanceConfigPage : public QWidget, private Ui::PerformanceConfigPage
 {
@@ -65,7 +59,6 @@
 };
 
 
-#if defined (ALSA_SUPPORT)
 class AlsaDevicesPage : public QWidget, private Ui::AlsaDevicesPage
 {
 public:
@@ -73,10 +66,8 @@
 private:
        friend class AudioDriverPage;
 };
-#endif
 
 
-#if defined (PORTAUDIO_SUPPORT)
 class PaDriverPage : public QWidget, private Ui::PaDriverPage
 {
 public:
@@ -84,7 +75,6 @@
 private:
        friend class AudioDriverPage;
 };
-#endif
 
 
 class KeyboardConfigPage : public QWidget, private Ui::KeyboardConfigPage
@@ -171,15 +161,9 @@
 
 private:
        QVBoxLayout* m_mainLayout;
-       QComboBox* m_driverCombo;
        DriverConfigPage* m_driverConfigPage;
-#if defined (ALSA_SUPPORT)
        AlsaDevicesPage* m_alsadevices;
-#endif
-       
-#if defined (PORTAUDIO_SUPPORT)
        PaDriverPage* m_portaudiodrivers;
-#endif
        
        void load_config();
        

Index: dialogs/settings/SettingsDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/settings/SettingsDialog.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- dialogs/settings/SettingsDialog.cpp 24 May 2008 17:24:06 -0000      1.13
+++ dialogs/settings/SettingsDialog.cpp 20 Feb 2009 22:18:46 -0000      1.14
@@ -85,7 +85,7 @@
        
        connect(&config(), SIGNAL(configChanged()), this, 
SLOT(external_change_to_settings()));
        
-       resize(500, 400);
+       resize(500, 300);
 }
 
 void SettingsDialog::show_page(const QString & page)

Index: ui/AlsaDevicesPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/AlsaDevicesPage.ui,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ui/AlsaDevicesPage.ui       15 Jan 2008 19:51:50 -0000      1.4
+++ ui/AlsaDevicesPage.ui       20 Feb 2009 22:18:46 -0000      1.5
@@ -6,39 +6,51 @@
     <x>0</x>
     <y>0</y>
     <width>356</width>
-    <height>123</height>
+    <height>141</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>ALSA Device</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
       <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="margin" >
-         <number>0</number>
-        </property>
         <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="label" >
           <property name="toolTip" >
@@ -72,12 +84,21 @@
       </item>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <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="label_2" >
           <property name="toolTip" >
@@ -118,12 +139,21 @@
       </item>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <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="label_3" >
           <property name="toolTip" >

Index: ui/BehaviorConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/BehaviorConfigPage.ui,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ui/BehaviorConfigPage.ui    4 Oct 2008 12:12:24 -0000       1.11
+++ ui/BehaviorConfigPage.ui    20 Feb 2009 22:18:46 -0000      1.12
@@ -6,19 +6,13 @@
     <x>0</x>
     <y>0</y>
     <width>336</width>
-    <height>413</height>
+    <height>344</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <property name="margin" >
-    <number>0</number>
-   </property>
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
@@ -28,7 +22,16 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="margin" >
+      <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>
@@ -36,7 +39,16 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="margin" >
+        <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>
@@ -51,7 +63,7 @@
           <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" >
            <size>
             <width>20</width>
             <height>23</height>
@@ -104,7 +116,16 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="margin" >
+      <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>
@@ -112,7 +133,16 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="margin" >
+        <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>
@@ -149,7 +179,16 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="margin" >
+      <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>
@@ -171,7 +210,16 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="margin" >
+      <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>
@@ -179,7 +227,16 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="margin" >
+        <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>

Index: ui/DriverConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/DriverConfigPage.ui,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ui/DriverConfigPage.ui      21 Jun 2007 14:31:11 -0000      1.3
+++ ui/DriverConfigPage.ui      20 Feb 2009 22:18:46 -0000      1.4
@@ -5,39 +5,55 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>373</width>
-    <height>190</height>
+    <width>240</width>
+    <height>316</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>0</number>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Driver Selection</string>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Driver:</string>
    </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="driverCombo" />
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="driverConfigGroupBox" >
      <property name="title" >
       <string>Configure driver</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
+      <item>
+       <layout class="QHBoxLayout" >
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item>
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
+        <property name="leftMargin" >
          <number>0</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <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="label_2" >
@@ -78,12 +94,21 @@
       </item>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <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="label_2_2" >
           <property name="toolTip" >
@@ -139,12 +164,21 @@
       </item>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <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="label_7" >
           <property name="toolTip" >
@@ -167,6 +201,30 @@
         </item>
        </layout>
       </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="restartDriverButton" >
+          <property name="text" >
+           <string>Restart Driver</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>
@@ -176,12 +234,21 @@
       <string>Jack</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
       <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>
        <widget class="QCheckBox" name="jackTransportCheckBox" >
         <property name="text" >
@@ -192,6 +259,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>

Index: ui/KeyboardConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/KeyboardConfigPage.ui,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ui/KeyboardConfigPage.ui    11 Oct 2007 13:01:55 -0000      1.6
+++ ui/KeyboardConfigPage.ui    20 Feb 2009 22:18:46 -0000      1.7
@@ -5,55 +5,36 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>341</width>
-    <height>323</height>
+    <width>254</width>
+    <height>286</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="keyboardLabel" >
-     <property name="maximumSize" >
-      <size>
-       <width>100</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="pixmap" >
-      <pixmap/>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>Configure Keyboard</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
+      <item>
+       <layout class="QHBoxLayout" >
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item>
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
+        <property name="leftMargin" >
          <number>0</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <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="label" >
@@ -85,12 +66,12 @@
             <height>16777215</height>
            </size>
           </property>
-          <property name="maximum" >
-           <number>300</number>
-          </property>
           <property name="minimum" >
            <number>100</number>
           </property>
+          <property name="maximum" >
+           <number>300</number>
+          </property>
           <property name="value" >
            <number>200</number>
           </property>
@@ -100,12 +81,21 @@
       </item>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <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="label_3" >
           <property name="toolTip" >
@@ -137,12 +127,12 @@
             <height>16777215</height>
            </size>
           </property>
-          <property name="maximum" >
-           <number>300</number>
-          </property>
           <property name="minimum" >
            <number>100</number>
           </property>
+          <property name="maximum" >
+           <number>300</number>
+          </property>
           <property name="value" >
            <number>200</number>
           </property>
@@ -159,19 +149,22 @@
       <string>Keymap</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
+      <item>
+       <layout class="QHBoxLayout" >
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item>
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
+        <property name="leftMargin" >
          <number>0</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <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="label_2" >
@@ -203,18 +196,27 @@
          <bool>false</bool>
         </property>
         <property name="textInteractionFlags" >
-         <enum>Qt::NoTextInteraction</enum>
+         <set>Qt::NoTextInteraction</set>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <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>
          <spacer>
           <property name="orientation" >
@@ -247,6 +249,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>236</width>
+       <height>16</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>

Index: ui/PerformanceConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/PerformanceConfigPage.ui,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ui/PerformanceConfigPage.ui 15 Dec 2007 16:50:48 -0000      1.4
+++ ui/PerformanceConfigPage.ui 20 Feb 2009 22:18:46 -0000      1.5
@@ -6,39 +6,51 @@
     <x>0</x>
     <y>0</y>
     <width>343</width>
-    <height>232</height>
+    <height>234</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
       <string>Audio file buffering</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
       <property name="spacing" >
        <number>12</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="margin" >
-         <number>0</number>
-        </property>
         <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="label" >
           <property name="toolTip" >
@@ -69,9 +81,7 @@
         <item>
          <widget class="QDoubleSpinBox" name="bufferTimeSpinBox" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>1</hsizetype>
-            <vsizetype>0</vsizetype>
+           <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
             <horstretch>0</horstretch>
             <verstretch>1</verstretch>
            </sizepolicy>
@@ -79,12 +89,12 @@
           <property name="decimals" >
            <number>1</number>
           </property>
-          <property name="maximum" >
-           <double>3.000000000000000</double>
-          </property>
           <property name="minimum" >
            <double>0.400000000000000</double>
           </property>
+          <property name="maximum" >
+           <double>3.000000000000000</double>
+          </property>
           <property name="singleStep" >
            <double>0.100000000000000</double>
           </property>
@@ -97,12 +107,21 @@
       </item>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <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="reloadWarningLabel" >
           <property name="minimumSize" >
@@ -119,9 +138,7 @@
         <item>
          <widget class="QLabel" name="label_2" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>5</vsizetype>
+           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
             <horstretch>1</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -143,20 +160,38 @@
       <string>Painting</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
       <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="margin" >
-         <number>0</number>
-        </property>
         <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="label_4" >
           <property name="toolTip" >
@@ -190,12 +225,12 @@
             <height>16777215</height>
            </size>
           </property>
-          <property name="maximum" >
-           <number>50</number>
-          </property>
           <property name="minimum" >
            <number>10</number>
           </property>
+          <property name="maximum" >
+           <number>50</number>
+          </property>
           <property name="value" >
            <number>25</number>
           </property>
@@ -223,6 +258,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>

Index: ui/RecordingConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/RecordingConfigPage.ui,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ui/RecordingConfigPage.ui   24 Jan 2008 20:12:08 -0000      1.5
+++ ui/RecordingConfigPage.ui   20 Feb 2009 22:18:46 -0000      1.6
@@ -5,14 +5,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>425</width>
-    <height>304</height>
+    <width>443</width>
+    <height>311</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>5</hsizetype>
-    <vsizetype>5</vsizetype>
+   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
     <horstretch>0</horstretch>
     <verstretch>1</verstretch>
    </sizepolicy>
@@ -21,32 +19,44 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>9</number>
-   </property>
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>Recording</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
       <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="margin" >
-         <number>0</number>
-        </property>
         <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="label" >
           <property name="toolTip" >
@@ -98,20 +108,38 @@
          <string>WavPack options</string>
         </property>
         <layout class="QVBoxLayout" >
-         <property name="margin" >
-          <number>9</number>
-         </property>
          <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="margin" >
-            <number>0</number>
-           </property>
            <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="label_4" >
              <property name="text" >
@@ -153,12 +181,21 @@
       <string>Resampling</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
       <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>
        <widget class="QCheckBox" name="useResamplingCheckBox" >
         <property name="text" >
@@ -168,20 +205,38 @@
       </item>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
-        <item>
-         <layout class="QVBoxLayout" >
-          <property name="margin" >
+        <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="label_3" >
             <property name="text" >
@@ -200,12 +255,21 @@
         </item>
         <item>
          <layout class="QVBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
           <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="QComboBox" name="ontheflyResampleComboBox" >
             <item>
@@ -268,7 +332,7 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
+       <width>425</width>
        <height>16</height>
       </size>
      </property>

Index: ui/ThemeConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ThemeConfigPage.ui,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ui/ThemeConfigPage.ui       4 Oct 2008 12:12:24 -0000       1.9
+++ ui/ThemeConfigPage.ui       20 Feb 2009 22:18:46 -0000      1.10
@@ -5,20 +5,24 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>346</width>
-    <height>640</height>
+    <width>294</width>
+    <height>490</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2" >
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <property name="margin" >
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="currentIndex" >
     <number>0</number>
    </property>
+     <widget class="QWidget" name="tab" >
+      <attribute name="title" >
+       <string>Theme</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="sizePolicy" >
@@ -34,7 +38,16 @@
       <property name="spacing" >
        <number>12</number>
       </property>
-      <property name="margin" >
+          <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>
@@ -42,7 +55,16 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="margin" >
+            <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>
@@ -50,7 +72,16 @@
           <property name="spacing" >
            <number>6</number>
           </property>
-          <property name="margin" >
+              <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>
@@ -65,7 +96,7 @@
             <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+                <property name="sizeHint" >
              <size>
               <width>40</width>
               <height>20</height>
@@ -80,7 +111,16 @@
           <property name="spacing" >
            <number>6</number>
           </property>
-          <property name="margin" >
+              <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>
@@ -121,7 +161,16 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="margin" >
+            <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>
@@ -154,7 +203,16 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="margin" >
+            <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>
@@ -188,7 +246,16 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="margin" >
+          <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>
@@ -235,13 +302,22 @@
      <property name="title" >
       <string>Style Options</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout" >
+         <layout class="QVBoxLayout" >
       <item>
        <layout class="QHBoxLayout" >
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="margin" >
+            <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>
@@ -280,13 +356,33 @@
     </widget>
    </item>
    <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2" >
+      <attribute name="title" >
+       <string>Toolbars</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <item>
     <widget class="QGroupBox" name="toolbarGroupBox" >
      <property name="title" >
       <string>Toolbars</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3" >
+         <layout class="QVBoxLayout" >
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout" >
+           <layout class="QHBoxLayout" >
         <item>
          <widget class="QLabel" name="label_5" >
           <property name="text" >
@@ -300,7 +396,7 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3" >
+           <layout class="QHBoxLayout" >
         <item>
          <widget class="QLabel" name="label_7" >
           <property name="text" >
@@ -314,7 +410,7 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2" >
+           <layout class="QHBoxLayout" >
         <item>
          <widget class="QLabel" name="label_6" >
           <property name="text" >
@@ -327,8 +423,61 @@
         </item>
        </layout>
       </item>
+          <item>
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
      </layout>
     </widget>
+     <widget class="QWidget" name="tab_3" >
+      <attribute name="title" >
+       <string>Language</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <item>
+        <widget class="QGroupBox" name="groupBox_3" >
+         <property name="title" >
+          <string>Interface Language</string>
+         </property>
+         <layout class="QVBoxLayout" >
+          <item>
+           <widget class="QComboBox" name="languageComboBox" >
+            <property name="insertPolicy" >
+             <enum>QComboBox::InsertAlphabetically</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
    </item>
   </layout>
  </widget>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]