Commit 4da281d2 authored by Matthias Clasen's avatar Matthias Clasen

Adapt the testpopover example

We now use GtkPopoverMenu, and just add the model buttons
directly to it.
parent e0959181
......@@ -9,8 +9,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/gdk \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS) \
$(GDK_DEP_CFLAGS) \
-pthread
$(GDK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gtk/libgtk-3.la
......@@ -20,11 +19,8 @@ LDADD = \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(GDK_DEP_LIBS) \
-lgmodule-2.0 \
-lm
AM_LDFLAGS = -Wl,--export-dynamic -pthread
if USE_X11
testsocket_programs = testsocket testsocket_child
......
<?xml version="1.0"?>
<interface>
<object class="GtkPopover" id="popover">
<object class="GtkPopoverMenu" id="popover">
<child>
<object class="GtkStack">
<object class="GtkBox">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="transition-type">slide-left-right</property>
<property name="orientation">vertical</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">6</property>
<property name="margin-bottom">3</property>
<child>
<object class="GtkBox" id="main">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="halign">fill</property>
<property name="margin">10</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">6</property>
<property name="margin-bottom">3</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
<property name="label">Edit</property>
<style>
<class name="separator"/>
</style>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.cut</property>
<property name="text">Cut</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.copy</property>
<property name="text">Copy</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.paste</property>
<property name="text">Paste</property>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">3</property>
<property name="margin-bottom">3</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">action1</property>
<property name="text">No action</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action2</property>
<property name="action-role">check</property>
<property name="text">Toggle</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action2a</property>
<property name="action-role">check</property>
<property name="text">Another Toggle</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">6</property>
<property name="margin-bottom">3</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
<property name="label">Middle Section</property>
<style>
<class name="separator"/>
</style>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action3</property>
<property name="action-target">'three'</property>
<property name="action-role">radio</property>
<property name="text">Radio 1</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action3</property>
<property name="action-target">'four'</property>
<property name="action-role">radio</property>
<property name="text">Radio 2</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">Submenu 1</property>
<property name="has-submenu">True</property>
<signal name="clicked" handler="open_submenu1"/>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">Submenu 2</property>
<property name="has-submenu">True</property>
<signal name="clicked" handler="open_submenu2"/>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">6</property>
<property name="margin-bottom">3</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
<property name="label">End Section</property>
<style>
<class name="separator"/>
</style>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action9</property>
<property name="text">Another Item 9</property>
<property name="icon">icon9</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action10</property>
<property name="text">Another Item 10</property>
</object>
</child>
<property name="halign">start</property>
<property name="label">Edit</property>
<style>
<class name="separator"/>
</style>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.cut</property>
<property name="text">Cut</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.copy</property>
<property name="text">Copy</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.paste</property>
<property name="text">Paste</property>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">3</property>
<property name="margin-bottom">3</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">action1</property>
<property name="text">No action</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action2</property>
<property name="action-role">check</property>
<property name="text">Toggle</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action2a</property>
<property name="action-role">check</property>
<property name="text">Another Toggle</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">6</property>
<property name="margin-bottom">3</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
<property name="label">Middle Section</property>
<style>
<class name="separator"/>
</style>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action3</property>
<property name="action-target">'three'</property>
<property name="action-role">radio</property>
<property name="text">Radio 1</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action3</property>
<property name="action-target">'four'</property>
<property name="action-role">radio</property>
<property name="text">Radio 2</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">Submenu 1</property>
<property name="has-submenu">True</property>
<property name="menu-name">submenu1</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">Submenu 2</property>
<property name="has-submenu">True</property>
<property name="menu-name">submenu2</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">6</property>
<property name="margin-bottom">3</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
<property name="label">End Section</property>
<style>
<class name="separator"/>
</style>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action9</property>
<property name="text">Another Item 9</property>
<property name="icon">icon9</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action10</property>
<property name="text">Another Item 10</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">Submenu 1</property>
<property name="has-submenu">True</property>
<property name="inverted">True</property>
<property name="centered">True</property>
<property name="menu-name">main</property>
</object>
<packing>
<property name="submenu">submenu1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">6</property>
<property name="margin-bottom">3</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
<property name="label">5555</property>
<style>
<class name="separator"/>
</style>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
</object>
</child>
</object>
<packing>
<property name="submenu">submenu1</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action5</property>
<property name="text">Item 5</property>
</object>
<packing>
<property name="submenu">submenu1</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action5</property>
<property name="text">Item 5a</property>
</object>
<packing>
<property name="submenu">submenu1</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action5</property>
<property name="text">Item 5b</property>
</object>
<packing>
<property name="submenu">submenu1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="halign">fill</property>
<property name="margin-top">10</property>
<style>
<class name="linked"/>
</style>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">List</property>
<property name="action-name">top.set-view</property>
<property name="action-target">'list'</property>
<property name="action-role">radio</property>
<property name="iconic">True</property>
<property name="centered">True</property>
<property name="icon">icon-list</property>
</object>
<packing>
<property name="expand">True</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">Grid</property>
<property name="action-name">top.set-view</property>
<property name="action-target">'grid'</property>
<property name="action-role">radio</property>
<property name="iconic">True</property>
<property name="centered">True</property>
<property name="icon">icon-grid</property>
</object>
<packing>
<property name="expand">True</property>
</packing>
</child>
</object>
<packing>
<property name="submenu">submenu1</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action5</property>
<property name="text">Item 5c</property>
</object>
<packing>
<property name="submenu">submenu1</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action5</property>
<property name="text">Item 5d</property>
</object>
<packing>
<property name="submenu">submenu1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">6</property>
<property name="margin-bottom">3</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
<property name="label">Format</property>
<style>
<class name="separator"/>
</style>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
</object>
</child>
</object>
<packing>
<property name="submenu">submenu1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="halign">fill</property>
<property name="margin-top">10</property>
<style>
<class name="linked"/>
</style>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">Bold</property>
<property name="action-name">top.bold</property>
<property name="action-role">check</property>
<property name="iconic">True</property>
<property name="centered">True</property>
</object>
<packing>
<property name="name">main</property>
<property name="expand">True</property>
</packing>
</child>
<child>
<object class="GtkBox" id="submenu1">
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin">10</property>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">Submenu 1</property>
<property name="has-submenu">True</property>
<property name="inverted">True</property>
<property name="centered">True</property>
<signal name="clicked" handler="open_main"/>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">6</property>
<property name="margin-bottom">3</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
<property name="label">5555</property>
<style>
<class name="separator"/>
</style>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action5</property>
<property name="text">Item 5</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action5</property>
<property name="text">Item 5a</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action5</property>
<property name="text">Item 5b</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="halign">fill</property>
<property name="margin-top">10</property>
<style>
<class name="linked"/>
</style>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">List</property>
<property name="action-name">top.set-view</property>
<property name="action-target">'list'</property>
<property name="action-role">radio</property>
<property name="iconic">True</property>
<property name="centered">True</property>
<property name="icon">icon-list</property>
</object>
<packing>
<property name="expand">True</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">Grid</property>
<property name="action-name">top.set-view</property>
<property name="action-target">'grid'</property>
<property name="action-role">radio</property>
<property name="iconic">True</property>
<property name="centered">True</property>
<property name="icon">icon-grid</property>
</object>
<packing>
<property name="expand">True</property>
</packing>
</child>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action5</property>
<property name="text">Item 5c</property>
</object>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="action-name">top.action5</property>
<property name="text">Item 5d</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">6</property>
<property name="margin-bottom">3</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
<property name="label">Format</property>
<style>
<class name="separator"/>
</style>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="halign">fill</property>
<property name="margin-top">10</property>
<style>
<class name="linked"/>
</style>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="text">Bold</property>
<property name="action-name">top.bold</property>