OSDN Git Service
Adriaan de Groot [Mon, 27 Sep 2021 11:08:22 +0000 (13:08 +0200)]
Changes: pre-release housekeeping
Adriaan de Groot [Fri, 24 Sep 2021 11:48:35 +0000 (13:48 +0200)]
i18n: source texts
Adriaan de Groot [Fri, 24 Sep 2021 11:48:27 +0000 (13:48 +0200)]
Changes: hot-fix release
demmm [Fri, 24 Sep 2021 14:27:35 +0000 (16:27 +0200)]
[initcpiocfg] fix install failure due to extra s
Adriaan de Groot [Fri, 24 Sep 2021 10:40:38 +0000 (12:40 +0200)]
Changes: pre-release housekeeping
Adriaan de Groot [Fri, 24 Sep 2021 10:33:07 +0000 (12:33 +0200)]
Merge branch 'fix-nm-name' into calamares
Adriaan de Groot [Fri, 24 Sep 2021 10:33:00 +0000 (12:33 +0200)]
[networkcfg] Refactor getting source-and-target paths of a file
Adriaan de Groot [Fri, 24 Sep 2021 10:30:11 +0000 (12:30 +0200)]
[networkcfg] Don't mindlessly PEP8
Adriaan de Groot [Fri, 24 Sep 2021 10:25:33 +0000 (12:25 +0200)]
[networkcfg] Refactor username-replacement
Read, then write, the NM file. Add a note about how we might
handle this better. Rename live_user() function to give it
a verb (and avoid UnboundLocal when using a variable of the same name).
Adriaan de Groot [Fri, 24 Sep 2021 10:15:16 +0000 (12:15 +0200)]
[networkcfg] Be more forgiving when getting the live username
- This function is intended to do whatever it takes to
get the live username.
Adriaan de Groot [Fri, 24 Sep 2021 09:26:41 +0000 (11:26 +0200)]
Merge pull request #1777 from librewish/btrfs_additions
[fstab] Improve btrfs mount options
Adriaan de Groot [Fri, 24 Sep 2021 09:26:08 +0000 (11:26 +0200)]
Merge pull request #1776 from librewish/consolefont
[initcpiocfg] add consolefont to hooks
librewish [Fri, 24 Sep 2021 07:00:42 +0000 (12:30 +0530)]
[initcpiocfg] add consolefont to hooks
librewish [Fri, 24 Sep 2021 06:54:58 +0000 (12:24 +0530)]
[fstab] Improve btrfs mount options
Shrinivas Vishnu Kumbhar [Thu, 23 Sep 2021 09:08:11 +0000 (11:08 +0200)]
[locale] Default to English in India
Shrinivas Vishnu Kumbhar [Thu, 23 Sep 2021 09:07:43 +0000 (11:07 +0200)]
[keyboard] Use US-English for India
Adriaan de Groot [Wed, 22 Sep 2021 09:26:28 +0000 (11:26 +0200)]
[libcalamares] Rename cPointerSetter
This class doesn't really set a pointer -- it is a scoped assignment
through a pointer, which **can** set a value on destruction (when
it leaves scope). Rename it.
While here, extend the API so that it can do an assignment to the
underlying object **now**, while also doing a scoped assignment
later when it leaves scope. This makes some code a bit easier
to read ("in this scope, X is now <v> and then it becomes <v'>")
Adriaan de Groot [Wed, 22 Sep 2021 09:17:41 +0000 (11:17 +0200)]
[libcalamares] Remove cBoolSetter
This class was used only once, and is confusing because
the assignment happens always, but to the opposite value
as what was visible. It can be replaced with other
scoped assignment, instead.
Removes the tests for it, too.
Adriaan de Groot [Wed, 22 Sep 2021 09:03:56 +0000 (11:03 +0200)]
[libcalamares] Log the Python language-search process just once
- log the list of search paths once
- log the found-language as if from Python
- warn always if none are found
Calamares CI [Tue, 21 Sep 2021 13:25:51 +0000 (15:25 +0200)]
i18n: [python] Automatic merge of Transifex translations
Calamares CI [Tue, 21 Sep 2021 13:25:51 +0000 (15:25 +0200)]
i18n: [calamares] Automatic merge of Transifex translations
Adriaan de Groot [Tue, 21 Sep 2021 23:45:36 +0000 (01:45 +0200)]
Merge branch 'issue-1603' into calamares
FIXES #1603
Adriaan de Groot [Tue, 21 Sep 2021 23:44:00 +0000 (01:44 +0200)]
[libcalamares] Reduce log-spam in emergencies
- when an emergency strikes, log the modules that are skipped
with a Once, but if an emergency module runs, refresh that
Once so that the function header is printed again -- to
distinguish JobQueue debugging from the logging from the
emergency module.
Adriaan de Groot [Tue, 21 Sep 2021 23:41:28 +0000 (01:41 +0200)]
[libcalamares] Give Logger::Once more flexibility
Adriaan de Groot [Tue, 21 Sep 2021 23:28:40 +0000 (01:28 +0200)]
[libcalamares] Cut down log-spam from KPMManager
Adriaan de Groot [Tue, 21 Sep 2021 23:27:33 +0000 (01:27 +0200)]
[partition] Cut down log-spam while checking for resize
Adriaan de Groot [Tue, 21 Sep 2021 23:05:13 +0000 (01:05 +0200)]
[partition] Cut down log spam about /etc/fstab
Adriaan de Groot [Tue, 21 Sep 2021 22:58:31 +0000 (00:58 +0200)]
[libcalamares] Reduce log spam when running commands
Adriaan de Groot [Tue, 21 Sep 2021 14:53:09 +0000 (16:53 +0200)]
[libcalamares] Cut down config-file-loading log spam
Adriaan de Groot [Tue, 21 Sep 2021 13:21:52 +0000 (15:21 +0200)]
Merge branch 'issue-1788' into calamares
This is in response to the issue, and cleans up a bunch of code,
but does not actually resolve the issue (because I can't quite
tell what the issue should be).
SEE #1788
Adriaan de Groot [Tue, 21 Sep 2021 13:16:08 +0000 (15:16 +0200)]
[initcpiocfg] Document this module
Adriaan de Groot [Tue, 21 Sep 2021 11:39:29 +0000 (13:39 +0200)]
[initcpio] Refactor file-writing
- iterate over the lines of the source file, rather
than over indexes, and make clear that the hooks, modules and files
lines are replaced, rather than merged.
- this calls write() more often, but it's only a few lines
Adriaan de Groot [Tue, 21 Sep 2021 11:18:01 +0000 (13:18 +0200)]
[initcpiocfg] Refactor
- Read the host /etc/mkinitcpio.cfg in one function rather
than hiding it inside the writer
Adriaan de Groot [Tue, 21 Sep 2021 11:13:21 +0000 (13:13 +0200)]
[initcpiocfg] Refactor, improve testability
- don't chain directly from modify_mkinitcpio_conf() to the
function that writes the file write_mkinitcpio_lines();
split into "figure out what needs to be written" and calling
that writing-function, so that we can test / check / log
if needed between the two.
Adriaan de Groot [Tue, 21 Sep 2021 11:03:13 +0000 (13:03 +0200)]
[initcpiocfg] Code-shuffle
- put the system-information and -detection functions at top
and the "do the actual work" things below
- don't mix the boolean do-we-use-this flags with the
lists of files and modules which are the important
parts of modify_mkinitcpio_conf
Adriaan de Groot [Tue, 21 Sep 2021 10:54:18 +0000 (12:54 +0200)]
[initcpiocfg] Use booleans for boolean values
(as previous) Use False/True rather than ""/"yes" for
keeping track of does-the-system-use-lvm2.
Adriaan de Groot [Tue, 21 Sep 2021 10:52:16 +0000 (12:52 +0200)]
[initcpiocfg] Use bools for boolean values
Having "" and "yes" as values is a bit shell-script-ish.
Use a regular boolean value instead; simplify code
while we're at it.
Adriaan de Groot [Tue, 21 Sep 2021 10:42:58 +0000 (12:42 +0200)]
[initcpiocfg] Refactor CPU-characteristics determination
The code is still over-wrought, but the API for cpuinfo
now exposes the interesting thing (is it Intel?) in
a useful -- more readable -- way.
Adriaan de Groot [Tue, 21 Sep 2021 10:13:36 +0000 (12:13 +0200)]
Merge branch 'issue-1786' into calamares
FIXES #1786
Adriaan de Groot [Tue, 21 Sep 2021 10:13:25 +0000 (12:13 +0200)]
Changes: post-release housekeeping
Adriaan de Groot [Tue, 21 Sep 2021 10:10:21 +0000 (12:10 +0200)]
[luksbootkeyfile] Bump timeout for adding LUKS keyfile
Adriaan de Groot [Tue, 21 Sep 2021 10:02:26 +0000 (12:02 +0200)]
[libcalamares] Simplify filling the entropy buffer
Adriaan de Groot [Tue, 21 Sep 2021 09:58:22 +0000 (11:58 +0200)]
[luksbootkeyfile] Don't dd in the target to get entropy
demmm [Fri, 17 Sep 2021 13:01:27 +0000 (15:01 +0200)]
[keyboardq] fix xml files, xml id has to be first
Adriaan de Groot [Fri, 17 Sep 2021 11:12:49 +0000 (13:12 +0200)]
i18n: update languages list
Calamares CI [Fri, 17 Sep 2021 10:58:10 +0000 (12:58 +0200)]
i18n: [calamares] Automatic merge of Transifex translations
demmm [Fri, 17 Sep 2021 10:40:55 +0000 (12:40 +0200)]
CHANGES: update the keyboardq improvements
Adriaan de Groot [Fri, 17 Sep 2021 09:53:44 +0000 (11:53 +0200)]
Changes: mention keyboardq improvements
Adriaan de Groot [Fri, 17 Sep 2021 09:52:16 +0000 (11:52 +0200)]
Changes: pre-release housekeeping
demmm [Thu, 16 Sep 2021 13:01:37 +0000 (15:01 +0200)]
[keyboardq] set proper SPDX headers
rename wrongly named shift.license
Calamares CI [Thu, 16 Sep 2021 08:57:53 +0000 (10:57 +0200)]
i18n: [python] Automatic merge of Transifex translations
Calamares CI [Thu, 16 Sep 2021 08:57:53 +0000 (10:57 +0200)]
i18n: [calamares] Automatic merge of Transifex translations
Adriaan de Groot [Wed, 15 Sep 2021 12:27:13 +0000 (14:27 +0200)]
Merge pull request #1782 from killajoe/patch-1
[shellprocess] fix typo in conf
Adriaan de Groot [Wed, 15 Sep 2021 11:33:58 +0000 (13:33 +0200)]
Changes: document fixes and contributors
Adriaan de Groot [Wed, 15 Sep 2021 11:21:39 +0000 (13:21 +0200)]
[libcalamaresui] Improve sizeLimit handling in log upload
The log sizeLimit can be 0 (disable log upload) but that's
not so clear in the code. While here, tidy up and add
some comments to surprising bits.
Adriaan de Groot [Wed, 15 Sep 2021 11:24:37 +0000 (13:24 +0200)]
Merge pull request #1785 from killajoe/patch-1
Branding: improve sizeLimit docs
Johannes Kamprad [Tue, 14 Sep 2021 14:54:29 +0000 (16:54 +0200)]
Update branding.desc
hint on sizeLimit must be set to have the log option work.
Calamares CI [Mon, 13 Sep 2021 10:53:36 +0000 (12:53 +0200)]
i18n: [python] Automatic merge of Transifex translations
Calamares CI [Mon, 13 Sep 2021 10:53:36 +0000 (12:53 +0200)]
i18n: [calamares] Automatic merge of Transifex translations
Johannes Kamprad [Sun, 12 Sep 2021 11:47:38 +0000 (13:47 +0200)]
Update shellprocess.conf
a minor typo
Adriaan de Groot [Wed, 8 Sep 2021 11:30:32 +0000 (13:30 +0200)]
[tracking] Add Q_OBJECT, sanitize API
Adriaan de Groot [Wed, 8 Sep 2021 11:23:20 +0000 (13:23 +0200)]
Add Q_OBJECT macro where it's missing
- Transifex tools complain about missing Q_OBJECT (which makes
some sense -- you end up with a different context for calls
to tr(), of the base class).
Calamares CI [Wed, 8 Sep 2021 11:01:02 +0000 (13:01 +0200)]
i18n: [python] Automatic merge of Transifex translations
Calamares CI [Wed, 8 Sep 2021 11:01:02 +0000 (13:01 +0200)]
i18n: [calamares] Automatic merge of Transifex translations
Adriaan de Groot [Wed, 8 Sep 2021 09:58:36 +0000 (11:58 +0200)]
Merge pull request #1774 from demmm/calamares
[keyboardq] add interactive keyboard preview
Adriaan de Groot [Wed, 8 Sep 2021 09:29:15 +0000 (11:29 +0200)]
Merge branch 'load-qtbase' into calamares
FIXES #1688
Adriaan de Groot [Wed, 8 Sep 2021 09:28:38 +0000 (11:28 +0200)]
[partition] Fix build with translated buttons
Adriaan de Groot [Wed, 8 Sep 2021 09:26:21 +0000 (11:26 +0200)]
[packagechooser] Restore (renamed) include that is needed after all
Adriaan de Groot [Wed, 8 Sep 2021 08:58:38 +0000 (10:58 +0200)]
[partition] Translate button texts in warning boxes
Adriaan de Groot [Wed, 8 Sep 2021 08:58:33 +0000 (10:58 +0200)]
[libcalamaresui] Translate button texts for paste-message
Adriaan de Groot [Tue, 7 Sep 2021 15:57:22 +0000 (17:57 +0200)]
[interactiveterminal] Fix up standard buttons
Adriaan de Groot [Tue, 7 Sep 2021 15:24:24 +0000 (17:24 +0200)]
[libcalamaresui] Use fixed standard-buttons labels
Move some of the texts to the new TranslationFix, from ViewManager,
and use them. Keep them in ViewManager, too, so that the translations
with context ViewManager are not removed just now.
Adriaan de Groot [Tue, 7 Sep 2021 15:20:07 +0000 (17:20 +0200)]
[license] Remove unused header
Adriaan de Groot [Tue, 7 Sep 2021 15:15:30 +0000 (17:15 +0200)]
i18n: introduce a "TranslationFix"
This is intended to apply translations to some common Qt UI components.
Example: a QMessageBox with standard buttons OK and Cancel; the text
for that is determined at startup using the system locale, and later
changes to the current locale or the current translation catalog,
do not affect OK and Cancel. It might be possible to load a catalog
with the right translation strings, except that there is no way to
know what the context or catalog **is** for the strings that are
used to label standard buttons: they can come from Qt base, or
the platform, or the theme. Merely loading the Qt Base translations
for the correct language does not help, because those translations
do not contain an "OK" string with the context used for standard
buttons.
Do the translation by hand; then we have all of the Calamares
languages covered, too, which is more than the Qt translations do.
Adriaan de Groot [Tue, 7 Sep 2021 14:31:24 +0000 (16:31 +0200)]
i18n: Shuffle the build so that all the bits are in lang/
Move the CMake code responsible for building the translations from
the src/calamares directory (yeah, yeah, the translations need to
link into the executable) into lang/ (which is where the source
and other infrastructure lives).
Adriaan de Groot [Wed, 8 Sep 2021 09:04:35 +0000 (11:04 +0200)]
[packagechooser] Remove unneeded include
Adriaan de Groot [Tue, 7 Sep 2021 13:47:30 +0000 (15:47 +0200)]
i18n: repair language names for Chinese
Prompted by Linlinger, I've reconsidered the names of languages
in the drop-down in the welcome page. We already have the
infrastructure for assigning specific names / locales to
"Calamares locale names" (which match Transifex names, not
necessarily Qt names). Use that to put exactly two Chinese-
language translations in the drop-down:
- Simplified Chinese (code zh_CN)
- Traditional Chinese (code zh_TW)
Drop zh (which is a peculiar locale name anyway) and zh_HK
(which is Traditional Chinese, but using the geographic
boundary is a bit weird; we're going to ignore the
minor orthographic differences with Traditional Chinese
written elsewhere for now).
Note that this makes the drop-down show "Chinese"
in the English column, twice; the difference is visible
only in the native-language representation.
SEE #1741
Adriaan de Groot [Tue, 7 Sep 2021 13:35:43 +0000 (15:35 +0200)]
Merge branch 'refactor-translation' into calamares
Adriaan de Groot [Tue, 7 Sep 2021 10:51:57 +0000 (12:51 +0200)]
[libcalamares] Use strong types for locale Ids
Change the API to force strong type for more methods.
This cascades to a couple of consumers.
Adriaan de Groot [Tue, 7 Sep 2021 10:35:47 +0000 (12:35 +0200)]
[libcalamares] Remove unused method
Adriaan de Groot [Tue, 7 Sep 2021 10:35:37 +0000 (12:35 +0200)]
[libcalamares] Code-format Retranslator, hide internal symbols
Adriaan de Groot [Tue, 7 Sep 2021 09:42:32 +0000 (11:42 +0200)]
[libcalamares] APIdox on Translation
Adriaan de Groot [Tue, 7 Sep 2021 09:38:54 +0000 (11:38 +0200)]
[libcalamares] Use structured bindings to unpack a std::pair
demmm [Mon, 6 Sep 2021 17:25:16 +0000 (19:25 +0200)]
[keyboardq] add interactive keyboard preview
rewrite of keyboardq.qml, reduce stackview to 2, use a combobox for
keyboard models list
colors set to configurable
.xml files used for keyboard layouts, about a dozen added now
builds, runs, actions record as intended, GS filled correctly
Adriaan de Groot [Mon, 6 Sep 2021 13:38:42 +0000 (15:38 +0200)]
Merge branch 'calamares' into refactor-translation
Adriaan de Groot [Mon, 6 Sep 2021 13:16:40 +0000 (15:16 +0200)]
Changes: post-release housekeeping
Adriaan de Groot [Mon, 6 Sep 2021 12:44:48 +0000 (14:44 +0200)]
[libcalamares] Fix network-connectivity check on old Qt
With old Qt, Calamares could only run one check on a thread,
because the NAM would be switched to NotAccessible --
subsequent checks would fail because the NAM is already
hard-set to NotAccessible, so it could never be turned back
on by Calamares code.
Reset the accessible flag for the NAM while checking if
the internet is there.
Adriaan de Groot [Mon, 6 Sep 2021 11:21:14 +0000 (13:21 +0200)]
Merge branch 'issue-1769' into calamares
FIXES #1769
Adriaan de Groot [Mon, 6 Sep 2021 11:16:23 +0000 (13:16 +0200)]
[keyboard] Fix mapping for India + English
- India (when in English) should use the English variant, not Hindi
- While here, fix up minor items in code:
- Typo in comment
- Asturian doesn't need a special case (which didn't match, anyway)
- Don't debug-log a country-name that might be entirely wrong
(the layout is English, variant "in" but "in" interpreted as
a country is Indonesia, and the actually-desired name is eng_in
which isn't a QLocale name at all -- just like the Hausa and Igbo
special cases)
Adriaan de Groot [Mon, 6 Sep 2021 10:49:49 +0000 (12:49 +0200)]
[shellprocess] Fix test
The test was loading the config file (for testing) either from the
build directory or possibly the source directory; if the config
in the build-dir was edited (for other testing purposes) then
the test would fail. Load only the source-dir version of the file.
Adriaan de Groot [Mon, 6 Sep 2021 09:56:50 +0000 (11:56 +0200)]
i18n: update english sources, too
Adriaan de Groot [Mon, 6 Sep 2021 10:35:24 +0000 (12:35 +0200)]
[welcome] Fix up and expand tests
- improve logging
- fix failing tests -- the observed and expected behavior is
to fill in a fallback check-URL, not change to an empty list,
- **except** if there's no requirements key in the config
at all; this is a bit weird, but let's make the tests
document existing behavior so we can notice if it changes.
Adriaan de Groot [Mon, 6 Sep 2021 10:06:11 +0000 (12:06 +0200)]
[keyboard] Code tidy
- complain just once (globally) if ckbcomp is not found, rather than
at every update to the layout.
- tighten up QStringList constructor.
Adriaan de Groot [Mon, 6 Sep 2021 09:39:01 +0000 (11:39 +0200)]
i18n: update language lists
Keep zh_HK in 'ok' even if technically it doesn't qualify.
Calamares CI [Sun, 5 Sep 2021 12:20:31 +0000 (14:20 +0200)]
i18n: [python] Automatic merge of Transifex translations
Calamares CI [Sun, 5 Sep 2021 12:20:30 +0000 (14:20 +0200)]
i18n: [calamares] Automatic merge of Transifex translations
Adriaan de Groot [Sun, 5 Sep 2021 12:18:52 +0000 (14:18 +0200)]
Changes: pre-release housekeeping
Adriaan de Groot [Mon, 6 Sep 2021 09:27:09 +0000 (11:27 +0200)]
Merge branch 'fix-pckq' into calamares
Adriaan de Groot [Mon, 6 Sep 2021 09:26:59 +0000 (11:26 +0200)]
Changes: credits for recent work
Adriaan de Groot [Mon, 6 Sep 2021 08:51:38 +0000 (10:51 +0200)]
Merge branch 'issue-1773' into calamares
FIXES #1773