[Xfce4-commits] r25396 - in squeeze/trunk: libsqueeze src

Stephan Arts stephan at xfce.org
Fri Apr 6 14:10:28 CEST 2007 

Author: stephan
Date: 2007-04-06 12:10:28 +0000 (Fri, 06 Apr 2007)
New Revision: 25396

Modified:
   squeeze/trunk/libsqueeze/Makefile.am
   squeeze/trunk/libsqueeze/xfce-launch-command.c
   squeeze/trunk/src/Makefile.am
   squeeze/trunk/src/main_window.c
   squeeze/trunk/src/message_dialog.c
   squeeze/trunk/src/notebook.c
Log:
- Remove profiling support
- Added throbber to tabs
- Fixed compile-warnings



Modified: squeeze/trunk/libsqueeze/Makefile.am
===================================================================
--- squeeze/trunk/libsqueeze/Makefile.am	2007-04-06 08:32:36 UTC (rev 25395)
+++ squeeze/trunk/libsqueeze/Makefile.am	2007-04-06 12:10:28 UTC (rev 25396)
@@ -28,7 +28,7 @@
 libsqueeze_1_la_CFLAGS = \
 	$(GLIB_CFLAGS)  \
 	$(DBUS_CFLAGS)  \
-	$(THUNAR_VFS_CFLAGS) -pg
+	$(THUNAR_VFS_CFLAGS)
 
 libsqueeze_1_la_LIBADD =
 

Modified: squeeze/trunk/libsqueeze/xfce-launch-command.c
===================================================================
--- squeeze/trunk/libsqueeze/xfce-launch-command.c	2007-04-06 08:32:36 UTC (rev 25395)
+++ squeeze/trunk/libsqueeze/xfce-launch-command.c	2007-04-06 12:10:28 UTC (rev 25396)
@@ -25,6 +25,7 @@
 #include <thunar-vfs/thunar-vfs.h>
 
 #include "libsqueeze-module.h"
+#include "libsqueeze-view.h"
 #include "archive-iter.h"
 #include "archive-command.h"
 #include "xfce-launch-command.h"

Modified: squeeze/trunk/src/Makefile.am
===================================================================
--- squeeze/trunk/src/Makefile.am	2007-04-06 08:32:36 UTC (rev 25395)
+++ squeeze/trunk/src/Makefile.am	2007-04-06 12:10:28 UTC (rev 25396)
@@ -40,7 +40,7 @@
 	$(XFCE4UTIL_CFLAGS) \
 	-DDATADIR=\"$(datadir)\" \
 	-DSRCDIR=\"$(top_srcdir)\" \
-	-DLOCALEDIR=\"$(localedir)\" -pg
+	-DLOCALEDIR=\"$(localedir)\"
  
 squeeze_LDADD = \
 	$(top_builddir)/libsqueeze/libsqueeze-1.la \
@@ -49,7 +49,7 @@
 	@DBUS_LIBS@ \
 	@THUNAR_VFS_LIBS@ 
 
-squeeze_LDFLAGS = -static
+# squeeze_LDFLAGS = -static
 
 
 INCLUDES = \

Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c	2007-04-06 08:32:36 UTC (rev 25395)
+++ squeeze/trunk/src/main_window.c	2007-04-06 12:10:28 UTC (rev 25396)
@@ -389,8 +389,8 @@
 		gtk_menu_bar_append(GTK_MENU_BAR(window->menu_bar), window->menubar.menu_item_view);
 		gtk_menu_bar_append(GTK_MENU_BAR(window->menu_bar), window->menubar.menu_item_help);
   
-		GtkMenuItem *item = gtk_menu_item_new ();
-		gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
+		GtkWidget *item = gtk_menu_item_new ();
+		gtk_widget_set_sensitive (item, FALSE);
 		gtk_menu_item_set_right_justified (GTK_MENU_ITEM (item), TRUE);
 		gtk_menu_shell_append (GTK_MENU_SHELL (window->menu_bar), item);
 		gtk_widget_show (item);
