Hello community,
here is the log from the commit of package gnuhealth-client for
openSUSE:Factory checked in at 2020-03-01 21:28:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnuhealth-client (Old)
and /work/SRC/openSUSE:Factory/.gnuhealth-client.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuhealth-client"
Sun Mar 1 21:28:32 2020 rev:15 rq:780758 version:3.6.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnuhealth-client/gnuhealth-client.changes
2020-01-31 23:58:39.679694211 +0100
+++
/work/SRC/openSUSE:Factory/.gnuhealth-client.new.26092/gnuhealth-client.changes
2020-03-01 21:29:04.536685866 +0100
@@ -1,0 +2,14 @@
+Sun Mar 1 16:58:48 UTC 2020 - Axel Braun <[email protected]>
+
+- version 3.6.8
+ * Removed the deprecated App Menu in favor of the Menu Bar.
+ * Migrate from obsolete Table to Grid
+ * Fix the footer
+ * Include accelerator for preferences (ctrl+shift+p) and fix
+ accelerator for shortcuts (ctrl+shift+F1)
+ * Avoid maximizing application at startup
+ * Remove unused fast tabbing option from menu
+ * Allow setting the GH command line on the bottom again (cli_position =
+ bottom). By default is top.
+
+-------------------------------------------------------------------
Old:
----
gnuhealth-client-3.6.6.tar.gz
New:
----
gnuhealth-client-3.6.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnuhealth-client.spec ++++++
--- /var/tmp/diff_new_pack.qz1Gwa/_old 2020-03-01 21:29:05.676688182 +0100
+++ /var/tmp/diff_new_pack.qz1Gwa/_new 2020-03-01 21:29:05.680688190 +0100
@@ -19,7 +19,7 @@
%define majorver 3.6
Name: gnuhealth-client
-Version: %{majorver}.6
+Version: %{majorver}.8
Release: 0
Summary: The client of the GNU Health Hospital system
License: GPL-3.0-only
++++++ gnuhealth-client-3.6.6.tar.gz -> gnuhealth-client-3.6.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnuhealth-client-3.6.6/COPYRIGHT
new/gnuhealth-client-3.6.8/COPYRIGHT
--- old/gnuhealth-client-3.6.6/COPYRIGHT 2020-01-01 10:43:01.000000000
+0100
+++ new/gnuhealth-client-3.6.8/COPYRIGHT 2020-03-01 14:26:43.000000000
+0100
@@ -4,8 +4,8 @@
#
# Licensed under GPL v3+
#
-# Copyright (C) 2017 - 2019 Luis Falcon <[email protected]>
-# Copyright (C) 2017 - 2019 GNU Solidario <[email protected]>
+# Copyright (C) 2017 - 2020 Luis Falcon <[email protected]>
+# Copyright (C) 2017 - 2020 GNU Solidario <[email protected]>
#
# Based on the Tryton GTK Client 5.2
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnuhealth-client-3.6.6/Changelog
new/gnuhealth-client-3.6.8/Changelog
--- old/gnuhealth-client-3.6.6/Changelog 2020-01-29 20:29:18.000000000
+0100
+++ new/gnuhealth-client-3.6.8/Changelog 2020-03-01 14:23:57.000000000
+0100
@@ -1,3 +1,40 @@
+changeset: 3546:acff636f68f4
+tag: tip
+user: Luis Falcon <[email protected]>
+date: Sun Mar 01 13:22:59 2020 +0000
+summary: Update to GH Client 3.6.8 with correct versioning
+
+changeset: 3545:64ba8c13ba73
+tag: tip
+user: Luis Falcon <[email protected]>
+date: Sun Mar 01 13:00:15 2020 +0000
+summary: GH GTK Client : PEP8 max line
+
+changeset: 3544:003c765a8e24
+user: Luis Falcon <[email protected]>
+date: Sun Mar 01 12:42:07 2020 +0000
+summary: GH GTK Client : Fix footer / status bar . Make window header
compatible with KDE and other desktops.
+
+changeset: 3543:5e5bbff945d4
+user: Luis Falcon <[email protected]>
+date: Sun Mar 01 09:01:28 2020 +0000
+summary: GH GTK client : Avoid maximizing window at startup
+
+changeset: 3542:a68aa1e08e3f
+user: Luis Falcon <[email protected]>
+date: Sun Mar 01 08:55:21 2020 +0000
+summary: GH GTK client : remove fast tabbing from options
+
+changeset: 3541:f288179d2dec
+user: Luis Falcon <[email protected]>
+date: Sun Mar 01 08:48:58 2020 +0000
+summary: GH GTK client . bug #57928. Implement menu bar
+
+changeset: 3540:7bb4fa7cd27c
+user: Luis Falcon <[email protected]>
+date: Sat Feb 29 11:38:44 2020 +0000
+summary: Update dev headers
+
changeset: 3515:3f626fe3b3f7
tag: tip
user: Luis Falcon <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnuhealth-client-3.6.6/PKG-INFO
new/gnuhealth-client-3.6.8/PKG-INFO
--- old/gnuhealth-client-3.6.6/PKG-INFO 2020-01-31 05:50:06.000000000 +0100
+++ new/gnuhealth-client-3.6.8/PKG-INFO 2020-03-01 14:29:43.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: gnuhealth-client
-Version: 3.6.6
+Version: 3.6.8
Summary: The GNU Health GTK client
Home-page: http://www.gnuhealth.org
Author: GNU Solidario
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnuhealth-client-3.6.6/gnuhealth_client.egg-info/PKG-INFO
new/gnuhealth-client-3.6.8/gnuhealth_client.egg-info/PKG-INFO
--- old/gnuhealth-client-3.6.6/gnuhealth_client.egg-info/PKG-INFO
2020-01-31 05:50:05.000000000 +0100
+++ new/gnuhealth-client-3.6.8/gnuhealth_client.egg-info/PKG-INFO
2020-03-01 14:29:43.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: gnuhealth-client
-Version: 3.6.6
+Version: 3.6.8
Summary: The GNU Health GTK client
Home-page: http://www.gnuhealth.org
Author: GNU Solidario
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnuhealth-client-3.6.6/tryton/__init__.py
new/gnuhealth-client-3.6.8/tryton/__init__.py
--- old/gnuhealth-client-3.6.6/tryton/__init__.py 2020-01-29
19:58:29.000000000 +0100
+++ new/gnuhealth-client-3.6.8/tryton/__init__.py 2020-03-01
14:22:31.000000000 +0100
@@ -1,6 +1,6 @@
# This file is part of GNU Health. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-__version__ = "3.6.6"
+__version__ = "3.6.8"
SERVER_VERSION = "5.0.0"
import gi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnuhealth-client-3.6.6/tryton/gui/main.py
new/gnuhealth-client-3.6.8/tryton/gui/main.py
--- old/gnuhealth-client-3.6.6/tryton/gui/main.py 2020-01-29
20:02:58.000000000 +0100
+++ new/gnuhealth-client-3.6.8/tryton/gui/main.py 2020-03-01
13:58:12.000000000 +0100
@@ -55,6 +55,7 @@
action = Gio.SimpleAction.new('preferences', None)
action.connect('activate', lambda *a: self.preferences())
self.add_action(action)
+ self.set_accels_for_action('app.preferences', ['<Primary><Shift>p'])
action = Gio.SimpleAction.new('menu-search', None)
action.connect(
@@ -110,7 +111,7 @@
action = Gio.SimpleAction.new('shortcuts', None)
action.connect('activate', lambda *a: self.shortcuts())
self.add_action(action)
- self.set_accels_for_action('app.shortcuts', ['<Primary>F1'])
+ self.set_accels_for_action('app.shortcuts', ['<Primary><Shift>F1'])
action = Gio.SimpleAction.new('about', None)
action.connect('activate', lambda *a: self.about())
@@ -135,39 +136,41 @@
self.set_accels_for_action('app.gh_cli', ['<Primary><Shift>Z'])
- menu = Gio.Menu.new()
- menu.append(_("Preferences..."), 'app.preferences')
-
- section = Gio.Menu.new()
+ # Main Menu
+ main_menu = Gio.Menu.new()
+ file_menu = Gio.Menu.new()
+ settings_menu = Gio.Menu.new()
+ help_menu = Gio.Menu.new()
toolbar = Gio.Menu.new()
- section.append_submenu(_("Toolbar"), toolbar)
+ main_menu.append_submenu(_("File"), file_menu)
+ main_menu.append_submenu(_("Settings"), settings_menu)
+ main_menu.append_submenu(_("Help"), help_menu)
+
+ settings_menu.append(_("Preferences..."), 'app.preferences')
+
+ settings_menu.append_submenu(_("Toolbar"), toolbar)
toolbar.append(_("Default"), 'app.toolbar::default')
toolbar.append(_("Text and Icons"), 'app.toolbar::both')
toolbar.append(_("Text"), 'app.toolbar::text')
toolbar.append(_("Icons"), 'app.toolbar::icons')
form = Gio.Menu.new()
- section.append_submenu(_("Form"), form)
+ settings_menu.append_submenu(_("Form"), form)
form.append(_("Save Width/Height"), 'app.save-width-height')
form.append(_("Save Tree State"), 'app.save-tree-state')
- form.append(_("Fast Tabbing"), 'app.fast-tabbing')
form.append(_("Spell Checking"), 'app.spell-checking')
- section.append(_("Search Limit..."), 'app.search-limit')
- section.append(_("Email..."), 'app.email')
+ settings_menu.append(_("Search Limit..."), 'app.search-limit')
+ settings_menu.append(_("Email..."), 'app.email')
- menu.append_section(_("Options"), section)
- section = Gio.Menu.new()
- section.append(_("Keyboard Shortcuts..."), 'app.shortcuts')
- section.append(_("About..."), 'app.about')
- menu.append_section(_("Help"), section)
+ help_menu.append(_("Keyboard Shortcuts..."), 'app.shortcuts')
+ help_menu.append(_("About..."), 'app.about')
- section = Gio.Menu.new()
- section.append(_("Quit"), 'app.quit')
- menu.append_section(None, section)
+ file_menu.append(_("Quit"), 'app.quit')
+
+ self.set_menubar(main_menu)
- self.set_app_menu(menu)
def do_activate(self):
if self.window:
@@ -176,37 +179,14 @@
self.window = Gtk.ApplicationWindow(application=self, title="GNU
Health")
self.window.set_default_size(960, 720)
- self.window.maximize()
self.window.set_position(Gtk.WindowPosition.CENTER)
self.window.set_resizable(True)
self.window.set_icon(GNUHEALTH_ICON)
self.window.connect("destroy", self.on_quit)
self.window.connect("delete_event", self.on_quit)
- self.header = Gtk.HeaderBar.new()
- self.header.set_show_close_button(True)
- self.window.set_titlebar(self.header)
self.set_title()
- menu = Gtk.Button.new()
- menu .set_relief(Gtk.ReliefStyle.NONE)
- menu.set_image(
- common.IconFactory.get_image('tryton-menu', Gtk.IconSize.BUTTON))
- menu.connect('clicked', self.menu_toggle)
- self.header.pack_start(menu)
-
- favorite = Gtk.MenuButton.new()
- favorite.set_relief(Gtk.ReliefStyle.NONE)
- favorite.set_image(common.IconFactory.get_image(
- 'tryton-bookmarks', Gtk.IconSize.BUTTON))
- self.menu_favorite = Gtk.Menu.new()
- favorite.set_popup(self.menu_favorite)
- favorite.connect('clicked', self.favorite_set)
- self.header.pack_start(favorite)
-
- self.set_global_search()
- self.header.pack_start(self.global_search_entry)
-
self.accel_group = Gtk.AccelGroup()
self.window.add_accel_group(self.accel_group)
@@ -284,10 +264,13 @@
# Register plugins
tryton.plugins.register()
+ # Initialize GNU Health environment
# GNUHEALTH CLI
self.cli = self.statusbar = self.footer_contents = self.footer = None
self.cli_position = CONFIG['client.cli_position']
+ self.init_gnuhealth_env()
+
self.set_title() # Adds username/profile while password is asked
try:
@@ -304,9 +287,6 @@
msg = "Connected to GNU Health Server"
self.activity_log_entry(msg, 'info')
- # Set the footer
- self.init_gnuhealth_env()
-
def gnuhealth_cli(self):
self.cli.grab_focus()
@@ -444,19 +424,8 @@
titles = [CONFIG['client.title']]
if value:
titles.append(value)
- self.header.set_title(' - '.join(titles))
- self.header.set_subtitle(login_info)
- try:
- style_context = self.header.get_style_context()
- except AttributeError:
- pass
- else:
- for name in style_context.list_classes():
- if name.startswith('profile-'):
- style_context.remove_class(name)
- if CONFIG['login.profile']:
- style_context.add_class(
- 'profile-%s' % CONFIG['login.profile'])
+ titles.append(login_info)
+ self.window.set_title(' - '.join(titles))
def favorite_set(self, *args):
if self.menu_favorite.get_children():
@@ -566,7 +535,7 @@
self.favorite_unset()
CONFIG['client.lang'] = prefs['language']
# Set placeholder after language is set to get correct translation
- self.global_search_entry.set_placeholder_text(_("Action"))
+ self.global_search_entry.set_placeholder_text(_("Global Search"))
CONFIG.save()
def preferences(self):
@@ -1128,32 +1097,63 @@
self.ghheader = Gtk.HBox()
self.ghheader.set_size_request(200,-1)
-
# Main footer
self.ghfooter = Gtk.HBox()
- # Create initally a 1x3 table for the footer, leaving the
- # middle column empty
- self.ghfooter_contents = Gtk.Table(1,3,True)
+ # Create initally a grid for the footer
+ self.ghfooter_contents = Gtk.Grid()
- # Create initally a 1x3 table for the header
- self.ghheader_contents = Gtk.Table(1,3,True)
+ # Create initally a grid for the header
+ self.ghheader_contents = Gtk.Grid()
# Set GNU Health Footer
self.set_ghfooter()
cli_position = self.cli_position
+ # Include the side menu toggle
+ side_menu = Gtk.Button.new()
+ side_menu.set_image(
+ common.IconFactory.get_image('tryton-menu', Gtk.IconSize.BUTTON))
+ side_menu.connect('clicked', self.menu_toggle)
+
+ # End of side-menu toggle
+
+ # Favorite entries
+ favorite = Gtk.MenuButton.new()
+ favorite.set_relief(Gtk.ReliefStyle.NONE)
+ favorite.set_image(common.IconFactory.get_image(
+ 'tryton-bookmarks', Gtk.IconSize.BUTTON))
+ self.menu_favorite = Gtk.Menu.new()
+ favorite.set_popup(self.menu_favorite)
+ favorite.connect('clicked', self.favorite_set)
+
+ self.set_global_search()
+
+
+
#Default CLI position at top
if (not cli_position or cli_position == 'top'):
- self.ghheader_contents.attach(self.cli, 0, 1, 0, 1)
- self.ghheader.pack_start(self.ghheader_contents,expand=True,
- fill=True, padding=0)
- self.vbox.pack_start (self.ghheader,
- expand=False, fill=False, padding=0)
+ self.ghheader_contents.add(self.cli)
+ self.ghheader_contents.attach_next_to(side_menu, self.cli,
+ Gtk.PositionType.RIGHT, 1, 1)
- self.vbox.reorder_child(self.ghheader, 1)
- self.ghheader.show_all()
+ else:
+ self.ghheader_contents.add(side_menu)
+
+ self.ghheader_contents.attach_next_to(favorite, side_menu,
+ Gtk.PositionType.RIGHT, 1, 1)
+ self.ghheader_contents.attach_next_to(self.global_search_entry,
+ favorite, Gtk.PositionType.RIGHT, 1, 1)
+
+ self.ghheader.pack_start(self.ghheader_contents,expand=True,
+ fill=True, padding=10)
+ self.vbox.pack_start (self.ghheader,
+ expand=False, fill=False, padding=10)
+
+ self.vbox.reorder_child(self.ghheader, 1)
+
+ self.ghheader.show_all()
# Add GNU Health Command Line and Status Bar in footer
def set_ghfooter(self):
@@ -1162,11 +1162,15 @@
ghfooter_contents = self.ghfooter_contents
if (self.cli_position == 'bottom'):
- ghfooter_contents.attach(cli, 0, 1, 0, 1)
+ ghfooter_contents.add(cli)
+ ghfooter_contents.attach_next_to(statusbar,cli,
+ Gtk.PositionType.RIGHT, 1, 1)
- ghfooter_contents.attach(statusbar,2, 3, 0, 1)
+ else:
+ ghfooter_contents.add(statusbar)
- self.ghfooter.pack_start(ghfooter_contents, expand=True, fill=True,
padding=0)
+ self.ghfooter.pack_start(ghfooter_contents, expand=True, fill=True,
+ padding=0)
# Pack the footer table in main vbox
self.vbox.pack_start (self.ghfooter, expand=False, fill=False,
padding=0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnuhealth-client-3.6.6/version
new/gnuhealth-client-3.6.8/version
--- old/gnuhealth-client-3.6.6/version 2020-01-29 19:58:07.000000000 +0100
+++ new/gnuhealth-client-3.6.8/version 2020-03-01 14:22:21.000000000 +0100
@@ -1 +1 @@
-3.6.6
+3.6.8
