[Goodies-commits] r2662 - xfce4-quicklauncher-plugin/trunk/panel-plugin

[Masse Nicolas]

Author: bountykiller
Date: 2007-04-04 22:24:07 +0000 (Wed, 04 Apr 2007)
New Revision: 2662

Modified:
   xfce4-quicklauncher-plugin/trunk/panel-plugin/callbacks.c
   xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c
   xfce4-quicklauncher-plugin/trunk/panel-plugin/types.h
Log:
+ resolve a size problem with labels
+ apply correctly the tooltips setting


Modified: xfce4-quicklauncher-plugin/trunk/panel-plugin/callbacks.c
===================================================================
--- xfce4-quicklauncher-plugin/trunk/panel-plugin/callbacks.c	2007-04-04 16:19:28 UTC (rev 2661)
+++ xfce4-quicklauncher-plugin/trunk/panel-plugin/callbacks.c	2007-04-04 22:24:07 UTC (rev 2662)
@@ -277,7 +277,6 @@
 	g_signal_connect(btn, "clicked", G_CALLBACK(btn_clicked), (gpointer)XFCE_ICON_CATEGORY_EXTERN);
 	g_signal_connect_swapped(btn, "clicked", G_CALLBACK(gtk_widget_hide), (gpointer)_icon_window);
 	gtk_widget_show(btn);
-
 	gtk_widget_show(hbox);
 
 	return _icon_window;
@@ -510,7 +509,8 @@
 		launcher->command = (gchar*) g_malloc(sizeof(gchar) * (strlen(arg2)+1));
 		strcpy(launcher->command, arg2);
 		gtk_list_store_set(GTK_LIST_STORE(treemodel), &iter, 1, launcher->command, -1);
-		gtk_tooltips_set_tip(launcher->tooltip, launcher->image, launcher->command, launcher->command);
+		launcher_set_has_tooltip(launcher, _dlg->quicklauncher->has_tooltips);
+		launcher_set_has_label(launcher, _dlg->quicklauncher->has_labels);
 		gtk_tree_path_free(path);
 	}
 }

Modified: xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c
===================================================================
--- xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c	2007-04-04 16:19:28 UTC (rev 2661)
+++ xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c	2007-04-04 22:24:07 UTC (rev 2662)
@@ -45,8 +45,6 @@
 /* Launcher funcs */
 gboolean launcher_passthrough (GtkWidget *box, GdkEventCrossing *event, t_launcher *launcher);
 gboolean launcher_clicked (GtkWidget *box, GdkEventButton *event, t_launcher *launcher);
-void launcher_set_has_tooltip(t_launcher *launcher, gboolean has_tooltip);
-void launcher_set_has_label(t_launcher *launcher, gboolean has_label);
 t_launcher* launcher_load_config(XfceRc *rcfile, gint num, t_quicklauncher *quicklauncher);
 void launcher_save_config(t_launcher *launcher, XfceRc *rcfile, guint16 num);
 
@@ -340,7 +338,7 @@
 	quicklauncher->table = g_object_ref(gtk_table_new(2, 2, FALSE));
 	gtk_table_set_col_spacings(GTK_TABLE(quicklauncher->table), 0);
 	gtk_table_set_row_spacings(GTK_TABLE(quicklauncher->table), 0);
-	gtk_container_add( GTK_CONTAINER(quicklauncher->plugin), quicklauncher->table);
+	gtk_container_add(GTK_CONTAINER(quicklauncher->plugin), quicklauncher->table);
 	gtk_widget_show(quicklauncher->table);
 	if((!filename) || (!quicklauncher_load_config(quicklauncher, filename) ) )
 		quicklauncher_load_default(quicklauncher);
@@ -487,7 +485,10 @@
 	launcher->def_img = _create_pixbuf(launcher->icon_id, launcher->icon_name, size);
 	if (launcher->def_img)
 		gtk_image_set_from_pixbuf(GTK_IMAGE(launcher->image), launcher->def_img);
-	gtk_widget_set_size_request(launcher->image, size, size);
+	if(!launcher->quicklauncher->has_labels)
+		gtk_widget_set_size_request(launcher->box, size, size);
+	else
+		gtk_widget_set_size_request(launcher->box, -1, size); 
 }
 
 void
@@ -499,6 +500,7 @@
 
 void launcher_set_has_tooltip(t_launcher *launcher, gboolean has_tooltip)
 {
+	DBG (has_tooltip?"Has tooltip":"No tooltip");
 	UNREF(launcher->tooltip);
 	if(has_tooltip)
 	{
@@ -512,6 +514,7 @@
 
 void launcher_set_has_label(t_launcher *launcher, gboolean has_label)
 {
+	DBG (has_label?"Has label":"No label");
 	if(launcher->label)
 		gtk_widget_destroy(launcher->label);
 	if(has_label)

Modified: xfce4-quicklauncher-plugin/trunk/panel-plugin/types.h
===================================================================
--- xfce4-quicklauncher-plugin/trunk/panel-plugin/types.h	2007-04-04 16:19:28 UTC (rev 2661)
+++ xfce4-quicklauncher-plugin/trunk/panel-plugin/types.h	2007-04-04 22:24:07 UTC (rev 2662)
@@ -109,7 +109,9 @@
 t_launcher* launcher_new (const gchar *command, gint icon_id,
 						const gchar *icon_name, t_quicklauncher *quicklauncher);
 void launcher_free (t_launcher *launcher);
-void launcher_update_icon(t_launcher *launcher, gint size) ;
+void launcher_update_icon(t_launcher *launcher, gint size);
+void launcher_set_has_tooltip(t_launcher *launcher, gboolean has_tooltip);
+void launcher_set_has_label(t_launcher *launcher, gboolean has_label);
 t_quicklauncher *quicklauncher_new (XfcePanelPlugin *plugin);
 void quicklauncher_add_element(t_quicklauncher *quicklauncher, t_launcher *launcher);
 t_launcher* quicklauncher_remove_element(t_quicklauncher *quicklauncher, gint num);