comparison src/audacious/util.c @ 2514:7934ac463591 trunk

[svn] - removed unused function bmp_menu_translate() - removed playlist_file_selection_browser() and replaced it with make_filebrowser() - modified make_filebrowser() behaviour - adapted equalizer file loading/saving functions to new make_filebrowser()
author mf0102
date Tue, 13 Feb 2007 06:09:50 -0800
parents 59661bd074b4
children 299be5908480
comparison
equal deleted inserted replaced
2513:1e6d2d719876 2514:7934ac463591
406 open_buffer = NULL; 406 open_buffer = NULL;
407 } 407 }
408 408
409 vfs_file_get_contents(filename, &buffer, &filesize); 409 vfs_file_get_contents(filename, &buffer, &filesize);
410 410
411 if (buffer == NULL) 411 if (buffer == NULL)
412 return NULL; 412 return NULL;
413 413
414 open_buffer = g_strdup(filename); 414 open_buffer = g_strdup(filename);
415 } 415 }
416 416
488 488
489 return ret_buffer; 489 return ret_buffer;
490 } 490 }
491 491
492 GArray * 492 GArray *
493 read_ini_array(const gchar * filename, const gchar * section,
494 const gchar * key)
495 {
496 gchar *temp;
497 GArray *a;
498
499 if ((temp = read_ini_string(filename, section, key)) == NULL) {
500 g_free(temp);
501 return NULL;
502 }
503 a = string_to_garray(temp);
504 g_free(temp);
505 return a;
506 }
507
508 GArray *
493 string_to_garray(const gchar * str) 509 string_to_garray(const gchar * str)
494 { 510 {
495 GArray *array; 511 GArray *array;
496 gint temp; 512 gint temp;
497 const gchar *ptr = str; 513 const gchar *ptr = str;
510 break; 526 break;
511 } 527 }
512 return (array); 528 return (array);
513 } 529 }
514 530
515 GArray *
516 read_ini_array(const gchar * filename, const gchar * section,
517 const gchar * key)
518 {
519 gchar *temp;
520 GArray *a;
521
522 if ((temp = read_ini_string(filename, section, key)) == NULL) {
523 g_free(temp);
524 return NULL;
525 }
526 a = string_to_garray(temp);
527 g_free(temp);
528 return a;
529 }
530
531 void 531 void
532 glist_movedown(GList * list) 532 glist_movedown(GList * list)
533 { 533 {
534 gpointer temp; 534 gpointer temp;
535 535
580 desc = pango_font_description_from_string(name); 580 desc = pango_font_description_from_string(name);
581 font = gdk_font_from_description(desc); 581 font = gdk_font_from_description(desc);
582 582
583 return font; 583 return font;
584 } 584 }
585
586 #ifdef ENABLE_NLS
587 gchar *
588 bmp_menu_translate(const gchar * path, gpointer func_data)
589 {
590 gchar *translation = gettext(path);
591
592 if (!translation || *translation != '/') {
593 g_warning("Bad translation for menupath: %s", path);
594 translation = (gchar *) path;
595 }
596
597 return translation;
598 }
599 #endif
600 585
601 /* text_get_extents() taken from The GIMP (C) Spencer Kimball, Peter 586 /* text_get_extents() taken from The GIMP (C) Spencer Kimball, Peter
602 * Mattis et al */ 587 * Mattis et al */
603 gboolean 588 gboolean
604 text_get_extents(const gchar * fontname, 589 text_get_extents(const gchar * fontname,
690 675
691 return TRUE; 676 return TRUE;
692 } 677 }
693 678
694 GtkWidget * 679 GtkWidget *
695 make_filebrowser(const gchar * title, 680 make_filebrowser(const gchar *title, gboolean save)
696 gboolean save)
697 { 681 {
698 GtkWidget *dialog; 682 GtkWidget *dialog;
699 GtkWidget *button; 683 GtkWidget *button;
700 GtkWidget *button_close;
701 684
702 g_return_val_if_fail(title != NULL, NULL); 685 g_return_val_if_fail(title != NULL, NULL);
703 686
704 dialog = gtk_file_chooser_dialog_new(title, GTK_WINDOW(mainwin), 687 dialog = gtk_file_chooser_dialog_new(title, GTK_WINDOW(mainwin),
705 GTK_FILE_CHOOSER_ACTION_OPEN, NULL, NULL); 688 save ?
706 if (save) 689 GTK_FILE_CHOOSER_ACTION_SAVE :
707 gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialog), 690 GTK_FILE_CHOOSER_ACTION_OPEN,
708 GTK_FILE_CHOOSER_ACTION_SAVE); 691 NULL, NULL);
709 692
710 if (!save) 693 button = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
711 gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE); 694 GTK_RESPONSE_REJECT);
712 695
713 g_signal_connect(dialog, "destroy", 696 gtk_button_set_use_stock(GTK_BUTTON(button), TRUE);
714 G_CALLBACK(gtk_widget_destroyed), &dialog); 697 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
715
716 button_close = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
717 GTK_RESPONSE_REJECT);
718 gtk_button_set_use_stock(GTK_BUTTON(button_close), TRUE);
719 GTK_WIDGET_SET_FLAGS(button_close, GTK_CAN_DEFAULT);
720 g_signal_connect_swapped(button_close, "clicked",
721 G_CALLBACK(gtk_widget_destroy), dialog);
722 698
723 button = gtk_dialog_add_button(GTK_DIALOG(dialog), save ? 699 button = gtk_dialog_add_button(GTK_DIALOG(dialog), save ?
724 GTK_STOCK_SAVE : GTK_STOCK_OPEN, 700 GTK_STOCK_SAVE : GTK_STOCK_OPEN,
725 GTK_RESPONSE_ACCEPT); 701 GTK_RESPONSE_ACCEPT);
702
726 gtk_button_set_use_stock(GTK_BUTTON(button), TRUE); 703 gtk_button_set_use_stock(GTK_BUTTON(button), TRUE);
727 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); 704 gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
728 gtk_window_set_default(GTK_WINDOW(dialog), button);
729
730 gtk_widget_show(dialog);
731 705
732 return dialog; 706 return dialog;
733 } 707 }
734 708
735 /* 709 /*