[Goodies-commits] r2028 - in xfce4-xmms-plugin/trunk: . panel-plugin

[Kemal Eroglu]

Author: ilgar
Date: 2006-09-12 22:44:59 +0000 (Tue, 12 Sep 2006)
New Revision: 2028

Modified:
   xfce4-xmms-plugin/trunk/ChangeLog
   xfce4-xmms-plugin/trunk/configure.in.in
   xfce4-xmms-plugin/trunk/panel-plugin/xmms_plugin.c
Log:
Committed patches by gaso, version bump to 0.4.2

Modified: xfce4-xmms-plugin/trunk/ChangeLog
===================================================================
--- xfce4-xmms-plugin/trunk/ChangeLog	2006-09-12 20:59:19 UTC (rev 2027)
+++ xfce4-xmms-plugin/trunk/ChangeLog	2006-09-12 22:44:59 UTC (rev 2028)
@@ -1,3 +1,18 @@
+2006-09-12 Kemal Ilgar Eroglu <kieroglu at math.washington.edu>
+
+	* Version 0.4.2
+	* Addressed issues noted by gaso <ganchang_mrlbr at ybb.ne.jp>, 
+	  applied his patches for:
+		* Gtk warning occurs at the plugin starting 
+		  time if XMMS isn't running
+		* "Horizontal volume bar on vertical panels" 
+		  option ignores "Show volume level" setting
+		* resized to incorrect size by "size-change" signal
+		* wrong value is set to height of volume bar if panel 
+		  and volume bar are vertical
+		* It seems volume bar width is too thick when 
+		  panel is horizontal
+
 2006-08-27 Kemal Ilgar Eroglu <kieroglu at math.washington.edu>
 
 	* Version bumped to 0.4.1 .

Modified: xfce4-xmms-plugin/trunk/configure.in.in
===================================================================
--- xfce4-xmms-plugin/trunk/configure.in.in	2006-09-12 20:59:19 UTC (rev 2027)
+++ xfce4-xmms-plugin/trunk/configure.in.in	2006-09-12 22:44:59 UTC (rev 2028)
@@ -8,7 +8,7 @@
 dnl version info
 m4_define([xfce4_xmms_version_major], [0])
 m4_define([xfce4_xmms_version_minor], [4])
-m4_define([xfce4_xmms_version_micro], [1])
+m4_define([xfce4_xmms_version_micro], [2])
 m4_define([xfce4_xmms_version_build], [@REVISION@])
 m4_define([xfce4_xmms_version_tag], [svn])
 m4_define([xfce4_xmms_version], [xfce4_xmms_version_major().xfce4_xmms_version_minor().xfce4_xmms_version_micro()ifelse(xfce4_xmms_version_tag(), [svn], [xfce4_xmms_version_tag()-xfce4_xmms_version_build()], [xfce4_xmms_version_tag()])])

Modified: xfce4-xmms-plugin/trunk/panel-plugin/xmms_plugin.c
===================================================================
--- xfce4-xmms-plugin/trunk/panel-plugin/xmms_plugin.c	2006-09-12 20:59:19 UTC (rev 2027)
+++ xfce4-xmms-plugin/trunk/panel-plugin/xmms_plugin.c	2006-09-12 22:44:59 UTC (rev 2028)
@@ -346,6 +346,13 @@
 
   gtk_widget_hide(pd->vol_pbar);
 
+  if( xfce_panel_plugin_get_orientation(pd->base)==GTK_ORIENTATION_VERTICAL)
+    gtk_widget_set_size_request
+    		(GTK_WIDGET(pd->base),xfce_panel_plugin_get_size(pd->base),50);
+  else
+    gtk_widget_set_size_request
+    		(GTK_WIDGET (pd->base),60,xfce_panel_plugin_get_size(pd->base)); 
+    		
   if(pd->vol_pbar){
     g_object_ref(G_OBJECT(pd->vol_pbar));
     gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(pd->vol_pbar)),
