Commit Graph

7036 Commits

Author SHA1 Message Date
Adriaan de Groot
7b6b53ab8c [calamares] Re-do building the main layout
- follow branding settings, taking the panel-sides into account
- drop fixed width and height for QML parts
- give panels a minimum appropriate-dimension if they don't have one

This allows, for instance, putting both Widget sidebar and QML navigation
on the left-hand side of the window.
2020-04-03 11:40:51 +02:00
Adriaan de Groot
e15e7d1dc5 [libcalamaresui] Load panel-side settings
- Introduce an enum for panel-side
- Expose this to QML -- I can imagine that QML panels need to know
  which side of the Calamares window they're on.
- Refactor loading the setting into a method that handles both
  flavor and side
2020-04-03 11:05:37 +02:00
Adriaan de Groot
b48e0ebb37 [branding] Introduce placement options for nav, sidebar
- There's no real reason to force the sidebar left and nav at the bottom,
  certainly with QML supporting more layouts and being more flexible,
  so document a mechanism to place the sidebar and navigation along
  "edges" of the Calamares window.
2020-04-03 10:39:03 +02:00
Adriaan de Groot
733801980c [libcalamaresui] Fix up icon name for back-button 2020-04-03 01:23:17 +02:00
Adriaan de Groot
10dd32edd2 [libcalamaresui] Fix isAtVeryEnd()
- With an empty list, the question is meaningless
- .. and we called this with an empty list while constructing the
  ViewManager; if quit-at-end is true, then this would terminate
  Calamares immediately because the list was at the end.
2020-04-02 23:50:41 +02:00
Adriaan de Groot
081f5ec4d9 [libcalamaresui] Remove unused static methods
- The UI bits that needed these button-setup functions have
  moved to CalamaresWindow (with copies of those functions)
2020-04-02 23:39:29 +02:00
Adriaan de Groot
a3c966cc6c Merge branch 'issue-1361'
FIXES #1361
2020-04-02 23:14:31 +02:00
Adriaan de Groot
c7733f51d0
Merge pull request #1365 from demmm/master
[welcomeq] buttons connecting
2020-04-02 23:13:29 +02:00
Adriaan de Groot
fafc508d63 [welcome] Update the widget's notion of the locale
- when the locale changes, tell the widget so that the drop-down
  displays the right language.

FIXES #1361
2020-04-02 23:10:55 +02:00
Adriaan de Groot
5956c6678e [welcome] Don't const& POD
- simplify parameter types in some set-methods
- while here, shuffle methods to bring things together
2020-04-02 22:42:41 +02:00
Adriaan de Groot
e756cc8720 [libcalamares] Tidy RequirementsModel some more
- put signals in conventional place
- remove const int& parameter, that can just be int
- drop oddly-guarded code (that leaks memory); if the index (row)
  being passed in, it's probably best to just crash
- remove unused signal warningMessageChanged
2020-04-02 22:14:27 +02:00
Adriaan de Groot
4e7020d030 [libcalamares] Polish model
- make signals consistent in carrying a parameter
- explain why there's no Q_ENUM
2020-04-02 22:04:34 +02:00
Adriaan de Groot
d2f5185d49 [welcome] Remove unused m_configurationMap
- the configuration is split into specific properties, not
  stored generically.
2020-04-02 22:00:43 +02:00
Adriaan de Groot
39afbdb570 [welcome] Shuffle signals to conventional location
- signals after slots, before private
- while here give the *MessageChanged signals a parameter (the changed
  message)
2020-04-02 21:57:00 +02:00
Adriaan de Groot
9d97972a34 [welcome] Apply coding style 2020-04-02 21:53:02 +02:00
Adriaan de Groot
ca7733c8e4 [welcome] Drop RequirementsModel
- Use the one from libcalamares
- Massage warning message into Config after it was removed from the model
2020-04-02 21:52:05 +02:00
Adriaan de Groot
3bf69c9da8 [calamares] Pacify gcc 2020-04-02 21:38:29 +02:00
Adriaan de Groot
e5562a5069 [libcalamares] Move RequirementsModel to libcalamares (1/2)
- Add the model and support code to libcalamares. The model still
  has some cruft that should be in the Welcome config.
2020-04-02 21:33:07 +02:00
demmm
34292618d8 welcomeq buttons connecting
minor spelling corrections
2020-04-02 20:16:05 +02:00
Adriaan de Groot
e2fee79957 [libcalamaresui] Set icon on back-button 2020-04-02 17:49:08 +02:00
Adriaan de Groot
61a56336a1 Changes: document QML work, thanks Anke 2020-04-02 17:19:12 +02:00
Adriaan de Groot
abe3f4cda0 Merge branch 'issue-1344'
FIXES #1344
2020-04-02 16:46:59 +02:00
Adriaan de Groot
510f9352e7 [calamares] Tweak QML sidebar
- some margins and extra space
 - left-align text
 - progress lozenges instead of pointy rectangles
2020-04-02 16:45:04 +02:00
Adriaan de Groot
1038de899b [calamares] Update sidebar and navigation QML
- use the right colors (from branding, not from desktop theme)
- apply branding logo
2020-04-02 16:22:39 +02:00
Adriaan de Groot
ff37792dc9 [calamares] Resize QML to width of parent window 2020-04-02 16:01:58 +02:00
Adriaan de Groot
476a576dda [libcalamaresui] Ensure all button labels are accurate
- since lots of state is updated when the labels change, call that
  in the constructor so that any QML bindings get current values.
