Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only sync ui #125

Merged
merged 5 commits into from
Nov 20, 2018
Merged

Only sync ui #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d87529
Proposal: fix alignment of 'Synchronize' and 'Configure' buttons
teclator Nov 19, 2018
bea6aa8
Bump version & changelog.
teclator Nov 19, 2018
5210426
Use VSpacing(1) only in TextMode
teclator Nov 20, 2018
9d03826
Updated changelog mentioning the fixed hide issue.
teclator Nov 20, 2018
35d0c6f
Changes based on code review.
teclator Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions package/yast2-ntp-client.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Nov 14 21:32:26 UTC 2018 - knut.andersse@suse.com

- Aligned "Synchronize Now" button and "NTP Server Address" box not
breaking previous fix and not hiding the manual checkbox in
TextMode (bnc#893065, bsc#1039985).
- 4.0.16

-------------------------------------------------------------------
Thu Nov 8 19:20:26 UTC 2018 - knut.andersse@suse.com

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-ntp-client.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-ntp-client
Version: 4.0.15
Version: 4.0.16
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0+
Expand Down
43 changes: 27 additions & 16 deletions src/clients/ntp-client_proposal.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,21 +210,36 @@ def ui_init(rp, first_time)
rp = deep_copy(rp)
cont = VBox(
VSpacing(0.5),
HBox(
HSpacing(3),
HWeight(
1,
Left(
ComboBox(
Id(:ntp_address),
Opt(:editable, :hstretch),
# TRANSLATORS: combo box label
_("&NTP Server Address")
)
)
),
HWeight(
1,
VBox(
# In TextMode and empty label is not filling an extra space, so
# an explicit vertical space was added in order to move down the
# push button being aligned with the combo box input.
UI.TextMode ? VSpacing(1) : Label(""),
teclator marked this conversation as resolved.
Show resolved Hide resolved
# TRANSLATORS: push button label
Left(PushButton(Id(:ntp_now), _("S&ynchronize now")))
)
)
),
HBox(
HSpacing(3),
HWeight(
1,
VBox(
VSpacing(0.5),
Left(
ComboBox(
Id(:ntp_address),
Opt(:editable, :hstretch),
# combo box label
_("&NTP Server Address")
)
),
VSpacing(0.3),
HBox(
HSpacing(0.5),
# check box label
Expand All @@ -238,7 +253,7 @@ def ui_init(rp, first_time)
),
HBox(
HSpacing(0.5),
# check box label
# TRANSLATORS: check box label
Left(
CheckBox(Id(:ntp_save), _("&Save NTP Configuration"), true)
)
Expand All @@ -248,11 +263,7 @@ def ui_init(rp, first_time)
HWeight(
1,
VBox(
Label(""),
# push button label
Left(PushButton(Id(:ntp_now), _("S&ynchronize now"))),
VSpacing(0.3),
# push button label
# TRANSLATORS: push button label
# bnc#449615: only simple config for inst-sys
Stage.initial ? Label("") : Left(PushButton(Id(:ntp_configure), _("&Configure..."))),
Label("")
Expand Down