diff options
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/bootloader.ui | 20 | ||||
| -rw-r--r-- | wizard/network.ui | 7 | ||||
| -rw-r--r-- | wizard/partitions.cpp | 1 | ||||
| -rw-r--r-- | wizard/partitions.ui | 2 | ||||
| -rw-r--r-- | wizard/partmansel.ui | 19 | ||||
| -rw-r--r-- | wizard/rootpartition.ui | 12 | ||||
| -rw-r--r-- | wizard/rootpwd.ui | 7 | ||||
| -rw-r--r-- | wizard/usercfg.ui | 8 | ||||
| -rw-r--r-- | wizard/userpwd.ui | 13 |
9 files changed, 77 insertions, 12 deletions
diff --git a/wizard/bootloader.ui b/wizard/bootloader.ui index f7b39b5..4b03d95 100644 --- a/wizard/bootloader.ui +++ b/wizard/bootloader.ui @@ -35,7 +35,12 @@ </size> </property> <property name="text"> - <string>HelpText</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select your <span style=" font-weight:600;">bootloader</span>:</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">A bootloader is needed to boot the Linux kernel or other operating systems and has to be installed on a bootable device (e.g. Harddisk, USB-Stick, Floppy)</p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> @@ -83,7 +88,12 @@ </size> </property> <property name="text"> - <string>HelpText</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Bootloader installation target</span>: </p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select the device where you want to install your bootloader. Usually you use the MBR (Master Boot Record) of the first device, but you could also install it to the root (<span style=" font-weight:600;">/</span>) partition. </p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> @@ -114,6 +124,12 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> </spacer> </item> </layout> diff --git a/wizard/network.ui b/wizard/network.ui index 7f6a36c..04a3f82 100644 --- a/wizard/network.ui +++ b/wizard/network.ui @@ -35,7 +35,12 @@ </size> </property> <property name="text"> - <string>HelpText</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please enter a <span style=" font-weight:600;">hostname</span> for your computer.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This should consist of letters (a-z) and numbers (0-9) only.</p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> diff --git a/wizard/partitions.cpp b/wizard/partitions.cpp index d35e94f..05db470 100644 --- a/wizard/partitions.cpp +++ b/wizard/partitions.cpp @@ -17,6 +17,7 @@ void wpPartitions::initializePage() listWidget->clear(); listWidget->addItem(new ListItem(tr("Manual partitioning"), tr("You will have to do the partitioning with a partition-manager manually. This way you have more possibilities to adjust the installation to your needs. The automatic partitioning lacks several features and is only a (computer generated) list of some possible options."), "partitionmanager", "manual")); listWidget->addItem(new ListItem(tr("Already partitioned"), tr("If you have already partitioned for the installation and don't want to start a partition manager then select this."), "drive-harddisk", "already")); + listWidget->setCurrentRow(0); clearPage(); } diff --git a/wizard/partitions.ui b/wizard/partitions.ui index f9badf4..2e21fda 100644 --- a/wizard/partitions.ui +++ b/wizard/partitions.ui @@ -14,7 +14,7 @@ <string>Partitions</string> </property> <property name="subTitle"> - <string>Mmmmmh! Partitions!</string> + <string>Please select your preferred way to partition your harddisks</string> </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> diff --git a/wizard/partmansel.ui b/wizard/partmansel.ui index 15a0302..ddb5741 100644 --- a/wizard/partmansel.ui +++ b/wizard/partmansel.ui @@ -35,7 +35,12 @@ </size> </property> <property name="text"> - <string>HelpText</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You have decided to <span style=" font-weight:600;">partition your harddisks</span> manually.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please select your favorite partition manager from the list.</p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> @@ -83,7 +88,11 @@ </size> </property> <property name="text"> - <string>HelpText</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please select the harddisk you want to partition from the list.</p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> @@ -104,6 +113,12 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> </spacer> </item> <item row="3" column="1"> diff --git a/wizard/rootpartition.ui b/wizard/rootpartition.ui index f582e32..ef1ccf4 100644 --- a/wizard/rootpartition.ui +++ b/wizard/rootpartition.ui @@ -35,7 +35,11 @@ </size> </property> <property name="text"> - <string>HelpText</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select your <span style=" font-weight:600;">root-partition</span> and a filesystem to <span style=" font-weight:600;">format</span> the partition with (optionally).</p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> @@ -89,7 +93,11 @@ </size> </property> <property name="text"> - <string>HelpText</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If you want to specify advanced options (e.g. a separate /home partition) please select <span style=" font-weight:600;">advanced partition options</span>.</p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> diff --git a/wizard/rootpwd.ui b/wizard/rootpwd.ui index 2e47950..d4d674c 100644 --- a/wizard/rootpwd.ui +++ b/wizard/rootpwd.ui @@ -35,7 +35,12 @@ </size> </property> <property name="text"> - <string>HelpText</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please enter the password for <span style=" font-weight:600;">root</span>:</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The root account is a special user account that has all rights and permissions on your system (e.g. installing software, adding users, ...). Therefore <span style=" font-weight:600;">keep it secret!</span></p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> diff --git a/wizard/usercfg.ui b/wizard/usercfg.ui index 3e5ded9..520ff58 100644 --- a/wizard/usercfg.ui +++ b/wizard/usercfg.ui @@ -35,7 +35,13 @@ </size> </property> <property name="text"> - <string>HelpText</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Realname</span>: Enter your name here.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Also enter a <span style=" font-weight:600;">username</span> for a less privileged account:</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Your user account is your &quot;normal&quot; working account. Your applications are launched from there and don't have full rights, only for this user account.</p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> diff --git a/wizard/userpwd.ui b/wizard/userpwd.ui index ff559a2..a4cfc18 100644 --- a/wizard/userpwd.ui +++ b/wizard/userpwd.ui @@ -35,7 +35,12 @@ </size> </property> <property name="text"> - <string>HelpText</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please enter the password for your <span style=" font-weight:600;">user</span> account:</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Just as the root password you should keep this one secret!</p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> @@ -168,7 +173,11 @@ </size> </property> <property name="text"> - <string>HelpText</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If you <span style=" font-weight:600;">enable Auto-Login</span> you won't be asked a password to login when booting.</p></body></html></string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> |