2020-04-02 15:48:43 +02:00
Adriaan de Groot
c755c7ed98 [libcalamaresui] restore quit-at-very-end functionality
- This doesn't need to go indirectly through a button
2020-04-02 13:54:14 +02:00
Adriaan de Groot
e7fabeceb2
Merge pull request #1364 from demmm/master
[welcomeq] About option re-added
2020-04-02 13:53:55 +02:00
Adriaan de Groot
91d0ba1007 [libcalamaresui] Remove *quit* button from ViewManager
- Mostly like the other buttons
- Also show/hide the button and set tooltip
2020-04-02 13:44:49 +02:00
Adriaan de Groot
0c71c7c23f [calamares] Set initial states of next, back buttons 2020-04-02 12:36:45 +02:00
Adriaan de Groot
38deb66e42 [libcalamaresui] Remove *back* button from ViewManager
- Now the back button should be done by clients as well
- Refactor in CalamaresWindow to avoid leaking local button pointers
  to surrounding code.
- Add macro UPDATE_BUTTON_PROPERTY for convenience in ViewManager
  (ugh, macro) to change a value and emit corresponding update signal.
2020-04-02 12:31:14 +02:00
Adriaan de Groot
8920be6bca [libcalamaresui] Remove *next* button from ViewManager
- add properties for the next button (enabled, label, icon...)
- update those properties as normal
- connect to the properties in the UI implementation
2020-04-02 12:04:24 +02:00
Adriaan de Groot
c638343c18 [libcalamares] Give ViewManager a real quit() slot
- instead of creating a lambda, give ViewManager a real slot
- hook up the new navigation buttons to the next, back, quit slots
2020-04-01 18:45:25 +02:00
demmm
2c2bba5525 actually set About button to false... 2020-04-01 16:21:43 +02:00
demmm
b3f59cee25 filling About in QML, button still disabled
using Loader, can be reused for other widgets conversion
leave onClick example with full path, commneted out
title text for About is hardcoded, discuss option to make this configurable in welcome.conf
background color hardcoded, tested to work well in dark themes too
2020-04-01 16:19:00 +02:00
Adriaan de Groot
9f66b63c00 [calamares] Indulge in template-fu to refactor
- since we've got two blocks of code copy-pasted, which both
  decide to call one or the other of two member functions based
  on a flavor value, turn that into a templated function.
- passing member functions looks a bit weird, and calling them
  is syntactically surprising, but it cuts down the code a lot.
2020-04-01 15:30:47 +02:00
Adriaan de Groot
2dcf265c40 [calamares] Give QML navigation bar a fixed height 2020-04-01 15:13:08 +02:00
Adriaan de Groot
02fc4ce806 [calamares] Load QML navigation 2020-04-01 15:09:59 +02:00
Adriaan de Groot
d4f903b95c [calamares] Create navigation panel in CalamaresWindow
- this is a non-functional duplicate panel, so it looks funny
2020-04-01 11:35:27 +02:00
Adriaan de Groot
6c8aa5da63 [libcalamaresui] Remove commented-out code 2020-04-01 11:26:09 +02:00
Adriaan de Groot
57e6864902 [libcalamaresui] Add panel flavor
- rename enum to more general PanelFlavor
- introduce branding settings for navigation (e.g. for switching
  the navigation buttons off, or using QML)
2020-04-01 11:13:41 +02:00
Adriaan de Groot
d4083c9bbb [libcalamaresui] Add "hidden" as alias for "none" in sidebar settings 2020-04-01 11:07:23 +02:00
Adriaan de Groot
d8ecd302e1 [libcalamares] Apply coding style
- minor space issues
 - drop a blank line after moc-warnings.h to avoid if being sorted
   downwards, after the MOC file it's protecting
2020-03-31 23:19:51 +02:00
Adriaan de Groot
1765412b61 [libcalamaresui] Move RequirementsChecker to libcalamares
- the checker only collects and calls requirements; it has no
  UI component, and only manages data (and a thread to do the
  checking). Move it out of the UI library.
2020-03-31 23:13:13 +02:00
Adriaan de Groot
7655584022 [libcalamaresui] Move Module to libcalamares
- The Module class has no UI-specific code in it; it's all about
  loading and data-management. Move it out of the UI library.
2020-03-31 22:56:42 +02:00
Adriaan de Groot
e04f87fe95 [libcalamaresui] Refactor moduleFromDescriptor
- this function lives in Module -- and is the only thing typing
  Module to the ViewSteps and JobTypes. Split it out into its
  own funciton. Nothing else in Module needs to befriend the
  ViewSteps, so we move the friend declaration around a bit
  as well.
- while here, apply coding style.

This is prep-work for moving module to libcalamares.
2020-03-31 22:46:45 +02:00
Adriaan de Groot
4ddd1ecceb [libcalamares] Move Requirement to libcalamares
- This isn't a UI component: a requirement can be checked and
  reported-on without a UI entirely.
2020-03-31 22:13:30 +02:00
demmm
c10ef9e3bc [welcome] Improve welcomeq visuals
- set image to fill
 - keep aspect ratio
 - don't hardcode text color
 - variation in icons used
 - expand header text to check fit
2020-03-31 16:08:24 +02:00
Adriaan de Groot
04c084e831 Merge branch 'issue-1340'
FIXES #1340
2020-03-30 14:28:46 +02:00
Adriaan de Groot
eda2e4e10a [calamares] Tweak looks of basic-QML-sidebar
- Use the new currentStepIndex (suggested by Camilo) to see if something
  is selected / current.
2020-03-30 14:25:54 +02:00