Mercurial > audlegacy

changeset 1388:b8e521f642e4 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - when the playlist page of the preferences window is shown, the checkbox for filepopup follows the popup menu now. - tweaks descriptions (s/song/entry/).
author yaz
date Mon, 10 Jul 2006 06:41:11 -0700
parents b0590e16329f
children c19443be579d
files ChangeLog audacious/glade/prefswin.glade audacious/prefswin.c audacious/ui_playlist.c
diffstat 4 files changed, 63 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jul 10 04:52:51 2006 -0700
+++ b/ChangeLog	Mon Jul 10 06:41:11 2006 -0700
@@ -1,3 +1,57 @@
+2006-07-10 11:52:51 +0000  Giacomo Lozito <james@develia.org>
+  revision [1688]
+  import amidi-plug 0.5
+
+  Changes:        Modified:
+  +14 -9          trunk/Plugins/Input/amidi-plug/Makefile.in  
+  +398 -0         trunk/Plugins/Input/amidi-plug/amidi-plug-icon.xpm  
+  +234 -234       trunk/Plugins/Input/amidi-plug/amidi-plug.c  
+  +12 -16         trunk/Plugins/Input/amidi-plug/amidi-plug.h  
+  +15 -0          trunk/Plugins/Input/amidi-plug/backend-alsa/Makefile.in  
+  +35 -0          trunk/Plugins/Input/amidi-plug/backend-alsa/b-alsa-config.h  
+  +875 -0         trunk/Plugins/Input/amidi-plug/backend-alsa/b-alsa.c  
+  +63 -0          trunk/Plugins/Input/amidi-plug/backend-alsa/b-alsa.h  
+  +444 -0         trunk/Plugins/Input/amidi-plug/backend-alsa/backend-alsa-icon.xpm  
+  +15 -0          trunk/Plugins/Input/amidi-plug/backend-dummy/Makefile.in  
+  +36 -0          trunk/Plugins/Input/amidi-plug/backend-dummy/b-dummy-config.h  
+  +392 -0         trunk/Plugins/Input/amidi-plug/backend-dummy/b-dummy.c  
+  +49 -0          trunk/Plugins/Input/amidi-plug/backend-dummy/b-dummy.h  
+  +852 -0         trunk/Plugins/Input/amidi-plug/backend-dummy/backend-dummy-icon.xpm  
+  +15 -0          trunk/Plugins/Input/amidi-plug/backend-fluidsynth/Makefile.in  
+  +41 -0          trunk/Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth-config.h  
+  +455 -0         trunk/Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth.c  
+  +56 -0          trunk/Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth.h  
+  +1408 -0        trunk/Plugins/Input/amidi-plug/backend-fluidsynth/backend-fluidsynth-icon.xpm  
+  +174 -0         trunk/Plugins/Input/amidi-plug/i_backend.c  
+  +82 -0          trunk/Plugins/Input/amidi-plug/i_backend.h  
+  +5 -2           trunk/Plugins/Input/amidi-plug/i_common.h  
+  +555 -0         trunk/Plugins/Input/amidi-plug/i_configure-alsa.c  
+  +36 -0          trunk/Plugins/Input/amidi-plug/i_configure-alsa.h  
+  +279 -0         trunk/Plugins/Input/amidi-plug/i_configure-ap.c  
+  +33 -0          trunk/Plugins/Input/amidi-plug/i_configure-ap.h  
+  +410 -0         trunk/Plugins/Input/amidi-plug/i_configure-dummy.c  
+  +36 -0          trunk/Plugins/Input/amidi-plug/i_configure-dummy.h  
+  +843 -0         trunk/Plugins/Input/amidi-plug/i_configure-fluidsynth.c  
+  +36 -0          trunk/Plugins/Input/amidi-plug/i_configure-fluidsynth.h  
+  +241 -336       trunk/Plugins/Input/amidi-plug/i_configure.c  
+  +7 -44          trunk/Plugins/Input/amidi-plug/i_configure.h  
+  +42 -0          trunk/Plugins/Input/amidi-plug/i_configure_private.h  
+  +19 -18         trunk/Plugins/Input/amidi-plug/i_fileinfo.c  
+  +0 -8           trunk/Plugins/Input/amidi-plug/i_fileinfo.h  
+  +189 -23        trunk/Plugins/Input/amidi-plug/i_midi.h  
+  +40 -0          trunk/Plugins/Input/amidi-plug/i_midievent.h  
+  +0 -493         trunk/Plugins/Input/amidi-plug/i_seq.c  
+  +0 -62          trunk/Plugins/Input/amidi-plug/i_seq.h  
+  +37 -39         trunk/Plugins/Input/amidi-plug/i_utils.c  
+  +4 -8           trunk/Plugins/Input/amidi-plug/i_utils.h  
+  +12 -0          trunk/Plugins/Input/amidi-plug/pcfg/Makefile.in  
+  +158 -0         trunk/Plugins/Input/amidi-plug/pcfg/i_pcfg.c  
+  +39 -0          trunk/Plugins/Input/amidi-plug/pcfg/i_pcfg.h  
+  +114 -15        trunk/configure.ac  
+  +3 -3           trunk/m4/amidi-plug.m4  
+  +7 -0           trunk/mk/rules.mk.in  
+
+
 2006-07-10 11:42:53 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1686]
   - disconnect mms code
--- a/audacious/glade/prefswin.glade	Mon Jul 10 04:52:51 2006 -0700
+++ b/audacious/glade/prefswin.glade	Mon Jul 10 06:41:11 2006 -0700
@@ -2353,9 +2353,9 @@
 			  <child>
 			    <widget class="GtkCheckButton" id="checkbutton10">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Toggles popup information window for the pointed song in the playlist. The window shows title of song, name of album, genre, year of publish, track number, track length, and artwork.</property>
+			      <property name="tooltip" translatable="yes">Toggles popup information window for the pointed entry in the playlist. The window shows title of song, name of album, genre, year of publish, track number, track length, and artwork.</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Show popup information for song</property>
+			      <property name="label" translatable="yes">Show popup information for playlist entries</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
--- a/audacious/prefswin.c	Mon Jul 10 04:52:51 2006 -0700
+++ b/audacious/prefswin.c	Mon Jul 10 06:41:11 2006 -0700
@@ -92,6 +92,7 @@
 static GtkWidget *prefswin = NULL;
 static GtkWidget *category_treeview = NULL;
 static GtkWidget *category_notebook = NULL;
+GtkWidget *filepopupbutton = NULL;
 
 static Category categories[] = {
     {DATA_DIR "/images/appearance.png", N_("Appearance"), 1},
@@ -2012,6 +2013,7 @@
 on_show_filepopup_for_tuple_realize(GtkToggleButton * button, gpointer data)
 {
     gtk_toggle_button_set_active(button, cfg.show_filepopup_for_tuple);
+    filepopupbutton = (GtkWidget *)button;
 }
 
 static void
--- a/audacious/ui_playlist.c	Mon Jul 10 04:52:51 2006 -0700
+++ b/audacious/ui_playlist.c	Mon Jul 10 06:41:11 2006 -0700
@@ -1969,6 +1969,8 @@
                                 guint action,
                                 GtkWidget * widget)
 {
+    extern GtkWidget *filepopupbutton;
+
     switch (action) {
     case ADD_FILES:
         playlistwin_show_filebrowser();
@@ -1996,6 +1998,9 @@
         break;
     case MISC_FILEPOPUP:
         cfg.show_filepopup_for_tuple = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
+        if(filepopupbutton != NULL){
+            gtk_signal_emit_by_name(GTK_OBJECT(filepopupbutton), "realize");
+        }
         break;
 
     }