Skip to content

Commit 4cbc924

Browse files
jcupittjcupitt
committed
some cleanups
renames, rationalisation, etc.
1 parent 2a42f6f commit 4cbc924

26 files changed

+101
-107
lines changed

‎TODO‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
- use GtkWindow* everywhere for "parent"
2-
3-
eg. classmodel_graphic_replace() etc
4-
51
- "reset" in display bar resets the position of scale/offset widgets, but does
62
not reset the menu items (eg. tick on falsecolour)
73

‎src/classmodel.c‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -122,31 +122,31 @@ classmodel_graphic_save_cb(GObject *source_object,
122122
Classmodel *classmodel = CLASSMODEL(user_data);
123123
ClassmodelClass *class = CLASSMODEL_GET_CLASS(classmodel);
124124
GtkFileDialog *dialog = GTK_FILE_DIALOG(source_object);
125-
GtkWidget *parent = g_object_get_data(G_OBJECT(dialog), "nip4-parent");
125+
GtkWindow *window = g_object_get_data(G_OBJECT(dialog), "nip4-window");
126126

127127
g_autoptr(GFile) file = gtk_file_dialog_save_finish(dialog, res, NULL);
128128
if (file) {
129129
g_autofree char *filename = g_file_get_path(file);
130130

131-
if (class->graphic_save(classmodel, parent, filename)) {
131+
if (class->graphic_save(classmodel, window, filename)) {
132132
VIPS_SETSTR(classmodel->filename, filename);
133133
iobject_changed(IOBJECT(classmodel));
134134
}
135135
else
136-
error_alert(parent);
136+
error_alert(window);
137137
}
138138
}
139139

140140
void
141-
classmodel_graphic_save(Classmodel *classmodel, GtkWidget *parent)
141+
classmodel_graphic_save(Classmodel *classmodel, GtkWindow *window)
142142
{
143143
ClassmodelClass *class = CLASSMODEL_GET_CLASS(classmodel);
144144

145145
if (!class->graphic_save) {
146146
error_top(_("Not implemented"));
147147
error_sub(_("_%s() method not implemented for %s"),
148148
"graphic_save", IOBJECT_GET_CLASS_NAME(classmodel));
149-
error_alert(parent);
149+
error_alert(window);
150150
return;
151151
}
152152

@@ -170,24 +170,22 @@ classmodel_graphic_save(Classmodel *classmodel, GtkWidget *parent)
170170
gtk_file_dialog_set_initial_file(dialog, file);
171171
}
172172

173-
g_object_set_data(G_OBJECT(dialog), "nip4-parent", parent);
173+
g_object_set_data(G_OBJECT(dialog), "nip4-window", window);
174174

175-
gtk_file_dialog_save(dialog,
176-
GTK_WINDOW(gtk_widget_get_root(parent)),
177-
NULL,
175+
gtk_file_dialog_save(dialog, window, NULL,
178176
classmodel_graphic_save_cb, classmodel);
179177
}
180178

181179
gboolean
182180
classmodel_graphic_replace_filename(Classmodel *classmodel,
183-
GtkWidget *parent, const char *filename)
181+
GtkWindow *window, const char *filename)
184182
{
185183
ClassmodelClass *class = CLASSMODEL_GET_CLASS(classmodel);
186184

187185
if (!class->graphic_replace)
188186
return TRUE;
189187

190-
if (!class->graphic_replace(classmodel, parent, filename))
188+
if (!class->graphic_replace(classmodel, window, filename))
191189
return FALSE;
192190

193191
g_object_ref(G_OBJECT(classmodel));
@@ -207,19 +205,19 @@ classmodel_graphic_replace_cb(GObject *source_object,
207205
{
208206
Classmodel *classmodel = CLASSMODEL(user_data);
209207
GtkFileDialog *dialog = GTK_FILE_DIALOG(source_object);
210-
GtkWidget *parent = g_object_get_data(G_OBJECT(dialog), "nip4-parent");
208+
GtkWindow *window = g_object_get_data(G_OBJECT(dialog), "nip4-window");
211209

212210
g_autoptr(GFile) file = gtk_file_dialog_open_finish(dialog, res, NULL);
213211
if (file) {
214212
g_autofree char *filename = g_file_get_path(file);
215213

216-
if (!classmodel_graphic_replace_filename(classmodel, parent, filename))
217-
error_alert(parent);
214+
if (!classmodel_graphic_replace_filename(classmodel, window, filename))
215+
error_alert(window);
218216
}
219217
}
220218

221219
void
222-
classmodel_graphic_replace(Classmodel *classmodel, GtkWidget *parent)
220+
classmodel_graphic_replace(Classmodel *classmodel, GtkWindow *window)
223221
{
224222
ClassmodelClass *class = CLASSMODEL_GET_CLASS(classmodel);
225223

@@ -228,7 +226,7 @@ classmodel_graphic_replace(Classmodel *classmodel, GtkWidget *parent)
228226
error_sub(_("_%s() method not implemented for %s"),
229227
"graphic_replace",
230228
IOBJECT_GET_CLASS_NAME(classmodel));
231-
error_alert(parent);
229+
error_alert(window);
232230
return;
233231
}
234232

@@ -252,11 +250,9 @@ classmodel_graphic_replace(Classmodel *classmodel, GtkWidget *parent)
252250
gtk_file_dialog_set_initial_file(dialog, file);
253251
}
254252

255-
g_object_set_data(G_OBJECT(dialog), "nip4-parent", parent);
253+
g_object_set_data(G_OBJECT(dialog), "nip4-window", window);
256254

257-
gtk_file_dialog_open(dialog,
258-
GTK_WINDOW(gtk_widget_get_root(parent)),
259-
NULL,
255+
gtk_file_dialog_open(dialog, window, NULL,
260256
classmodel_graphic_replace_cb, classmodel);
261257
}
262258

@@ -851,7 +847,8 @@ classmodel_load(Model *model,
851847
classmodel_set_edited(CLASSMODEL(model), TRUE);
852848
}
853849

854-
return MODEL_CLASS(classmodel_parent_class)->load(model, state, parent, xthis);
850+
return MODEL_CLASS(classmodel_parent_class)->
851+
load(model, state, parent, xthis);
855852
}
856853

