audlegacy-plugins: src/statusicon/si

comparison src/statusicon/si_ui.c @ 962:9f0ac3bb82f4 trunk

[svn] - statusicon: added support for quit button in smallmenu; also, the field is being prepared for customizable smallmenu entries

author	giacomo
date	Mon, 16 Apr 2007 01:35:24 -0700
parents	c84c20155e00
children	149fc284aa86

comparison

equal deleted inserted replaced

-:25bc2010e9f0
+:9f0ac3bb82f4
 static void si_ui_statusicon_popup_timer_start ( GtkWidget * );
 static void si_ui_statusicon_popup_timer_stop ( GtkWidget * );
 static void si_ui_statusicon_smallmenu_show ( gint x, gint y, guint button, guint32 time , gpointer );
+static void si_ui_statusicon_smallmenu_recreate ( GtkWidget * );
 extern si_cfg_t si_cfg;
+static gboolean recreate_smallmenu = FALSE;
 /* this stuff required to make titlechange hook work properly */
 typedef struct
 {
 case 3:
 {
 switch ( si_cfg.rclick_menu )
 {
-case SI_CFG_RCLICK_MENU_SMALL:
+case SI_CFG_RCLICK_MENU_SMALL1:
+case SI_CFG_RCLICK_MENU_SMALL2:
+if ( recreate_smallmenu == TRUE )
+si_ui_statusicon_smallmenu_recreate( evbox );
 si_ui_statusicon_smallmenu_show( event->x_root , event->y_root , 3 , event->time , evbox );
 break;
 case SI_CFG_RCLICK_MENU_AUD:
 default:
 audacious_menu_main_show( event->x_root , event->y_root , 3 , event->time );
 si_ui_statusicon_smallmenu_create ( void )
 {
 GtkWidget *si_smenu = gtk_menu_new();
 GtkWidget *si_smenu_prev_item, *si_smenu_play_item, *si_smenu_pause_item;
 GtkWidget *si_smenu_stop_item, *si_smenu_next_item, *si_smenu_sep_item, *si_smenu_eject_item;
+GtkWidget *si_smenu_quit_item;
+si_smenu_eject_item = gtk_image_menu_item_new_from_stock(
+GTK_STOCK_OPEN , NULL );
+g_signal_connect_swapped( si_smenu_eject_item , "activate" ,
+G_CALLBACK(si_audacious_playback_ctrl) ,
+GINT_TO_POINTER(SI_AUDACIOUS_PLAYBACK_CTRL_EJECT) );
+gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_eject_item );
+gtk_widget_show(si_smenu_eject_item);
+si_smenu_sep_item = gtk_separator_menu_item_new();
+gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_sep_item );
+gtk_widget_show(si_smenu_sep_item);
 si_smenu_prev_item = gtk_image_menu_item_new_from_stock(
 GTK_STOCK_MEDIA_PREVIOUS , NULL );
 g_signal_connect_swapped( si_smenu_prev_item , "activate" ,
 G_CALLBACK(si_audacious_playback_ctrl) ,
 GINT_TO_POINTER(SI_AUDACIOUS_PLAYBACK_CTRL_PREV) );
 g_signal_connect_swapped( si_smenu_next_item , "activate" ,
 G_CALLBACK(si_audacious_playback_ctrl) ,
 GINT_TO_POINTER(SI_AUDACIOUS_PLAYBACK_CTRL_NEXT) );
 gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_next_item );
 gtk_widget_show(si_smenu_next_item);
-si_smenu_sep_item = gtk_separator_menu_item_new();
-gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_sep_item );
+if ( si_cfg.rclick_menu == SI_CFG_RCLICK_MENU_SMALL2 )
-gtk_widget_show(si_smenu_sep_item);
+{
-si_smenu_eject_item = gtk_image_menu_item_new_from_stock(
+si_smenu_sep_item = gtk_separator_menu_item_new();
-GTK_STOCK_OPEN , NULL );
+gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_sep_item );
-g_signal_connect_swapped( si_smenu_eject_item , "activate" ,
+gtk_widget_show(si_smenu_sep_item);
-G_CALLBACK(si_audacious_playback_ctrl) ,
+si_smenu_quit_item = gtk_image_menu_item_new_from_stock(
-GINT_TO_POINTER(SI_AUDACIOUS_PLAYBACK_CTRL_EJECT) );
+GTK_STOCK_QUIT , NULL );
-gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_eject_item );
+g_signal_connect_swapped( si_smenu_quit_item , "activate" ,
-gtk_widget_show(si_smenu_eject_item);
+G_CALLBACK(si_audacious_quit) , NULL );
+gtk_menu_shell_append( GTK_MENU_SHELL(si_smenu) , si_smenu_quit_item );
+gtk_widget_show(si_smenu_quit_item);
+}
 return si_smenu;
+}
+static void
+si_ui_statusicon_smallmenu_recreate ( GtkWidget * evbox )
+{
+GtkWidget *smenu = g_object_get_data( G_OBJECT(evbox) , "smenu" );
+gtk_widget_destroy( GTK_WIDGET(smenu) );
+smenu = si_ui_statusicon_smallmenu_create();
+g_object_set_data( G_OBJECT(evbox) , "smenu" , smenu );
+recreate_smallmenu = FALSE;
+return;
 }
 void
 si_ui_statusicon_enable ( gboolean enable )
 {
 static GtkWidget *si_evbox = NULL;
-static GtkWidget *si_smenu = NULL;
 static si_hook_tchange_prevs_t *si_hook_tchange_prevs = NULL;
 if (( enable == TRUE ) && ( si_evbox == NULL ))
 {
 GtkWidget *si_image;
 GtkWidget *si_popup;
+GtkWidget *si_smenu;
 AudGtkTrayIcon *si_applet;
 GtkRequisition req;
 GtkAllocation allocation;
 si_applet = si_ui_statusicon_create();
 else
 {
 if ( si_evbox != NULL )
 {
 AudGtkTrayIcon *si_applet = g_object_get_data( G_OBJECT(si_evbox) , "applet" );
+GtkWidget *si_smenu = g_object_get_data( G_OBJECT(si_evbox) , "smenu" );
 si_ui_statusicon_popup_timer_stop( si_evbox ); /* just in case the timer is active */
 gtk_widget_destroy( GTK_WIDGET(si_evbox) );
 gtk_widget_destroy( GTK_WIDGET(si_applet) );
 gtk_widget_destroy( GTK_WIDGET(si_smenu) );
 hook_dissociate( "playback begin" , si_ui_statusicon_cb_hook_pbstart );
 si_cfg.rclick_menu = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(list->data),"val"));
 break;
 }
 list = g_slist_next(list);
 }
 list = g_object_get_data( G_OBJECT(prefs_win) , "msa_grp" );
 while ( list != NULL )
 {
 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(list->data) ) == TRUE )
 {
 si_cfg.scroll_action = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(list->data),"val"));
 break;
 }
 list = g_slist_next(list);
 }
 si_cfg_save();
