Commit d197aaef authored by Philip Müller's avatar Philip Müller Committed by GitHub

Merge pull request #109 from sanchitsamuel/ux_improvement

Reverting back to buttons
parents ace7f1cd ede96e92
......@@ -51,7 +51,7 @@ QString
MhwdCommon::getButtonFreeText()
{
QString text = QString( tr ( "Auto Install Open-Source Driver" ) );
return QString ( "<a href=\"#\">" + text + "</a>" );
return QString ( text );
}
......@@ -59,7 +59,7 @@ QString
MhwdCommon::getButtonNonFreeText()
{
QString text = QString( tr ( "Auto Install Proprietary Driver" ) );
return QString ( "<a href=\"#\">" + text + "</a>" );
return QString ( text );
}
......
......@@ -46,17 +46,15 @@ MhwdPage::MhwdPage( QWidget* parent ) :
ui->buttonInstallNonFree->setText( MhwdCommon::getButtonNonFreeText() );
// Connect signals and slots
connect( ui->buttonInstallFree, &QLabel::linkActivated,
[=] ( const QString& link )
connect( ui->buttonInstallFree, &QPushButton::clicked,
[=] ( )
{
Q_UNUSED( link )
MhwdCommon::installFreeConfiguration();
load();
} );
connect( ui->buttonInstallNonFree, &QLabel::linkActivated,
[=] ( const QString& link )
connect( ui->buttonInstallNonFree, &QPushButton::clicked,
[=] ( )
{
Q_UNUSED( link )
MhwdCommon::installNonFreeConfiguration();
load();
} );
......
......@@ -27,43 +27,24 @@
<number>11</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0">
<property name="spacing">
<number>10</number>
</property>
<item>
<widget class="QLabel" name="buttonInstallFree">
<widget class="QPushButton" name="buttonInstallNonFree">
<property name="text">
<string/>
<string>Auto Install Proprietary Driver</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="buttonInstallNonFree">
<widget class="QPushButton" name="buttonInstallFree">
<property name="text">
<string/>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
<string>Auto Install Open-Source Driver</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>2</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment