[PC-BSD Commits] r6000 - pcbsd/trunk/SysInstaller

svn at pcbsd.org svn at pcbsd.org
Wed Jan 13 14:44:37 PST 2010


Author: kris
Date: 2010-01-13 14:44:36 -0800 (Wed, 13 Jan 2010)
New Revision: 6000

Modified:
   pcbsd/trunk/SysInstaller/sys-keyboardwidget.cpp
   pcbsd/trunk/SysInstaller/sysinstaller.cpp
   pcbsd/trunk/SysInstaller/sysinstaller.h
   pcbsd/trunk/SysInstaller/sysinstaller.ui
Log:

Cleanup the default keyboard selection screen, don't need the "small" checkbox some folks
have complained about ;)



Modified: pcbsd/trunk/SysInstaller/sys-keyboardwidget.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sys-keyboardwidget.cpp	2010-01-13 22:16:12 UTC (rev 5999)
+++ pcbsd/trunk/SysInstaller/sys-keyboardwidget.cpp	2010-01-13 22:44:36 UTC (rev 6000)
@@ -10,17 +10,16 @@
 
   // Set the default keyboard stuff
   setKbDefaults();
-  checkKbDefault->setChecked(true);
   slotCurrentKbLayoutChanged(0);
-  groupKeyboard->setEnabled(false);
+  groupKeyboard->setEnabled(true);
 
+
   // Connect all our slots
   connect(listKbLayouts, SIGNAL(currentRowChanged(int)), this, SLOT(slotCurrentKbLayoutChanged(int)));
   connect(listKbVariants,SIGNAL(currentRowChanged(int)), this, SLOT(slotCurrentKbVariantChanged(int)));
   connect(listKbLayouts, SIGNAL(itemSelectionChanged()), this, SLOT(slotSelectedKbItemChanged()));
   connect(listKbVariants,SIGNAL(itemSelectionChanged()), this, SLOT(slotSelectedKbItemChanged()));
   connect(comboBoxKeyboardModel,SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateKbOnSys()));
-  connect(checkKbDefault,SIGNAL(stateChanged(int)), this, SLOT(slotDefaultKbChecked(int)));
 
 }
 
@@ -89,25 +88,9 @@
 
 void SysInstaller::slotSelectedKbItemChanged()
 {
-    checkKbDefault->setChecked(false);
     lineKbTest->clear();
 }
 
-void SysInstaller::slotDefaultKbChecked(int state)
-{
-   if (state == Qt::Checked) {
-     groupKeyboard->setEnabled(false);
-     QString model, layout, variant;
-     model = "pc104";
-     layout = "us";
-     variant = "";
-     Scripts::Backend::changeKbMap(model, layout, variant);
-   } else {
-     groupKeyboard->setEnabled(true);
-     setKbDefaults();
-   }
-}
-
 void SysInstaller::setKbDefaults()
 {
     // set the keyboard layout and variant defaults; :)

Modified: pcbsd/trunk/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-01-13 22:16:12 UTC (rev 5999)
+++ pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-01-13 22:44:36 UTC (rev 6000)
@@ -580,31 +580,26 @@
   }
 
   // Now figure out of we need to set custom keyboard layouts
-  if ( ! checkKbDefault->isChecked() )
+  tmpList << "";
+  tmpList << "# Keyboard Layout Options";
+  tmp = comboBoxKeyboardModel->currentText();
+  tmp.truncate(tmp.indexOf(")"));
+  tmp = tmp.remove(0, tmp.indexOf(" (") + 2 );
+  tmpList << "localizeKeyModel=" + tmp;
+
+  tmp = listKbLayouts->currentItem()->text();
+  tmp.truncate(tmp.indexOf(")"));
+  tmp = tmp.remove(0, tmp.indexOf(" (") + 2 );
+  tmpList << "localizeKeyLayout=" + tmp;
+
+  tmp = listKbVariants->currentItem()->text();
+  if ( tmp != "<none>" )
   {
-    tmpList << "";
-    tmpList << "# Keyboard Layout Options";
-    tmp = comboBoxKeyboardModel->currentText();
     tmp.truncate(tmp.indexOf(")"));
     tmp = tmp.remove(0, tmp.indexOf(" (") + 2 );
-    tmpList << "localizeKeyModel=" + tmp;
+    tmpList << "localizeKeyVariant=" + tmp;
+  } 
 
