diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | callbacks.c | 10 | ||||
| -rw-r--r-- | deadbeef.gladep | 10 | ||||
| -rw-r--r-- | interface.c | 63 | ||||
| -rw-r--r-- | support.c | 4 | ||||
| -rw-r--r-- | support.h | 25 |
6 files changed, 48 insertions, 65 deletions
@@ -15,7 +15,6 @@ config.status config.sub depcomp stamp-h* -*.gladep *.zip *.log *.guess diff --git a/callbacks.c b/callbacks.c index ffc7dd23..628fdb7c 100644 --- a/callbacks.c +++ b/callbacks.c @@ -75,8 +75,9 @@ main_playlist_init (GtkWidget *widget) { main_playlist.clicktime = -1; main_playlist.nvisiblerows = 0; main_playlist.fmtcache = NULL; - int colwidths[pl_ncolumns] = { 50, 150, 50, 150, 50 }; - memcpy (main_playlist.colwidths, colwidths, sizeof (colwidths)); +// int colwidths[pl_ncolumns] = { 50, 150, 50, 150, 50 }; +// memcpy (main_playlist.colwidths, colwidths, sizeof (colwidths)); + main_playlist.colwidths = session_get_main_colwidths_ptr (); gtk_object_set_data (GTK_OBJECT (main_playlist.playlist), "ps", &main_playlist); gtk_object_set_data (GTK_OBJECT (main_playlist.header), "ps", &main_playlist); gtk_object_set_data (GTK_OBJECT (main_playlist.scrollbar), "ps", &main_playlist); @@ -101,8 +102,9 @@ search_playlist_init (GtkWidget *widget) { search_playlist.clicktime = -1; search_playlist.nvisiblerows = 0; search_playlist.fmtcache = NULL; - int colwidths[pl_ncolumns] = { 0, 150, 50, 150, 50 }; - memcpy (search_playlist.colwidths, colwidths, sizeof (colwidths)); +// int colwidths[pl_ncolumns] = { 0, 150, 50, 150, 50 }; +// memcpy (search_playlist.colwidths, colwidths, sizeof (colwidths)); + search_playlist.colwidths = session_get_search_colwidths_ptr (); gtk_object_set_data (GTK_OBJECT (search_playlist.playlist), "ps", &search_playlist); gtk_object_set_data (GTK_OBJECT (search_playlist.header), "ps", &search_playlist); gtk_object_set_data (GTK_OBJECT (search_playlist.scrollbar), "ps", &search_playlist); diff --git a/deadbeef.gladep b/deadbeef.gladep new file mode 100644 index 00000000..22ea860c --- /dev/null +++ b/deadbeef.gladep @@ -0,0 +1,10 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd"> + +<glade-project> + <name>Deadbeef</name> + <program_name>deadbeef</program_name> + <source_directory></source_directory> + <gnome_support>FALSE</gnome_support> + <gettext_support>FALSE</gettext_support> +</glade-project> diff --git a/interface.c b/interface.c index b4cbe829..f2db2bd0 100644 --- a/interface.c +++ b/interface.c @@ -98,7 +98,7 @@ create_mainwin (void) mainwin = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_widget_set_events (mainwin, GDK_KEY_PRESS_MASK); - gtk_window_set_title (GTK_WINDOW (mainwin), _("DeaDBeeF")); + gtk_window_set_title (GTK_WINDOW (mainwin), "DeaDBeeF"); gtk_window_set_default_size (GTK_WINDOW (mainwin), 500, 300); vbox1 = gtk_vbox_new (FALSE, 0); @@ -109,7 +109,7 @@ create_mainwin (void) gtk_widget_show (menubar1); gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0); - menuitem1 = gtk_menu_item_new_with_mnemonic (_("_File")); + menuitem1 = gtk_menu_item_new_with_mnemonic ("_File"); gtk_widget_show (menuitem1); gtk_container_add (GTK_CONTAINER (menubar1), menuitem1); @@ -125,11 +125,11 @@ create_mainwin (void) gtk_container_add (GTK_CONTAINER (menuitem1_menu), separator2); gtk_widget_set_sensitive (separator2, FALSE); - add_files = gtk_menu_item_new_with_mnemonic (_("Add files")); + add_files = gtk_menu_item_new_with_mnemonic ("Add files"); gtk_widget_show (add_files); gtk_container_add (GTK_CONTAINER (menuitem1_menu), add_files); - add_folder1 = gtk_menu_item_new_with_mnemonic (_("Add folder")); + add_folder1 = gtk_menu_item_new_with_mnemonic ("Add folder"); gtk_widget_show (add_folder1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), add_folder1); @@ -142,7 +142,7 @@ create_mainwin (void) gtk_widget_show (quit1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), quit1); - edit1 = gtk_menu_item_new_with_mnemonic (_("Edit")); + edit1 = gtk_menu_item_new_with_mnemonic ("Edit"); gtk_widget_show (edit1); gtk_container_add (GTK_CONTAINER (menubar1), edit1); @@ -157,7 +157,7 @@ create_mainwin (void) gtk_widget_show (select_all1); gtk_container_add (GTK_CONTAINER (edit1_menu), select_all1); - selection1 = gtk_menu_item_new_with_mnemonic (_("Selection")); + selection1 = gtk_menu_item_new_with_mnemonic ("Selection"); gtk_widget_show (selection1); gtk_container_add (GTK_CONTAINER (edit1_menu), selection1); @@ -168,7 +168,7 @@ create_mainwin (void) gtk_widget_show (remove1); gtk_container_add (GTK_CONTAINER (selection1_menu), remove1); - crop1 = gtk_menu_item_new_with_mnemonic (_("Crop")); + crop1 = gtk_menu_item_new_with_mnemonic ("Crop"); gtk_widget_show (crop1); gtk_container_add (GTK_CONTAINER (selection1_menu), crop1); @@ -176,88 +176,88 @@ create_mainwin (void) gtk_widget_show (find); gtk_container_add (GTK_CONTAINER (edit1_menu), find); - playlist1 = gtk_menu_item_new_with_mnemonic (_("Playlist")); + playlist1 = gtk_menu_item_new_with_mnemonic ("Playlist"); gtk_widget_show (playlist1); gtk_container_add (GTK_CONTAINER (menubar1), playlist1); playlist1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (playlist1), playlist1_menu); - playlist_load = gtk_menu_item_new_with_mnemonic (_("Load")); + playlist_load = gtk_menu_item_new_with_mnemonic ("Load"); gtk_widget_show (playlist_load); gtk_container_add (GTK_CONTAINER (playlist1_menu), playlist_load); - playlist_save = gtk_menu_item_new_with_mnemonic (_("Save")); + playlist_save = gtk_menu_item_new_with_mnemonic ("Save"); gtk_widget_show (playlist_save); gtk_container_add (GTK_CONTAINER (playlist1_menu), playlist_save); - playlist_save_as = gtk_menu_item_new_with_mnemonic (_("Save As")); + playlist_save_as = gtk_menu_item_new_with_mnemonic ("Save As"); gtk_widget_show (playlist_save_as); gtk_container_add (GTK_CONTAINER (playlist1_menu), playlist_save_as); - order1 = gtk_menu_item_new_with_mnemonic (_("Order")); + order1 = gtk_menu_item_new_with_mnemonic ("Order"); gtk_widget_show (order1); gtk_container_add (GTK_CONTAINER (playlist1_menu), order1); order1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (order1), order1_menu); - order_linear = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Linear")); + order_linear = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, "Linear"); order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_linear)); gtk_widget_show (order_linear); gtk_container_add (GTK_CONTAINER (order1_menu), order_linear); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (order_linear), TRUE); - order_shuffle = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Shuffle")); + order_shuffle = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, "Shuffle"); order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_shuffle)); gtk_widget_show (order_shuffle); gtk_container_add (GTK_CONTAINER (order1_menu), order_shuffle); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (order_shuffle), TRUE); - order_random = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Random")); + order_random = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, "Random"); order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_random)); gtk_widget_show (order_random); gtk_container_add (GTK_CONTAINER (order1_menu), order_random); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (order_random), TRUE); - looping1 = gtk_menu_item_new_with_mnemonic (_("Looping")); + looping1 = gtk_menu_item_new_with_mnemonic ("Looping"); gtk_widget_show (looping1); gtk_container_add (GTK_CONTAINER (playlist1_menu), looping1); looping1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (looping1), looping1_menu); - loop_all = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Loop All")); + loop_all = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, "Loop All"); loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_all)); gtk_widget_show (loop_all); gtk_container_add (GTK_CONTAINER (looping1_menu), loop_all); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (loop_all), TRUE); - loop_single = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Loop Single Song")); + loop_single = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, "Loop Single Song"); loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_single)); gtk_widget_show (loop_single); gtk_container_add (GTK_CONTAINER (looping1_menu), loop_single); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (loop_single), TRUE); - loop_disable = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Don't Loop")); + loop_disable = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, "Don't Loop"); loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_disable)); gtk_widget_show (loop_disable); gtk_container_add (GTK_CONTAINER (looping1_menu), loop_disable); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (loop_disable), TRUE); - scroll_follows_playback = gtk_check_menu_item_new_with_mnemonic (_("Scroll follows playback")); + scroll_follows_playback = gtk_check_menu_item_new_with_mnemonic ("Scroll follows playback"); gtk_widget_show (scroll_follows_playback); gtk_container_add (GTK_CONTAINER (playlist1_menu), scroll_follows_playback); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (scroll_follows_playback), TRUE); - menuitem4 = gtk_menu_item_new_with_mnemonic (_("_Help")); + menuitem4 = gtk_menu_item_new_with_mnemonic ("_Help"); gtk_widget_show (menuitem4); gtk_container_add (GTK_CONTAINER (menubar1), menuitem4); menuitem4_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem4), menuitem4_menu); - about1 = gtk_menu_item_new_with_mnemonic (_("_About")); + about1 = gtk_menu_item_new_with_mnemonic ("_About"); gtk_widget_show (about1); gtk_container_add (GTK_CONTAINER (menuitem4_menu), about1); @@ -641,21 +641,18 @@ create_aboutdialog (void) "Button artwork: Stas \"uncle lag\" Akimushkin <uncle.lag@gmail.com>", NULL }; - /* TRANSLATORS: Replace this string with your names, one name per line. */ - gchar *translators = _("translator-credits"); aboutdialog = gtk_about_dialog_new (); gtk_container_set_border_width (GTK_CONTAINER (aboutdialog), 4); gtk_window_set_destroy_with_parent (GTK_WINDOW (aboutdialog), TRUE); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (aboutdialog), VERSION); - gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (aboutdialog), _("DeaDBeeF")); - gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (aboutdialog), _("Copyright \302\251 2009 Alexey Yakovenko")); - gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (aboutdialog), _("DeaDBeeF - ultimate music player for GNU/Linux systems with X11\nCopyright (C) 2009 Alexey Yakovenko\n\nThis program is free software; you can redistribute it and/or\nmodify it under the terms of the GNU General Public License\nas published by the Free Software Foundation; either version 2\nof the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\n\nNote that other included libraries have separate licensing terms.\n\n\nDUMB - Dynamic Universal Music Bibliotheque, Version 0.9.3\nCopyright (C) 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere.\n\n\nGame_Music_Emu Version 0.5.2\nCopyright (C) 2003-2006 Shay Green.\n\n\nFunctions to compute MD5 message digest of files or memory blocks\nWritten by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.\nModified by Gray Watson <http://256.com/gray/>, 1997.\n\n\nlibsidplay2 - commodore 64 SID emulation library\nCopyright (C) Simon White and other authors.")); + gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (aboutdialog), "DeaDBeeF"); + gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (aboutdialog), "Copyright \302\251 2009 Alexey Yakovenko"); + gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (aboutdialog), "DeaDBeeF - ultimate music player for GNU/Linux systems with X11\nCopyright (C) 2009 Alexey Yakovenko\n\nThis program is free software; you can redistribute it and/or\nmodify it under the terms of the GNU General Public License\nas published by the Free Software Foundation; either version 2\nof the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\n\nNote that other included libraries have separate licensing terms.\n\n\nDUMB - Dynamic Universal Music Bibliotheque, Version 0.9.3\nCopyright (C) 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere.\n\n\nGame_Music_Emu Version 0.5.2\nCopyright (C) 2003-2006 Shay Green.\n\n\nFunctions to compute MD5 message digest of files or memory blocks\nWritten by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.\nModified by Gray Watson <http://256.com/gray/>, 1997.\n\n\nlibsidplay2 - commodore 64 SID emulation library\nCopyright (C) Simon White and other authors."); gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (aboutdialog), "http://deadbeef.sf.net"); - gtk_about_dialog_set_website_label (GTK_ABOUT_DIALOG (aboutdialog), _("website")); + gtk_about_dialog_set_website_label (GTK_ABOUT_DIALOG (aboutdialog), "website"); gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (aboutdialog), authors); gtk_about_dialog_set_artists (GTK_ABOUT_DIALOG (aboutdialog), artists); - gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG (aboutdialog), translators); /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (aboutdialog, aboutdialog, "aboutdialog"); @@ -678,7 +675,7 @@ create_searchwin (void) searchwin = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_widget_set_size_request (searchwin, 600, 150); gtk_widget_set_events (searchwin, GDK_KEY_PRESS_MASK); - gtk_window_set_title (GTK_WINDOW (searchwin), _("Search")); + gtk_window_set_title (GTK_WINDOW (searchwin), "Search"); gtk_window_set_position (GTK_WINDOW (searchwin), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (searchwin), TRUE); gtk_window_set_skip_pager_hint (GTK_WINDOW (searchwin), TRUE); @@ -821,7 +818,7 @@ create_traymenu (void) gtk_widget_show (next1); gtk_container_add (GTK_CONTAINER (traymenu), next1); - play_random1 = gtk_menu_item_new_with_mnemonic (_("Play Random")); + play_random1 = gtk_menu_item_new_with_mnemonic ("Play Random"); gtk_widget_show (play_random1); gtk_container_add (GTK_CONTAINER (traymenu), play_random1); @@ -896,7 +893,7 @@ create_addprogress (void) GtkWidget *button1; addprogress = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (addprogress), _("Adding files...")); + gtk_window_set_title (GTK_WINDOW (addprogress), "Adding files..."); gtk_window_set_position (GTK_WINDOW (addprogress), GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (addprogress), TRUE); gtk_window_set_skip_pager_hint (GTK_WINDOW (addprogress), TRUE); @@ -918,7 +915,7 @@ create_addprogress (void) gtk_widget_show (hbox7); gtk_box_pack_start (GTK_BOX (vbox6), hbox7, FALSE, TRUE, 2); - button1 = gtk_button_new_with_mnemonic (_("Abort")); + button1 = gtk_button_new_with_mnemonic ("Abort"); gtk_widget_show (button1); gtk_box_pack_start (GTK_BOX (hbox7), button1, FALSE, FALSE, 0); gtk_widget_set_size_request (button1, 83, -1); @@ -87,7 +87,7 @@ create_pixmap (GtkWidget *widget, if (!pathname) { - g_warning (_("Couldn't find pixmap file: %s"), filename); + g_warning ("Couldn't find pixmap file: %s", filename); return gtk_image_new (); } @@ -111,7 +111,7 @@ create_pixbuf (const gchar *filename) if (!pathname) { - g_warning (_("Couldn't find pixmap file: %s"), filename); + g_warning ("Couldn't find pixmap file: %s", filename); return NULL; } @@ -9,31 +9,6 @@ #include <gtk/gtk.h> /* - * Standard gettext macros. - */ -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (PACKAGE, String) -# define Q_(String) g_strip_context ((String), gettext (String)) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define Q_(String) g_strip_context ((String), (String)) -# define N_(String) (String) -#endif - - -/* * Public Functions. */ |