@@ -364,27 +371,32 @@
   			(pd-> base)-3,5);					
   			
   	gtk_box_pack_start(GTK_BOX(pd->boxV),pd->vol_pbar, DOEXPAND, DOFILL, PADDING);
+  /* Else horiz panel or vertical with vertical volume bar */
   }else{
   	gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR (pd->vol_pbar),
   	 GTK_PROGRESS_BOTTOM_TO_TOP ) ;	
-  	gtk_widget_set_size_request
-  			(pd->vol_pbar,5,
-  			xfce_panel_plugin_get_size(pd->base)-3);		  	 		    
+  	 
+        if (xfce_panel_plugin_get_orientation(pd->base)==GTK_ORIENTATION_VERTICAL) {
+                // vertical panel
+                // if do not this, volume bar height will be set based on panel width
+                gtk_widget_set_size_request(pd->vol_pbar, 5, 0);
+        } else {
+        	// Horizontal panel
+	  	gtk_widget_set_size_request (pd->vol_pbar,5,
+	  			xfce_panel_plugin_get_size(pd->base)-3);		  	  }		    
+
   	gtk_box_pack_start(GTK_BOX(pd->boxMain),pd->vol_pbar, DOEXPAND, DOFILL, 
-  									PADDING);    
+  									1);    
   }
-  
-  gtk_widget_show(pd->vol_pbar);
-  
-  if( xfce_panel_plugin_get_orientation(pd->base)==GTK_ORIENTATION_VERTICAL)
-    gtk_widget_set_size_request
-    		(GTK_WIDGET(pd->base),xfce_panel_plugin_get_size(pd->base),50);
-  else
-    gtk_widget_set_size_request
-    		(GTK_WIDGET (pd->base),80,xfce_panel_plugin_get_size(pd->base));  
- 
+
+  // check "Show volume level" setting
+  if (pd->vol_pbar_visible)
+	  gtk_widget_show(pd->vol_pbar);
+   
 }
 
+
+
 /*****************************/
 /* apply visibility settings */
 /*****************************/
@@ -736,6 +748,16 @@
   adjust_vol_pbar(pd);
 }
 
+/**
+ * panel resize callback
+ */
+static gboolean xmms_plugin_set_size(XfcePanelPlugin *plugin, int size, plugin_data *pd) {
+       adjust_vol_pbar(pd); // ad-hoc
+       return TRUE;
+}  
+
+
+
 /**********************/
 /* preferences dialog */
 /**********************/
@@ -874,6 +896,10 @@
   g_signal_connect (plugin, "orientation-changed", 
                       G_CALLBACK (orient_change), pd);
 
+  // resize plugin to correct size
+  g_signal_connect(plugin, "size-changed",
+                 G_CALLBACK(xmms_plugin_set_size), pd);
+
                         
   /* add scrolling callback for the plugin base widget */
   pd->base                     = plugin;
@@ -934,11 +960,15 @@
   					GTK_PROGRESS_CONTINUOUS);
   gtk_widget_set_size_request       (vol_pbar, 6, 0);
   xmms_remote_get_volume            (pd->xmms_session, &vl, &vr);
-  gtk_progress_bar_set_fraction     (GTK_PROGRESS_BAR(vol_pbar), 
+
+  if(vl==-1)
+  	gtk_progress_bar_set_fraction     (GTK_PROGRESS_BAR(vol_pbar), 
   					((double)(MAX(vl, vr)))/100);
-  rc =                              gtk_widget_get_modifier_style 
-  					(GTK_WIDGET (vol_pbar));
+  else
+  	gtk_progress_bar_set_fraction     (GTK_PROGRESS_BAR(vol_pbar), 0);
 
+  rc =  gtk_widget_get_modifier_style (GTK_WIDGET (vol_pbar));
+
   if (!rc)
 	rc = gtk_rc_style_new ();