annotate src/statusicon/si_ui.c @ 3110:a522493de76e

Set up a hook_call for showing the main menu, since it's implemented in a plugin now (fixes #38).
author John Lindgren <john.lindgren@tds.net>
date Sat, 02 May 2009 11:16:23 -0400
parents 2a4eb326eb1d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
1 /*
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
2 *
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
3 * Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
4 *
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
5 * This program is free software; you can redistribute it and/or modify it
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
6 * under the terms of the GNU General Public License as published by the
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
7 * Free Software Foundation; either version 2 of the License, or (at your
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
8 * option) any later version.
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
9 *
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
10 * This program is distributed in the hope that it will be useful, but
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
11 * WITHOUT ANY WARRANTY; without even the implied warranty of
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
13 * General Public License for more details.
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
14 *
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License along
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
16 * with this program; if not, write to the Free Software Foundation, Inc.,
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
17 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
18 *
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
19 */
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
20
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
21 #include "si_ui.h"
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
22 #include "si_audacious.h"
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
23 #include "si_cfg.h"
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
24 #include "si_common.h"
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
25 #include "gtktrayicon.h"
2971
3134a0987162 - changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 2577
diff changeset
26 #include <audlegacy/ui_fileinfopopup.h>
3134a0987162 - changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 2577
diff changeset
27 #include <audlegacy/plugin.h>
3134a0987162 - changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 2577
diff changeset
28 #include <audlegacy/i18n.h>
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
29 #include <glib.h>
439
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
30 #include <gdk/gdk.h>
542
d58404ba9af9 [svn] - made popup window use audacious_fileinfopopup_show_from_title if track_name and song length is not available
giacomo
parents: 527
diff changeset
31 #include <gdk/gdkx.h>
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
32 #include <gtk/gtk.h>
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
33
2223
6b34a88b1408 statusicon: more elegant solution, workaround removed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2222
diff changeset
34 #ifndef MAX
6b34a88b1408 statusicon: more elegant solution, workaround removed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2222
diff changeset
35 # define MAX(a,b) ((a) > (b) ? (a) : (b))
6b34a88b1408 statusicon: more elegant solution, workaround removed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2222
diff changeset
36 #endif
6b34a88b1408 statusicon: more elegant solution, workaround removed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2222
diff changeset
37
796
f3ce11fad729 [svn] statusicon: improvements in title changes detection while the popup is being displayed
giacomo
parents: 795
diff changeset
38 static void si_ui_statusicon_popup_timer_start ( GtkWidget * );
f3ce11fad729 [svn] statusicon: improvements in title changes detection while the popup is being displayed
giacomo
parents: 795
diff changeset
39 static void si_ui_statusicon_popup_timer_stop ( GtkWidget * );
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
40 static void si_ui_statusicon_smallmenu_show ( gint x, gint y, guint button, guint32 time , gpointer );
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
41 static void si_ui_statusicon_smallmenu_recreate ( GtkWidget * );
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
42
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
43 extern si_cfg_t si_cfg;
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
44 static gboolean recreate_smallmenu = FALSE;
796
f3ce11fad729 [svn] statusicon: improvements in title changes detection while the popup is being displayed
giacomo
parents: 795
diff changeset
45
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
46
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
47 /* this stuff required to make titlechange hook work properly */
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
48 typedef struct
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
49 {
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
50 gchar *title;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
51 gchar *filename;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
52 gpointer evbox;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
53 }
2060
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
54 si_aud_hook_tchange_prevs_t;
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
55
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
56
886
f2fde7b4dccd [svn] - statusicon: use function/define names that do not collide with gtk >= 2.10 internals (paranoia)
giacomo
parents: 855
diff changeset
57 static AudGtkTrayIcon *
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
58 si_ui_statusicon_create ( void )
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
59 {
886
f2fde7b4dccd [svn] - statusicon: use function/define names that do not collide with gtk >= 2.10 internals (paranoia)
giacomo
parents: 855
diff changeset
60 AudGtkTrayIcon *si_applet = NULL;
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
61
886
f2fde7b4dccd [svn] - statusicon: use function/define names that do not collide with gtk >= 2.10 internals (paranoia)
giacomo
parents: 855
diff changeset
62 si_applet = _aud_gtk_tray_icon_new( "audacious" );
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
63
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
64 gtk_widget_show( GTK_WIDGET(si_applet) );
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
65
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
66 return si_applet;
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
67 }
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
68
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
69
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
70 static gboolean
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
71 si_ui_statusicon_cb_btpress ( GtkWidget * evbox , GdkEventButton * event )
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
72 {
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
73 switch ( event->button )
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
74 {
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
75 case 1:
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
76 {
2422
e780330f6189 jump between songs using shift+lmb and shift+rmb (Bugzilla #157)
Cristi Magherusan <majeru@atheme.org>
parents: 2223
diff changeset
77 if (event->state & GDK_SHIFT_MASK)
e780330f6189 jump between songs using shift+lmb and shift+rmb (Bugzilla #157)
Cristi Magherusan <majeru@atheme.org>
parents: 2223
diff changeset
78 audacious_drct_pl_next();
e780330f6189 jump between songs using shift+lmb and shift+rmb (Bugzilla #157)
Cristi Magherusan <majeru@atheme.org>
parents: 2223
diff changeset
79 else
e780330f6189 jump between songs using shift+lmb and shift+rmb (Bugzilla #157)
Cristi Magherusan <majeru@atheme.org>
parents: 2223
diff changeset
80 si_audacious_toggle_visibility();
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
81 break;
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
82 }
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
83
2167
d44adaddae8b applied a patch from Igor Stirbu, middleclick on SI toggles play/pause
Cristi Magherusan <majeru@atheme-project.org>
parents: 2161
diff changeset
84 case 2:
d44adaddae8b applied a patch from Igor Stirbu, middleclick on SI toggles play/pause
Cristi Magherusan <majeru@atheme-project.org>
parents: 2161
diff changeset
85 {
d44adaddae8b applied a patch from Igor Stirbu, middleclick on SI toggles play/pause
Cristi Magherusan <majeru@atheme-project.org>
parents: 2161
diff changeset
86 si_audacious_toggle_playback();
d44adaddae8b applied a patch from Igor Stirbu, middleclick on SI toggles play/pause
Cristi Magherusan <majeru@atheme-project.org>
parents: 2161
diff changeset
87 break;
d44adaddae8b applied a patch from Igor Stirbu, middleclick on SI toggles play/pause
Cristi Magherusan <majeru@atheme-project.org>
parents: 2161
diff changeset
88 }
d44adaddae8b applied a patch from Igor Stirbu, middleclick on SI toggles play/pause
Cristi Magherusan <majeru@atheme-project.org>
parents: 2161
diff changeset
89
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
90 case 3:
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
91 {
2422
e780330f6189 jump between songs using shift+lmb and shift+rmb (Bugzilla #157)
Cristi Magherusan <majeru@atheme.org>
parents: 2223
diff changeset
92 if (event->state & GDK_SHIFT_MASK)
e780330f6189 jump between songs using shift+lmb and shift+rmb (Bugzilla #157)
Cristi Magherusan <majeru@atheme.org>
parents: 2223
diff changeset
93 audacious_drct_pl_prev();
e780330f6189 jump between songs using shift+lmb and shift+rmb (Bugzilla #157)
Cristi Magherusan <majeru@atheme.org>
parents: 2223
diff changeset
94 else{
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
95 switch ( si_cfg.rclick_menu )
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
96 {
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
97 case SI_CFG_RCLICK_MENU_SMALL1:
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
98 case SI_CFG_RCLICK_MENU_SMALL2:
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
99 if ( recreate_smallmenu == TRUE )
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
100 si_ui_statusicon_smallmenu_recreate( evbox );
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
101 si_ui_statusicon_smallmenu_show( event->x_root , event->y_root , 3 , event->time , evbox );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
102 break;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
103 case SI_CFG_RCLICK_MENU_AUD:
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
104 default:
3110
a522493de76e Set up a hook_call for showing the main menu, since it's implemented in a plugin now (fixes #38).
John Lindgren <john.lindgren@tds.net>
parents: 2992
diff changeset
105 aud_hook_call ("show main menu", event);
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
106 break;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
107 }
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
108 break;
2422
e780330f6189 jump between songs using shift+lmb and shift+rmb (Bugzilla #157)
Cristi Magherusan <majeru@atheme.org>
parents: 2223
diff changeset
109 }
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
110 }
439
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
111 }
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
112
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
113 return FALSE;
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
114 }
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
115
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
116
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
117 static gboolean
453
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
118 si_ui_statusicon_cb_btscroll ( GtkWidget * evbox , GdkEventScroll * event )
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
119 {
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
120 switch ( event->direction )
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
121 {
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
122 case GDK_SCROLL_UP:
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
123 {
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
124 switch ( si_cfg.scroll_action )
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
125 {
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
126 case SI_CFG_SCROLL_ACTION_VOLUME:
2425
ced4a5392948 made status plugin use the main mouse wheel setting when changing the volume
Cristi Magherusan <majeru@atheme.org>
parents: 2422
diff changeset
127 si_audacious_volume_change( si_cfg.volume_delta );
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
128 break;
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
129 case SI_CFG_SCROLL_ACTION_SKIP:
919
d16737cc85f6 [svn] - statusicon: invert skip direction in mouse wheel; much better this way
giacomo
parents: 918
diff changeset
130 si_audacious_playback_skip( -1 );
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
131 break;
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
132 }
453
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
133 break;
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
134 }
3110
a522493de76e Set up a hook_call for showing the main menu, since it's implemented in a plugin now (fixes #38).
John Lindgren <john.lindgren@tds.net>
parents: 2992
diff changeset
135
453
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
136 case GDK_SCROLL_DOWN:
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
137 {
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
138 switch ( si_cfg.scroll_action )
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
139 {
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
140 case SI_CFG_SCROLL_ACTION_VOLUME:
2425
ced4a5392948 made status plugin use the main mouse wheel setting when changing the volume
Cristi Magherusan <majeru@atheme.org>
parents: 2422
diff changeset
141 si_audacious_volume_change( -si_cfg.volume_delta );
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
142 break;
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
143 case SI_CFG_SCROLL_ACTION_SKIP:
919
d16737cc85f6 [svn] - statusicon: invert skip direction in mouse wheel; much better this way
giacomo
parents: 918
diff changeset
144 si_audacious_playback_skip( 1 );
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
145 break;
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
146 }
453
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
147 break;
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
148 }
2219
d7acad3d50e8 statusicon: warnings suppressed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2167
diff changeset
149
d7acad3d50e8 statusicon: warnings suppressed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2167
diff changeset
150 default: ;
453
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
151 }
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
152
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
153 return FALSE;
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
154 }
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
155
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
156
60395c0d7587 [svn] - status icon plugin: use scroll wheel on the status icon to change volume
giacomo
parents: 452
diff changeset
157 static gboolean
439
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
158 si_ui_statusicon_popup_show ( gpointer evbox )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
159 {
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
160 if ( GPOINTER_TO_INT(g_object_get_data( G_OBJECT(evbox) , "timer_active" )) == 1 )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
161 {
1442
95b8abed24c7 statusicon: new tuple API
William Pitcock <nenolod@atheme-project.org>
parents: 1054
diff changeset
162 Tuple *tuple;
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
163 Playlist *pl_active = aud_playlist_get_active();
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
164 gint pos = aud_playlist_get_position(pl_active);
439
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
165 GtkWidget *popup = g_object_get_data( G_OBJECT(evbox) , "popup" );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
166
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
167 tuple = aud_playlist_get_tuple( pl_active , pos );
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1697
diff changeset
168 if ( ( tuple == NULL ) || ( aud_tuple_get_int(tuple, FIELD_LENGTH, NULL) < 1 ) )
542
d58404ba9af9 [svn] - made popup window use audacious_fileinfopopup_show_from_title if track_name and song length is not available
giacomo
parents: 527
diff changeset
169 {
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
170 gchar *title = aud_playlist_get_songtitle( pl_active , pos );
542
d58404ba9af9 [svn] - made popup window use audacious_fileinfopopup_show_from_title if track_name and song length is not available
giacomo
parents: 527
diff changeset
171 audacious_fileinfopopup_show_from_title( popup , title );
d58404ba9af9 [svn] - made popup window use audacious_fileinfopopup_show_from_title if track_name and song length is not available
giacomo
parents: 527
diff changeset
172 g_free( title );
d58404ba9af9 [svn] - made popup window use audacious_fileinfopopup_show_from_title if track_name and song length is not available
giacomo
parents: 527
diff changeset
173 }
d58404ba9af9 [svn] - made popup window use audacious_fileinfopopup_show_from_title if track_name and song length is not available
giacomo
parents: 527
diff changeset
174 else
d58404ba9af9 [svn] - made popup window use audacious_fileinfopopup_show_from_title if track_name and song length is not available
giacomo
parents: 527
diff changeset
175 {
d58404ba9af9 [svn] - made popup window use audacious_fileinfopopup_show_from_title if track_name and song length is not available
giacomo
parents: 527
diff changeset
176 audacious_fileinfopopup_show_from_tuple( popup , tuple );
d58404ba9af9 [svn] - made popup window use audacious_fileinfopopup_show_from_title if track_name and song length is not available
giacomo
parents: 527
diff changeset
177 }
439
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
178
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
179 g_object_set_data( G_OBJECT(evbox) , "popup_active" , GINT_TO_POINTER(1) );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
180 }
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
181
796
f3ce11fad729 [svn] statusicon: improvements in title changes detection while the popup is being displayed
giacomo
parents: 795
diff changeset
182 si_ui_statusicon_popup_timer_stop( evbox );
439
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
183 return FALSE;
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
184 }
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
185
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
186
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
187 static void
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
188 si_ui_statusicon_popup_hide ( gpointer evbox )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
189 {
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
190 if ( GPOINTER_TO_INT(g_object_get_data( G_OBJECT(evbox) , "popup_active" )) == 1 )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
191 {
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
192 GtkWidget *popup = g_object_get_data( G_OBJECT(evbox) , "popup" );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
193 g_object_set_data( G_OBJECT(evbox) , "popup_active" , GINT_TO_POINTER(0) );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
194 audacious_fileinfopopup_hide( popup , NULL );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
195 }
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
196 }
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
197
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
198
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
199 static void
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
200 si_ui_statusicon_popup_timer_start ( GtkWidget * evbox )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
201 {
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
202 gint timer_id = g_timeout_add( 500 , si_ui_statusicon_popup_show , evbox );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
203 g_object_set_data( G_OBJECT(evbox) , "timer_id" , GINT_TO_POINTER(timer_id) );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
204 g_object_set_data( G_OBJECT(evbox) , "timer_active" , GINT_TO_POINTER(1) );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
205 return;
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
206 }
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
207
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
208
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
209 static void
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
210 si_ui_statusicon_popup_timer_stop ( GtkWidget * evbox )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
211 {
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
212 if ( GPOINTER_TO_INT(g_object_get_data(G_OBJECT(evbox),"timer_active")) == 1 )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
213 g_source_remove( GPOINTER_TO_INT(g_object_get_data(G_OBJECT(evbox),"timer_id")) );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
214
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
215 g_object_set_data( G_OBJECT(evbox) , "timer_id" , GINT_TO_POINTER(0) );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
216 g_object_set_data( G_OBJECT(evbox) , "timer_active" , GINT_TO_POINTER(0) );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
217 return;
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
218 }
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
219
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
220
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
221 static void
2060
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
222 si_ui_statusicon_cb_aud_hook_pbstart ( gpointer plentry_gp , gpointer evbox )
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
223 {
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
224 if ( ( GPOINTER_TO_INT(g_object_get_data( G_OBJECT(evbox) , "popup_active" )) == 1 ) &&
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
225 ( plentry_gp != NULL ) )
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
226 {
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
227 si_ui_statusicon_popup_hide( evbox );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
228 si_ui_statusicon_popup_timer_start( evbox );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
229 }
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
230 }
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
231
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
232
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
233 static void
2060
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
234 si_ui_statusicon_cb_aud_hook_tchange ( gpointer plentry_gp , gpointer prevs_gp )
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
235 {
2060
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
236 si_aud_hook_tchange_prevs_t *prevs = prevs_gp;
796
f3ce11fad729 [svn] statusicon: improvements in title changes detection while the popup is being displayed
giacomo
parents: 795
diff changeset
237 PlaylistEntry *pl_entry = plentry_gp;
1054
2d6a00ed166f [svn] - statusicon: partial rewrite of si_ui_statusicon_cb_hook_tchange , nicer this way
giacomo
parents: 1053
diff changeset
238 gboolean upd_pop = FALSE;
2d6a00ed166f [svn] - statusicon: partial rewrite of si_ui_statusicon_cb_hook_tchange , nicer this way
giacomo
parents: 1053
diff changeset
239
2d6a00ed166f [svn] - statusicon: partial rewrite of si_ui_statusicon_cb_hook_tchange , nicer this way
giacomo
parents: 1053
diff changeset
240 if ( pl_entry != NULL )
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
241 {
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
242 if ( ( prevs->title != NULL ) && ( prevs->filename != NULL ) )
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
243 {
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
244 if ( ( pl_entry->filename != NULL ) &&
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
245 ( !strcmp(pl_entry->filename,prevs->filename) ) )
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
246 {
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
247 if ( ( pl_entry->title != NULL ) &&
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
248 ( strcmp(pl_entry->title,prevs->title) ) )
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
249 {
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
250 g_free( prevs->title );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
251 prevs->title = g_strdup(pl_entry->title);
1054
2d6a00ed166f [svn] - statusicon: partial rewrite of si_ui_statusicon_cb_hook_tchange , nicer this way
giacomo
parents: 1053
diff changeset
252 upd_pop = TRUE;
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
253 }
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
254 }
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
255 else
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
256 {
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
257 g_free(prevs->filename);
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
258 prevs->filename = g_strdup(pl_entry->filename);
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
259 /* if filename changes, reset title as well */
1054
2d6a00ed166f [svn] - statusicon: partial rewrite of si_ui_statusicon_cb_hook_tchange , nicer this way
giacomo
parents: 1053
diff changeset
260 g_free(prevs->title);
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
261 prevs->title = g_strdup(pl_entry->title);
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
262 }
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
263 }
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
264 else
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
265 {
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
266 if ( prevs->title != NULL )
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
267 g_free(prevs->title);
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
268 prevs->title = g_strdup(pl_entry->title);
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
269 if ( prevs->filename != NULL )
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
270 g_free(prevs->filename);
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
271 prevs->filename = g_strdup(pl_entry->filename);
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
272 }
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
273 }
1054
2d6a00ed166f [svn] - statusicon: partial rewrite of si_ui_statusicon_cb_hook_tchange , nicer this way
giacomo
parents: 1053
diff changeset
274
2d6a00ed166f [svn] - statusicon: partial rewrite of si_ui_statusicon_cb_hook_tchange , nicer this way
giacomo
parents: 1053
diff changeset
275 if ( ( upd_pop == TRUE ) &&
2d6a00ed166f [svn] - statusicon: partial rewrite of si_ui_statusicon_cb_hook_tchange , nicer this way
giacomo
parents: 1053
diff changeset
276 ( GPOINTER_TO_INT(g_object_get_data( G_OBJECT(prevs->evbox) , "popup_active" )) == 1 ) )
796
f3ce11fad729 [svn] statusicon: improvements in title changes detection while the popup is being displayed
giacomo
parents: 795
diff changeset
277 {
1054
2d6a00ed166f [svn] - statusicon: partial rewrite of si_ui_statusicon_cb_hook_tchange , nicer this way
giacomo
parents: 1053
diff changeset
278 si_ui_statusicon_popup_hide( prevs->evbox );
2d6a00ed166f [svn] - statusicon: partial rewrite of si_ui_statusicon_cb_hook_tchange , nicer this way
giacomo
parents: 1053
diff changeset
279 si_ui_statusicon_popup_timer_start( prevs->evbox );
796
f3ce11fad729 [svn] statusicon: improvements in title changes detection while the popup is being displayed
giacomo
parents: 795
diff changeset
280 }
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
281 }
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
282
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
283
439
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
284 static gboolean
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
285 si_ui_statusicon_cb_popup ( GtkWidget * evbox , GdkEvent * event )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
286 {
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
287 if ((event->type == GDK_LEAVE_NOTIFY || event->type == GDK_ENTER_NOTIFY) &&
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
288 event->crossing.detail == GDK_NOTIFY_INFERIOR)
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
289 return FALSE;
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
290
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
291 if ( event->type != GDK_KEY_PRESS && event->type != GDK_KEY_RELEASE )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
292 {
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
293 GtkWidget *event_widget = gtk_get_event_widget( event );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
294 if ( event_widget != evbox )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
295 return FALSE;
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
296 }
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
297
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
298 switch (event->type)
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
299 {
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
300 case GDK_EXPOSE:
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
301 /* do nothing */
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
302 break;
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
303
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
304 case GDK_ENTER_NOTIFY:
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
305 si_ui_statusicon_popup_timer_start( evbox );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
306 break;
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
307
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
308 case GDK_LEAVE_NOTIFY:
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
309 si_ui_statusicon_popup_timer_stop( evbox );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
310 if ( GPOINTER_TO_INT(g_object_get_data( G_OBJECT(evbox) , "popup_active" )) == 1 )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
311 si_ui_statusicon_popup_hide( evbox );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
312 break;
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
313
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
314 case GDK_MOTION_NOTIFY:
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
315 break; /* ignore */
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
316
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
317 case GDK_BUTTON_PRESS:
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
318 case GDK_BUTTON_RELEASE:
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
319 case GDK_KEY_PRESS:
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
320 case GDK_KEY_RELEASE:
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
321 case GDK_PROXIMITY_IN:
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
322 case GDK_SCROLL:
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
323 si_ui_statusicon_popup_timer_stop( evbox );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
324 if ( GPOINTER_TO_INT(g_object_get_data( G_OBJECT(evbox) , "popup_active" )) == 1 )
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
325 si_ui_statusicon_popup_hide( evbox );
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
326 break;
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
327
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
328 default:
84029a5250c1 [svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
giacomo
parents: 433
diff changeset
329 break;
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
330 }
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
331
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
332 return FALSE;
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
333 }
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
334
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
335
440
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
336 static void
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
337 si_ui_statusicon_image_update ( GtkWidget * image )
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
338 {
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
339 GdkPixbuf *si_pixbuf, *si_scaled_pixbuf;
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
340 gint size = GPOINTER_TO_INT(g_object_get_data( G_OBJECT(image) , "size" ));
455
f001b217c88b [svn] - status icon plugin: added a workaround to handle situations where KWin doesn't give a correct size for tray icons
giacomo
parents: 454
diff changeset
341 static gchar *wmname = NULL;
3110
a522493de76e Set up a hook_call for showing the main menu, since it's implemented in a plugin now (fixes #38).
John Lindgren <john.lindgren@tds.net>
parents: 2992
diff changeset
342
2219
d7acad3d50e8 statusicon: warnings suppressed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2167
diff changeset
343 AUDDBG("WM reported proposed icon size: %d\n", size);
455
f001b217c88b [svn] - status icon plugin: added a workaround to handle situations where KWin doesn't give a correct size for tray icons
giacomo
parents: 454
diff changeset
344
f001b217c88b [svn] - status icon plugin: added a workaround to handle situations where KWin doesn't give a correct size for tray icons
giacomo
parents: 454
diff changeset
345 /* sometimes, KDE won't give the correct size-allocation; workaround this */
f001b217c88b [svn] - status icon plugin: added a workaround to handle situations where KWin doesn't give a correct size for tray icons
giacomo
parents: 454
diff changeset
346 if ( wmname == NULL )
f001b217c88b [svn] - status icon plugin: added a workaround to handle situations where KWin doesn't give a correct size for tray icons
giacomo
parents: 454
diff changeset
347 {
f001b217c88b [svn] - status icon plugin: added a workaround to handle situations where KWin doesn't give a correct size for tray icons
giacomo
parents: 454
diff changeset
348 GdkScreen *screen = gdk_screen_get_default();
f001b217c88b [svn] - status icon plugin: added a workaround to handle situations where KWin doesn't give a correct size for tray icons
giacomo
parents: 454
diff changeset
349 if ( screen != NULL )
f001b217c88b [svn] - status icon plugin: added a workaround to handle situations where KWin doesn't give a correct size for tray icons
giacomo
parents: 454
diff changeset
350 wmname = (gchar*)gdk_x11_screen_get_window_manager_name( screen );
2221
b4a2a7197c05 statusicon: quick workaround for Xfce4
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2219
diff changeset
351 AUDDBG("WM name: %s\n", wmname);
455
f001b217c88b [svn] - status icon plugin: added a workaround to handle situations where KWin doesn't give a correct size for tray icons
giacomo
parents: 454
diff changeset
352 }
2223
6b34a88b1408 statusicon: more elegant solution, workaround removed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2222
diff changeset
353 if ( ( size <= 1 || size > 22 ) && ( wmname != NULL ) && !strcmp("KWin",wmname) )
455
f001b217c88b [svn] - status icon plugin: added a workaround to handle situations where KWin doesn't give a correct size for tray icons
giacomo
parents: 454
diff changeset
354 size = 22;
2427
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
355 GtkIconTheme *theme;
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
356 GtkIconInfo *info;
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
357 int *array;
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
358 int i;
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
359 const gchar *path;
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
360 gboolean scalable = FALSE;
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
361 gboolean catch = FALSE;
3110
a522493de76e Set up a hook_call for showing the main menu, since it's implemented in a plugin now (fixes #38).
John Lindgren <john.lindgren@tds.net>
parents: 2992
diff changeset
362
2427
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
363 theme = gtk_icon_theme_get_default ();
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
364 array = gtk_icon_theme_get_icon_sizes (theme, "audacious");
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
365 if (array[0] != 0) {
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
366 for (i = 0; array[i] != 0; i++) {
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
367 if (array[i] == -1)
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
368 scalable = TRUE;
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
369 if (array[i] == 22)
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
370 catch = TRUE;
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
371 }
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
372 }
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
373 g_free (array);
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
374 if (catch) {
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
375 info = gtk_icon_theme_lookup_icon (theme, "audacious", 22, GTK_ICON_LOOKUP_NO_SVG);
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
376 path = gtk_icon_info_get_filename (info);
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
377 si_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
378 } else if (scalable) {
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
379 info = gtk_icon_theme_lookup_icon (theme, "audacious", -1, GTK_ICON_LOOKUP_FORCE_SVG);
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
380 path = gtk_icon_info_get_filename (info);
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
381 si_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
3110
a522493de76e Set up a hook_call for showing the main menu, since it's implemented in a plugin now (fixes #38).
John Lindgren <john.lindgren@tds.net>
parents: 2992
diff changeset
382
2427
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
383 } else {
2432
db80c2fc0b57 get rid of hardcoded paths
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2427
diff changeset
384 si_pixbuf = gdk_pixbuf_new_from_file (DATA_DIR "/images/audacious_player.xpm", NULL);
2427
e041adc026a8 Status Icon can now be changed, patch provided by Matteo (Bugzilla #182)
Cristi Magherusan <majeru@atheme.org>
parents: 2425
diff changeset
385 }
440
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
386 si_scaled_pixbuf = gdk_pixbuf_scale_simple( si_pixbuf , size , size , GDK_INTERP_BILINEAR );
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
387 gtk_image_set_from_pixbuf( GTK_IMAGE(image) , si_scaled_pixbuf );
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
388 g_object_unref( si_pixbuf );
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
389 g_object_unref( si_scaled_pixbuf );
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
390
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
391 return;
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
392 }
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
393
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
394
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
395 static void
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
396 si_ui_statusicon_cb_image_sizalloc ( GtkWidget * image , GtkAllocation * allocation , gpointer si_applet )
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
397 {
2223
6b34a88b1408 statusicon: more elegant solution, workaround removed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2222
diff changeset
398 /*GtkOrientation orientation;*/
440
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
399 static gint prev_size = 0;
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
400 gint size = 0;
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
401
2223
6b34a88b1408 statusicon: more elegant solution, workaround removed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2222
diff changeset
402 /*orientation = _aud_gtk_tray_icon_get_orientation( AUD_GTK_TRAY_ICON(si_applet) );
440
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
403 if ( orientation == GTK_ORIENTATION_HORIZONTAL )
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
404 size = allocation->height;
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
405 else
2223
6b34a88b1408 statusicon: more elegant solution, workaround removed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2222
diff changeset
406 size = allocation->width;*/
3110
a522493de76e Set up a hook_call for showing the main menu, since it's implemented in a plugin now (fixes #38).
John Lindgren <john.lindgren@tds.net>
parents: 2992
diff changeset
407
2223
6b34a88b1408 statusicon: more elegant solution, workaround removed
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2222
diff changeset
408 size = MAX(allocation->height, allocation->width); /* some WMs doesn't report orientation correctly --asphyx */
440
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
409
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
410 if ( prev_size != size )
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
411 {
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
412 prev_size = size;
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
413 g_object_set_data( G_OBJECT(image) , "size" , GINT_TO_POINTER(size) );
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
414 si_ui_statusicon_image_update( image );
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
415 }
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
416
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
417 return;
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
418 }
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
419
84fdf898438b [svn] - status icon plugin: try to auto-detect the correct size for the status icon
giacomo
parents: 439
diff changeset
420
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
421 static void
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
422 si_ui_statusicon_smallmenu_show ( gint x, gint y, guint button, guint32 time , gpointer evbox )
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
423 {
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
424 GtkWidget *si_smenu = g_object_get_data( G_OBJECT(evbox) , "smenu" );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
425 gtk_menu_popup( GTK_MENU(si_smenu) , NULL , NULL , NULL , NULL , button , time );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
426 }
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
427
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
428
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
429 static GtkWidget *
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
430 si_ui_statusicon_smallmenu_create ( void )
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
431 {
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
432 GtkWidget *si_smenu = gtk_menu_new();
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
433 GtkWidget *si_smenu_prev_item, *si_smenu_play_item, *si_smenu_pause_item;
855
fbf1f593b0c6 [svn] statusicon: added a open-file item in the small right-click menu
giacomo
parents: 854
diff changeset
434 GtkWidget *si_smenu_stop_item, *si_smenu_next_item, *si_smenu_sep_item, *si_smenu_eject_item;
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
435 GtkWidget *si_smenu_quit_item;
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
436
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
437 si_smenu_eject_item = gtk_image_menu_item_new_from_stock(
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
438 GTK_STOCK_OPEN , NULL );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
439 g_signal_connect_swapped( si_smenu_eject_item , "activate" ,
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
440 G_CALLBACK(si_audacious_playback_ctrl) ,
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
441 GINT_TO_POINTER(SI_AUDACIOUS_PLAYBACK_CTRL_EJECT) );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
442 gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_eject_item );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
443 gtk_widget_show(si_smenu_eject_item);
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
444 si_smenu_sep_item = gtk_separator_menu_item_new();
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
445 gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_sep_item );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
446 gtk_widget_show(si_smenu_sep_item);
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
447 si_smenu_prev_item = gtk_image_menu_item_new_from_stock(
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
448 GTK_STOCK_MEDIA_PREVIOUS , NULL );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
449 g_signal_connect_swapped( si_smenu_prev_item , "activate" ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
450 G_CALLBACK(si_audacious_playback_ctrl) ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
451 GINT_TO_POINTER(SI_AUDACIOUS_PLAYBACK_CTRL_PREV) );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
452 gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_prev_item );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
453 gtk_widget_show(si_smenu_prev_item);
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
454 si_smenu_play_item = gtk_image_menu_item_new_from_stock(
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
455 GTK_STOCK_MEDIA_PLAY , NULL );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
456 g_signal_connect_swapped( si_smenu_play_item , "activate" ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
457 G_CALLBACK(si_audacious_playback_ctrl) ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
458 GINT_TO_POINTER(SI_AUDACIOUS_PLAYBACK_CTRL_PLAY) );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
459 gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_play_item );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
460 gtk_widget_show(si_smenu_play_item);
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
461 si_smenu_pause_item = gtk_image_menu_item_new_from_stock(
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
462 GTK_STOCK_MEDIA_PAUSE , NULL );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
463 g_signal_connect_swapped( si_smenu_pause_item , "activate" ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
464 G_CALLBACK(si_audacious_playback_ctrl) ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
465 GINT_TO_POINTER(SI_AUDACIOUS_PLAYBACK_CTRL_PAUSE) );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
466 gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_pause_item );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
467 gtk_widget_show(si_smenu_pause_item);
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
468 si_smenu_stop_item = gtk_image_menu_item_new_from_stock(
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
469 GTK_STOCK_MEDIA_STOP , NULL );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
470 g_signal_connect_swapped( si_smenu_stop_item , "activate" ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
471 G_CALLBACK(si_audacious_playback_ctrl) ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
472 GINT_TO_POINTER(SI_AUDACIOUS_PLAYBACK_CTRL_STOP) );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
473 gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_stop_item );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
474 gtk_widget_show(si_smenu_stop_item);
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
475 si_smenu_next_item = gtk_image_menu_item_new_from_stock(
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
476 GTK_STOCK_MEDIA_NEXT , NULL );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
477 g_signal_connect_swapped( si_smenu_next_item , "activate" ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
478 G_CALLBACK(si_audacious_playback_ctrl) ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
479 GINT_TO_POINTER(SI_AUDACIOUS_PLAYBACK_CTRL_NEXT) );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
480 gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_next_item );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
481 gtk_widget_show(si_smenu_next_item);
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
482
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
483 if ( si_cfg.rclick_menu == SI_CFG_RCLICK_MENU_SMALL2 )
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
484 {
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
485 si_smenu_sep_item = gtk_separator_menu_item_new();
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
486 gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_sep_item );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
487 gtk_widget_show(si_smenu_sep_item);
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
488 si_smenu_quit_item = gtk_image_menu_item_new_from_stock(
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
489 GTK_STOCK_QUIT , NULL );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
490 g_signal_connect_swapped( si_smenu_quit_item , "activate" ,
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
491 G_CALLBACK(si_audacious_quit) , NULL );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
492 gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_quit_item );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
493 gtk_widget_show(si_smenu_quit_item);
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
494 }
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
495
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
496 return si_smenu;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
497 }
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
498
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
499
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
500 static void
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
501 si_ui_statusicon_smallmenu_recreate ( GtkWidget * evbox )
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
502 {
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
503 GtkWidget *smenu = g_object_get_data( G_OBJECT(evbox) , "smenu" );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
504 gtk_widget_destroy( GTK_WIDGET(smenu) );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
505 smenu = si_ui_statusicon_smallmenu_create();
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
506 g_object_set_data( G_OBJECT(evbox) , "smenu" , smenu );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
507 recreate_smallmenu = FALSE;
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
508 return;
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
509 }
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
510
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
511
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
512 void
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
513 si_ui_statusicon_enable ( gboolean enable )
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
514 {
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
515 static GtkWidget *si_evbox = NULL;
2060
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
516 static si_aud_hook_tchange_prevs_t *si_aud_hook_tchange_prevs = NULL;
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
517
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
518 if (( enable == TRUE ) && ( si_evbox == NULL ))
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
519 {
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
520 GtkWidget *si_image;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
521 GtkWidget *si_popup;
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
522 GtkWidget *si_smenu;
886
f2fde7b4dccd [svn] - statusicon: use function/define names that do not collide with gtk >= 2.10 internals (paranoia)
giacomo
parents: 855
diff changeset
523 AudGtkTrayIcon *si_applet;
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
524 GtkRequisition req;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
525 GtkAllocation allocation;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
526
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
527 si_applet = si_ui_statusicon_create();
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
528 if ( si_applet == NULL )
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
529 {
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
530 g_warning( "StatusIcon plugin: unable to create a status icon.\n" );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
531 return;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
532 }
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
533
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
534 si_image = gtk_image_new();
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
535 g_object_set_data( G_OBJECT(si_image) , "size" , GINT_TO_POINTER(0) );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
536
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
537 g_signal_connect( si_image , "size-allocate" ,
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
538 G_CALLBACK(si_ui_statusicon_cb_image_sizalloc) , si_applet );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
539
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
540 si_evbox = gtk_event_box_new();
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
541 si_popup = audacious_fileinfopopup_create();
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
542
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
543 g_object_set_data( G_OBJECT(si_evbox) , "applet" , si_applet );
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
544
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
545 g_object_set_data( G_OBJECT(si_evbox) , "timer_id" , GINT_TO_POINTER(0) );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
546 g_object_set_data( G_OBJECT(si_evbox) , "timer_active" , GINT_TO_POINTER(0) );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
547
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
548 g_object_set_data( G_OBJECT(si_evbox) , "popup_active" , GINT_TO_POINTER(0) );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
549 g_object_set_data( G_OBJECT(si_evbox) , "popup" , si_popup );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
550
2161
e6522a66278a applied a patch from chrome|debian, fixes bug#56
Cristi Magherusan <majeru@atheme-project.org>
parents: 2060
diff changeset
551 g_signal_connect( G_OBJECT(si_evbox) , "button-release-event" ,
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
552 G_CALLBACK(si_ui_statusicon_cb_btpress) , NULL );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
553 g_signal_connect( G_OBJECT(si_evbox) , "scroll-event" ,
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
554 G_CALLBACK(si_ui_statusicon_cb_btscroll) , NULL );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
555 g_signal_connect_after( G_OBJECT(si_evbox) , "event-after" ,
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
556 G_CALLBACK(si_ui_statusicon_cb_popup) , NULL );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
557
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
558 gtk_container_add( GTK_CONTAINER(si_evbox), si_image );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
559 gtk_container_add( GTK_CONTAINER(si_applet), si_evbox );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
560
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
561 gtk_widget_show_all( GTK_WIDGET(si_applet) );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
562
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
563 gtk_widget_size_request( GTK_WIDGET(si_applet) , &req );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
564 allocation.x = 0;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
565 allocation.y = 0;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
566 allocation.width = req.width;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
567 allocation.height = req.height;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
568 gtk_widget_size_allocate( GTK_WIDGET(si_applet) , &allocation );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
569
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
570 /* small menu that can be used in place of the audacious standard one */
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
571 si_smenu = si_ui_statusicon_smallmenu_create();
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
572 g_object_set_data( G_OBJECT(si_evbox) , "smenu" , si_smenu );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
573
2060
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
574 aud_hook_associate( "playback begin" , si_ui_statusicon_cb_aud_hook_pbstart , si_evbox );
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
575 si_aud_hook_tchange_prevs = g_malloc0(sizeof(si_aud_hook_tchange_prevs_t));
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
576 si_aud_hook_tchange_prevs->title = NULL;
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
577 si_aud_hook_tchange_prevs->filename = NULL;
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
578 si_aud_hook_tchange_prevs->evbox = si_evbox;
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
579 aud_hook_associate( "playlist set info" , si_ui_statusicon_cb_aud_hook_tchange , si_aud_hook_tchange_prevs );
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
580
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
581 return;
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
582 }
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
583 else
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
584 {
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
585 if ( si_evbox != NULL )
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
586 {
886
f2fde7b4dccd [svn] - statusicon: use function/define names that do not collide with gtk >= 2.10 internals (paranoia)
giacomo
parents: 855
diff changeset
587 AudGtkTrayIcon *si_applet = g_object_get_data( G_OBJECT(si_evbox) , "applet" );
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
588 GtkWidget *si_smenu = g_object_get_data( G_OBJECT(si_evbox) , "smenu" );
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
589 si_ui_statusicon_popup_timer_stop( si_evbox ); /* just in case the timer is active */
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
590 gtk_widget_destroy( GTK_WIDGET(si_evbox) );
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
591 gtk_widget_destroy( GTK_WIDGET(si_applet) );
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
592 gtk_widget_destroy( GTK_WIDGET(si_smenu) );
2060
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
593 aud_hook_dissociate( "playback begin" , si_ui_statusicon_cb_aud_hook_pbstart );
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
594 aud_hook_dissociate( "playlist set info" , si_ui_statusicon_cb_aud_hook_tchange );
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
595 if ( si_aud_hook_tchange_prevs->title != NULL ) g_free( si_aud_hook_tchange_prevs->title );
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
596 if ( si_aud_hook_tchange_prevs->filename != NULL ) g_free( si_aud_hook_tchange_prevs->filename );
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
597 g_free( si_aud_hook_tchange_prevs );
0803fba87da8 hook shit
William Pitcock <nenolod@atheme.org>
parents: 2057
diff changeset
598 si_aud_hook_tchange_prevs = NULL;
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
599 si_smenu = NULL;
795
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
600 si_evbox = NULL;
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
601 }
ca6dca840074 [svn] - statusicon: re-display statusicon popup with updated information when song (or title) changes, closes bug #846
giacomo
parents: 542
diff changeset
602 return;
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
603 }
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
604 }
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
605
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
606
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
607 void
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
608 si_ui_about_show ( void )
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
609 {
454
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
610 static GtkWidget *about_dlg = NULL;
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
611 gchar *about_title;
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
612 gchar *about_text;
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
613
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
614 if ( about_dlg != NULL )
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
615 {
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
616 gtk_window_present( GTK_WINDOW(about_dlg) );
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
617 return;
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
618 }
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
619
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
620 about_title = g_strdup( _("About Status Icon Plugin") );
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
621 about_text = g_strjoin( "" , "Status Icon Plugin " , SI_VERSION_PLUGIN ,
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
622 _("\nwritten by Giacomo Lozito < james@develia.org >\n\n"
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
623 "This plugin provides a status icon, placed in\n"
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
624 "the system tray area of the window manager.\n") , NULL );
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
625
1677
f6f5603a0954 xmms_show_message() changed to audacious_info_dialog()
Matti Hamalainen <ccr@tnsp.org>
parents: 1442
diff changeset
626 about_dlg = audacious_info_dialog( about_title , about_text , _("Ok") , FALSE , NULL , NULL );
454
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
627 g_signal_connect( G_OBJECT(about_dlg) , "destroy" ,
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
628 G_CALLBACK(gtk_widget_destroyed), &about_dlg );
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
629 g_free( about_text );
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
630 g_free( about_title );
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
631
6c1c03111db4 [svn] - use xmms_show_message for the about box
giacomo
parents: 453
diff changeset
632 gtk_widget_show_all( about_dlg );
433
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
633 return;
38fe08dff5cd [svn] - added status icon plugin (written from scratch, with code from gtk 2.10)
giacomo
parents:
diff changeset
634 }
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
635
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
636
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
637 void
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
638 si_ui_prefs_cb_commit ( gpointer prefs_win )
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
639 {
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
640 GSList *list = g_object_get_data( G_OBJECT(prefs_win) , "rcm_grp" );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
641 while ( list != NULL )
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
642 {
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
643 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(list->data) ) == TRUE )
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
644 {
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
645 si_cfg.rclick_menu = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(list->data),"val"));
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
646 break;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
647 }
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
648 list = g_slist_next(list);
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
649 }
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
650
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
651 list = g_object_get_data( G_OBJECT(prefs_win) , "msa_grp" );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
652 while ( list != NULL )
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
653 {
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
654 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(list->data) ) == TRUE )
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
655 {
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
656 si_cfg.scroll_action = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(list->data),"val"));
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
657 break;
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
658 }
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
659 list = g_slist_next(list);
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
660 }
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
661
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
662 si_cfg_save();
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
663
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
664 /* request the recreation of status icon small-menu if necessary */
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
665 if ( si_cfg.rclick_menu != SI_CFG_RCLICK_MENU_AUD )
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
666 recreate_smallmenu = TRUE;
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
667
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
668 gtk_widget_destroy( GTK_WIDGET(prefs_win) );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
669 }
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
670
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
671
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
672 void
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
673 si_ui_prefs_show ( void )
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
674 {
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
675 static GtkWidget *prefs_win = NULL;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
676 GtkWidget *prefs_vbox;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
677 GtkWidget *prefs_rclick_frame, *prefs_rclick_vbox;
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
678 GtkWidget *prefs_rclick_audmenu_rbt, *prefs_rclick_smallmenu1_rbt, *prefs_rclick_smallmenu2_rbt;
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
679 GtkWidget *prefs_scroll_frame, *prefs_scroll_vbox;
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
680 GtkWidget *prefs_scroll_vol_rbt, *prefs_scroll_skip_rbt;
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
681 GtkWidget *prefs_bbar_bbox;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
682 GtkWidget *prefs_bbar_bt_ok, *prefs_bbar_bt_cancel;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
683 GdkGeometry prefs_win_hints;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
684
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
685 if ( prefs_win != NULL )
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
686 {
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
687 gtk_window_present( GTK_WINDOW(prefs_win) );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
688 return;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
689 }
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
690
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
691 prefs_win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
692 gtk_window_set_type_hint( GTK_WINDOW(prefs_win), GDK_WINDOW_TYPE_HINT_DIALOG );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
693 gtk_window_set_position( GTK_WINDOW(prefs_win), GTK_WIN_POS_CENTER );
920
c84c20155e00 [svn] - statusicon: fix preferences window name
giacomo
parents: 919
diff changeset
694 gtk_window_set_title( GTK_WINDOW(prefs_win), _("Status Icon Plugin - Preferences") );
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
695 gtk_container_set_border_width( GTK_CONTAINER(prefs_win) , 10 );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
696 prefs_win_hints.min_width = 320;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
697 prefs_win_hints.min_height = -1;
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
698 gtk_window_set_geometry_hints( GTK_WINDOW(prefs_win) , GTK_WIDGET(prefs_win) ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
699 &prefs_win_hints , GDK_HINT_MIN_SIZE );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
700 g_signal_connect( G_OBJECT(prefs_win) , "destroy" , G_CALLBACK(gtk_widget_destroyed) , &prefs_win );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
701
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
702 prefs_vbox = gtk_vbox_new( FALSE , 0 );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
703 gtk_container_add( GTK_CONTAINER(prefs_win) , prefs_vbox );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
704
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
705 prefs_rclick_frame = gtk_frame_new( _("Right-Click Menu") );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
706 prefs_rclick_vbox = gtk_vbox_new( TRUE , 0 );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
707 gtk_container_set_border_width( GTK_CONTAINER(prefs_rclick_vbox) , 6 );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
708 gtk_container_add( GTK_CONTAINER(prefs_rclick_frame) , prefs_rclick_vbox );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
709 prefs_rclick_audmenu_rbt = gtk_radio_button_new_with_label( NULL ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
710 _("Audacious standard menu") );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
711 g_object_set_data( G_OBJECT(prefs_rclick_audmenu_rbt) , "val" ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
712 GINT_TO_POINTER(SI_CFG_RCLICK_MENU_AUD) );
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
713 prefs_rclick_smallmenu1_rbt = gtk_radio_button_new_with_label_from_widget(
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
714 GTK_RADIO_BUTTON(prefs_rclick_audmenu_rbt) ,
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
715 _("Small playback menu #1") );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
716 g_object_set_data( G_OBJECT(prefs_rclick_smallmenu1_rbt) , "val" ,
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
717 GINT_TO_POINTER(SI_CFG_RCLICK_MENU_SMALL1) );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
718 prefs_rclick_smallmenu2_rbt = gtk_radio_button_new_with_label_from_widget(
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
719 GTK_RADIO_BUTTON(prefs_rclick_audmenu_rbt) ,
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
720 _("Small playback menu #2") );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
721 g_object_set_data( G_OBJECT(prefs_rclick_smallmenu2_rbt) , "val" ,
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
722 GINT_TO_POINTER(SI_CFG_RCLICK_MENU_SMALL2) );
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
723 g_object_set_data( G_OBJECT(prefs_win) , "rcm_grp" ,
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
724 gtk_radio_button_get_group(GTK_RADIO_BUTTON(prefs_rclick_smallmenu1_rbt)) );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
725 switch ( si_cfg.rclick_menu )
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
726 {
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
727 case SI_CFG_RCLICK_MENU_SMALL1:
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
728 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(prefs_rclick_smallmenu1_rbt) , TRUE );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
729 break;
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
730 case SI_CFG_RCLICK_MENU_SMALL2:
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
731 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(prefs_rclick_smallmenu2_rbt) , TRUE );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
732 break;
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
733 case SI_CFG_RCLICK_MENU_AUD:
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
734 default:
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
735 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(prefs_rclick_audmenu_rbt) , TRUE );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
736 break;
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
737 }
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
738 gtk_box_pack_start( GTK_BOX(prefs_rclick_vbox) , prefs_rclick_audmenu_rbt , TRUE , TRUE , 0 );
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
739 gtk_box_pack_start( GTK_BOX(prefs_rclick_vbox) , prefs_rclick_smallmenu1_rbt , TRUE , TRUE , 0 );
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
740 gtk_box_pack_start( GTK_BOX(prefs_rclick_vbox) , prefs_rclick_smallmenu2_rbt , TRUE , TRUE , 0 );
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
741 gtk_box_pack_start( GTK_BOX(prefs_vbox) , prefs_rclick_frame , TRUE , TRUE , 0 );
962
9f0ac3bb82f4 [svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries
giacomo
parents: 920
diff changeset
742
918
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
743 prefs_scroll_frame = gtk_frame_new( _("Mouse Scroll Action") );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
744 prefs_scroll_vbox = gtk_vbox_new( TRUE , 0 );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
745 gtk_container_set_border_width( GTK_CONTAINER(prefs_scroll_vbox) , 6 );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
746 gtk_container_add( GTK_CONTAINER(prefs_scroll_frame) , prefs_scroll_vbox );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
747 prefs_scroll_vol_rbt = gtk_radio_button_new_with_label( NULL ,
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
748 _("Change volume") );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
749 g_object_set_data( G_OBJECT(prefs_scroll_vol_rbt) , "val" ,
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
750 GINT_TO_POINTER(SI_CFG_SCROLL_ACTION_VOLUME) );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
751 prefs_scroll_skip_rbt = gtk_radio_button_new_with_label_from_widget(
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
752 GTK_RADIO_BUTTON(prefs_scroll_vol_rbt) ,
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
753 _("Change playing song") );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
754 g_object_set_data( G_OBJECT(prefs_scroll_skip_rbt) , "val" ,
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
755 GINT_TO_POINTER(SI_CFG_SCROLL_ACTION_SKIP) );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
756 g_object_set_data( G_OBJECT(prefs_win) , "msa_grp" ,
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
757 gtk_radio_button_get_group(GTK_RADIO_BUTTON(prefs_scroll_skip_rbt)) );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
758 if ( si_cfg.scroll_action == SI_CFG_SCROLL_ACTION_VOLUME )
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
759 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(prefs_scroll_vol_rbt) , TRUE );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
760 else
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
761 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(prefs_scroll_skip_rbt) , TRUE );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
762 gtk_box_pack_start( GTK_BOX(prefs_scroll_vbox) , prefs_scroll_vol_rbt , TRUE , TRUE , 0 );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
763 gtk_box_pack_start( GTK_BOX(prefs_scroll_vbox) , prefs_scroll_skip_rbt , TRUE , TRUE , 0 );
209bd85dc1b9 [svn] - statusicon: add an option to use mouse wheel to change playing song instead of volume
giacomo
parents: 886
diff changeset
764 gtk_box_pack_start( GTK_BOX(prefs_vbox) , prefs_scroll_frame , TRUE , TRUE , 0 );
854
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
765
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
766 /* horizontal separator and buttons */
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
767 gtk_box_pack_start( GTK_BOX(prefs_vbox) , gtk_hseparator_new() , FALSE , FALSE , 4 );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
768 prefs_bbar_bbox = gtk_hbutton_box_new();
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
769 gtk_button_box_set_layout( GTK_BUTTON_BOX(prefs_bbar_bbox) , GTK_BUTTONBOX_END );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
770 prefs_bbar_bt_cancel = gtk_button_new_from_stock( GTK_STOCK_CANCEL );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
771 g_signal_connect_swapped( G_OBJECT(prefs_bbar_bt_cancel) , "clicked" ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
772 G_CALLBACK(gtk_widget_destroy) , prefs_win );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
773 gtk_container_add( GTK_CONTAINER(prefs_bbar_bbox) , prefs_bbar_bt_cancel );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
774 prefs_bbar_bt_ok = gtk_button_new_from_stock( GTK_STOCK_OK );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
775 gtk_container_add( GTK_CONTAINER(prefs_bbar_bbox) , prefs_bbar_bt_ok );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
776 g_signal_connect_swapped( G_OBJECT(prefs_bbar_bt_ok) , "clicked" ,
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
777 G_CALLBACK(si_ui_prefs_cb_commit) , prefs_win );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
778 gtk_box_pack_start( GTK_BOX(prefs_vbox) , prefs_bbar_bbox , FALSE , FALSE , 0 );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
779
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
780 gtk_widget_show_all( prefs_win );
aac49941ee8f [svn] statusicon 0.3: alternative right-click menu with simple playback control commands
giacomo
parents: 796
diff changeset
781 }