[PC-BSD Commits] r4697 - in pcbsd/trunk/XGUISource: . resources resources/bin resources/cardDetect resources/conf resources/conf/.fluxbox resources/nvidia-detect resources/scripts resources/settings resources/templates resources/templates/driver resources/templates/header resources/templates/scripts

svn at pcbsd.org svn at pcbsd.org
Wed Oct 21 19:15:50 PDT 2009


Author: kris
Date: 2009-10-21 19:15:49 -0700 (Wed, 21 Oct 2009)
New Revision: 4697

Added:
   pcbsd/trunk/XGUISource/resources/
   pcbsd/trunk/XGUISource/resources/bin/
   pcbsd/trunk/XGUISource/resources/bin/rundetect.sh
   pcbsd/trunk/XGUISource/resources/bin/setupconf.sh
   pcbsd/trunk/XGUISource/resources/cardDetect/
   pcbsd/trunk/XGUISource/resources/cardDetect/XF86Config.compat
   pcbsd/trunk/XGUISource/resources/cardDetect/XF86Config.default
   pcbsd/trunk/XGUISource/resources/cardDetect/XF86Config.vmware
   pcbsd/trunk/XGUISource/resources/cardDetect/x_config.sh
   pcbsd/trunk/XGUISource/resources/conf/
   pcbsd/trunk/XGUISource/resources/conf/.fluxbox/
   pcbsd/trunk/XGUISource/resources/conf/.fluxbox/init
   pcbsd/trunk/XGUISource/resources/conf/.fluxbox/keys
   pcbsd/trunk/XGUISource/resources/conf/.fluxbox/menu
   pcbsd/trunk/XGUISource/resources/conf/ttys.normal
   pcbsd/trunk/XGUISource/resources/conf/ttys.xsetup
   pcbsd/trunk/XGUISource/resources/conf/xorg.conf.basic
   pcbsd/trunk/XGUISource/resources/nvidia-detect/
   pcbsd/trunk/XGUISource/resources/nvidia-detect/detect-nvidia.sh
   pcbsd/trunk/XGUISource/resources/nvidia-detect/nvidia17-pciid.txt
   pcbsd/trunk/XGUISource/resources/nvidia-detect/nvidia9x-pciid.txt
   pcbsd/trunk/XGUISource/resources/scripts/
   pcbsd/trunk/XGUISource/resources/scripts/cardboard.sh
   pcbsd/trunk/XGUISource/resources/scripts/cardbus.sh
   pcbsd/trunk/XGUISource/resources/scripts/carddriver.sh
   pcbsd/trunk/XGUISource/resources/scripts/cardpciid.sh
   pcbsd/trunk/XGUISource/resources/scripts/cardvendor.sh
   pcbsd/trunk/XGUISource/resources/scripts/checkunprobed.sh
   pcbsd/trunk/XGUISource/resources/scripts/monmodel.sh
   pcbsd/trunk/XGUISource/resources/scripts/monvendor.sh
   pcbsd/trunk/XGUISource/resources/settings/
   pcbsd/trunk/XGUISource/resources/settings/README
   pcbsd/trunk/XGUISource/resources/settings/alias.txt
   pcbsd/trunk/XGUISource/resources/settings/definition.txt
   pcbsd/trunk/XGUISource/resources/settings/depth.txt
   pcbsd/trunk/XGUISource/resources/settings/drivers.txt
   pcbsd/trunk/XGUISource/resources/settings/refresh.txt
   pcbsd/trunk/XGUISource/resources/settings/resolutions.txt
   pcbsd/trunk/XGUISource/resources/templates/
   pcbsd/trunk/XGUISource/resources/templates/driver/
   pcbsd/trunk/XGUISource/resources/templates/driver/README
   pcbsd/trunk/XGUISource/resources/templates/driver/apm.template
   pcbsd/trunk/XGUISource/resources/templates/driver/ark.template
   pcbsd/trunk/XGUISource/resources/templates/driver/ati-3d-enable.template
   pcbsd/trunk/XGUISource/resources/templates/driver/ati.template
   pcbsd/trunk/XGUISource/resources/templates/driver/chips.template
   pcbsd/trunk/XGUISource/resources/templates/driver/cirrus.template
   pcbsd/trunk/XGUISource/resources/templates/driver/cyrix.template
   pcbsd/trunk/XGUISource/resources/templates/driver/dummy.template
   pcbsd/trunk/XGUISource/resources/templates/driver/fbdev.template
   pcbsd/trunk/XGUISource/resources/templates/driver/glint.template
   pcbsd/trunk/XGUISource/resources/templates/driver/i128.template
   pcbsd/trunk/XGUISource/resources/templates/driver/i740.template
   pcbsd/trunk/XGUISource/resources/templates/driver/i810.template
   pcbsd/trunk/XGUISource/resources/templates/driver/imstt.template
   pcbsd/trunk/XGUISource/resources/templates/driver/intel-3d-enable.template
   pcbsd/trunk/XGUISource/resources/templates/driver/intel.template
   pcbsd/trunk/XGUISource/resources/templates/driver/mach64.template
   pcbsd/trunk/XGUISource/resources/templates/driver/mga-3d-enable.template
   pcbsd/trunk/XGUISource/resources/templates/driver/mga.template
   pcbsd/trunk/XGUISource/resources/templates/driver/neomagic.template
   pcbsd/trunk/XGUISource/resources/templates/driver/newport.template
   pcbsd/trunk/XGUISource/resources/templates/driver/nsc.template
   pcbsd/trunk/XGUISource/resources/templates/driver/nv.template
   pcbsd/trunk/XGUISource/resources/templates/driver/nvidia.template
   pcbsd/trunk/XGUISource/resources/templates/driver/openchrome.template
   pcbsd/trunk/XGUISource/resources/templates/driver/r128.template
   pcbsd/trunk/XGUISource/resources/templates/driver/radeonhd.template
   pcbsd/trunk/XGUISource/resources/templates/driver/rendition.template
   pcbsd/trunk/XGUISource/resources/templates/driver/s3.template
   pcbsd/trunk/XGUISource/resources/templates/driver/s3virge.template
   pcbsd/trunk/XGUISource/resources/templates/driver/savage.template
   pcbsd/trunk/XGUISource/resources/templates/driver/siliconmotion.template
   pcbsd/trunk/XGUISource/resources/templates/driver/sis-intel.template
   pcbsd/trunk/XGUISource/resources/templates/driver/sis.template
   pcbsd/trunk/XGUISource/resources/templates/driver/tdfx.template
   pcbsd/trunk/XGUISource/resources/templates/driver/tga.template
   pcbsd/trunk/XGUISource/resources/templates/driver/trident.template
   pcbsd/trunk/XGUISource/resources/templates/driver/tseng.template
   pcbsd/trunk/XGUISource/resources/templates/driver/vesa.template
   pcbsd/trunk/XGUISource/resources/templates/driver/vga.template
   pcbsd/trunk/XGUISource/resources/templates/driver/via.template
   pcbsd/trunk/XGUISource/resources/templates/driver/vmware.template
   pcbsd/trunk/XGUISource/resources/templates/driver/voodoo.template
   pcbsd/trunk/XGUISource/resources/templates/header/
   pcbsd/trunk/XGUISource/resources/templates/header/README
   pcbsd/trunk/XGUISource/resources/templates/header/ati-3d-enable.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/ati.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/intel-3d-enable.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/intel.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/mga-3d-enable.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/nvidia.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/xorg.conf.generic
   pcbsd/trunk/XGUISource/resources/templates/scripts/
   pcbsd/trunk/XGUISource/resources/templates/scripts/README
   pcbsd/trunk/XGUISource/resources/templates/scripts/ati-3d-enable.sh
   pcbsd/trunk/XGUISource/resources/templates/scripts/intel-3d-enable.sh
   pcbsd/trunk/XGUISource/resources/templates/scripts/nvidia.sh