857854
static gboolean

‎src/classmodel.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ typedef struct _ClassmodelClass {
121121

122122
/* Save and replace graphic displays ... eg. image/matrix.
123123
*/
124-
gboolean (*graphic_save)(Classmodel *, GtkWidget *, const char *);
125-
gboolean (*graphic_replace)(Classmodel *, GtkWidget *, const char *);
124+
gboolean (*graphic_save)(Classmodel *, GtkWindow *, const char *);
125+
gboolean (*graphic_replace)(Classmodel *, GtkWindow *, const char *);
126126

127127
ClassmodelMember *members;
128128
int n_members;
@@ -135,10 +135,10 @@ void image_value_set(ImageValue *image, Imageinfo *ii);
135135
void image_value_caption(ImageValue *value, VipsBuf *buf);
136136

137137
void *classmodel_get_instance(Classmodel *classmodel);
138-
void classmodel_graphic_save(Classmodel *classmodel, GtkWidget *parent);
138+
void classmodel_graphic_save(Classmodel *classmodel, GtkWindow *window);
139139
gboolean classmodel_graphic_replace_filename(Classmodel *classmodel,
140-
GtkWidget *parent, const char *filename);
141-
void classmodel_graphic_replace(Classmodel *classmodel, GtkWidget *parent);
140+
GtkWindow *window, const char *filename);
141+
void classmodel_graphic_replace(Classmodel *classmodel, GtkWindow *window);
142142

143143
void *classmodel_iimage_unlink(Classmodel *classmodel, iImage *iimage);
144144
void classmodel_iimage_update(Classmodel *classmodel, Imageinfo *ii);

