Commit Graph

6745 Commits

Author SHA1 Message Date
Adriaan de Groot
ba7e96c5e1 [libcalamares] Add test for InstanceKey
- cover all the constructors
 - Start with some tests that fail, showing bugs in the implementation
 - Fix bug that "derp@derp" was creating a valid instance-key with
   a bad module and id (need to use ::fromString() to get that
   functionality).
 - Extend tests with more bad cases.
 - Refactor tests to simplify "this is bad" assertions.
2019-09-15 20:38:16 +02:00
Adriaan de Groot
2f99004041 [libcalamares] Move the module instance-key
- Split out of the UI library and into (header-only) libcalamares.
2019-09-15 20:38:16 +02:00
Adriaan de Groot
666462651b [libcalamares] Namespace consistently
- Things in libcalamares/ subdirectories are namespaced
   according to that subdirectory (sometimes in namespace
   Calamares, sometimes CalamaresUtils). Do that in modulesystem/ too.
2019-09-15 20:38:16 +02:00
Adriaan de Groot
78de6776af [libcalamaresui] Swap out use of QString for ModuleInstanceKey
- The strings `module@id` are used internally, make that type explicit.
2019-09-15 20:38:19 +02:00
Adriaan de Groot
b8dd6e9ae7 [libcalamaresui] Introduce a module-instance-key class
- This replaces rather ad-hoc use of a QString as key.
2019-09-15 20:38:16 +02:00
Adriaan de Groot
e1aced56fd Changes: fix typo's 2019-09-14 08:01:44 -04:00
Adriaan de Groot
0c14bbc50b Merge branch 'locale-polish' 2019-09-14 07:56:52 -04:00
Adriaan de Groot
57a942d155 [libcalamares] Make a NAM per thread
- To avoid warnings about creating requests and replies, parented
   by the NAM but from another thread, make a NAM per thread.
2019-09-14 07:21:24 -04:00
Adriaan de Groot
ca351ff7b6 [libcalamares] Apply (some) options to request earlier 2019-09-10 14:26:46 +02:00
Adriaan de Groot
11d3f10e26 [locale] Dispose of waiting widget
- Do the async GeoIP checking in the async requirements-checking phase
 - Do not return any requirements results -- we just need the async bit
 - Drop the waiting widget, since it's not needed (done by the
   requirements phase)
2019-09-10 14:18:47 +02:00
Adriaan de Groot
41ece863de [locale] Create widgets when needed instead of at startup
- this blocks forever, since now the GeoIP lookup isn't done at all.
2019-09-10 06:19:20 -04:00
Adriaan de Groot
0a1dc77f9b [locale] Hang on to GeoIP::Handler just once
- replace configuration settings by putting them in an object
 - use unique_ptr to allow us to create one optionally.
2019-09-10 11:26:47 +02:00
Adriaan de Groot
d70d418d92 [locale] Refactor setting of LC entries 2019-09-07 17:02:59 +02:00
Adriaan de Groot
5cac3ac6ad [locale] Apply coding style 2019-09-07 16:58:37 +02:00
Adriaan de Groot
0ee8427d5a [locale] Remove old-style GeoIP configuration 2019-09-07 16:05:09 +02:00
Adriaan de Groot
5a24e45e3b [locale] Factor out a simple lambda
- If this was handed to an algorithm it would make more sense
   as a lambda
2019-09-07 15:58:56 +02:00
Adriaan de Groot
3093f635e2 [locale] Apply coding style 2019-09-07 15:48:22 +02:00
Adriaan de Groot
21dde80a65 [locale] Refactor button handling to plain methods 2019-09-07 15:47:12 +02:00
Adriaan de Groot
91f0509272 [locale] Refactor lambdas to plain methods
- Lengthy lambda's doing UI stuff -- that doesn't change --
   are easier to read as plain methods.
