[PC-BSD Commits] r17565 - pcbsd/current/src-qt4/pc-xgui

[svn at pcbsd.org]

Author: kris
Date: 2012-07-02 16:15:59 +0000 (Mon, 02 Jul 2012)
New Revision: 17565

Modified:
   pcbsd/current/src-qt4/pc-xgui/dialogconfirm.cpp
   pcbsd/current/src-qt4/pc-xgui/dialogconfirm.ui
   pcbsd/current/src-qt4/pc-xgui/main.cpp
Log:

Fix the size and the button text for the xorg confirmation GUI



Modified: pcbsd/current/src-qt4/pc-xgui/dialogconfirm.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/dialogconfirm.cpp	2012-07-02 16:12:11 UTC (rev 17564)
+++ pcbsd/current/src-qt4/pc-xgui/dialogconfirm.cpp	2012-07-02 16:15:59 UTC (rev 17565)
@@ -19,6 +19,7 @@
    if ( ! yesno ) {
      pushNo->setEnabled(false);
      pushNo->setVisible(false);
+     pushYes->setText(tr("&Ok"));
    }
 
    if ( ac ) {

Modified: pcbsd/current/src-qt4/pc-xgui/dialogconfirm.ui
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/dialogconfirm.ui	2012-07-02 16:12:11 UTC (rev 17564)
+++ pcbsd/current/src-qt4/pc-xgui/dialogconfirm.ui	2012-07-02 16:15:59 UTC (rev 17565)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>315</width>
-    <height>111</height>
+    <width>403</width>
+    <height>178</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,7 +23,7 @@
       <string>Do you wish to use this resolution?</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <set>Qt::AlignHCenter|Qt::AlignTop</set>
      </property>
      <property name="wordWrap">
       <bool>true</bool>

Modified: pcbsd/current/src-qt4/pc-xgui/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/main.cpp	2012-07-02 16:12:11 UTC (rev 17564)
+++ pcbsd/current/src-qt4/pc-xgui/main.cpp	2012-07-02 16:15:59 UTC (rev 17565)
@@ -49,7 +49,7 @@
           QRect dimensions = desk->screenGeometry();
           int wid = dimensions.width();     // returns desktop width
           int hig = dimensions.height();    // returns desktop height
-          d.setGeometry((wid/2) - (315/2), (hig/2) - (111/2), 315, 111);
+          d.setGeometry((wid/2) - (355/2), (hig/2) - (151/2), 355, 151);
           d.ProgramInit(QObject::tr("Keep these display settings?"), true, true);
           //d.setStyle(QStyleFactory::create( "Plastik" ));
           d.show();
@@ -63,7 +63,7 @@
           QRect dimensions = desk->screenGeometry();
           int wid = dimensions.width();     // returns desktop width
           int hig = dimensions.height();    // returns desktop height
-          d.setGeometry((wid/2) - (315/2), (hig/2) - (111/2), 315, 111);
+          d.setGeometry((wid/2) - (355/2), (hig/2) - (160/2), 355, 160);
           d.ProgramInit(QObject::tr("The previous attempt failed, please check your settings and try again."), false, false);
           //d.setStyle(QStyleFactory::create( "Plastik" ));
           d.show();
@@ -77,7 +77,7 @@
           QRect dimensions = desk->screenGeometry();
           int wid = dimensions.width();     // returns desktop width
           int hig = dimensions.height();    // returns desktop height
-          d.setGeometry((wid/2) - (315/2), (hig/2) - (111/2), 315, 111);
+          d.setGeometry((wid/2) - (355/2), (hig/2) - (160/2), 355, 160);
           d.ProgramInit(QObject::tr("Your display has been automatically configured. Keep these settings?"), false, true);
           //d.setStyle(QStyleFactory::create( "Plastik" ));
           d.show();