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-05-18 13:12:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui (Old)
and /work/SRC/openSUSE:Factory/.libyui.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui"
Wed May 18 13:12:55 2022 rev:79 rq:977764 version:4.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui/libyui.changes 2022-04-16
00:13:34.489595070 +0200
+++ /work/SRC/openSUSE:Factory/.libyui.new.1538/libyui.changes 2022-05-18
13:13:05.506657437 +0200
@@ -1,0 +2,11 @@
+Tue May 17 11:44:16 UTC 2022 - Stefan Hundhammer <shundham...@suse.com>
+
+- Added a custom QTranslator for translations support for Qt Designer
+ .ui files (bsc#1198097)
+- Renamed .ui files and toplevel classes in .ui files to conform to
+ our naming standards (QY2*, YQ*) to avoid ambiguities with predefined
+ Qt classes to work with our new custom QTranslator
+- Added TEXTDOMAIN file to support .ui files in y2makepot (@lslezak)
+- 4.4.1
+
+-------------------------------------------------------------------
Old:
----
libyui-4.4.0.tar.bz2
New:
----
libyui-4.4.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-bindings.spec ++++++
--- /var/tmp/diff_new_pack.Bo33MC/_old 2022-05-18 13:13:06.310658145 +0200
+++ /var/tmp/diff_new_pack.Bo33MC/_new 2022-05-18 13:13:06.318658151 +0200
@@ -20,7 +20,7 @@
Name: libyui-bindings
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
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.Bo33MC/_old 2022-05-18 13:13:06.338658169 +0200
+++ /var/tmp/diff_new_pack.Bo33MC/_new 2022-05-18 13:13:06.342658173 +0200
@@ -19,7 +19,7 @@
Name: libyui-ncurses-pkg
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
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.Bo33MC/_old 2022-05-18 13:13:06.410658232 +0200
+++ /var/tmp/diff_new_pack.Bo33MC/_new 2022-05-18 13:13:06.414658236 +0200
@@ -19,7 +19,7 @@
Name: libyui-qt-graph
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
Release: 0
%define so_version 16
++++++ libyui-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.Bo33MC/_old 2022-05-18 13:13:06.438658257 +0200
+++ /var/tmp/diff_new_pack.Bo33MC/_new 2022-05-18 13:13:06.442658260 +0200
@@ -19,7 +19,7 @@
Name: libyui-qt-pkg
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
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.4.0.tar.bz2 -> libyui-4.4.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/.github/workflows/ci.yml
new/libyui-4.4.1/.github/workflows/ci.yml
--- old/libyui-4.4.0/.github/workflows/ci.yml 2022-04-14 15:46:50.000000000
+0200
+++ new/libyui-4.4.1/.github/workflows/ci.yml 2022-05-17 14:31:33.000000000
+0200
@@ -20,6 +20,9 @@
- name: Inspect Installed Packages
run: rpm -qa | sort
+ - name: Fix directory owner (Git workaround)
+ run: chown -c "$UID" .
+
- name: Packages Build And Install
## uncomment this to enable cmake verbose output
# env:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/VERSION.cmake
new/libyui-4.4.1/VERSION.cmake
--- old/libyui-4.4.0/VERSION.cmake 2022-04-14 15:46:50.000000000 +0200
+++ new/libyui-4.4.1/VERSION.cmake 2022-05-17 14:31:33.000000000 +0200
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "4")
SET( VERSION_MINOR "4" )
-SET( VERSION_PATCH "0" )
+SET( VERSION_PATCH "1" )
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.4.0/libyui-qt/TEXTDOMAIN
new/libyui-4.4.1/libyui-qt/TEXTDOMAIN
--- old/libyui-4.4.0/libyui-qt/TEXTDOMAIN 1970-01-01 01:00:00.000000000
+0100
+++ new/libyui-4.4.1/libyui-qt/TEXTDOMAIN 2022-05-17 14:31:33.000000000
+0200
@@ -0,0 +1 @@
+libyui-qt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/CMakeLists.txt
new/libyui-4.4.1/libyui-qt/src/CMakeLists.txt
--- old/libyui-4.4.0/libyui-qt/src/CMakeLists.txt 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/libyui-qt/src/CMakeLists.txt 2022-05-17
14:31:33.000000000 +0200
@@ -103,6 +103,7 @@
QY2StyleEditor.cc
QY2StyleSheetSelector.cc
QY2Styler.cc
+ QY2Translator.cc
)
@@ -176,13 +177,15 @@
QY2StyleEditor.h
QY2StyleSheetSelector.h
QY2Styler.h
+ QY2Translator.h
utf8.h
)
set( UI_FILES # Qt Designer -generated dialog descriptions
- QHelpDialog.ui
- QStyleEditor.ui
+ # Notice that the QY2* or YQ* prefix is important for translations!
+ QY2HelpDialog.ui
+ QY2StyleEditor.ui
QY2StyleSheetSelector.ui
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/QHelpDialog.ui
new/libyui-4.4.1/libyui-qt/src/QHelpDialog.ui
--- old/libyui-4.4.0/libyui-qt/src/QHelpDialog.ui 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/libyui-qt/src/QHelpDialog.ui 1970-01-01
01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-<ui version="4.0" >
- <class>QHelpDialog</class>
- <widget class="QDialog" name="QHelpDialog" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>581</width>
- <height>388</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Help</string>
- </property>
- <layout class="QVBoxLayout" >
- <item>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QTextBrowser" name="textBrowser" />
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineEdit" />
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton" >
- <property name="text" >
- <string>&Close</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections>
- <connection>
- <sender>pushButton</sender>
- <signal>clicked()</signal>
- <receiver>QHelpDialog</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>371</x>
- <y>282</y>
- </hint>
- <hint type="destinationlabel" >
- <x>289</x>
- <y>-15</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/QStyleEditor.ui
new/libyui-4.4.1/libyui-qt/src/QStyleEditor.ui
--- old/libyui-4.4.0/libyui-qt/src/QStyleEditor.ui 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/libyui-qt/src/QStyleEditor.ui 1970-01-01
01:00:00.000000000 +0100
@@ -1,85 +0,0 @@
-<ui version="4.0" >
- <class>QStyleEditor</class>
- <widget class="QDialog" name="QStyleEditor" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>581</width>
- <height>388</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Help</string>
- </property>
- <layout class="QVBoxLayout" >
- <item>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QTextEdit" name="textEdit" />
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QPushButton" name="applyButton" >
- <property name="text" >
- <string>&Apply</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="autoApply" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="text" >
- <string>Auto Apply</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="loadButton" >
- <property name="text" >
- <string>&Load File</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="closeButton" >
- <property name="text" >
- <string>&Close</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/QY2HelpDialog.cc
new/libyui-4.4.1/libyui-qt/src/QY2HelpDialog.cc
--- old/libyui-4.4.0/libyui-qt/src/QY2HelpDialog.cc 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/libyui-qt/src/QY2HelpDialog.cc 2022-05-17
14:31:33.000000000 +0200
@@ -24,10 +24,10 @@
/-*/
-#include "QY2HelpDialog.h"
-#include "ui_QHelpDialog.h"
-#include <QDebug>
#include <QTextObject>
+
+#include "QY2HelpDialog.h"
+#include "ui_QY2HelpDialog.h"
#include "YQi18n.h"
#include "YQUI.h"
#include "QY2Styler.h"
@@ -44,7 +44,7 @@
, _searchResultForeground(Qt::black)
, _searchResultBackground(Qt::yellow)
{
- _ui = new Ui_QHelpDialog();
+ _ui = new Ui_QY2HelpDialog();
_ui->setupUi( this );
_ui->textBrowser->setText( helpText );
Q_INIT_RESOURCE(qt_icons);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/QY2HelpDialog.h
new/libyui-4.4.1/libyui-qt/src/QY2HelpDialog.h
--- old/libyui-4.4.0/libyui-qt/src/QY2HelpDialog.h 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/libyui-qt/src/QY2HelpDialog.h 2022-05-17
14:31:33.000000000 +0200
@@ -31,7 +31,7 @@
#include <QColor>
class QTextCursor;
-class Ui_QHelpDialog;
+class Ui_QY2HelpDialog;
class QY2HelpDialog : public QDialog
{
@@ -53,7 +53,7 @@
void searchStringChanged( QString );
private:
- Ui_QHelpDialog *_ui;
+ Ui_QY2HelpDialog *_ui;
QList<QTextCursor> _marks;
QColor _searchResultForeground;
QColor _searchResultBackground;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/QY2HelpDialog.ui
new/libyui-4.4.1/libyui-qt/src/QY2HelpDialog.ui
--- old/libyui-4.4.0/libyui-qt/src/QY2HelpDialog.ui 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-4.4.1/libyui-qt/src/QY2HelpDialog.ui 2022-05-17
14:31:33.000000000 +0200
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QY2HelpDialog</class>
+ <widget class="QDialog" name="QY2HelpDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>581</width>
+ <height>388</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Help</string>
+ </property>
+ <layout class="QVBoxLayout">
+ <item>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QTextBrowser" name="textBrowser"/>
+ </item>
+ <item>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit"/>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton">
+ <property name="text">
+ <string>&Close</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>pushButton</sender>
+ <signal>clicked()</signal>
+ <receiver>QY2HelpDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>371</x>
+ <y>282</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>289</x>
+ <y>-15</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/QY2StyleEditor.cc
new/libyui-4.4.1/libyui-qt/src/QY2StyleEditor.cc
--- old/libyui-4.4.0/libyui-qt/src/QY2StyleEditor.cc 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/libyui-qt/src/QY2StyleEditor.cc 2022-05-17
14:31:33.000000000 +0200
@@ -24,15 +24,15 @@
/-*/
-#include "YQUI.h"
-#include "QY2StyleEditor.h"
-#include "QY2Styler.h"
-#include "ui_QStyleEditor.h"
-#include <QDebug>
#include <QFile>
#include <QFileDialog>
#include <QMessageBox>
#include <QTextObject>
+#include <QDebug>
+
+#include "YQUI.h"
+#include "QY2StyleEditor.h"
+#include "QY2Styler.h"
#include "YQi18n.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/QY2StyleEditor.h
new/libyui-4.4.1/libyui-qt/src/QY2StyleEditor.h
--- old/libyui-4.4.0/libyui-qt/src/QY2StyleEditor.h 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/libyui-qt/src/QY2StyleEditor.h 2022-05-17
14:31:33.000000000 +0200
@@ -28,7 +28,7 @@
#define _QY2StyleEditor_h
#include <QDialog>
-#include "ui_QStyleEditor.h"
+#include "ui_QY2StyleEditor.h"
/**
@@ -69,7 +69,7 @@
void slotTextChanged();
private:
- Ui_QStyleEditor ui;
+ Ui_QY2StyleEditor ui;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/QY2StyleEditor.ui
new/libyui-4.4.1/libyui-qt/src/QY2StyleEditor.ui
--- old/libyui-4.4.0/libyui-qt/src/QY2StyleEditor.ui 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-4.4.1/libyui-qt/src/QY2StyleEditor.ui 2022-05-17
14:31:33.000000000 +0200
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QY2StyleEditor</class>
+ <widget class="QDialog" name="QY2StyleEditor">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>598</width>
+ <height>401</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Help</string>
+ </property>
+ <layout class="QVBoxLayout">
+ <item>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QTextEdit" name="textEdit"/>
+ </item>
+ <item>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QPushButton" name="applyButton">
+ <property name="text">
+ <string>&Apply</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="autoApply">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Auto Apply</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="loadButton">
+ <property name="text">
+ <string>&Load File</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="closeButton">
+ <property name="text">
+ <string>&Close</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/QY2Translator.cc
new/libyui-4.4.1/libyui-qt/src/QY2Translator.cc
--- old/libyui-4.4.0/libyui-qt/src/QY2Translator.cc 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-4.4.1/libyui-qt/src/QY2Translator.cc 2022-05-17
14:31:33.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ 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
+ License, or (at your option) version 3.0 of the License. This library
+ is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this library; if not, write
+ to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ Floor, Boston, MA 02110-1301 USA
+*/
+
+
+#include "QY2Translator.h"
+#include "YQi18n.h"
+#include "utf8.h"
+
+#define TEXTDOMAIN "qt"
+
+
+QY2Translator::QY2Translator( QObject * parent )
+ : QTranslator( parent )
+{
+
+}
+
+
+QY2Translator::~QY2Translator()
+{
+ // NOP
+}
+
+
+QString
+QY2Translator::translate( const char * context_str,
+ const char * sourceText,
+ const char * disambiguation,
+ int nPlural ) const
+{
+ QString context( fromUTF8( context_str ) );
+
+ if ( context.startsWith( "QY2" ) ||
+ context.startsWith( "YQ" ) )
+ {
+ // Use GNU gettext from YQi18n.h
+
+ return _( sourceText );
+ }
+ else
+ {
+ // Fallback: Use Qt's built-in translation method
+ // (many predefined Qt dialogs and (context) menus use that)
+
+ return QTranslator::translate( context_str,
+ sourceText,
+ disambiguation,
+ nPlural );
+ }
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/QY2Translator.h
new/libyui-4.4.1/libyui-qt/src/QY2Translator.h
--- old/libyui-4.4.0/libyui-qt/src/QY2Translator.h 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-4.4.1/libyui-qt/src/QY2Translator.h 2022-05-17
14:31:33.000000000 +0200
@@ -0,0 +1,61 @@
+/*
+ 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
+ License, or (at your option) version 3.0 of the License. This library
+ is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this library; if not, write
+ to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ Floor, Boston, MA 02110-1301 USA
+*/
+
+
+#ifndef QY2Translator_h
+#define QY2Translator_h
+
+#include <QTranslator>
+#include "YQi18n.h"
+
+/**
+ * Helper class to enable YaST translations (using xgettext) even in a Qt
+ * context, e.g. for .ui files which use QCoreApplication::translate() in the
+ * generated ui_*.h files.
+ *
+ * NOTICE: This requires a QY2 or YQ prefix for those classes!
+ *
+ * This is not commonly used for other translations in the YaST / libyui-qt
+ * context, just for .ui files (created with Qt Designer).
+ **/
+class QY2Translator: public QTranslator
+{
+ Q_OBJECT
+
+public:
+
+ QY2Translator( QObject * parent );
+ virtual ~QY2Translator();
+
+ /**
+ * Reimplemented from QTranslator:
+ *
+ * Use GNU gettext like everywhere in YaST if 'context' (usually the class
+ * name) starts with "QY2" or "YQ", fall back to Qt's built-in translation
+ * method otherwise.
+ *
+ * Notice that this is also used for Qt's own messages that need to be
+ * translated, such as predefined dialogs (file dialog) and context menus
+ * (e.g. when right-clicking input fields, lists, scroll bars), so we
+ * cannot simply use GNU gettext everywhere.
+ **/
+ virtual QString translate( const char * context,
+ const char * sourceText,
+ const char * disambiguation = 0,
+ int nPlural = -1 ) const
Q_DECL_OVERRIDE;
+
+}; // class QY2Translator
+
+#endif // QY2Translator_h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/libyui-qt/src/YQUI.cc
new/libyui-4.4.1/libyui-qt/src/YQUI.cc
--- old/libyui-4.4.0/libyui-qt/src/YQUI.cc 2022-04-14 15:46:50.000000000
+0200
+++ new/libyui-4.4.1/libyui-qt/src/YQUI.cc 2022-05-17 14:31:33.000000000
+0200
@@ -54,6 +54,7 @@
#include "YQUI.h"
#include "QY2Styler.h"
+#include "QY2Translator.h"
#include "YQApplication.h"
#include "YQDialog.h"
#include "YQWidgetFactory.h"
@@ -164,6 +165,11 @@
_busyCursorTimer = new QTimer( _signalReceiver );
_busyCursorTimer->setSingleShot( true );
+ // Enable GNU gettext translations for .ui files
+ // (will be cleaned up together with its qApp parent)
+ QY2Translator * translator = new QY2Translator( qApp );
+ qApp->installTranslator( translator );
+
(void) QY2Styler::styler(); // Make sure QY2Styler singleton is created
setButtonOrderFromEnvironment();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/package/libyui-bindings.spec
new/libyui-4.4.1/package/libyui-bindings.spec
--- old/libyui-4.4.0/package/libyui-bindings.spec 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/package/libyui-bindings.spec 2022-05-17
14:31:33.000000000 +0200
@@ -20,7 +20,7 @@
Name: libyui-bindings
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
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.4.0/package/libyui-ncurses-pkg.spec
new/libyui-4.4.1/package/libyui-ncurses-pkg.spec
--- old/libyui-4.4.0/package/libyui-ncurses-pkg.spec 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/package/libyui-ncurses-pkg.spec 2022-05-17
14:31:33.000000000 +0200
@@ -19,7 +19,7 @@
Name: libyui-ncurses-pkg
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/package/libyui-ncurses-rest-api.spec
new/libyui-4.4.1/package/libyui-ncurses-rest-api.spec
--- old/libyui-4.4.0/package/libyui-ncurses-rest-api.spec 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/package/libyui-ncurses-rest-api.spec 2022-05-17
14:31:33.000000000 +0200
@@ -19,7 +19,7 @@
Name: libyui-ncurses-rest-api
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/package/libyui-ncurses.spec
new/libyui-4.4.1/package/libyui-ncurses.spec
--- old/libyui-4.4.0/package/libyui-ncurses.spec 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/package/libyui-ncurses.spec 2022-05-17
14:31:33.000000000 +0200
@@ -19,7 +19,7 @@
Name: libyui-ncurses
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/package/libyui-qt-graph.spec
new/libyui-4.4.1/package/libyui-qt-graph.spec
--- old/libyui-4.4.0/package/libyui-qt-graph.spec 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/package/libyui-qt-graph.spec 2022-05-17
14:31:33.000000000 +0200
@@ -19,7 +19,7 @@
Name: libyui-qt-graph
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/package/libyui-qt-pkg.spec
new/libyui-4.4.1/package/libyui-qt-pkg.spec
--- old/libyui-4.4.0/package/libyui-qt-pkg.spec 2022-04-14 15:46:50.000000000
+0200
+++ new/libyui-4.4.1/package/libyui-qt-pkg.spec 2022-05-17 14:31:33.000000000
+0200
@@ -19,7 +19,7 @@
Name: libyui-qt-pkg
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/package/libyui-qt-rest-api.spec
new/libyui-4.4.1/package/libyui-qt-rest-api.spec
--- old/libyui-4.4.0/package/libyui-qt-rest-api.spec 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/package/libyui-qt-rest-api.spec 2022-05-17
14:31:33.000000000 +0200
@@ -19,7 +19,7 @@
Name: libyui-qt-rest-api
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/package/libyui-qt.spec
new/libyui-4.4.1/package/libyui-qt.spec
--- old/libyui-4.4.0/package/libyui-qt.spec 2022-04-14 15:46:50.000000000
+0200
+++ new/libyui-4.4.1/package/libyui-qt.spec 2022-05-17 14:31:33.000000000
+0200
@@ -19,7 +19,7 @@
Name: libyui-qt
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/package/libyui-rest-api.spec
new/libyui-4.4.1/package/libyui-rest-api.spec
--- old/libyui-4.4.0/package/libyui-rest-api.spec 2022-04-14
15:46:50.000000000 +0200
+++ new/libyui-4.4.1/package/libyui-rest-api.spec 2022-05-17
14:31:33.000000000 +0200
@@ -19,7 +19,7 @@
Name: libyui-rest-api
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
Release: 0
%define so_version 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/package/libyui.changes
new/libyui-4.4.1/package/libyui.changes
--- old/libyui-4.4.0/package/libyui.changes 2022-04-14 15:46:50.000000000
+0200
+++ new/libyui-4.4.1/package/libyui.changes 2022-05-17 14:31:33.000000000
+0200
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Tue May 17 11:44:16 UTC 2022 - Stefan Hundhammer <shundham...@suse.com>
+
+- Added a custom QTranslator for translations support for Qt Designer
+ .ui files (bsc#1198097)
+- Renamed .ui files and toplevel classes in .ui files to conform to
+ our naming standards (QY2*, YQ*) to avoid ambiguities with predefined
+ Qt classes to work with our new custom QTranslator
+- Added TEXTDOMAIN file to support .ui files in y2makepot (@lslezak)
+- 4.4.1
+
+-------------------------------------------------------------------
Thu Apr 14 13:01:44 UTC 2022 - Stefan Hundhammer <shundham...@suse.com>
- Added dynamic property first-item to YQItemSelector and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-4.4.0/package/libyui.spec
new/libyui-4.4.1/package/libyui.spec
--- old/libyui-4.4.0/package/libyui.spec 2022-04-14 15:46:50.000000000
+0200
+++ new/libyui-4.4.1/package/libyui.spec 2022-05-17 14:31:33.000000000
+0200
@@ -19,7 +19,7 @@
Name: libyui
# DO NOT manually bump the version here; instead, use rake version:bump
-Version: 4.4.0
+Version: 4.4.1
Release: 0
%define so_version 16
