Luke Granger-Brown
57725ef3ec
git-subtree-dir: third_party/nixpkgs git-subtree-split: 76612b17c0ce71689921ca12d9ffdc9c23ce40b2
100 lines
5.4 KiB
Diff
100 lines
5.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Victor Fuentes <vmfuentes64@gmail.com>
|
|
Date: Thu, 1 Aug 2024 16:01:53 -0400
|
|
Subject: [PATCH] Modifies finished module to add some NixOS resources.
|
|
|
|
Modifies packagechooser module to change the UI.
|
|
---
|
|
src/modules/finished/FinishedPage.cpp | 12 +++++---
|
|
.../packagechooser/PackageChooserPage.cpp | 1 +
|
|
src/modules/packagechooser/page_package.ui | 28 +++++++++----------
|
|
3 files changed, 23 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp
|
|
index 51be52678..307607232 100644
|
|
--- a/src/modules/finished/FinishedPage.cpp
|
|
+++ b/src/modules/finished/FinishedPage.cpp
|
|
@@ -74,8 +74,10 @@ FinishedPage::retranslate()
|
|
{
|
|
ui->mainText->setText( tr( "<h1>All done.</h1><br/>"
|
|
"%1 has been set up on your computer.<br/>"
|
|
- "You may now start using your new system.",
|
|
- "@info" )
|
|
+ "You may now start using your new system.<br/>"
|
|
+ "You can change every setting later except the bootloader.<br/>"
|
|
+ "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>"
|
|
+ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>", "@info" )
|
|
.arg( branding->versionedName() ) );
|
|
ui->restartCheckBox->setToolTip( tr( "<html><head/><body>"
|
|
"<p>When this box is checked, your system will "
|
|
@@ -89,8 +91,10 @@ FinishedPage::retranslate()
|
|
ui->mainText->setText( tr( "<h1>All done.</h1><br/>"
|
|
"%1 has been installed on your computer.<br/>"
|
|
"You may now restart into your new system, or continue "
|
|
- "using the %2 Live environment.",
|
|
- "@info" )
|
|
+ "using the %2 Live environment.<br/>"
|
|
+ "You can change every setting later except the bootloader.<br/>"
|
|
+ "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>"
|
|
+ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>", "@info" )
|
|
.arg( branding->versionedName(), branding->productName() ) );
|
|
ui->restartCheckBox->setToolTip( tr( "<html><head/><body>"
|
|
"<p>When this box is checked, your system will "
|
|
diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
|
|
index 44a570d2f..4dc931bf3 100644
|
|
--- a/src/modules/packagechooser/PackageChooserPage.cpp
|
|
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
|
|
@@ -52,6 +52,7 @@ PackageChooserPage::currentChanged( const QModelIndex& index )
|
|
if ( !index.isValid() || !ui->products->selectionModel()->hasSelection() )
|
|
{
|
|
ui->productName->setText( m_introduction.name.get() );
|
|
+ ui->productName->setStyleSheet("font-weight: bold");
|
|
ui->productScreenshot->setPixmap( m_introduction.screenshot );
|
|
ui->productDescription->setText( m_introduction.description.get() );
|
|
}
|
|
diff --git a/src/modules/packagechooser/page_package.ui b/src/modules/packagechooser/page_package.ui
|
|
index 2ab5b7f13..bed462069 100644
|
|
--- a/src/modules/packagechooser/page_package.ui
|
|
+++ b/src/modules/packagechooser/page_package.ui
|
|
@@ -37,20 +37,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
- <layout class="QVBoxLayout" name="verticalLayout" stretch="1,30,1">
|
|
- <item>
|
|
- <widget class="QLabel" name="productName">
|
|
- <property name="sizePolicy">
|
|
- <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
|
|
- <horstretch>0</horstretch>
|
|
- <verstretch>0</verstretch>
|
|
- </sizepolicy>
|
|
- </property>
|
|
- <property name="text">
|
|
- <string>Product Name</string>
|
|
- </property>
|
|
- </widget>
|
|
- </item>
|
|
+ <layout class="QVBoxLayout" name="verticalLayout" stretch="30,1,1">
|
|
<item>
|
|
<widget class="FixedAspectRatioLabel" name="productScreenshot">
|
|
<property name="sizePolicy">
|
|
@@ -67,6 +54,19 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
+ <item>
|
|
+ <widget class="QLabel" name="productName">
|
|
+ <property name="sizePolicy">
|
|
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
|
|
+ <horstretch>0</horstretch>
|
|
+ <verstretch>0</verstretch>
|
|
+ </sizepolicy>
|
|
+ </property>
|
|
+ <property name="text">
|
|
+ <string>Product Name</string>
|
|
+ </property>
|
|
+ </widget>
|
|
+ </item>
|
|
<item>
|
|
<widget class="QLabel" name="productDescription">
|
|
<property name="sizePolicy">
|