Merge lp://staging/~flscogna/ubuntu-terminal-app/profile-selection into lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

Proposed by Filippo Scognamiglio
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 77
Merged at revision: 80
Proposed branch: lp://staging/~flscogna/ubuntu-terminal-app/profile-selection
Merge into: lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 434 lines (+207/-59)
8 files modified
po/com.ubuntu.terminal.pot (+13/-8)
src/app/fileio.cpp (+2/-4)
src/app/qml/KeyboardBar.qml (+31/-9)
src/app/qml/KeyboardRows/KeyboardLayout.qml (+2/-2)
src/app/qml/LayoutsPage.qml (+47/-0)
src/app/qml/SettingsPage.qml (+38/-31)
src/app/qml/TerminalSettings.qml (+69/-5)
src/app/qml/ubuntu-terminal-app.qml (+5/-0)
To merge this branch: bzr merge lp://staging/~flscogna/ubuntu-terminal-app/profile-selection
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+255077@code.staging.launchpad.net

Commit message

Custom profile visibility in settings

Description of the change

Custom profile visibility in settings. It is possible to show only a subset of the installed layouts.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

I set no profiles active, but still see the keyboard button. Can we hide that when all keyboard layouts are disabled?

http://people.canonical.com/~alan/screenshots/device-2015-04-13-120147.png

Other than that, looks great.

review: Needs Fixing
Revision history for this message
Filippo Scognamiglio (flscogna) wrote :

Alan, we can theoretically hide the keyboard button, but what about the row? If we hide only the button, we would basically have a black useless rectangle at the bottom.
Let's discuss some options:

1) Leave the current situation, with a useless bar and a useless button. (quite bad but predictable)
2) Hide the keyboard bar when no profiles are selected. (might be confusing?)
3) Force at least one profiles to be active (e.g. your ubuntu layout).

What do you think?

Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

I prefer 2).

If someone doesn't want to 'waste' the screen real-estate used by the layout, so switches them all off, they'll be disappointed that they don't gain space IMO.

If we force a profile to be active, we're forcing that 'waste' of space for users who don't need it.

I would default to having the layouts enabled by default, but if the user actively has chosen to disable them _all_ then they should expect the consequence that they're gone from the main UI. They've already discovered how to disable them, re-enabling them shouldn't be a stretch for them.

What do you think?

Revision history for this message
Filippo Scognamiglio (flscogna) wrote :

We already have a setting to completely disable the keyboard bar (in the main page).
The state which might be confusing here is: "Show Keyboard Bar" is turned on, but all profiles are disabled.

I'd personally not mix profiles selection with bar visibility. I'm thinking some day we'll have a keyboard shortcut to show/hide the bar, and we need to preserve the state (read the profiles enabled).

I'm inclined to think the best solution is to always show the additional bar (provided "Show Keyboard Bar" is enabled), but grey out the button when no profile is selected.
If the users wants to recover the screen real-estate (temporarily or permanently) it is just a tick away, without the need to change anything about its favourites profiles.

I perfectly agree with the default choices.

Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Ok, you make a good argument. Let's go with your plan.

Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Are you planning to add the grey icon in this merge? If so, when can we expect that?

Revision history for this message
Filippo Scognamiglio (flscogna) wrote :

Sorry, I completely forgot about this merge proposal. I'll work on it in
the next two days.

2015-05-19 11:22 GMT+02:00 Alan Pope ξƒΏ <email address hidden>:

> Are you planning to add the grey icon in this merge? If so, when can we
> expect that?
> --
>
> https://code.launchpad.net/~flscogna/ubuntu-terminal-app/profile-selection/+merge/255077
> You are the owner of lp:~flscogna/ubuntu-terminal-app/profile-selection.
>

74. By Filippo Scognamiglio

Set the button colour to grey when no profiles are selected.

75. By Filippo Scognamiglio

Merge the latest changes from trunk.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Filippo Scognamiglio (flscogna) wrote :

Alan, when you have some time give this a go. The colour might be tweaked a bit, but I think the result is decent.

Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

There seems to be a breakage in some use cases.

Add a few layouts
Go back to the main terminal screen
Select one as the current one
Go back to layout settings, de-select the one set as current

Expected behaviour:- Switch to another layout (next in list for example), or un-set a layout

Actual behaviour can sometimes be:-

* No layout set, choosing a layout has no effect:-
http://people.canonical.com/~alan/screenshots/device-2015-05-27-155914.png
http://people.canonical.com/~alan/screenshots/device-2015-05-27-155920.png

review: Needs Fixing
76. By Filippo Scognamiglio

Fix unexpected behaviour when unselecting the last profile in the list.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Filippo Scognamiglio (flscogna) wrote :

Ok, there was an issue when the last profile was active and unselected from the settings. This should work fine now.

77. By Filippo Scognamiglio

Import the latest changes from trunk.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

That fixed it!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches