napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[calamares] Add 'about calamares' button alongside the debug-button

Browse Source
This commit is contained in:
Adriaan de Groot 2022-05-29 15:22:02 +02:00
parent 04121892cf
commit 006c3f99e6
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES-3.2
View File

@ -36,6 +36,7 @@ or translations are expected. This is also the final release done
- *partition* will cycle out a LUKS key if all the key slots are in use
and a new key is added, rather than crashing the installer. (Thanks Arjen)
# 3.2.58.2 (2022-05-24)
This is a extra-quick release for an issue that shows up when using a

27
src/calamares/CalamaresWindow.cpp
View File

@ -130,14 +130,37 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
tv->setFocusPolicy( Qt::NoFocus );
sideLayout->addWidget( tv );
QHBoxLayout* extraButtons = new QHBoxLayout;
sideLayout->addLayout( extraButtons );
const int defaultFontHeight = CalamaresUtils::defaultFontHeight();
if ( /* About-Calamares Button enabled */ true )
{
QPushButton* aboutDialog = new QPushButton;
aboutDialog->setObjectName( "aboutDialogButton" );
aboutDialog->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,
CalamaresUtils::Original,
2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
CALAMARES_RETRANSLATE_FOR(
aboutDialog,
aboutDialog->setToolTip( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(),
"Show information about Calamares" ) ); );
extraButtons->addWidget( aboutDialog );
aboutDialog->setFlat( true );
aboutDialog->setCheckable( true );
QObject::connect( aboutDialog, &QPushButton::clicked, debug, &Calamares::DebugWindowManager::show );
}
if ( debug && debug->enabled() )
{
QPushButton* debugWindowBtn = new QPushButton;
debugWindowBtn->setObjectName( "debugButton" );
debugWindowBtn->setIcon( CalamaresUtils::defaultPixmap(
CalamaresUtils::Bugs, CalamaresUtils::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
CALAMARES_RETRANSLATE_FOR( debugWindowBtn,
debugWindowBtn->setText( QCoreApplication::translate(
debugWindowBtn->setToolTip( QCoreApplication::translate(
CalamaresWindow::staticMetaObject.className(), "Show debug information" ) ); );
sideLayout->addWidget( debugWindowBtn );
extraButtons->addWidget( debugWindowBtn );
debugWindowBtn->setFlat( true );
debugWindowBtn->setCheckable( true );
QObject::connect( debugWindowBtn, &QPushButton::clicked, debug, &Calamares::DebugWindowManager::show );