Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package adwaita-qt for openSUSE:Factory
checked in at 2022-09-29 18:12:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/adwaita-qt (Old)
and /work/SRC/openSUSE:Factory/.adwaita-qt.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "adwaita-qt"
Thu Sep 29 18:12:31 2022 rev:14 rq:1006648 version:1.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/adwaita-qt/adwaita-qt.changes 2022-02-24
18:24:22.822643994 +0100
+++ /work/SRC/openSUSE:Factory/.adwaita-qt.new.2275/adwaita-qt.changes
2022-09-29 18:12:42.535179268 +0200
@@ -1,0 +2,11 @@
+Tue Sep 27 00:59:08 UTC 2022 - Luciano Santos <luc1...@opensuse.org>
+
+- Update to version 1.4.2:
+ + Fixed plugin path for Qt6.
+ + Switch between dark/light variant on runtime on
+ QEvent::PaletteChange.
+ + Qt5X11Extras is an optional dependency.
+ + UI: QMenu improvements.
+ + Fixed placeholder text color for Qt6.
+
+-------------------------------------------------------------------
Old:
----
adwaita-qt-1.4.1.tar.gz
New:
----
adwaita-qt-1.4.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ adwaita-qt.spec ++++++
--- /var/tmp/diff_new_pack.y6jS3j/_old 2022-09-29 18:12:43.075180323 +0200
+++ /var/tmp/diff_new_pack.y6jS3j/_new 2022-09-29 18:12:43.079180331 +0200
@@ -35,7 +35,7 @@
%endif
%define sover 1
Name: adwaita-qt%{?_suffix}%{?_suffix:-src}
-Version: 1.4.1
+Version: 1.4.2
Release: 0
Summary: Adwaita theme for Qt-based applications
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ adwaita-qt-1.4.1.tar.gz -> adwaita-qt-1.4.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/adwaita-qt-1.4.1/CMakeLists.txt
new/adwaita-qt-1.4.2/CMakeLists.txt
--- old/adwaita-qt-1.4.1/CMakeLists.txt 2021-11-10 11:25:40.000000000 +0100
+++ new/adwaita-qt-1.4.2/CMakeLists.txt 2022-09-20 10:07:37.000000000 +0200
@@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 3.17)
set(ADWAITAQT_VERSION_MAJOR 1)
-set(ADWAITAQT_VERSION "1.4.1")
+set(ADWAITAQT_VERSION "1.4.2")
option(USE_QT6 "Use Qt6 instead of Qt5" OFF)
@@ -30,7 +30,6 @@
find_package(QT NAMES Qt5 COMPONENTS Core DBus Gui Widgets REQUIRED)
endif()
-
find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
Core
DBus
@@ -41,19 +40,19 @@
if (NOT APPLE AND NOT WIN32 AND NOT USE_QT6)
find_package(XCB 1.10 COMPONENTS XCB)
- set(ADWAITA_HAVE_X11 ${XCB_FOUND})
-
- find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} CONFIG REQUIRED
COMPONENTS
- X11Extras
- )
+ find_package(Qt${QT_VERSION_MAJOR}X11Extras ${QT_MIN_VERSION})
+ set(ADWAITA_HAVE_X11 ${XCB_FOUND} AND ${Qt5X11Extras_FOUND})
endif()
-if (NOT USE_QT6)
- get_target_property(REAL_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE}
IMPORTED_LOCATION)
- if (NOT QT_PLUGINS_DIR)
+if (NOT QT_PLUGINS_DIR)
+ if (NOT USE_QT6)
+ get_target_property(REAL_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE}
+ IMPORTED_LOCATION)
execute_process(COMMAND "${REAL_QMAKE_EXECUTABLE}" -query
QT_INSTALL_PLUGINS
OUTPUT_VARIABLE QT_PLUGINS_DIR
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+ else()
+ set(QT_PLUGINS_DIR ${QT6_INSTALL_PLUGINS})
endif()
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/adwaita-qt-1.4.1/src/lib/adwaita.h
new/adwaita-qt-1.4.2/src/lib/adwaita.h
--- old/adwaita-qt-1.4.1/src/lib/adwaita.h 2021-11-10 11:25:40.000000000
+0100
+++ new/adwaita-qt-1.4.2/src/lib/adwaita.h 2022-09-20 10:07:37.000000000
+0200
@@ -283,7 +283,7 @@
class StyleOptionsPrivate;
-class ADWAITAQT_EXPORT StyleOptions
+class ADWAITAQT_MAIN_EXPORT StyleOptions
{
public:
explicit StyleOptions(const QPalette &palette);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/adwaita-qt-1.4.1/src/lib/adwaitacolors.cpp
new/adwaita-qt-1.4.2/src/lib/adwaitacolors.cpp
--- old/adwaita-qt-1.4.1/src/lib/adwaitacolors.cpp 2021-11-10
11:25:40.000000000 +0100
+++ new/adwaita-qt-1.4.2/src/lib/adwaitacolors.cpp 2022-09-20
10:07:37.000000000 +0200
@@ -456,6 +456,7 @@
palette.setColor(QPalette::All, QPalette::AlternateBase,
colorsGlobal->adwaitaColor(ColorsPrivate::base_color, variant));
palette.setColor(QPalette::All, QPalette::ToolTipBase,
colorsGlobal->adwaitaColor(ColorsPrivate::osd_bg_color, variant));
palette.setColor(QPalette::All, QPalette::ToolTipText,
colorsGlobal->adwaitaColor(ColorsPrivate::osd_text_color, variant));
+ palette.setColor(QPalette::All, QPalette::PlaceholderText,
colorsGlobal->adwaitaColor(ColorsPrivate::fg_color, variant));
palette.setColor(QPalette::All, QPalette::Text,
colorsGlobal->adwaitaColor(ColorsPrivate::fg_color, variant));
palette.setColor(QPalette::All, QPalette::Button,
buttonColor);
palette.setColor(QPalette::All, QPalette::ButtonText,
colorsGlobal->adwaitaColor(ColorsPrivate::fg_color, variant));
@@ -477,6 +478,7 @@
palette.setColor(QPalette::Disabled, QPalette::WindowText,
colorsGlobal->adwaitaColor(ColorsPrivate::insensitive_fg_color, variant));
palette.setColor(QPalette::Disabled, QPalette::Base,
colorsGlobal->adwaitaColor(ColorsPrivate::base_color, variant));
palette.setColor(QPalette::Disabled, QPalette::AlternateBase,
colorsGlobal->adwaitaColor(ColorsPrivate::base_color, variant));
+ palette.setColor(QPalette::Disabled, QPalette::PlaceholderText,
colorsGlobal->adwaitaColor(ColorsPrivate::insensitive_fg_color, variant));
palette.setColor(QPalette::Disabled, QPalette::Text,
colorsGlobal->adwaitaColor(ColorsPrivate::insensitive_fg_color, variant));
palette.setColor(QPalette::Disabled, QPalette::Button,
colorsGlobal->adwaitaColor(ColorsPrivate::insensitive_bg_color, variant));
palette.setColor(QPalette::Disabled, QPalette::ButtonText,
colorsGlobal->adwaitaColor(ColorsPrivate::insensitive_fg_color, variant));
@@ -500,6 +502,7 @@
palette.setColor(QPalette::Inactive, QPalette::AlternateBase,
colorsGlobal->adwaitaColor(ColorsPrivate::backdrop_base_color, variant));
palette.setColor(QPalette::Inactive, QPalette::ToolTipBase,
colorsGlobal->adwaitaColor(ColorsPrivate::osd_bg_color, variant));
palette.setColor(QPalette::Inactive, QPalette::ToolTipText,
colorsGlobal->adwaitaColor(ColorsPrivate::osd_text_color, variant));
+ palette.setColor(QPalette::Inactive, QPalette::PlaceholderText,
colorsGlobal->adwaitaColor(ColorsPrivate::backdrop_fg_color, variant));
palette.setColor(QPalette::Inactive, QPalette::Text,
colorsGlobal->adwaitaColor(ColorsPrivate::backdrop_fg_color, variant));
palette.setColor(QPalette::Inactive, QPalette::Button,
disabledButtonColor);
palette.setColor(QPalette::Inactive, QPalette::ButtonText,
colorsGlobal->adwaitaColor(ColorsPrivate::backdrop_fg_color, variant));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/adwaita-qt-1.4.1/src/lib/adwaitacolors.h
new/adwaita-qt-1.4.2/src/lib/adwaitacolors.h
--- old/adwaita-qt-1.4.1/src/lib/adwaitacolors.h 2021-11-10
11:25:40.000000000 +0100
+++ new/adwaita-qt-1.4.2/src/lib/adwaitacolors.h 2022-09-20
10:07:37.000000000 +0200
@@ -30,7 +30,7 @@
namespace Adwaita
{
-class ADWAITAQT_EXPORT Colors
+class ADWAITAQT_MAIN_EXPORT Colors
{
public:
// Color adjustments
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/adwaita-qt-1.4.1/src/lib/adwaitaqt_export.h
new/adwaita-qt-1.4.2/src/lib/adwaitaqt_export.h
--- old/adwaita-qt-1.4.1/src/lib/adwaitaqt_export.h 2021-11-10
11:25:40.000000000 +0100
+++ new/adwaita-qt-1.4.2/src/lib/adwaitaqt_export.h 2022-09-20
10:07:37.000000000 +0200
@@ -2,13 +2,29 @@
#define ADWAITAQT_EXPORT_H
#if defined(_WIN32)
+# if defined (adwaitaqt6priv_EXPORTS) || defined (adwaitaqtpriv_EXPORTS)
# define ADWAITAQT_EXPORT __declspec(dllexport)
+# else
+# define ADWAITAQT_EXPORT __declspec(dllimport)
+# endif
#elif defined(__GNUC__)
# define ADWAITAQT_EXPORT __attribute__((visibility("default")))
#else
# define ADWAITAQT_EXPORT
#endif
+#if defined(_WIN32)
+# if defined (adwaitaqt6_EXPORTS) || defined (adwaitaqt_EXPORTS)
+# define ADWAITAQT_MAIN_EXPORT __declspec(dllexport)
+# else
+# define ADWAITAQT_MAIN_EXPORT __declspec(dllimport)
+# endif
+#elif defined(__GNUC__)
+# define ADWAITAQT_MAIN_EXPORT __attribute__((visibility("default")))
+#else
+# define ADWAITAQT_MAIN_EXPORT
+#endif
+
#ifndef ADWAITAQT_NO_EXPORT
# define ADWAITAQT_NO_EXPORT __attribute__((visibility("hidden")))
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/adwaita-qt-1.4.1/src/lib/adwaitarenderer.h
new/adwaita-qt-1.4.2/src/lib/adwaitarenderer.h
--- old/adwaita-qt-1.4.1/src/lib/adwaitarenderer.h 2021-11-10
11:25:40.000000000 +0100
+++ new/adwaita-qt-1.4.2/src/lib/adwaitarenderer.h 2022-09-20
10:07:37.000000000 +0200
@@ -28,7 +28,7 @@
namespace Adwaita
{
-class ADWAITAQT_EXPORT Renderer
+class ADWAITAQT_MAIN_EXPORT Renderer
{
public:
static void renderDebugFrame(const StyleOptions &options);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/adwaita-qt-1.4.1/src/lib/animations/adwaitabusyindicatordata.h
new/adwaita-qt-1.4.2/src/lib/animations/adwaitabusyindicatordata.h
--- old/adwaita-qt-1.4.1/src/lib/animations/adwaitabusyindicatordata.h
2021-11-10 11:25:40.000000000 +0100
+++ new/adwaita-qt-1.4.2/src/lib/animations/adwaitabusyindicatordata.h
2022-09-20 10:07:37.000000000 +0200
@@ -26,7 +26,7 @@
namespace Adwaita
{
-class Q_DECL_EXPORT BusyIndicatorData : public QObject
+class ADWAITAQT_EXPORT BusyIndicatorData : public QObject
{
Q_OBJECT
public:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/adwaita-qt-1.4.1/src/style/CMakeLists.txt
new/adwaita-qt-1.4.2/src/style/CMakeLists.txt
--- old/adwaita-qt-1.4.1/src/style/CMakeLists.txt 2021-11-10
11:25:40.000000000 +0100
+++ new/adwaita-qt-1.4.2/src/style/CMakeLists.txt 2022-09-20
10:07:37.000000000 +0200
@@ -41,8 +41,4 @@
PREFIX "")
endif()
-if (USE_QT6)
- install(TARGETS ${LIBRARY_NAME} DESTINATION
"${QT6_INSTALL_PLUGINS}/styles")
-else()
- install(TARGETS ${LIBRARY_NAME} DESTINATION "${QT_PLUGINS_DIR}/styles")
-endif()
+install(TARGETS ${LIBRARY_NAME} DESTINATION "${QT_PLUGINS_DIR}/styles")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/adwaita-qt-1.4.1/src/style/adwaitastyle.cpp
new/adwaita-qt-1.4.2/src/style/adwaitastyle.cpp
--- old/adwaita-qt-1.4.1/src/style/adwaitastyle.cpp 2021-11-10
11:25:40.000000000 +0100
+++ new/adwaita-qt-1.4.2/src/style/adwaitastyle.cpp 2022-09-20
10:07:37.000000000 +0200
@@ -219,7 +219,6 @@
namespace Adwaita
{
-
//______________________________________________________________
Style::Style(ColorVariant variant)
: _addLineButtons(SingleButton)
@@ -234,18 +233,6 @@
, _variant(variant)
, _dark(variant == AdwaitaDark || variant == AdwaitaHighcontrastInverse)
{
- // use DBus connection to update on adwaita configuration change
- QDBusConnection dbus = QDBusConnection::sessionBus();
- dbus.connect(QString(),
- QStringLiteral("/AdwaitaStyle"),
- QStringLiteral("org.kde.Adwaita.Style"),
- QStringLiteral("reparseConfiguration"), this,
SLOT(configurationChanged()));
-
- dbus.connect(QString(),
- QStringLiteral("/AdwaitaDecoration"),
- QStringLiteral("org.kde.Adwaita.Style"),
- QStringLiteral("reparseConfiguration"), this,
SLOT(configurationChanged()));
-
// Detect if running under KDE, if so set menus, etc, to have translucent
background.
// For GNOME desktop, dont want translucent backgrounds otherwise no menu
shadow is drawn.
_isKDE = qgetenv("XDG_CURRENT_DESKTOP").toLower() == "kde";
@@ -373,7 +360,7 @@
QLineEdit *lineEdit = comboBox->lineEdit();
if (lineEdit && !comboBox->isEnabled()) {
QPalette pal = lineEdit->palette();
- pal.setColor(QPalette::Base,
comboBox->palette().color(QPalette::Window));
+ pal.setColor(QPalette::Base,
Colors::palette(_variant).color(QPalette::Window));
lineEdit->setPalette(pal);
lineEdit->setAutoFillBackground(true);
}
@@ -394,7 +381,7 @@
} else if (QSpinBox *spinBox = qobject_cast<QSpinBox *>(widget)) {
if (!spinBox->isEnabled()) {
QPalette pal = spinBox->palette();
- pal.setColor(QPalette::Base,
spinBox->palette().color(QPalette::Window));
+ pal.setColor(QPalette::Base,
Colors::palette(_variant).color(QPalette::Window));
spinBox->setPalette(pal);
spinBox->setAutoFillBackground(true);
}
@@ -1280,9 +1267,13 @@
return eventFilterComboBoxContainer(widget, event);
}
+ if (QEvent::PaletteChange == event->type()) {
+ configurationChanged();
+ }
+
if ((!widget->parent() || !qobject_cast<QWidget *>(widget->parent()) ||
qobject_cast<QDialog *>(widget) || qobject_cast<QMainWindow *>(widget))
- && (QEvent::Show == event->type() || QEvent::StyleChange ==
event->type())) {
- _helper->setVariant(widget, _dark ? "dark" : "light");
+ && (event->type() == QEvent::Show || event->type() ==
QEvent::StyleChange)) {
+ configurationChanged();
}
// fallback
@@ -4942,6 +4933,7 @@
StyleOptions styleOptions(painter, QRect(rect.left(), rect.bottom() -
2, rect.width(), 3));
styleOptions.setColorVariant(_variant);
styleOptions.setOutlineColor(Colors::focusColor(StyleOptions(palette,
_variant)));
+ styleOptions.setColor(palette.color(QPalette::Highlight));
Adwaita::Renderer::renderFocusRect(styleOptions);
}
@@ -4969,9 +4961,12 @@
}
// copy rect and palette
- const QRect &rect(option->rect);
+ QRect rect(option->rect);
const QPalette &palette(option->palette);
+ // leave room for the menu border
+ rect.adjust(1, 0, -1, 0);
+
// deal with separators
if (menuItemOption->menuItemType == QStyleOptionMenuItem::Separator) {
// normal separator
@@ -5131,6 +5126,8 @@
painter->drawPixmap(iconRect, icon);
}
+ const QColor acceleratorColor =
Colors::transparentize(palette.color(QPalette::Active, QPalette::WindowText),
0.55);
+
// arrow
QRect arrowRect(contentsRect.right() - Metrics::MenuButton_IndicatorWidth
+ 1, contentsRect.top() + (contentsRect.height() -
Metrics::MenuButton_IndicatorWidth) / 2, Metrics::MenuButton_IndicatorWidth,
Metrics::MenuButton_IndicatorWidth);
@@ -5141,22 +5138,9 @@
// arrow orientation
ArrowOrientation orientation(reverseLayout ? ArrowLeft : ArrowRight);
- // color
- QColor arrowColor;
- if (useStrongFocus && (selected || sunken)) {
- arrowColor = palette.color(QPalette::HighlightedText);
- } else if (sunken) {
- arrowColor = Colors::focusColor(StyleOptions(palette, _variant));
- } else if (selected) {
- arrowColor = Colors::hoverColor(StyleOptions(palette, _variant));
- } else {
- styleOptions.setColorRole(QPalette::WindowText);
- arrowColor = Colors::arrowOutlineColor(styleOptions);
- }
-
styleOptions.setPainter(painter);
styleOptions.setRect(arrowRect);
- styleOptions.setColor(arrowColor);
+ styleOptions.setColor(acceleratorColor);
styleOptions.setColorVariant(_variant);
// render
@@ -5185,7 +5169,7 @@
QString accelerator(text.mid(tabPosition + 1));
text = text.left(tabPosition);
QPalette copy(palette);
- copy.setColor(QPalette::Active, QPalette::WindowText,
Colors::transparentize(copy.color(QPalette::Active, QPalette::WindowText),
0.55));
+ copy.setColor(QPalette::Active, QPalette::WindowText,
acceleratorColor);
copy.setColor(QPalette::Active, QPalette::HighlightedText,
Colors::transparentize(copy.color(QPalette::Active, QPalette::HighlightedText),
0.55));
drawItemText(painter, textRect, textFlags, copy, enabled,
accelerator, QPalette::WindowText);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/adwaita-qt-1.4.1/src/style/adwaitastyle.h
new/adwaita-qt-1.4.2/src/style/adwaitastyle.h
--- old/adwaita-qt-1.4.1/src/style/adwaitastyle.h 2021-11-10
11:25:40.000000000 +0100
+++ new/adwaita-qt-1.4.2/src/style/adwaitastyle.h 2022-09-20
10:07:37.000000000 +0200
@@ -497,7 +497,6 @@
bool hasAlteredBackground(const QWidget *widget) const;
private:
-
//*@name scrollbar button types (for addLine and subLine )
//@{
ScrollBarButtonType _addLineButtons;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/adwaita-qt-1.4.1/src/style/adwaitastyleplugin.cpp
new/adwaita-qt-1.4.2/src/style/adwaitastyleplugin.cpp
--- old/adwaita-qt-1.4.1/src/style/adwaitastyleplugin.cpp 2021-11-10
11:25:40.000000000 +0100
+++ new/adwaita-qt-1.4.2/src/style/adwaitastyleplugin.cpp 2022-09-20
10:07:37.000000000 +0200
@@ -56,8 +56,8 @@
QStringList StylePlugin::keys() const
{
- return QStringList() << QStringLiteral("Adwaita") <<
QStringLiteral("Adwaita-Dark")
- << QStringLiteral("Adwaita-HighContrast") <<
QStringLiteral("Adwaita-HighContrast-Dark");
+ return QStringList() << QStringLiteral("Adwaita") <<
QStringLiteral("Adwaita-Dark") << QStringLiteral("Adwaita-Light")
+ << QStringLiteral("Adwaita-HighContrast") <<
QStringLiteral("Adwaita-HighContrastInverse");
}
} // namespace Adwaita
