Philip Müller
b88e5589ed
Merge branch 'master' of https://github.com/calamares/calamares into development
2020-03-24 11:22:13 +01:00
Adriaan de Groot
4efb082d67
Changes: credit to Gael (I spelled it right in the file)
2020-03-23 17:13:20 +01:00
Adriaan de Groot
8c92768f66
Merge pull request #1348 from gportay/partition-type
...
[partition] Add support for partition type
2020-03-23 17:10:00 +01:00
Adriaan de Groot
1718f7a8a8
Merge branch 'master' into partition-type
2020-03-23 17:09:44 +01:00
Adriaan de Groot
377a78a405
Merge pull request #1347 from gportay/partition-name
...
[partition] Name partition using filesystem label
2020-03-23 16:59:01 +01:00
Adriaan de Groot
74aaccda15
Merge pull request #1341 from gportay/filesystem-features
...
[partition] Add support for filesystem-specific features (KPMCore 4.2.0 required)
2020-03-23 16:57:22 +01:00
Adriaan de Groot
54356a22ba
[fsresizer] Chase API change in tests
...
- Missed this earlier because the module is not enabled in FreeBSD.
2020-03-23 16:54:23 +01:00
Gaël PORTAY
15cce29a51
[partition] Add support for filesystem-specific features
2020-03-22 09:25:26 -04:00
Gaël PORTAY
c5ebe13aeb
[partition] Add support for partition type
2020-03-22 09:05:32 -04:00
Gaël PORTAY
cba4d2e93b
[partition] Name partition using filesystem label
2020-03-21 23:46:20 -04:00
Adriaan de Groot
c850408555
Merge branch 'tighten-yaml-types'
2020-03-20 21:56:12 +01:00
Adriaan de Groot
3b0c0435bc
[libcalamaresui] Chase API change in Yaml
...
- We can drop a bunch of calls to toMap() now.
2020-03-20 21:55:03 +01:00
Adriaan de Groot
1678a03cb3
[libcalamares] Tighten up types
...
- If we're converting a YAML map to a QVariant (Map), may as well
express that in the types. This makes the return from, say,
`yamlMapToVariant()` cheaper, but incurs conversion in
`yamlToVariant()` .. previously the place for costs was
swapped around.
- For those cases that want-and-expect a Map, or List, this makes
the calls slightly cheaper. For the generic case, the costs move
around internally.
2020-03-20 21:25:42 +01:00
Adriaan de Groot
2eb84e2de1
[partition] [tracking] [welcome] Missing Q_OBJECT
...
- These aren't strictly necessary for the code, but they
help with translations.
2020-03-19 00:37:37 +01:00
Adriaan de Groot
d65e0fb4c8
[libcalamares] Fix build with GCC
...
- <memory> isn't implicitly-included for std::unique_ptr
2020-03-19 00:08:20 +01:00
Adriaan de Groot
9fe679dca8
Merge commit 'afc0c78b4c01ac734b9877b11ae94597c685d804'
...
Pull in the instance-weight changes and type-improvements,
but not the part where special-casing of unsquash is dropped:
weights are still per-job, not per-module.
2020-03-18 23:58:00 +01:00
Calamares CI
92bbf6896c
i18n: [python] Automatic merge of Transifex translations
2020-03-18 23:41:19 +01:00
Calamares CI
2eff1f0e78
i18n: [dummypythonqt] Automatic merge of Transifex translations
2020-03-18 23:41:19 +01:00
Calamares CI
1d0ff39c92
i18n: [calamares] Automatic merge of Transifex translations
2020-03-18 23:41:18 +01:00
Adriaan de Groot
fba38b949a
Changes: Credits to Gabriel for resume-fixes
2020-03-18 18:57:57 +01:00
Gabriel Craciunescu
47c167dc04
[bootloader] Resume from outer swap partition
...
- These fixes are similar to the other swap-from-LUKS changes,
and just needed to be applied to a different module.
2020-03-18 17:21:20 +01:00
Gabriel Craciunescu
65a989d3cd
[grubcfg] With LUKS, resume from the correct swap name
...
FIXES #1208
2020-03-18 17:12:33 +01:00
Adriaan de Groot
489fd0b272
[welcomeq] Fix QML import
...
- Now using the properly-namespaced QML import for Calamares things
2020-03-18 11:12:15 +01:00
Adriaan de Groot
cd7884a0e5
[welcomeq] Fix build with clang
...
- can't convert lambda-with-captures to a function pointer (Clang 9)
- instead, use a context property .. QmlViewStep already sets a
"config" property with the Config object, but WelcomeQ wants it
as another name as well.
- this avoids registering the Welcome object across all QML pages,
as well.
NOTE: needs to have the QML adjusted for this change.
2020-03-18 11:02:35 +01:00
Adriaan de Groot
c4324fd3ea
[libcalamaresui] Provide convenience method for context properties
2020-03-18 11:02:16 +01:00
Adriaan de Groot
3f87cc214a
[calamares] Warnings--
...
- Set the width of the QML sidebar explicitly
- Handle all sidebar-flavor enum values explicitly
2020-03-18 10:39:16 +01:00
Adriaan de Groot
948ecb4fd1
CMake: explain the policy settings
2020-03-18 10:25:16 +01:00
Adriaan de Groot
685c2c9de0
Changes: mention Camilo for his QML work
2020-03-18 10:25:01 +01:00
Adriaan de Groot
afc0c78b4c
[libcalamares] Refactor job-weight computations
...
- only check index-vs-length once
2020-03-16 17:25:27 +01:00
Adriaan de Groot
07da6e3905
[libcalamares] Expand instance with weight
2020-03-13 02:59:09 +01:00
Adriaan de Groot
e37809a126
[libcalamares] Detailed InstanceDescription type
2020-03-13 02:55:38 +01:00
Adriaan de Groot
0e68013bb3
[libcalamares] Start making InstanceDescription a stronger type
...
- Replace a map-of-strings with a class type.
- For now, doesn't compile.
- Intention is to construct from a YAML / QVariant from the
*instances* list in `settings.conf`.
2020-03-13 02:41:42 +01:00
Adriaan de Groot
3897bd54df
Changes: write some of the QML docs
...
- Fix references; I decided to put it in Qml.h, which is
the header for the code that does the work.
2020-03-12 17:37:39 +01:00
Adriaan de Groot
4576cb4fa0
[notesqml] Fix up documentation pointers
2020-03-12 17:30:08 +01:00
Adriaan de Groot
21c7063239
Changes: document QML sidebar
2020-03-12 17:28:44 +01:00
Adriaan de Groot
6ff0ac72de
Merge branch 'qml-sidebar'
2020-03-12 15:39:25 +01:00
Adriaan de Groot
aeffda945f
[calamares] Use the ViewManager model to show steps
2020-03-12 15:38:49 +01:00
Adriaan de Groot
b5a09d2f83
[branding] Don't hide the sidebar by default
2020-03-12 05:00:03 +01:00
Adriaan de Groot
cec406e402
[calamares] Add a sample QML-sidebar
...
- The built-in one is loaded if no branding file is found.
- This sidebar is just the most basic of QML examples.
2020-03-12 04:59:01 +01:00
Adriaan de Groot
cc3b0b2859
[calamares] Remove cruft from CMakeLists.txt
2020-03-12 04:48:07 +01:00
Adriaan de Groot
32ebb08788
[calamares] Search for sidebar QML file
...
- change name to "calamares-sidebar" so it's clear that
it is a core component.
2020-03-12 04:21:03 +01:00
Adriaan de Groot
8d6e3e547c
[libcalamaresui] Add qmlSearch for non-modules
...
- Refactor into a support method and two API points
- Use std::transform for doing-things-to-a-list
- Add searchQmlFile that only takes a name, for
non-modules to use.
2020-03-12 04:17:48 +01:00
Adriaan de Groot
0fd7fec25e
[libcalamaresui] Move registration into Qml-service
...
- Registration of QML modules may need to be done
for more parts of Calamares. Move into the library,
out of the model.
- Register for QML when using the QML sidebar.
2020-03-12 03:45:14 +01:00
Adriaan de Groot
1c9a2e8c5f
Changes: document some of the new QML things
2020-03-11 19:49:41 +01:00
Adriaan de Groot
c628192163
Merge branch 'progress-model'
2020-03-11 19:39:58 +01:00
Adriaan de Groot
a0b4d58000
[calamares] The very simplest of QML sidebars
2020-03-11 19:39:28 +01:00
Adriaan de Groot
a834d67283
[notesqml] Adjust to new name for Branding
2020-03-11 17:42:19 +01:00
Adriaan de Groot
28c2da12ae
[libcalamaresui] Register in io.calamares namespace
...
- Register both Branding and ViewManager for QML
- Note that this changes the name of Branding
- Add code-docs about object ownership
2020-03-11 17:40:03 +01:00
Adriaan de Groot
7a8eb09cdb
[libcalamaresui] Move QML-searching
...
- This is utility code, so it can be in the QML "service"
from Calamares, rather than in the QmlViewStep itself.
That makes it usable for other QML bits as well.
2020-03-11 17:12:02 +01:00
Adriaan de Groot
7d99ad3177
[welcomeq] Adjust to Config-API that QmlViewStep expects
2020-03-11 16:49:07 +01:00