Mercurial > geeqie
annotate src/bar_histogram.c @ 1329:1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
author | zas_ |
---|---|
date | Thu, 26 Feb 2009 20:50:36 +0000 |
parents | e4f9e3567f0a |
children | 8b6e2a47adc7 |
rev | line source |
---|---|
1298 | 1 /* |
2 * Geeqie | |
3 * (C) 2004 John Ellis | |
4 * Copyright (C) 2008 - 2009 The Geeqie Team | |
5 * | |
6 * Author: Vladimir Nadvornik | |
7 * | |
8 * This software is released under the GNU General Public License (GNU GPL). | |
9 * Please read the included file COPYING for more information. | |
10 * This software comes with no warranty of any kind, use at your own risk! | |
11 */ | |
12 | |
13 | |
14 #include "main.h" | |
15 #include "bar_comment.h" | |
16 | |
17 #include "bar.h" | |
18 #include "metadata.h" | |
19 #include "filedata.h" | |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
20 #include "menu.h" |
1298 | 21 #include "ui_menu.h" |
22 #include "ui_misc.h" | |
23 #include "histogram.h" | |
1309 | 24 #include "rcfile.h" |
1298 | 25 |
26 /* | |
27 *------------------------------------------------------------------- | |
28 * keyword / comment utils | |
29 *------------------------------------------------------------------- | |
30 */ | |
31 | |
32 | |
33 | |
34 typedef struct _PaneHistogramData PaneHistogramData; | |
35 struct _PaneHistogramData | |
36 { | |
37 PaneData pane; | |
38 GtkWidget *widget; | |
39 GtkWidget *drawing_area; | |
40 Histogram *histogram; | |
41 gint histogram_width; | |
42 gint histogram_height; | |
43 GdkPixbuf *pixbuf; | |
44 FileData *fd; | |
45 }; | |
46 | |
47 | |
48 static void bar_pane_histogram_update(PaneHistogramData *phd) | |
49 { | |
50 const HistMap *histmap; | |
51 if (phd->pixbuf) g_object_unref(phd->pixbuf); | |
52 phd->pixbuf = NULL; | |
53 | |
54 if (!phd->histogram_width || !phd->histogram_height || !phd->fd) return; | |
55 | |
56 gtk_widget_queue_draw_area(GTK_WIDGET(phd->drawing_area), 0, 0, phd->histogram_width, phd->histogram_height); | |
57 | |
58 histmap = histmap_get(phd->fd); | |
59 | |
60 if (!histmap) return; | |
61 | |
62 phd->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, phd->histogram_width, phd->histogram_height); | |
63 gdk_pixbuf_fill(phd->pixbuf, 0xffffffff); | |
64 histogram_draw(phd->histogram, histmap, phd->pixbuf, 0, 0, phd->histogram_width, phd->histogram_height); | |
65 } | |
66 | |
67 | |
68 static void bar_pane_histogram_set_fd(GtkWidget *pane, FileData *fd) | |
69 { | |
70 PaneHistogramData *phd; | |
71 | |
72 phd = g_object_get_data(G_OBJECT(pane), "pane_data"); | |
73 if (!phd) return; | |
74 | |
75 file_data_unref(phd->fd); | |
76 phd->fd = file_data_ref(fd); | |
77 | |
78 bar_pane_histogram_update(phd); | |
79 } | |
80 | |
1309 | 81 static void bar_pane_histogram_write_config(GtkWidget *pane, GString *outstr, gint indent) |
82 { | |
83 PaneHistogramData *phd; | |
84 | |
85 phd = g_object_get_data(G_OBJECT(pane), "pane_data"); | |
86 if (!phd) return; | |
87 | |
1314 | 88 WRITE_STRING("<pane_histogram\n"); |
1309 | 89 indent++; |
90 WRITE_CHAR(*phd, pane.title); | |
91 WRITE_BOOL(*phd, pane.expanded); | |
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
92 WRITE_INT(*phd->histogram, histogram_channel); |
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
93 WRITE_INT(*phd->histogram, histogram_mode); |
1309 | 94 indent--; |
1314 | 95 WRITE_STRING("/>\n"); |
1309 | 96 } |
97 | |
98 | |
1298 | 99 static void bar_pane_histogram_notify_cb(FileData *fd, NotifyType type, gpointer data) |
100 { | |
101 PaneHistogramData *phd = data; | |
102 if (fd == phd->fd) bar_pane_histogram_update(phd); | |
103 } | |
104 | |
105 static gboolean bar_pane_histogram_expose_event_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data) | |
106 { | |
107 PaneHistogramData *phd = data; | |
108 if (!phd || !phd->pixbuf) return TRUE; | |
109 | |
110 gdk_draw_pixbuf(widget->window, | |
111 widget->style->fg_gc[GTK_WIDGET_STATE (widget)], | |
112 phd->pixbuf, | |
113 0, 0, | |
114 0, 0, | |
115 -1, -1, | |
116 GDK_RGB_DITHER_NORMAL, 0, 0); | |
117 return TRUE; | |
118 } | |
119 | |
120 static void bar_pane_histogram_size_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer data) | |
121 { | |
122 PaneHistogramData *phd = data; | |
123 | |
124 phd->histogram_width = allocation->width; | |
125 phd->histogram_height = allocation->height; | |
126 bar_pane_histogram_update(phd); | |
127 } | |
128 | |
129 static void bar_pane_histogram_close(GtkWidget *pane) | |
130 { | |
131 PaneHistogramData *phd; | |
132 | |
133 phd = g_object_get_data(G_OBJECT(pane), "pane_data"); | |
134 if (!phd) return; | |
135 | |
136 gtk_widget_destroy(phd->widget); | |
137 } | |
138 | |
139 static void bar_pane_histogram_destroy(GtkWidget *widget, gpointer data) | |
140 { | |
141 PaneHistogramData *phd = data; | |
142 | |
143 file_data_unregister_notify_func(bar_pane_histogram_notify_cb, phd); | |
144 | |
145 file_data_unref(phd->fd); | |
146 g_free(phd->pane.title); | |
147 histogram_free(phd->histogram); | |
148 if (phd->pixbuf) g_object_unref(phd->pixbuf); | |
149 | |
150 g_free(phd); | |
151 } | |
152 | |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
153 static void bar_pane_histogram_popup_channels_cb(GtkWidget *widget, gpointer data) |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
154 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
155 PaneHistogramData *phd; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
156 gint channel; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
157 |
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
158 if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return; |
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
159 |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
160 phd = submenu_item_get_data(widget); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
161 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
162 if (!phd) return; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
163 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
164 channel = GPOINTER_TO_INT(data); |
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
165 if (channel == histogram_get_channel(phd->histogram)) return; |
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
166 |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
167 histogram_set_channel(phd->histogram, channel); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
168 bar_pane_histogram_update(phd); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
169 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
170 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
171 static void bar_pane_histogram_popup_logmode_cb(GtkWidget *widget, gpointer data) |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
172 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
173 PaneHistogramData *phd; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
174 gint logmode; |
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
175 |
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
176 if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return; |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
177 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
178 phd = submenu_item_get_data(widget); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
179 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
180 if (!phd) return; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
181 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
182 logmode = GPOINTER_TO_INT(data); |
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
183 if (logmode == histogram_get_mode(phd->histogram)) return; |
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
184 |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
185 histogram_set_mode(phd->histogram, logmode); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
186 bar_pane_histogram_update(phd); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
187 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
188 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
189 static GtkWidget *bar_pane_histogram_add_radio(GtkWidget *menu, GtkWidget *parent, |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
190 const gchar *label, |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
191 GCallback func, gint value, |
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
192 gboolean show_current, gint current_value) |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
193 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
194 GtkWidget *item; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
195 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
196 if (show_current) |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
197 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
198 item = menu_item_add_radio(menu, parent, |
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
199 label, (value == current_value), |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
200 func, GINT_TO_POINTER((gint)value)); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
201 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
202 else |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
203 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
204 item = menu_item_add(menu, label, |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
205 func, GINT_TO_POINTER((gint)value)); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
206 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
207 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
208 return item; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
209 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
210 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
211 GtkWidget *bar_pane_histogram_add_channels(GtkWidget *menu, GCallback func, gpointer data, |
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
212 gboolean show_current, gint current_value) |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
213 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
214 GtkWidget *submenu; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
215 GtkWidget *parent; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
216 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
217 submenu = gtk_menu_new(); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
218 g_object_set_data(G_OBJECT(submenu), "submenu_data", data); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
219 |
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
220 parent = bar_pane_histogram_add_radio(submenu, NULL, _("_Red"), func, HCHAN_R, show_current, current_value); |
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
221 bar_pane_histogram_add_radio(submenu, parent, _("_Green"), func, HCHAN_G, show_current, current_value); |
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
222 bar_pane_histogram_add_radio(submenu, parent, _("_Blue"),func, HCHAN_B, show_current, current_value); |
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
223 bar_pane_histogram_add_radio(submenu, parent, _("_RGB"),func, HCHAN_RGB, show_current, current_value); |
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
224 bar_pane_histogram_add_radio(submenu, parent, _("_Value"),func, HCHAN_MAX, show_current, current_value); |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
225 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
226 if (menu) |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
227 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
228 GtkWidget *item; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
229 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
230 item = menu_item_add(menu, _("Channels"), NULL, NULL); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
231 gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
232 return item; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
233 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
234 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
235 return submenu; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
236 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
237 GtkWidget *bar_pane_histogram_add_logmode(GtkWidget *menu, GCallback func, gpointer data, |
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
238 gboolean show_current, gint current_value) |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
239 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
240 GtkWidget *submenu; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
241 GtkWidget *parent; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
242 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
243 submenu = gtk_menu_new(); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
244 g_object_set_data(G_OBJECT(submenu), "submenu_data", data); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
245 |
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
246 parent = bar_pane_histogram_add_radio(submenu, NULL, _("_Linear"), func, 0, show_current, current_value); |
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
247 bar_pane_histogram_add_radio(submenu, parent, _("Lo_garithmical"), func, 1, show_current, current_value); |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
248 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
249 if (menu) |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
250 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
251 GtkWidget *item; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
252 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
253 item = menu_item_add(menu, _("Mode"), NULL, NULL); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
254 gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
255 return item; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
256 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
257 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
258 return submenu; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
259 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
260 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
261 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
262 static GtkWidget *bar_pane_histogram_menu(PaneHistogramData *phd) |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
263 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
264 GtkWidget *menu; |
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
265 static gboolean show_current = TRUE; |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
266 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
267 menu = popup_menu_short_lived(); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
268 bar_pane_histogram_add_channels(menu, G_CALLBACK(bar_pane_histogram_popup_channels_cb), phd, |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
269 show_current, histogram_get_channel(phd->histogram)); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
270 bar_pane_histogram_add_logmode(menu, G_CALLBACK(bar_pane_histogram_popup_logmode_cb), phd, |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
271 show_current, histogram_get_mode(phd->histogram)); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
272 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
273 return menu; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
274 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
275 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
276 static gboolean bar_pane_histogram_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
277 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
278 PaneHistogramData *phd = data; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
279 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
280 if (bevent->button == MOUSE_BUTTON_RIGHT) |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
281 { |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
282 GtkWidget *menu; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
283 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
284 menu = bar_pane_histogram_menu(phd); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
285 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, bevent->button, bevent->time); |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
286 return TRUE; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
287 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
288 |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
289 return FALSE; |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
290 } |
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
291 |
1298 | 292 |
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
293 GtkWidget *bar_pane_histogram_new(const gchar *title, gint height, gint expanded, gint histogram_channel, gint histogram_mode) |
1298 | 294 { |
295 PaneHistogramData *phd; | |
296 | |
297 phd = g_new0(PaneHistogramData, 1); | |
298 | |
299 phd->pane.pane_set_fd = bar_pane_histogram_set_fd; | |
1309 | 300 phd->pane.pane_write_config = bar_pane_histogram_write_config; |
1298 | 301 phd->pane.title = g_strdup(title); |
1309 | 302 phd->pane.expanded = expanded; |
1298 | 303 |
304 phd->histogram = histogram_new(); | |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
305 |
1324 | 306 histogram_set_channel(phd->histogram, histogram_channel); |
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
307 histogram_set_mode(phd->histogram, histogram_mode); |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
308 |
1298 | 309 phd->widget = gtk_vbox_new(FALSE, PREF_PAD_GAP); |
310 | |
311 g_object_set_data(G_OBJECT(phd->widget), "pane_data", phd); | |
312 g_signal_connect(G_OBJECT(phd->widget), "destroy", | |
313 G_CALLBACK(bar_pane_histogram_destroy), phd); | |
314 | |
315 | |
316 gtk_widget_set_size_request(GTK_WIDGET(phd->widget), -1, height); | |
317 | |
318 phd->drawing_area = gtk_drawing_area_new(); | |
319 g_signal_connect_after(G_OBJECT(phd->drawing_area), "size_allocate", | |
320 G_CALLBACK(bar_pane_histogram_size_cb), phd); | |
321 | |
322 g_signal_connect(G_OBJECT(phd->drawing_area), "expose_event", | |
323 G_CALLBACK(bar_pane_histogram_expose_event_cb), phd); | |
324 | |
325 gtk_box_pack_start(GTK_BOX(phd->widget), phd->drawing_area, TRUE, TRUE, 0); | |
326 gtk_widget_show(phd->drawing_area); | |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
327 gtk_widget_add_events(phd->drawing_area, GDK_BUTTON_PRESS_MASK); |
1298 | 328 |
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
329 g_signal_connect(G_OBJECT(phd->drawing_area), "button_press_event", G_CALLBACK(bar_pane_histogram_press_cb), phd); |
1298 | 330 |
331 gtk_widget_show(phd->widget); | |
332 | |
333 file_data_register_notify_func(bar_pane_histogram_notify_cb, phd, NOTIFY_PRIORITY_LOW); | |
334 | |
335 return phd->widget; | |
336 } | |
337 | |
1309 | 338 GtkWidget *bar_pane_histogram_new_from_config(const gchar **attribute_names, const gchar **attribute_values) |
339 { | |
340 gchar *title = g_strdup(_("NoName")); | |
341 gboolean expanded = TRUE; | |
342 gint height = 80; | |
1324 | 343 gint histogram_channel = HCHAN_RGB; |
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
344 gint histogram_mode = 0; |
1309 | 345 |
346 while (*attribute_names) | |
347 { | |
348 const gchar *option = *attribute_names++; | |
349 const gchar *value = *attribute_values++; | |
350 | |
1315 | 351 if (READ_CHAR_FULL("pane.title", title)) continue; |
352 if (READ_BOOL_FULL("pane.expanded", expanded)) continue; | |
1324 | 353 if (READ_INT_FULL("histogram_channel", histogram_channel)) continue; |
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
354 if (READ_INT_FULL("histogram_mode", histogram_mode)) continue; |
1324 | 355 |
1309 | 356 |
357 DEBUG_1("unknown attribute %s = %s", option, value); | |
358 } | |
359 | |
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
360 return bar_pane_histogram_new(title, height, expanded, histogram_channel, histogram_mode); |
1309 | 361 } |
362 | |
363 | |
1298 | 364 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ |