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