Mercurial > audlegacy

comparison src/audacious/ui_main.c @ 2842:c2622a939e9e trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename audacious_pbutton to ui_skinned_button
author Tomasz Mon <desowin@gmail.com>
date Sun, 17 Jun 2007 12:54:59 +0200
parents 53dd8641b4d1
children 91ef09fe7936
comparison
equal deleted inserted replaced
2841:b2fb6a4e02b8 2842:c2622a939e9e
79 #include "strings.h" 79 #include "strings.h"
80 #include "util.h" 80 #include "util.h"
81 #include "visualization.h" 81 #include "visualization.h"
82 82
83 #include "ui_skinned_window.h" 83 #include "ui_skinned_window.h"
84 #include "ui_skinned_button.h"
84 #include "ui_jumptotrack.h" 85 #include "ui_jumptotrack.h"
85 86
86 static GTimeVal cb_time; /* click delay for tristate is defined by TRISTATE_THRESHOLD */ 87 static GTimeVal cb_time; /* click delay for tristate is defined by TRISTATE_THRESHOLD */
87 88
88 #define ITEM_SEPARATOR {"/-", NULL, NULL, 0, "<Separator>"} 89 #define ITEM_SEPARATOR {"/-", NULL, NULL, 0, "<Separator>"}
2686 } 2687 }
2687 2688
2688 static void 2689 static void
2689 mainwin_create_widgets(void) 2690 mainwin_create_widgets(void)
2690 { 2691 {
2691 mainwin_menubtn = audacious_pbutton_new(); 2692 mainwin_menubtn = ui_skinned_button_new();
2692 audacious_pbutton_setup(mainwin_menubtn, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, 2693 ui_skinned_push_button_setup(mainwin_menubtn, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
2693 SKINNED_WINDOW(mainwin)->gc, 6, 3, 9, 9, 0, 0, 0, 9, SKIN_TITLEBAR); 2694 SKINNED_WINDOW(mainwin)->gc, 6, 3, 9, 9, 0, 0, 0, 9, SKIN_TITLEBAR);
2694 g_signal_connect(mainwin_menubtn, "clicked", mainwin_menubtn_cb, NULL ); 2695 g_signal_connect(mainwin_menubtn, "clicked", mainwin_menubtn_cb, NULL );
2695 2696
2696 mainwin_minimize = audacious_pbutton_new(); 2697 mainwin_minimize = ui_skinned_button_new();
2697 audacious_pbutton_setup(mainwin_minimize, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, 2698 ui_skinned_push_button_setup(mainwin_minimize, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
2698 SKINNED_WINDOW(mainwin)->gc, 244, 3, 9, 9, 9, 0, 9, 9, SKIN_TITLEBAR); 2699 SKINNED_WINDOW(mainwin)->gc, 244, 3, 9, 9, 9, 0, 9, 9, SKIN_TITLEBAR);
2699 g_signal_connect(mainwin_minimize, "clicked", mainwin_minimize_cb, NULL ); 2700 g_signal_connect(mainwin_minimize, "clicked", mainwin_minimize_cb, NULL );
2700 2701
2701 mainwin_shade = audacious_pbutton_new(); 2702 mainwin_shade = ui_skinned_button_new();
2702 audacious_pbutton_setup(mainwin_shade, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, 2703 ui_skinned_push_button_setup(mainwin_shade, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
2703 SKINNED_WINDOW(mainwin)->gc, 254, 3, 9, 9, 0, 2704 SKINNED_WINDOW(mainwin)->gc, 254, 3, 9, 9, 0,
2704 cfg.player_shaded ? 27 : 18, 9, cfg.player_shaded ? 27 : 18, SKIN_TITLEBAR); 2705 cfg.player_shaded ? 27 : 18, 9, cfg.player_shaded ? 27 : 18, SKIN_TITLEBAR);
2705 g_signal_connect(mainwin_shade, "clicked", mainwin_shade_toggle, NULL ); 2706 g_signal_connect(mainwin_shade, "clicked", mainwin_shade_toggle, NULL );
2706 2707
2707 mainwin_close = audacious_pbutton_new(); 2708 mainwin_close = ui_skinned_button_new();
2708 audacious_pbutton_setup(mainwin_close, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, 2709 ui_skinned_push_button_setup(mainwin_close, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
2709 SKINNED_WINDOW(mainwin)->gc, 264, 3, 9, 9, 18, 0, 18, 9, SKIN_TITLEBAR); 2710 SKINNED_WINDOW(mainwin)->gc, 264, 3, 9, 9, 18, 0, 18, 9, SKIN_TITLEBAR);
2710 g_signal_connect(mainwin_close, "clicked", mainwin_quit_cb, NULL ); 2711 g_signal_connect(mainwin_close, "clicked", mainwin_quit_cb, NULL );
2711 2712
2712 mainwin_rew = audacious_pbutton_new(); 2713 mainwin_rew = ui_skinned_button_new();
2713 audacious_pbutton_setup(mainwin_rew, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, 2714 ui_skinned_push_button_setup(mainwin_rew, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
2714 SKINNED_WINDOW(mainwin)->gc, 16, 88, 23, 18, 0, 0, 0, 18, SKIN_CBUTTONS); 2715 SKINNED_WINDOW(mainwin)->gc, 16, 88, 23, 18, 0, 0, 0, 18, SKIN_CBUTTONS);
2715 g_signal_connect(mainwin_rew, "pressed", mainwin_rev_pushed, NULL); 2716 g_signal_connect(mainwin_rew, "pressed", mainwin_rev_pushed, NULL);
2716 g_signal_connect(mainwin_rew, "released", mainwin_rev_release, NULL); 2717 g_signal_connect(mainwin_rew, "released", mainwin_rev_release, NULL);
2717 2718
2718 mainwin_fwd = audacious_pbutton_new(); 2719 mainwin_fwd = ui_skinned_button_new();
2719 audacious_pbutton_setup(mainwin_fwd, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, 2720 ui_skinned_push_button_setup(mainwin_fwd, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
2720 SKINNED_WINDOW(mainwin)->gc, 108, 88, 22, 18, 92, 0, 92, 18, SKIN_CBUTTONS); 2721 SKINNED_WINDOW(mainwin)->gc, 108, 88, 22, 18, 92, 0, 92, 18, SKIN_CBUTTONS);
2721 g_signal_connect(mainwin_fwd, "pressed", mainwin_fwd_pushed, NULL); 2722 g_signal_connect(mainwin_fwd, "pressed", mainwin_fwd_pushed, NULL);
2722 g_signal_connect(mainwin_fwd, "released", mainwin_fwd_release, NULL); 2723 g_signal_connect(mainwin_fwd, "released", mainwin_fwd_release, NULL);
2723 2724
2724 mainwin_play = audacious_pbutton_new(); 2725 mainwin_play = ui_skinned_button_new();
2725 audacious_pbutton_setup(mainwin_play, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, 2726 ui_skinned_push_button_setup(mainwin_play, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
2726 SKINNED_WINDOW(mainwin)->gc, 39, 88, 23, 18, 23, 0, 23, 18, SKIN_CBUTTONS); 2727 SKINNED_WINDOW(mainwin)->gc, 39, 88, 23, 18, 23, 0, 23, 18, SKIN_CBUTTONS);
2727 g_signal_connect(mainwin_play, "clicked", mainwin_play_pushed, NULL ); 2728 g_signal_connect(mainwin_play, "clicked", mainwin_play_pushed, NULL );
2728 2729
2729 mainwin_pause = audacious_pbutton_new(); 2730 mainwin_pause = ui_skinned_button_new();
2730 audacious_pbutton_setup(mainwin_pause, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, 2731 ui_skinned_push_button_setup(mainwin_pause, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
2731 SKINNED_WINDOW(mainwin)->gc, 62, 88, 23, 18, 46, 0, 46, 18, SKIN_CBUTTONS); 2732 SKINNED_WINDOW(mainwin)->gc, 62, 88, 23, 18, 46, 0, 46, 18, SKIN_CBUTTONS);
2732 g_signal_connect(mainwin_pause, "clicked", playback_pause, NULL ); 2733 g_signal_connect(mainwin_pause, "clicked", playback_pause, NULL );
2733 2734
2734 mainwin_stop = audacious_pbutton_new(); 2735 mainwin_stop = ui_skinned_button_new();
2735 audacious_pbutton_setup(mainwin_stop, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, 2736 ui_skinned_push_button_setup(mainwin_stop, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
2736 SKINNED_WINDOW(mainwin)->gc, 85, 88, 23, 18, 69, 0, 69, 18, SKIN_CBUTTONS); 2737 SKINNED_WINDOW(mainwin)->gc, 85, 88, 23, 18, 69, 0, 69, 18, SKIN_CBUTTONS);
2737 g_signal_connect(mainwin_stop, "clicked", mainwin_stop_pushed, NULL ); 2738 g_signal_connect(mainwin_stop, "clicked", mainwin_stop_pushed, NULL );
2738 2739
2739 mainwin_eject = audacious_pbutton_new(); 2740 mainwin_eject = ui_skinned_button_new();
2740 audacious_pbutton_setup(mainwin_eject, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, 2741 ui_skinned_push_button_setup(mainwin_eject, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg,
2741 SKINNED_WINDOW(mainwin)->gc, 136, 89, 22, 16, 114, 0, 114, 16, SKIN_CBUTTONS); 2742 SKINNED_WINDOW(mainwin)->gc, 136, 89, 22, 16, 114, 0, 114, 16, SKIN_CBUTTONS);
2742 g_signal_connect(mainwin_eject, "clicked", mainwin_eject_pushed, NULL); 2743 g_signal_connect(mainwin_eject, "clicked", mainwin_eject_pushed, NULL);
2743 2744
2744 mainwin_srew = 2745 mainwin_srew =
2745 create_sbutton(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 169, 4, 8, 2746 create_sbutton(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 169, 4, 8,