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

[welcome] Switch API for buttons to an enum + string

Browse Source 
- Handle buttons and their URL-opening in a more
   general way with an enum; drop existing three-boot
   method and special setupDonateButton()
 - Doesn't compile because consumers haven't changed.
This commit is contained in:
Adriaan de Groot 2019-08-13 22:43:11 +02:00
parent 03e506a826
commit 64d4b0a46c
2 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/modules/welcome/WelcomePage.cpp
View File

@ -32,6 +32,7 @@
#include "modulesystem/ModuleManager.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h"
#include "utils/NamedEnum.h"
#include "utils/Retranslator.h"
#include <QApplication>
@ -244,27 +245,59 @@ WelcomePage::setUpLinks( bool showSupportUrl, bool showKnownIssuesUrl, bool show
void
WelcomePage::setupDonateButton( const QString& url )
WelcomePage::setupButton( Button role, const QString& url )
{
QPushButton* button = nullptr;
CalamaresUtils::ImageType icon = CalamaresUtils::Information;
switch ( role )
{
case Button::Donate:
button = ui->donateButton;
icon = CalamaresUtils::Donate;
break;
case Button::KnownIssues:
button = ui->knownIssuesButton;
icon = CalamaresUtils::Bugs;
break;
case Button::ReleaseNotes:
button = ui->releaseNotesButton;
icon = CalamaresUtils::Release;
break;
case Button::Support:
button = ui->supportButton;
icon = CalamaresUtils::Help;
break;
}
if ( !button )
{
qWarning() << "Unknown button role" << smash( role );
return;
}
if ( url.isEmpty() )
{
ui->donateButton->hide();
button->hide();
return;
}
QUrl u( url );
if ( u.isValid() )
{
ui->donateButton->setIcon( CalamaresUtils::defaultPixmap(
CalamaresUtils::Donate,
CalamaresUtils::Original,
2 * QSize( CalamaresUtils::defaultFontHeight(), CalamaresUtils::defaultFontHeight() ) ) );
connect( ui->donateButton, &QPushButton::clicked, [u]() { QDesktopServices::openUrl( u ); } );
auto size = 2 * QSize( CalamaresUtils::defaultFontHeight(), CalamaresUtils::defaultFontHeight() ) );
button->setIcon( CalamaresUtils::defaultPixmap(
icon,
CalamaresUtils::Original,size
);
connect( button, &QPushButton::clicked, [u]()
{
QDesktopServices::openUrl( u );
} );
}
else
{
qWarning() << "Donate URL" << url << "is invalid.";
ui->donateButton->hide();
qWarning() << "Welcome button" << smash( role ) << "URL" << url << "is invalid.";
button->hide();
}
}

14
src/modules/welcome/WelcomePage.h
View File

@ -38,10 +38,16 @@ class WelcomePage : public QWidget
public:
explicit WelcomePage( QWidget* parent = nullptr );
/// @brief Configure the buttons for URLs from the branding configuration
void setUpLinks( bool showSupportUrl, bool showKnownIssuesUrl, bool showReleaseNotesUrl );
/// @brief Configure the "Donate" button
void setupDonateButton( const QString& );
enum class Button
{
Support,
Donate,
KnownIssues,
ReleaseNotes
};
/// @brief Configure the button @p n, to open @p url
void setupButton( Button b, const QString& url );
/// @brief Set international language-selector icon
void setLanguageIcon( QPixmap );