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

[netinstall] Support selecting visible groups by default.

Browse Source 
In other words, support:
  hidden: false
  selected: true
groups.

This was supposed to work according to README.md, but not actually
implemented. Now it should be working.
This commit is contained in:
Kevin Kofler 2016-11-02 05:58:00 +01:00
parent c09e7030db
commit 075577d948
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/netinstall/NetInstallPage.cpp
View File

@ -111,7 +111,7 @@ NetInstallPage::dataIsHere( QNetworkReply* reply )
continue; continue;
} }
GroupSelectionWidget* groupWidget = new GroupSelectionWidget( group.name, group.description, group.packages, this ); GroupSelectionWidget* groupWidget = new GroupSelectionWidget( group.name, group.description, group.packages, group.selected, this );
m_groupWidgets.insert( groupKey, groupWidget ); m_groupWidgets.insert( groupKey, groupWidget );
ui->groupswidget->layout()->addWidget( groupWidget ); ui->groupswidget->layout()->addWidget( groupWidget );

3
src/modules/netinstall/widgets/groupselectionwidget.cpp
View File

@ -20,7 +20,7 @@
#include <QtDebug> #include <QtDebug>
GroupSelectionWidget::GroupSelectionWidget( QString name, QString description, QStringList packages, QWidget* parent ) : GroupSelectionWidget::GroupSelectionWidget( QString name, QString description, QStringList packages, bool selected, QWidget* parent ) :
QWidget( parent ), QWidget( parent ),
m_isToggled( false ) m_isToggled( false )
{ {
@ -29,6 +29,7 @@ GroupSelectionWidget::GroupSelectionWidget( QString name, QString description, Q
connect( ui.group, &QCheckBox::toggled, this, &GroupSelectionWidget::toggleGroup ); connect( ui.group, &QCheckBox::toggled, this, &GroupSelectionWidget::toggleGroup );
ui.group->setText( name ); ui.group->setText( name );
ui.group->setChecked( selected ); // also triggers the toggleGroup slot
ui.description->setText( description ); ui.description->setText( description );
const int columns = 4; const int columns = 4;
const int rows = ( packages.size() - 1 ) / columns + 1; const int rows = ( packages.size() - 1 ) / columns + 1;

2
src/modules/netinstall/widgets/groupselectionwidget.h
View File

@ -29,7 +29,7 @@ class GroupSelectionWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit GroupSelectionWidget( QString name, QString description, QStringList packages, QWidget* parent = nullptr ); explicit GroupSelectionWidget( QString name, QString description, QStringList packages, bool selected, QWidget* parent = nullptr );
// Current status of the group: is it selected in the view? // Current status of the group: is it selected in the view?
bool isToggled() const; bool isToggled() const;