Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libyui for openSUSE:Factory checked
in at 2022-03-16 21:30:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui (Old)
and /work/SRC/openSUSE:Factory/.libyui.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui"
Wed Mar 16 21:30:23 2022 rev:77 rq:961888 version:4.3.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui/libyui.changes 2022-03-05
14:44:18.087714309 +0100
+++ /work/SRC/openSUSE:Factory/.libyui.new.25692/libyui.changes 2022-03-16
21:30:29.143399058 +0100
@@ -1,0 +2,8 @@
+Tue Mar 15 12:51:39 UTC 2022 - Stefan Hundhammer <shundham...@suse.com>
+
+- Fixed release notes dialog in YQWizard clearing content on click
+ (bsc#1195158)
+- Documented the different ways of displaying release notes in the UI
+- 4.3.3
+
+-------------------------------------------------------------------
Old:
----
libyui-4.3.2.tar.bz2
New:
----
libyui-4.3.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-bindings.spec ++++++
--- /var/tmp/diff_new_pack.vLif9m/_old 2022-03-16 21:30:29.787399547 +0100
+++ /var/tmp/diff_new_pack.vLif9m/_new 2022-03-16 21:30:29.795399552 +0100
@@ -20,7 +20,7 @@
Name: libyui-bindings
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
Summary: Bindings for libyui
License: LGPL-2.1-only OR LGPL-3.0-only
++++++ libyui-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.vLif9m/_old 2022-03-16 21:30:29.823399574 +0100
+++ /var/tmp/diff_new_pack.vLif9m/_new 2022-03-16 21:30:29.827399577 +0100
@@ -19,7 +19,7 @@
Name: libyui-ncurses-pkg
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
libyui-ncurses-rest-api.spec: same change
libyui-ncurses.spec: same change
++++++ libyui-qt-graph.spec ++++++
--- /var/tmp/diff_new_pack.vLif9m/_old 2022-03-16 21:30:29.927399653 +0100
+++ /var/tmp/diff_new_pack.vLif9m/_new 2022-03-16 21:30:29.931399655 +0100
@@ -19,7 +19,7 @@
Name: libyui-qt-graph
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
++++++ libyui-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.vLif9m/_old 2022-03-16 21:30:29.967399683 +0100
+++ /var/tmp/diff_new_pack.vLif9m/_new 2022-03-16 21:30:29.971399686 +0100
@@ -19,7 +19,7 @@
Name: libyui-qt-pkg
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
libyui-qt-rest-api.spec: same change
libyui-qt.spec: same change
libyui-rest-api.spec: same change
libyui.spec: same change
++++++ libyui-4.3.2.tar.bz2 -> libyui-4.3.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/VERSION.cmake
new/libyui-4.3.3/VERSION.cmake
--- old/libyui-4.3.2/VERSION.cmake 2022-03-03 10:44:51.000000000 +0100
+++ new/libyui-4.3.3/VERSION.cmake 2022-03-15 14:32:06.000000000 +0100
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "4")
SET( VERSION_MINOR "3" )
-SET( VERSION_PATCH "2" )
+SET( VERSION_PATCH "3" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
SET( SONAME_MAJOR "16" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/libyui/src/YDialogHelpers.cc
new/libyui-4.3.3/libyui/src/YDialogHelpers.cc
--- old/libyui-4.3.2/libyui/src/YDialogHelpers.cc 2022-03-03
10:44:51.000000000 +0100
+++ new/libyui-4.3.3/libyui/src/YDialogHelpers.cc 2022-03-15
14:32:06.000000000 +0100
@@ -122,6 +122,15 @@
}
+/**
+ * This is called from the YRelNotesButtonHandler event filter (see YDialog.cc)
+ * on a very low level when a button has the "release notes" button role
+ * (YPushButton::isRelNotesButton()).
+ *
+ * Notice that the YQWizard has its own release notes dialog (see
+ * QY2RelNotesDialog) that is used only in the Qt UI and only in the YQWizard
+ * and only after UI.WizardCommand(ShowReleaseNotesButton, ...).
+ **/
bool
YDialog::showRelNotesText()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/libyui-qt/src/QY2RelNotesDialog.cc
new/libyui-4.3.3/libyui-qt/src/QY2RelNotesDialog.cc
--- old/libyui-4.3.2/libyui-qt/src/QY2RelNotesDialog.cc 2022-03-03
10:44:51.000000000 +0100
+++ new/libyui-4.3.3/libyui-qt/src/QY2RelNotesDialog.cc 2022-03-15
14:32:06.000000000 +0100
@@ -1,5 +1,6 @@
/*
- Copyright (C) 2000-2012 Novell, Inc
+ Copyright (c) 2000-2012 Novell, Inc
+ Copyright (c) 2022 SUSE LLC
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
@@ -24,12 +25,14 @@
/-*/
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+
#include "QY2RelNotesDialog.h"
-#include <QDebug>
-#include <QTextObject>
#include "YQi18n.h"
#include "YQUI.h"
#include "QY2Styler.h"
+
#define YUILogComponent "qt-ui"
#include <yui/YUILog.h>
@@ -44,76 +47,80 @@
QY2RelNotesDialog::QY2RelNotesDialog( QWidget *parent )
: QDialog( parent )
{
- if (this->objectName().isEmpty())
- this->setObjectName(QStringLiteral("QRelNotesDialog"));
- this->resize(581, 388); // same size as help pop-up, proven over time
+ QVBoxLayout *vboxLayout;
+ QHBoxLayout *hboxLayout;
+
+ yuiMilestone() << "Creating YQWizard-internal release notes dialog" <<
endl;
+
+ if ( objectName().isEmpty() )
+ setObjectName( "QRelNotesDialog" );
+
+ resize(581, 388); // same size as help pop-up, proven over time
vboxLayout = new QVBoxLayout(this);
- vboxLayout->setObjectName(QStringLiteral("vboxLayout"));
+ vboxLayout->setObjectName( "vboxLayout");
- tabBar = new QTabBar( this );
- Q_CHECK_PTR( tabBar );
+ _tabBar = new QTabBar( this );
+ Q_CHECK_PTR( _tabBar );
- tabBar->setSizePolicy( QSizePolicy( QSizePolicy::Preferred,
QSizePolicy::Preferred ) ); // hor/vert
- setFocusProxy( tabBar );
+ _tabBar->setSizePolicy( QSizePolicy( QSizePolicy::Preferred,
QSizePolicy::Preferred ) ); // hor/vert
+ setFocusProxy( _tabBar );
setFocusPolicy( Qt::TabFocus );
- QObject::connect( tabBar, SIGNAL(currentChanged(int)), this,
SLOT(tabChanged( int )));
+ connect( _tabBar, SIGNAL( currentChanged ( int ) ),
+ this, SLOT ( tabChanged ( int ) ) );
- vboxLayout->addWidget(tabBar);
+ vboxLayout->addWidget(_tabBar);
- textBrowser = new QTextBrowser(this);
- textBrowser->setObjectName(QStringLiteral("textBrowser"));
+ _textBrowser = new QY2TextBrowser(this);
+ _textBrowser->setObjectName( "textBrowser");
- vboxLayout->addWidget(textBrowser);
+ vboxLayout->addWidget(_textBrowser);
hboxLayout = new QHBoxLayout();
- closeButton = new QPushButton(this);
- closeButton->setObjectName(QStringLiteral("closeButton"));
hboxLayout->addStretch();
- hboxLayout->addWidget(closeButton);
+
+ _closeButton = new QPushButton(this);
+ _closeButton->setObjectName( "closeButton" );
+ // Close button for wizard help window
+ _closeButton->setText( _( "&Close" ) );
+
+ connect( _closeButton, SIGNAL( clicked() ),
+ this, SLOT ( accept() ) );
+
+ hboxLayout->addWidget(_closeButton);
hboxLayout->addStretch();
vboxLayout->addLayout(hboxLayout);
- QObject::connect(closeButton, SIGNAL(clicked()), this, SLOT(accept()));
-
YQUI::setTextdomain( TEXTDOMAIN );
// Window title for help wizard window
setWindowTitle( _( "Release Notes" ) );
- // Close button for wizard help window
- closeButton->setText( _( "&Close" ) );
-
QY2Styler::styler()->registerWidget( this );
// the stylesheet for the displayed text is set separately
- textBrowser->document()->setDefaultStyleSheet(
QY2Styler::styler()->textStyle() );
+ _textBrowser->document()->setDefaultStyleSheet(
QY2Styler::styler()->textStyle() );
}
void QY2RelNotesDialog::setRelNotes( const std::map<string,string>& relnotes )
{
- while (tabBar->count() > 0)
+ while ( _tabBar->count() > 0 )
{
- tabBar->removeTab( 0 );
+ _tabBar->removeTab( 0 );
}
- _relnotes = relnotes;
- _tab_keys = std::vector<string>();
+ _relNotes = relnotes;
+ _tabKeys = std::vector<string>();
+
for ( std::map<string,string>::const_iterator it = relnotes.begin(); it !=
relnotes.end(); ++it )
{
- _tab_keys.push_back(it->first);
- tabBar->addTab( it->first.c_str() );
+ _tabKeys.push_back(it->first);
+ _tabBar->addTab( it->first.c_str() );
}
- if (_relnotes.size() > 1)
- {
- tabBar->show();
- }
- else
- {
- tabBar->hide();
- }
- textBrowser->setText( relnotes.begin()->second.c_str() );
+
+ _tabBar->setVisible( _relNotes.size() > 1 );
+ _textBrowser->setText( relnotes.begin()->second.c_str() );
}
@@ -125,16 +132,25 @@
void QY2RelNotesDialog::tabChanged( int index )
{
- if (index < 0 || _tab_keys.empty() || _relnotes.empty())
- {
+ if ( index < 0 || _tabKeys.empty() || _relNotes.empty() )
return;
- }
- textBrowser->setText( _relnotes[_tab_keys[index]].c_str() );
+
+ _textBrowser->setText( _relNotes[ _tabKeys[ index ] ].c_str() );
}
void QY2RelNotesDialog::retranslate()
{
setWindowTitle( _( "Release Notes" ) );
- closeButton->setText( _( "&Close" ) );
+ _closeButton->setText( _( "&Close" ) );
+}
+
+
+void QY2TextBrowser::setSource( const QUrl & name )
+{
+ // scroll to link if it's available in the current document
+ // but prevent loading empty pages (bsc#1195158)
+
+ if ( name.toString().startsWith("#") )
+ scrollToAnchor( name.toString().mid(1) );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/libyui-qt/src/QY2RelNotesDialog.h
new/libyui-4.3.3/libyui-qt/src/QY2RelNotesDialog.h
--- old/libyui-4.3.2/libyui-qt/src/QY2RelNotesDialog.h 2022-03-03
10:44:51.000000000 +0100
+++ new/libyui-4.3.3/libyui-qt/src/QY2RelNotesDialog.h 2022-03-15
14:32:06.000000000 +0100
@@ -1,5 +1,6 @@
/*
- Copyright (C) 2000-2012 Novell, Inc
+ Copyright (c) 2000-2012 Novell, Inc
+ Copyright (c) 2022 SUSE LLC
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
@@ -24,18 +25,33 @@
/-*/
-#ifndef _QY2RelNotesDialog_h
-#define _QY2RelNotesDialog_h
+#ifndef QY2RelNotesDialog_h
+#define QY2RelNotesDialog_h
-#include <QDialog>
-#include <QtWidgets/QTextBrowser>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QTabBar>
-
-class QTextCursor;
+#include <string>
+#include <map>
+#include <vector>
+#include <QDialog>
+#include <QTextBrowser>
+#include <QPushButton>
+#include <QTabBar>
+#include <QUrl>
+
+class QY2TextBrowser;
+
+/**
+ * Release notes dialog for the YQWizard widget.
+ *
+ * This one is used only in the Qt UI inside the YQWizard after
+ * UI.WizardCommand(ShowReleaseNotesButton, ...).
+ *
+ * Outside of the YQWizard or in the NCurses UI, it uses
+ * YDialog::showRelNotesText() (see ../../libyui/YDialogHelpers.cc) after being
+ * triggered from the YRelNotesButtonHandler event filter on a very low level
+ * when a button has the "release notes" button role
+ * (YPushButton::isRelNotesButton()).
+ **/
class QY2RelNotesDialog : public QDialog
{
Q_OBJECT
@@ -43,26 +59,39 @@
public:
QY2RelNotesDialog( QWidget *parent );
~QY2RelNotesDialog();
- void setRelNotes( const std::map<std::string,std::string>& relnotes );
+ void setRelNotes( const std::map<std::string,std::string>& relNotes );
void retranslate();
public slots:
void tabChanged( int index );
protected:
- QVBoxLayout *vboxLayout;
- QTabBar *tabBar;
- QTextBrowser *textBrowser;
- QHBoxLayout *hboxLayout;
- QPushButton *closeButton;
+ QTabBar * _tabBar;
+ QY2TextBrowser * _textBrowser;
+ QPushButton * _closeButton;
+
+ std::map<std::string,std::string> _relNotes;
+ std::vector<std::string> _tabKeys;
+};
-private:
- QList<QTextCursor> _marks;
- std::map<std::string,std::string> _relnotes;
- std::vector<std::string> _tab_keys;
+class QY2TextBrowser: public QTextBrowser
+{
+ Q_OBJECT
+
+public:
+ QY2TextBrowser( QWidget * parent ):
+ QTextBrowser( parent )
+ {}
+
+public slots:
+ /**
+ * Overriding setSource to prevent clearing the content when the user
+ * clicks on (external) hyperlinks.
+ **/
+ virtual void setSource( const QUrl & name );
};
-#endif
+#endif // QY2RelNotesDialog_h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/package/libyui-bindings.spec
new/libyui-4.3.3/package/libyui-bindings.spec
--- old/libyui-4.3.2/package/libyui-bindings.spec 2022-03-03
10:44:51.000000000 +0100
+++ new/libyui-4.3.3/package/libyui-bindings.spec 2022-03-15
14:32:06.000000000 +0100
@@ -20,7 +20,7 @@
Name: libyui-bindings
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
Summary: Bindings for libyui
License: LGPL-2.1-only OR LGPL-3.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/package/libyui-ncurses-pkg.spec
new/libyui-4.3.3/package/libyui-ncurses-pkg.spec
--- old/libyui-4.3.2/package/libyui-ncurses-pkg.spec 2022-03-03
10:44:51.000000000 +0100
+++ new/libyui-4.3.3/package/libyui-ncurses-pkg.spec 2022-03-15
14:32:06.000000000 +0100
@@ -19,7 +19,7 @@
Name: libyui-ncurses-pkg
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/package/libyui-ncurses-rest-api.spec
new/libyui-4.3.3/package/libyui-ncurses-rest-api.spec
--- old/libyui-4.3.2/package/libyui-ncurses-rest-api.spec 2022-03-03
10:44:51.000000000 +0100
+++ new/libyui-4.3.3/package/libyui-ncurses-rest-api.spec 2022-03-15
14:32:06.000000000 +0100
@@ -19,7 +19,7 @@
Name: libyui-ncurses-rest-api
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/package/libyui-ncurses.spec
new/libyui-4.3.3/package/libyui-ncurses.spec
--- old/libyui-4.3.2/package/libyui-ncurses.spec 2022-03-03
10:44:51.000000000 +0100
+++ new/libyui-4.3.3/package/libyui-ncurses.spec 2022-03-15
14:32:06.000000000 +0100
@@ -19,7 +19,7 @@
Name: libyui-ncurses
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/package/libyui-qt-graph.spec
new/libyui-4.3.3/package/libyui-qt-graph.spec
--- old/libyui-4.3.2/package/libyui-qt-graph.spec 2022-03-03
10:44:51.000000000 +0100
+++ new/libyui-4.3.3/package/libyui-qt-graph.spec 2022-03-15
14:32:06.000000000 +0100
@@ -19,7 +19,7 @@
Name: libyui-qt-graph
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/package/libyui-qt-pkg.spec
new/libyui-4.3.3/package/libyui-qt-pkg.spec
--- old/libyui-4.3.2/package/libyui-qt-pkg.spec 2022-03-03 10:44:51.000000000
+0100
+++ new/libyui-4.3.3/package/libyui-qt-pkg.spec 2022-03-15 14:32:06.000000000
+0100
@@ -19,7 +19,7 @@
Name: libyui-qt-pkg
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/package/libyui-qt-rest-api.spec
new/libyui-4.3.3/package/libyui-qt-rest-api.spec
--- old/libyui-4.3.2/package/libyui-qt-rest-api.spec 2022-03-03
10:44:51.000000000 +0100
+++ new/libyui-4.3.3/package/libyui-qt-rest-api.spec 2022-03-15
14:32:06.000000000 +0100
@@ -19,7 +19,7 @@
Name: libyui-qt-rest-api
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/package/libyui-qt.spec
new/libyui-4.3.3/package/libyui-qt.spec
--- old/libyui-4.3.2/package/libyui-qt.spec 2022-03-03 10:44:51.000000000
+0100
+++ new/libyui-4.3.3/package/libyui-qt.spec 2022-03-15 14:32:06.000000000
+0100
@@ -19,7 +19,7 @@
Name: libyui-qt
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/package/libyui-rest-api.spec
new/libyui-4.3.3/package/libyui-rest-api.spec
--- old/libyui-4.3.2/package/libyui-rest-api.spec 2022-03-03
10:44:51.000000000 +0100
+++ new/libyui-4.3.3/package/libyui-rest-api.spec 2022-03-15
14:32:06.000000000 +0100
@@ -19,7 +19,7 @@
Name: libyui-rest-api
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/package/libyui.changes
new/libyui-4.3.3/package/libyui.changes
--- old/libyui-4.3.2/package/libyui.changes 2022-03-03 10:44:51.000000000
+0100
+++ new/libyui-4.3.3/package/libyui.changes 2022-03-15 14:32:06.000000000
+0100
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Tue Mar 15 12:51:39 UTC 2022 - Stefan Hundhammer <shundham...@suse.com>
+
+- Fixed release notes dialog in YQWizard clearing content on click
+ (bsc#1195158)
+- Documented the different ways of displaying release notes in the UI
+- 4.3.3
+
+-------------------------------------------------------------------
Thu Mar 3 07:57:59 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
- Update also the stylesheet (theme) for the RichText content when
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.3.2/package/libyui.spec
new/libyui-4.3.3/package/libyui.spec
--- old/libyui-4.3.2/package/libyui.spec 2022-03-03 10:44:51.000000000
+0100
+++ new/libyui-4.3.3/package/libyui.spec 2022-03-15 14:32:06.000000000
+0100
@@ -19,7 +19,7 @@
Name: libyui
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.3.2
+Version: 4.3.3
Release: 0
%define so_version 16
