[PC-BSD Commits] r8194 - pcbsd/current/src-qt4/pc-sysinstaller

[svn at pcbsd.org]

Author: kris
Date: 2010-12-10 09:33:48 -0800 (Fri, 10 Dec 2010)
New Revision: 8194

Modified:
   pcbsd/current/src-qt4/pc-sysinstaller/sys-userwidget.cpp
   pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
   pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.ui
Log:

Remove the auto-login user checkbox from current installer



Modified: pcbsd/current/src-qt4/pc-sysinstaller/sys-userwidget.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sys-userwidget.cpp	2010-12-10 17:28:01 UTC (rev 8193)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sys-userwidget.cpp	2010-12-10 17:33:48 UTC (rev 8194)
@@ -288,8 +288,6 @@
       userList << "userShell=" + listUsers.at(i).at(3);
       userList << "userHome=/home/" + listUsers.at(i).at(0);
       userList << "userGroups=wheel,operator";
-      if(checkAutoLogon->isChecked() && i == 0)
-        userList << "autoLoginUser=" + listUsers.at(i).at(0);
       userList << "commitUser";
       userList << "";
       summaryList << listUsers.at(i).at(1) + " (" + listUsers.at(i).at(0) + ")";

Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-12-10 17:28:01 UTC (rev 8193)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-12-10 17:33:48 UTC (rev 8194)
@@ -345,15 +345,6 @@
    if ( stackWidget->currentIndex() == 5 && ! haveMetaDesktopChecked() )
       return;
 
-
-   // Check if we are doing FreeBSD install and hide a checkbox
-   if ( stackWidget->currentIndex() == 3 \
-     && radioInstallFreeBSD->isChecked() \
-     && radioInstall->isChecked() )
-    checkAutoLogon->setHidden(true);  
-   else
-    checkAutoLogon->setHidden(false);  
-
    // Generate the config and display the summary on the next page
    if ( stackWidget->currentIndex() == 6 )
      startConfigGen();

Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.ui
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.ui	2010-12-10 17:28:01 UTC (rev 8193)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.ui	2010-12-10 17:33:48 UTC (rev 8194)
@@ -993,7 +993,7 @@
                 </palette>
                </property>
                <property name="currentIndex">
-                <number>3</number>
+                <number>4</number>
                </property>
                <widget class="QWidget" name="aiStep0">
                 <property name="palette">
@@ -2100,8 +2100,8 @@
                       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Bitstream Vera Sans'; font-size:10pt;&quot;&gt;Welcome to PC-BSD! You may get started above, or click the Help button for more information on each screen. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Bitstream Vera Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Welcome to PC-BSD! You may get started above, or click the Help button for more information on each screen. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                      </property>
                     </widget>
                    </item>
@@ -8872,7 +8872,7 @@
                     <widget class="QCheckBox" name="checkDiskGPT">
                      <property name="toolTip">
                       <string>Check to use GPT/EFI partition scheme for dedicated disks.
-Warning: May not work with older BIOS / Motherboards. </string>
+Warning: May not work with older BIOS / Motherboards.</string>
                      </property>
                      <property name="text">
                       <string>Partition with GPT for full disk install</string>
@@ -8937,16 +8937,6 @@
                    </property>
                   </spacer>
                  </item>
-                 <item row="3" column="1">
-                  <widget class="QCheckBox" name="checkAutoLogon">
-                   <property name="text">
-                    <string>Auto-login User (The first user listed will be logged on automatically)</string>
-                   </property>
-                   <property name="checked">
-                    <bool>false</bool>
-                   </property>
-                  </widget>
-                 </item>
                  <item row="0" column="1">
                   <widget class="QGroupBox" name="groupBox">
                    <property name="font">
@@ -10176,7 +10166,6 @@
   <tabstop>pushAddUser</tabstop>
   <tabstop>listWidgetUsers</tabstop>
   <tabstop>pushRemoveUser</tabstop>
-  <tabstop>checkAutoLogon</tabstop>
   <tabstop>abortButton</tabstop>
   <tabstop>backButton</tabstop>
   <tabstop>nextButton</tabstop>