OSDN Git Service
Adriaan de Groot [Mon, 2 Nov 2020 12:08:30 +0000 (13:08 +0100)]
Merge branch 'issue-1523' into calamares
Adriaan de Groot [Mon, 2 Nov 2020 11:27:50 +0000 (12:27 +0100)]
[users] Run an expected-to-fail test in creating groups
Adriaan de Groot [Mon, 2 Nov 2020 11:11:13 +0000 (12:11 +0100)]
[users] Expand tests for groups a little
Adriaan de Groot [Mon, 2 Nov 2020 11:01:02 +0000 (12:01 +0100)]
CMake: comment on BUILD_AS_TEST
Adriaan de Groot [Mon, 2 Nov 2020 10:43:07 +0000 (11:43 +0100)]
Merge pull request #1561 from gportay/partition-set-swap-partition-name
[partition] Allow a configurable swap Partition name
Adriaan de Groot [Mon, 2 Nov 2020 10:39:44 +0000 (11:39 +0100)]
Merge pull request #1562 from gportay/partition-group-efi-things-together
[partition] Group EFI things together
Adriaan de Groot [Sun, 1 Nov 2020 16:59:41 +0000 (17:59 +0100)]
[libcalamares] Fix tests failures from JobQueue asserts
Some compile flags changed recently, triggering assert()
in the jobqueue when there is more than one. There's no
real reason for JobQueue to be a singleton, but it wants
to be. So clean up pointers a little more enthusiastically.
Adriaan de Groot [Sat, 31 Oct 2020 23:33:59 +0000 (00:33 +0100)]
Merge branch 'partition-warnings' into calamares
Adriaan de Groot [Sat, 31 Oct 2020 23:20:17 +0000 (00:20 +0100)]
[partition] Reduce warnings from KPMCore
- make KPMHelper.h an "everything include" and suppress warnings
from it, then use it in the tests.
Adriaan de Groot [Sat, 31 Oct 2020 23:05:05 +0000 (00:05 +0100)]
[partition] Reduce warnings
- Add a helper header that munges the warnings-settings so that
KPMcore headers can be included.
Adriaan de Groot [Sat, 31 Oct 2020 22:48:20 +0000 (23:48 +0100)]
[locale] Reduce warnings (C++17)
Now that Calamares is compiled as C++17, we get this:
src/modules/locale/timezonewidget/TimeZoneImage.cpp:28:55: warning: out-of-line definition of constexpr static data member is redundant in C++17 and is deprecated [-Wdeprecated]
/* static constexpr */ const QSize TimeZoneImageList::imageSize;
Adriaan de Groot [Sat, 31 Oct 2020 22:37:06 +0000 (23:37 +0100)]
[partition] Reduce warnings (Clang, FreeBSD)
The code doesn't match the comment: there are no by-ref captures
in the code, and the shadowing of parameters and local variables
is confusing. Remove one variable that is passed in as an argument
(and just pass the value as argument) and copy-capture the other
rather than doing weird argument passing.
Adriaan de Groot [Sat, 31 Oct 2020 22:16:48 +0000 (23:16 +0100)]
[partition] Reduce warnings (Clang, FreeBSD)
- remove unused this captures from lambda
- rename variables that are short, cryptic, and shadowed
- remove documentation for parameters that don't exist
Gaël PORTAY [Tue, 27 Oct 2020 13:59:18 +0000 (09:59 -0400)]
[partition] Group EFI things together
Adriaan de Groot [Sat, 31 Oct 2020 22:04:47 +0000 (23:04 +0100)]
Docs: fix the table
Gaël PORTAY [Sat, 31 Oct 2020 21:53:11 +0000 (17:53 -0400)]
[partition] Update partition.conf
Adriaan de Groot [Sat, 31 Oct 2020 21:53:47 +0000 (22:53 +0100)]
Docs: try to get the table of links right
Gaël PORTAY [Tue, 27 Oct 2020 11:16:39 +0000 (07:16 -0400)]
[partition] Allow a configurable swap Partition name
This commit adds the new configuration `swapPartitionName` to the file
partition.conf.
This option sets the partition name to the swap partition that is
created. If this option is unset, the partition is left unnamed.
Adriaan de Groot [Fri, 30 Oct 2020 11:36:57 +0000 (12:36 +0100)]
[keyboard] SPDX-tagging
Adriaan de Groot [Fri, 30 Oct 2020 21:30:38 +0000 (22:30 +0100)]
Merge pull request #1558 from gportay/partition-cleanups
[partition] cleanups
Adriaan de Groot [Fri, 30 Oct 2020 21:28:16 +0000 (22:28 +0100)]
Merge pull request #1559 from gportay/libcalamres-cleanups
[libcalamres] cleanups
Gaël PORTAY [Fri, 30 Oct 2020 14:15:30 +0000 (10:15 -0400)]
[partition] Rename execute to createPartitions
Gaël PORTAY [Fri, 30 Oct 2020 14:01:29 +0000 (10:01 -0400)]
[partition] Fix coding style
Gaël PORTAY [Thu, 29 Oct 2020 13:23:28 +0000 (09:23 -0400)]
Fix missing SPDX-FileCopyrightText in header
Gaël PORTAY [Mon, 22 Jun 2020 20:34:06 +0000 (16:34 -0400)]
[partition] Rename the KPMCore Partition local to part
Gaël PORTAY [Mon, 22 Jun 2020 17:56:57 +0000 (13:56 -0400)]
[partition] Rename iterator in for loop to entry
Gaël PORTAY [Mon, 22 Jun 2020 14:36:20 +0000 (10:36 -0400)]
[partition] Simplify the method execute
- Rename the "size" locals using "sectors" in their name. Size may be
confusing or not enough specific as it can be interpreted a size in
Byte.
partSizeMap -> partSectorsMap,
totalSize -> totalSectors,
availablesize -> availableSectors,
size -> sectors,
minSize -> minSectors
maxSize -> maxSectors
- Create a the new local currentSector to iterate over the sectors;
instead of using the parameter firstSector.
- Remove the variable end that does not help much; too many variable
already. Expand its expression instead.
Gaël PORTAY [Sun, 21 Jun 2020 22:02:04 +0000 (18:02 -0400)]
[partition] Introduce new constructors for PartitionEntry
- Introduces new constructors for PartitionEntry: copy constructory and
constructor with all attributes.
- Use the new constructor in method addEntry().
Gaël PORTAY [Sun, 21 Jun 2020 22:16:07 +0000 (18:16 -0400)]
[partition] Simplify the retrieval of the size attributes
- The variant helper toString() takes a default value since commit
c9f942ad6 ([libcalamares] Add default value to variant helpers).
- Set the default value to 0 and simplify the retreival of size values
by calling the helper toString() and removing the temporary variables.
Gaël PORTAY [Wed, 28 Oct 2020 15:38:01 +0000 (11:38 -0400)]
[libcalamares] Fix constness of functions
Gaël PORTAY [Wed, 28 Oct 2020 14:41:48 +0000 (10:41 -0400)]
[libcalamares] Fix coding style
Gaël PORTAY [Sun, 21 Jun 2020 22:20:26 +0000 (18:20 -0400)]
[partition] Remove the call the method contains
- The variant helper getString() calls contains() already.
Gaël PORTAY [Sat, 20 Jun 2020 03:06:38 +0000 (23:06 -0400)]
[partition] Move initLayout logic to object PartitionLayout
- The logic of the method initLayout belongs to the object
PartitionLayout. Move logic to that object.
- Use a single method initLayout in object PartitionCoreModule.
- Member m_partLayout in object PartitionCoreModule is no longer
allocated.
Gaël PORTAY [Mon, 22 Jun 2020 13:59:30 +0000 (09:59 -0400)]
[partition] Remove unused PartitionLayout constructor
- The constructor PartitionLayout with PartitionEntry appears to be
unused since its always. Drop it!
Gaël PORTAY [Sat, 20 Jun 2020 04:37:17 +0000 (00:37 -0400)]
[partition] Remove unused addEntry method
- The method addEntry with PartitionEntry appears to be unused since its
always. Drop it!
Adriaan de Groot [Fri, 30 Oct 2020 10:05:15 +0000 (11:05 +0100)]
[keyboard] Fix group-switcher multiplying
FIXES #1556
Adriaan de Groot [Thu, 29 Oct 2020 15:33:27 +0000 (16:33 +0100)]
Merge branch 'calamares' into issue-1523
Adriaan de Groot [Thu, 29 Oct 2020 14:57:53 +0000 (15:57 +0100)]
CI: use a larger tmpfs for the build (my local build/ is 112M)
Calamares CI [Thu, 29 Oct 2020 13:28:48 +0000 (14:28 +0100)]
i18n: [python] Automatic merge of Transifex translations
Calamares CI [Thu, 29 Oct 2020 13:28:48 +0000 (14:28 +0100)]
i18n: [desktop] Automatic merge of Transifex translations
Calamares CI [Thu, 29 Oct 2020 13:28:48 +0000 (14:28 +0100)]
i18n: [calamares] Automatic merge of Transifex translations
Adriaan de Groot [Thu, 29 Oct 2020 13:26:17 +0000 (14:26 +0100)]
Changes: add Vietnamese translation
Adriaan de Groot [Wed, 28 Oct 2020 16:07:19 +0000 (17:07 +0100)]
Changes: document Artem's work
Adriaan de Groot [Wed, 28 Oct 2020 16:03:57 +0000 (17:03 +0100)]
Merge branch 'fix-keyboardq' into calamares
This lands Artem's work on supporting non-ASCII layouts better,
which currently only applies to Russian layouts -- it works with
a table, so it is easy to extend for other layouts.
The QML and Widget steps now completely share the Config backend,
which is why there's so many commits here: the Widget page needed
to have most of its code ripped out, and the models for
keyboard data were broken in various ways and needed fixing.
FIXES #1211
Adriaan de Groot [Wed, 28 Oct 2020 16:00:12 +0000 (17:00 +0100)]
[keyboard] Reduce debugging output
Adriaan de Groot [Wed, 28 Oct 2020 15:51:34 +0000 (16:51 +0100)]
[keyboard] Simplify back down to lambdas
- With debugging and untangling done, the lambdas are simple
and short, so return to using them. One point of improvement
might be to give the models suitable slots themselves,
to avoid even this indirection.
Adriaan de Groot [Wed, 28 Oct 2020 15:47:52 +0000 (16:47 +0100)]
[keyboard] Sanity in setCurrentIndex() parameters
Adriaan de Groot [Wed, 28 Oct 2020 15:40:43 +0000 (16:40 +0100)]
[keyboard] Tidy up the debugging output, add docs
Adriaan de Groot [Wed, 28 Oct 2020 15:28:00 +0000 (16:28 +0100)]
[keyboard] Replace broken-ish variants model with k-v list
- Use the just-refactored XKBListModel to store the xkb key-value
pairs for variants, drop most of the complicated implementation,
store just a single list of values.
Adriaan de Groot [Wed, 28 Oct 2020 15:20:02 +0000 (16:20 +0100)]
[keyboard] Factor out a 2-column k-v list
Adriaan de Groot [Wed, 28 Oct 2020 14:34:47 +0000 (15:34 +0100)]
[keyboard] Use the models from Config
- Remove code that is duplicated in Config.
- Hook up UI for physical keyboard model, and back.
- For now, introduce some named slots with debugging output.
This makes debugging a lot easier since we have function names
to work with rather than anonymous lambdas
Adriaan de Groot [Wed, 28 Oct 2020 13:03:46 +0000 (14:03 +0100)]
[keyboard] Hook up the model-selection again
Adriaan de Groot [Wed, 28 Oct 2020 12:55:21 +0000 (13:55 +0100)]
[keyboard] Tear up connections between widgets and model
Adriaan de Groot [Wed, 28 Oct 2020 12:52:30 +0000 (13:52 +0100)]
[keyboard] Restore the notion of PC105 default index
Adriaan de Groot [Wed, 28 Oct 2020 12:41:34 +0000 (13:41 +0100)]
[keyboard] Apply coding style
Adriaan de Groot [Wed, 28 Oct 2020 12:41:21 +0000 (13:41 +0100)]
[keyboard] Re-do the keyboard physical models model from scratch
Adriaan de Groot [Wed, 28 Oct 2020 12:06:43 +0000 (13:06 +0100)]
[keyboard] Typo in comment
Adriaan de Groot [Wed, 28 Oct 2020 09:38:51 +0000 (10:38 +0100)]
[keyboard] Rename UI widgets to make code clearer
Adriaan de Groot [Wed, 28 Oct 2020 00:10:05 +0000 (01:10 +0100)]
[keyboard] Move remaining variables to Config
- Config already *has* everythind, but drop the useless copies
and duplicated code from the Page
- Plug the models model into the Page
- While here, document the model / layout / variant distinctions
The code doesn't fill the UI properly, and the drop-down
for the models combobox is not right, but at least the data
is shared.
Adriaan de Groot [Wed, 28 Oct 2020 00:07:49 +0000 (01:07 +0100)]
[keyboard] Matching of layouts is very suspect
Adriaan de Groot [Tue, 27 Oct 2020 23:04:40 +0000 (00:04 +0100)]
Merge branch 'calamares' into fix-keyboardq
Adriaan de Groot [Tue, 27 Oct 2020 21:11:23 +0000 (22:11 +0100)]
Merge pull request #1553 from LordTermor/calamares
Initial additional layout support for non-ASCII layouts
Artem Grinev [Tue, 27 Oct 2020 17:53:20 +0000 (20:53 +0300)]
[keyboard] Simplified variable name
Artem Grinev [Tue, 27 Oct 2020 17:48:18 +0000 (20:48 +0300)]
[keyboard] Minor logic rework
Artem Grinev [Tue, 27 Oct 2020 17:42:49 +0000 (20:42 +0300)]
[keyboard] Adjusted indents
Artem Grinev [Tue, 27 Oct 2020 17:38:04 +0000 (20:38 +0300)]
[keyboard] fixed typo
Adriaan de Groot [Tue, 27 Oct 2020 15:59:22 +0000 (16:59 +0100)]
[keyboard] Remove superfluous variable (set to true, never changed)
Artem Grinev [Tue, 27 Oct 2020 01:56:19 +0000 (04:56 +0300)]
[keyboard] Implemented X11 config writing for additional layout
Artem Grinev [Tue, 27 Oct 2020 01:53:05 +0000 (04:53 +0300)]
[keyboard] Fixed condition bug
Artem Grinev [Mon, 26 Oct 2020 15:30:24 +0000 (18:30 +0300)]
[keyboard] Added explanatory comment for xkbmap_query_grp_option
Artem Grinev [Mon, 26 Oct 2020 15:26:14 +0000 (18:26 +0300)]
[keyboard] Swapped primary and additional layouts in selection
Artem Grinev [Mon, 26 Oct 2020 15:22:43 +0000 (18:22 +0300)]
[keyboard] Removed unnecessary repacking in xkbmap_layout_args
Artem Grinev [Sun, 25 Oct 2020 11:29:33 +0000 (14:29 +0300)]
[keyboard] Minor additional layout info rework
Artem Grinev [Sun, 25 Oct 2020 02:14:42 +0000 (05:14 +0300)]
[keyboard] Support for additional layout if current layout is not ASCII-
capable in live system
Adriaan de Groot [Tue, 27 Oct 2020 15:55:02 +0000 (16:55 +0100)]
[keyboardq] Remove superfluous variable (set to true, never changed)
Adriaan de Groot [Tue, 27 Oct 2020 15:47:47 +0000 (16:47 +0100)]
[keyboardq] Fix include style, remove unnecessary declarations
Adriaan de Groot [Tue, 27 Oct 2020 15:12:36 +0000 (16:12 +0100)]
[keyboard] Migrate to Config::onActivate() which is badly-named
Adriaan de Groot [Tue, 27 Oct 2020 14:56:50 +0000 (15:56 +0100)]
[keyboard] Remove unused code
- this has already migrated to Config but had not been removed locally
Adriaan de Groot [Tue, 27 Oct 2020 14:55:29 +0000 (15:55 +0100)]
[keyboard] Use Config's own finalize()
Adriaan de Groot [Tue, 27 Oct 2020 14:53:59 +0000 (15:53 +0100)]
[keyboard] Replace own copy of status by the one from Config
Adriaan de Groot [Tue, 27 Oct 2020 14:51:48 +0000 (15:51 +0100)]
[keyboard] Use Config methods rather than own copy
- this continues the port of the keyboard module to use the Config
object, which was horribly botched earlier.
Adriaan de Groot [Tue, 27 Oct 2020 14:48:51 +0000 (15:48 +0100)]
[keyboard] Rename mysterious Config::init() to descriptive name
Adriaan de Groot [Tue, 27 Oct 2020 14:46:18 +0000 (15:46 +0100)]
[keyboardq] Load configuration into Config object
Adriaan de Groot [Tue, 27 Oct 2020 14:42:27 +0000 (15:42 +0100)]
[keyboardq] Drop unnecessary variable -- just use the Config status
Adriaan de Groot [Tue, 27 Oct 2020 14:38:38 +0000 (15:38 +0100)]
Changes: credits for this round
Adriaan de Groot [Sun, 25 Oct 2020 17:52:38 +0000 (18:52 +0100)]
CMake: restore NOTREACHED, without the macro-mess
- gcc (up to at least version 10) is worse at recognizing that all
cases have been handled, so it complains about all the switches
that cover enum values.
demmm [Sun, 25 Oct 2020 17:35:03 +0000 (18:35 +0100)]
[keyboardq] fix build
Adriaan de Groot [Sun, 25 Oct 2020 16:48:54 +0000 (17:48 +0100)]
[libcalamares] Search for balance between warnings and annotations
- CI's gcc is too old to analyse a switch() for completeness,
so the CI build fails.
Adriaan de Groot [Sun, 25 Oct 2020 16:36:24 +0000 (17:36 +0100)]
[partition] Don't needlessly expose a test symbol
Andrius Štikonas [Sun, 25 Oct 2020 11:54:27 +0000 (11:54 +0000)]
README: switch to C++17.
Adriaan de Groot [Sun, 25 Oct 2020 11:48:12 +0000 (12:48 +0100)]
CMake: drop the NOTREACHED macro
- both clang and g++ support __builtin_unreachable(); (as Kevin
Kofler pointed out) so we don't need the macro to do different things;
- the compilers have gotten better at detecting unreachable code,
so instead of inserting macros or fiddly bits, just drop them
and the unreachable code they comment.
Adriaan de Groot [Sat, 24 Oct 2020 15:20:23 +0000 (17:20 +0200)]
CMake: prefer normal C++17 [[fallthrough]] annotation
Adriaan de Groot [Sat, 24 Oct 2020 14:28:06 +0000 (16:28 +0200)]
CMake: don't put linker flags in compile-flags variables
Adriaan de Groot [Sat, 24 Oct 2020 11:19:42 +0000 (13:19 +0200)]
[libcalamares] Avoid object-slice
g++ warns that error_already_set is polymorphic, and we're catching
by-value (although we don't use that value). Avoid that.
Adriaan de Groot [Sat, 24 Oct 2020 10:49:56 +0000 (12:49 +0200)]
[libcalamaresui] Warnings-- for Qt 5.15 deprecations
Introduce a GUI-oriented compatibility header that introduces aliases
for some enum values that are deprecated in Qt 5.15
Adriaan de Groot [Sat, 24 Oct 2020 10:35:19 +0000 (12:35 +0200)]
[libcalamares] Remove useless variable
- describe() is for debugging purposes, doesn't need to calculate
whether the requirements are accepted.
Adriaan de Groot [Sat, 24 Oct 2020 10:32:07 +0000 (12:32 +0200)]
CMake: simplify C and C++ flags
- reduce the difference between clang and g++ builds, factor
common flags out of the CMake-if
- drop special boost-warning-suppression, we do that differently
most of the time in the affected source files
Adriaan de Groot [Sat, 24 Oct 2020 00:31:38 +0000 (02:31 +0200)]
CMake: switch to C++17
Adriaan de Groot [Sat, 24 Oct 2020 00:24:37 +0000 (02:24 +0200)]
[partition] Remove unused variables
Adriaan de Groot [Sat, 24 Oct 2020 00:21:32 +0000 (02:21 +0200)]
[partition] Warnings-- in tests related to virtual destructors