From 476a576ddaa51892ac4dd10a01b315f7102af54b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 2 Apr 2020 15:48:43 +0200 Subject: [PATCH] [libcalamaresui] Ensure all button labels are accurate - since lots of state is updated when the labels change, call that in the constructor so that any QML bindings get current values. --- src/libcalamaresui/ViewManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 79b4a244f..e80d4afd8 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -94,12 +94,12 @@ ViewManager::ViewManager( QObject* parent ) m_stack->setContentsMargins( 0, 0, 0, 0 ); mainLayout->addWidget( m_stack ); - CALAMARES_RETRANSLATE_SLOT( &ViewManager::updateButtonLabels ) + updateButtonLabels(); connect( JobQueue::instance(), &JobQueue::failed, this, &ViewManager::onInstallationFailed ); connect( JobQueue::instance(), &JobQueue::finished, this, &ViewManager::next ); - UPDATE_BUTTON_PROPERTY( quitVisible, !Calamares::Settings::instance()->disableCancel() ) + CALAMARES_RETRANSLATE_SLOT( &ViewManager::updateButtonLabels ) }