On installations that have a desktop environment running (live, image,...), we don't change runtime keyboard configuration and changes made on the Keyboard spoke apply only to the installed system. But there is no hint for the user. I'd like to propose bug #886463 as NTH and push this to F18.
This patch adds a visible warning [1] to such installations.
[1] http://vpodzime.fedorapeople.org/keyboard_spoke_warning.png
Vratislav Podzimek (1): Add warning to keyboard spoke on live installations (#886463)
pyanaconda/ui/gui/spokes/keyboard.glade | 50 +++++++++++++++++++++++++++++++-- pyanaconda/ui/gui/spokes/keyboard.py | 4 +++ 2 files changed, 52 insertions(+), 2 deletions(-)
On live installations we do not change runtime keyboard configuration because desktop enviromnets provide their tools for that. We should give the user a hint on that.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com --- pyanaconda/ui/gui/spokes/keyboard.glade | 50 +++++++++++++++++++++++++++++++-- pyanaconda/ui/gui/spokes/keyboard.py | 4 +++ 2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/keyboard.glade b/pyanaconda/ui/gui/spokes/keyboard.glade index 9ca9aaf..852ae56 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.glade +++ b/pyanaconda/ui/gui/spokes/keyboard.glade @@ -215,7 +215,6 @@ <object class="GtkLabel" id="pickLayoutLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_bottom">24</property> <property name="xalign">0</property> <property name="label" translatable="yes">Which keyboard layouts would you like to use on this system? You may move any layout to the top of the list to select it as the default.</property> <property name="wrap">True</property> @@ -232,9 +231,56 @@ </packing> </child> <child> + <object class="GtkBox" id="warningBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="margin_right">20</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="warningImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-dialog-warning</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="liveWarningLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">On installations with running desktop environment, changes done here only apply to the installed system. Use tools of the running desktop environment to configure keyboard for the installation process.</property> + <property name="wrap">True</property> + <attributes> + <attribute name="font-desc" value="Cantarell 12"/> + <attribute name="weight" value="normal"/> + <attribute name="scale" value="1"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">24</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="spacing">30</property> @@ -479,7 +525,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index 81d59e2..f0ba40a 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -286,6 +286,10 @@ class KeyboardSpoke(NormalSpoke): def initialize(self): NormalSpoke.initialize(self)
+ if flags.can_touch_runtime_system("hide runtime keyboard configuration " + "warning"): + self.builder.get_object("warningBox").hide() + # We want to store layouts' names but show layouts as # 'language (description)'. layoutColumn = self.builder.get_object("layoutColumn")
On Thu, Dec 13, 2012 at 01:36:16PM +0100, Vratislav Podzimek wrote:
On live installations we do not change runtime keyboard configuration because desktop enviromnets provide their tools for that. We should give the user a hint on that.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com
pyanaconda/ui/gui/spokes/keyboard.glade | 50 +++++++++++++++++++++++++++++++-- pyanaconda/ui/gui/spokes/keyboard.py | 4 +++ 2 files changed, 52 insertions(+), 2 deletions(-)
<property name="can_focus">False</property><property name="label" translatable="yes">On installations with running desktop environment, changes done here only apply to the installed system. Use tools of the running desktop environment to configure keyboard for the installation process.</property>
We already know this is a live install, so I think this can be shorter:
Changes here will only apply to the installed system. Use the live desktop's tool to configure the keyboard for the installation process.
On Thu, 2012-12-13 at 10:05 -0800, Brian C. Lane wrote:
On Thu, Dec 13, 2012 at 01:36:16PM +0100, Vratislav Podzimek wrote:
On live installations we do not change runtime keyboard configuration because desktop enviromnets provide their tools for that. We should give the user a hint on that.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com
pyanaconda/ui/gui/spokes/keyboard.glade | 50 +++++++++++++++++++++++++++++++-- pyanaconda/ui/gui/spokes/keyboard.py | 4 +++ 2 files changed, 52 insertions(+), 2 deletions(-)
<property name="can_focus">False</property><property name="label" translatable="yes">On installations with running desktop environment, changes done here only apply to the installed system. Use tools of the running desktop environment to configure keyboard for the installation process.</property>We already know this is a live install, so I think this can be shorter:
Changes here will only apply to the installed system. Use the live desktop's tool to configure the keyboard for the installation process.
I would like to shorten it, but what about image installations?
On Fri, Dec 14, 2012 at 08:57:08AM +0100, Vratislav Podzimek wrote:
On Thu, 2012-12-13 at 10:05 -0800, Brian C. Lane wrote:
On Thu, Dec 13, 2012 at 01:36:16PM +0100, Vratislav Podzimek wrote:
On live installations we do not change runtime keyboard configuration because desktop enviromnets provide their tools for that. We should give the user a hint on that.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com
pyanaconda/ui/gui/spokes/keyboard.glade | 50 +++++++++++++++++++++++++++++++-- pyanaconda/ui/gui/spokes/keyboard.py | 4 +++ 2 files changed, 52 insertions(+), 2 deletions(-)
<property name="can_focus">False</property><property name="label" translatable="yes">On installations with running desktop environment, changes done here only apply to the installed system. Use tools of the running desktop environment to configure keyboard for the installation process.</property>We already know this is a live install, so I think this can be shorter:
Changes here will only apply to the installed system. Use the live desktop's tool to configure the keyboard for the installation process.
I would like to shorten it, but what about image installations?
I think image installs are a very limited set of users, they're usually going to be doing things via kickstart anyway. I guess we could drop 'live' and just say "Use the desktop's tool..."
On live installations we do not change runtime keyboard configuration because desktop enviromnets provide their tools for that. We should give the user a hint on that.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com --- pyanaconda/ui/gui/spokes/keyboard.glade | 50 +++++++++++++++++++++++++++++++-- pyanaconda/ui/gui/spokes/keyboard.py | 4 +++ 2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/keyboard.glade b/pyanaconda/ui/gui/spokes/keyboard.glade index 9ca9aaf..2f00a7f 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.glade +++ b/pyanaconda/ui/gui/spokes/keyboard.glade @@ -215,7 +215,6 @@ <object class="GtkLabel" id="pickLayoutLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_bottom">24</property> <property name="xalign">0</property> <property name="label" translatable="yes">Which keyboard layouts would you like to use on this system? You may move any layout to the top of the list to select it as the default.</property> <property name="wrap">True</property> @@ -232,9 +231,56 @@ </packing> </child> <child> + <object class="GtkBox" id="warningBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="margin_right">20</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="warningImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-dialog-warning</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="liveWarningLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Changes here will only apply to the installed system. Use the desktop's tool to configure the keyboard for the installation process.</property> + <property name="wrap">True</property> + <attributes> + <attribute name="font-desc" value="Cantarell 12"/> + <attribute name="weight" value="normal"/> + <attribute name="scale" value="1"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">24</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="spacing">30</property> @@ -479,7 +525,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index 81d59e2..f0ba40a 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -286,6 +286,10 @@ class KeyboardSpoke(NormalSpoke): def initialize(self): NormalSpoke.initialize(self)
+ if flags.can_touch_runtime_system("hide runtime keyboard configuration " + "warning"): + self.builder.get_object("warningBox").hide() + # We want to store layouts' names but show layouts as # 'language (description)'. layoutColumn = self.builder.get_object("layoutColumn")
On Mon, Dec 17, 2012 at 02:17:18PM +0100, Vratislav Podzimek wrote:
On live installations we do not change runtime keyboard configuration because desktop enviromnets provide their tools for that. We should give the user a hint on that.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com
pyanaconda/ui/gui/spokes/keyboard.glade | 50 +++++++++++++++++++++++++++++++-- pyanaconda/ui/gui/spokes/keyboard.py | 4 +++ 2 files changed, 52 insertions(+), 2 deletions(-)
ACK
anaconda-patches@lists.fedorahosted.org
-
Brian C. Lane -
Vratislav Podzimek