Skip to content

Commit d50c831

Browse files
jcupittjcupitt
committed
up to gtkutil
1 parent e737d67 commit d50c831

File tree

11 files changed

+364
-72
lines changed

11 files changed

+364
-72
lines changed

‎share/nip2/rc/mainw.glade

Lines changed: 265 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,265 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Generated with glade 3.18.3 -->
3+
<interface>
4+
<requires lib="gtk+" version="3.12"/>
5+
<object class="GtkApplicationWindow" id="applicationwindow1">
6+
<property name="can_focus">False</property>
7+
<child>
8+
<object class="GtkBox" id="box1">
9+
<property name="visible">True</property>
10+
<property name="can_focus">False</property>
11+
<property name="orientation">vertical</property>
12+
<child>
13+
<object class="GtkMenuBar" id="menubar1">
14+
<property name="visible">True</property>
15+
<property name="can_focus">False</property>
16+
<child>
17+
<object class="GtkMenuItem" id="menuitem1">
18+
<property name="visible">True</property>
19+
<property name="can_focus">False</property>
20+
<property name="label" translatable="yes">_File</property>
21+
<property name="use_underline">True</property>
22+
<child type="submenu">
23+
<object class="GtkMenu" id="menu1">
24+
<property name="visible">True</property>
25+
<property name="can_focus">False</property>
26+
<child>
27+
<object class="GtkImageMenuItem" id="imagemenuitem1">
28+
<property name="label">gtk-new</property>
29+
<property name="visible">True</property>
30+
<property name="can_focus">False</property>
31+
<property name="use_underline">True</property>
32+
<property name="use_stock">True</property>
33+
</object>
34+
</child>
35+
<child>
36+
<object class="GtkImageMenuItem" id="imagemenuitem2">
37+
<property name="label">gtk-open</property>
38+
<property name="visible">True</property>
39+
<property name="can_focus">False</property>
40+
<property name="use_underline">True</property>
41+
<property name="use_stock">True</property>
42+
</object>
43+
</child>
44+
<child>
45+
<object class="GtkImageMenuItem" id="imagemenuitem3">
46+
<property name="label">gtk-save</property>
47+
<property name="visible">True</property>
48+
<property name="can_focus">False</property>
49+
<property name="use_underline">True</property>
50+
<property name="use_stock">True</property>
51+
</object>
52+
</child>
53+
<child>
54+
<object class="GtkImageMenuItem" id="imagemenuitem4">
55+
<property name="label">gtk-save-as</property>
56+
<property name="visible">True</property>
57+
<property name="can_focus">False</property>
58+
<property name="use_underline">True</property>
59+
<property name="use_stock">True</property>
60+
</object>
61+
</child>
62+
<child>
63+
<object class="GtkSeparatorMenuItem" id="separatormenuitem1">
64+
<property name="visible">True</property>
65+
<property name="can_focus">False</property>
66+
</object>
67+
</child>
68+
<child>
69+
<object class="GtkImageMenuItem" id="imagemenuitem5">
70+
<property name="label">gtk-quit</property>
71+
<property name="visible">True</property>
72+
<property name="can_focus">False</property>
73+
<property name="use_underline">True</property>
74+
<property name="use_stock">True</property>
75+
</object>
76+
</child>
77+
</object>
78+
</child>
79+
</object>
80+
</child>
81+
<child>
82+
<object class="GtkMenuItem" id="menuitem2">
83+
<property name="visible">True</property>
84+
<property name="can_focus">False</property>
85+
<property name="label" translatable="yes">_Edit</property>
86+
<property name="use_underline">True</property>
87+
<child type="submenu">
88+
<object class="GtkMenu" id="menu2">
89+
<property name="visible">True</property>
90+
<property name="can_focus">False</property>
91+
<child>
92+
<object class="GtkImageMenuItem" id="imagemenuitem6">
93+
<property name="label">gtk-cut</property>
94+
<property name="visible">True</property>
95+
<property name="can_focus">False</property>
96+
<property name="use_underline">True</property>
97+
<property name="use_stock">True</property>
98+
</object>
99+
</child>
100+
<child>
101+
<object class="GtkImageMenuItem" id="imagemenuitem7">
102+
<property name="label">gtk-copy</property>
103+
<property name="visible">True</property>
104+
<property name="can_focus">False</property>
105+
<property name="use_underline">True</property>
106+
<property name="use_stock">True</property>
107+
</object>
108+
</child>
109+
<child>
110+
<object class="GtkImageMenuItem" id="imagemenuitem8">
111+
<property name="label">gtk-paste</property>
112+
<property name="visible">True</property>
113+
<property name="can_focus">False</property>
114+
<property name="use_underline">True</property>
115+
<property name="use_stock">True</property>
116+
</object>
117+
</child>
118+
<child>
119+
<object class="GtkImageMenuItem" id="imagemenuitem9">
120+
<property name="label">gtk-delete</property>
121+
<property name="visible">True</property>
122+
<property name="can_focus">False</property>
123+
<property name="use_underline">True</property>
124+
<property name="use_stock">True</property>
125+
</object>
126+
</child>
127+
</object>
128+
</child>
129+
</object>
130+
</child>
131+
<child>
132+
<object class="GtkMenuItem" id="menuitem3">
133+
<property name="visible">True</property>
134+
<property name="can_focus">False</property>
135+
<property name="label" translatable="yes">_View</property>
136+
<property name="use_underline">True</property>
137+
</object>
138+
</child>
139+
<child>
140+
<object class="GtkMenuItem" id="menuitem4">
141+
<property name="visible">True</property>
142+
<property name="can_focus">False</property>
143+
<property name="label" translatable="yes">_Help</property>
144+
<property name="use_underline">True</property>
145+
<child type="submenu">
146+
<object class="GtkMenu" id="menu3">
147+
<property name="visible">True</property>
148+
<property name="can_focus">False</property>
149+
<child>
150+
<object class="GtkImageMenuItem" id="imagemenuitem10">
151+
<property name="label">gtk-about</property>
152+
<property name="visible">True</property>
153+
<property name="can_focus">False</property>
154+
<property name="use_underline">True</property>
155+
<property name="use_stock">True</property>
156+
</object>
157+
</child>
158+
</object>
159+
</child>
160+
</object>
161+
</child>
162+
</object>
163+
<packing>
164+
<property name="expand">False</property>
165+
<property name="fill">True</property>
166+
<property name="position">0</property>
167+
</packing>
168+
</child>
169+
<child>
170+
<object class="GtkNotebook" id="notebook1">
171+
<property name="visible">True</property>
172+
<property name="can_focus">True</property>
173+
<child>
174+
<placeholder/>
175+
</child>
176+
<child type="tab">
177+
<object class="GtkLabel" id="label1">
178+
<property name="visible">True</property>
179+
<property name="can_focus">False</property>
180+
<property name="label" translatable="yes">page 1</property>
181+
</object>
182+
<packing>
183+
<property name="tab_fill">False</property>
184+
</packing>
185+
</child>
186+
<child>
187+
<placeholder/>
188+
</child>
189+
<child type="tab">
190+
<object class="GtkLabel" id="label2">
191+
<property name="visible">True</property>
192+
<property name="can_focus">False</property>
193+
<property name="label" translatable="yes">page 2</property>
194+
</object>
195+
<packing>
196+
<property name="position">1</property>
197+
<property name="tab_fill">False</property>
198+
</packing>
199+
</child>
200+
<child>
201+
<placeholder/>
202+
</child>
203+
<child type="tab">
204+
<object class="GtkLabel" id="label3">
205+
<property name="visible">True</property>
206+
<property name="can_focus">False</property>
207+
<property name="label" translatable="yes">page 3</property>
208+
</object>
209+
<packing>
210+
<property name="position">2</property>
211+
<property name="tab_fill">False</property>
212+
</packing>
213+
</child>
214+
</object>
215+
<packing>
216+
<property name="expand">True</property>
217+
<property name="fill">True</property>
218+
<property name="position">1</property>
219+
</packing>
220+
</child>
221+
<child>
222+
<object class="GtkBox" id="box2">
223+
<property name="visible">True</property>
224+
<property name="can_focus">False</property>
225+
<property name="spacing">5</property>
226+
<child>
227+
<object class="GtkLabel" id="label4">
228+
<property name="visible">True</property>
229+
<property name="can_focus">False</property>
230+
<property name="xalign">0</property>
231+
<property name="label" translatable="yes">label</property>
232+
</object>
233+
<packing>
234+
<property name="expand">False</property>
235+
<property name="fill">True</property>
236+
<property name="position">0</property>
237+
</packing>
238+
</child>
239+
<child>
240+
<object class="GtkLabel" id="label5">
241+
<property name="visible">True</property>
242+
<property name="can_focus">False</property>
243+
<property name="xalign">0</property>
244+
<property name="label" translatable="yes">label</property>
245+
<property name="angle">0.099999997764825821</property>
246+
</object>
247+
<packing>
248+
<property name="expand">True</property>
249+
<property name="fill">True</property>
250+
<property name="pack_type">end</property>
251+
<property name="position">1</property>
252+
</packing>
253+
</child>
254+
</object>
255+
<packing>
256+
<property name="expand">False</property>
257+
<property name="fill">True</property>
258+
<property name="pack_type">end</property>
259+
<property name="position">2</property>
260+
</packing>
261+
</child>
262+
</object>
263+
</child>
264+
</object>
265+
</interface>

‎src/Makefile.am

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ nip2_SOURCES = \
9595
fontnameview.h \
9696
filesel.c \
9797
filesel.h \
98-
graphwindow.c \
99-
graphwindow.h \
10098
graphicview.c \
10199
graphicview.h \
102100
gtkutil.c \
@@ -118,12 +116,8 @@ nip2_SOURCES = \
118116
idialog.h \
119117
iimage.c \
120118
iimage.h \
121-
iimageview.c \
122-
iimageview.h \
123119
imagedisplay.c \
124120
imagedisplay.h \
125-
log.c \
126-
log.h \
127121
error.c \
128122
error.h \
129123
managed.c \
@@ -172,8 +166,6 @@ nip2_SOURCES = \
172166
link.h \
173167
main.c \
174168
main.h \
175-
mainw.c \
176-
mainw.h \
177169
matrix.c \
178170
matrix.h \
179171
matrixview.c \
@@ -182,8 +174,6 @@ nip2_SOURCES = \
182174
plot.h \
183175
plotview.c \
184176
plotview.h \
185-
plotwindow.c \
186-
plotwindow.h \
187177
model.c \
188178
model.h \
189179
nip2-icon.rc \
@@ -199,8 +189,6 @@ nip2_SOURCES = \
199189
path.h \
200190
predicate.c \
201191
predicate.h \
202-
program.c \
203-
program.h \
204192
string.c \
205193
istring.h \
206194
number.c \
@@ -296,7 +284,20 @@ nip2_SOURCES = \
296284
workspaceroot.c \
297285
workspaceroot.h \
298286
workspaceview.c \
299-
workspaceview.h
287+
workspaceview.h \
288+
\
289+
graphwindow.c \
290+
graphwindow.h \
291+
iimageview.c \
292+
iimageview.h \
293+
log.c \
294+
log.h \
295+
mainw.c \
296+
mainw.h \
297+
plotwindow.c \
298+
plotwindow.h \
299+
program.c \
300+
program.h
300301

301302
helpindex.h:
302303
./makehelpindex.pl $(prefix) > helpindex.h

‎src/classmodel.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,15 +614,16 @@ classmodel_done_member( Classmodel *classmodel,
614614
ClassmodelMember *m, GtkWidget *widget )
615615
{
616616
char txt[256];
617+
gboolean b;
617618

618619
switch( m->type ) {
619620
case CLASSMODEL_MEMBER_INT:
620621
case CLASSMODEL_MEMBER_ENUM:
621622
break;
622623

623624
case CLASSMODEL_MEMBER_BOOLEAN:
624-
G_STRUCT_MEMBER( gboolean, classmodel, m->offset ) =
625-
GTK_TOGGLE_BUTTON( widget )->active;
625+
b = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ) );
626+
G_STRUCT_MEMBER( gboolean, classmodel, m->offset ) = b;
626627
break;
627628

628629
case CLASSMODEL_MEMBER_DOUBLE:

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy