From 7e9f699b6b44bfb5c88cee5f4b84e110a71b56b8 Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Fri, 27 Mar 2020 17:42:26 +0100 Subject: [PATCH 1/4] Copy from Qt implementation of missing abstract methods --- src/YGDumbTab.cc | 9 +++++++++ src/YGMenuButton.cc | 8 ++++++++ src/YGText.cc | 7 +++++++ src/YGTreeView.cc | 10 ++++++++++ 4 files changed, 34 insertions(+) diff --git a/src/YGDumbTab.cc b/src/YGDumbTab.cc index c0a420d2..cf56698d 100644 --- a/src/YGDumbTab.cc +++ b/src/YGDumbTab.cc @@ -154,6 +154,15 @@ class YGDumbTab : public YDumbTab, public YGWidget pThis->syncTabPage(); } + // NOTE copy of Qt one + void activate() + { + // send an activation event for this widget + if ( notify() ) + YGUI::ui()->sendEvent( new YWidgetEvent( this,YEvent::Activated ) ); + } + + YGWIDGET_IMPL_CONTAINER (YDumbTab) }; diff --git a/src/YGMenuButton.cc b/src/YGMenuButton.cc index 58634671..42111d59 100644 --- a/src/YGMenuButton.cc +++ b/src/YGMenuButton.cc @@ -64,6 +64,14 @@ class YGMenuButton : public YMenuButton, public YGWidget ygtk_menu_button_set_popup (YGTK_MENU_BUTTON (getWidget()), menu); } + // NOTE copy of Qt one + void activateItem( YMenuItem * item ) + { + if ( item ) + YGUI::ui()->sendEvent( new YMenuEvent( item ) ); + } + + YGWIDGET_IMPL_COMMON (YMenuButton) }; diff --git a/src/YGText.cc b/src/YGText.cc index 3fcaf1a3..4a5a9581 100644 --- a/src/YGText.cc +++ b/src/YGText.cc @@ -273,6 +273,13 @@ class YGRichText : public YRichText, YGScrolledWidget virtual unsigned int getMinSize (YUIDimension dim) { return shrinkable() ? 10 : 100; } + // NOTE copy of Qt one + void activateLink( const std::string & url ) + { + YGUI::ui()->sendEvent( new YMenuEvent( url ) ); + } + + YGWIDGET_IMPL_COMMON (YRichText) }; diff --git a/src/YGTreeView.cc b/src/YGTreeView.cc index dabddbc9..cdd9deeb 100644 --- a/src/YGTreeView.cc +++ b/src/YGTreeView.cc @@ -337,6 +337,7 @@ class YGTreeView : public YGScrolledWidget, public YGSelectionStore gtk_widget_queue_draw (pThis->getWidget()); } + static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGTreeView *pThis) { pThis->emitEvent (YEvent::ContextMenuActivated); } }; @@ -828,6 +829,15 @@ class YGTree : public YTree, public YGTreeView } #endif + // NOTE copy of Qt one + void activate() + { + // send an activation event for this widget + if ( notify() ) + YGUI::ui()->sendEvent( new YWidgetEvent( this,YEvent::Activated ) ); + } + + YGLABEL_WIDGET_IMPL (YTree) YGSELECTION_WIDGET_IMPL (YTree) }; From bb3f1c6260e2dbd316d1fcb1fb62f2a53796b9d1 Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Thu, 28 May 2020 19:14:41 +0200 Subject: [PATCH 2/4] Fixed libyui dependency --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ff070a43..5c57a356 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ # Use the libyui/devel image as the base -FROM libyui/devel +FROM registry.opensuse.org/devel/libraries/libyui/containers/libyui-devel:latest COPY . /usr/src/app From 93296b27bed2efea6716c93ec5d624b41c44e901 Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Thu, 28 May 2020 20:06:15 +0200 Subject: [PATCH 3/4] Added gtk3-devel --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5c57a356..2ba4b646 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ # Use the libyui/devel image as the base FROM registry.opensuse.org/devel/libraries/libyui/containers/libyui-devel:latest +RUN zypper install -y gtk3-devel + COPY . /usr/src/app From ce61f3ab8e0aa1e31993a39677d1923b04bdbd14 Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Thu, 28 May 2020 20:22:14 +0200 Subject: [PATCH 4/4] New version 2.48.0 --- VERSION.cmake | 2 +- package/libyui-gtk-doc.spec | 2 +- package/libyui-gtk.changes | 8 +++++++- package/libyui-gtk.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 8191c56d..f91765f0 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,5 +1,5 @@ SET( VERSION_MAJOR "2" ) -SET( VERSION_MINOR "47" ) +SET( VERSION_MINOR "48" ) SET( VERSION_PATCH "0" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SHA1}" ) diff --git a/package/libyui-gtk-doc.spec b/package/libyui-gtk-doc.spec index f8705451..156a0187 100644 --- a/package/libyui-gtk-doc.spec +++ b/package/libyui-gtk-doc.spec @@ -20,7 +20,7 @@ %define so_version 11 Name: %{parent}-doc -Version: 2.47.0 +Version: 2.48.0 Release: 0 Source: %{parent}-%{version}.tar.bz2 diff --git a/package/libyui-gtk.changes b/package/libyui-gtk.changes index 11aac8aa..635f82cd 100644 --- a/package/libyui-gtk.changes +++ b/package/libyui-gtk.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 28 20:19:07 CEST 2020 - anaselli@linux.it + +- Added missing abstract methods (copy of Qt behavior) +- Fixed trevis building +- 2.48.0 + ------------------------------------------------------------------- Thu May 28 18:09:47 CEST 2020 - besser82@fedoraproject.org @@ -33,7 +40,6 @@ Thu May 28 18:09:47 CEST 2020 - besser82@fedoraproject.org - 2.47.0 ------------------------------------------------------------------- - Wed Dec 11 09:54:55 UTC 2019 - Rodion Iafarov - Increase SO version to 11 (bsc#1132247) diff --git a/package/libyui-gtk.spec b/package/libyui-gtk.spec index f5832078..14a30d3b 100644 --- a/package/libyui-gtk.spec +++ b/package/libyui-gtk.spec @@ -17,7 +17,7 @@ Name: libyui-gtk -Version: 2.47.0 +Version: 2.48.0 Release: 0 Source: %{name}-%{version}.tar.bz2