| Andrew Geissler | ac970dd | 2021-02-12 15:32:45 -0600 | [diff] [blame^] | 1 | From 8414d63343cc7909bc7a972941c678509d5d5be6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Kai Kang <kai.kang@windriver.com> |
| 3 | Date: Mon, 11 Jan 2021 10:15:45 +0800 |
| 4 | Subject: [PATCH 6/8] themes/Industrial: add info label in ui |
| 5 | |
| 6 | Adjust the layout and add a new label "info" under the labe "prompt" in |
| 7 | themes/Industrial to tell user some useful information such as |
| 8 | "Authentication failed" or "Invalid password". |
| 9 | |
| 10 | Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] |
| 11 | |
| 12 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 13 | --- |
| 14 | data/themes/Industrial/greeter-gtk3.ui | 27 +++++++++++++++++++++++++- |
| 15 | data/themes/Industrial/greeter.ui | 27 +++++++++++++++++++++++++- |
| 16 | data/themes/Industrial/gtk.css | 5 +++++ |
| 17 | 3 files changed, 57 insertions(+), 2 deletions(-) |
| 18 | |
| 19 | diff --git a/data/themes/Industrial/greeter-gtk3.ui b/data/themes/Industrial/greeter-gtk3.ui |
| 20 | index 2f4e631..e59eee3 100644 |
| 21 | --- a/data/themes/Industrial/greeter-gtk3.ui |
| 22 | +++ b/data/themes/Industrial/greeter-gtk3.ui |
| 23 | @@ -45,7 +45,12 @@ |
| 24 | <property name="xscale">0</property> |
| 25 | <property name="yscale">0</property> |
| 26 | <child> |
| 27 | - <object class="GtkHBox" id="hbox3"> |
| 28 | + <object class="GtkVBox" id="vbox3"> |
| 29 | + <property name="visible">True</property> |
| 30 | + <property name="orientation">vertical</property> |
| 31 | + <property name="spacing">12</property> |
| 32 | + <child> |
| 33 | + <object class="GtkHBox" id="hbox3"> |
| 34 | <property name="visible">True</property> |
| 35 | <property name="spacing">12</property> |
| 36 | <child> |
| 37 | @@ -91,6 +96,26 @@ |
| 38 | </packing> |
| 39 | </child> |
| 40 | </object> |
| 41 | + </child> |
| 42 | + <child> |
| 43 | + <object class="GtkHBox" id="hbox4"> |
| 44 | + <property name="visible">True</property> |
| 45 | + <property name="spacing">12</property> |
| 46 | + <child> |
| 47 | + <object class="GtkLabel" id="info"> |
| 48 | + <property name="visible">True</property> |
| 49 | + <property name="label" translatable="yes"></property> |
| 50 | + <property name="yalign">0.2</property> |
| 51 | + </object> |
| 52 | + <packing> |
| 53 | + <property name="expand">False</property> |
| 54 | + <property name="fill">False</property> |
| 55 | + <property name="position">0</property> |
| 56 | + </packing> |
| 57 | + </child> |
| 58 | + </object> |
| 59 | + </child> |
| 60 | + </object> |
| 61 | </child> |
| 62 | </object> |
| 63 | <packing> |
| 64 | diff --git a/data/themes/Industrial/greeter.ui b/data/themes/Industrial/greeter.ui |
| 65 | index 3413922..6a02d8d 100644 |
| 66 | --- a/data/themes/Industrial/greeter.ui |
| 67 | +++ b/data/themes/Industrial/greeter.ui |
| 68 | @@ -47,7 +47,12 @@ |
| 69 | <property name="xscale">0</property> |
| 70 | <property name="yscale">0</property> |
| 71 | <child> |
| 72 | - <object class="GtkHBox" id="hbox3"> |
| 73 | + <object class="GtkVBox" id="vbox3"> |
| 74 | + <property name="visible">True</property> |
| 75 | + <property name="orientation">vertical</property> |
| 76 | + <property name="spacing">12</property> |
| 77 | + <child> |
| 78 | + <object class="GtkHBox" id="hbox3"> |
| 79 | <property name="visible">True</property> |
| 80 | <property name="spacing">12</property> |
| 81 | <child> |
| 82 | @@ -93,6 +98,26 @@ |
| 83 | </packing> |
| 84 | </child> |
| 85 | </object> |
| 86 | + </child> |
| 87 | + <child> |
| 88 | + <object class="GtkHBox" id="hbox4"> |
| 89 | + <property name="visible">True</property> |
| 90 | + <property name="spacing">12</property> |
| 91 | + <child> |
| 92 | + <object class="GtkLabel" id="info"> |
| 93 | + <property name="visible">True</property> |
| 94 | + <property name="label" translatable="yes"></property> |
| 95 | + <property name="yalign">0.2</property> |
| 96 | + </object> |
| 97 | + <packing> |
| 98 | + <property name="expand">False</property> |
| 99 | + <property name="fill">False</property> |
| 100 | + <property name="position">0</property> |
| 101 | + </packing> |
| 102 | + </child> |
| 103 | + </object> |
| 104 | + </child> |
| 105 | + </object> |
| 106 | </child> |
| 107 | </object> |
| 108 | <packing> |
| 109 | diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css |
| 110 | index 7621345..be15f43 100644 |
| 111 | --- a/data/themes/Industrial/gtk.css |
| 112 | +++ b/data/themes/Industrial/gtk.css |
| 113 | @@ -22,3 +22,8 @@ |
| 114 | font: Sans 12; |
| 115 | color: #9E9D9B; |
| 116 | } |
| 117 | + |
| 118 | +#info { |
| 119 | + font: Sans 14; |
| 120 | + font-style: italic; |
| 121 | +} |
| 122 | -- |
| 123 | 2.25.1 |
| 124 | |