Merge pull request #2583 from keymanapp/fix/linux/about-missing-copyright

fix(linux): Fix 'About' keyboard when missing copyright
This commit is contained in:
Darcy Wong 2020-02-05 14:49:52 +07:00 • committed by GitHub
commit 863cbf98b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions

View file

@ -1,5 +1,9 @@
# Keyman for Linux Version History
## 2020-02-05 13.0.25 beta
* Bug Fix:
* Fix "About" keyboard when missing copyright info (#2583)
## 2020-02-04 13.0.23 beta
* Remove cosmic and disco releases. Add eoan (#2574)

View file

@ -122,16 +122,17 @@ class KeyboardDetailsView(Gtk.Window):
label.set_selectable(True)
grid.attach_next_to(label, lbl_pkg_auth, Gtk.PositionType.RIGHT, 1, 1)
lbl_pkg_cpy = Gtk.Label()
lbl_pkg_cpy.set_text("Package copyright: ")
lbl_pkg_cpy.set_halign(Gtk.Align.END)
grid.attach_next_to(lbl_pkg_cpy, prevlabel, Gtk.PositionType.BOTTOM, 1, 1)
prevlabel = lbl_pkg_cpy
label = Gtk.Label()
label.set_text(info['copyright']['description'])
label.set_halign(Gtk.Align.START)
label.set_selectable(True)
grid.attach_next_to(label, lbl_pkg_cpy, Gtk.PositionType.RIGHT, 1, 1)
if "copyright" in info:
lbl_pkg_cpy = Gtk.Label()
lbl_pkg_cpy.set_text("Package copyright: ")
lbl_pkg_cpy.set_halign(Gtk.Align.END)
grid.attach_next_to(lbl_pkg_cpy, prevlabel, Gtk.PositionType.BOTTOM, 1, 1)
prevlabel = lbl_pkg_cpy
label = Gtk.Label()
label.set_text(info['copyright']['description'])
label.set_halign(Gtk.Align.START)
label.set_selectable(True)
grid.attach_next_to(label, lbl_pkg_cpy, Gtk.PositionType.RIGHT, 1, 1)
# Padding and full width horizontal divider
lbl_pad = Gtk.Label()