[PC-BSD Commits] r13497 - in pcbsd/current/src-qt4/pc-sysinstaller: . images

svn at pcbsd.org svn at pcbsd.org
Mon Oct 24 12:39:30 PDT 2011


Author: kris
Date: 2011-10-24 12:39:30 -0700 (Mon, 24 Oct 2011)
New Revision: 13497

Added:
   pcbsd/current/src-qt4/pc-sysinstaller/images/help-hint.png
   pcbsd/current/src-qt4/pc-sysinstaller/images/input-keyboard.png
Modified:
   pcbsd/current/src-qt4/pc-sysinstaller/sys-keyboardwidget.cpp
   pcbsd/current/src-qt4/pc-sysinstaller/sys-userwidget.cpp
   pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.h
   pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.qrc
   pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.ui
Log:

Fix missing "" in tr(), and add icons / button for launching virtual keyboard





Property changes on: pcbsd/current/src-qt4/pc-sysinstaller/images/help-hint.png
___________________________________________________________________
Added: svn:mime-type
   + image/png


Property changes on: pcbsd/current/src-qt4/pc-sysinstaller/images/input-keyboard.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: pcbsd/current/src-qt4/pc-sysinstaller/sys-keyboardwidget.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sys-keyboardwidget.cpp	2011-10-24 19:11:05 UTC (rev 13496)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sys-keyboardwidget.cpp	2011-10-24 19:39:30 UTC (rev 13497)
@@ -20,8 +20,15 @@
   connect(listKbVariants,SIGNAL(itemSelectionChanged()), this, SLOT(slotSelectedKbItemChanged()));
   connect(comboBoxKeyboardModel,SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateKbOnSys()));
   connect(pushToggleKeyLayout, SIGNAL(clicked()), this, SLOT(slotToggleKeyLayout()));
+  connect(pushTouchKeyboard, SIGNAL(clicked()), this, SLOT(slotPushVirtKeyboard()));
 }
 
+// Start xvkbd
+void SysInstaller::slotPushVirtKeyboard()
+{
+   system("xvkbd &");
+}
+
 void SysInstaller::slotCurrentKbLayoutChanged(int row)
 {
     if (row != -1) {

Modified: pcbsd/current/src-qt4/pc-sysinstaller/sys-userwidget.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sys-userwidget.cpp	2011-10-24 19:11:05 UTC (rev 13496)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sys-userwidget.cpp	2011-10-24 19:39:30 UTC (rev 13497)
@@ -102,7 +102,7 @@
 
    //Check username is less than 512 characters
    if (lineUserName->text().length() > 512){
-     textAcctNotify->setText(tr(Username must contain less than 512 characters!));
+     textAcctNotify->setText(tr("Username must contain less than 512 characters!"));
      ok = FALSE;
    }
 

Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.h
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.h	2011-10-24 19:11:05 UTC (rev 13496)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.h	2011-10-24 19:39:30 UTC (rev 13497)
@@ -128,6 +128,10 @@
 
     // Toggle key layout slot
     void slotToggleKeyLayout();
+
+    // Start xvkbd
+    void slotPushVirtKeyboard();
+
 private:
     void initSteps();
     void initAnteInstall();

Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.qrc
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.qrc	2011-10-24 19:11:05 UTC (rev 13496)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.qrc	2011-10-24 19:39:30 UTC (rev 13497)
@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="/modules">
+    <file>images/help-hint.png</file>
     <file>images/view-refresh.png</file>
     <file>images/language.png</file>
     <file>images/keyboard.png</file>
@@ -17,6 +18,7 @@
     <file>images/systemsettings.png</file>
   </qresource>
   <qresource prefix="/PCBSD">
+    <file>images/input-keyboard.png</file>
     <file>images/edit_add.png</file>
     <file>images/edit.png</file>
     <file>images/edit_remove.png</file>

Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.ui
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.ui	2011-10-24 19:11:05 UTC (rev 13496)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.ui	2011-10-24 19:39:30 UTC (rev 13497)
@@ -7963,23 +7963,62 @@
         <property name="text">
          <string>&Help</string>
         </property>
+        <property name="icon">
+         <iconset resource="sysinstaller.qrc">
+          <normaloff>:/modules/images/help-hint.png</normaloff>:/modules/images/help-hint.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>32</width>
+          <height>32</height>
+         </size>
+        </property>
         <property name="flat">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
+       <widget class="QPushButton" name="pushTouchKeyboard">
+        <property name="toolTip">
+         <string>On-Screen Keyboard</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="sysinstaller.qrc">
+          <normaloff>:/PCBSD/images/input-keyboard.png</normaloff>:/PCBSD/images/input-keyboard.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>32</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="flat">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
        <widget class="QPushButton" name="pushToggleKeyLayout">
         <property name="toolTip">
          <string>Switch between US layout and user selected layout</string>
         </property>
         <property name="text">
-         <string>Toggle Keyboard Layout</string>
+         <string/>
         </property>
         <property name="icon">
          <iconset resource="sysinstaller.qrc">
           <normaloff>:/modules/images/keyboard.png</normaloff>:/modules/images/keyboard.png</iconset>
         </property>
+        <property name="iconSize">
+         <size>
+          <width>32</width>
+          <height>32</height>
+         </size>
+        </property>
         <property name="autoDefault">
          <bool>false</bool>
         </property>



More information about the Commits mailing list