Skip to content

Commit 5536cb6

Browse files
authored
Merge pull request #68 from anaselli/master
Copy from Qt implementation of missing abstract methods
2 parents 3832391 + ce61f3a commit 5536cb6

File tree

9 files changed

+47
-5
lines changed

9 files changed

+47
-5
lines changed

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Use the libyui/devel image as the base
2-
FROM libyui/devel
2+
FROM registry.opensuse.org/devel/libraries/libyui/containers/libyui-devel:latest
3+
4+
RUN zypper install -y gtk3-devel
35

46
COPY . /usr/src/app

VERSION.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SET( VERSION_MAJOR "2" )
2-
SET( VERSION_MINOR "47" )
2+
SET( VERSION_MINOR "48" )
33
SET( VERSION_PATCH "0" )
44
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SHA1}" )
55

package/libyui-gtk-doc.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
%define so_version 11
2121

2222
Name: %{parent}-doc
23-
Version: 2.47.0
23+
Version: 2.48.0
2424
Release: 0
2525
Source: %{parent}-%{version}.tar.bz2
2626

package/libyui-gtk.changes

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
-------------------------------------------------------------------
2+
Thu May 28 20:19:07 CEST 2020 - [email protected]
3+
4+
- Added missing abstract methods (copy of Qt behavior)
5+
- Fixed trevis building
6+
- 2.48.0
7+
18
-------------------------------------------------------------------
29
Thu May 28 18:09:47 CEST 2020 - [email protected]
310

@@ -33,7 +40,6 @@ Thu May 28 18:09:47 CEST 2020 - [email protected]
3340
- 2.47.0
3441

3542
-------------------------------------------------------------------
36-
3743
Wed Dec 11 09:54:55 UTC 2019 - Rodion Iafarov <[email protected]>
3844

3945
- Increase SO version to 11 (bsc#1132247)

package/libyui-gtk.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818

1919
Name: libyui-gtk
20-
Version: 2.47.0
20+
Version: 2.48.0
2121
Release: 0
2222
Source: %{name}-%{version}.tar.bz2
2323

src/YGDumbTab.cc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,15 @@ class YGDumbTab : public YDumbTab, public YGWidget
154154
pThis->syncTabPage();
155155
}
156156

157+
// NOTE copy of Qt one
158+
void activate()
159+
{
160+
// send an activation event for this widget
161+
if ( notify() )
162+
YGUI::ui()->sendEvent( new YWidgetEvent( this,YEvent::Activated ) );
163+
}
164+
165+
157166
YGWIDGET_IMPL_CONTAINER (YDumbTab)
158167
};
159168

src/YGMenuButton.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ class YGMenuButton : public YMenuButton, public YGWidget
6464
ygtk_menu_button_set_popup (YGTK_MENU_BUTTON (getWidget()), menu);
6565
}
6666

67+
// NOTE copy of Qt one
68+
void activateItem( YMenuItem * item )
69+
{
70+
if ( item )
71+
YGUI::ui()->sendEvent( new YMenuEvent( item ) );
72+
}
73+
74+
6775
YGWIDGET_IMPL_COMMON (YMenuButton)
6876
};
6977

src/YGText.cc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,13 @@ class YGRichText : public YRichText, YGScrolledWidget
273273
virtual unsigned int getMinSize (YUIDimension dim)
274274
{ return shrinkable() ? 10 : 100; }
275275

276+
// NOTE copy of Qt one
277+
void activateLink( const std::string & url )
278+
{
279+
YGUI::ui()->sendEvent( new YMenuEvent( url ) );
280+
}
281+
282+
276283
YGWIDGET_IMPL_COMMON (YRichText)
277284
};
278285

src/YGTreeView.cc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ class YGTreeView : public YGScrolledWidget, public YGSelectionStore
337337
gtk_widget_queue_draw (pThis->getWidget());
338338
}
339339

340+
340341
static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGTreeView *pThis)
341342
{ pThis->emitEvent (YEvent::ContextMenuActivated); }
342343
};
@@ -833,6 +834,15 @@ class YGTree : public YTree, public YGTreeView
833834
}
834835
#endif
835836

837+
// NOTE copy of Qt one
838+
void activate()
839+
{
840+
// send an activation event for this widget
841+
if ( notify() )
842+
YGUI::ui()->sendEvent( new YWidgetEvent( this,YEvent::Activated ) );
843+
}
844+
845+
836846
YGLABEL_WIDGET_IMPL (YTree)
837847
YGSELECTION_WIDGET_IMPL (YTree)
838848
};

0 commit comments

Comments
 (0)