Attachment #100544 for bug #152890

View | Details | Raw Unified | Return to bug 152890
Collapse All | Expand All

Lines 12-20 Link Here

(-)../gkrellmms/Makefile (+8 lines)
12	XMMS_INCLUDE ?= `pkg-config bmp --cflags`	12	XMMS_INCLUDE ?= `pkg-config bmp --cflags`
13	XMMS_LIB ?= `pkg-config bmp --libs`	13	XMMS_LIB ?= `pkg-config bmp --libs`
14	else	14	else
		15	ifdef USE_AUDACIOUS
		16	XMMS_INCLUDE ?= `pkg-config audacious --cflags`
		17	XMMS_LIB ?= `pkg-config audacious --libs`
		18	else
15	XMMS_INCLUDE ?= `xmms-config --cflags`	19	XMMS_INCLUDE ?= `xmms-config --cflags`
16	XMMS_LIB ?= `xmms-config --libs`	20	XMMS_LIB ?= `xmms-config --libs`
17	endif	21	endif
		22	endif
18		23
19	PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins	24	PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
20		25
Lines 25-30 Link Here
25	ifdef USE_BMP	30	ifdef USE_BMP
26	FLAGS += -DUSE_BMP	31	FLAGS += -DUSE_BMP
27	endif	32	endif
		33	ifdef USE_AUDACIOUS
		34	FLAGS += -DUSE_AUDACIOUS
		35	endif
28		36
29	LOCALEDIR ?= /usr/share/locale	37	LOCALEDIR ?= /usr/share/locale
30	ifeq ($(enable_nls),1)	38	ifeq ($(enable_nls),1)

Lines 860-866 Link Here