‎src/colour.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ colour_edit_choose_rgba(GObject *source_object,
260260
}
261261

262262
static void
263-
colour_edit(GtkWidget *parent, Model *model)
263+
colour_edit(Model *model, GtkWindow *window)
264264
{
265265
Colour *colour = COLOUR(model);
266266

@@ -276,7 +276,7 @@ colour_edit(GtkWidget *parent, Model *model)
276276
.alpha = 1.0
277277
};
278278

279-
gtk_color_dialog_choose_rgba(dialog, view_get_window(VIEW(parent)),
279+
gtk_color_dialog_choose_rgba(dialog, window,
280280
&initial_color, NULL, colour_edit_choose_rgba, colour);
281281
}
282282

‎src/filemodel.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ filemodel_saveas_sub(GObject *source_object,
655655
GAsyncResult *res, void *data)
656656
{
657657
GtkFileDialog *dialog = GTK_FILE_DIALOG(source_object);
658-
GtkWindow *parent = g_object_get_data(G_OBJECT(dialog), "nip4-parent");
658+
GtkWindow *window = g_object_get_data(G_OBJECT(dialog), "nip4-window");
659659
Filemodel *filemodel =
660660
g_object_get_data(G_OBJECT(dialog), "nip4-filemodel");
661661
FilemodelSaveasResult next =
@@ -670,17 +670,17 @@ filemodel_saveas_sub(GObject *source_object,
670670
g_autofree char *filename = g_file_get_path(file);
671671

672672
if (!filemodel_top_save(filemodel, filename))
673-
error(parent, filemodel, a, b);
673+
error(window, filemodel, a, b);
674674
else {
675675
filemodel_set_filename(filemodel, filename);
676676
filemodel_set_modified(filemodel, FALSE);
677-
next(parent, filemodel, a, b);
677+
next(window, filemodel, a, b);
678678
}
679679
}
680680
}
681681