Removed:
   pcbsd/trunk/XGUISource/gtf.c
   pcbsd/trunk/XGUISource/refresh.txt
   pcbsd/trunk/XGUISource/resolutions.txt
Modified:
   pcbsd/trunk/XGUISource/XGUI.pro
   pcbsd/trunk/XGUISource/main.cpp
   pcbsd/trunk/XGUISource/xgui.cpp
   pcbsd/trunk/XGUISource/xgui.h
   pcbsd/trunk/XGUISource/xgui.ui
Log:

Large update to the XGUI tool:

* Added detection of older nvidia PCI ID's to set the recommended driver properly
* Converted tool to entirely QT 4.5 based
* Added all external scripts / resources to the XGUI tool, will remove these files from the system-overlay dir now, to try and tidy things up



Modified: pcbsd/trunk/XGUISource/XGUI.pro
===================================================================
--- pcbsd/trunk/XGUISource/XGUI.pro	2009-10-21 03:26:30 UTC (rev 4696)
+++ pcbsd/trunk/XGUISource/XGUI.pro	2009-10-22 02:15:49 UTC (rev 4697)
@@ -20,10 +20,30 @@
 
 INCLUDEPATH += /usr/local/kde4/include
 
-
 TARGET  = XGUI
 
 DESTDIR = /usr/PCBSD/xorg-gui/bin/
 
-QT +=qt3support
+bin.path = /usr/PCBSD/xorg-gui/bin/
+bin.files = resources/bin/*
+scripts.path = /usr/PCBSD/xorg-gui/scripts/
+scripts.files = resources/scripts/*
+conf.path = /usr/PCBSD/xorg-gui/conf/
+conf.files = resources/conf/*
+fluxbox.path = /usr/PCBSD/xorg-gui/conf/.fluxbox
+fluxbox.files = resources/conf/.fluxbox/*
+carddetect.path = /usr/PCBSD/xorg-gui/cardDetect
+carddetect.files = /resources/cardDetect/*
+settings.path = /usr/PCBSD/xorg-gui/settings
+settings.files = resources/settings/*
+temscripts.path = /usr/PCBSD/xorg-gui/templates/scripts/
+temscripts.files = resources/templates/scripts/*
+temheader.path = /usr/PCBSD/xorg-gui/templates/header/
+temheader.files = resources/templates/header/*
+temdriver.path = /usr/PCBSD/xorg-gui/templates/driver/
+temdriver.files = resources/templates/driver/*
+nvdetect.path = /usr/PCBSD/xorg-gui/nvidia-detect
+nvdetect.files = resources/nvidia-detect/*
 
+INSTALLS += bin scripts conf fluxbox carddetect settings temscripts temheader temdriver nvdetect
+

Modified: pcbsd/trunk/XGUISource/main.cpp
===================================================================
--- pcbsd/trunk/XGUISource/main.cpp	2009-10-21 03:26:30 UTC (rev 4696)
+++ pcbsd/trunk/XGUISource/main.cpp	2009-10-22 02:15:49 UTC (rev 4697)
@@ -35,7 +35,8 @@
 
     KApplication a;
 
-    QString nlang = QTextCodec::locale();
+    QLocale mylocale;
+    QString nlang = QLocale::languageToString(mylocale.language());
     // Check the language we are running in, and set the correct font
     if (  nlang == "zh_CN" ||  nlang == "zh_TW" )
     {
@@ -60,7 +61,7 @@
 	{
 
         QTranslator translator( 0 );
-        translator.load( QString("XGUISource_") + QTextCodec::locale(), "/PCBSD/LANGS/" );
+        translator.load( QString("XGUISource_") + QLocale::languageToString(mylocale.language()), "/PCBSD/LANGS/" );
         a.installTranslator( &translator );
 
         XGUI w;
@@ -80,7 +81,7 @@
     } 
 
     QTranslator translator( 0 );
-    translator.load( QString("XGUISource_") + QTextCodec::locale(), "/PCBSD/LANGS/" );
+    translator.load( QString("XGUISource_") + QLocale::languageToString(mylocale.language()), "/PCBSD/LANGS/" );
     a.installTranslator( &translator );
 
     XGUI w;


Property changes on: pcbsd/trunk/XGUISource/resources/bin/rundetect.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/bin/setupconf.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/cardDetect/x_config.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/nvidia-detect/detect-nvidia.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/scripts/cardboard.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/scripts/cardbus.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/scripts/carddriver.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/scripts/cardpciid.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/scripts/cardvendor.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/scripts/checkunprobed.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/scripts/monmodel.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/scripts/monvendor.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/templates/scripts/ati-3d-enable.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/templates/scripts/intel-3d-enable.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/XGUISource/resources/templates/scripts/nvidia.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: pcbsd/trunk/XGUISource/xgui.cpp
===================================================================
--- pcbsd/trunk/XGUISource/xgui.cpp	2009-10-21 03:26:30 UTC (rev 4696)
+++ pcbsd/trunk/XGUISource/xgui.cpp	2009-10-22 02:15:49 UTC (rev 4697)
@@ -12,13 +12,17 @@
 #include "xgui.h"
 #include <qfile.h>
 #include <qmessagebox.h>
+#include <QTextStream>
+#include <QDebug>
 
+#define PROGDIR QString("/usr/PCBSD/xorg-gui")
 
+
 void XGUI::ProgramInit()
 {
     
-    gridLayout->setMargin(0);
-    gridLayout->setSpacing(0);
+    //gridLayout_4->setMargin(0);
+    //gridLayout_4->setSpacing(0);
     
     // Load the screen resolutions
     loadResolutions();
@@ -40,6 +44,9 @@
 
     // Connect our Dual-head checkbox / slot
     connect(checkDualHead, SIGNAL( clicked() ), this, SLOT( dualChangedSlot() ) );
+    connect(checkMonitorSync, SIGNAL( clicked() ), this, SLOT( monitorChangedSlot() ) );
+    connect(pushApply, SIGNAL( clicked() ), this, SLOT( applySlot() ) );
+    connect(pushClose, SIGNAL( clicked() ), this, SLOT( closeSlot() ) );
 
     // Check out dualChangedSlot to ensure we disable the box by default
     dualChangedSlot();
@@ -49,43 +56,27 @@
 void XGUI::loadDeviceInformation()
 {
     QString tmp;
+    QString scriptdir = PROGDIR + "/scripts";
 
     // Get the card name and display it
-    QFile file( "/tmp/.cardboard" );
-    if ( file.open( IO_ReadOnly ) ) {
-        QTextStream stream( &file );
-             labelVideoCard->setText(stream.readLine()); // line of text excluding '\n'
-        file.close();
+    tmp = getLineFromCommandOutput(scriptdir + "/cardboard.sh");
+    labelVideoCard->setText(tmp);
+
+    // Get the Monitor Name and display it 
+    tmp = getLineFromCommandOutput(scriptdir + "/monmodel.sh");
+    if ( tmp == "Monitor Model" )
+    {
+       labelMonitor->setText(tr("Unknown Monitor"));
+    } else {
+       labelMonitor->setText(tmp);
     }
 
-   // Get the Monitor Name and display it 
-   QFile file2( "/tmp/.monmodel" );
-   if ( file2.open( IO_ReadOnly ) ) {
-        QTextStream stream2( &file2 );
-             tmp = stream2.readLine(); // line of text excluding '\n'
-             if ( tmp == "Monitor Model" )
-             {
-		labelMonitor->setText(tr("Unknown Monitor"));
-             } else {
-		labelMonitor->setText(tmp);
-             }
-        file2.close();
-   }
 
-
     // Get the detected driver, and make suggestion based upon it
-    QFile file3( "/tmp/.carddriver" );
-    if ( file3.open( IO_ReadOnly ) ) {
-        QTextStream stream3( &file3 );
-            tmp = stream3.readLine(); // line of text excluding '\n'
+    tmp = getLineFromCommandOutput(scriptdir + "/carddriver.sh");
+    // Figure out the suggested driver for this card
+    suggestDriver(tmp);
 
-            // Figure out the suggested driver for this card
-            suggestDriver(tmp);
-        file3.close();
-    }
-
-   
-
 }
 
 // Function which takes a supplied driver name, and makes suggestion for user
@@ -93,7 +84,19 @@
 {
    QString sugDriver, tmp;
    int z;
+   QString nvdir = PROGDIR + "/nvidia-detect";
 
+   // If we are using the "nv" driver, check which version of the nvidia-drivers are for this card
+   if ( driver == "nv" )
+   {
+     tmp = getLineFromCommandOutput(nvdir + "/detect-nvidia.sh");
+     // If we didn't get an unknown hit, set to the correct nvidia driver
+     if ( tmp != "UNKNOWN" )
+       driver = tmp;
+     qDebug() << driver;
+     qDebug() << tmp;
+   }
+
    // Loop through the drivers, and mark the suggested one
    z = comboDriver->count();
    for ( int i = 0; i < z; i++)
@@ -169,17 +172,17 @@
     
     comboResolution->clear();
 
-        QFile file( "/PCBSD/xorg-gui/settings/resolutions.txt" );
-    if ( file.open( IO_ReadOnly ) ) {
+        QFile file( PROGDIR + "/settings/resolutions.txt" );
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
              while ( !stream.atEnd() ) {
                line = stream.readLine(); // line of text excluding '\n'
-               comboResolution->insertItem(line);	    
-               comboDualRes->insertItem(line);	    
+               comboResolution->addItem(line);	    
+               comboDualRes->addItem(line);	    
                if (line == "1024x768" )
                {
-			comboResolution->setCurrentItem(i);
-			comboDualRes->setCurrentItem(i);
+			comboResolution->setCurrentIndex(i);
+			comboDualRes->setCurrentIndex(i);
                }
           i++;
 	}
@@ -196,14 +199,14 @@
     comboDriver->clear();
 
     // Now populate the combo box
-    QFile file( "/PCBSD/xorg-gui/settings/drivers.txt" );
-    if ( file.open( IO_ReadOnly ) ) {
+    QFile file( PROGDIR + "/settings/drivers.txt" );
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
              while ( !stream.atEnd() ) {
                line = stream.readLine(); // line of text excluding '\n'
-               comboDriver->insertItem(line);	    
+               comboDriver->addItem(line);	    
 	       if ( line == "vesa" ) {
-	   	 comboDriver->setCurrentItem(i);
+	   	 comboDriver->setCurrentIndex(i);
                }
 	       i++;
 	}
@@ -219,14 +222,14 @@
     
     comboDepth->clear();
 
-        QFile file( "/PCBSD/xorg-gui/settings/depth.txt" );
-    if ( file.open( IO_ReadOnly ) ) {
+        QFile file( PROGDIR + "/settings/depth.txt" );
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
              while ( !stream.atEnd() ) {
                line = stream.readLine(); // line of text excluding '\n'
-               comboDepth->insertItem(line);	    
+               comboDepth->addItem(line);	    
 	       if ( line == "24bit" ) {
-		  comboDepth->setCurrentItem(i);
+		  comboDepth->setCurrentIndex(i);
 	       }
 	 i++;
 
@@ -248,15 +251,15 @@
 	QString tmp;
 
 
-	QFile file( "/PCBSD/xorg-gui/.xsettings.sh" );
-    	if ( file.open( IO_WriteOnly ) ) {
+	QFile file( PROGDIR + "/.xsettings.sh" );
+    	if ( file.open( QIODevice::WriteOnly ) ) {
         QTextStream stream( &file );
             stream << "#!/bin/sh\n";
             stream << "RES=\"" + comboResolution->currentText() + "\"; export RES\n";
             stream << "DRIVER=\"" + comboDriver->currentText() + "\"; export DRIVER\n";
 
 	     	tmp = comboDepth->currentText();
-		tmp.truncate(tmp.find("bit"));
+		tmp.truncate(tmp.indexOf("bit"));
 	    stream << "DEPTH=\"" + tmp + "\"; export DEPTH\n";
    	    if ( checkMonitorSync->isChecked() )
     	    {
@@ -304,3 +307,24 @@
 	groupDualHead->setEnabled(FALSE);
     }
 }
+
+QString XGUI::getLineFromCommandOutput( QString command )
+{
+        FILE *file = popen(command.toLatin1(),"r");
+
+        char buffer[100];
+
+        QString line = "";
+        char firstChar;
+
+        if ((firstChar = fgetc(file)) != -1){
+                line += firstChar;
+                line += fgets(buffer,100,file);
+        }
+
+        
+        pclose(file);
+
+        return line.simplified();
+}
+

Modified: pcbsd/trunk/XGUISource/xgui.h
===================================================================
--- pcbsd/trunk/XGUISource/xgui.h	2009-10-21 03:26:30 UTC (rev 4696)
+++ pcbsd/trunk/XGUISource/xgui.h	2009-10-22 02:15:49 UTC (rev 4697)
@@ -3,15 +3,15 @@
 
 #include <qfile.h>
 #include <qmessagebox.h>
-#include <Q3MainWindow>
+#include <QMainWindow>
 #include "ui_xgui.h"
 
-class XGUI : public Q3MainWindow, private Ui::XGUI
+class XGUI : public QMainWindow, private Ui::XGUI
 {
         Q_OBJECT
 
 public:
-        XGUI() : Q3MainWindow()
+        XGUI() : QMainWindow()
         {
           setupUi(this);
         }
@@ -33,8 +33,8 @@
     void loadDepth();
     void checkUnprobedMonitor();
     void suggestDriver(QString driver);
+    QString getLineFromCommandOutput(QString command);
 
-
 signals:
 
 } ;

Modified: pcbsd/trunk/XGUISource/xgui.ui
===================================================================
--- pcbsd/trunk/XGUISource/xgui.ui	2009-10-21 03:26:30 UTC (rev 4696)
+++ pcbsd/trunk/XGUISource/xgui.ui	2009-10-22 02:15:49 UTC (rev 4697)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>XGUI</class>
- <widget class="Q3MainWindow" name="XGUI">
+ <widget class="QMainWindow" name="XGUI">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>564</width>
-    <height>461</height>
+    <width>565</width>
+    <height>431</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -16,71 +16,560 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>564</width>
-    <height>461</height>
-   </size>
+  <property name="contextMenuPolicy">
+   <enum>Qt::DefaultContextMenu</enum>
   </property>
-  <property name="maximumSize">
-   <size>
-    <width>1000</width>
-    <height>760</height>
-   </size>
-  </property>
-  <property name="baseSize">
-   <size>
-    <width>0</width>
-    <height>0</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>Display Settings</string>
   </property>
-  <widget class="QWidget" name="widget">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>564</width>
-     <height>461</height>
-    </rect>
-   </property>
-   <layout class="QGridLayout" name="gridLayout_2">
-    <item row="0" column="2" rowspan="3">
-     <spacer name="spacer5_2_2_3_2_2">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeType">
-       <enum>QSizePolicy::Fixed</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>6</width>
-        <height>360</height>
-       </size>
-      </property>
-     </spacer>
+  <property name="windowIcon">
+   <iconset resource="XGUI.qrc">
+    <normaloff>:/video-display.png</normaloff>:/video-display.png</iconset>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QGridLayout" name="gridLayout_4">
+    <item row="0" column="0">
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="pixmapLabel1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Plain</enum>
+        </property>
+        <property name="pixmap">
+         <pixmap resource="XGUI.qrc">:/monitor.png</pixmap>
+        </property>
+        <property name="scaledContents">
+         <bool>true</bool>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignTop</set>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="Line" name="line2">
+        <property name="frameShape">
+         <enum>QFrame::VLine</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>5</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
     </item>
-    <item row="0" column="3">
-     <spacer name="spacer11">
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <property name="sizeType">
-       <enum>QSizePolicy::Fixed</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>330</width>
-        <height>16</height>
-       </size>
-      </property>
-     </spacer>
+    <item row="0" column="1">
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <spacer name="spacer11">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>330</width>
+          <height>16</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="0">
+       <widget class="QTabWidget" name="tabWidget">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <widget class="QWidget" name="tab_2">
+         <attribute name="title">
+          <string>General</string>
+         </attribute>
+         <layout class="QGridLayout" name="gridLayout_5">
+          <item row="0" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="QLabel" name="label_5">
+              <property name="text">
+               <string>Video Card:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelVideoCard">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="pixmapLabel1_6">
+              <property name="minimumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="XGUI.qrc">:/kcontrol.png</pixmap>
+              </property>
+              <property name="scaledContents">
+               <bool>true</bool>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_5">
+            <item>
+             <widget class="QLabel" name="label_6">
+              <property name="text">
+               <string>Monitor:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelMonitor">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="pixmapLabel1_7">
+              <property name="minimumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="XGUI.qrc">:/video-display.png</pixmap>
+              </property>
+              <property name="scaledContents">
+               <bool>true</bool>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="0">
+           <layout class="QHBoxLayout" name="_9">
+            <item>
+             <widget class="QLabel" name="textLabel1_5">
+              <property name="text">
+               <string>Screen Resolution:</string>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="comboResolution">
+              <item>
+               <property name="text">
+                <string>1024x768</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="pixmapLabel1_3">
+              <property name="minimumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="XGUI.qrc">:/randr.png</pixmap>
+              </property>
+              <property name="scaledContents">
+               <bool>true</bool>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="3" column="0">
+           <layout class="QHBoxLayout" name="_10">
+            <item>
+             <widget class="QLabel" name="textLabel1_6">
+              <property name="text">
+               <string>Color Depth:</string>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="comboDepth">
+              <item>
+               <property name="text">
+                <string>24bits</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="pixmapLabel1_2_4">
+              <property name="minimumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="XGUI.qrc">:/colors.png</pixmap>
+              </property>
+              <property name="scaledContents">
+               <bool>true</bool>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="4" column="0">
+           <layout class="QHBoxLayout" name="_11">
+            <item>
+             <widget class="QLabel" name="textLabel1_7">
+              <property name="text">
+               <string>Video Driver</string>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="comboDriver"/>
+            </item>
+            <item>
+             <widget class="QLabel" name="pixmapLabel1_2_7">
+              <property name="minimumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="XGUI.qrc">:/kcontrol.png</pixmap>
+              </property>
+              <property name="scaledContents">
+               <bool>true</bool>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="6" column="0">
+           <spacer name="spacer2_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Preferred</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>16</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="labelRecDriver">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="TabPage_2">
+         <attribute name="title">
+          <string>Advanced</string>
+         </attribute>
+         <layout class="QGridLayout" name="gridLayout_6">
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="checkMonitorSync">
+            <property name="text">
+             <string>Monitor Settings</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="checkDualHead">
+            <property name="text">
+             <string>Enable Dual-Head support</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QGroupBox" name="groupDualHead">
+            <property name="title">
+             <string/>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_2">
+             <item row="0" column="0">
+              <layout class="QHBoxLayout" name="horizontalLayout_6">
+               <item>
+                <widget class="QLabel" name="label_7">
+                 <property name="text">
+                  <string>Monitor Resolution:</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QComboBox" name="comboDualRes"/>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_8">
+            <property name="text">
+             <string>Dual-Head support is designed for systems with one video card and two monitors. Other setups may be achived by editing /etc/X11/xorg.conf</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QGroupBox" name="groupMonitor">
+            <property name="title">
+             <string/>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_8">
+             <item row="0" column="0">
+              <layout class="QHBoxLayout" name="_13">
+               <item>
+                <widget class="QLabel" name="textLabel1_8">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="text">
+                  <string>Horizontal Sync:</string>
+                 </property>
+                 <property name="wordWrap">
+                  <bool>false</bool>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLineEdit" name="lineHorz">
+                 <property name="text">
+                  <string>28.0-78.0</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignHCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLabel" name="pixmapLabel1_2_8">
+                 <property name="minimumSize">
+                  <size>
+                   <width>32</width>
+                   <height>32</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>32</width>
+                   <height>32</height>
+                  </size>
+                 </property>
+                 <property name="pixmap">
+                  <pixmap resource="XGUI.qrc">:/smserver.png</pixmap>
+                 </property>
+                 <property name="scaledContents">
+                  <bool>true</bool>
+                 </property>
+                 <property name="wordWrap">
+                  <bool>false</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item row="1" column="0">
+              <layout class="QHBoxLayout" name="_14">
+               <item>
+                <widget class="QLabel" name="textLabel1_4_3">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="text">
+                  <string>Vertical Refresh:</string>
+                 </property>
+                 <property name="wordWrap">
+                  <bool>false</bool>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLineEdit" name="lineVertRefresh">
+                 <property name="text">
+                  <string>50.0-76.0</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignHCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLabel" name="pixmapLabel1_2_6_3">
+                 <property name="minimumSize">
+                  <size>
+                   <width>32</width>
+                   <height>32</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>32</width>
+                   <height>32</height>
+                  </size>
+                 </property>
+                 <property name="pixmap">
+                  <pixmap resource="XGUI.qrc">:/smserver.png</pixmap>
+                 </property>
+                 <property name="scaledContents">
+                  <bool>true</bool>
+                 </property>
+                 <property name="wordWrap">
+                  <bool>false</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <spacer name="spacer12">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Preferred</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>327</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
     </item>
-    <item row="0" column="4" rowspan="3">
-     <spacer name="spacer5_2_2_3_2">
+    <item row="0" column="2">
+     <spacer name="horizontalSpacer_2">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
@@ -89,51 +578,45 @@
       </property>
       <property name="sizeHint" stdset="0">
        <size>
-        <width>6</width>
-        <height>360</height>
+        <width>10</width>
+        <height>20</height>
        </size>
       </property>
      </spacer>
     </item>
-    <item row="2" column="3">
-     <spacer name="spacer12">
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
+    <item row="1" column="0" colspan="2">
+     <widget class="Line" name="line1">
+      <property name="frameShape">
+       <enum>QFrame::HLine</enum>
       </property>
-      <property name="sizeType">
-       <enum>QSizePolicy::Fixed</enum>
+      <property name="frameShadow">
+       <enum>QFrame::Sunken</enum>
       </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>327</width>
-        <height>17</height>
-       </size>
-      </property>
-     </spacer>
+     </widget>
     </item>
-    <item row="4" column="0" colspan="4">
+    <item row="2" column="0" colspan="2">
      <spacer name="spacer5_2">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
       <property name="sizeType">
-       <enum>QSizePolicy::MinimumExpanding</enum>
+       <enum>QSizePolicy::Preferred</enum>
       </property>
       <property name="sizeHint" stdset="0">
        <size>
         <width>530</width>
-        <height>6</height>
+        <height>13</height>
        </size>
       </property>
      </spacer>
     </item>
-    <item row="5" column="0" colspan="4">
-     <layout class="QHBoxLayout">
+    <item row="3" column="0" colspan="2">
+     <layout class="QHBoxLayout" name="_8">
       <property name="margin">
        <number>0</number>
       </property>
       <item>
-       <spacer name="spacer1">
+       <spacer name="spacer1_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -169,7 +652,7 @@
        </widget>
       </item>
       <item>
-       <spacer name="spacer4">
+       <spacer name="spacer4_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -186,573 +669,11 @@
       </item>
      </layout>
     </item>
-    <item row="0" column="0" rowspan="3">
-     <widget class="QLabel" name="pixmapLabel1">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Plain</enum>
-      </property>
-      <property name="pixmap">
-       <pixmap resource="XGUI.qrc">:/monitor.png</pixmap>
-      </property>
-      <property name="scaledContents">
-       <bool>true</bool>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignTop</set>
-      </property>
-      <property name="wordWrap">
-       <bool>false</bool>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1" rowspan="3">
-     <widget class="Line" name="line2">
-      <property name="frameShape">
-       <enum>QFrame::VLine</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Sunken</enum>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="0" colspan="4">
-     <widget class="Line" name="line1">
-      <property name="frameShape">
-       <enum>QFrame::HLine</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Sunken</enum>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="3">
-     <widget class="QTabWidget" name="tabWidget2">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="currentIndex">
-       <number>0</number>
-      </property>
-      <widget class="QWidget" name="tab">
-       <attribute name="title">
-        <string>General</string>
-       </attribute>
-       <layout class="QGridLayout" name="gridLayout_3">
-        <item row="0" column="0">
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
-          <item>
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Video Card:</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="labelVideoCard">
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="pixmapLabel1_5">
-            <property name="minimumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="pixmap">
-             <pixmap resource="XGUI.qrc">:/kcontrol.png</pixmap>
-            </property>
-            <property name="scaledContents">
-             <bool>true</bool>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="1" column="0">
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>Monitor:</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="labelMonitor">
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="pixmapLabel1_4">
-            <property name="minimumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="pixmap">
-             <pixmap resource="XGUI.qrc">:/video-display.png</pixmap>
-            </property>
-            <property name="scaledContents">
-             <bool>true</bool>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="2" column="0">
-         <layout class="QHBoxLayout">
-          <item>
-           <widget class="QLabel" name="textLabel1">
-            <property name="text">
-             <string>Screen Resolution:</string>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="comboResolution">
-            <item>
-             <property name="text">
-              <string>1024x768</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="pixmapLabel1_2">
-            <property name="minimumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="pixmap">
-             <pixmap resource="XGUI.qrc">:/randr.png</pixmap>
-            </property>
-            <property name="scaledContents">
-             <bool>true</bool>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="3" column="0">
-         <layout class="QHBoxLayout">
-          <item>
-           <widget class="QLabel" name="textLabel1_2">
-            <property name="text">
-             <string>Color Depth:</string>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="comboDepth">
-            <item>
-             <property name="text">
-              <string>24bits</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="pixmapLabel1_2_3">
-            <property name="minimumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="pixmap">
-             <pixmap resource="XGUI.qrc">:/colors.png</pixmap>
-            </property>
-            <property name="scaledContents">
-             <bool>true</bool>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="4" column="0">
-         <layout class="QHBoxLayout">
-          <item>
-           <widget class="QLabel" name="textLabel1_3">
-            <property name="text">
-             <string>Video Driver</string>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="comboDriver"/>
-          </item>
-          <item>
-           <widget class="QLabel" name="pixmapLabel1_2_5">
-            <property name="minimumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>32</width>
-              <height>32</height>
-             </size>
-            </property>
-            <property name="pixmap">
-             <pixmap resource="XGUI.qrc">:/kcontrol.png</pixmap>
-            </property>
-            <property name="scaledContents">
-             <bool>true</bool>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="6" column="0">
-         <spacer name="spacer2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>16</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="5" column="0">
-         <widget class="QLabel" name="labelRecDriver">
-          <property name="text">
-           <string/>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-          <property name="wordWrap">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="TabPage">
-       <attribute name="title">
-        <string>Advanced</string>
-       </attribute>
-       <layout class="QGridLayout" name="gridLayout_4">
-        <item row="0" column="0">
-         <widget class="QCheckBox" name="checkMonitorSync">
-          <property name="text">
-           <string>Monitor Settings</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="Q3GroupBox" name="groupMonitor">
-          <property name="title">
-           <string/>
-          </property>
-          <layout class="QGridLayout">
-           <item row="0" column="0">
-            <layout class="QHBoxLayout">
-             <item>
-              <widget class="QLabel" name="textLabel1_4">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>Horizontal Sync:</string>
-               </property>
-               <property name="wordWrap">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="lineHorz">
-               <property name="text">
-                <string>28.0-78.0</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignHCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="pixmapLabel1_2_6">
-               <property name="minimumSize">
-                <size>
-                 <width>32</width>
-                 <height>32</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>32</width>
-                 <height>32</height>
-                </size>
-               </property>
-               <property name="pixmap">
-                <pixmap resource="XGUI.qrc">:/smserver.png</pixmap>
-               </property>
-               <property name="scaledContents">
-                <bool>true</bool>
-               </property>
-               <property name="wordWrap">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="1" column="0">
-            <layout class="QHBoxLayout">
-             <item>
-              <widget class="QLabel" name="textLabel1_4_2">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>Vertical Refresh:</string>
-               </property>
-               <property name="wordWrap">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="lineVertRefresh">
-               <property name="text">
-                <string>50.0-76.0</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignHCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="pixmapLabel1_2_6_2">
-               <property name="minimumSize">
-                <size>
-                 <width>32</width>
-                 <height>32</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>32</width>
-                 <height>32</height>
-                </size>
-               </property>
-               <property name="pixmap">
-                <pixmap resource="XGUI.qrc">:/smserver.png</pixmap>
-               </property>
-               <property name="scaledContents">
-                <bool>true</bool>
-               </property>
-               <property name="wordWrap">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QCheckBox" name="checkDualHead">
-          <property name="text">
-           <string>Enable Dual-Head support</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QGroupBox" name="groupDualHead">
-          <property name="title">
-           <string/>
-          </property>
-          <layout class="QGridLayout" name="gridLayout">
-           <item row="0" column="0">
-            <layout class="QHBoxLayout" name="horizontalLayout">
-             <item>
-              <widget class="QLabel" name="label_4">
-               <property name="text">
-                <string>Monitor Resolution:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="comboDualRes"/>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_3">
-          <property name="text">
-           <string>Dual-Head support is designed for systems with one video card and two monitors. Other setups may be achived by editing /etc/X11/xorg.conf</string>
-          </property>
-          <property name="wordWrap">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-    </item>
    </layout>
   </widget>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
- <customwidgets>
-  <customwidget>
-   <class>Q3GroupBox</class>
-   <extends>QGroupBox</extends>
-   <header>Qt3Support/Q3GroupBox</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Q3MainWindow</class>
-   <extends>QWidget</extends>
-   <header>q3mainwindow.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <includes>
-  <include location="local">qfile.h</include>
-  <include location="local">qmessagebox.h</include>
- </includes>
  <resources>
   <include location="XGUI.qrc"/>
  </resources>
- <connections>
-  <connection>
-   <sender>pushApply</sender>
-   <signal>clicked()</signal>
-   <receiver>XGUI</receiver>
-   <slot>applySlot()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>pushClose</sender>
-   <signal>clicked()</signal>
-   <receiver>XGUI</receiver>
-   <slot>closeSlot()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkMonitorSync</sender>
-   <signal>clicked()</signal>
-   <receiver>XGUI</receiver>
-   <slot>monitorChangedSlot()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>



More information about the Commits mailing list