2019-09-07 15:18:58 +02:00
Adriaan de Groot
782b469974 [locale] Move all the translation work to a single slot 2019-09-07 12:38:49 +02:00
Philip Müller
fae488b998 Merge branch 'development' into 3.2.x-stable 2019-09-05 07:00:56 -04:00
Philip Müller
718f24b826 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-09-05 07:00:21 -04:00
Adriaan de Groot
a57a030ee2 [packagechooser] Massage the list view to be narrower 2019-09-05 06:41:06 -04:00
Adriaan de Groot
4259bc9d5d [packagechooser] Also use screenshot from no-package-selected 2019-09-05 03:23:50 -04:00
Adriaan de Groot
52e72f4fb1 [welcome] Apply coding style 2019-09-05 03:23:28 -04:00
Adriaan de Groot
88fc6685ba [libcalamares] Apply coding style to geoip/ 2019-09-05 03:23:28 -04:00
Philip Müller
fd327aedc5 Merge branch 'development' into 3.2.x-stable 2019-09-04 13:46:42 -04:00
Philip Müller
212e0d8f46 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-09-04 13:44:10 -04:00
Adriaan de Groot
01c4383178 [packagechooser] Simplify parameters
- Just pass the no-package-selected item around.
2019-09-04 19:40:35 +02:00
Adriaan de Groot
996714dd06 [packagechooser] Use all translations for no-package-selected
- If there is an item with id "" (empty), it is used as the
   "no-package-selected" placeholder text.
 - Existing code iterated over the abstract model and used the
   name and description at the time the model was set -- but
   by getting the name and description from the model, only
   a single string was obtained instead of the full range
   of translations.
 - Therefore, when arriving on the page, the "no-package-selected"
   information was displayed from the translation that was active
   when the model was set.

Instead, extend the non-abstract model so we can find the no-package-
selected item and pass that explicitly to the page.

FIXES #1241
2019-09-04 19:33:24 +02:00
Philip Müller
367f4b78f3 [fix] conflicts 2019-09-02 18:26:52 -04:00
Philip Müller
71d26e85e1 [mhwdcfg] fix mounting mhwd/db blacklists 2019-09-02 18:15:25 -04:00
Philip Müller
93c81a077b [mhwdcfg] fix call cmd 2019-09-02 17:23:35 -04:00
Philip Müller
a2a47826d4 [mhwdcfg] fix call cmd 2019-09-02 17:23:09 -04:00
Philip Müller
bba3ce09cd [modules] fix mkdir for 'opt/mhwd' 2019-09-02 16:42:37 -04:00
Philip Müller
6be8b16979 [modules] fix mkdir for 'opt/mhwd' 2019-09-02 16:42:19 -04:00
Philip Müller
eaae9d910f [modules] add mkdir and rmdir for 'opt/mhwd' 2019-09-02 16:38:09 -04:00
Philip Müller
e797bb0dc5 [modules] add mkdir and rmdir for 'opt/mhwd' 2019-09-02 16:37:48 -04:00
Philip Müller
250093d9f0 [postcfg] update value 2019-09-02 14:53:17 -04:00
Philip Müller
03ad1a3587 [postcfg] update value 2019-09-02 14:18:17 -04:00
Philip Müller
1d775fa4bc [packagechooser] use our images 2019-09-02 11:46:40 -04:00
Philip Müller
703640f7c2 [packagechooser] use our images 2019-09-02 11:46:10 -04:00
Philip Müller
ff9483c2bd [cleanup] remove unneeded conf 2019-09-02 11:38:44 -04:00
Philip Müller
68078fec4e [cleanup] remove unneeded conf 2019-09-02 11:38:25 -04:00
Philip Müller
76fc49d367 Merge branch 'development' into 3.2.x-stable 2019-09-02 11:37:51 -04:00
Philip Müller
a927a9f6a2 [packagechooser] add Office example settings 2019-09-02 11:36:57 -04:00
Philip Müller
42d6322ce3 Merge branch 'master' of https://github.com/calamares/calamares into development 2019-09-02 11:18:52 -04:00
Adriaan de Groot
c2f1070f2a Merge branch 'translate-packagechooser'
FIXES #1228

The label on the left can now be specified (and translated)
in the config file. The strings corresponding to "nothing
selected" from PackageChooserPage.cpp L33-34 can already
be specified in the *items* section.
2019-09-02 15:30:41 +02:00
Adriaan de Groot
019d1c36c6 [packagechooser] Load translated strings from config
- Apply the *labels* from the configuration file to the
   visible strings (only the ViewStep name).
2019-09-02 15:29:00 +02:00
Adriaan de Groot
0eae72e10f [packagechooser] Introduce translatable labels
- Since the package chooser might be used more than once, or for
   more specific items than "Packages", introduce a way to provide
   specific strings for display.
 - The only string needed is the ViewStep name, since the item with
   id "" can be used for the no-selection item.
2019-09-02 15:28:15 +02:00