Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2016-05-02 10:43:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old) and /work/SRC/openSUSE:Factory/.libyui-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2015-10-14 16:41:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2016-05-02 10:43:44.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 5 17:29:56 CEST 2016 - shundhammer@suse.de + +- Show help in wizard widget upon F1 and Alt-H (bnc#973389) +- 2.46.22 + +------------------------------------------------------------------- Old: ---- libyui-qt-2.46.21.tar.bz2 New: ---- libyui-qt-2.46.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.p7IDxS/_old 2016-05-02 10:43:45.000000000 +0200 +++ /var/tmp/diff_new_pack.p7IDxS/_new 2016-05-02 10:43:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt-doc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define so_version 7 Name: %{parent}-doc -Version: 2.46.21 +Version: 2.46.22 Release: 0 Source: %{parent}-%{version}.tar.bz2 ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.p7IDxS/_old 2016-05-02 10:43:45.000000000 +0200 +++ /var/tmp/diff_new_pack.p7IDxS/_new 2016-05-02 10:43:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.46.21 +Version: 2.46.22 Release: 0 Source: %{name}-%{version}.tar.bz2 ++++++ libyui-qt-2.46.21.tar.bz2 -> libyui-qt-2.46.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/Rakefile new/libyui-qt-2.46.22/Rakefile --- old/libyui-qt-2.46.21/Rakefile 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.46.22/Rakefile 2016-04-05 17:59:11.000000000 +0200 @@ -0,0 +1,8 @@ +#-- +# Copyright (C) 2015 SUSE LLC +# +# make continuous integration using rubygem-libyui-rake. +# +# MIT license +#++ +require "libyui/rake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/VERSION.cmake new/libyui-qt-2.46.22/VERSION.cmake --- old/libyui-qt-2.46.21/VERSION.cmake 2015-10-02 17:34:10.000000000 +0200 +++ new/libyui-qt-2.46.22/VERSION.cmake 2016-04-05 17:59:11.000000000 +0200 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "46") -SET(VERSION_PATCH "21") +SET(VERSION_PATCH "22") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/package/libyui-qt-doc.spec new/libyui-qt-2.46.22/package/libyui-qt-doc.spec --- old/libyui-qt-2.46.21/package/libyui-qt-doc.spec 2015-10-02 17:34:10.000000000 +0200 +++ new/libyui-qt-2.46.22/package/libyui-qt-doc.spec 2016-04-06 16:49:09.000000000 +0200 @@ -20,7 +20,7 @@ %define so_version 7 Name: %{parent}-doc -Version: 2.46.21 +Version: 2.46.22 Release: 0 Source: %{parent}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/package/libyui-qt.changes new/libyui-qt-2.46.22/package/libyui-qt.changes --- old/libyui-qt-2.46.21/package/libyui-qt.changes 2015-10-02 17:34:10.000000000 +0200 +++ new/libyui-qt-2.46.22/package/libyui-qt.changes 2016-04-05 17:59:11.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 5 17:29:56 CEST 2016 - shundhammer@suse.de + +- Show help in wizard widget upon F1 and Alt-H (bnc#973389) +- 2.46.22 + +------------------------------------------------------------------- Fri Oct 2 14:55:08 UTC 2015 - lslezak@suse.cz - fixed styling for the release notes dialog content (bsc#947167) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/package/libyui-qt.spec new/libyui-qt-2.46.22/package/libyui-qt.spec --- old/libyui-qt-2.46.21/package/libyui-qt.spec 2015-10-02 17:34:10.000000000 +0200 +++ new/libyui-qt-2.46.22/package/libyui-qt.spec 2016-04-06 16:49:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.46.21 +Version: 2.46.22 Release: 0 Source: %{name}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/src/YQWizard.cc new/libyui-qt-2.46.22/src/YQWizard.cc --- old/libyui-qt-2.46.21/src/YQWizard.cc 2015-09-21 11:47:56.000000000 +0200 +++ new/libyui-qt-2.46.22/src/YQWizard.cc 2016-04-06 16:49:09.000000000 +0200 @@ -853,16 +853,24 @@ hbox->setMargin( 0 ); // Help button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _helpButton = new YQWizardButton( this, parent, _( "&Help" ).toStdString()); YUI_CHECK_NEW( _helpButton ); - _helpButton->setShortcut( Qt::Key_F1 ); connect( _helpButton, &pclass(_helpButton)::clicked, this, &pclass(this)::showHelp ); hbox->addWidget( (QWidget *) _helpButton->widgetRep() ); + // Help action to be able to react to F1 and Alt-H (bnc#973389) + _helpAction = new QAction( this ); + _helpAction->setShortcut( Qt::Key_F1 ); + addAction( _helpAction ); + + connect( _helpAction, &pclass( _helpAction )::triggered, + this, &pclass( this )::showHelp ); + + hbox->addSpacing( 10 ); // @@ -870,7 +878,7 @@ // // Release Notes button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _releaseNotesButton = new YQWizardButton( this, parent, _( "&Release Notes" ).toStdString ()); YUI_CHECK_NEW( _releaseNotesButton ); hbox->addWidget( (QWidget *) _releaseNotesButton->widgetRep() ); @@ -1072,7 +1080,6 @@ void YQWizard::showHelp() { - if (!_helpDlg) _helpDlg = new QY2HelpDialog ( _qHelpText, NULL ); else @@ -1310,7 +1317,7 @@ return; } - // QT handles duplicate shortcuts, it can be kept + // Qt handles duplicate shortcuts, it can be kept _releaseNotesButton->setLabel( fromUTF8( label ) ); _releaseNotesButtonId = id; _releaseNotesButtonLabel = label; @@ -1336,22 +1343,22 @@ if ( _helpButton ) // "Help" button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _helpButton->setLabel( _( "&Help" ) ); if ( _stepsButton ) // "Steps" button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _stepsButton->setText( _( "&Steps" ) ); if ( _treeButton ) // "Tree" button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _treeButton->setText( _( "&Tree" ) ); if ( _releaseNotesButton ) // "Release Notes" button - // QT handles duplicate shortcuts, it can be kept (bnc#880983) + // Qt handles duplicate shortcuts, it can be kept (bnc#880983) _releaseNotesButton->setLabel( _( "&Release Notes" ) ); if ( _helpDlg ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.21/src/YQWizard.h new/libyui-qt-2.46.22/src/YQWizard.h --- old/libyui-qt-2.46.21/src/YQWizard.h 2015-09-21 11:47:56.000000000 +0200 +++ new/libyui-qt-2.46.22/src/YQWizard.h 2016-04-05 17:59:12.000000000 +0200 @@ -36,6 +36,7 @@ #include <QSplitter> #include <qlabel.h> #include <QMenu> +#include <QAction> #include <qevent.h> #include <yui/YWizard.h> #include "YQWizardButton.h" @@ -579,6 +580,7 @@ static std::string _releaseNotesButtonId; static std::string _releaseNotesButtonLabel; YQWizardButton * _helpButton; + QAction * _helpAction; QPushButton * _stepsButton; QPushButton * _treeButton; QFrame * _treePanel;