mirror of
https://github.com/parchlinux/calamares.git
synced 2025-06-27 17:35:37 -04:00
Merge remote-tracking branch 'upstream/master' into partition-layout
This commit is contained in:
commit
5cacc0ddc6
39 changed files with 773 additions and 482 deletions
|
@ -2,6 +2,7 @@
|
|||
*
|
||||
* Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
|
||||
* Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
|
||||
* Copyright 2019, Collabora Ltd
|
||||
*
|
||||
* Calamares is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1471,3 +1472,16 @@ ChoicePage::updateSwapChoicesTr(QComboBox* box)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
ChoicePage::lastSelectedDeviceIndex()
|
||||
{
|
||||
return m_lastSelectedDeviceIndex;
|
||||
}
|
||||
|
||||
void
|
||||
ChoicePage::setLastSelectedDeviceIndex( int index )
|
||||
{
|
||||
m_lastSelectedDeviceIndex = index;
|
||||
m_drivesCombo->setCurrentIndex( m_lastSelectedDeviceIndex );
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue