[PC-BSD Commits] r17903 - pcbsd/current/src-qt4/pc-firstbootgui

svn at pcbsd.org svn at pcbsd.org
Tue Jul 24 09:33:47 PDT 2012


Author: kris
Date: 2012-07-24 16:33:47 +0000 (Tue, 24 Jul 2012)
New Revision: 17903

Modified:
   pcbsd/current/src-qt4/pc-firstbootgui/dialogHelp.ui
   pcbsd/current/src-qt4/pc-firstbootgui/dialogInfoBox.ui
   pcbsd/current/src-qt4/pc-firstbootgui/dialogKeyboard.ui
   pcbsd/current/src-qt4/pc-firstbootgui/firstboot.cpp
   pcbsd/current/src-qt4/pc-firstbootgui/firstboot.h
   pcbsd/current/src-qt4/pc-firstbootgui/firstboot.ui
   pcbsd/current/src-qt4/pc-firstbootgui/helpText.h
   pcbsd/current/src-qt4/pc-firstbootgui/netKey.ui
Log:

Improve the first boot setup wizard, add a status bar to explain what
each buttion does, and fix window titles to not show squares on i18n.
Also fix the help text for each screen.



Modified: pcbsd/current/src-qt4/pc-firstbootgui/dialogHelp.ui
===================================================================
(Binary files differ)

Modified: pcbsd/current/src-qt4/pc-firstbootgui/dialogInfoBox.ui
===================================================================
(Binary files differ)

Modified: pcbsd/current/src-qt4/pc-firstbootgui/dialogKeyboard.ui
===================================================================
(Binary files differ)

Modified: pcbsd/current/src-qt4/pc-firstbootgui/firstboot.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-firstbootgui/firstboot.cpp	2012-07-24 15:25:57 UTC (rev 17902)
+++ pcbsd/current/src-qt4/pc-firstbootgui/firstboot.cpp	2012-07-24 16:33:47 UTC (rev 17903)
@@ -10,7 +10,7 @@
 #include "firstboot.h"
 #include "helpText.h"
 
-Installer::Installer(QWidget *parent) : QWidget(parent)
+Installer::Installer(QWidget *parent) : QMainWindow(parent)
 {
     setupUi(this);
 

Modified: pcbsd/current/src-qt4/pc-firstbootgui/firstboot.h
===================================================================
--- pcbsd/current/src-qt4/pc-firstbootgui/firstboot.h	2012-07-24 15:25:57 UTC (rev 17902)
+++ pcbsd/current/src-qt4/pc-firstbootgui/firstboot.h	2012-07-24 16:33:47 UTC (rev 17903)
@@ -14,7 +14,7 @@
 
 #include "backend.h"
 
-class Installer : public QWidget, private Ui::Installer
+class Installer : public QMainWindow, private Ui::Installer
 {
     Q_OBJECT
 

Modified: pcbsd/current/src-qt4/pc-firstbootgui/firstboot.ui
===================================================================
(Binary files differ)

Modified: pcbsd/current/src-qt4/pc-firstbootgui/helpText.h
===================================================================
--- pcbsd/current/src-qt4/pc-firstbootgui/helpText.h	2012-07-24 15:25:57 UTC (rev 17902)
+++ pcbsd/current/src-qt4/pc-firstbootgui/helpText.h	2012-07-24 16:33:47 UTC (rev 17903)
@@ -3,15 +3,15 @@
 #define HELPTEXT_H
 #include <QObject>
 
-#define HELPTEXT0 QObject::tr("This screen allows you to setup your system language and local timezone.<br><br>Enabling the option for NTP will keep your computers date and time in sync via the internet.")
-#define HELPTEXT1 QObject::tr("On this screen please take a moment to setup and test your keyboard. The pc104 keyboard is common, although you should select your keyboard model / layout if it exists as an option.")
-#define HELPTEXT2 QObject::tr("Please select the type of installation you want to perform. If doing an upgrade please make sure you have created a backup of your files beforehand. <br><br>Next select if you are installing PC-BSD or FreeBSD. PC-BSD is recommended for new users and people wanting to run a desktop. FreeBSD does NOT include a graphical interface by default, and should be installed by more experienced users.<br><br>If you are booting from a installation or live DVD/USB/CD then the fastest option is to install from DVD / USB. Network installation is required when booting from a boot-only media. NOTE: Network installation is for wired ethernet only, wifi configuration is not supported at this time.")
-#define HELPTEXT3 QObject::tr("Please select the disk or partition you wish to use for installation. If you plan to dual-boot with another operating system you will need a MBR primary partition available. If you want to format the disk with GPT (Required for greater than 2TB disks) then you will need to select 'Use Entire Disk'.<br><br>The default file-system is UFS with Journaling, but advanced users may want to install with the ZFS filesystem.<br><br>The option for 'Encrypt user data' will encrypt the /usr file-system, which includes your home directories.")
-#define HELPTEXT4 QObject::tr("On this screen you will need to set the password for the system (root) user. It is also recommended to setup at least one regular user, which is required for login on PC-BSD. <br><br>If you wish to name this system, enable the option 'Custom System Hostname' and enter the system nickname. Otherwise the default pcbsd-xxxx or freebsd-xxxx will be used.")
-#define HELPTEXT5 QObject::tr("PC-BSD gives you the option of customizing your system with a variety of Desktops and other 'Meta-pkgs'. If you are unsure what these are, then please accept the defaults. You are always able to add / remove these packages post-installation via the 'System Manager' in the PC-BSD control panel.")
-#define HELPTEXT6 QObject::tr("Please select any optional components you wish to have installed on this system. These may also be added post-installation via the AppCafe or System Manager.")
-#define HELPTEXT7 QObject::tr("This screen will display a summary of your installation options. Please confirm these are correct before hitting Next. This is your last chance to cancel before changes are made to your disk.")
-#define HELPTEXT8 QObject::tr("The system is now installing! This process may take a while depending upon the options chosen and the system speed.")
-#define HELPTEXT9 QObject::tr("Success! The system is now installed, you may remove any DVD/CD/USB from the system and reboot into your new operating system.")
+#define HELPTEXT0 QObject::tr("This screen allows you to select the system language you wish to use.")
+#define HELPTEXT1 QObject::tr("This screen lets you pick the default timezone for your computer.")
+#define HELPTEXT2 QObject::tr("On this screen please enter the root password you wish to use. This password is used for full system access, and should be something secure.")
+#define HELPTEXT3 QObject::tr("On this screen you will need to create a user to log into your desktop. Additional users may be created in the Control Panel.")
+#define HELPTEXT4 QObject::tr("On this screen you may connect to an available wifi network. If you have a hidden network, it may be added later in the Network Manager.")
+#define HELPTEXT5 QObject::tr("The computer setup is now finished! Click Finish to log into your new Desktop.")
+#define HELPTEXT6 QObject::tr("")
+#define HELPTEXT7 QObject::tr("")
+#define HELPTEXT8 QObject::tr("")
+#define HELPTEXT9 QObject::tr("")
 
 #endif // HELPTEXT_H

Modified: pcbsd/current/src-qt4/pc-firstbootgui/netKey.ui
===================================================================
(Binary files differ)



More information about the Commits mailing list