diff options
| author | Nippy <nippy@Nippy-Mac-mini.local> | 2026-09-25 16:49:38 +0200 |
|---|---|---|
| committer | Nippy <nippy@Nippy-Mac-mini.local> | 2026-09-25 16:49:38 +0200 |
| commit | 85bd02f08f5ee3a6ea2cec8b3af1a5ea9e23c46a (patch) | |
| tree | e9bb2fca72c29d63d76a30d7f5f80fc4678c0c55 /raveos-calamares | |
| parent | 3be48285527e754c159afbe0cb64544682749563 (diff) | |
| download | RaveOS-PKGBUILD-85bd02f08f5ee3a6ea2cec8b3af1a5ea9e23c46a.tar.gz RaveOS-PKGBUILD-85bd02f08f5ee3a6ea2cec8b3af1a5ea9e23c46a.zip | |
update szep.25 calamares finish
Diffstat (limited to 'raveos-calamares')
| -rw-r--r-- | raveos-calamares/0003-restart-button.patch | 58 | ||||
| -rw-r--r-- | raveos-calamares/PKGBUILD | 7 |
2 files changed, 63 insertions, 2 deletions
diff --git a/raveos-calamares/0003-restart-button.patch b/raveos-calamares/0003-restart-button.patch new file mode 100644 index 0000000..a06ea52 --- /dev/null +++ b/raveos-calamares/0003-restart-button.patch @@ -0,0 +1,58 @@ +--- a/src/calamares/CalamaresWindow.cpp ++++ b/src/calamares/CalamaresWindow.cpp +@@ -35,6 +35,9 @@ + #include <QFile> + #include <QFileInfo> + #include <QLabel> ++#include <QMessageBox> ++#include <QProcess> ++#include <QPushButton> + #ifdef WITH_QML + #include <QQmlContext> + #include <QQmlEngine> +@@ -216,6 +219,36 @@ + { + QWidget* navigation = new QWidget( parent ); + QBoxLayout* bottomLayout = new QHBoxLayout; ++ ++ // RaveOS: globalis ujrainditas gomb a bal also sarokban (minden oldalon lathato) ++ { ++ auto* restart = new QPushButton( ++ getButtonIcon( QStringLiteral( "view-refresh" ) ), ++ QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Restart", "@button" ), ++ navigation ); ++ restart->setObjectName( "restartButton" ); ++ restart->setToolTip( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), ++ "Restart the computer", ++ "@tooltip" ) ); ++ QObject::connect( restart, ++ &QPushButton::clicked, ++ navigation, ++ []() ++ { ++ if ( QMessageBox::question( nullptr, ++ QStringLiteral( "RaveOS" ), ++ QCoreApplication::translate( "calamares-sidebar", ++ "Restart the computer?", ++ "@info" ) ) ++ == QMessageBox::Yes ) ++ { ++ QProcess::startDetached( QStringLiteral( "systemctl" ), ++ { QStringLiteral( "-i" ), QStringLiteral( "reboot" ) } ); ++ } ++ } ); ++ bottomLayout->addWidget( restart ); ++ } ++ + bottomLayout->addStretch(); + + // Create buttons and sets an initial icon; the icons may change +@@ -272,7 +305,7 @@ + bottomLayout->addWidget( quit ); + } + +- bottomLayout->setContentsMargins( 0, 0, 6, 6 ); ++ bottomLayout->setContentsMargins( 6, 0, 6, 6 ); + navigation->setLayout( bottomLayout ); + return navigation; + } diff --git a/raveos-calamares/PKGBUILD b/raveos-calamares/PKGBUILD index 05885d7..fc96a9b 100644 --- a/raveos-calamares/PKGBUILD +++ b/raveos-calamares/PKGBUILD @@ -4,7 +4,7 @@ _pkgname="calamares" pkgname="$_pkgname" pkgver=3.4.2 -pkgrel=9 +pkgrel=10 pkgdesc="Distribution-independent installer framework" url="https://codeberg.org/Calamares/calamares" license=("GPL-3.0-or-later") @@ -31,15 +31,18 @@ _pkgsrc="$_pkgname" _pkgext="tar.gz" source=("$_pkgname-$pkgver.$_pkgext"::"$url/releases/download/v$pkgver/$_pkgname-$pkgver.$_pkgext" "0001-support-yay.patch" - "0002-limit-translations.patch") + "0002-limit-translations.patch" + "0003-restart-button.patch") sha256sums=('733bbbb00dc9f84874bd5c22960952f317ea2537565431179fa2152b2fbfdccc' 'SKIP' + 'SKIP' 'SKIP') prepare() { cd $srcdir/$_pkgname-$pkgver patch -Np1 -i ../0001-support-yay.patch patch -Np1 -i ../0002-limit-translations.patch + patch -Np1 -i ../0003-restart-button.patch # Copy across the custom images cp -a ${startdir}/images/partition-alongside.svg $srcdir/$_pkgname-$pkgver/data/images/partition-alongside.svg |