-    tmp = listKbLayouts->currentItem()->text();
-    tmp.truncate(tmp.indexOf(")"));
-    tmp = tmp.remove(0, tmp.indexOf(" (") + 2 );
-    tmpList << "localizeKeyLayout=" + tmp;
-
-    tmp = listKbVariants->currentItem()->text();
-    if ( tmp != "<none>" )
-    {
-      tmp.truncate(tmp.indexOf(")"));
-      tmp = tmp.remove(0, tmp.indexOf(" (") + 2 );
-      tmpList << "localizeKeyVariant=" + tmp;
-    } 
-
-  }
-  
-
   tmpList << " ";
 
   return tmpList;

Modified: pcbsd/trunk/SysInstaller/sysinstaller.h
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.h	2010-01-13 22:16:12 UTC (rev 5999)
+++ pcbsd/trunk/SysInstaller/sysinstaller.h	2010-01-13 22:44:36 UTC (rev 6000)
@@ -71,7 +71,6 @@
     void slotCurrentKbLayoutChanged(int);
     void slotCurrentKbVariantChanged(int);
     void slotSelectedKbItemChanged();
-    void slotDefaultKbChecked(int);
     void slotUpdateKbOnSys();
 
     // Networking slots

Modified: pcbsd/trunk/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.ui	2010-01-13 22:16:12 UTC (rev 5999)
+++ pcbsd/trunk/SysInstaller/sysinstaller.ui	2010-01-13 22:44:36 UTC (rev 6000)
@@ -996,7 +996,7 @@
                 </palette>
                </property>
                <property name="currentIndex">
-                <number>6</number>
+                <number>1</number>
                </property>
                <widget class="QWidget" name="aiStep0">
                 <property name="palette">
@@ -1933,191 +1933,6 @@
                    </property>
                   </spacer>
                  </item>
-                 <item row="0" column="1">
-                  <widget class="QCheckBox" name="checkKbDefault">
-                   <property name="palette">
-                    <palette>
-                     <active>
-                      <colorrole role="WindowText">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>14</red>
-                         <green>14</green>
-                         <blue>14</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Button">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>255</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Text">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>14</red>
-                         <green>14</green>
-                         <blue>14</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="ButtonText">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>14</red>
-                         <green>14</green>
-                         <blue>14</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Base">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>255</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Window">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>255</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                     </active>
-                     <inactive>
-                      <colorrole role="WindowText">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>14</red>
-                         <green>14</green>
-                         <blue>14</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Button">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>255</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Text">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>14</red>
-                         <green>14</green>
-                         <blue>14</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="ButtonText">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>14</red>
-                         <green>14</green>
-                         <blue>14</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Base">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>255</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Window">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>255</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                     </inactive>
-                     <disabled>
-                      <colorrole role="WindowText">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>14</red>
-                         <green>14</green>
-                         <blue>14</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Button">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>255</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Text">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>14</red>
-                         <green>14</green>
-                         <blue>14</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="ButtonText">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>14</red>
-                         <green>14</green>
-                         <blue>14</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Base">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>255</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Window">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>255</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                     </disabled>
-                    </palette>
-                   </property>
-                   <property name="layoutDirection">
-                    <enum>Qt::LeftToRight</enum>
-                   </property>
-                   <property name="text">
-                    <string>Use Default</string>
-                   </property>
-                   <property name="checked">
-                    <bool>true</bool>
-                   </property>
-                  </widget>
-                 </item>
                  <item row="1" column="1">
                   <widget class="QGroupBox" name="groupKeyboard">
                    <property name="title">
@@ -9539,7 +9354,6 @@
   <tabstop>radioInstallFreeBSD</tabstop>
   <tabstop>comboBoxKeyboardModel</tabstop>
   <tabstop>comboLanguage</tabstop>
-  <tabstop>checkKbDefault</tabstop>
   <tabstop>textWelcome</tabstop>
   <tabstop>listKbLayouts</tabstop>
   <tabstop>listKbVariants</tabstop>



More information about the Commits mailing list