Sun, 20 Jul 2025 22:04:39 +0200
update toolkit, adjust UI code
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | * Copyright 2017 Olaf Wintermann. All rights reserved. |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include <stdio.h> |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | #include <stdlib.h> |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | #include <string.h> |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | #include "../ui/window.h" |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
34 | #include "../ui/properties.h" |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | #include "../common/context.h" |
|
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
36 | #include "../common/menu.h" |
|
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
37 | #include "../common/toolbar.h" |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | |
|
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
39 | #include <cx/mempool.h> |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | #include "menu.h" |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | #include "toolbar.h" |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | #include "container.h" |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
44 | #include "headerbar.h" |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
45 | #include "button.h" |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | static int nwindows = 0; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | static int window_default_width = 650; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | static int window_default_height = 550; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | |
|
71
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
52 | static gboolean ui_window_destroy(void *data) { |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
53 | UiObject *obj = data; |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
54 | uic_object_destroy(obj); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | nwindows--; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | #ifdef UI_GTK2 |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | if(nwindows == 0) { |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | gtk_main_quit(); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | #endif |
|
71
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
62 | |
|
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
63 | return FALSE; |
|
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
64 | } |
|
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
65 | |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
66 | void ui_window_widget_destroy(UiObject *obj) { |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
67 | #if GTK_MAJOR_VERSION >= 4 |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
68 | gtk_window_destroy(GTK_WINDOW(obj->widget)); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
69 | #else |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
70 | gtk_widget_destroy(obj->widget); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
71 | #endif |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
72 | } |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
73 | |
|
71
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
74 | void ui_exit_event(GtkWidget *widget, gpointer data) { |
|
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
75 | // delay exit handler |
|
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
76 | g_idle_add(ui_window_destroy, data); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
79 | static gboolean ui_window_close_request(UiObject *obj) { |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
80 | uic_context_prepare_close(obj->ctx); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
81 | obj->ref--; |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
82 | if(obj->ref > 0) { |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
83 | #if GTK_CHECK_VERSION(2, 18, 0) |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
84 | gtk_widget_set_visible(obj->widget, FALSE); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
85 | #else |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
86 | gtk_widget_hide(obj->widget); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
87 | #endif |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
88 | return TRUE; |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
89 | } else { |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
90 | return FALSE; |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
91 | } |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
92 | } |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
93 | |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
94 | #if GTK_MAJOR_VERSION >= 4 |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
95 | static gboolean close_request(GtkWindow* self, UiObject *obj) { |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
96 | return ui_window_close_request(obj); |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
97 | } |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
98 | #else |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
99 | static gboolean close_request(GtkWidget* self, GdkEvent* event, UiObject *obj) { |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
100 | return ui_window_close_request(obj); |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
101 | } |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
102 | #endif |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
103 | |
| 100 | 104 | static UiObject* create_window(const char *title, void *window_data, UiBool sidebar, UiBool simple) { |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
105 | UiObject *obj = uic_object_new_toplevel(); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
106 | |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
107 | #ifdef UI_LIBADWAITA |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
108 | obj->widget = adw_application_window_new(ui_get_application()); |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
109 | #elif !defined(UI_GTK2) |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
110 | obj->widget = gtk_application_window_new(ui_get_application()); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
111 | #else |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
112 | obj->widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
113 | #endif |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
114 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
115 | obj->window = window_data; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
116 | |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
117 | #if GTK_CHECK_VERSION(4, 0, 0) |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
118 | obj->ctx->action_map = G_ACTION_MAP(obj->widget); |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
119 | #endif |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
120 | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
121 | if(title != NULL) { |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
122 | gtk_window_set_title(GTK_WINDOW(obj->widget), title); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
123 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
124 | |
|
98
16e84fac48bd
in the repo list, show the stored-user if no user is configured
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
125 | const char *width = ui_get_property("ui.window.width"); |
|
16e84fac48bd
in the repo list, show the stored-user if no user is configured
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
86
diff
changeset
|
126 | const char *height = ui_get_property("ui.window.height"); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
127 | if(width && height) { |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
128 | gtk_window_set_default_size( |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
129 | GTK_WINDOW(obj->widget), |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
130 | atoi(width), |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
131 | atoi(height)); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
132 | } else { |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
133 | gtk_window_set_default_size( |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
134 | GTK_WINDOW(obj->widget), |
| 100 | 135 | window_default_width + sidebar*250, |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
136 | window_default_height); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
137 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
138 | |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
139 | obj->destroy = ui_window_widget_destroy; |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
140 | g_signal_connect( |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
141 | obj->widget, |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
142 | "destroy", |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
143 | G_CALLBACK(ui_exit_event), |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
144 | obj); |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
145 | #if GTK_MAJOR_VERSION >= 4 |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
146 | g_signal_connect( |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
147 | obj->widget, |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
148 | "close-request", |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
149 | G_CALLBACK(close_request), |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
150 | obj); |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
151 | #else |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
152 | g_signal_connect( |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
153 | obj->widget, |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
154 | "delete-event", |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
155 | G_CALLBACK(close_request), |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
156 | obj); |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
157 | #endif |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
158 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | GtkWidget *vbox = ui_gtk_vbox_new(0); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
160 | #ifdef UI_LIBADWAITA |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
161 | GtkWidget *toolbar_view = adw_toolbar_view_new(); |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
162 | adw_toolbar_view_set_content(ADW_TOOLBAR_VIEW(toolbar_view), vbox); |
| 100 | 163 | |
| 164 | GtkWidget *content_box = ui_gtk_vbox_new(0); | |
| 165 | BOX_ADD_EXPAND(GTK_BOX(vbox), content_box); | |
| 166 | ||
|
102
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
167 | GtkWidget *sidebar_headerbar = NULL; |
| 100 | 168 | if(sidebar) { |
| 169 | GtkWidget *splitview = adw_overlay_split_view_new(); | |
| 170 | adw_application_window_set_content(ADW_APPLICATION_WINDOW(obj->widget), splitview); | |
| 171 | ||
| 172 | GtkWidget *sidebar_toolbar_view = adw_toolbar_view_new(); | |
| 173 | adw_overlay_split_view_set_sidebar(ADW_OVERLAY_SPLIT_VIEW(splitview), sidebar_toolbar_view); | |
|
102
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
174 | sidebar_headerbar = adw_header_bar_new(); |
| 100 | 175 | adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(sidebar_toolbar_view), sidebar_headerbar); |
| 176 | ||
| 177 | adw_overlay_split_view_set_content(ADW_OVERLAY_SPLIT_VIEW(splitview), toolbar_view); | |
| 178 | ||
| 179 | g_object_set_data(G_OBJECT(obj->widget), "ui_sidebar", sidebar_toolbar_view); | |
| 180 | } else { | |
| 181 | adw_application_window_set_content(ADW_APPLICATION_WINDOW(obj->widget), toolbar_view); | |
| 182 | } | |
| 183 | ||
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
184 | GtkWidget *headerbar = adw_header_bar_new(); |
|
102
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
185 | |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
186 | const char *show_title = ui_get_property("ui.gtk.window.showtitle"); |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
187 | if(show_title) { |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
188 | if(!strcmp(show_title, "main") && sidebar) { |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
189 | adw_header_bar_set_show_title(ADW_HEADER_BAR(sidebar_headerbar), FALSE); |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
190 | } else if(!strcmp(show_title, "sidebar")) { |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
191 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar), FALSE); |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
192 | } else if(!strcmp(show_title, "false")) { |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
193 | adw_header_bar_set_show_title(ADW_HEADER_BAR(sidebar_headerbar), FALSE); |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
194 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar), FALSE); |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
195 | } else { |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
196 | fprintf(stderr, "Unknown value '%s' for property ui.gtk.window.showtitle\n", show_title); |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
197 | adw_header_bar_set_show_title(ADW_HEADER_BAR(sidebar_headerbar), FALSE); |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
198 | } |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
199 | } else { |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
200 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar), FALSE); |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
201 | } |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
202 | |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
203 | adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(toolbar_view), headerbar); |
|
51
e324291ca9f8
add resource preview window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
204 | g_object_set_data(G_OBJECT(obj->widget), "ui_headerbar", headerbar); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
205 | |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
206 | if(!simple) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
207 | ui_fill_headerbar(obj, headerbar); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
208 | } |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
209 | #elif GTK_MAJOR_VERSION >= 4 |
| 100 | 210 | GtkWidget *content_box = ui_gtk_vbox_new(0); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
211 | WINDOW_SET_CONTENT(obj->widget, vbox); |
|
101
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
212 | if(!simple) { |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
213 | if(uic_get_menu_list()) { |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
214 | GtkWidget *mb = ui_create_menubar(obj); |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
215 | if(mb) { |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
216 | BOX_ADD(vbox, mb); |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
217 | } |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
218 | } |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
219 | } |
| 100 | 220 | if(sidebar) { |
| 221 | GtkWidget *paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); | |
| 222 | GtkWidget *sidebar_vbox = ui_gtk_vbox_new(0); | |
| 223 | gtk_paned_set_start_child(GTK_PANED(paned), sidebar_vbox); | |
| 224 | gtk_paned_set_end_child(GTK_PANED(paned), content_box); | |
| 225 | BOX_ADD_EXPAND(GTK_BOX(vbox), paned); | |
| 226 | g_object_set_data(G_OBJECT(obj->widget), "ui_sidebar", sidebar_vbox); | |
| 227 | } else { | |
| 228 | BOX_ADD_EXPAND(GTK_BOX(vbox), content_box); | |
| 229 | } | |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
230 | #else |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
231 | if(!simple) { |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
232 | // menu |
|
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
233 | if(uic_get_menu_list()) { |
|
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
234 | GtkWidget *mb = ui_create_menubar(obj); |
|
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
235 | if(mb) { |
|
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
236 | gtk_box_pack_start(GTK_BOX(vbox), mb, FALSE, FALSE, 0); |
|
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
237 | } |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
238 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
239 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
240 | // toolbar |
|
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
241 | if(uic_toolbar_isenabled()) { |
|
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
242 | GtkWidget *tb = ui_create_toolbar(obj); |
|
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
243 | if(tb) { |
|
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
244 | gtk_box_pack_start(GTK_BOX(vbox), tb, FALSE, FALSE, 0); |
|
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
245 | } |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
246 | } |
| 32 | 247 | |
| 248 | //GtkWidget *hb = ui_create_headerbar(obj); | |
| 249 | //gtk_window_set_titlebar(GTK_WINDOW(obj->widget), hb); | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
250 | } |
| 100 | 251 | |
| 252 | GtkWidget *content_box = ui_gtk_vbox_new(0); | |
| 253 | WINDOW_SET_CONTENT(obj->widget, vbox); | |
| 254 | if(sidebar) { | |
| 255 | GtkWidget *paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); | |
| 256 | GtkWidget *sidebar_vbox = ui_gtk_vbox_new(0); | |
| 257 | gtk_paned_add1(GTK_PANED(paned), sidebar_vbox); | |
| 258 | gtk_paned_add2(GTK_PANED(paned), content_box); | |
| 259 | BOX_ADD_EXPAND(GTK_BOX(vbox), paned); | |
| 260 | g_object_set_data(G_OBJECT(obj->widget), "ui_sidebar", sidebar_vbox); | |
| 261 | gtk_paned_set_position (GTK_PANED(paned), 200); | |
| 262 | } else { | |
| 263 | BOX_ADD_EXPAND(GTK_BOX(vbox), content_box); | |
| 264 | } | |
| 265 | ||
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
266 | #endif |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
267 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
268 | // window content |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
269 | // the content has a (TODO: not yet) configurable frame |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
270 | // TODO: really? why |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
271 | /* |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
272 | GtkWidget *frame = gtk_frame_new(NULL); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
273 | gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
274 | gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
275 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
276 | // content vbox |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
277 | GtkWidget *content_box = ui_gtk_vbox_new(0); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
278 | gtk_container_add(GTK_CONTAINER(frame), content_box); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
279 | obj->container = ui_box_container(obj, content_box); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
280 | */ |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
281 | obj->container = ui_box_container(obj, content_box, UI_CONTAINER_VBOX); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
282 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
283 | nwindows++; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
284 | return obj; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
285 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
286 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
287 | |
|
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
288 | UiObject* ui_window(const char *title, void *window_data) { |
| 100 | 289 | return create_window(title, window_data, FALSE, FALSE); |
| 290 | } | |
| 291 | ||
| 292 | UiObject *ui_sidebar_window(const char *title, void *window_data) { | |
| 293 | return create_window(title, window_data, TRUE, FALSE); | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
294 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
295 | |
| 32 | 296 | UiObject* ui_simple_window(const char *title, void *window_data) { |
| 100 | 297 | return create_window(title, window_data, FALSE, TRUE); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
298 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
299 | |
| 32 | 300 | void ui_window_size(UiObject *obj, int width, int height) { |
| 301 | gtk_window_set_default_size( | |
| 302 | GTK_WINDOW(obj->widget), | |
| 303 | width, | |
| 304 | height); | |
| 305 | } | |
| 306 | ||
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
307 | #ifdef UI_LIBADWAITA |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
308 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
309 | static void dialog_response(AdwAlertDialog *self, gchar *response, UiEventData *data) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
310 | UiEvent evt; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
311 | evt.obj = data->obj; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
312 | evt.document = evt.obj->ctx->document; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
313 | evt.window = evt.obj->window; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
314 | evt.eventdata = NULL; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
315 | evt.eventdatatype = 0; |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
316 | evt.eventdatatype = 0; |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
317 | evt.intval = 0; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
318 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
319 | if(!strcmp(response, "btn1")) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
320 | evt.intval = 1; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
321 | } else if(!strcmp(response, "btn2")) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
322 | evt.intval = 2; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
323 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
324 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
325 | if(data->customdata) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
326 | GtkWidget *entry = data->customdata; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
327 | evt.eventdata = (void*)ENTRY_GET_TEXT(GTK_ENTRY(entry)); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
328 | evt.eventdatatype = UI_EVENT_DATA_STRING; |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
329 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
330 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
331 | if(data->callback) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
332 | data->callback(&evt, data->userdata); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
333 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
334 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
335 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
336 | void ui_dialog_create(UiObject *parent, UiDialogArgs *args) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
337 | AdwDialog *dialog = adw_alert_dialog_new(args->title, args->content); |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
338 | UiEventData *event = malloc(sizeof(UiEventData)); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
339 | event->callback = args->result; |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
340 | event->userdata = args->resultdata; |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
341 | event->customdata = NULL; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
342 | event->customint = 0; |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
343 | event->value = 0; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
344 | event->obj = parent; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
345 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
346 | if(args->button1_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
347 | adw_alert_dialog_add_response(ADW_ALERT_DIALOG(dialog), "btn1", args->button1_label); |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
348 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
349 | if(args->button2_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
350 | adw_alert_dialog_add_response(ADW_ALERT_DIALOG(dialog), "btn2", args->button2_label); |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
351 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
352 | if(args->closebutton_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
353 | adw_alert_dialog_add_response(ADW_ALERT_DIALOG(dialog), "close", args->closebutton_label); |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
354 | adw_alert_dialog_set_close_response(ADW_ALERT_DIALOG(dialog), "close"); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
355 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
356 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
357 | GtkWidget *entry = NULL; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
358 | if(args->input || args->password) { |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
359 | entry = gtk_entry_new(); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
360 | if(args->password) { |
|
65
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
361 | gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); |
|
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
362 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
363 | if(args->input_value) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
364 | ENTRY_SET_TEXT(entry, args->input_value); |
|
65
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
365 | } |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
366 | adw_alert_dialog_set_extra_child(ADW_ALERT_DIALOG(dialog), entry); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
367 | event->customdata = entry; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
368 | event->customint = 0; |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
369 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
370 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
371 | g_signal_connect( |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
372 | dialog, |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
373 | "destroy", |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
374 | G_CALLBACK(ui_destroy_userdata), |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
375 | event); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
376 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
377 | g_signal_connect(dialog, "response", G_CALLBACK(dialog_response), event); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
378 | adw_dialog_present(dialog, parent->widget); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
379 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
380 | if(entry) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
381 | gtk_entry_grab_focus_without_selecting(GTK_ENTRY(entry)); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
382 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
383 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
384 | #else |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
385 | |
| 32 | 386 | static void ui_dialog_response (GtkDialog* self, gint response_id, gpointer user_data) { |
| 387 | UiEventData *data = user_data; | |
| 388 | UiEvent evt; | |
| 389 | evt.obj = data->obj; | |
| 390 | evt.document = evt.obj->ctx->document; | |
| 391 | evt.window = evt.obj->window; | |
| 392 | evt.eventdata = NULL; | |
| 393 | evt.intval = 0; | |
| 394 | ||
| 395 | if(data->customdata) { | |
| 396 | GtkWidget *entry = data->customdata; | |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
397 | evt.eventdata = (void*)ENTRY_GET_TEXT(GTK_ENTRY(entry)); |
| 32 | 398 | |
| 399 | } | |
| 400 | ||
| 401 | if(response_id == 1 || response_id == 2) { | |
| 402 | evt.intval = response_id; | |
| 403 | } | |
| 404 | ||
| 405 | ||
| 406 | if(data->callback) { | |
| 407 | data->callback(&evt, data->userdata); | |
| 408 | } | |
| 409 | ||
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
410 | WINDOW_DESTROY(GTK_WIDGET(self)); |
| 32 | 411 | } |
| 412 | ||
| 413 | void ui_dialog_create(UiObject *parent, UiDialogArgs args) { | |
| 414 | GtkDialog *dialog = GTK_DIALOG(gtk_dialog_new()); | |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
415 | gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent->widget)); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
416 | gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
417 | |
| 32 | 418 | GtkWidget *dialog_w = GTK_WIDGET(dialog); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
419 | if(args->title) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
420 | gtk_window_set_title(GTK_WINDOW(dialog), args->title); |
| 32 | 421 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
422 | if(args->button1_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
423 | gtk_dialog_add_button(dialog, args->button1_label, 1); |
| 32 | 424 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
425 | if(args->button2_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
426 | gtk_dialog_add_button(dialog, args->button2_label, 2); |
| 32 | 427 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
428 | if(args->closebutton_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
429 | gtk_dialog_add_button(dialog, args->closebutton_label, 0); |
| 32 | 430 | } |
| 431 | ||
| 432 | GtkWidget *content_area = gtk_dialog_get_content_area(dialog); | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
433 | if(args->content) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
434 | GtkWidget *label = gtk_label_new(args->content); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
435 | BOX_ADD(content_area, label); |
| 32 | 436 | } |
| 437 | ||
| 438 | GtkWidget *textfield = NULL; | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
439 | if(args->input || args->password) { |
| 32 | 440 | textfield = gtk_entry_new(); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
441 | if(args->password) { |
|
65
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
442 | gtk_entry_set_visibility(GTK_ENTRY(textfield), FALSE); |
|
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
443 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
444 | if(args->input_value) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
445 | ENTRY_SET_TEXT(textfield, args->input_value); |
|
65
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
446 | } |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
447 | BOX_ADD(content_area, textfield); |
| 32 | 448 | } |
| 449 | ||
| 450 | UiEventData *event = malloc(sizeof(UiEventData)); | |
| 451 | event->obj = parent; | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
452 | event->callback = args->result; |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
453 | event->userdata = args->resultdata; |
| 32 | 454 | event->value = 0; |
| 455 | event->customdata = textfield; | |
| 456 | ||
| 457 | g_signal_connect(dialog_w, | |
| 458 | "response", | |
| 459 | G_CALLBACK(ui_dialog_response), | |
| 460 | event); | |
| 461 | ||
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
462 | WINDOW_SHOW(GTK_WIDGET(dialog_w)); |
| 32 | 463 | } |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
464 | #endif |
| 32 | 465 | |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
466 | |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
467 | #if GTK_MAJOR_VERSION >= 3 |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
468 | UiFileList listmodel2filelist(GListModel *selection) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
469 | UiFileList flist; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
470 | flist.files = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
471 | flist.nfiles = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
472 | flist.nfiles = g_list_model_get_n_items(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
473 | flist.files = calloc(flist.nfiles, sizeof(char*)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
474 | for(int i=0;i<flist.nfiles;i++) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
475 | GFile *file = g_list_model_get_item(selection, i); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
476 | char *path = g_file_get_path(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
477 | flist.files[i] = path ? strdup(path) : NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
478 | g_object_unref(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
479 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
480 | return flist; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
481 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
482 | #endif |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
483 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
484 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
485 | #if GTK_CHECK_VERSION(4, 10, 0) |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
486 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
487 | #define UI_GTK_FILEDIALOG_OPEN 16 |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
488 | #define UI_GTK_FILEDIALOG_SAVE 32 |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
489 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
490 | static void filechooser_opened(GObject *source, GAsyncResult *result, void *data) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
491 | UiEventData *event = data; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
492 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
493 | GFile *file = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
494 | GListModel *selection = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
495 | GError *error = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
496 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
497 | int mode = event->value; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
498 | int multi = mode & UI_FILEDIALOG_SELECT_MULTI; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
499 | if((mode & UI_FILEDIALOG_SELECT_FOLDER) == UI_FILEDIALOG_SELECT_FOLDER) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
500 | if(multi) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
501 | selection = gtk_file_dialog_select_multiple_folders_finish(GTK_FILE_DIALOG(source), result, &error); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
502 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
503 | file = gtk_file_dialog_select_folder_finish(GTK_FILE_DIALOG(source), result, &error); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
504 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
505 | } else if((mode & UI_GTK_FILEDIALOG_OPEN) == UI_GTK_FILEDIALOG_OPEN) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
506 | if(multi) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
507 | selection = gtk_file_dialog_open_multiple_finish(GTK_FILE_DIALOG(source), result, &error); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
508 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
509 | file = gtk_file_dialog_open_finish(GTK_FILE_DIALOG(source), result, &error); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
510 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
511 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
512 | file = gtk_file_dialog_save_finish(GTK_FILE_DIALOG(source), result, &error); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
513 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
514 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
515 | UiEvent evt; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
516 | evt.obj = event->obj; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
517 | evt.document = evt.obj->ctx->document; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
518 | evt.window = evt.obj->window; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
519 | evt.intval = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
520 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
521 | UiFileList flist; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
522 | flist.files = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
523 | flist.nfiles = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
524 | evt.eventdata = &flist; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
525 | evt.eventdatatype = UI_EVENT_DATA_FILE_LIST; |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
526 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
527 | if(selection) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
528 | flist = listmodel2filelist(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
529 | g_object_unref(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
530 | } else if(file) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
531 | char *path = g_file_get_path(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
532 | if(path) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
533 | flist.nfiles = 1; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
534 | flist.files = calloc(flist.nfiles, sizeof(char*)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
535 | flist.files[0] = strdup(path); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
536 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
537 | g_object_unref(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
538 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
539 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
540 | if(event->callback) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
541 | event->callback(&evt, event->userdata); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
542 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
543 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
544 | for(int i=0;i<flist.nfiles;i++) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
545 | free(flist.files[i]); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
546 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
547 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
548 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
549 | static void ui_gtkfilechooser(UiObject *obj, GtkFileChooserAction action, unsigned int mode, const char *name, ui_callback file_selected_callback, void *cbdata) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
550 | if(action == GTK_FILE_CHOOSER_ACTION_OPEN) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
551 | mode |= UI_GTK_FILEDIALOG_OPEN; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
552 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
553 | mode |= UI_GTK_FILEDIALOG_SAVE; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
554 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
555 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
556 | UiEventData *event = malloc(sizeof(UiEventData)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
557 | event->callback = file_selected_callback; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
558 | event->userdata = cbdata; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
559 | event->customdata = NULL; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
560 | event->customint = 0; |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
561 | event->value = mode; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
562 | event->obj = obj; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
563 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
564 | GtkWindow *parent = GTK_WINDOW(gtk_widget_get_root(obj->widget)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
565 | GtkFileDialog *dialog = gtk_file_dialog_new(); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
566 | if(name) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
567 | gtk_file_dialog_set_initial_name(dialog, name); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
568 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
569 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
570 | int multi = mode & UI_FILEDIALOG_SELECT_MULTI; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
571 | if((mode & UI_FILEDIALOG_SELECT_FOLDER) == UI_FILEDIALOG_SELECT_FOLDER) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
572 | if(multi) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
573 | gtk_file_dialog_select_multiple_folders(dialog, parent, NULL, filechooser_opened, event); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
574 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
575 | gtk_file_dialog_select_folder(dialog, parent, NULL, filechooser_opened, event); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
576 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
577 | } else if(action == GTK_FILE_CHOOSER_ACTION_OPEN) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
578 | if(multi) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
579 | gtk_file_dialog_open_multiple(dialog, parent, NULL, filechooser_opened, event); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
580 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
581 | gtk_file_dialog_open(dialog, parent, NULL, filechooser_opened, event); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
582 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
583 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
584 | gtk_file_dialog_save(dialog, parent, NULL, filechooser_opened, event); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
585 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
586 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
587 | g_object_unref(dialog); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
588 | } |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
589 | #else |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
590 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
591 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
592 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
593 | static void filechooser_response(GtkDialog* self, gint response_id, UiEventData *data) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
594 | UiEvent evt; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
595 | evt.obj = data->obj; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
596 | evt.document = evt.obj->ctx->document; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
597 | evt.window = evt.obj->window; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
598 | evt.intval = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
599 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
600 | UiFileList flist; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
601 | flist.files = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
602 | flist.nfiles = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
603 | evt.eventdata = &flist; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
604 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
605 | if(response_id == GTK_RESPONSE_ACCEPT) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
606 | #if GTK_CHECK_VERSION(4, 0, 0) |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
607 | GListModel *selection = gtk_file_chooser_get_files(GTK_FILE_CHOOSER(self)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
608 | flist = flist = listmodel2filelist(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
609 | g_object_unref(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
610 | #else |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
611 | GSList *selection = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(self)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
612 | flist.nfiles = g_slist_length(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
613 | flist.files = calloc(flist.nfiles, sizeof(char*)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
614 | int i = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
615 | while(selection) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
616 | char *file = selection->data; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
617 | flist.files[i] = strdup(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
618 | g_free(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
619 | selection = selection->next; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
620 | i++; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
621 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
622 | g_slist_free(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
623 | #endif |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
624 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
625 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
626 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
627 | if(data->callback) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
628 | data->callback(&evt, data->userdata); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
629 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
630 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
631 | for(int i=0;i<flist.nfiles;i++) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
632 | free(flist.files[i]); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
633 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
634 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
635 | WINDOW_DESTROY(GTK_WIDGET(self)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
636 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
637 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
638 | static void ui_gtkfilechooser(UiObject *obj, GtkFileChooserAction action, unsigned int mode, const char *name, ui_callback file_selected_callback, void *cbdata) { |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
639 | char *button; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
640 | char *title; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
641 | |
| 32 | 642 | GtkWidget *dialog; |
| 643 | if((mode & UI_FILEDIALOG_SELECT_FOLDER) == UI_FILEDIALOG_SELECT_FOLDER) { | |
| 644 | dialog = gtk_file_chooser_dialog_new ( | |
| 645 | "Open Folder", | |
| 646 | GTK_WINDOW(obj->widget), | |
| 647 | GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, | |
| 648 | "Cancel", | |
| 649 | GTK_RESPONSE_CANCEL, | |
| 650 | "Select Folder", | |
| 651 | GTK_RESPONSE_ACCEPT, | |
| 652 | NULL); | |
| 653 | } else if(action == GTK_FILE_CHOOSER_ACTION_OPEN) { | |
| 654 | dialog = gtk_file_chooser_dialog_new ( | |
| 655 | "Select Folder", | |
| 656 | GTK_WINDOW(obj->widget), | |
| 657 | action, | |
| 658 | "Cancel", | |
| 659 | GTK_RESPONSE_CANCEL, | |
| 660 | "Open File", | |
| 661 | GTK_RESPONSE_ACCEPT, | |
| 662 | NULL); | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
663 | } else { |
| 32 | 664 | dialog = gtk_file_chooser_dialog_new ( |
| 665 | "Save File", | |
| 666 | GTK_WINDOW(obj->widget), | |
| 667 | action, | |
| 668 | "Cancel", | |
| 669 | GTK_RESPONSE_CANCEL, | |
| 670 | "Save File", | |
| 671 | GTK_RESPONSE_ACCEPT, | |
| 672 | NULL); | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
673 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
674 | |
| 32 | 675 | if((mode & UI_FILEDIALOG_SELECT_MULTI) == UI_FILEDIALOG_SELECT_MULTI) { |
| 676 | gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE); | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
677 | } |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
678 | |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
679 | UiEventData *event = malloc(sizeof(UiEventData)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
680 | event->obj = obj; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
681 | event->userdata = cbdata; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
682 | event->callback = file_selected_callback; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
683 | event->value = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
684 | event->customdata = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
685 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
686 | g_signal_connect( |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
687 | dialog, |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
688 | "response", |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
689 | G_CALLBACK(filechooser_response), |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
690 | event); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
691 | g_signal_connect( |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
692 | dialog, |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
693 | "destroy", |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
694 | G_CALLBACK(ui_destroy_userdata), |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
695 | event); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
696 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
697 | |
| 32 | 698 | UiEvent evt; |
| 699 | evt.obj = obj; | |
| 700 | evt.document = evt.obj->ctx->document; | |
| 701 | evt.window = evt.obj->window; | |
| 702 | evt.intval = 0; | |
| 703 | ||
| 704 | UiFileList flist; | |
| 705 | flist.files = NULL; | |
| 706 | flist.nfiles = 0; | |
| 707 | evt.eventdata = &flist; | |
| 708 | ||
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
709 | gtk_widget_show(dialog); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
710 | } |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
711 | #endif |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
712 | |
| 32 | 713 | void ui_openfiledialog(UiObject *obj, unsigned int mode, ui_callback file_selected_callback, void *cbdata) { |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
714 | ui_gtkfilechooser(obj, GTK_FILE_CHOOSER_ACTION_OPEN, mode, NULL, file_selected_callback, cbdata); |
| 32 | 715 | } |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
716 | |
| 32 | 717 | void ui_savefiledialog(UiObject *obj, const char *name, ui_callback file_selected_callback, void *cbdata) { |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
718 | ui_gtkfilechooser(obj, GTK_FILE_CHOOSER_ACTION_SAVE, 0, name, file_selected_callback, cbdata); |
| 32 | 719 | } |
| 720 | ||
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
721 | #if GTK_CHECK_VERSION(4, 10, 0) |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
722 | #define DIALOG_NEW() gtk_window_new() |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
723 | #else |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
724 | #define DIALOG_NEW() gtk_dialog_new() |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
725 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
726 | static void ui_dialogwindow_response(GtkDialog* self, gint response_id, gpointer user_data) { |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
727 | UiEventData *event = user_data; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
728 | // TODO: do we need to check if response_id == GTK_RESPONSE_DELETE_EVENT? |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
729 | if(event->callback) { |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
730 | UiEvent e; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
731 | e.obj = event->obj; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
732 | e.window = event->obj->window; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
733 | e.document = event->obj->ctx->document; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
734 | e.eventdata = NULL; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
735 | e.intval = event->value; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
736 | event->callback(&e, event->userdata); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
737 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
738 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
739 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
740 | #endif |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
741 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
742 | #if GTK_CHECK_VERSION(4, 0, 0) |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
743 | #define HEADERBAR_SHOW_CLOSEBUTTON(headerbar, set) gtk_header_bar_set_show_title_buttons(GTK_HEADER_BAR(headerbar), set) |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
744 | #define DEFAULT_BUTTON(window, button) gtk_window_set_default_widget(GTK_WINDOW(window), button) |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
745 | #else |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
746 | #define HEADERBAR_SHOW_CLOSEBUTTON(headerbar, set) gtk_header_bar_set_show_close_button(GTK_HEADER_BAR(headerbar), set) |
|
72
d5307e9ee384
implement key management UI
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
747 | #define DEFAULT_BUTTON(window, button) gtk_widget_set_can_default(button, TRUE); gtk_window_set_default(GTK_WINDOW(window), button) |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
748 | #endif |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
749 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
750 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
751 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
752 | UiObject* ui_dialog_window_create(UiObject *parent, UiDialogWindowArgs *args) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
753 | GtkWidget *dialog = DIALOG_NEW(); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
754 | if(args->width > 0 || args->height > 0) { |
|
72
d5307e9ee384
implement key management UI
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
755 | gtk_window_set_default_size( |
|
d5307e9ee384
implement key management UI
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
756 | GTK_WINDOW(dialog), |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
757 | args->width, |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
758 | args->height); |
|
72
d5307e9ee384
implement key management UI
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
759 | } |
|
d5307e9ee384
implement key management UI
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
760 | |
|
d5307e9ee384
implement key management UI
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
761 | |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
762 | gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent->widget)); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
763 | if(args->modal != UI_OFF) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
764 | gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
765 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
766 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
767 | UiObject *obj = uic_object_new_toplevel(); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
768 | obj->widget = dialog; |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
769 | obj->ref = 0; |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
770 | obj->destroy = ui_window_widget_destroy; |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
771 | nwindows++; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
772 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
773 | if(args->title != NULL) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
774 | gtk_window_set_title(GTK_WINDOW(dialog), args->title); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
775 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
776 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
777 | #if ! GTK_CHECK_VERSION(4, 10, 0) |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
778 | UiEventData *event = malloc(sizeof(UiEventData)); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
779 | event->obj = obj; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
780 | event->userdata = args->onclickdata; |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
781 | event->callback = args->onclick; |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
782 | event->value = 0; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
783 | event->customdata = NULL; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
784 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
785 | g_signal_connect(dialog, "response", G_CALLBACK(ui_dialogwindow_response), event); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
786 | g_signal_connect( |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
787 | dialog, |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
788 | "destroy", |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
789 | G_CALLBACK(ui_destroy_userdata), |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
790 | event); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
791 | #endif |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
792 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
793 | g_signal_connect( |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
794 | dialog, |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
795 | "destroy", |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
796 | G_CALLBACK(ui_exit_event), |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
797 | obj); |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
798 | #if GTK_MAJOR_VERSION >= 4 |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
799 | g_signal_connect( |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
800 | obj->widget, |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
801 | "close-request", |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
802 | G_CALLBACK(close_request), |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
803 | obj); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
804 | #else |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
805 | g_signal_connect( |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
806 | obj->widget, |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
807 | "delete-event", |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
808 | G_CALLBACK(close_request), |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
809 | obj); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
810 | #endif |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
811 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
812 | #if GTK_MAJOR_VERSION < 4 |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
813 | GtkWidget *c = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
814 | gtk_container_remove(GTK_CONTAINER(dialog), c); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
815 | #endif |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
816 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
817 | GtkWidget *content_vbox = ui_gtk_vbox_new(0); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
818 | obj->container = ui_box_container(obj, content_vbox, UI_CONTAINER_VBOX); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
819 | if(args->lbutton1 || args->lbutton2 || args->rbutton3 || args->rbutton4) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
820 | #if GTK_CHECK_VERSION(3, 10, 0) |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
821 | if(args->titlebar_buttons != UI_OFF) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
822 | GtkWidget *headerbar = gtk_header_bar_new(); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
823 | gtk_window_set_titlebar(GTK_WINDOW(dialog), headerbar); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
824 | if(args->show_closebutton == UI_OFF) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
825 | HEADERBAR_SHOW_CLOSEBUTTON(headerbar, FALSE); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
826 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
827 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
828 | if(args->lbutton1) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
829 | GtkWidget *button = ui_create_button(obj, args->lbutton1, NULL, args->onclick, args->onclickdata, 1, args->default_button == 1); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
830 | gtk_header_bar_pack_start(GTK_HEADER_BAR(headerbar), button); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
831 | if(args->default_button == 1) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
832 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
833 | DEFAULT_BUTTON(dialog, button); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
834 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
835 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
836 | if(args->lbutton2) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
837 | GtkWidget *button = ui_create_button(obj, args->lbutton2, NULL, args->onclick, args->onclickdata, 2, args->default_button == 2); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
838 | gtk_header_bar_pack_start(GTK_HEADER_BAR(headerbar), button); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
839 | if(args->default_button == 2) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
840 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
841 | DEFAULT_BUTTON(dialog, button); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
842 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
843 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
844 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
845 | if(args->rbutton4) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
846 | GtkWidget *button = ui_create_button(obj, args->rbutton4, NULL, args->onclick, args->onclickdata, 4, args->default_button == 4); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
847 | gtk_header_bar_pack_end(GTK_HEADER_BAR(headerbar), button); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
848 | if(args->default_button == 4) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
849 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
850 | DEFAULT_BUTTON(dialog, button); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
851 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
852 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
853 | if(args->rbutton3) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
854 | GtkWidget *button = ui_create_button(obj, args->rbutton3, NULL, args->onclick, args->onclickdata, 3, args->default_button == 3); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
855 | gtk_header_bar_pack_end(GTK_HEADER_BAR(headerbar), button); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
856 | if(args->default_button == 3) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
857 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
858 | DEFAULT_BUTTON(dialog, button); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
859 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
860 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
861 | WINDOW_SET_CONTENT(obj->widget, content_vbox); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
862 | return obj; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
863 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
864 | #endif |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
865 | GtkWidget *vbox = ui_gtk_vbox_new(0); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
866 | WINDOW_SET_CONTENT(obj->widget, vbox); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
867 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
868 | GtkWidget *separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
869 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
870 | GtkWidget *grid = ui_create_grid_widget(10, 10); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
871 | GtkWidget *widget = ui_box_set_margin(grid, 16); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
872 | gtk_grid_set_column_homogeneous(GTK_GRID(grid), TRUE); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
873 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
874 | if(args->lbutton1) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
875 | GtkWidget *button = ui_create_button(obj, args->lbutton1, NULL, args->onclick, args->onclickdata, 1, args->default_button == 1); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
876 | gtk_grid_attach(GTK_GRID(grid), button, 0, 0, 1, 1); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
877 | if(args->default_button == 1) { |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
878 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
879 | DEFAULT_BUTTON(dialog, button); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
880 | } |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
881 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
882 | if(args->lbutton2) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
883 | GtkWidget *button = ui_create_button(obj, args->lbutton2, NULL, args->onclick, args->onclickdata, 2, args->default_button == 2); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
884 | gtk_grid_attach(GTK_GRID(grid), button, 1, 0, 1, 1); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
885 | if(args->default_button == 2) { |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
886 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
887 | DEFAULT_BUTTON(dialog, button); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
888 | } |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
889 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
890 | GtkWidget *space = gtk_label_new(NULL); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
891 | gtk_widget_set_hexpand(space, TRUE); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
892 | gtk_grid_attach(GTK_GRID(grid), space, 2, 0, 1, 1); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
893 | if(args->rbutton3) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
894 | GtkWidget *button = ui_create_button(obj, args->rbutton3, NULL, args->onclick, args->onclickdata, 3, args->default_button == 3); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
895 | gtk_grid_attach(GTK_GRID(grid), button, 3, 0, 1, 1); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
896 | if(args->default_button == 3) { |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
897 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
898 | DEFAULT_BUTTON(dialog, button); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
899 | } |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
900 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
901 | if(args->rbutton4) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
902 | GtkWidget *button = ui_create_button(obj, args->rbutton4, NULL, args->onclick, args->onclickdata, 4, args->default_button == 4); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
903 | gtk_grid_attach(GTK_GRID(grid), button, 4, 0, 1, 1); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
904 | if(args->default_button == 4) { |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
905 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
906 | DEFAULT_BUTTON(dialog, button); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
907 | } |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
908 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
909 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
910 | BOX_ADD_EXPAND(vbox, content_vbox); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
911 | BOX_ADD_NO_EXPAND(vbox, separator); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
912 | BOX_ADD_NO_EXPAND(vbox, widget); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
913 | } else { |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
914 | WINDOW_SET_CONTENT(obj->widget, content_vbox); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
915 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
916 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
917 | return obj; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
918 | } |