From a64ef966534f8dba6af889ba4bfce15691bfc85b Mon Sep 17 00:00:00 2001 From: Nippy Date: Sun, 1 Nov 2026 18:13:54 +0100 Subject: új telepítő MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- raveos-calamares/0003-raveos-panelek.patch | 46 ++++ raveos-calamares/0003-restart-button.patch | 115 --------- .../0004-raveos-telepites-haladas.patch | 54 +++++ raveos-calamares/0005-raveos-qml-forditas.patch | 75 ++++++ raveos-calamares/0006-raveos-lepesre-ugras.patch | 51 ++++ .../0007-raveos-naplo-hozzajarulas.patch | 263 +++++++++++++++++++++ raveos-calamares/PKGBUILD | 25 +- 7 files changed, 508 insertions(+), 121 deletions(-) create mode 100644 raveos-calamares/0003-raveos-panelek.patch delete mode 100644 raveos-calamares/0003-restart-button.patch create mode 100644 raveos-calamares/0004-raveos-telepites-haladas.patch create mode 100644 raveos-calamares/0005-raveos-qml-forditas.patch create mode 100644 raveos-calamares/0006-raveos-lepesre-ugras.patch create mode 100644 raveos-calamares/0007-raveos-naplo-hozzajarulas.patch (limited to 'raveos-calamares') diff --git a/raveos-calamares/0003-raveos-panelek.patch b/raveos-calamares/0003-raveos-panelek.patch new file mode 100644 index 0000000..b548da9 --- /dev/null +++ b/raveos-calamares/0003-raveos-panelek.patch @@ -0,0 +1,46 @@ +--- a/src/calamares/CalamaresWindow.cpp ++++ b/src/calamares/CalamaresWindow.cpp +@@ -294,8 +294,8 @@ + // which seems to match what the widget navigation would use for height + // (with *my* specific screen, style, etc. so YMMV). + // +- // Bound between (16, 64) with a default of 48. +- qreal minimumHeight = qBound( qreal( 16 ), w->rootObject() ? w->rootObject()->height() : 48, qreal( 64 ) ); ++ // Bound between (16, 96) with a default of 48. ++ qreal minimumHeight = qBound( qreal( 16 ), w->rootObject() ? w->rootObject()->height() : 48, qreal( 96 ) ); + w->setMinimumHeight( int( minimumHeight ) ); + w->setFixedHeight( int( minimumHeight ) ); + } +@@ -500,7 +500,9 @@ + baseWidget, + ::getWidgetSidebar, + ::getQmlSidebar, +- qBound( 100, Calamares::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); ++ branding->sidebarFlavor() == Calamares::Branding::PanelFlavor::Qml ++ ? 240 ++ : qBound( 100, Calamares::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); + QWidget* navigation = flavoredWidget( branding->navigationFlavor(), + ::orientation( branding->navigationSide() ), + m_debugManager, +@@ -536,6 +538,21 @@ + Calamares::unmarginLayout( contentsLayout ); + baseWidget->setLayout( mainLayout ); + setStyleSheet( Calamares::Branding::instance()->stylesheet() ); ++ ++ auto panelekElsoLepesnel = [ this, sideBox, navigation ]() ++ { ++ const bool latszik = m_viewManager->currentStepIndex() > 0; ++ if ( sideBox ) ++ { ++ sideBox->setVisible( latszik ); ++ } ++ if ( navigation ) ++ { ++ navigation->setVisible( latszik ); ++ } ++ }; ++ connect( m_viewManager, &Calamares::ViewManager::currentStepChanged, this, panelekElsoLepesnel ); ++ panelekElsoLepesnel(); + } + + void diff --git a/raveos-calamares/0003-restart-button.patch b/raveos-calamares/0003-restart-button.patch deleted file mode 100644 index 0d8e0f4..0000000 --- a/raveos-calamares/0003-restart-button.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- a/src/calamares/CalamaresWindow.cpp -+++ b/src/calamares/CalamaresWindow.cpp -@@ -24,6 +24,7 @@ - #include "utils/Logger.h" - #include "utils/Qml.h" - #include "utils/Retranslator.h" -+#include "viewpages/ExecutionViewStep.h" - #include "viewpages/ViewStep.h" - - #include -@@ -34,7 +35,10 @@ - #endif - #include - #include -+#include - #include -+#include -+#include - #ifdef WITH_QML - #include - #include -@@ -207,6 +211,38 @@ - return sideBox; - } - -+/** @brief RaveOS: localized confirm dialog for the global restart button. */ -+static bool -+raveosConfirmRestart( QWidget* parent ) -+{ -+ QDialog dialog( parent ); -+ dialog.setObjectName( QStringLiteral( "raveosDialog" ) ); -+ dialog.setWindowTitle( QStringLiteral( "RaveOS" ) ); -+ dialog.setMinimumWidth( 420 ); -+ -+ auto* layout = new QVBoxLayout( &dialog ); -+ auto* label = new QLabel( QCoreApplication::translate( "raveos", "Restart the computer?" ), &dialog ); -+ label->setObjectName( QStringLiteral( "raveosDialogLabel" ) ); -+ label->setWordWrap( true ); -+ layout->addWidget( label ); -+ layout->addSpacing( 10 ); -+ -+ auto* buttons = new QHBoxLayout; -+ buttons->addStretch(); -+ auto* cancel = new QPushButton( QCoreApplication::translate( "raveos", "Cancel" ), &dialog ); -+ cancel->setObjectName( QStringLiteral( "raveosDialogCancel" ) ); -+ auto* ok = new QPushButton( QCoreApplication::translate( "raveos", "Restart" ), &dialog ); -+ ok->setObjectName( QStringLiteral( "raveosDialogOk" ) ); -+ buttons->addWidget( cancel ); -+ buttons->addWidget( ok ); -+ layout->addLayout( buttons ); -+ -+ QObject::connect( cancel, &QPushButton::clicked, &dialog, &QDialog::reject ); -+ QObject::connect( ok, &QPushButton::clicked, &dialog, &QDialog::accept ); -+ -+ return dialog.exec() == QDialog::Accepted; -+} -+ - static QWidget* - getWidgetNavigation( Calamares::DebugWindowManager*, - Calamares::ViewManager* viewManager, -@@ -216,6 +252,45 @@ - { - QWidget* navigation = new QWidget( parent ); - QBoxLayout* bottomLayout = new QHBoxLayout; -+ -+ // RaveOS: globalis ujrainditas gomb a bal also sarokban. -+ // Telepites kozben (exec) es a finish oldalon NEM latszik. -+ { -+ auto* restart = new QPushButton( navigation ); -+ restart->setObjectName( "restartButton" ); -+ restart->setIcon( getButtonIcon( QStringLiteral( "view-refresh" ) ) ); -+ CALAMARES_RETRANSLATE_FOR( -+ restart, -+ restart->setText( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), -+ "&Restart", -+ "@button" ) ); -+ restart->setToolTip( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), -+ "Restart the computer", -+ "@tooltip" ) ); ); -+ QObject::connect( restart, -+ &QPushButton::clicked, -+ restart, -+ [restart]() -+ { -+ if ( raveosConfirmRestart( restart ) ) -+ { -+ QProcess::startDetached( QStringLiteral( "systemctl" ), -+ { QStringLiteral( "-i" ), QStringLiteral( "reboot" ) } ); -+ } -+ } ); -+ bottomLayout->addWidget( restart ); -+ -+ auto updateVisibility = [restart, viewManager]() -+ { -+ auto* step = viewManager->currentStep(); -+ const bool inExec = qobject_cast< Calamares::ExecutionViewStep* >( step ) != nullptr; -+ const bool onFinish = step && step->isAtEnd() && !step->isNextEnabled(); -+ restart->setVisible( !inExec && !onFinish ); -+ }; -+ QObject::connect( viewManager, &Calamares::ViewManager::currentStepChanged, restart, updateVisibility ); -+ updateVisibility(); -+ } -+ - bottomLayout->addStretch(); - - // Create buttons and sets an initial icon; the icons may change -@@ -272,7 +347,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/0004-raveos-telepites-haladas.patch b/raveos-calamares/0004-raveos-telepites-haladas.patch new file mode 100644 index 0000000..c5bd208 --- /dev/null +++ b/raveos-calamares/0004-raveos-telepites-haladas.patch @@ -0,0 +1,54 @@ +--- a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp ++++ b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp +@@ -15,6 +15,7 @@ + + #include "Branding.h" + #include "CalamaresConfig.h" ++#include "GlobalStorage.h" + #include "Job.h" + #include "JobQueue.h" + #include "Settings.h" +@@ -108,7 +109,28 @@ + barLayout->addWidget( m_progressBar ); + barLayout->addWidget( toolBar ); + ++ m_progressBar->hide(); ++ m_label->hide(); ++ toolBar->hide(); ++ + connect( JobQueue::instance(), &JobQueue::progress, this, &ExecutionViewStep::updateFromJobQueue ); ++ ++ if ( auto* gs = JobQueue::instance()->globalStorage() ) ++ { ++ connect( gs, ++ &GlobalStorage::changed, ++ this, ++ [ this, gs ]() ++ { ++ const bool naploKell = gs->value( QStringLiteral( "raveosNaplo" ) ).toBool(); ++ const bool naploLatszik = m_tab_widget->currentIndex() == 1; ++ if ( naploKell != naploLatszik ) ++ { ++ toggleLog(); ++ } ++ }, ++ Qt::QueuedConnection ); ++ } + } + + QString +@@ -217,6 +239,14 @@ + { + m_label->setText( message ); + } ++ if ( auto* gs = JobQueue::instance()->globalStorage() ) ++ { ++ gs->insert( QStringLiteral( "raveosHaladas" ), percent ); ++ if ( !message.isEmpty() ) ++ { ++ gs->insert( QStringLiteral( "raveosUzenet" ), message ); ++ } ++ } + } + + void diff --git a/raveos-calamares/0005-raveos-qml-forditas.patch b/raveos-calamares/0005-raveos-qml-forditas.patch new file mode 100644 index 0000000..286b4a1 --- /dev/null +++ b/raveos-calamares/0005-raveos-qml-forditas.patch @@ -0,0 +1,75 @@ +--- a/src/calamares/CalamaresWindow.cpp ++++ b/src/calamares/CalamaresWindow.cpp +@@ -319,6 +319,7 @@ + w->setSource( + QUrl( Calamares::searchQmlFile( Calamares::QmlSearch::Both, QStringLiteral( "calamares-sidebar" ) ) ) ); + setDimension( w, o, desiredWidth ); ++ CALAMARES_RETRANSLATE_FOR( w, w->engine()->retranslate(); ); + return w; + } + +@@ -338,6 +339,7 @@ + w->setSource( + QUrl( Calamares::searchQmlFile( Calamares::QmlSearch::Both, QStringLiteral( "calamares-navigation" ) ) ) ); + setDimension( w, o, desiredWidth ); ++ CALAMARES_RETRANSLATE_FOR( w, w->engine()->retranslate(); ); + return w; + } + #else +--- a/src/libcalamaresui/ViewManager.cpp ++++ b/src/libcalamaresui/ViewManager.cpp +@@ -92,6 +92,16 @@ + connect( JobQueue::instance(), &JobQueue::finished, this, &ViewManager::next ); + + CALAMARES_RETRANSLATE_SLOT( &ViewManager::updateButtonLabels ); ++ CALAMARES_RETRANSLATE( QMetaObject::invokeMethod( ++ this, ++ [ this ]() ++ { ++ if ( rowCount() > 0 ) ++ { ++ emit dataChanged( index( 0 ), index( rowCount() - 1 ) ); ++ } ++ }, ++ Qt::QueuedConnection ); ); + + #ifdef PRESERVE_FOR_TRANSLATION_PURPOSES + tr( "&Yes" ); +--- a/src/libcalamaresui/viewpages/QmlViewStep.cpp ++++ b/src/libcalamaresui/viewpages/QmlViewStep.cpp +@@ -17,6 +17,7 @@ + #include "utils/Logger.h" + #include "utils/NamedEnum.h" + #include "utils/Qml.h" ++#include "utils/Retranslator.h" + #include "utils/Variant.h" + #include "widgets/WaitingWidget.h" + +@@ -87,6 +88,7 @@ + layout->addWidget( m_spinner ); + + m_qmlEngine->addImportPath( Calamares::qmlModulesDir().absolutePath() ); ++ CALAMARES_RETRANSLATE( m_qmlEngine->retranslate(); ); + + // QML Loading starts when the configuration for the module is set. + } +@@ -156,17 +158,8 @@ + QSize + QmlViewStep::widgetMargins( Qt::Orientations panelSides ) + { +- // If any panels around it, use the standard, but if all the +- // panels are hidden, like on full-screen with subsumed navigation, +- // then no margins. +- if ( panelSides ) +- { +- return ViewStep::widgetMargins( panelSides ); +- } +- else +- { +- return QSize( 0, 0 ); +- } ++ Q_UNUSED( panelSides ) ++ return QSize( 0, 0 ); + } + + void diff --git a/raveos-calamares/0006-raveos-lepesre-ugras.patch b/raveos-calamares/0006-raveos-lepesre-ugras.patch new file mode 100644 index 0000000..820ead9 --- /dev/null +++ b/raveos-calamares/0006-raveos-lepesre-ugras.patch @@ -0,0 +1,51 @@ +--- a/src/libcalamaresui/ViewManager.h ++++ b/src/libcalamaresui/ViewManager.h +@@ -146,6 +146,8 @@ + * have any pages before the current one. + */ + void back(); ++ ++ void goBackTo( int index ); + bool backEnabled() const + { + return m_backEnabled; ///< Is the back-button to be enabled +--- a/src/libcalamaresui/ViewManager.cpp ++++ b/src/libcalamaresui/ViewManager.cpp +@@ -468,6 +468,37 @@ + } + + void ++ViewManager::goBackTo( int index ) ++{ ++ if ( !currentStepValid() || index < 0 || index >= m_currentStep ) ++ { ++ return; ++ } ++ for ( int i = index; i <= m_currentStep; ++i ) ++ { ++ if ( stepIsExecute( m_steps, i ) ) ++ { ++ return; ++ } ++ } ++ ++ ViewStep* step = m_steps.at( m_currentStep ); ++ m_currentStep = index; ++ m_stack->setCurrentIndex( m_currentStep ); ++ step->onLeave(); ++ m_steps.at( m_currentStep )->onActivate(); ++ emit currentStepChanged(); ++ ++ UPDATE_NEXT_BUTTON_PROPERTY( m_steps.at( m_currentStep ), m_steps.at( m_currentStep )->isNextEnabled() ); ++ UPDATE_BUTTON_PROPERTY( backEnabled, ++ ( m_currentStep == 0 && m_steps.first()->isAtBeginning() ) ++ ? false ++ : m_steps.at( m_currentStep )->isBackEnabled() ); ++ ++ updateButtonLabels(); ++} ++ ++void + ViewManager::back() + { + if ( !currentStepValid() ) diff --git a/raveos-calamares/0007-raveos-naplo-hozzajarulas.patch b/raveos-calamares/0007-raveos-naplo-hozzajarulas.patch new file mode 100644 index 0000000..91d835a --- /dev/null +++ b/raveos-calamares/0007-raveos-naplo-hozzajarulas.patch @@ -0,0 +1,263 @@ +--- a/src/libcalamaresui/ViewManager.cpp ++++ b/src/libcalamaresui/ViewManager.cpp +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #define UPDATE_BUTTON_PROPERTY( name, value ) \ + do \ +@@ -171,12 +172,14 @@ + QString heading = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed", "@title" ) + : tr( "Installation Failed", "@title" ); + +- ErrorDialog* errorDialog = new ErrorDialog(); ++ ErrorDialog* errorDialog = new ErrorDialog( m_widget->window() ); ++ errorDialog->setWindowModality( Qt::ApplicationModal ); + errorDialog->setWindowTitle( tr( "Error", "@title" ) ); + errorDialog->setHeading( "" + heading + "" ); + errorDialog->setInformativeText( message ); + errorDialog->setShouldOfferWebPaste( Calamares::Branding::instance()->uploadServer() ); + errorDialog->setDetails( details ); ++ errorDialog->adjustSize(); + errorDialog->show(); + + cDebug() << "Calamares will quit when the dialog closes."; +@@ -184,9 +187,10 @@ + &QDialog::finished, + [ errorDialog ]( int result ) + { +- if ( result == QDialog::Accepted && errorDialog->shouldOfferWebPaste() ) ++ if ( result == QDialog::Accepted && errorDialog->shouldOfferWebPaste() ++ && !Calamares::Paste::doLogUploadUI( errorDialog->parentWidget() ).isEmpty() ) + { +- Calamares::Paste::doLogUploadUI( errorDialog ); ++ QProcess::startDetached( QStringLiteral( "systemctl" ), { QStringLiteral( "reboot" ) } ); + } + #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + QApplication::quit(); +--- a/src/libcalamaresui/widgets/ErrorDialog.cpp ++++ b/src/libcalamaresui/widgets/ErrorDialog.cpp +@@ -12,6 +12,7 @@ + + #include "widgets/TranslationFix.h" + #include ++#include + #include + + namespace Calamares +@@ -25,6 +26,7 @@ + ui->iconLabel->setPixmap( QIcon::fromTheme( "dialog-error" ).pixmap( 64 ) ); + ui->detailsWidget->hide(); + ui->offerWebPasteLabel->hide(); ++ ui->detailsBrowser->setMinimumHeight( 180 ); + } + + ErrorDialog::~ErrorDialog() +@@ -98,6 +100,15 @@ + ui->buttonBox->setStandardButtons( m_shouldOfferWebPaste ? ( QDialogButtonBox::Yes | QDialogButtonBox::No ) + : QDialogButtonBox::Close ); + fixButtonLabels( ui->buttonBox ); ++ if ( m_shouldOfferWebPaste ) ++ { ++ QPushButton* nem = ui->buttonBox->button( QDialogButtonBox::No ); ++ nem->setDefault( true ); ++ nem->setFocus(); ++ ui->offerWebPasteLabel->setMinimumWidth( 520 ); ++ ui->offerWebPasteLabel->setMinimumHeight( ui->offerWebPasteLabel->heightForWidth( 520 ) ); ++ adjustSize(); ++ } + + emit shouldOfferWebPasteChanged(); + } +--- a/src/libcalamaresui/widgets/ErrorDialog.ui ++++ b/src/libcalamaresui/widgets/ErrorDialog.ui +@@ -53,8 +53,15 @@ + + + +- Would you like to paste the install log to the web? ++ Would you like to send the installation log to the RaveOS developers? It helps us find and fix the problem. ++ ++The log contains the steps of the installer and their error messages, your hardware (processor, graphics card, disks and partitions), the settings you chose (language, time zone, keyboard, desktop, user name and computer name) and the output of the package installation. It contains no passwords. ++ ++It is sent over an encrypted connection, only the RaveOS developers can see it, and it is deleted automatically after 30 days. + ++ ++ true ++ + + + +--- a/src/libcalamaresui/utils/Paste.cpp ++++ b/src/libcalamaresui/utils/Paste.cpp +@@ -17,9 +17,17 @@ + + #include + #include ++#include + #include + #include ++#include ++#include + #include ++#include ++#include ++#include ++#include ++#include + #include + #include + #include +@@ -115,6 +123,66 @@ + } + } + ++STATICTEST QByteArray ++raveosHardwareSummary() ++{ ++ static QByteArray summary; ++ static bool collected = false; ++ if ( collected ) ++ { ++ return summary; ++ } ++ collected = true; ++ const QString script = QStringLiteral( "/etc/calamares/modules/raveos-hwinfo.sh" ); ++ if ( !QFileInfo::exists( script ) ) ++ { ++ return QByteArray(); ++ } ++ QProcess process; ++ process.start( QStringLiteral( "/bin/bash" ), { script } ); ++ if ( !process.waitForFinished( 15000 ) ) ++ { ++ process.kill(); ++ process.waitForFinished(); ++ cWarning() << "Hardware summary timed out"; ++ return QByteArray(); ++ } ++ summary = process.readAllStandardOutput(); ++ return summary; ++} ++ ++STATICTEST QString ++raveosLogUpload( const QByteArray& logData, const QUrl& serverUrl ) ++{ ++ const QByteArray pasteData = raveosHardwareSummary() + logData; ++ QNetworkAccessManager manager; ++ QNetworkRequest request( serverUrl ); ++ request.setHeader( QNetworkRequest::ContentTypeHeader, QStringLiteral( "text/plain; charset=utf-8" ) ); ++ request.setTransferTimeout( 60000 ); ++ ++ QNetworkReply* reply = manager.post( request, pasteData ); ++ QEventLoop loop; ++ QObject::connect( reply, &QNetworkReply::finished, &loop, &QEventLoop::quit ); ++ loop.exec( QEventLoop::ExcludeUserInputEvents ); ++ ++ const QByteArray response = reply->readAll(); ++ const QNetworkReply::NetworkError error = reply->error(); ++ delete reply; ++ ++ if ( error != QNetworkReply::NoError ) ++ { ++ cError() << "Log upload failed" << error; ++ return QString(); ++ } ++ ++ const QString identifier = QJsonDocument::fromJson( response ).object().value( QStringLiteral( "azonosito" ) ).toString(); ++ if ( identifier.isEmpty() ) ++ { ++ cError() << "No identifier from log upload server"; ++ } ++ return identifier; ++} ++ + QString + Calamares::Paste::doLogUpload( QObject* parent ) + { +@@ -149,6 +217,10 @@ + cWarning() << "No upload configured."; + return QString(); + case Calamares::Branding::UploadServerType::Fiche: ++ if ( serverUrl.scheme() == QStringLiteral( "https" ) ) ++ { ++ return raveosLogUpload( pasteData, serverUrl ); ++ } + return ficheLogUpload( pasteData, serverUrl, parent ); + } + return QString(); +@@ -157,32 +229,52 @@ + QString + Calamares::Paste::doLogUploadUI( QWidget* parent ) + { +- // These strings originated in the ViewManager class +- QString pasteUrl = Calamares::Paste::doLogUpload( parent ); +- QString pasteUrlMessage; +- if ( pasteUrl.isEmpty() ) ++ QString pasteUrl; ++ while ( true ) + { +- pasteUrlMessage = QCoreApplication::translate( "Calamares::ViewManager", +- "The upload was unsuccessful. No web-paste was done." ); +- } +- else +- { +- QClipboard* clipboard = QApplication::clipboard(); +- clipboard->setText( pasteUrl, QClipboard::Clipboard ); +- +- if ( clipboard->supportsSelection() ) ++ QApplication::setOverrideCursor( Qt::WaitCursor ); ++ pasteUrl = Calamares::Paste::doLogUpload( parent ); ++ QApplication::restoreOverrideCursor(); ++ if ( !pasteUrl.isEmpty() ) + { +- clipboard->setText( pasteUrl, QClipboard::Selection ); ++ break; + } +- QString pasteUrlFmt = QCoreApplication::translate( "Calamares::ViewManager", +- "Install log posted to\n\n%1\n\nLink copied to clipboard" ); +- pasteUrlMessage = pasteUrlFmt.arg( pasteUrl ); ++ QMessageBox retry( QMessageBox::Warning, ++ QCoreApplication::translate( "Calamares::ViewManager", "Installation log" ), ++ QCoreApplication::translate( "Calamares::ViewManager", ++ "The installation log could not be sent. There is probably no " ++ "internet connection.\n\nCheck the network connection and " ++ "try again." ), ++ QMessageBox::Retry | QMessageBox::Close, ++ parent ); ++ Calamares::fixButtonLabels( &retry ); ++ retry.button( QMessageBox::Retry ) ++ ->setText( QCoreApplication::translate( "Calamares::ViewManager", "Try again" ) ); ++ retry.setDefaultButton( QMessageBox::Retry ); ++ if ( retry.exec() != QMessageBox::Retry ) ++ { ++ return QString(); ++ } + } + +- QMessageBox mb( QMessageBox::Critical, +- QCoreApplication::translate( "Calamares::ViewManager", "Install Log Paste URL" ), ++ QClipboard* clipboard = QApplication::clipboard(); ++ clipboard->setText( pasteUrl, QClipboard::Clipboard ); ++ if ( clipboard->supportsSelection() ) ++ { ++ clipboard->setText( pasteUrl, QClipboard::Selection ); ++ } ++ ++ const QString pasteUrlMessage ++ = QCoreApplication::translate( ++ "Calamares::ViewManager", ++ "The installation log has been sent to the RaveOS developers.\n\nIdentifier: %1\n\nThank you!" ) ++ .arg( pasteUrl ); ++ ++ QMessageBox mb( QMessageBox::Information, ++ QCoreApplication::translate( "Calamares::ViewManager", "Installation log" ), + pasteUrlMessage, +- QMessageBox::Ok ); ++ QMessageBox::Ok, ++ parent ); + Calamares::fixButtonLabels( &mb ); + mb.exec(); + return pasteUrl; diff --git a/raveos-calamares/PKGBUILD b/raveos-calamares/PKGBUILD index 2157aa6..9a87a09 100644 --- a/raveos-calamares/PKGBUILD +++ b/raveos-calamares/PKGBUILD @@ -4,7 +4,7 @@ _pkgname="calamares" pkgname="$_pkgname" pkgver=3.4.2 -pkgrel=14 +pkgrel=15 pkgdesc="Distribution-independent installer framework" url="https://codeberg.org/Calamares/calamares" license=("GPL-3.0-or-later") @@ -12,6 +12,7 @@ arch=('x86_64') depends=( 'kcoreaddons' + 'kcrash' 'kpmcore' 'libpwquality' 'python' @@ -32,17 +33,29 @@ _pkgext="tar.gz" source=("$_pkgname-$pkgver.$_pkgext"::"$url/releases/download/v$pkgver/$_pkgname-$pkgver.$_pkgext" "0001-support-yay.patch" "0002-limit-translations.patch" - "0003-restart-button.patch") + "0003-raveos-panelek.patch" + "0004-raveos-telepites-haladas.patch" + "0005-raveos-qml-forditas.patch" + "0006-raveos-lepesre-ugras.patch" + "0007-raveos-naplo-hozzajarulas.patch") sha256sums=('733bbbb00dc9f84874bd5c22960952f317ea2537565431179fa2152b2fbfdccc' - 'SKIP' - 'SKIP' - 'SKIP') + '286a652c3666f5390010c60225bb54077d484639c7c9a1ab5eb693013361e8c2' + '06560b7e9ce9ae84c2f2af91b68b9051a89d58ef6da552632d41912e674dd7d6' + '0c15377385f5c87db25f464c5c8369322bf7865226c8af7f2df37d6be8d0e0d0' + 'd3aade3c7aba9b640753c40bfde9187c00b43b81e8be68a3d05a5e62ad9b2568' + '6498f0b475bfa32f7689cfb1ec5db98bf94f1a47f4bfb31404da155eae079dcf' + '9a1af33283744af9a1c9bf4199bdc12361e3bdb5052e7ffd604b7328a7c30775' + '8eb6adc2985e4c0a3e3ae2f691c76523e318ebab0e8c56f1675ec2ecf96d962c') 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 + patch -Np1 -i ../0003-raveos-panelek.patch + patch -Np1 -i ../0004-raveos-telepites-haladas.patch + patch -Np1 -i ../0005-raveos-qml-forditas.patch + patch -Np1 -i ../0006-raveos-lepesre-ugras.patch + patch -Np1 -i ../0007-raveos-naplo-hozzajarulas.patch # Copy across the custom images cp -a ${startdir}/images/partition-alongside.svg $srcdir/$_pkgname-$pkgver/data/images/partition-alongside.svg -- cgit v1.3