@@ -1250,7 +1250,7 @@
 	const gchar *message = lsq_archive_get_status(archive);
 	if(!message)
 	{
-		sq_throbber_set_animated(window->throbber, FALSE);
+		sq_throbber_set_animated(SQ_THROBBER(window->throbber), FALSE);
 		message = _("Done");
 		if(window->menu_bar)
 		{
@@ -1274,7 +1274,7 @@
 
 		if(window->menu_bar)
 		{
-			sq_throbber_set_animated(window->throbber, TRUE);
+			sq_throbber_set_animated(SQ_THROBBER(window->throbber), TRUE);
 			gtk_widget_set_sensitive(window->menubar.menu_item_add, FALSE);
 			gtk_widget_set_sensitive(window->menubar.menu_item_extract, FALSE);
 			gtk_widget_set_sensitive(window->menubar.menu_item_remove, FALSE);

Modified: squeeze/trunk/src/message_dialog.c
===================================================================
--- squeeze/trunk/src/message_dialog.c	2007-04-06 08:32:36 UTC (rev 25395)
+++ squeeze/trunk/src/message_dialog.c	2007-04-06 12:10:28 UTC (rev 25396)
@@ -69,7 +69,6 @@
 sq_message_dialog_class_init(SQMessageDialogClass *dialog_class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (dialog_class);
-	GParamSpec *pspec = NULL;
 
 	parent_class = gtk_type_class (GTK_TYPE_WINDOW);
 

Modified: squeeze/trunk/src/notebook.c
===================================================================
--- squeeze/trunk/src/notebook.c	2007-04-06 08:32:36 UTC (rev 25395)
+++ squeeze/trunk/src/notebook.c	2007-04-06 12:10:28 UTC (rev 25396)
@@ -26,6 +26,7 @@
 #include "tool_bar.h"
 #include "path_bar.h"
 #include "notebook.h"
+#include "throbber.h"
 
 static void
 sq_notebook_class_init(SQNotebookClass *archive_class);
@@ -56,6 +57,8 @@
 static void
 cb_notebook_archive_state_changed(LSQArchive *archive, SQNotebook *notebook);
 static void
+cb_notebook_tab_archive_state_changed(LSQArchive *archive, GtkContainer *widget);
+static void
 cb_notebook_file_activated(SQArchiveStore *, LSQArchiveIter *, SQNotebook *);
 
 static void
@@ -495,6 +498,7 @@
 	GtkWidget *lbl_hbox = gtk_hbox_new(FALSE, 0);
 	GtkWidget *label = gtk_label_new(lsq_archive_get_filename(archive));
 	GtkWidget *archive_image = gtk_image_new_from_icon_name("unknown", GTK_ICON_SIZE_MENU);
+	GtkWidget *throbber = sq_throbber_new();
 	/*thunar_vfs_mime_info_lookup_icon_name(lsq_archive_get_mimetype(archive), notebook->icon_theme), GTK_ICON_SIZE_MENU);*/
 	GtkWidget *close_button = gtk_button_new();
 	GtkWidget *close_image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
@@ -523,6 +527,7 @@
 	g_signal_connect(G_OBJECT(tree_model), "notify", G_CALLBACK(cb_sq_notebook_notify_proxy), notebook);
 
 	gtk_box_pack_start(GTK_BOX(lbl_hbox), archive_image, FALSE, FALSE, 3);
+	gtk_box_pack_start(GTK_BOX(lbl_hbox), throbber, FALSE, FALSE, 3);
 	gtk_box_pack_start(GTK_BOX(lbl_hbox), label, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(lbl_hbox), close_button, FALSE, FALSE, 0);
 	gtk_widget_show_all(lbl_hbox);
@@ -531,6 +536,7 @@
 
 	g_signal_connect(G_OBJECT(archive), "refreshed", G_CALLBACK(cb_notebook_archive_refreshed), tree_view);
 	g_signal_connect(G_OBJECT(archive), "state-changed", G_CALLBACK(cb_notebook_archive_state_changed), notebook);
+	g_signal_connect(G_OBJECT(archive), "state-changed", G_CALLBACK(cb_notebook_tab_archive_state_changed), lbl_hbox);
 
 	g_signal_connect(G_OBJECT(close_button), "clicked", G_CALLBACK(cb_notebook_close_archive), scroll_window);
 	g_signal_connect(G_OBJECT(tree_model), "file-activated", G_CALLBACK(cb_notebook_file_activated), notebook);
@@ -631,6 +637,26 @@
 }
 
 static void
+cb_notebook_tab_archive_state_changed(LSQArchive *archive, GtkContainer *widget)
+{
+	GList *children = gtk_container_get_children(widget);
+	if(lsq_archive_get_status(archive))
+	{
+		gtk_widget_hide(GTK_WIDGET(children->data));
+		sq_throbber_set_animated(SQ_THROBBER(children->next->data), TRUE);
+		gtk_widget_show(GTK_WIDGET(children->next->data));
+	}
+	else
+	{
+		gtk_widget_show(GTK_WIDGET(children->data));
+		sq_throbber_set_animated(SQ_THROBBER(children->next->data), FALSE);
+		gtk_widget_hide(GTK_WIDGET(children->next->data));
+	}
+
+	g_list_free(children);
+}
+
+static void
 sq_notebook_treeview_reset_columns(LSQArchive *archive, GtkTreeView *treeview)
 {
 	GtkCellRenderer *renderer = NULL;
@@ -805,8 +831,8 @@
 	
 	return filenames;
 }
+		
 
-
 void
 sq_notebook_page_get_archive(SQNotebook *notebook, LSQArchive **lp_archive, gint n)
 {

More information about the Xfce4-commits mailing list