From bf50f8724db62b7b656523c34a1295b6d2a7847c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 18 Oct 2020 21:58:54 +0200 Subject: [PATCH 1/2] Changes: post-release housekeeping --- CHANGES | 12 ++++++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 84b7d545d..911f7156e 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.33 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - No external contributors yet + +## Core ## + - No core changes yet + +## Modules ## + - No module changes yet + + # 3.2.32.1 (2020-10-17) # This is a release to address source-incompatible changes in KPMcore 4.2.0, diff --git a/CMakeLists.txt b/CMakeLists.txt index 64acdece3..99f6cd42a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,10 +41,10 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.32.1 + VERSION 3.2.33 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # From 0cb6c89876f88e17a364df38264df9371c3c320a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 20 Oct 2020 23:15:32 +0200 Subject: [PATCH 2/2] [netinstall] Don't update selection state for items with no children The special setup for nicely-named groups which have a single hidden subgroup containing the actual packages, has the problem that there is a non-empty subgroups item, but this results in zero actual children: then the number of selected and partly selected children is also zero in updateSelected() and therefore the item ends up unselected. Special-case this to avoid unnecessarily unselecting the item. Reported by Vitor L. --- src/modules/netinstall/PackageModel.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp index 147bd5a5c..d4887b6c2 100644 --- a/src/modules/netinstall/PackageModel.cpp +++ b/src/modules/netinstall/PackageModel.cpp @@ -267,8 +267,13 @@ PackageModel::setupModelData( const QVariantList& groupList, PackageTreeItem* pa setupModelData( subgroups, item ); // The children might be checked while the parent isn't (yet). // Children are added to their parent (below) without affecting - // the checked-state -- do it manually. - item->updateSelected(); + // the checked-state -- do it manually. Items with subgroups + // but no children have only hidden children -- those get + // handled specially. + if ( item->childCount() > 0 ) + { + item->updateSelected(); + } } else {