Hello community, here is the log from the commit of package yast2-support for openSUSE:Factory checked in at 2018-09-07 15:39:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-support (Old) and /work/SRC/openSUSE:Factory/.yast2-support.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-support" Fri Sep 7 15:39:53 2018 rev:49 rq:633479 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-support/yast2-support.changes 2018-06-29 22:37:27.329946869 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-support.new/yast2-support.changes 2018-09-07 15:39:54.934503211 +0200 @@ -1,0 +2,8 @@ +Thu Aug 30 13:01:32 UTC 2018 - [email protected] + +- In ncurses the "Next" button to submit the gathered information + was not visible (bsc#1093358) +- Made the Contact Information screen fit in a 80x24 terminal +- 4.0.1 + +------------------------------------------------------------------- Old: ---- yast2-support-4.0.0.tar.bz2 New: ---- yast2-support-4.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-support.spec ++++++ --- /var/tmp/diff_new_pack.ofhG4y/_old 2018-09-07 15:39:55.306502812 +0200 +++ /var/tmp/diff_new_pack.ofhG4y/_new 2018-09-07 15:39:55.306502812 +0200 @@ -17,7 +17,7 @@ Name: yast2-support -Version: 4.0.0 +Version: 4.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-support-4.0.0.tar.bz2 -> yast2-support-4.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-4.0.0/package/yast2-support.changes new/yast2-support-4.0.1/package/yast2-support.changes --- old/yast2-support-4.0.0/package/yast2-support.changes 2018-06-29 16:37:54.000000000 +0200 +++ new/yast2-support-4.0.1/package/yast2-support.changes 2018-09-05 15:20:13.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Aug 30 13:01:32 UTC 2018 - [email protected] + +- In ncurses the "Next" button to submit the gathered information + was not visible (bsc#1093358) +- Made the Contact Information screen fit in a 80x24 terminal +- 4.0.1 + +------------------------------------------------------------------- Wed Jun 27 09:50:24 CEST 2018 - [email protected] - Added additional searchkeys to desktop file (fate#321043). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-4.0.0/package/yast2-support.spec new/yast2-support-4.0.1/package/yast2-support.spec --- old/yast2-support-4.0.0/package/yast2-support.spec 2018-06-29 16:37:54.000000000 +0200 +++ new/yast2-support-4.0.1/package/yast2-support.spec 2018-09-05 15:20:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-support -Version: 4.0.0 +Version: 4.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-support-4.0.0/src/include/support/dialogs.rb new/yast2-support-4.0.1/src/include/support/dialogs.rb --- old/yast2-support-4.0.0/src/include/support/dialogs.rb 2018-06-29 16:37:54.000000000 +0200 +++ new/yast2-support-4.0.1/src/include/support/dialogs.rb 2018-09-05 15:20:13.000000000 +0200 @@ -677,6 +677,15 @@ Convert.to_symbol(ret) end + # A helper to construct the UI + # @param id [Symbol] + # @param label [String] + # @param key [String] key in Support.options + def input_field(id, label, key) + value = Support.options.fetch(key, "") + Left(InputField(Id(id), label, value)) + end + # Configure2 dialog # @return dialog result def ContactDialog @@ -687,66 +696,20 @@ contents = VBox( Frame( _("Contact Information"), - VBox( - Left( - InputField( - Id(:company), - _("Company"), - Ops.get_string( - Support.options, - "VAR_OPTION_CONTACT_COMPANY", - "" - ) - ) - ), - Left( - InputField( - Id(:email), - _("Email Address"), - Ops.get_string(Support.options, "VAR_OPTION_CONTACT_EMAIL", "") - ) - ), - Left( - InputField( - Id(:name), - _("Name"), - Ops.get_string(Support.options, "VAR_OPTION_CONTACT_NAME", "") - ) - ), - Left( - InputField( - Id(:phone), - _("Phone Number"), - Ops.get_string(Support.options, "VAR_OPTION_CONTACT_PHONE", "") - ) - ), - Left( - InputField( - Id(:storeid), - _("Store ID"), - Ops.get_string( - Support.options, - "VAR_OPTION_CONTACT_STOREID", - "" - ) - ) - ), - Left( - InputField( - Id(:terminalid), - _("Terminal ID"), - Ops.get_string( - Support.options, - "VAR_OPTION_CONTACT_TERMINALID", - "" - ) + HBox( + Top( + VBox( + input_field(:company, _("Company"), "VAR_OPTION_CONTACT_COMPANY"), + input_field(:email, _("Email Address"), "VAR_OPTION_CONTACT_EMAIL"), + input_field(:name, _("Name"), "VAR_OPTION_CONTACT_NAME"), + input_field(:phone, _("Phone Number"), "VAR_OPTION_CONTACT_PHONE") ) ), - Left( - InputField( - Id(:gpg_uid), - _("GPG UID"), - Ops.get_string(Support.options, "VAR_OPTION_GPG_UID", "") + Top( + VBox( + input_field(:storeid, _("Store ID"), "VAR_OPTION_CONTACT_STOREID"), + input_field(:terminalid, _("Terminal ID"), "VAR_OPTION_CONTACT_TERMINALID"), + input_field(:gpg_uid, _("GPG UID"), "VAR_OPTION_GPG_UID") ) ) ) @@ -759,11 +722,7 @@ Id(:target), _("Upload Target"), Builtins.deletechars( - Ops.get_string( - Support.options, - "VAR_OPTION_UPLOAD_TARGET", - "" - ), + Support.options.fetch("VAR_OPTION_UPLOAD_TARGET", ""), "'" ) ) @@ -867,7 +826,10 @@ def GenerateDialog caption = _("Collecting Data") - contents = VBox(LogView(Id(:log), _("Progress"), 1000, 1000)) + contents = VBox( + ReplacePoint(Id(:rp), Empty()), + LogView(Id(:log), Opt(:vstretch), _("Progress"), 10, 1000) + ) Wizard.SetContentsButtons( caption, contents, @@ -916,6 +878,7 @@ end else Wizard.EnableNextButton + UI.ReplaceWidget(Id(:rp), Empty()) # work around bsc#1106744 break end ret = Convert.to_symbol(UI.PollInput)
