audlegacy: src/audacious/ui

comparison src/audacious/ui_main.c @ 2843:91ef09fe7936 trunk

UiSkinnedButton can now work as TButton

author	Tomasz Mon <desowin@gmail.com>
date	Sun, 17 Jun 2007 15:53:59 +0200
parents	c2622a939e9e
children	22da7cd0eca0

comparison

equal deleted inserted replaced

-:c2622a939e9e
+:91ef09fe7936
 static GtkWidget *mainwin_rew, *mainwin_fwd;
 static GtkWidget *mainwin_eject;
 static GtkWidget *mainwin_play, *mainwin_pause, *mainwin_stop;
-TButton *mainwin_shuffle, *mainwin_repeat, *mainwin_eq, *mainwin_pl;
+static GtkWidget *mainwin_shuffle, *mainwin_repeat, *mainwin_eq, *mainwin_pl;
 TextBox *mainwin_info;
 TextBox *mainwin_stime_min, *mainwin_stime_sec;
 static TextBox *mainwin_rate_text, *mainwin_freq_text,
 *mainwin_othertext;
 void mainwin_position_motion_cb(gint pos);
 void mainwin_position_release_cb(gint pos);
 void set_doublesize(gboolean doublesize);
+void mainwin_eq_pushed(gboolean toggled);
+void mainwin_pl_pushed(gboolean toggled);
 /* FIXME: placed here for now */
 void
 playback_get_sample_params(gint * bitrate,
 if (bmp_active_skin->properties.mainwin_eject_x && bmp_active_skin->properties.mainwin_eject_y)
 gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->fixed), GTK_WIDGET(mainwin_eject), bmp_active_skin->properties.mainwin_eject_x,
 bmp_active_skin->properties.mainwin_eject_y);
 if (bmp_active_skin->properties.mainwin_eqbutton_x && bmp_active_skin->properties.mainwin_eqbutton_y)
-widget_move(WIDGET(mainwin_eq), bmp_active_skin->properties.mainwin_eqbutton_x,
+gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->fixed), GTK_WIDGET(mainwin_eq), bmp_active_skin->properties.mainwin_eqbutton_x,
 bmp_active_skin->properties.mainwin_eqbutton_y);
 if (bmp_active_skin->properties.mainwin_plbutton_x && bmp_active_skin->properties.mainwin_plbutton_y)
-widget_move(WIDGET(mainwin_pl), bmp_active_skin->properties.mainwin_plbutton_x,
+gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->fixed), GTK_WIDGET(mainwin_pl), bmp_active_skin->properties.mainwin_plbutton_x,
 bmp_active_skin->properties.mainwin_plbutton_y);
 if (bmp_active_skin->properties.mainwin_shuffle_x && bmp_active_skin->properties.mainwin_shuffle_y)
-widget_move(WIDGET(mainwin_shuffle), bmp_active_skin->properties.mainwin_shuffle_x,
+gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->fixed), GTK_WIDGET(mainwin_shuffle), bmp_active_skin->properties.mainwin_shuffle_x,
 bmp_active_skin->properties.mainwin_shuffle_y);
 if (bmp_active_skin->properties.mainwin_repeat_x && bmp_active_skin->properties.mainwin_repeat_y)
-widget_move(WIDGET(mainwin_repeat), bmp_active_skin->properties.mainwin_repeat_x,
+gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->fixed), GTK_WIDGET(mainwin_repeat), bmp_active_skin->properties.mainwin_repeat_x,
 bmp_active_skin->properties.mainwin_repeat_y);
 if (bmp_active_skin->properties.mainwin_about_x && bmp_active_skin->properties.mainwin_about_y)
 widget_move(WIDGET(mainwin_about), bmp_active_skin->properties.mainwin_about_x,
 bmp_active_skin->properties.mainwin_about_y);
 mainwin_shuffle_pushed(gboolean toggled)
 {
 check_set( toggleaction_group_others , "playback shuffle" , toggled );
 }
+void mainwin_shuffle_pushed_cb(void) {
+mainwin_shuffle_pushed(UI_SKINNED_BUTTON(mainwin_shuffle)->inside);
+}
 void
 mainwin_repeat_pushed(gboolean toggled)
 {
 check_set( toggleaction_group_others , "playback repeat" , toggled );
+}
+void mainwin_repeat_pushed_cb(void) {
+mainwin_repeat_pushed(UI_SKINNED_BUTTON(mainwin_repeat)->inside);
+}
+void mainwin_equalizer_pushed_cb(void) {
+mainwin_eq_pushed(UI_SKINNED_BUTTON(mainwin_eq)->inside);
+}
+void mainwin_playlist_pushed_cb(void) {
+mainwin_pl_pushed(UI_SKINNED_BUTTON(mainwin_pl)->inside);
+}
+void
+mainwin_eq_pushed(gboolean toggled)
+{
+equalizerwin_show(toggled);
 }
 void
 mainwin_pl_pushed(gboolean toggled)
 {
 7, mainwin_playlist_next);
 mainwin_seject =
 create_sbutton(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 216, 4, 9,
 7, mainwin_eject_pushed);