(-)../gkrellmms/gkrellmms.c (+14 lines)
860		860
861	if (scrolling_tooltip == NULL) {	861	if (scrolling_tooltip == NULL) {
862	scrolling_tooltip = gtk_tooltips_new();	862	scrolling_tooltip = gtk_tooltips_new();
		863	#ifdef USE_AUDACIOUS
		864	scrolling_tooltip_text = g_strdup("audacious");
		865	#elif USE_BMP
		866	scrolling_tooltip_text = g_strdup("bmp");
		867	#else
863	scrolling_tooltip_text = g_strdup("xmms");	868	scrolling_tooltip_text = g_strdup("xmms");
		869	#endif
864	gtk_tooltips_set_tip(scrolling_tooltip, scroll_panel->drawing_area,	870	gtk_tooltips_set_tip(scrolling_tooltip, scroll_panel->drawing_area,
865	scrolling_tooltip_text, NULL);	871	scrolling_tooltip_text, NULL);
866	gtk_tooltips_set_delay(scrolling_tooltip, 750);	872	gtk_tooltips_set_delay(scrolling_tooltip, 750);
Lines 1033-1045 Link Here
1033		1039
1034	playlist_dir = g_strdup(gkrellm_homedir());	1040	playlist_dir = g_strdup(gkrellm_homedir());
1035	files_directory = g_strdup("/");	1041	files_directory = g_strdup("/");
		1042	#ifdef USE_BMP
		1043	gkrellmms_label = g_strdup("bmp");
		1044	#elif USE_AUDACIOUS
		1045	gkrellmms_label = g_strdup("audacious");
		1046	#else
1036	gkrellmms_label = g_strdup("xmms");	1047	gkrellmms_label = g_strdup("xmms");
		1048	#endif
1037	xmms_session = 0;	1049	xmms_session = 0;
1038	scroll_enable = TRUE;	1050	scroll_enable = TRUE;
1039	scroll_separator = g_strdup(SCROLL_SEPARATOR);	1051	scroll_separator = g_strdup(SCROLL_SEPARATOR);
1040	draw_time = 1;	1052	draw_time = 1;
1041	#ifdef USE_BMP	1053	#ifdef USE_BMP
1042	xmms_exec_command = g_strdup("beep-media-player");	1054	xmms_exec_command = g_strdup("beep-media-player");
		1055	#elif USE_AUDACIOUS
		1056	xmms_exec_command = g_strdup("audacious");
1043	#else	1057	#else
1044	xmms_exec_command = g_strdup("xmms");	1058	xmms_exec_command = g_strdup("xmms");
1045	#endif	1059	#endif

Lines 27-32 Link Here

(-)../gkrellmms/gkrellmms.h (+2 lines)
27		27
28	#ifdef USE_BMP	28	#ifdef USE_BMP
29	#include <bmp/beepctrl.h>	29	#include <bmp/beepctrl.h>
		30	#elif USE_AUDACIOUS
		31	#include <audacious/beepctrl.h>
30	#else	32	#else
31	#include <xmms/xmmsctrl.h>	33	#include <xmms/xmmsctrl.h>
32	#endif	34	#endif




static gint time_fmt_thing;
static gint always_load_thing;

#ifdef USE_BMP
  #define PROG_NAME "BMP"
#elif USE_AUDACIOUS
  #define PROG_NAME "Audacious"
#else
  #define PROG_NAME "XMMS"
#endif


void toggles_func (GtkWidget *w, gpointer what)
{
  gint type;

  {N_("/Toggles.../Always on top on"),  NULL, aot_func,      ON,       "<Item>"},
  {N_("/Toggles.../Always on top off"), NULL, aot_func,      OFF,      "<Item>"},
  {"/-",                                NULL, NULL,          0,        "<Separator>"},
  {"/"PROG_NAME"...",                          NULL, NULL,          0,        "<Branch>"},
  {N_("/"PROG_NAME".../Previous"),             NULL, toggles_func,  gkrellmms_prev,     "<Item>"},
  {N_("/"PROG_NAME".../Play"),                 NULL, toggles_func,  gkrellmms_play,     "<Item>"},
  {N_("/"PROG_NAME".../Pause"),                NULL, toggles_func,  gkrellmms_paus,     "<Item>"},
  {N_("/"PROG_NAME".../Stop"),                 NULL, toggles_func,  gkrellmms_stop,     "<Item>"},
  {N_("/"PROG_NAME".../Next"),                 NULL, toggles_func,  gkrellmms_next,     "<Item>"},
  {"/-",                                NULL, NULL,          0,        "<Separator>"},
  {N_("/Playlist Editor"),              NULL, open_playlist_cb, 0,        "<Item>"},
  {N_("/GKrellMMS Options"),            NULL, open_options_cb, 0,        "<Item>"},
  {"/-",                                NULL, NULL,          0,        "<Separator>"},
  {N_("/Open file(s)"),                 NULL, toggles_func,  gkrellmms_eject,    "<Item>"},
  {N_("/Open Playlist"),                NULL, load_playlist_cb,  0,        "<Item>"},
  {N_("/"PROG_NAME" Prefs"),                   NULL, toggles_func,  gkrellmms_prefs,    "<Item>"},
  {"/-",                                NULL, NULL,          0,        "<Separator>"},
  {N_("/Quit "PROG_NAME),                    NULL, quit_func,     0,        "<Item>"},
  {"/-",                                NULL, NULL,          0,        "<Separator>"},
};

static GtkItemFactoryEntry gkrellmms_factory_norun[] =
{
  {"/-",                           NULL, NULL,          0,    "<Separator>"},
  {N_("/Launch "PROG_NAME),                 NULL, start_func,    0,    "<Item>"},
  {"/-",                           NULL, NULL,          0,    "<Separator>"},
};


  gint i;
  static gchar *gkrellmms_help_text[] =
  {
    N_("GKrellMMS is a GKrellM "PROG_NAME"-plugin which allows you to control \n" \
    PROG_NAME" from within GKrellM. It features some cool things, such as: \n" \
    "\n" \
    "- A scrolling title. \n" \
    "- A Krell which indicates where you are in a song. \n" \
    "- Themeable buttons for controlling "PROG_NAME". \n" \
    "- A playlist editor. \n" \
    "- A gtk-popup-menu with misc. "PROG_NAME"-functions. \n" \
    "\n"),

    N_("<b>How to use GKrellMMS: \n"),
    N_("\n" \
    "You can do some cool stuff with the "PROG_NAME"-Krell, by using your mouse. \n" \
    "\n"),

    N_("<b>Mouse actions: \n" \

    N_("Jump through song. \n"),

    N_("<b>\tMiddle mouse-button: "),
    N_("Pause/stop/play "PROG_NAME" (configurable), \n" \
    "\t  or launch "PROG_NAME" if it's not running. \n"),

    N_("<b>\tRight mouse-button: "),
    N_("Popup-menu. \n" \

    "\n"),

    N_("<b>\tConstant red: "),
    N_(PROG_NAME" is turned off. \n"),

    N_("<b>\tConstant green: "),
    N_(PROG_NAME" is playing. \n"),

    N_("<b>\tRed, blinking green: "),
    N_(PROG_NAME" is stopped. \n"),

    N_("<b>\tGreen, blinking red: "),
    N_(PROG_NAME" is paused. \n" \
    "\n"),

    N_("<b>Configurabilities:\n"),


    N_("<b>Configs tab: \n" \
    "\n" \
    "\t"PROG_NAME" Executable: \n"),

    N_("\tHow the "PROG_NAME"-executable (+ eventually path) \n" \
    "\tis called on your computer. Default is xmms\n" \
    "\n"),

    N_("<b>\tFiles Directory: \n"),
    N_("\tThe directory where your mp3's/xm's/whatever \n" \
    "\tare stored in. When starting "PROG_NAME" from GKrellM, it will go to this \n" \
    "\tdirectory when ejecting. \n" \
    "\n"),
  

    "\n"),

    N_("<b>\tKrell label: \n"),
    N_("\tThe text-label you want in the krell when "PROG_NAME" isn't running/playing. \n" \
    "\n"),
  
    N_("<b>\tScroll separator: \n"),

    "\tIt defaults to '   ***   ' (that's 3 spaces, 3 *'s and 3 spaces). \n" \
    "\n"),

    N_("<b>\t"PROG_NAME" Session to use: \n"),
    N_("\tThe "PROG_NAME"-session you want to use with GKrellMMS. \n" \
    "\tUse 0 if you only have 1 "PROG_NAME" running. \n" \
    "\n"),
  
    N_("<b>Toggles tab: \n" \

    N_("\tDraw a minus (-) before the remaining time, when you have \n" \
    "\tthe output-time displaying remaining time. \n\n"),

    N_("<b>\t"PROG_NAME" Auto Launch: \n"),
    N_("\tAuto launch "PROG_NAME" when starting GKrellMMS. \n" \
    "\n"),
  
    N_("<b>\tAuto Mainwindow Close: \n"),
    N_("\tAutomatically close the "PROG_NAME"-mainwindow \n" \
    "\twhen GKrellMMS starts, and "PROG_NAME" is already running, or when \n" \
    "\tlaunching "PROG_NAME" while GKrellMMS runs. This option also enables the \n" \
    "\tmainwindow back when you quit gkrellm (some people really do). \n" \
    "\n"),

    N_("<b>\tAuto hide all "PROG_NAME" windows: \n"),
    N_("\tAutomatically hide all "PROG_NAME" windows when GKrellMMS starts. \n" \
     "\n"),

    N_("<b>\tAuto start playing: \n"),
    N_("\tAutomatically start playing when launching "PROG_NAME". \n\n"),

    N_("<b>\tEnable scrolling title: \n"),
    N_("\tEnable/disable the scrolling title-panel. \n" \

    "\tEject opens: \n"),

    N_("\tCheck whether the eject-button on the button-bar opens a \n" \
    "\tplaylist or an other "PROG_NAME"-file. \n" \
    "\n"),
  
    N_("<b>\tMMB on krell click: \n"),
    N_("\tCheck whether GKrellMMS should pause/continue or \n" \
    "\tstop/play the current song on a MMB-click on the krell. MMB Click will \n" \
    "\talways start playing the song if "PROG_NAME" isn't playing. \n" \
    "\n"),

    N_("<b>\tLoad file-info: \n"),

    "\tplaylist editor, or are playing on a slow network/cdrom. \n\n"),

    N_("<b>\tDraw in time bar: \n"),
    N_("\tCheck whether to draw the output time or '"PROG_NAME"' in \n" \
    "\tthe time-krell panel. \n" \
    "\n"),


  hbox = gtk_hbox_new(FALSE, 5);

  zbox = gtk_vbox_new(FALSE, 0);
  label = gtk_label_new(_(PROG_NAME" Executable:"));
  gtk_box_pack_start(GTK_BOX(zbox), label, TRUE, FALSE, 0);
  label = gtk_label_new(_("Files Directory:"));
  gtk_box_pack_start(GTK_BOX(zbox), label, TRUE, FALSE, 0);

  gtk_spin_button_set_digits(GTK_SPIN_BUTTON(session_entry), (guint) 0);
  gtk_spin_button_set_value(GTK_SPIN_BUTTON(session_entry), xmms_session);
  gtk_box_pack_start(GTK_BOX(hbox), session_entry, FALSE, FALSE, 0);
  label = gtk_label_new(_(PROG_NAME" Session to use"));
  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
  gtk_container_add(GTK_CONTAINER(vbox), hbox);


  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(draw_minus_entry), draw_minus);  
  gtk_container_add(GTK_CONTAINER(vbox), draw_minus_entry);

  xmms_start_entry = gtk_check_button_new_with_label(_("Auto launch "PROG_NAME" on GKrellMMS startup"));
  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(xmms_start_entry), xmms_autostart);
  gtk_container_add(GTK_CONTAINER(vbox), xmms_start_entry);

  main_close_entry = gtk_check_button_new_with_label(_("Auto close (and open) "PROG_NAME" Mainwin"));
  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(main_close_entry), auto_main_close);
  gtk_container_add(GTK_CONTAINER(vbox), main_close_entry);

  hide_all_entry = gtk_check_button_new_with_label(_("Auto hide all "PROG_NAME" windows on "PROG_NAME" startup"));
  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hide_all_entry), auto_hide_all);
  gtk_container_add(GTK_CONTAINER(vbox), hide_all_entry);

  auto_play_entry = gtk_check_button_new_with_label(_("Auto start playing on "PROG_NAME" launch"));
  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_play_entry), auto_play_start);
  gtk_container_add(GTK_CONTAINER(vbox), auto_play_entry);


  gtk_signal_connect(GTK_OBJECT(time_draw_entry), "pressed",
                     (GtkSignalFunc) time_type_set, GINT_TO_POINTER(1));

  time_draw_entry = gtk_radio_button_new_with_label(time_draw_group, _(PROG_NAME"-text"));
  gtk_box_pack_start(GTK_BOX(zbox), time_draw_entry, FALSE, FALSE, 0);
  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(time_draw_entry), !draw_time);
  gtk_signal_connect(GTK_OBJECT(time_draw_entry), "pressed",

  /* About */
  gkrellmms_info_text = g_strdup_printf(
    _("GKrellMMS %d.%d.%d\n" \
    "GKrellM XMMS/BMP/Audacious Plugin\n" \
    "\n" \
    "Copyright (C) 2000-2002 Sander Klein Lebbink <sander@cerberus.demon.nl>\n"\
    "Current Maintainer: Sjoerd Simons <sjoerd@luon.net>\n" \
    "Audacious Patch: Sascha Hlusiak <mail@saschahlusiak.de>\n" \
    "http://gkrellm.luon.net/\n" \
    "\n" \
    "Released under the GNU Public License\n"),

Lines 26-31 Link Here

(-)../gkrellmms/playlist.h (+2 lines)
26		26
27	#ifdef USE_BMP	27	#ifdef USE_BMP
28	#include <bmp/beepctrl.h>	28	#include <bmp/beepctrl.h>
		29	#elif USE_AUDACIOUS
		30	#include <audacious/beepctrl.h>
29	#else	31	#else
30	#include <xmms/xmmsctrl.h>	32	#include <xmms/xmmsctrl.h>
31	#endif	33	#endif

Return to bug 152890

Lines 44-49 Link Here

(-)../gkrellmms/options.c (-46 / +56 lines)
44	static gint time_fmt_thing;	44	static gint time_fmt_thing;
45	static gint always_load_thing;	45	static gint always_load_thing;
46		46
		47	#ifdef USE_BMP
		48	#define PROG_NAME "BMP"
		49	#elif USE_AUDACIOUS
		50	#define PROG_NAME "Audacious"
		51	#else
		52	#define PROG_NAME "XMMS"
		53	#endif
		54
		55
47	void toggles_func (GtkWidget *w, gpointer what)	56	void toggles_func (GtkWidget *w, gpointer what)
48	{	57	{
49	gint type;	58	gint type;
Lines 178-205 Link Here
178	{N_("/Toggles.../Always on top on"), NULL, aot_func, ON, "<Item>"},	187	{N_("/Toggles.../Always on top on"), NULL, aot_func, ON, "<Item>"},
179	{N_("/Toggles.../Always on top off"), NULL, aot_func, OFF, "<Item>"},	188	{N_("/Toggles.../Always on top off"), NULL, aot_func, OFF, "<Item>"},
180	{"/-", NULL, NULL, 0, "<Separator>"},	189	{"/-", NULL, NULL, 0, "<Separator>"},
181	{"/Xmms...", NULL, NULL, 0, "<Branch>"},	190	{"/"PROG_NAME"...", NULL, NULL, 0, "<Branch>"},
182	{N_("/Xmms.../Previous"), NULL, toggles_func, gkrellmms_prev, "<Item>"},	191	{N_("/"PROG_NAME".../Previous"), NULL, toggles_func, gkrellmms_prev, "<Item>"},
183	{N_("/Xmms.../Play"), NULL, toggles_func, gkrellmms_play, "<Item>"},	192	{N_("/"PROG_NAME".../Play"), NULL, toggles_func, gkrellmms_play, "<Item>"},
184	{N_("/Xmms.../Pause"), NULL, toggles_func, gkrellmms_paus, "<Item>"},	193	{N_("/"PROG_NAME".../Pause"), NULL, toggles_func, gkrellmms_paus, "<Item>"},
185	{N_("/Xmms.../Stop"), NULL, toggles_func, gkrellmms_stop, "<Item>"},	194	{N_("/"PROG_NAME".../Stop"), NULL, toggles_func, gkrellmms_stop, "<Item>"},
186	{N_("/Xmms.../Next"), NULL, toggles_func, gkrellmms_next, "<Item>"},	195	{N_("/"PROG_NAME".../Next"), NULL, toggles_func, gkrellmms_next, "<Item>"},
187	{"/-", NULL, NULL, 0, "<Separator>"},	196	{"/-", NULL, NULL, 0, "<Separator>"},
188	{N_("/Playlist Editor"), NULL, open_playlist_cb, 0, "<Item>"},	197	{N_("/Playlist Editor"), NULL, open_playlist_cb, 0, "<Item>"},
189	{N_("/GKrellMMS Options"), NULL, open_options_cb, 0, "<Item>"},	198	{N_("/GKrellMMS Options"), NULL, open_options_cb, 0, "<Item>"},
190	{"/-", NULL, NULL, 0, "<Separator>"},	199	{"/-", NULL, NULL, 0, "<Separator>"},
191	{N_("/Open file(s)"), NULL, toggles_func, gkrellmms_eject, "<Item>"},	200	{N_("/Open file(s)"), NULL, toggles_func, gkrellmms_eject, "<Item>"},
192	{N_("/Open Playlist"), NULL, load_playlist_cb, 0, "<Item>"},	201	{N_("/Open Playlist"), NULL, load_playlist_cb, 0, "<Item>"},
193	{N_("/XMMS Prefs"), NULL, toggles_func, gkrellmms_prefs, "<Item>"},	202	{N_("/"PROG_NAME" Prefs"), NULL, toggles_func, gkrellmms_prefs, "<Item>"},
194	{"/-", NULL, NULL, 0, "<Separator>"},	203	{"/-", NULL, NULL, 0, "<Separator>"},
195	{N_("/Quit XMMS"), NULL, quit_func, 0, "<Item>"},	204	{N_("/Quit "PROG_NAME), NULL, quit_func, 0, "<Item>"},
196	{"/-", NULL, NULL, 0, "<Separator>"},	205	{"/-", NULL, NULL, 0, "<Separator>"},
197	};	206	};
198		207
199	static GtkItemFactoryEntry gkrellmms_factory_norun[] =	208	static GtkItemFactoryEntry gkrellmms_factory_norun[] =
200	{	209	{
201	{"/-", NULL, NULL, 0, "<Separator>"},	210	{"/-", NULL, NULL, 0, "<Separator>"},
202	{N_("/Launch XMMS"), NULL, start_func, 0, "<Item>"},	211	{N_("/Launch "PROG_NAME), NULL, start_func, 0, "<Item>"},
203	{"/-", NULL, NULL, 0, "<Separator>"},	212	{"/-", NULL, NULL, 0, "<Separator>"},
204	};	213	};
205		214
Lines 423-441 Link Here
423	gint i;	432	gint i;
424	static gchar *gkrellmms_help_text[] =	433	static gchar *gkrellmms_help_text[] =
425	{	434	{
426	N_("GKrellMMS is a GKrellM XMMS-plugin which allows you to control \n" \	435	N_("GKrellMMS is a GKrellM "PROG_NAME"-plugin which allows you to control \n" \
427	"XMMS from within GKrellM. It features some cool things, such as: \n" \	436	PROG_NAME" from within GKrellM. It features some cool things, such as: \n" \
428	"\n" \	437	"\n" \
429	"- A scrolling title. \n" \	438	"- A scrolling title. \n" \
430	"- A Krell which indicates where you are in a song. \n" \	439	"- A Krell which indicates where you are in a song. \n" \
431	"- Themeable buttons for controlling XMMS. \n" \	440	"- Themeable buttons for controlling "PROG_NAME". \n" \
432	"- A playlist editor. \n" \	441	"- A playlist editor. \n" \
433	"- A gtk-popup-menu with misc. XMMS-functions. \n" \	442	"- A gtk-popup-menu with misc. "PROG_NAME"-functions. \n" \
434	"\n"),	443	"\n"),
435		444
436	N_("<b>How to use GKrellMMS: \n"),	445	N_("<b>How to use GKrellMMS: \n"),
437	N_("\n" \	446	N_("\n" \
438	"You can do some cool stuff with the XMMS-Krell, by using your mouse. \n" \	447	"You can do some cool stuff with the "PROG_NAME"-Krell, by using your mouse. \n" \
439	"\n"),	448	"\n"),
440		449
441	N_("<b>Mouse actions: \n" \	450	N_("<b>Mouse actions: \n" \
Lines 443-450 Link Here
443	N_("Jump through song. \n"),	452	N_("Jump through song. \n"),
444		453
445	N_("<b>\tMiddle mouse-button: "),	454	N_("<b>\tMiddle mouse-button: "),
446	N_("Pause/stop/play XMMS (configurable), \n" \	455	N_("Pause/stop/play "PROG_NAME" (configurable), \n" \
447	"\t or launch XMMS if it's not running. \n"),	456	"\t or launch "PROG_NAME" if it's not running. \n"),
448		457
449	N_("<b>\tRight mouse-button: "),	458	N_("<b>\tRight mouse-button: "),
450	N_("Popup-menu. \n" \	459	N_("Popup-menu. \n" \
Lines 453-468 Link Here
453	"\n"),	462	"\n"),
454		463
455	N_("<b>\tConstant red: "),	464	N_("<b>\tConstant red: "),
456	N_("XMMS is turned off. \n"),	465	N_(PROG_NAME" is turned off. \n"),
457		466
458	N_("<b>\tConstant green: "),	467	N_("<b>\tConstant green: "),
459	N_("XMMS is playing. \n"),	468	N_(PROG_NAME" is playing. \n"),
460		469
461	N_("<b>\tRed, blinking green: "),	470	N_("<b>\tRed, blinking green: "),
462	N_("XMMS is stopped. \n"),	471	N_(PROG_NAME" is stopped. \n"),
463		472
464	N_("<b>\tGreen, blinking red: "),	473	N_("<b>\tGreen, blinking red: "),
465	N_("XMMS is paused. \n" \	474	N_(PROG_NAME" is paused. \n" \
466	"\n"),	475	"\n"),
467		476
468	N_("<b>Configurabilities:\n"),	477	N_("<b>Configurabilities:\n"),
Lines 473-487 Link Here
473		482
474	N_("<b>Configs tab: \n" \	483	N_("<b>Configs tab: \n" \
475	"\n" \	484	"\n" \
476	"\tXMMS Executable: \n"),	485	"\t"PROG_NAME" Executable: \n"),
477		486
478	N_("\tHow the XMMS-executable (+ eventually path) \n" \	487	N_("\tHow the "PROG_NAME"-executable (+ eventually path) \n" \
479	"\tis called on your computer. Default is xmms\n" \	488	"\tis called on your computer. Default is xmms\n" \
480	"\n"),	489	"\n"),
481		490
482	N_("<b>\tFiles Directory: \n"),	491	N_("<b>\tFiles Directory: \n"),
483	N_("\tThe directory where your mp3's/xm's/whatever \n" \	492	N_("\tThe directory where your mp3's/xm's/whatever \n" \
484	"\tare stored in. When starting XMMS from GKrellM, it will go to this \n" \	493	"\tare stored in. When starting "PROG_NAME" from GKrellM, it will go to this \n" \
485	"\tdirectory when ejecting. \n" \	494	"\tdirectory when ejecting. \n" \
486	"\n"),	495	"\n"),
487		496
Lines 490-496 Link Here
490	"\n"),	499	"\n"),
491		500
492	N_("<b>\tKrell label: \n"),	501	N_("<b>\tKrell label: \n"),
493	N_("\tThe text-label you want in the krell when xmms isn't running/playing. \n" \	502	N_("\tThe text-label you want in the krell when "PROG_NAME" isn't running/playing. \n" \
494	"\n"),	503	"\n"),
495		504
496	N_("<b>\tScroll separator: \n"),	505	N_("<b>\tScroll separator: \n"),
Lines 498-506 Link Here
498	"\tIt defaults to ' *** ' (that's 3 spaces, 3 *'s and 3 spaces). \n" \	507	"\tIt defaults to ' *** ' (that's 3 spaces, 3 *'s and 3 spaces). \n" \
499	"\n"),	508	"\n"),
500		509
501	N_("<b>\tXMMS Session to use: \n"),	510	N_("<b>\t"PROG_NAME" Session to use: \n"),
502	N_("\tThe XMMS-session you want to use with GKrellMMS. \n" \	511	N_("\tThe "PROG_NAME"-session you want to use with GKrellMMS. \n" \
503	"\tUse 0 if you only have 1 XMMS running. \n" \	512	"\tUse 0 if you only have 1 "PROG_NAME" running. \n" \
504	"\n"),	513	"\n"),
505		514
506	N_("<b>Toggles tab: \n" \	515	N_("<b>Toggles tab: \n" \
Lines 510-532 Link Here
510	N_("\tDraw a minus (-) before the remaining time, when you have \n" \	519	N_("\tDraw a minus (-) before the remaining time, when you have \n" \
511	"\tthe output-time displaying remaining time. \n\n"),	520	"\tthe output-time displaying remaining time. \n\n"),
512		521
513	N_("<b>\tXMMS Auto Launch: \n"),	522	N_("<b>\t"PROG_NAME" Auto Launch: \n"),
514	N_("\tAuto launch XMMS when starting GKrellMMS. \n" \	523	N_("\tAuto launch "PROG_NAME" when starting GKrellMMS. \n" \
515	"\n"),	524	"\n"),
516		525
517	N_("<b>\tAuto Mainwindow Close: \n"),	526	N_("<b>\tAuto Mainwindow Close: \n"),
518	N_("\tAutomatically close the XMMS-mainwindow \n" \	527	N_("\tAutomatically close the "PROG_NAME"-mainwindow \n" \
519	"\twhen GKrellMMS starts, and XMMS is already running, or when \n" \	528	"\twhen GKrellMMS starts, and "PROG_NAME" is already running, or when \n" \
520	"\tlaunching XMMS while GKrellMMS runs. This option also enables the \n" \	529	"\tlaunching "PROG_NAME" while GKrellMMS runs. This option also enables the \n" \
521	"\tmainwindow back when you quit gkrellm (some people really do). \n" \	530	"\tmainwindow back when you quit gkrellm (some people really do). \n" \
522	"\n"),	531	"\n"),
523		532
524	N_("<b>\tAuto hide all XMMS windows: \n"),	533	N_("<b>\tAuto hide all "PROG_NAME" windows: \n"),
525	N_("\tAutomatically hide all XMMS windows when GKrellMMS starts. \n" \	534	N_("\tAutomatically hide all "PROG_NAME" windows when GKrellMMS starts. \n" \
526	"\n"),	535	"\n"),
527		536
528	N_("<b>\tAuto start playing: \n"),	537	N_("<b>\tAuto start playing: \n"),
529	N_("\tAutomatically start playing when launching XMMS. \n\n"),	538	N_("\tAutomatically start playing when launching "PROG_NAME". \n\n"),
530		539
531	N_("<b>\tEnable scrolling title: \n"),	540	N_("<b>\tEnable scrolling title: \n"),
532	N_("\tEnable/disable the scrolling title-panel. \n" \	541	N_("\tEnable/disable the scrolling title-panel. \n" \
Lines 537-549 Link Here
537	"\tEject opens: \n"),	546	"\tEject opens: \n"),
538		547
539	N_("\tCheck whether the eject-button on the button-bar opens a \n" \	548	N_("\tCheck whether the eject-button on the button-bar opens a \n" \
540	"\tplaylist or an other XMMS-file. \n" \	549	"\tplaylist or an other "PROG_NAME"-file. \n" \
541	"\n"),	550	"\n"),
542		551
543	N_("<b>\tMMB on krell click: \n"),	552	N_("<b>\tMMB on krell click: \n"),
544	N_("\tCheck whether GKrellMMS should pause/continue or \n" \	553	N_("\tCheck whether GKrellMMS should pause/continue or \n" \
545	"\tstop/play the current song on a MMB-click on the krell. MMB Click will \n" \	554	"\tstop/play the current song on a MMB-click on the krell. MMB Click will \n" \
546	"\talways start playing the song if XMMS isn't playing. \n" \	555	"\talways start playing the song if "PROG_NAME" isn't playing. \n" \
547	"\n"),	556	"\n"),
548		557
549	N_("<b>\tLoad file-info: \n"),	558	N_("<b>\tLoad file-info: \n"),
Lines 553-559 Link Here
553	"\tplaylist editor, or are playing on a slow network/cdrom. \n\n"),	562	"\tplaylist editor, or are playing on a slow network/cdrom. \n\n"),
554		563
555	N_("<b>\tDraw in time bar: \n"),	564	N_("<b>\tDraw in time bar: \n"),
556	N_("\tCheck whether to draw the output time or 'xmms' in \n" \	565	N_("\tCheck whether to draw the output time or '"PROG_NAME"' in \n" \
557	"\tthe time-krell panel. \n" \	566	"\tthe time-krell panel. \n" \
558	"\n"),	567	"\n"),
559		568
Lines 577-583 Link Here
577	hbox = gtk_hbox_new(FALSE, 5);	586	hbox = gtk_hbox_new(FALSE, 5);
578		587
579	zbox = gtk_vbox_new(FALSE, 0);	588	zbox = gtk_vbox_new(FALSE, 0);
580	label = gtk_label_new(_("XMMS Executable:"));	589	label = gtk_label_new(_(PROG_NAME" Executable:"));
581	gtk_box_pack_start(GTK_BOX(zbox), label, TRUE, FALSE, 0);	590	gtk_box_pack_start(GTK_BOX(zbox), label, TRUE, FALSE, 0);
582	label = gtk_label_new(_("Files Directory:"));	591	label = gtk_label_new(_("Files Directory:"));
583	gtk_box_pack_start(GTK_BOX(zbox), label, TRUE, FALSE, 0);	592	gtk_box_pack_start(GTK_BOX(zbox), label, TRUE, FALSE, 0);
Lines 625-631 Link Here
625	gtk_spin_button_set_digits(GTK_SPIN_BUTTON(session_entry), (guint) 0);	634	gtk_spin_button_set_digits(GTK_SPIN_BUTTON(session_entry), (guint) 0);
626	gtk_spin_button_set_value(GTK_SPIN_BUTTON(session_entry), xmms_session);	635	gtk_spin_button_set_value(GTK_SPIN_BUTTON(session_entry), xmms_session);
627	gtk_box_pack_start(GTK_BOX(hbox), session_entry, FALSE, FALSE, 0);	636	gtk_box_pack_start(GTK_BOX(hbox), session_entry, FALSE, FALSE, 0);
628	label = gtk_label_new(_("XMMS Session to use"));	637	label = gtk_label_new(_(PROG_NAME" Session to use"));
629	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);	638	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
630	gtk_container_add(GTK_CONTAINER(vbox), hbox);	639	gtk_container_add(GTK_CONTAINER(vbox), hbox);
631		640
Lines 644-662 Link Here
644	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(draw_minus_entry), draw_minus);	653	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(draw_minus_entry), draw_minus);
645	gtk_container_add(GTK_CONTAINER(vbox), draw_minus_entry);	654	gtk_container_add(GTK_CONTAINER(vbox), draw_minus_entry);
646		655
647	xmms_start_entry = gtk_check_button_new_with_label(_("Auto launch XMMS on GKrellMMS startup"));	656	xmms_start_entry = gtk_check_button_new_with_label(_("Auto launch "PROG_NAME" on GKrellMMS startup"));
648	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(xmms_start_entry), xmms_autostart);	657	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(xmms_start_entry), xmms_autostart);
649	gtk_container_add(GTK_CONTAINER(vbox), xmms_start_entry);	658	gtk_container_add(GTK_CONTAINER(vbox), xmms_start_entry);
650		659
651	main_close_entry = gtk_check_button_new_with_label(_("Auto close (and open) XMMS Mainwin"));	660	main_close_entry = gtk_check_button_new_with_label(_("Auto close (and open) "PROG_NAME" Mainwin"));
652	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(main_close_entry), auto_main_close);	661	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(main_close_entry), auto_main_close);
653	gtk_container_add(GTK_CONTAINER(vbox), main_close_entry);	662	gtk_container_add(GTK_CONTAINER(vbox), main_close_entry);
654		663
655	hide_all_entry = gtk_check_button_new_with_label(_("Auto hide all XMMS windows on XMMS startup"));	664	hide_all_entry = gtk_check_button_new_with_label(_("Auto hide all "PROG_NAME" windows on "PROG_NAME" startup"));
656	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hide_all_entry), auto_hide_all);	665	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hide_all_entry), auto_hide_all);
657	gtk_container_add(GTK_CONTAINER(vbox), hide_all_entry);	666	gtk_container_add(GTK_CONTAINER(vbox), hide_all_entry);
658		667
659	auto_play_entry = gtk_check_button_new_with_label(_("Auto start playing on XMMS launch"));	668	auto_play_entry = gtk_check_button_new_with_label(_("Auto start playing on "PROG_NAME" launch"));
660	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_play_entry), auto_play_start);	669	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_play_entry), auto_play_start);
661	gtk_container_add(GTK_CONTAINER(vbox), auto_play_entry);	670	gtk_container_add(GTK_CONTAINER(vbox), auto_play_entry);
662		671
Lines 720-726 Link Here
720	gtk_signal_connect(GTK_OBJECT(time_draw_entry), "pressed",	729	gtk_signal_connect(GTK_OBJECT(time_draw_entry), "pressed",
721	(GtkSignalFunc) time_type_set, GINT_TO_POINTER(1));	730	(GtkSignalFunc) time_type_set, GINT_TO_POINTER(1));
722		731
723	time_draw_entry = gtk_radio_button_new_with_label(time_draw_group, _("XMMS-text"));	732	time_draw_entry = gtk_radio_button_new_with_label(time_draw_group, _(PROG_NAME"-text"));
724	gtk_box_pack_start(GTK_BOX(zbox), time_draw_entry, FALSE, FALSE, 0);	733	gtk_box_pack_start(GTK_BOX(zbox), time_draw_entry, FALSE, FALSE, 0);
725	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(time_draw_entry), !draw_time);	734	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(time_draw_entry), !draw_time);
726	gtk_signal_connect(GTK_OBJECT(time_draw_entry), "pressed",	735	gtk_signal_connect(GTK_OBJECT(time_draw_entry), "pressed",
Lines 840-849 Link Here
840	/* About */	849	/* About */
841	gkrellmms_info_text = g_strdup_printf(	850	gkrellmms_info_text = g_strdup_printf(
842	_("GKrellMMS %d.%d.%d\n" \	851	_("GKrellMMS %d.%d.%d\n" \
843	"GKrellM XMMS Plugin\n" \	852	"GKrellM XMMS/BMP/Audacious Plugin\n" \
844	"\n" \	853	"\n" \
845	"Copyright (C) 2000-2002 Sander Klein Lebbink <sander@cerberus.demon.nl>\n"\	854	"Copyright (C) 2000-2002 Sander Klein Lebbink <sander@cerberus.demon.nl>\n"\
846	"Current Maintainer: Sjoerd Simons <sjoerd@luon.net>\n" \	855	"Current Maintainer: Sjoerd Simons <sjoerd@luon.net>\n" \
		856	"Audacious Patch: Sascha Hlusiak <mail@saschahlusiak.de>\n" \
847	"http://gkrellm.luon.net/\n" \	857	"http://gkrellm.luon.net/\n" \
848	"\n" \	858	"\n" \
849	"Released under the GNU Public License\n"),	859	"Released under the GNU Public License\n"),