ui/gtk/toolbar.c

Sun, 07 Apr 2024 21:56:56 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 07 Apr 2024 21:56:56 +0200
branch
newapi
changeset 280
e3565cf7c831
parent 278
a8faf8757450
permissions
-rw-r--r--

add threadpool

3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
140
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
4 * Copyright 2017 Olaf Wintermann. All rights reserved.
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
c1a75454b444 added toolbar
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
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #include <stdio.h>
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30 #include <stdlib.h>
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
31 #include <string.h>
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
32
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
33 #include "toolbar.h"
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
34 #include "menu.h"
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
35 #include "button.h"
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
36 #include "image.h"
116
480354705c2f added combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 90
diff changeset
37 #include "tree.h"
253
087cc9216f28 initial newapi GTK port
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 174
diff changeset
38 #include <cx/mempool.h>
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 168
diff changeset
39 #include <cx/hash_map.h>
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 168
diff changeset
40 #include <cx/linked_list.h>
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 168
diff changeset
41 #include <cx/array_list.h>
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
42 #include "../common/context.h"
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
43
86
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
44
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
45 GtkWidget* ui_create_toolbar(UiObject *obj) {
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
46 GtkWidget *toolbar = gtk_toolbar_new();
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
47 #ifdef UI_GTK3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
48 gtk_style_context_add_class(
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
49 gtk_widget_get_style_context(toolbar),
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
50 GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
51 #endif
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
52
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
53 CxMap *items = uic_get_toolbar_items();
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
54 CxList *left_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_LEFT);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
55 CxList *center_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_CENTER);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
56 CxList *right_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_RIGHT);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
57
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
58 ui_toolbar_add_items(obj, toolbar, items, left_defaults);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
59 ui_toolbar_add_items(obj, toolbar, items, center_defaults);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
60 ui_toolbar_add_items(obj, toolbar, items, right_defaults);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
61
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
62 /*
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
63 GtkToolbar *tb = GTK_TOOLBAR(toolbar);
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 168
diff changeset
64 CxIterator i = cxListIterator(defaults);
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 168
diff changeset
65 cx_foreach(char *, def, i) {
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 168
diff changeset
66 UiToolItemI *item = cxMapGet(toolbar_items, def);
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
67 if(item) {
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
68 item->add_to(tb, item, obj);
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 168
diff changeset
69 } else if(!strcmp(def, "@separator")) {
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
70 gtk_toolbar_insert(tb, gtk_separator_tool_item_new(), -1);
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
71 } else {
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 168
diff changeset
72 fprintf(stderr, "UI Error: Unknown toolbar item: %s\n", def);
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
73 }
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
74 }
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
75 */
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
76
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
77 return toolbar;
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
78 }
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
79
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
80 static void create_item(UiObject *obj, GtkWidget *toolbar, UiToolbarItemI *i) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
81 GtkToolbar *tb = GTK_TOOLBAR(toolbar);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
82 switch(i->type) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
83 case UI_TOOLBAR_ITEM: {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
84 add_toolitem_widget(tb, (UiToolbarItem*)i, obj);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
85 break;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
86 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
87 case UI_TOOLBAR_TOGGLEITEM: {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
88 add_toolitem_toggle_widget(tb, (UiToolbarToggleItem*)i, obj);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
89 break;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
90 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
91 case UI_TOOLBAR_MENU: {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
92 add_toolitem_menu_widget(tb, (UiToolbarMenuItem*)i, obj);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
93 break;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
94 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
95 default: fprintf(stderr, "toolbar item type unimplemented: %d\n", (int)i->type);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
96 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
97 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
98
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
99 void ui_toolbar_add_items(UiObject *obj, GtkWidget *toolbar, CxMap *items, CxList *defaults) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
100 // add pre-configured items
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
101 CxIterator i = cxListIterator(defaults);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
102 cx_foreach(char*, def, i) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
103 UiToolbarItemI* item = uic_toolbar_get_item(def);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
104 if (!item) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
105 fprintf(stderr, "unknown toolbar item: %s\n", def);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
106 continue;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
107 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
108 create_item(obj, toolbar, item);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
109 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
110 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
111
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
112 static void set_toolbutton_icon(GtkToolItem *item, const char *icon_name) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
113 #if GTK_MAJOR_VERSION >= 3
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
114 gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), icon_name);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
115 #else
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
116 UiIcon *icon = ui_icon(icon_name, 24);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
117 if(icon) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
118 GdkPixbuf *pixbuf = ui_icon_pixbuf(icon);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
119 if(pixbuf) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
120 GtkWidget *image = gtk_image_new_from_pixbuf(pixbuf);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
121 gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(item), image);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
122 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
123 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
124 #endif
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
125 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
126
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
127 void add_toolitem_widget(GtkToolbar *tb, UiToolbarItem *item, UiObject *obj) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
128 GtkToolItem *button;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
129 if(item->args.stockid) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
130 #ifdef UI_GTK2
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
131 button = gtk_tool_button_new_from_stock(item->args.stockid);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
132 #else
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
133 // TODO: gtk3 stock
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
134 button = gtk_tool_button_new(NULL, item->args.label);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
135 #endif
90
2019fdbaadfd persistent textarea cursor position
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 86
diff changeset
136 } else {
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
137 button = gtk_tool_button_new(NULL, item->args.label);
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
138 }
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
139
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
140 gtk_tool_item_set_homogeneous(button, FALSE);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
141 if(item->args.icon) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
142 set_toolbutton_icon(button, item->args.icon);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
143 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
144 gtk_tool_item_set_is_important(button, TRUE);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
145
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
146 if(item->args.onclick) {
174
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 168
diff changeset
147 UiEventData *event = cxMalloc(
0358f1d9c506 upgrade ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 168
diff changeset
148 obj->ctx->allocator,
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
149 sizeof(UiEventData));
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
150 event->obj = obj;
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
151 event->callback = item->args.onclick;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
152 event->userdata = item->args.onclickdata;
278
a8faf8757450 implement ui_dialog_create (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
153 event->customdata = NULL;
a8faf8757450 implement ui_dialog_create (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
154 event->value = 0;
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
155
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
156 g_signal_connect(
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
157 button,
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
158 "clicked",
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
159 G_CALLBACK(ui_button_clicked),
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
160 event);
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
161 }
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
162
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
163 gtk_toolbar_insert(tb, button, -1);
27
77b09bb52ca0 added groups for toolbar items and copy & paste (GTK, Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
164
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
165 /*
27
77b09bb52ca0 added groups for toolbar items and copy & paste (GTK, Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
166 if(item->groups) {
168
1b99acacc5bb refactor widget groups
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 167
diff changeset
167 uic_add_group_widget(obj->ctx, button, (ui_enablefunc)ui_set_enabled, item->groups);
27
77b09bb52ca0 added groups for toolbar items and copy & paste (GTK, Motif)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
168 }
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
169 */
3
c1a75454b444 added toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
170 }
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
171
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
172 void add_toolitem_toggle_widget(GtkToolbar *tb, UiToolbarToggleItem *item, UiObject *obj) {
167
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
173 GtkToolItem *button;
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
174 if(item->args.stockid) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
175 #ifdef UI_GTK2
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
176 button = gtk_toggle_tool_button_new_from_stock(item->args.stockid);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
177 #else
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
178 button = gtk_toggle_tool_button_new_from_stock(item->args.stockid); // TODO: gtk3 stock
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
179 #endif
167
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
180 } else {
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
181 button = gtk_toggle_tool_button_new();
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
182 gtk_tool_item_set_homogeneous(button, FALSE);
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
183 if(item->args.label) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
184 gtk_tool_button_set_label(GTK_TOOL_BUTTON(button), item->args.label);
167
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
185 }
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
186 if(item->args.icon) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
187 set_toolbutton_icon(button, item->args.icon);
167
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
188 }
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
189 }
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
190
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
191 UiVar* var = uic_widget_var(obj->ctx, obj->ctx, NULL, item->args.varname, UI_VAR_INTEGER);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
192 if(var) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
193 UiInteger *i = (UiInteger*)var->value;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
194 if(i) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
195 i->get = ui_tool_toggle_button_get;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
196 i->set = ui_tool_toggle_button_set;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
197 i->obj = button;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
198
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
199 if(i->value != 0) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
200 gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(button), TRUE);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
201 }
167
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
202 }
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
203 }
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
204
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
205 UiVarEventData *event = cxMalloc(
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
206 obj->ctx->allocator,
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
207 sizeof(UiVarEventData));
167
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
208 event->obj = obj;
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
209 event->callback = item->args.onchange;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
210 event->userdata = item->args.onchangedata;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
211 event->var = var;
167
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
212
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
213 g_signal_connect(
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
214 button,
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
215 "toggled",
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
216 G_CALLBACK(ui_tool_button_toggled),
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
217 event);
167
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
218
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
219 // add item to toolbar
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
220 gtk_toolbar_insert(tb, button, -1);
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
221
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
222 /*
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
223 if(item->groups) {
168
1b99acacc5bb refactor widget groups
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 167
diff changeset
224 uic_add_group_widget(obj->ctx, button, (ui_enablefunc)ui_set_enabled, item->groups);
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
225 }
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
226 */
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
227 }
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
228
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
229 void ui_tool_button_toggled(GtkToggleToolButton *widget, UiVarEventData *event) {
167
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
230 UiEvent e;
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
231 e.obj = event->obj;
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
232 e.window = event->obj->window;
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
233 e.document = event->obj->ctx->document;
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
234 e.eventdata = NULL;
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
235 e.intval = gtk_toggle_tool_button_get_active(widget);
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
236
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
237 if(event->callback) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
238 event->callback(&e, event->userdata);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
239 }
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
240
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
241 UiVar *var = event->var;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
242 UiInteger *i = var ? var->value : NULL;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
243
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
244 if(i) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
245 ui_notify_evt(i->observers, &e);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
246 }
167
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
247 }
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
248
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
249 int64_t ui_tool_toggle_button_get(UiInteger *integer) {
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
250 integer->value = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(integer->obj));
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
251 return integer->value;
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
252 }
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
253
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
254 void ui_tool_toggle_button_set(UiInteger *integer, int64_t value) {
168
1b99acacc5bb refactor widget groups
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 167
diff changeset
255 gboolean s = value != 0 ? TRUE : FALSE;
167
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
256 gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(integer->obj), s);
161511838ea6 add new toolbar toggle button
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 163
diff changeset
257 integer->value = s;
33
458831c574f4 added listview, sidebar and toolbar image button (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
258 }
86
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
259
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
260
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
261
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
262 typedef struct UiToolbarMenuWidget {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
263 GtkWidget *button;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
264 GtkMenu *menu;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
265 } UiToolbarMenuWidget;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
266
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
267 static void ui_toolbar_menubutton_clicked(GtkWidget *widget, UiToolbarMenuWidget *menu) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
268 int x;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
269 gtk_menu_popup_at_widget(menu->menu, menu->button, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, NULL);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
270 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
271
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
272 static void ui_toolbar_menubutton_destroy(GtkWidget *widget, UiToolbarMenuWidget *menu) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
273 free(menu);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
274 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
276 void add_toolitem_menu_widget(GtkToolbar *tb, UiToolbarMenuItem *item, UiObject *obj) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
277 GtkToolItem *button;
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
278 if(item->args.stockid) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
279 #ifdef UI_GTK2
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
280 button = gtk_tool_button_new_from_stock(item->args.stockid);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
281 #else
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
282 // TODO: gtk3 stock
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
283 button = gtk_tool_button_new(NULL, item->args.label);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
284 #endif
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
285 } else {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
286 button = gtk_tool_button_new(NULL, item->args.label);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
287 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
288
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
289 gtk_tool_item_set_homogeneous(button, FALSE);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
290 if(item->args.icon) {
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
291 set_toolbutton_icon(button, item->args.icon);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
292 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
293 gtk_tool_item_set_is_important(button, TRUE);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
294
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
295 gtk_toolbar_insert(tb, button, -1);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
296
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
297 // menu
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
298 GtkWidget *menu_widget = gtk_menu_new();
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
299 ui_add_menu_items(menu_widget, 0, &item->menu, obj);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
300 gtk_widget_show_all(menu_widget);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
301
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
302 UiToolbarMenuWidget *tbmenu = malloc(sizeof(UiToolbarMenuWidget));
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
303 tbmenu->button = GTK_WIDGET(button);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
304 tbmenu->menu = GTK_MENU(menu_widget);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
305
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
306 g_signal_connect(
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
307 button,
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
308 "clicked",
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
309 G_CALLBACK(ui_toolbar_menubutton_clicked),
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
310 tbmenu);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
311
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
312 g_signal_connect(
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
313 button,
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
314 "destroy",
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
315 G_CALLBACK(ui_toolbar_menubutton_destroy),
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
316 tbmenu);
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
317 }
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
318
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
319
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
320
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
321
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
322 // deprecated / unsupported
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
323 /*
86
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
324 void add_toolbar_combobox(GtkToolbar *tb, UiToolbarComboBox *cb, UiObject *obj) {
146
dd0ae1c62a72 new icon/image api and pixbuf support in treeview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
325 UiModel *modelinfo = ui_model(obj->ctx, UI_STRING, "", -1);
86
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
326 modelinfo->getvalue = cb->getvalue;
147
2e384acc89a6 adds simple drag and drop support (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 146
diff changeset
327 UiListModel *model = ui_list_model_new(obj, cb->var, modelinfo);
86
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
328
116
480354705c2f added combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 90
diff changeset
329 GtkWidget *combobox = ui_create_combobox(obj, model, cb->callback, cb->userdata);
86
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
330 GtkToolItem *item = gtk_tool_item_new();
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
331 gtk_container_add(GTK_CONTAINER(item), combobox);
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
332 gtk_toolbar_insert(tb, item, -1);
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
333 }
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
334
116
480354705c2f added combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 90
diff changeset
335 void add_toolbar_combobox_nv(GtkToolbar *tb, UiToolbarComboBoxNV *cb, UiObject *obj) {
140
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
336 UiVar *var = uic_create_var(obj->ctx, cb->listname, UI_VAR_LIST);
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
337 if(var) {
146
dd0ae1c62a72 new icon/image api and pixbuf support in treeview (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
338 UiModel *modelinfo = ui_model(obj->ctx, UI_STRING, "", -1);
140
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
339 modelinfo->getvalue = cb->getvalue;
147
2e384acc89a6 adds simple drag and drop support (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 146
diff changeset
340 UiListModel *model = ui_list_model_new(obj, var, modelinfo);
140
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
341
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
342 GtkWidget *combobox = ui_create_combobox(obj, model, cb->callback, cb->userdata);
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
343 GtkToolItem *item = gtk_tool_item_new();
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
344 gtk_container_add(GTK_CONTAINER(item), combobox);
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
345 gtk_toolbar_insert(tb, item, -1);
c03c338a7dcf refactors value binding system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 116
diff changeset
346 }
86
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
347 }
275
132c7bcc6997 implement new toolbar (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 254
diff changeset
348 */
86
3c63f57a8f77 added toolbar combobox (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 49
diff changeset
349
276
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
350
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
351
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
352 #ifdef UI_GTK3
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
353
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
354 GtkWidget* ui_create_headerbar(UiObject *obj) {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
355 GtkWidget *headerbar = gtk_header_bar_new();
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
356
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
357 CxMap *items = uic_get_toolbar_items();
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
358 CxList *left_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_LEFT);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
359 CxList *center_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_CENTER);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
360 CxList *right_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_RIGHT);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
361
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
362 ui_headerbar_add_items(obj, headerbar, items, left_defaults);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
363 ui_headerbar_add_items(obj, headerbar, items, center_defaults);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
364 ui_headerbar_add_items(obj, headerbar, items, right_defaults);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
365
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
366 return headerbar;
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
367 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
368
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
369 static void hb_create_item(UiObject *obj, GtkWidget *toolbar, UiToolbarItemI *i) {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
370 GtkHeaderBar *tb = GTK_HEADER_BAR(toolbar);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
371 switch(i->type) {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
372 case UI_TOOLBAR_ITEM: {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
373 add_headerbar_item_widget(tb, (UiToolbarItem*)i, obj);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
374 break;
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
375 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
376 case UI_TOOLBAR_TOGGLEITEM: {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
377 add_headerbar_item_toggle_widget(tb, (UiToolbarToggleItem*)i, obj);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
378 break;
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
379 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
380 case UI_TOOLBAR_MENU: {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
381 add_headerbar_item_menu_widget(tb, (UiToolbarMenuItem*)i, obj);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
382 break;
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
383 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
384 default: fprintf(stderr, "toolbar item type unimplemented: %d\n", (int)i->type);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
385 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
386 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
387
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
388
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
389 void ui_headerbar_add_items(UiObject *obj, GtkWidget *headerbar, CxMap *items, CxList *defaults) {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
390 // add pre-configured items
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
391 CxIterator i = cxListIterator(defaults);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
392 cx_foreach(char*, def, i) {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
393 UiToolbarItemI* item = uic_toolbar_get_item(def);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
394 if (!item) {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
395 fprintf(stderr, "unknown toolbar item: %s\n", def);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
396 continue;
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
397 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
398 hb_create_item(obj, headerbar, item);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
399 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
400 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
401
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
402 void add_headerbar_item_widget(GtkHeaderBar *hb, UiToolbarItem *item, UiObject *obj) {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
403 GtkWidget *button = gtk_button_new_with_label(item->args.label);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
404 if(item->args.icon) {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
405 ui_button_set_icon_name(button, item->args.icon);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
406 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
407
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
408 gtk_header_bar_pack_start(hb, button);
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
409
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
410 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
411
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
412 void add_headerbar_item_toggle_widget(GtkHeaderBar *hb, UiToolbarToggleItem *item, UiObject *obj) {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
413
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
414 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
415
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
416 void add_headerbar_item_menu_widget(GtkHeaderBar *hb, UiToolbarMenuItem *item, UiObject *obj) {
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
417
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
418 }
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
419
376921880a7f add initial support for headerbars (GTK)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
420 #endif

mercurial