682682
static void
683-
filemodel_saveas(GtkWindow *parent, Filemodel *filemodel,
683+
filemodel_saveas(GtkWindow *window, Filemodel *filemodel,
684684
FilemodelSaveasResult next,
685685
FilemodelSaveasResult error, void *a, void *b)
686686
{
@@ -690,7 +690,7 @@ filemodel_saveas(GtkWindow *parent, Filemodel *filemodel,
690690
GtkFileDialog *dialog = gtk_file_dialog_new();
691691
gtk_file_dialog_set_title(dialog, title);
692692
gtk_file_dialog_set_modal(dialog, TRUE);
693-
g_object_set_data(G_OBJECT(dialog), "nip4-parent", parent);
693+
g_object_set_data(G_OBJECT(dialog), "nip4-window", window);
694694
g_object_set_data(G_OBJECT(dialog), "nip4-filemodel", filemodel);
695695
g_object_set_data(G_OBJECT(dialog), "nip4-next", next);
696696
g_object_set_data(G_OBJECT(dialog), "nip4-error", error);
@@ -706,7 +706,7 @@ filemodel_saveas(GtkWindow *parent, Filemodel *filemodel,
706706
gtk_file_dialog_set_initial_file(dialog, file);
707707
}
708708

709-
gtk_file_dialog_save(dialog, parent, NULL,
709+
gtk_file_dialog_save(dialog, window, NULL,
710710
filemodel_saveas_sub, NULL);
711711
}
712712

@@ -715,7 +715,7 @@ filemodel_save_before_close_cb(GObject *source_object,
715715
GAsyncResult *result, void *data)
716716
{
717717
GtkAlertDialog *alert = GTK_ALERT_DIALOG(source_object);
718-
GtkWindow *parent = g_object_get_data(G_OBJECT(alert), "nip4-parent");
718+
GtkWindow *window = g_object_get_data(G_OBJECT(alert), "nip4-window");
719719
Filemodel *filemodel = g_object_get_data(G_OBJECT(alert), "nip4-filemodel");
720720
FilemodelSaveasResult next =
721721
g_object_get_data(G_OBJECT(alert), "nip4-next");
@@ -730,12 +730,12 @@ filemodel_save_before_close_cb(GObject *source_object,
730730
// close without saving ... tag as unmodified, and move on
731731
// "next" is responsible for doing the gtk_window_close()
732732
filemodel_set_modified(filemodel, FALSE);
733-
next(parent, filemodel, a, b);
733+
next(window, filemodel, a, b);
734734
break;
735735

736736
case 2:
737737
// save then move on
738-
filemodel_saveas(parent, filemodel, next, error, a, b);
738+
filemodel_saveas(window, filemodel, next, error, a, b);
739739
break;
740740

741741
default:
@@ -745,10 +745,10 @@ filemodel_save_before_close_cb(GObject *source_object,
745745
}
746746

747747
static void
748-
filemodel_save_before_close_error(GtkWindow *parent,
748+
filemodel_save_before_close_error(GtkWindow *window,
749749
Filemodel *filemodel, void *a, void *b)
750750
{
751-
Mainwindow *main = MAINWINDOW(parent);
751+
Mainwindow *main = MAINWINDOW(window);
752752

753753
mainwindow_error(main);
754754
}
@@ -757,7 +757,7 @@ void
757757
filemodel_save_before_close(Filemodel *filemodel,
758758
FilemodelSaveasResult next, void *a, void *b)
759759
{
760-
GtkWindow *parent = filemodel_get_window_hint(filemodel);
760+
GtkWindow *window = filemodel_get_window_hint(filemodel);
761761
const char *tname = IOBJECT_GET_CLASS_NAME(filemodel);
762762

763763
g_autofree char *message = g_strdup_printf("%s has been modified", tname);
@@ -778,15 +778,15 @@ filemodel_save_before_close(Filemodel *filemodel,
778778
gtk_alert_dialog_set_detail(alert, detail);
779779
gtk_alert_dialog_set_buttons(alert, labels);
780780
gtk_alert_dialog_set_modal(alert, TRUE);
781-
g_object_set_data(G_OBJECT(alert), "nip4-parent", parent);
781+
g_object_set_data(G_OBJECT(alert), "nip4-window", window);
782782
g_object_set_data(G_OBJECT(alert), "nip4-filemodel", filemodel);
783783
g_object_set_data(G_OBJECT(alert), "nip4-next", next);
784784
g_object_set_data(G_OBJECT(alert), "nip4-error",
785785
filemodel_save_before_close_error);
786786
g_object_set_data(G_OBJECT(alert), "nip4-a", a);
787787
g_object_set_data(G_OBJECT(alert), "nip4-b", b);
788788

789-
gtk_alert_dialog_choose(alert, parent, NULL,
789+
gtk_alert_dialog_choose(alert, window, NULL,
790790
filemodel_save_before_close_cb, NULL);
791791
}
792792

@@ -812,23 +812,23 @@ filemodel_close_registered_next_reply_idle(void *user_data)
812812
}
813813

814814
static void
815-
filemodel_close_registered_next(GtkWindow *parent,
815+
filemodel_close_registered_next(GtkWindow *window,
816816
Filemodel *filemodel, void *a, void *b);
817817

818818
static void
819-
filemodel_close_registered_next_reply(GtkWindow *parent,
819+
filemodel_close_registered_next_reply(GtkWindow *window,
820820
Filemodel *filemodel, void *a, void *b)
821821
{
822822
/* We can't close immediately, the alert is still being shown
823823
* and must detach. Close the window back in idle.
824824
*/
825-
g_idle_add(filemodel_close_registered_next_reply_idle, parent);
825+
g_idle_add(filemodel_close_registered_next_reply_idle, window);
826826

827827
filemodel_close_registered_next(NULL, NULL, a, b);
828828
}
829829

830830
static void
831-
filemodel_close_registered_next(GtkWindow *parent,
831+
filemodel_close_registered_next(GtkWindow *window,
832832
Filemodel *filemodel, void *a, void *b)
833833
{
834834
SListMapFn callback = (SListMapFn) a;

‎src/filemodel.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void filemodel_set_auto_load(Filemodel *filemodel);
124124
void filemodel_set_window_hint(Filemodel *filemodel, GtkWindow *window);
125125
GtkWindow *filemodel_get_window_hint(Filemodel *filemodel);
126126

127-
typedef void (*FilemodelSaveasResult)(GtkWindow *parent,
127+
typedef void (*FilemodelSaveasResult)(GtkWindow *window,
128128
Filemodel *filemodel, void *a, void *b);
129129
void filemodel_save_before_close(Filemodel *filemodel,
130130
FilemodelSaveasResult next, void *a, void *b);

‎src/graphicview.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@ graphicview_pressed(GtkGestureClick *gesture,
7575
}
7676
else {
7777
Model *model = MODEL(VOBJECT(graphicview)->iobject);
78+
GtkWindow *window =
79+
GTK_WINDOW(gtk_widget_get_root(GTK_WIDGET(graphicview)));
7880

79-
model_edit(GTK_WIDGET(graphicview), model);
81+
model_edit(model, window);
8082
}
8183
}
8284

‎src/gtkutil.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,18 +284,18 @@ alert_yesno_cb(GObject *source_object,
284284
GAsyncResult *result, gpointer user_data)
285285
{
286286
GtkAlertDialog *alert = GTK_ALERT_DIALOG(source_object);
287-
GtkWindow *parent = g_object_get_data(G_OBJECT(alert), "nip4-parent");
287+
GtkWindow *window = g_object_get_data(G_OBJECT(alert), "nip4-window");
288288
Yesno yesno = g_object_get_data(G_OBJECT(alert), "nip4-yesno");
289289
int choice = gtk_alert_dialog_choose_finish(alert, result, NULL);
290290

291291
if (choice == 1)
292-
yesno(parent, user_data);
292+
yesno(window, user_data);
293293
}
294294

295295
/* Ask before doing something.
296296
*/
297297
void
298-
alert_yesno(GtkWindow *parent, Yesno yesno, void *user_data,
298+
alert_yesno(GtkWindow *window, Yesno yesno, void *user_data,
299299
const char *message, const char *format, ...)
300300
{
301301
va_list ap;
@@ -311,9 +311,9 @@ alert_yesno(GtkWindow *parent, Yesno yesno, void *user_data,
311311
gtk_alert_dialog_set_detail(alert, buf);
312312
gtk_alert_dialog_set_buttons(alert, labels);
313313
gtk_alert_dialog_set_modal(alert, TRUE);
314-
g_object_set_data(G_OBJECT(alert), "nip4-parent", parent);
314+
g_object_set_data(G_OBJECT(alert), "nip4-window", window);
315315
g_object_set_data(G_OBJECT(alert), "nip4-yesno", yesno);
316-
gtk_alert_dialog_choose(alert, parent, NULL, alert_yesno_cb, user_data);
316+
gtk_alert_dialog_choose(alert, window, NULL, alert_yesno_cb, user_data);
317317
}
318318

319319
char *

‎src/gtkutil.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ int get_dpi(void);
8989
G_DEFINE_AUTOPTR_CLEANUP_FUNC(cairo_t, cairo_destroy)
9090
G_DEFINE_AUTOPTR_CLEANUP_FUNC(cairo_surface_t, cairo_surface_destroy)
9191

92-
typedef void (*Yesno)(GtkWindow *parent, void *user_data);
93-
void alert_yesno(GtkWindow *parent, Yesno yesno, void *user_data,
92+
typedef void (*Yesno)(GtkWindow *window, void *user_data);
93+
void alert_yesno(GtkWindow *window, Yesno yesno, void *user_data,
9494
const char *message, const char *format, ...);
9595

9696
char *text_view_get_text(GtkTextView *text);

0 commit comments

Comments
 (0)