+/* request the recreation of status icon small-menu if necessary */
+if ( si_cfg.rclick_menu != SI_CFG_RCLICK_MENU_AUD )
+recreate_smallmenu = TRUE;
 gtk_widget_destroy( GTK_WIDGET(prefs_win) );
 }
 void
 si_ui_prefs_show ( void )
 {
 static GtkWidget *prefs_win = NULL;
 GtkWidget *prefs_vbox;
 GtkWidget *prefs_rclick_frame, *prefs_rclick_vbox;
-GtkWidget *prefs_rclick_audmenu_rbt, *prefs_rclick_smallmenu_rbt;
+GtkWidget *prefs_rclick_audmenu_rbt, *prefs_rclick_smallmenu1_rbt, *prefs_rclick_smallmenu2_rbt;
 GtkWidget *prefs_scroll_frame, *prefs_scroll_vbox;
 GtkWidget *prefs_scroll_vol_rbt, *prefs_scroll_skip_rbt;
 GtkWidget *prefs_bbar_bbox;
 GtkWidget *prefs_bbar_bt_ok, *prefs_bbar_bt_cancel;
 GdkGeometry prefs_win_hints;
 gtk_container_add( GTK_CONTAINER(prefs_rclick_frame) , prefs_rclick_vbox );
 prefs_rclick_audmenu_rbt = gtk_radio_button_new_with_label( NULL ,
 _("Audacious standard menu") );
 g_object_set_data( G_OBJECT(prefs_rclick_audmenu_rbt) , "val" ,
 GINT_TO_POINTER(SI_CFG_RCLICK_MENU_AUD) );
-prefs_rclick_smallmenu_rbt = gtk_radio_button_new_with_label_from_widget(
+prefs_rclick_smallmenu1_rbt = gtk_radio_button_new_with_label_from_widget(
 GTK_RADIO_BUTTON(prefs_rclick_audmenu_rbt) ,
-_("Small playback menu") );
+_("Small playback menu #1") );
-g_object_set_data( G_OBJECT(prefs_rclick_smallmenu_rbt) , "val" ,
+g_object_set_data( G_OBJECT(prefs_rclick_smallmenu1_rbt) , "val" ,
-GINT_TO_POINTER(SI_CFG_RCLICK_MENU_SMALL) );
+GINT_TO_POINTER(SI_CFG_RCLICK_MENU_SMALL1) );
+prefs_rclick_smallmenu2_rbt = gtk_radio_button_new_with_label_from_widget(
+GTK_RADIO_BUTTON(prefs_rclick_audmenu_rbt) ,
+_("Small playback menu #2") );
+g_object_set_data( G_OBJECT(prefs_rclick_smallmenu2_rbt) , "val" ,
+GINT_TO_POINTER(SI_CFG_RCLICK_MENU_SMALL2) );
 g_object_set_data( G_OBJECT(prefs_win) , "rcm_grp" ,
-gtk_radio_button_get_group(GTK_RADIO_BUTTON(prefs_rclick_smallmenu_rbt)) );
+gtk_radio_button_get_group(GTK_RADIO_BUTTON(prefs_rclick_smallmenu1_rbt)) );
-if ( si_cfg.rclick_menu == SI_CFG_RCLICK_MENU_AUD )
+switch ( si_cfg.rclick_menu )
-gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(prefs_rclick_audmenu_rbt) , TRUE );
+{
-else
+case SI_CFG_RCLICK_MENU_SMALL1:
-gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(prefs_rclick_smallmenu_rbt) , TRUE );
+gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(prefs_rclick_smallmenu1_rbt) , TRUE );
+break;
+case SI_CFG_RCLICK_MENU_SMALL2:
+gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(prefs_rclick_smallmenu2_rbt) , TRUE );
+break;
+case SI_CFG_RCLICK_MENU_AUD:
+default:
+gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(prefs_rclick_audmenu_rbt) , TRUE );
+break;
+}
 gtk_box_pack_start( GTK_BOX(prefs_rclick_vbox) , prefs_rclick_audmenu_rbt , TRUE , TRUE , 0 );
-gtk_box_pack_start( GTK_BOX(prefs_rclick_vbox) , prefs_rclick_smallmenu_rbt , TRUE , TRUE , 0 );
+gtk_box_pack_start( GTK_BOX(prefs_rclick_vbox) , prefs_rclick_smallmenu1_rbt , TRUE , TRUE , 0 );
+gtk_box_pack_start( GTK_BOX(prefs_rclick_vbox) , prefs_rclick_smallmenu2_rbt , TRUE , TRUE , 0 );
 gtk_box_pack_start( GTK_BOX(prefs_vbox) , prefs_rclick_frame , TRUE , TRUE , 0 );
 prefs_scroll_frame = gtk_frame_new( _("Mouse Scroll Action") );
 prefs_scroll_vbox = gtk_vbox_new( TRUE , 0 );
 gtk_container_set_border_width( GTK_CONTAINER(prefs_scroll_vbox) , 6 );
 gtk_container_add( GTK_CONTAINER(prefs_scroll_frame) , prefs_scroll_vbox );
 prefs_scroll_vol_rbt = gtk_radio_button_new_with_label( NULL ,

Mercurial > audlegacy-plugins

comparison src/statusicon/si_ui.c @ 962:9f0ac3bb82f4 trunk