Sat, 27 Dec 2025 22:47:56 +0100
update toolkit, ucx
|
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" |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
38 | #include "../common/utils.h" |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | |
|
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
40 | #include <cx/mempool.h> |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | #include "menu.h" |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | #include "toolbar.h" |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | #include "container.h" |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
45 | #include "headerbar.h" |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
46 | #include "button.h" |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | static int nwindows = 0; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | static int window_default_width = 650; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | static int window_default_height = 550; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
53 | static int splitview_window_default_pos = -1; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
54 | static UiBool splitview_window_use_prop = TRUE; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
55 | |
|
71
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
56 | static gboolean ui_window_destroy(void *data) { |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | UiObject *obj = data; |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
58 | uic_object_destroy(obj); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | nwindows--; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | #ifdef UI_GTK2 |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | if(nwindows == 0) { |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
63 | gtk_main_quit(); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | #endif |
|
71
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
66 | |
|
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
67 | return FALSE; |
|
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
68 | } |
|
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
69 | |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
70 | void ui_window_widget_destroy(UiObject *obj) { |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
71 | #if GTK_MAJOR_VERSION >= 4 |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
72 | gtk_window_destroy(GTK_WINDOW(obj->widget)); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
73 | #else |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
74 | gtk_widget_destroy(obj->widget); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
75 | #endif |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
76 | } |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
77 | |
|
71
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
78 | 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
|
79 | // delay exit handler |
|
9e19ac687b9f
fix crash when closing the preferences window (GTK3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
80 | g_idle_add(ui_window_destroy, data); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
83 | static gboolean ui_window_close_request(UiObject *obj) { |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
84 | if(obj->widget) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
85 | void *appwindow = g_object_get_data(G_OBJECT(obj->widget), "ui.appwindow"); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
86 | if(appwindow) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
87 | int width = 0; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
88 | int height = 0; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
89 | #if GTK_CHECK_VERSION(4, 10, 0) |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
90 | graphene_rect_t bounds; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
91 | if(gtk_widget_compute_bounds(obj->widget, obj->widget, &bounds)) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
92 | width = bounds.size.width; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
93 | height = bounds.size.height; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
94 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
95 | #elif GTK_CHECK_VERSION(4, 0, 0) |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
96 | GtkAllocation alloc; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
97 | gtk_widget_get_allocation(GTK_WIDGET(obj->widget), &alloc); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
98 | width = alloc.width; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
99 | height = alloc.height; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
100 | #else |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
101 | gtk_window_get_size(GTK_WINDOW(obj->widget), &width, &height); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
102 | #endif |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
103 | if(width > 0 && height > 0) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
104 | char width_str[32]; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
105 | char height_str[32]; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
106 | snprintf(width_str, 32, "%d", width); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
107 | snprintf(height_str, 32, "%d", height); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
108 | ui_set_property("ui.window.width", width_str); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
109 | ui_set_property("ui.window.height", height_str); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
110 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
111 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
112 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
113 | |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
114 | uic_context_prepare_close(obj->ctx); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
115 | obj->ref--; |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
116 | if(obj->ref > 0) { |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
117 | #if GTK_CHECK_VERSION(2, 18, 0) |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
118 | gtk_widget_set_visible(obj->widget, FALSE); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
119 | #else |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
120 | gtk_widget_hide(obj->widget); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
121 | #endif |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
122 | return TRUE; |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
123 | } else { |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
124 | return FALSE; |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
125 | } |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
126 | } |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
127 | |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
128 | #if GTK_MAJOR_VERSION >= 4 |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
129 | 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
|
130 | return ui_window_close_request(obj); |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
131 | } |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
132 | #else |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
133 | 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
|
134 | return ui_window_close_request(obj); |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
135 | } |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
136 | #endif |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
137 | |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
138 | static void save_window_splitview_pos(GtkWidget *widget, void *unused) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
139 | int pos = gtk_paned_get_position(GTK_PANED(widget)); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
140 | char buf[32]; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
141 | snprintf(buf, 32, "%d", pos); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
142 | ui_set_property("ui.window.splitview.pos", buf); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
143 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
144 | |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
145 | static UiObject* create_window(const char *title, UiBool sidebar, UiBool splitview, UiBool simple) { |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
146 | UiObject *obj = uic_object_new_toplevel(); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
147 | |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
148 | #ifdef UI_LIBADWAITA |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
149 | obj->widget = adw_application_window_new(ui_get_application()); |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
150 | #elif !defined(UI_GTK2) |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
151 | obj->widget = gtk_application_window_new(ui_get_application()); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
152 | #else |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
153 | obj->widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
154 | #endif |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
155 | |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
156 | #if GTK_CHECK_VERSION(4, 0, 0) |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
157 | obj->ctx->action_map = G_ACTION_MAP(obj->widget); |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
158 | #endif |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
159 | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
160 | if(title != NULL) { |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
161 | gtk_window_set_title(GTK_WINDOW(obj->widget), title); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
162 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
163 | |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
164 | if(!simple) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
165 | g_object_set_data(G_OBJECT(obj->widget), "ui.appwindow", obj); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
166 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
167 | |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
168 | int window_width = window_default_width; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
169 | int window_height = window_default_height; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
170 | if(!simple) { |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
171 | ui_get_window_default_width(&window_width, &window_height); |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
172 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
173 | gtk_window_set_default_size( |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
174 | GTK_WINDOW(obj->widget), |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
175 | window_width, |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
176 | window_height); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
177 | |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
178 | obj->destroy = ui_window_widget_destroy; |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
179 | g_signal_connect( |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
180 | obj->widget, |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
181 | "destroy", |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
182 | G_CALLBACK(ui_exit_event), |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
183 | obj); |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
184 | #if GTK_MAJOR_VERSION >= 4 |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
185 | g_signal_connect( |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
186 | obj->widget, |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
187 | "close-request", |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
188 | G_CALLBACK(close_request), |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
189 | obj); |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
190 | #else |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
191 | g_signal_connect( |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
192 | obj->widget, |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
193 | "delete-event", |
|
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
194 | G_CALLBACK(close_request), |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
195 | obj); |
|
69
d8991e166f2a
add toolkit window close fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
196 | #endif |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
197 | |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
198 | int splitview_pos = 0; |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
199 | if(splitview) { |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
200 | const char *splitview_pos_str = ui_get_property("ui.window.splitview.pos"); |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
201 | splitview_pos= splitview_window_default_pos; |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
202 | if(splitview_pos < 0) { |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
203 | splitview_pos = window_width / 2; |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
204 | } |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
205 | if(splitview_pos_str && splitview_window_use_prop) { |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
206 | int sv_pos = atoi(splitview_pos_str); |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
207 | if(sv_pos > 0) { |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
208 | splitview_pos = sv_pos; |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
209 | } |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
210 | } |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
211 | } |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
212 | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
213 | GtkWidget *vbox = ui_gtk_vbox_new(0); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
214 | #ifdef UI_LIBADWAITA |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
215 | GtkWidget *toolbar_view = adw_toolbar_view_new(); |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
216 | adw_toolbar_view_set_content(ADW_TOOLBAR_VIEW(toolbar_view), vbox); |
| 100 | 217 | |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
218 | GtkWidget *headerbar_sidebar = NULL; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
219 | GtkWidget *headerbar_main = adw_header_bar_new(); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
220 | GtkWidget *headerbar_right = NULL; |
| 100 | 221 | |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
222 | GtkWidget *content = toolbar_view; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
223 | if(splitview) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
224 | content = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
225 | g_signal_connect( |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
226 | content, |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
227 | "destroy", |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
228 | G_CALLBACK(save_window_splitview_pos), |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
229 | NULL); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
230 | |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
231 | gtk_paned_set_position(GTK_PANED(content), splitview_pos); |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
232 | |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
233 | GtkWidget *right_panel = adw_toolbar_view_new(); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
234 | GtkWidget *right_vbox = ui_gtk_vbox_new(0); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
235 | adw_toolbar_view_set_content(ADW_TOOLBAR_VIEW(right_panel), right_vbox); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
236 | |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
237 | headerbar_right = adw_header_bar_new(); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
238 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_right), FALSE); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
239 | adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(right_panel), headerbar_right); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
240 | |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
241 | adw_header_bar_set_show_end_title_buttons(ADW_HEADER_BAR(headerbar_main), FALSE); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
242 | |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
243 | gtk_paned_set_start_child(GTK_PANED(content), toolbar_view); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
244 | gtk_paned_set_end_child(GTK_PANED(content), right_panel); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
245 | |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
246 | g_object_set_data(G_OBJECT(obj->widget), "ui_window_splitview", content); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
247 | g_object_set_data(G_OBJECT(obj->widget), "ui_left_panel", vbox); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
248 | g_object_set_data(G_OBJECT(obj->widget), "ui_right_panel", right_vbox); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
249 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
250 | |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
251 | GtkWidget *content_box = vbox; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
252 | |
| 100 | 253 | if(sidebar) { |
| 254 | GtkWidget *splitview = adw_overlay_split_view_new(); | |
| 255 | adw_application_window_set_content(ADW_APPLICATION_WINDOW(obj->widget), splitview); | |
| 256 | ||
| 257 | GtkWidget *sidebar_toolbar_view = adw_toolbar_view_new(); | |
| 258 | adw_overlay_split_view_set_sidebar(ADW_OVERLAY_SPLIT_VIEW(splitview), sidebar_toolbar_view); | |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
259 | headerbar_sidebar = adw_header_bar_new(); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
260 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), FALSE); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
261 | adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(sidebar_toolbar_view), headerbar_sidebar); |
| 100 | 262 | |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
263 | adw_overlay_split_view_set_content(ADW_OVERLAY_SPLIT_VIEW(splitview), content); |
| 100 | 264 | |
| 265 | g_object_set_data(G_OBJECT(obj->widget), "ui_sidebar", sidebar_toolbar_view); | |
| 266 | } else { | |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
267 | adw_application_window_set_content(ADW_APPLICATION_WINDOW(obj->widget), content); |
| 100 | 268 | } |
| 269 | ||
|
102
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
270 | 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
|
271 | if(show_title) { |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
272 | if(!strcmp(show_title, "main") && sidebar) { |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
273 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), FALSE); |
|
102
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
274 | } else if(!strcmp(show_title, "sidebar")) { |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
275 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_main), FALSE); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
276 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), TRUE); |
|
102
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
277 | } else if(!strcmp(show_title, "false")) { |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
278 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), FALSE); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
279 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_main), FALSE); |
|
102
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
280 | } else { |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
281 | fprintf(stderr, "Unknown value '%s' for property ui.gtk.window.showtitle\n", show_title); |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
282 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), FALSE); |
|
102
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
283 | } |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
284 | } else { |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
285 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_main), FALSE); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
286 | if(sidebar) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
287 | adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), TRUE); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
288 | } |
|
102
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
289 | } |
|
64ded9f6a6c6
update libs (ucx, toolkit, libidav)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
290 | |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
291 | adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(toolbar_view), headerbar_main); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
292 | g_object_set_data(G_OBJECT(obj->widget), "ui_headerbar", headerbar_main); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
293 | |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
294 | if(!simple) { |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
295 | ui_fill_headerbar(obj, headerbar_sidebar, headerbar_main, headerbar_right); |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
296 | } |
|
117
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
297 | #else |
|
101
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
298 | if(!simple) { |
|
117
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
299 | // menu |
|
101
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
300 | if(uic_get_menu_list()) { |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
301 | GtkWidget *mb = ui_create_menubar(obj); |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
302 | if(mb) { |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
303 | BOX_ADD(vbox, mb); |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
304 | } |
|
7b3a3130be44
update ucx, toolkit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
305 | } |
|
117
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
306 | |
|
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
307 | // toolbar |
|
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
308 | #if GTK_MAJOR_VERSION >= 4 |
|
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
309 | // TODO: gtk4 toolbar |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
310 | #else |
|
117
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
311 | if(uic_toolbar_isenabled()) { |
|
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
312 | GtkWidget *tb = ui_create_toolbar(obj, sidebar); |
|
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
313 | if(tb) { |
|
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
314 | BOX_ADD(vbox, tb); |
|
29
3fc287f06305
add minimal working download
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
315 | } |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
316 | } |
|
117
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
317 | #endif |
| 32 | 318 | //GtkWidget *hb = ui_create_headerbar(obj); |
| 319 | //gtk_window_set_titlebar(GTK_WINDOW(obj->widget), hb); | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
320 | } |
| 100 | 321 | |
| 322 | GtkWidget *content_box = ui_gtk_vbox_new(0); | |
| 323 | WINDOW_SET_CONTENT(obj->widget, vbox); | |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
324 | if(sidebar || splitview) { |
| 100 | 325 | GtkWidget *paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
326 | if(sidebar) { |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
327 | GtkWidget *sidebar_vbox = ui_gtk_vbox_new(0); |
|
117
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
328 | PANED_SET_CHILD1(paned, sidebar_vbox); |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
329 | g_object_set_data(G_OBJECT(obj->widget), "ui_sidebar", sidebar_vbox); |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
330 | gtk_paned_set_position(GTK_PANED(paned), 200); |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
331 | } |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
332 | |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
333 | if(splitview) { |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
334 | GtkWidget *content_paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
335 | gtk_paned_set_position(GTK_PANED(content_paned), splitview_pos); |
|
117
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
336 | PANED_SET_CHILD2(paned, content_paned); |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
337 | |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
338 | GtkWidget *right_content_box = ui_gtk_vbox_new(0); |
|
117
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
339 | PANED_SET_CHILD1(content_paned, content_box); |
|
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
340 | PANED_SET_CHILD2(content_paned, right_content_box); |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
341 | |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
342 | g_object_set_data(G_OBJECT(obj->widget), "ui_window_splitview", content_paned); |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
343 | g_object_set_data(G_OBJECT(obj->widget), "ui_left_panel", content_box); |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
344 | g_object_set_data(G_OBJECT(obj->widget), "ui_right_panel", right_content_box); |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
345 | } else { |
|
117
b174e721663e
update toolkit, ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
346 | PANED_SET_CHILD2(paned, content_box); |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
347 | } |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
348 | |
| 100 | 349 | BOX_ADD_EXPAND(GTK_BOX(vbox), paned); |
| 350 | } else { | |
| 351 | BOX_ADD_EXPAND(GTK_BOX(vbox), content_box); | |
| 352 | } | |
| 353 | ||
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
354 | #endif |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
355 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
356 | // window content |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
357 | // 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
|
358 | // TODO: really? why |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
359 | /* |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
360 | GtkWidget *frame = gtk_frame_new(NULL); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
361 | 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
|
362 | 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
|
363 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
364 | // content vbox |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
365 | GtkWidget *content_box = ui_gtk_vbox_new(0); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
366 | gtk_container_add(GTK_CONTAINER(frame), content_box); |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
367 | obj->container = ui_box_container(obj, content_box); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
368 | */ |
| 112 | 369 | UiContainerX *container = ui_box_container(obj, content_box, UI_CONTAINER_VBOX); |
| 370 | uic_object_push_container(obj, container); | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
371 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
372 | nwindows++; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
373 | return obj; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
374 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
375 | |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
376 | |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
377 | UiObject* ui_window(const char *title) { |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
378 | return create_window(title, FALSE, FALSE, FALSE); |
| 100 | 379 | } |
| 380 | ||
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
381 | UiObject *ui_sidebar_window(const char *title) { |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
382 | return create_window(title, TRUE, FALSE, FALSE); |
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
383 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
384 | |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
385 | UiObject *ui_splitview_window(const char *title, UiBool sidebar) { |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
386 | return create_window(title, sidebar, TRUE, FALSE); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
387 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
388 | |
|
115
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
389 | UiObject* ui_simple_window(const char *title) { |
|
e57ca2747782
fix build with newest toolkit version
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
390 | return create_window(title, FALSE, FALSE, TRUE); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
391 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
392 | |
| 32 | 393 | void ui_window_size(UiObject *obj, int width, int height) { |
| 394 | gtk_window_set_default_size( | |
| 395 | GTK_WINDOW(obj->widget), | |
| 396 | width, | |
| 397 | height); | |
| 398 | } | |
| 399 | ||
|
110
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
400 | void ui_window_default_size(int width, int height) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
401 | window_default_width = width; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
402 | window_default_height = height; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
403 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
404 | |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
405 | void ui_splitview_window_set_pos(UiObject *obj, int pos) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
406 | GtkWidget *splitview = g_object_get_data(G_OBJECT(obj->widget), "ui_window_splitview"); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
407 | if(splitview) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
408 | gtk_paned_set_position(GTK_PANED(splitview), pos); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
409 | } else { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
410 | fprintf(stderr, "Error: window has no splitview\n"); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
411 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
412 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
413 | |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
414 | int ui_splitview_window_get_pos(UiObject *obj) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
415 | GtkWidget *splitview = g_object_get_data(G_OBJECT(obj->widget), "ui_window_splitview"); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
416 | if(splitview) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
417 | return gtk_paned_get_position(GTK_PANED(splitview)); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
418 | } else { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
419 | fprintf(stderr, "Error: window has no splitview\n"); |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
420 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
421 | return 0; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
422 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
423 | |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
424 | void ui_splitview_window_set_default_pos(int pos) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
425 | splitview_window_default_pos = pos; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
426 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
427 | |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
428 | void ui_splitview_window_use_property(UiBool enable) { |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
429 | splitview_window_use_prop = enable; |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
430 | } |
|
c00e968d018b
fix repolist menu button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
431 | |
| 112 | 432 | UIEXPORT void ui_splitview_window_set_visible(UiObject *obj, int pane, UiBool visible) { |
| 433 | GtkWidget *panel = NULL; | |
| 434 | if(pane == 0) { | |
| 435 | panel = g_object_get_data(G_OBJECT(obj->widget), "ui_left_panel"); | |
| 436 | } else if(pane == 1) { | |
| 437 | panel = g_object_get_data(G_OBJECT(obj->widget), "ui_right_panel"); | |
| 438 | } | |
| 439 | ||
| 440 | if(panel == NULL) { | |
| 441 | fprintf(stderr, "Error: obj is not a splitview window or invalid pane %d specified\n", pane); | |
| 442 | return; | |
| 443 | } | |
| 444 | ||
| 445 | gtk_widget_set_visible(panel, visible); | |
| 446 | } | |
| 447 | ||
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
448 | #ifdef UI_LIBADWAITA |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
449 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
450 | static void dialog_response(AdwAlertDialog *self, gchar *response, UiEventData *data) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
451 | UiEvent evt; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
452 | evt.obj = data->obj; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
453 | evt.document = evt.obj->ctx->document; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
454 | evt.window = evt.obj->window; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
455 | evt.eventdata = NULL; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
456 | evt.eventdatatype = 0; |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
457 | evt.intval = 0; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
458 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
459 | if(!strcmp(response, "btn1")) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
460 | evt.intval = 1; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
461 | } else if(!strcmp(response, "btn2")) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
462 | evt.intval = 2; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
463 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
464 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
465 | if(data->customdata) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
466 | GtkWidget *entry = data->customdata; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
467 | 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
|
468 | evt.eventdatatype = UI_EVENT_DATA_STRING; |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
469 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
470 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
471 | if(data->callback) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
472 | data->callback(&evt, data->userdata); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
473 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
474 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
475 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
476 | void ui_dialog_create(UiObject *parent, UiDialogArgs *args) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
477 | 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
|
478 | UiEventData *event = malloc(sizeof(UiEventData)); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
479 | event->callback = args->result; |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
480 | event->userdata = args->resultdata; |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
481 | event->customdata = NULL; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
482 | event->customint = 0; |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
483 | event->value = 0; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
484 | event->obj = parent; |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
485 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
486 | if(args->button1_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
487 | 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
|
488 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
489 | if(args->button2_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
490 | 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
|
491 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
492 | if(args->closebutton_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
493 | 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
|
494 | 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
|
495 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
496 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
497 | GtkWidget *entry = NULL; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
498 | if(args->input || args->password) { |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
499 | entry = gtk_entry_new(); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
500 | if(args->password) { |
|
65
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
501 | gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); |
|
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
502 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
503 | if(args->input_value) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
504 | ENTRY_SET_TEXT(entry, args->input_value); |
|
65
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
505 | } |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
506 | 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
|
507 | event->customdata = entry; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
508 | event->customint = 0; |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
509 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
510 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
511 | g_signal_connect( |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
512 | dialog, |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
513 | "destroy", |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
514 | G_CALLBACK(ui_destroy_userdata), |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
515 | event); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
516 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
517 | g_signal_connect(dialog, "response", G_CALLBACK(dialog_response), event); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
518 | adw_dialog_present(dialog, parent->widget); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
519 | |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
520 | if(entry) { |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
521 | gtk_entry_grab_focus_without_selecting(GTK_ENTRY(entry)); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
522 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
523 | } |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
524 | #else |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
525 | |
| 32 | 526 | static void ui_dialog_response (GtkDialog* self, gint response_id, gpointer user_data) { |
| 527 | UiEventData *data = user_data; | |
| 528 | UiEvent evt; | |
| 529 | evt.obj = data->obj; | |
| 530 | evt.document = evt.obj->ctx->document; | |
| 531 | evt.window = evt.obj->window; | |
| 532 | evt.eventdata = NULL; | |
| 533 | evt.intval = 0; | |
| 534 | ||
| 535 | if(data->customdata) { | |
| 536 | GtkWidget *entry = data->customdata; | |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
537 | evt.eventdata = (void*)ENTRY_GET_TEXT(GTK_ENTRY(entry)); |
| 32 | 538 | |
| 539 | } | |
| 540 | ||
| 541 | if(response_id == 1 || response_id == 2) { | |
| 542 | evt.intval = response_id; | |
| 543 | } | |
| 544 | ||
| 545 | ||
| 546 | if(data->callback) { | |
| 547 | data->callback(&evt, data->userdata); | |
| 548 | } | |
| 549 | ||
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
550 | WINDOW_DESTROY(GTK_WIDGET(self)); |
| 32 | 551 | } |
| 552 | ||
|
109
c3dfcb8f0be7
update toolkit, remove getvalue func from model to table/listview args
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
553 | void ui_dialog_create(UiObject *parent, UiDialogArgs *args) { |
| 32 | 554 | GtkDialog *dialog = GTK_DIALOG(gtk_dialog_new()); |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
555 | 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
|
556 | gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); |
|
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
557 | |
| 32 | 558 | GtkWidget *dialog_w = GTK_WIDGET(dialog); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
559 | if(args->title) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
560 | gtk_window_set_title(GTK_WINDOW(dialog), args->title); |
| 32 | 561 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
562 | if(args->button1_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
563 | gtk_dialog_add_button(dialog, args->button1_label, 1); |
| 32 | 564 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
565 | if(args->button2_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
566 | gtk_dialog_add_button(dialog, args->button2_label, 2); |
| 32 | 567 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
568 | if(args->closebutton_label) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
569 | gtk_dialog_add_button(dialog, args->closebutton_label, 0); |
| 32 | 570 | } |
| 571 | ||
| 572 | 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
|
573 | if(args->content) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
574 | GtkWidget *label = gtk_label_new(args->content); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
575 | BOX_ADD(content_area, label); |
| 32 | 576 | } |
| 577 | ||
| 578 | GtkWidget *textfield = NULL; | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
579 | if(args->input || args->password) { |
| 32 | 580 | textfield = gtk_entry_new(); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
581 | if(args->password) { |
|
65
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
582 | gtk_entry_set_visibility(GTK_ENTRY(textfield), FALSE); |
|
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
583 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
584 | if(args->input_value) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
585 | ENTRY_SET_TEXT(textfield, args->input_value); |
|
65
48f43130b4a2
implement UI for credentials settings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
586 | } |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
587 | BOX_ADD(content_area, textfield); |
| 32 | 588 | } |
| 589 | ||
| 590 | UiEventData *event = malloc(sizeof(UiEventData)); | |
| 591 | event->obj = parent; | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
592 | event->callback = args->result; |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
593 | event->userdata = args->resultdata; |
| 32 | 594 | event->value = 0; |
| 595 | event->customdata = textfield; | |
| 596 | ||
| 597 | g_signal_connect(dialog_w, | |
| 598 | "response", | |
| 599 | G_CALLBACK(ui_dialog_response), | |
| 600 | event); | |
| 601 | ||
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
602 | WINDOW_SHOW(GTK_WIDGET(dialog_w)); |
| 32 | 603 | } |
|
46
31bc86844659
implement action_newfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
604 | #endif |
| 32 | 605 | |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
606 | |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
607 | #if GTK_MAJOR_VERSION >= 3 |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
608 | UiFileList listmodel2filelist(GListModel *selection) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
609 | UiFileList flist; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
610 | flist.files = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
611 | flist.nfiles = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
612 | 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
|
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 | 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
|
615 | 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
|
616 | char *path = g_file_get_path(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
617 | flist.files[i] = path ? strdup(path) : NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
618 | g_object_unref(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
619 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
620 | return flist; |
|
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 | #endif |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
623 | |
|
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 | #if GTK_CHECK_VERSION(4, 10, 0) |
|
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 | #define UI_GTK_FILEDIALOG_OPEN 16 |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
628 | #define UI_GTK_FILEDIALOG_SAVE 32 |
|
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 | 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
|
631 | UiEventData *event = data; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
632 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
633 | GFile *file = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
634 | GListModel *selection = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
635 | GError *error = NULL; |
|
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 | int mode = event->value; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
638 | int multi = mode & UI_FILEDIALOG_SELECT_MULTI; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
639 | 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
|
640 | if(multi) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
641 | 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
|
642 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
643 | 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
|
644 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
645 | } 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
|
646 | if(multi) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
647 | 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
|
648 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
649 | 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
|
650 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
651 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
652 | 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
|
653 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
654 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
655 | UiEvent evt; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
656 | evt.obj = event->obj; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
657 | evt.document = evt.obj->ctx->document; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
658 | evt.window = evt.obj->window; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
659 | evt.intval = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
660 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
661 | UiFileList flist; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
662 | flist.files = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
663 | flist.nfiles = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
664 | evt.eventdata = &flist; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
665 | 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
|
666 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
667 | if(selection) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
668 | flist = listmodel2filelist(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
669 | g_object_unref(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
670 | } else if(file) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
671 | char *path = g_file_get_path(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
672 | if(path) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
673 | flist.nfiles = 1; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
674 | flist.files = calloc(flist.nfiles, sizeof(char*)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
675 | flist.files[0] = strdup(path); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
676 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
677 | g_object_unref(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
678 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
679 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
680 | if(event->callback) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
681 | event->callback(&evt, event->userdata); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
682 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
683 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
684 | 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
|
685 | free(flist.files[i]); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
686 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
687 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
688 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
689 | 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
|
690 | if(action == GTK_FILE_CHOOSER_ACTION_OPEN) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
691 | mode |= UI_GTK_FILEDIALOG_OPEN; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
692 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
693 | mode |= UI_GTK_FILEDIALOG_SAVE; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
694 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
695 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
696 | UiEventData *event = malloc(sizeof(UiEventData)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
697 | event->callback = file_selected_callback; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
698 | event->userdata = cbdata; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
699 | event->customdata = NULL; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
700 | event->customint = 0; |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
701 | event->value = mode; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
702 | event->obj = obj; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
703 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
704 | 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
|
705 | GtkFileDialog *dialog = gtk_file_dialog_new(); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
706 | if(name) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
707 | 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
|
708 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
709 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
710 | int multi = mode & UI_FILEDIALOG_SELECT_MULTI; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
711 | 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
|
712 | if(multi) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
713 | 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
|
714 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
715 | 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
|
716 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
717 | } 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
|
718 | if(multi) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
719 | 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
|
720 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
721 | 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
|
722 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
723 | } else { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
724 | 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
|
725 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
726 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
727 | g_object_unref(dialog); |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
728 | } |
|
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
729 | #else |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
730 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
731 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
732 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
733 | 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
|
734 | UiEvent evt; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
735 | evt.obj = data->obj; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
736 | evt.document = evt.obj->ctx->document; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
737 | evt.window = evt.obj->window; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
738 | evt.intval = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
739 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
740 | UiFileList flist; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
741 | flist.files = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
742 | flist.nfiles = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
743 | evt.eventdata = &flist; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
744 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
745 | if(response_id == GTK_RESPONSE_ACCEPT) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
746 | #if GTK_CHECK_VERSION(4, 0, 0) |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
747 | 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
|
748 | flist = flist = listmodel2filelist(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
749 | g_object_unref(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
750 | #else |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
751 | 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
|
752 | flist.nfiles = g_slist_length(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
753 | flist.files = calloc(flist.nfiles, sizeof(char*)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
754 | int i = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
755 | while(selection) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
756 | char *file = selection->data; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
757 | flist.files[i] = strdup(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
758 | g_free(file); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
759 | selection = selection->next; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
760 | i++; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
761 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
762 | g_slist_free(selection); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
763 | #endif |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
764 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
765 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
766 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
767 | if(data->callback) { |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
768 | data->callback(&evt, data->userdata); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
769 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
770 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
771 | 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
|
772 | free(flist.files[i]); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
773 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
774 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
775 | WINDOW_DESTROY(GTK_WIDGET(self)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
776 | } |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
777 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
778 | 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
|
779 | char *button; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
780 | char *title; |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
781 | |
| 32 | 782 | GtkWidget *dialog; |
| 783 | if((mode & UI_FILEDIALOG_SELECT_FOLDER) == UI_FILEDIALOG_SELECT_FOLDER) { | |
| 784 | dialog = gtk_file_chooser_dialog_new ( | |
| 785 | "Open Folder", | |
| 786 | GTK_WINDOW(obj->widget), | |
| 787 | GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, | |
| 788 | "Cancel", | |
| 789 | GTK_RESPONSE_CANCEL, | |
| 790 | "Select Folder", | |
| 791 | GTK_RESPONSE_ACCEPT, | |
| 792 | NULL); | |
| 793 | } else if(action == GTK_FILE_CHOOSER_ACTION_OPEN) { | |
| 794 | dialog = gtk_file_chooser_dialog_new ( | |
| 795 | "Select Folder", | |
| 796 | GTK_WINDOW(obj->widget), | |
| 797 | action, | |
| 798 | "Cancel", | |
| 799 | GTK_RESPONSE_CANCEL, | |
| 800 | "Open File", | |
| 801 | GTK_RESPONSE_ACCEPT, | |
| 802 | NULL); | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
803 | } else { |
| 32 | 804 | dialog = gtk_file_chooser_dialog_new ( |
| 805 | "Save File", | |
| 806 | GTK_WINDOW(obj->widget), | |
| 807 | action, | |
| 808 | "Cancel", | |
| 809 | GTK_RESPONSE_CANCEL, | |
| 810 | "Save File", | |
| 811 | GTK_RESPONSE_ACCEPT, | |
| 812 | NULL); | |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
813 | } |
|
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
814 | |
| 32 | 815 | if((mode & UI_FILEDIALOG_SELECT_MULTI) == UI_FILEDIALOG_SELECT_MULTI) { |
| 816 | 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
|
817 | } |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
818 | |
|
45
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
819 | UiEventData *event = malloc(sizeof(UiEventData)); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
820 | event->obj = obj; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
821 | event->userdata = cbdata; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
822 | event->callback = file_selected_callback; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
823 | event->value = 0; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
824 | event->customdata = NULL; |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
825 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
826 | g_signal_connect( |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
827 | dialog, |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
828 | "response", |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
829 | G_CALLBACK(filechooser_response), |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
830 | event); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
831 | g_signal_connect( |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
832 | dialog, |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
833 | "destroy", |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
834 | G_CALLBACK(ui_destroy_userdata), |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
835 | event); |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
836 | |
|
ab71409644b0
update toolkit, fix download/upload progressbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
837 | gtk_widget_show(dialog); |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
838 | } |
|
44
473954dc6b74
update toolkit: gtk4 improvements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
839 | #endif |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
840 | |
| 32 | 841 | 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
|
842 | ui_gtkfilechooser(obj, GTK_FILE_CHOOSER_ACTION_OPEN, mode, NULL, file_selected_callback, cbdata); |
| 32 | 843 | } |
|
0
2483f517c562
add existing toolkit code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
844 | |
| 32 | 845 | 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
|
846 | ui_gtkfilechooser(obj, GTK_FILE_CHOOSER_ACTION_SAVE, 0, name, file_selected_callback, cbdata); |
| 32 | 847 | } |
| 848 | ||
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
849 | #if GTK_CHECK_VERSION(4, 10, 0) |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
850 | #define DIALOG_NEW() gtk_window_new() |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
851 | #else |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
852 | #define DIALOG_NEW() gtk_dialog_new() |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
853 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
854 | 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
|
855 | UiEventData *event = user_data; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
856 | // 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
|
857 | if(event->callback) { |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
858 | UiEvent e; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
859 | e.obj = event->obj; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
860 | e.window = event->obj->window; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
861 | e.document = event->obj->ctx->document; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
862 | e.eventdata = NULL; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
863 | e.intval = event->value; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
864 | event->callback(&e, event->userdata); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
865 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
866 | } |
|
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 | #endif |
|
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 | #if GTK_CHECK_VERSION(4, 0, 0) |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
871 | #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
|
872 | #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
|
873 | #else |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
874 | #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
|
875 | #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
|
876 | #endif |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
877 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
878 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
879 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
880 | UiObject* ui_dialog_window_create(UiObject *parent, UiDialogWindowArgs *args) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
881 | GtkWidget *dialog = DIALOG_NEW(); |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
882 | if(args->width > 0 || args->height > 0) { |
|
72
d5307e9ee384
implement key management UI
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
883 | gtk_window_set_default_size( |
|
d5307e9ee384
implement key management UI
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
884 | GTK_WINDOW(dialog), |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
885 | args->width, |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
886 | args->height); |
|
72
d5307e9ee384
implement key management UI
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
887 | } |
|
d5307e9ee384
implement key management UI
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
888 | |
|
d5307e9ee384
implement key management UI
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
889 | |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
890 | 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
|
891 | if(args->modal != UI_OFF) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
892 | gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
893 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
894 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
895 | UiObject *obj = uic_object_new_toplevel(); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
896 | obj->widget = dialog; |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
897 | obj->ref = 0; |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
898 | obj->destroy = ui_window_widget_destroy; |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
899 | nwindows++; |
|
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->title != NULL) { |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
902 | gtk_window_set_title(GTK_WINDOW(dialog), args->title); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
903 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
904 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
905 | #if ! GTK_CHECK_VERSION(4, 10, 0) |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
906 | UiEventData *event = malloc(sizeof(UiEventData)); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
907 | event->obj = obj; |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
908 | event->userdata = args->onclickdata; |
|
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
909 | event->callback = args->onclick; |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
910 | event->value = 0; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
911 | event->customdata = NULL; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
912 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
913 | 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
|
914 | g_signal_connect( |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
915 | dialog, |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
916 | "destroy", |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
917 | G_CALLBACK(ui_destroy_userdata), |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
918 | event); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
919 | #endif |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
920 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
921 | g_signal_connect( |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
922 | dialog, |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
923 | "destroy", |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
924 | G_CALLBACK(ui_exit_event), |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
925 | obj); |
|
86
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
926 | #if GTK_MAJOR_VERSION >= 4 |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
927 | g_signal_connect( |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
928 | obj->widget, |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
929 | "close-request", |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
930 | G_CALLBACK(close_request), |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
931 | obj); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
932 | #else |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
933 | g_signal_connect( |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
934 | obj->widget, |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
935 | "delete-event", |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
936 | G_CALLBACK(close_request), |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
937 | obj); |
|
8e7c57c23133
add reference counting to download window
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
938 | #endif |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
939 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
940 | #if GTK_MAJOR_VERSION < 4 |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
941 | GtkWidget *c = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
942 | gtk_container_remove(GTK_CONTAINER(dialog), c); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
943 | #endif |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
944 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
945 | GtkWidget *content_vbox = ui_gtk_vbox_new(0); |
| 112 | 946 | UiContainerX *container = ui_box_container(obj, content_vbox, UI_CONTAINER_VBOX); |
| 947 | uic_object_push_container(obj, container); | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
948 | if(args->lbutton1 || args->lbutton2 || args->rbutton3 || args->rbutton4) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
949 | #if GTK_CHECK_VERSION(3, 10, 0) |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
950 | if(args->titlebar_buttons != UI_OFF) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
951 | GtkWidget *headerbar = gtk_header_bar_new(); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
952 | 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
|
953 | if(args->show_closebutton == UI_OFF) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
954 | HEADERBAR_SHOW_CLOSEBUTTON(headerbar, FALSE); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
955 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
956 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
957 | if(args->lbutton1) { |
| 112 | 958 | GtkWidget *button = ui_create_button(obj, args->lbutton1, NULL, NULL/*tooltip*/, args->onclick, args->onclickdata, 1, args->default_button == 1); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
959 | 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
|
960 | if(args->default_button == 1) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
961 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
962 | DEFAULT_BUTTON(dialog, button); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
963 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
964 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
965 | if(args->lbutton2) { |
| 112 | 966 | GtkWidget *button = ui_create_button(obj, args->lbutton2, NULL, NULL/*tooltip*/, args->onclick, args->onclickdata, 2, args->default_button == 2); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
967 | 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
|
968 | if(args->default_button == 2) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
969 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
970 | DEFAULT_BUTTON(dialog, button); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
971 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
972 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
973 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
974 | if(args->rbutton4) { |
| 112 | 975 | GtkWidget *button = ui_create_button(obj, args->rbutton4, NULL, NULL/*tooltip*/, args->onclick, args->onclickdata, 4, args->default_button == 4); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
976 | 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
|
977 | if(args->default_button == 4) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
978 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
979 | DEFAULT_BUTTON(dialog, button); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
980 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
981 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
982 | if(args->rbutton3) { |
| 112 | 983 | GtkWidget *button = ui_create_button(obj, args->rbutton3, NULL, NULL/*tooltip*/, args->onclick, args->onclickdata, 3, args->default_button == 3); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
984 | 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
|
985 | if(args->default_button == 3) { |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
986 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
987 | DEFAULT_BUTTON(dialog, button); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
988 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
989 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
990 | WINDOW_SET_CONTENT(obj->widget, content_vbox); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
991 | return obj; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
992 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
993 | #endif |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
994 | GtkWidget *vbox = ui_gtk_vbox_new(0); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
995 | WINDOW_SET_CONTENT(obj->widget, vbox); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
996 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
997 | GtkWidget *separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
998 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
999 | GtkWidget *grid = ui_create_grid_widget(10, 10); |
| 112 | 1000 | GtkWidget *widget = ui_gtk_set_margin(grid, 16, 0, 0, 0, 0); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1001 | gtk_grid_set_column_homogeneous(GTK_GRID(grid), TRUE); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1002 | |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
1003 | if(args->lbutton1) { |
| 112 | 1004 | GtkWidget *button = ui_create_button(obj, args->lbutton1, NULL, NULL/*tooltip*/, args->onclick, args->onclickdata, 1, args->default_button == 1); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1005 | 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
|
1006 | if(args->default_button == 1) { |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1007 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1008 | DEFAULT_BUTTON(dialog, button); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1009 | } |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1010 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
1011 | if(args->lbutton2) { |
| 112 | 1012 | GtkWidget *button = ui_create_button(obj, args->lbutton2, NULL, NULL/*tooltip*/, args->onclick, args->onclickdata, 2, args->default_button == 2); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1013 | 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
|
1014 | if(args->default_button == 2) { |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1015 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1016 | DEFAULT_BUTTON(dialog, button); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1017 | } |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1018 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1019 | GtkWidget *space = gtk_label_new(NULL); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1020 | gtk_widget_set_hexpand(space, TRUE); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1021 | 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
|
1022 | if(args->rbutton3) { |
| 112 | 1023 | GtkWidget *button = ui_create_button(obj, args->rbutton3, NULL, NULL/*tooltip*/, args->onclick, args->onclickdata, 3, args->default_button == 3); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1024 | 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
|
1025 | if(args->default_button == 3) { |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1026 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1027 | DEFAULT_BUTTON(dialog, button); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1028 | } |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1029 | } |
|
108
77254bd6dccb
update toolkit, adjust UI code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
1030 | if(args->rbutton4) { |
| 112 | 1031 | GtkWidget *button = ui_create_button(obj, args->rbutton4, NULL, NULL/*tooltip*/, args->onclick, args->onclickdata, 4, args->default_button == 4); |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1032 | 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
|
1033 | if(args->default_button == 4) { |
|
58
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1034 | WIDGET_ADD_CSS_CLASS(button, "suggested-action"); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1035 | DEFAULT_BUTTON(dialog, button); |
|
0d25f15e2625
add minimal query error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
1036 | } |
|
56
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1037 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1038 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1039 | BOX_ADD_EXPAND(vbox, content_vbox); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1040 | BOX_ADD_NO_EXPAND(vbox, separator); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1041 | BOX_ADD_NO_EXPAND(vbox, widget); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1042 | } else { |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1043 | WINDOW_SET_CONTENT(obj->widget, content_vbox); |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1044 | } |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1045 | |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1046 | return obj; |
|
294d5515583a
add authentication dialog
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1047 | } |