Philip Müller
76d79d8cd0
[officechooser] fix ccp files
2019-08-07 07:44:00 +02:00
Philip Müller
d0a64e1736
[officechooser] center fonts
2019-08-07 07:39:25 +02:00
Philip Müller
51ec85fdd5
[officechooser] merge with upstream
2019-08-07 07:38:12 +02:00
Philip Müller
ac5c2a041d
Merge branch 'master' of https://github.com/calamares/calamares into development
2019-08-07 07:16:41 +02:00
Adriaan de Groot
1b29ca5697
Changes: document packagechooser and others
2019-08-06 23:43:29 +02:00
Adriaan de Groot
5bdcc2c7a8
Merge branch 'software-chooser'
...
FIXES #426
FIXES #1172
FIXES #706
2019-08-06 22:55:13 +02:00
Adriaan de Groot
194a562727
[packagechooser] Expand tests with override features
2019-08-06 22:51:14 +02:00
Adriaan de Groot
a4362dac65
[packagechooser] Change tests for modified API
2019-08-06 22:48:04 +02:00
Adriaan de Groot
5d4c3ea92c
[packagechooser] Don't give a default pixmap
2019-08-06 22:48:04 +02:00
Adriaan de Groot
0b72006ffb
[packagechooser] Use overrides on AppData for example
2019-08-06 22:48:04 +02:00
Adriaan de Groot
6ddae94628
[packagechooser] Allow to override some of AppData
...
- The ID and Screenshot entries might be weird in AppData (in particular,
a remove URL) so put those back under the control of Calamares even
when using AppData as the source of descriptions.
2019-08-06 22:48:04 +02:00
Adriaan de Groot
d72391942f
[packagechooser] Implement AppData loading
...
- An item can refer to *appdata* and load that, or provide
the data in the config file itself.
- Fix documentation about translations.
2019-08-06 15:55:27 +02:00
Adriaan de Groot
9a8b2c5a1e
[packagechooser] CHeck that AppData load was succesful
2019-08-06 15:45:14 +02:00
Adriaan de Groot
fb547364c7
[packagechooser] Complete parsing of AppData
...
- Document all the static inline methods that do the work
- Fill up a QVariantMap from <name>, <summary> and <description><p>
elements, and use that to initialize the PackageItem.
2019-08-06 15:36:34 +02:00
Adriaan de Groot
431c4de77f
[packagechooser] Use GUI for tests
...
- Because we'll be creating Pixmaps, we need to have a GUI main.
2019-08-06 15:19:20 +02:00
Adriaan de Groot
6821b14d00
[packagechooser] Enable logging in tests
2019-08-06 14:50:04 +02:00
Adriaan de Groot
beb5896fa2
[packagechooser] Start implementation of AppData loading
...
- Doing a manual read of the XML, since existing appdata libraries
don't seem to have a convenient entry for what I need.
- Expand tests to loading AppData (currently, they fail).
2019-08-06 14:50:04 +02:00
Adriaan de Groot
8329d7d7dc
CI: Add an AppData file
2019-08-06 14:50:04 +02:00
Philip Müller
5a433e22ac
Merge branch 'software-chooser' of https://github.com/calamares/calamares into development
2019-08-06 13:03:34 +02:00
Philip Müller
1d8938cc28
Merge branch 'master' of https://github.com/calamares/calamares into development
2019-08-06 13:02:38 +02:00
Adriaan de Groot
6c41151f80
[packagechooser] Just one screenshot, and mark package unused
2019-08-06 12:38:28 +02:00
Adriaan de Groot
6e05a1ef05
[packagechooser] Load translated strings as well
...
- This makes it possible to put the translations into the config
file, and have them displayed when the Calamares language changes.
2019-08-06 12:02:29 +02:00
Adriaan de Groot
4febe477cf
[libcalamares] Add isEmpty() to TranslatedString
...
- Massage the implementation a bit, don't insert a meaningless
copy of the key as the untranslated message.
- Add isEmpty() to check for presence of the untranslated message.
- Document API.
- Update tests.
2019-08-06 11:53:35 +02:00
Adriaan de Groot
8d3546f0b3
[packagechooser] Expand the example config with translated entries
2019-08-06 00:31:05 +02:00
Adriaan de Groot
6a8e10837d
[libcalamares] Drop unneeded debugging
2019-08-06 00:26:04 +02:00
Adriaan de Groot
fee2297e67
[packagechooser] Fix fallthrough situation
...
- Add a FALLTHRU macro to annotate fallthrough situations in both
Clang and GCC,
- Annotate intentional fallthroughs.
- Add missing break which meant that the selection mode was
always multiple-selection.
2019-08-06 00:24:53 +02:00
Adriaan de Groot
56db9e9341
[packagechooser] Use translated strings
2019-08-06 00:17:50 +02:00
Adriaan de Groot
fd75b33784
[libcalamares] Add default constructor to TranslatedString
2019-08-06 00:17:30 +02:00
Adriaan de Groot
3560ea6622
Merge branch 'master' into software-chooser
2019-08-06 00:08:21 +02:00
Adriaan de Groot
39b7e4c55f
Merge branch 'translatable-configuration'
2019-08-06 00:07:48 +02:00
Adriaan de Groot
764c775f08
[libcalamares] Tighten tests, add special case
...
- The tests should be run in C locale, otherwise the plain get()
function uses the current locale, which will fail (e.g. running
LANG=nl ./libcalamareslocaletest returns the Dutch strings for
plain get, which isn't what we expect).
- sr@latin is still special.
2019-08-06 00:05:24 +02:00
Adriaan de Groot
a9292d0c75
[libcalamares] Implement getting the string
2019-08-05 23:54:53 +02:00
Adriaan de Groot
50d74c4eca
[libcalamares] Add get() to the string
...
- Look up the translation of the requested string with the current
or a specific locale. This implementation is a stub.
- Add tests for the getter.
2019-08-05 23:37:25 +02:00
Adriaan de Groot
e0edd1f3e2
[libcalamares] Fix misleading comment, add accessor
...
- the sort order is not English-at-the-top
- add accessor for the locale ID.
2019-08-05 23:32:13 +02:00
Adriaan de Groot
28293ef77a
[libcalamares] Expand tests of TranslatableString
2019-08-05 23:30:51 +02:00
Adriaan de Groot
5d6ccfe8fc
[libcalamares] Adjust tests for new Esperanto support
2019-08-05 18:30:50 +02:00
Adriaan de Groot
83df41ef06
CMake: bump required CMake to 3.3, enable Esperanto
...
- Require CMake 3.3 for the IN_LIST operator in if() statements
- It looks like Qt 5.12.2 (possibly earlier) supports a QLocale("eo")
so enable Esperanto if that Qt version or later is detected.
2019-08-05 18:24:31 +02:00
Adriaan de Groot
18e2f2ae52
[libcalamares] Add tests for new TranslatedString
...
- Test that construction works as expected
- Add count() method to TranslatedString for testing purposes.
2019-08-05 17:57:32 +02:00
Adriaan de Groot
19ca1b3c30
[libcalamares] One missing bit of coding style
2019-08-04 23:00:03 +02:00
Adriaan de Groot
8ea4091c7b
[libcalamares] Add a TranslatedString class to locale/
...
- While QObject::tr and gettext give us translations **most** of the
time via the translation mechanism, we sometimes have strings
embedded in configuration files that need to be shown to people
as well. Follow the .desktop style in handling this.
- A key's value **might** be translated; use `key[lang]` for the
translation into one of the languages that Calamares understands.
Code that expects a translated (human-readable) string in a configuration
file can use TranslatedString to collect all the translations of a
given key, so that it displays the right string from the configuration
when needed.
2019-08-04 22:56:41 +02:00
Adriaan de Groot
1afa9c4d08
[libcalamares] Apply current coding style to all of libcalamares/
2019-08-04 22:24:55 +02:00
Adriaan de Groot
fa676c573e
CI: Fix style script
...
- when passing in more than one directory, expanded the wrong variable
2019-08-04 22:21:53 +02:00
Adriaan de Groot
7fcb7be1e4
[libcalamares] Apply current coding style to libcalamares/locale/
2019-08-04 22:17:12 +02:00
Adriaan de Groot
43ba59361b
[libcalamares] Don't format generated files of CLDR data
2019-08-04 22:16:33 +02:00
Adriaan de Groot
fa2b94d931
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
Adriaan de Groot
312865cdd9
[libcalamares] Fix build on FreeBSD
2019-08-04 22:09:53 +02:00
Adriaan de Groot
b8a74657f4
[libcalamares] Apply current coding style to libcalamares/utils/
...
- String.cpp needs special handling since part of it should
remain unchanged, the formatting is "special" there.
2019-08-04 22:01:56 +02:00
Adriaan de Groot
29b9a21f59
[libcalamares] Don't format files copied from KCoreAddons
2019-08-04 22:01:31 +02:00
Adriaan de Groot
b7f54a3866
[libcalamares] Don't break string tables by reformatting
2019-08-04 22:01:31 +02:00
Adriaan de Groot
2556ba9d55
CI: set style for macro continuations
2019-08-04 22:01:31 +02:00