summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-18 15:38:36 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-18 15:38:36 -0600
commit0e9db4fe22f40c7ce1a10235369f1253295b4d85 (patch)
treec066186a1fa2aacc326c964482c226c7b40c8b5d
parentbf86a55dd46aae173462137aa5a59d8e24516b83 (diff)
downloadhorizon-0e9db4fe22f40c7ce1a10235369f1253295b4d85.tar.gz
horizon-0e9db4fe22f40c7ce1a10235369f1253295b4d85.tar.bz2
horizon-0e9db4fe22f40c7ce1a10235369f1253295b4d85.tar.xz
horizon-0e9db4fe22f40c7ce1a10235369f1253295b4d85.zip
Qt UI: Make all QLabels word wrap
This is necessary in case someone needs font sizes raised. Otherwise, content may be truncated.
-rw-r--r--ui/qt5/commitpage.cc1
-rw-r--r--ui/qt5/inputpage.cc1
-rw-r--r--ui/qt5/netdhcppage.cc3
-rw-r--r--ui/qt5/netsimplewifipage.cc1
-rw-r--r--ui/qt5/networkifacepage.cc3
-rw-r--r--ui/qt5/pkgdefaults.cc3
6 files changed, 10 insertions, 2 deletions
diff --git a/ui/qt5/commitpage.cc b/ui/qt5/commitpage.cc
index f144ade..1bbb7b7 100644
--- a/ui/qt5/commitpage.cc
+++ b/ui/qt5/commitpage.cc
@@ -32,6 +32,7 @@ CommitPage::CommitPage(QWidget *parent) : HorizonWizardPage(parent) {
choices = new QLabel;
choices->setFrameStyle(QFrame::Panel | QFrame::Sunken);
choices->setTextFormat(Qt::RichText);
+ choices->setWordWrap(true);
QVBoxLayout *layout = new QVBoxLayout;
layout->addWidget(descLabel);
diff --git a/ui/qt5/inputpage.cc b/ui/qt5/inputpage.cc
index 009fa86..a02def6 100644
--- a/ui/qt5/inputpage.cc
+++ b/ui/qt5/inputpage.cc
@@ -34,6 +34,7 @@ InputPage::InputPage(QWidget *parent) : HorizonWizardPage(parent) {
setTitle(tr("Keyboard Layout"));
descLabel = new QLabel(tr("Choose the layout of your keyboard."));
+ descLabel->setWordWrap(true);
/* REQ: UI.Input.LayoutList */
layoutList = new QListWidget(this);
diff --git a/ui/qt5/netdhcppage.cc b/ui/qt5/netdhcppage.cc
index bf223f0..56a29ca 100644
--- a/ui/qt5/netdhcppage.cc
+++ b/ui/qt5/netdhcppage.cc
@@ -24,13 +24,16 @@ NetDHCPPage::NetDHCPPage(QWidget *parent) : HorizonWizardPage(parent) {
loadWatermark("network");
QLabel *overall = new QLabel(tr("Please wait while System Installation performs the following tasks:"));
+ overall->setWordWrap(true);
information = new QLabel;
information->setWordWrap(true);
addrStatus = new QLabel;
address = new QLabel(tr("Obtain a network address"));
+ address->setWordWrap(true);
inetStatus = new QLabel;
inet = new QLabel(tr("Check Internet connectivity"));
+ inet->setWordWrap(true);
QGridLayout *progressLayout = new QGridLayout;
progressLayout->addWidget(addrStatus, 0, 0);
diff --git a/ui/qt5/netsimplewifipage.cc b/ui/qt5/netsimplewifipage.cc
index e6c2d8b..113669b 100644
--- a/ui/qt5/netsimplewifipage.cc
+++ b/ui/qt5/netsimplewifipage.cc
@@ -39,6 +39,7 @@ NetworkSimpleWirelessPage::NetworkSimpleWirelessPage(QWidget *parent)
setTitle(tr("Select Your Network"));
statusLabel = new QLabel(tr("Scanning for networks..."));
+ statusLabel->setWordWrap(true);
rescanButton = new QPushButton(tr("&Rescan Networks"));
connect(rescanButton, &QPushButton::clicked, [=](void) { doScan(); });
diff --git a/ui/qt5/networkifacepage.cc b/ui/qt5/networkifacepage.cc
index 9eecefd..e0d3665 100644
--- a/ui/qt5/networkifacepage.cc
+++ b/ui/qt5/networkifacepage.cc
@@ -59,7 +59,6 @@ void NetworkIfacePage::initializePage() {
#ifdef HAS_INSTALL_ENV
descLabel = new QLabel(tr(
"Your computer has more than one network device. Select the one you wish to use during installation."));
- descLabel->setWordWrap(true);
for(auto &iface : horizonWizard()->interfaces) {
QIcon ifaceIcon;
@@ -91,8 +90,8 @@ void NetworkIfacePage::initializePage() {
}
#else
descLabel = new QLabel(tr("Enter the name of the network device you will use on this computer."));
- descLabel->setWordWrap(true);
#endif /* HAS_INSTALL_ENV */
+ descLabel->setWordWrap(true);
layout = new QVBoxLayout;
layout->addWidget(descLabel);
diff --git a/ui/qt5/pkgdefaults.cc b/ui/qt5/pkgdefaults.cc
index de18858..e3c358d 100644
--- a/ui/qt5/pkgdefaults.cc
+++ b/ui/qt5/pkgdefaults.cc
@@ -36,6 +36,7 @@ PkgDefaultsPage::PkgDefaultsPage(QWidget *parent) : HorizonWizardPage(parent) {
/******************** /bin/sh provider ********************/
QButtonGroup *shellGroup = new QButtonGroup;
QLabel *shellLabel = new QLabel(tr("Shell to use for /bin/sh:"));
+ shellLabel->setWordWrap(true);
dashShell = new QRadioButton("Dash");
dashShell->setWhatsThis(tr("Use the lightweight Dash shell. "
@@ -67,6 +68,7 @@ PkgDefaultsPage::PkgDefaultsPage(QWidget *parent) : HorizonWizardPage(parent) {
/******************** /sbin/init provider ********************/
QButtonGroup *initGroup = new QButtonGroup;
QLabel *initLabel = new QLabel(tr("Init system (/sbin/init):"));
+ initLabel->setWordWrap(true);
s6Init = new QRadioButton("s6-linux-init");
s6Init->setWhatsThis(tr("Use the lightweight, customisable s6-linux-init init system."));
@@ -93,6 +95,7 @@ PkgDefaultsPage::PkgDefaultsPage(QWidget *parent) : HorizonWizardPage(parent) {
/******************** device event handler ********************/
QButtonGroup *udevGroup = new QButtonGroup;
QLabel *udevLabel = new QLabel(tr("uevent management daemon:"));
+ udevLabel->setWordWrap(true);
eudev = new QRadioButton("eudev");
eudev->setWhatsThis(tr("Use the traditional, UDev-compatible eudev system. "