-mainwin_shuffle =
+mainwin_shuffle = ui_skinned_button_new();
-create_tbutton(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 164, 89, 46,
+ui_skinned_toggle_button_setup(mainwin_shuffle, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
-15, 28, 0, 28, 15, 28, 30, 28, 45,
+			SKINNED_WINDOW(mainwin)->gc, 164, 89, 46,
-mainwin_shuffle_pushed, SKIN_SHUFREP);
+15, 28, 0, 28, 15, 28, 30, 28, 45, SKIN_SHUFREP);
+g_signal_connect(mainwin_shuffle, "clicked", mainwin_shuffle_pushed_cb, NULL);
-mainwin_repeat =
-create_tbutton(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 210, 89, 28,
+mainwin_repeat = ui_skinned_button_new();
-15, 0, 0, 0, 15, 0, 30, 0, 45,
+ui_skinned_toggle_button_setup(mainwin_repeat, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
-mainwin_repeat_pushed, SKIN_SHUFREP);
+			SKINNED_WINDOW(mainwin)->gc, 210, 89, 28,
+15, 0, 0, 0, 15, 0, 30, 0, 45, SKIN_SHUFREP);
-mainwin_eq =
+g_signal_connect(mainwin_repeat, "clicked", mainwin_repeat_pushed_cb, NULL);
-create_tbutton(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 219, 58, 23,
-12, 0, 61, 46, 61, 0, 73, 46, 73, equalizerwin_show,
+mainwin_eq = ui_skinned_button_new();
-SKIN_SHUFREP);
+ui_skinned_toggle_button_setup(mainwin_eq, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
-tbutton_set_toggled(mainwin_eq, cfg.equalizer_visible);
+			SKINNED_WINDOW(mainwin)->gc, 219, 58, 23,
-mainwin_pl =
+12, 0, 61, 46, 61, 0, 73, 46, 73, SKIN_SHUFREP);
-create_tbutton(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 242, 58, 23,
+g_signal_connect(mainwin_eq, "clicked", mainwin_equalizer_pushed_cb, NULL);
-12, 23, 61, 69, 61, 23, 73, 69, 73,
+UI_SKINNED_BUTTON(mainwin_eq)->inside = cfg.equalizer_visible;
-mainwin_pl_pushed, SKIN_SHUFREP);
-tbutton_set_toggled(mainwin_pl, cfg.playlist_visible);
+mainwin_pl = ui_skinned_button_new();
+ui_skinned_toggle_button_setup(mainwin_pl, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
+			SKINNED_WINDOW(mainwin)->gc, 242, 58, 23,
+12, 23, 61, 69, 61, 23, 73, 69, 73, SKIN_SHUFREP);
+g_signal_connect(mainwin_pl, "clicked", mainwin_playlist_pushed_cb, NULL);
+UI_SKINNED_BUTTON(mainwin_pl)->inside = cfg.playlist_visible;
 mainwin_info =
 create_textbox(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 112, 27,
 153, 1, SKIN_TEXT);
 textbox_set_scroll(mainwin_info, cfg.autoscroll);
 ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_splay));
 ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_spause));
 ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_sstop));
 ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_sfwd));
 ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_seject));
-ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_shuffle));
-ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_repeat));
-ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_eq));
-ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_pl));
 ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_info));
 ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_othertext));
 ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_rate_text));
 void
 action_playback_repeat( GtkToggleAction * action )
 {
 cfg.repeat = gtk_toggle_action_get_active( action );
-tbutton_set_toggled(mainwin_repeat, cfg.repeat);
+UI_SKINNED_BUTTON(mainwin_repeat)->inside = cfg.repeat;
 }
 void
 action_playback_shuffle( GtkToggleAction * action )
 {
 cfg.shuffle = gtk_toggle_action_get_active( action );
 playlist_set_shuffle(cfg.shuffle);
-tbutton_set_toggled(mainwin_shuffle, cfg.shuffle);
+UI_SKINNED_BUTTON(mainwin_shuffle)->inside = cfg.shuffle;
 }
 void
 action_stop_after_current_song( GtkToggleAction * action )
 {

Mercurial > audlegacy

comparison src/audacious/ui_main.c @ 2843:91ef09fe7936 trunk