Skip to content

Commit 9402569

Browse files
mvidnermvidner
committed
Made the gdbus example run again.
Converted the XML from Libglade to GtkBuilder (via glade3-3.8.5) Replaced libglade2 with gtk2, used Gtk::Builder http://ruby-gnome2.osdn.jp/hiki.cgi?Ruby%2FGTK http://ruby-gnome2.osdn.jp/hiki.cgi?Gtk%3A%3ABuilder
1 parent 8ee30ce commit 9402569

2 files changed

Lines changed: 106 additions & 191 deletions

File tree

‎examples/gdbus/gdbus‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# -- Arnaud
77

88
require 'dbus'
9-
require 'libglade2'
9+
require "gtk2"
1010

1111
$enable_system = false
1212

@@ -74,25 +74,26 @@ end
7474

7575
class DBusUI
7676
def initialize
77-
@glade = GladeXML.new("gdbus.glade") { |h| method(h) } # This block is like
78-
# black magic :)
79-
@sessiontreeview = @glade.get_widget("sessiontreeview")
77+
@glade = Gtk::Builder.new
78+
@glade << "gdbus.glade"
79+
80+
@sessiontreeview = @glade.get_object("sessiontreeview")
8081
setup_treeview_renderer(@sessiontreeview, 'D-Bus Objects')
8182
@sessiontreeview.selection.signal_connect("changed") do |selection|
8283
on_treeview_selection_changed(selection)
8384
end
8485

85-
@systemtreeview = @glade.get_widget("systemtreeview")
86+
@systemtreeview = @glade.get_object("systemtreeview")
8687
setup_treeview_renderer(@systemtreeview, 'D-Bus Objects')
8788
@systemtreeview.selection.signal_connect("changed") do |selection|
8889
on_treeview_selection_changed(selection)
8990
end
9091

91-
@methsigtreeview = @glade.get_widget("methsigtreeview")
92+
@methsigtreeview = @glade.get_object("methsigtreeview")
9293
# ierk
9394
setup_methodview_renderer(@methsigtreeview)
9495

95-
@window = @glade.get_widget("window1")
96+
@window = @glade.get_object("window1")
9697
@window.show_all
9798
start_buses
9899
end

‎examples/gdbus/gdbus.glade‎

Lines changed: 98 additions & 184 deletions
Original file line numberDiff line numberDiff line change
@@ -1,184 +1,98 @@
1-
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
2-
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
3-
4-
<glade-interface>
5-
6-
<widget class="GtkWindow" id="window1">
7-
<property name="visible">True</property>
8-
<property name="title" translatable="yes">GD-Bus</property>
9-
<property name="type">GTK_WINDOW_TOPLEVEL</property>
10-
<property name="window_position">GTK_WIN_POS_NONE</property>
11-
<property name="modal">False</property>
12-
<property name="default_width">500</property>
13-
<property name="default_height">400</property>
14-
<property name="resizable">True</property>
15-
<property name="destroy_with_parent">False</property>
16-
<property name="decorated">True</property>
17-
<property name="skip_taskbar_hint">False</property>
18-
<property name="skip_pager_hint">False</property>
19-
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
20-
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
21-
<property name="focus_on_map">True</property>
22-
<property name="urgency_hint">False</property>
23-
<signal name="delete_event" handler="on_window_delete_event" last_modification_time="Sat, 17 Mar 2007 14:49:13 GMT"/>
24-
25-
<child>
26-
<widget class="GtkHPaned" id="hpaned1">
27-
<property name="visible">True</property>
28-
<property name="can_focus">True</property>
29-
30-
<child>
31-
<widget class="GtkNotebook" id="notebook1">
32-
<property name="visible">True</property>
33-
<property name="can_focus">True</property>
34-
<property name="show_tabs">True</property>
35-
<property name="show_border">True</property>
36-
<property name="tab_pos">GTK_POS_TOP</property>
37-
<property name="scrollable">False</property>
38-
<property name="enable_popup">False</property>
39-
40-
<child>
41-
<widget class="GtkScrolledWindow" id="scrolledwindow3">
42-
<property name="visible">True</property>
43-
<property name="can_focus">True</property>
44-
<property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
45-
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
46-
<property name="shadow_type">GTK_SHADOW_IN</property>
47-
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
48-
49-
<child>
50-
<widget class="GtkTreeView" id="sessiontreeview">
51-
<property name="visible">True</property>
52-
<property name="can_focus">True</property>
53-
<property name="headers_visible">True</property>
54-
<property name="rules_hint">False</property>
55-
<property name="reorderable">False</property>
56-
<property name="enable_search">True</property>
57-
<property name="fixed_height_mode">False</property>
58-
<property name="hover_selection">False</property>
59-
<property name="hover_expand">False</property>
60-
<signal name="row_activated" handler="on_sessiontreeview_row_activated" last_modification_time="Sat, 17 Mar 2007 10:17:11 GMT"/>
61-
</widget>
62-
</child>
63-
</widget>
64-
<packing>
65-
<property name="tab_expand">False</property>
66-
<property name="tab_fill">True</property>
67-
</packing>
68-
</child>
69-
70-
<child>
71-
<widget class="GtkLabel" id="label1">
72-
<property name="visible">True</property>
73-
<property name="label" translatable="yes">Session</property>
74-
<property name="use_underline">False</property>
75-
<property name="use_markup">False</property>
76-
<property name="justify">GTK_JUSTIFY_LEFT</property>
77-
<property name="wrap">False</property>
78-
<property name="selectable">False</property>
79-
<property name="xalign">0.5</property>
80-
<property name="yalign">0.5</property>
81-
<property name="xpad">0</property>
82-
<property name="ypad">0</property>
83-
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
84-
<property name="width_chars">-1</property>
85-
<property name="single_line_mode">False</property>
86-
<property name="angle">0</property>
87-
</widget>
88-
<packing>
89-
<property name="type">tab</property>
90-
</packing>
91-
</child>
92-
93-
<child>
94-
<widget class="GtkScrolledWindow" id="scrolledwindow5">
95-
<property name="visible">True</property>
96-
<property name="can_focus">True</property>
97-
<property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
98-
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
99-
<property name="shadow_type">GTK_SHADOW_IN</property>
100-
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
101-
102-
<child>
103-
<widget class="GtkTreeView" id="systemtreeview">
104-
<property name="visible">True</property>
105-
<property name="can_focus">True</property>
106-
<property name="headers_visible">True</property>
107-
<property name="rules_hint">False</property>
108-
<property name="reorderable">False</property>
109-
<property name="enable_search">True</property>
110-
<property name="fixed_height_mode">False</property>
111-
<property name="hover_selection">False</property>
112-
<property name="hover_expand">False</property>
113-
</widget>
114-
</child>
115-
</widget>
116-
<packing>
117-
<property name="tab_expand">False</property>
118-
<property name="tab_fill">True</property>
119-
</packing>
120-
</child>
121-
122-
<child>
123-
<widget class="GtkLabel" id="label2">
124-
<property name="visible">True</property>
125-
<property name="label" translatable="yes">System</property>
126-
<property name="use_underline">False</property>
127-
<property name="use_markup">False</property>
128-
<property name="justify">GTK_JUSTIFY_LEFT</property>
129-
<property name="wrap">False</property>
130-
<property name="selectable">False</property>
131-
<property name="xalign">0.5</property>
132-
<property name="yalign">0.5</property>
133-
<property name="xpad">0</property>
134-
<property name="ypad">0</property>
135-
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
136-
<property name="width_chars">-1</property>
137-
<property name="single_line_mode">False</property>
138-
<property name="angle">0</property>
139-
</widget>
140-
<packing>
141-
<property name="type">tab</property>
142-
</packing>
143-
</child>
144-
</widget>
145-
<packing>
146-
<property name="shrink">True</property>
147-
<property name="resize">False</property>
148-
</packing>
149-
</child>
150-
151-
<child>
152-
<widget class="GtkScrolledWindow" id="scrolledwindow4">
153-
<property name="visible">True</property>
154-
<property name="can_focus">True</property>
155-
<property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
156-
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
157-
<property name="shadow_type">GTK_SHADOW_IN</property>
158-
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
159-
160-
<child>
161-
<widget class="GtkTreeView" id="methsigtreeview">
162-
<property name="visible">True</property>
163-
<property name="can_focus">True</property>
164-
<property name="headers_visible">True</property>
165-
<property name="rules_hint">False</property>
166-
<property name="reorderable">False</property>
167-
<property name="enable_search">True</property>
168-
<property name="fixed_height_mode">False</property>
169-
<property name="hover_selection">False</property>
170-
<property name="hover_expand">False</property>
171-
<signal name="row_activated" handler="on_method_activated" last_modification_time="Sat, 17 Mar 2007 14:49:13 GMT"/>
172-
</widget>
173-
</child>
174-
</widget>
175-
<packing>
176-
<property name="shrink">True</property>
177-
<property name="resize">False</property>
178-
</packing>
179-
</child>
180-
</widget>
181-
</child>
182-
</widget>
183-
184-
</glade-interface>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<interface>
3+
<!-- interface-requires gtk+ 2.6 -->
4+
<!-- interface-naming-policy toplevel-contextual -->
5+
<object class="GtkWindow" id="window1">
6+
<property name="visible">True</property>
7+
<property name="can_focus">False</property>
8+
<property name="title" translatable="yes">GD-Bus</property>
9+
<property name="default_width">500</property>
10+
<property name="default_height">400</property>
11+
<signal name="delete-event" handler="on_window_delete_event" swapped="no"/>
12+
<child>
13+
<object class="GtkHPaned" id="hpaned1">
14+
<property name="visible">True</property>
15+
<property name="can_focus">True</property>
16+
<child>
17+
<object class="GtkNotebook" id="notebook1">
18+
<property name="visible">True</property>
19+
<property name="can_focus">True</property>
20+
<child>
21+
<object class="GtkScrolledWindow" id="scrolledwindow3">
22+
<property name="visible">True</property>
23+
<property name="can_focus">True</property>
24+
<property name="shadow_type">in</property>
25+
<child>
26+
<object class="GtkTreeView" id="sessiontreeview">
27+
<property name="visible">True</property>
28+
<property name="can_focus">True</property>
29+
<signal name="row-activated" handler="on_sessiontreeview_row_activated" swapped="no"/>
30+
</object>
31+
</child>
32+
</object>
33+
</child>
34+
<child type="tab">
35+
<object class="GtkLabel" id="label1">
36+
<property name="visible">True</property>
37+
<property name="can_focus">False</property>
38+
<property name="label" translatable="yes">Session</property>
39+
</object>
40+
<packing>
41+
<property name="tab_fill">False</property>
42+
</packing>
43+
</child>
44+
<child>
45+
<object class="GtkScrolledWindow" id="scrolledwindow5">
46+
<property name="visible">True</property>
47+
<property name="can_focus">True</property>
48+
<property name="shadow_type">in</property>
49+
<child>
50+
<object class="GtkTreeView" id="systemtreeview">
51+
<property name="visible">True</property>
52+
<property name="can_focus">True</property>
53+
</object>
54+
</child>
55+
</object>
56+
<packing>
57+
<property name="position">1</property>
58+
</packing>
59+
</child>
60+
<child type="tab">
61+
<object class="GtkLabel" id="label2">
62+
<property name="visible">True</property>
63+
<property name="can_focus">False</property>
64+
<property name="label" translatable="yes">System</property>
65+
</object>
66+
<packing>
67+
<property name="position">1</property>
68+
<property name="tab_fill">False</property>
69+
</packing>
70+
</child>
71+
</object>
72+
<packing>
73+
<property name="resize">False</property>
74+
<property name="shrink">True</property>
75+
</packing>
76+
</child>
77+
<child>
78+
<object class="GtkScrolledWindow" id="scrolledwindow4">
79+
<property name="visible">True</property>
80+
<property name="can_focus">True</property>
81+
<property name="shadow_type">in</property>
82+
<child>
83+
<object class="GtkTreeView" id="methsigtreeview">
84+
<property name="visible">True</property>
85+
<property name="can_focus">True</property>
86+
<signal name="row-activated" handler="on_method_activated" swapped="no"/>
87+
</object>
88+
</child>
89+
</object>
90+
<packing>
91+
<property name="resize">False</property>
92+
<property name="shrink">True</property>
93+
</packing>
94+
</child>
95+
</object>
96+
</child>
97+
</object>
98+
</interface>

0 commit comments

Comments
 (0)