GNOME.org
 

anjuta r4672 - in trunk: . libanjuta plugins/file-manager plugins/subversion

Author: jhs
Date: Sun Feb  1 17:36:44 2009
New Revision: 4672
URL: http://svn.gnome.org/viewvc/anjuta?rev=4672&view=rev

Log:
2009-02-01  Johannes Schmid  <jhs gnome org>

	* libanjuta/anjuta-ui.c (anjuta_ui_init),
	(anjuta_ui_add_action_group), (anjuta_ui_get_accel_editor),
	(anjuta_ui_unload_accels):
	#564276 â useless checkbox next to action groups in Shortcuts view
	
	* libanjuta/anjuta-vcs-status.h:
	* plugins/file-manager/file-model.c (get_vcs_emblem),
	(file_model_vcs_status_callback):
	* plugins/file-manager/file-view.c:
	* plugins/subversion/subversion-vcs-interface.c
	(subversion_ivcs_query_status):
	* plugins/subversion/svn-status-command.c (on_svn_status_notify):
	* plugins/subversion/svn-status.c (svn_status_get_vcs_status):
	
	Show more file stati

Modified:
   trunk/ChangeLog
   trunk/libanjuta/anjuta-ui.c
   trunk/libanjuta/anjuta-vcs-status.h
   trunk/plugins/file-manager/file-model.c
   trunk/plugins/file-manager/file-view.c
   trunk/plugins/subversion/subversion-vcs-interface.c
   trunk/plugins/subversion/svn-status-command.c
   trunk/plugins/subversion/svn-status.c

Modified: trunk/libanjuta/anjuta-ui.c
==============================================================================
--- trunk/libanjuta/anjuta-ui.c	(original)
+++ trunk/libanjuta/anjuta-ui.c	Sun Feb  1 17:36:44 2009
@@ -84,6 +84,7 @@
 	COLUMN_PIXBUF,
 	COLUMN_ACTION_LABEL,
 	COLUMN_VISIBLE,
+	COLUMN_SHOW_VISIBLE,
 	COLUMN_SENSITIVE,
 	COLUMN_ACTION,
 	COLUMN_GROUP,
@@ -354,6 +355,7 @@
 								G_TYPE_STRING,
 								G_TYPE_BOOLEAN,
 								G_TYPE_BOOLEAN,
+								G_TYPE_BOOLEAN,
 								G_TYPE_OBJECT,
 								G_TYPE_STRING);
 	gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(store), COLUMN_ACTION_LABEL,
@@ -524,6 +526,7 @@
 						COLUMN_PIXBUF, pixbuf,
 						COLUMN_ACTION_LABEL, action_group_label,
 						COLUMN_GROUP, action_group_name,
+						COLUMN_SHOW_VISIBLE, FALSE,
 						-1);
 	for (l = actions; l; l = l->next)
 	{
@@ -561,6 +564,7 @@
 									COLUMN_PIXBUF, pixbuf,
 									COLUMN_ACTION_LABEL, action_label,
 									COLUMN_VISIBLE, gtk_action_get_visible (action),
+									COLUMN_SHOW_VISIBLE, TRUE,
 									COLUMN_SENSITIVE, gtk_action_get_sensitive(action),
 									COLUMN_ACTION, action,
 									COLUMN_GROUP, action_group_name,
@@ -575,6 +579,7 @@
 			gtk_tree_store_set (GTK_TREE_STORE (ui->priv->model), &iter,
 								COLUMN_ACTION_LABEL, action_label,
 								COLUMN_VISIBLE, gtk_action_get_visible (action),
+								COLUMN_SHOW_VISIBLE, TRUE,
 								COLUMN_SENSITIVE, gtk_action_get_sensitive (action),
 								COLUMN_ACTION, action,
 								COLUMN_GROUP, action_group_name,
@@ -859,6 +864,8 @@
 													   renderer,
 													   "active",
 													   COLUMN_VISIBLE,
+													   "visible",
+													   COLUMN_SHOW_VISIBLE,
 													   NULL);
 	/* gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); */
 	gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
@@ -994,7 +1001,7 @@
 anjuta_ui_unload_accels (AnjutaUI *ui)
 {
     anjuta_ui_save_accels (NULL);
-    gtk_accel_map_foreach_unfiltered (ui, anjuta_ui_remove_accel);
+    gtk_accel_map_foreach_unfiltered (ui, (GtkAccelMapForeach) anjuta_ui_remove_accel);
 } 
 
 

Modified: trunk/libanjuta/anjuta-vcs-status.h
==============================================================================
--- trunk/libanjuta/anjuta-vcs-status.h	(original)
+++ trunk/libanjuta/anjuta-vcs-status.h	Sun Feb  1 17:36:44 2009
@@ -24,7 +24,7 @@
  * @ANJUTA_VCS_STATUS_ADDED: File was added
  * @ANJUTA_VCS_STATUS_DELETED: File was deleted
  * @ANJUTA_VCS_STATUS_CONFLICTED: File has unresolved conflict
- * @ANJUTA_VCS_STATUS_OUTDATED: File is not up-to-date
+ * @ANJUTA_VCS_STATUS_UPTODATE: File is up-to-date
  * @ANJUTA_VCS_STATUS_LOCKED: File is locked
  * @ANJUTA_VCS_STATUS_MISSING: File is missing 
  * @ANJUTA_VCS_STATUS_UNVERSIONED: File is ignored by VCS system
@@ -36,14 +36,15 @@
 {
 	/* Unversioned, ignored, or uninteresting items */
 	ANJUTA_VCS_STATUS_NONE = 0, /*< skip >*/
-	ANJUTA_VCS_STATUS_MODIFIED = 1 << 0,
-	ANJUTA_VCS_STATUS_ADDED = 1 << 1,
-	ANJUTA_VCS_STATUS_DELETED = 1 << 2,
-	ANJUTA_VCS_STATUS_CONFLICTED = 1 << 3,
-	ANJUTA_VCS_STATUS_OUTDATED = 1 << 4,
-	ANJUTA_VCS_STATUS_LOCKED = 1 << 5,
-	ANJUTA_VCS_STATUS_MISSING = 1 << 6,
-	ANJUTA_VCS_STATUS_UNVERSIONED = 1 << 7
+	ANJUTA_VCS_STATUS_MODIFIED,
+	ANJUTA_VCS_STATUS_ADDED,
+	ANJUTA_VCS_STATUS_DELETED,
+	ANJUTA_VCS_STATUS_CONFLICTED,
+	ANJUTA_VCS_STATUS_UPTODATE,
+	ANJUTA_VCS_STATUS_LOCKED,
+	ANJUTA_VCS_STATUS_MISSING,
+	ANJUTA_VCS_STATUS_UNVERSIONED,
+	ANJUTA_VCS_STATUS_IGNORED
 } AnjutaVcsStatus;
 
 #endif // ANJUTA_VCS_STATUS_H

Modified: trunk/plugins/file-manager/file-model.c
==============================================================================
--- trunk/plugins/file-manager/file-model.c	(original)
+++ trunk/plugins/file-manager/file-model.c	Sun Feb  1 17:36:44 2009
@@ -131,7 +131,7 @@
 #define EMBLEM_IGNORED "vcs-ignored.png"
 #define EMBLEM_LOCKED "vcs-locked.png"
 #define EMBLEM_UNVERSIONED "vcs-unversioned.png"
-#define EMBLEM_UPDATED "vcs-updated.png"
+#define EMBLEM_UPTODATE "vcs-updated.png"
 #define EMBLEM_MODIFIED "vcs-modified.png"
 
 #define COMPOSITE_ALPHA 225
@@ -142,9 +142,6 @@
 	GdkPixbuf* emblem ;
 	switch (status)
 	{
-		case ANJUTA_VCS_STATUS_NONE:
-			emblem = gdk_pixbuf_new_from_file (PACKAGE_PIXMAPS_DIR"/"EMBLEM_UPDATED, NULL);
-			break;
 		case ANJUTA_VCS_STATUS_ADDED:
 			emblem = gdk_pixbuf_new_from_file (PACKAGE_PIXMAPS_DIR"/"EMBLEM_ADDED, NULL);
 			break;
@@ -163,6 +160,12 @@
 		case ANJUTA_VCS_STATUS_UNVERSIONED:
 			emblem = gdk_pixbuf_new_from_file (PACKAGE_PIXMAPS_DIR"/"EMBLEM_UNVERSIONED, NULL);
 			break;
+		case ANJUTA_VCS_STATUS_UPTODATE:
+			emblem = gdk_pixbuf_new_from_file (PACKAGE_PIXMAPS_DIR"/"EMBLEM_UPTODATE, NULL);
+			break;
+		case ANJUTA_VCS_STATUS_IGNORED:
+			emblem = gdk_pixbuf_new_from_file (PACKAGE_PIXMAPS_DIR"/"EMBLEM_IGNORED, NULL);
+			break;
 		default:
 			emblem = NULL;
 	}
@@ -177,9 +180,7 @@
 {
 	VcsData* data = user_data;
 	gchar* path = g_file_get_path (file);
-	
-	DEBUG_PRINT ("Status of %s = %d", path, status);
-	
+		
 	GtkTreePath* tree_path = gtk_tree_row_reference_get_path (data->ref);
 	if (tree_path)
 	{

Modified: trunk/plugins/file-manager/file-view.c
==============================================================================
--- trunk/plugins/file-manager/file-view.c	(original)
+++ trunk/plugins/file-manager/file-view.c	Sun Feb  1 17:36:44 2009
@@ -61,10 +61,11 @@
 	N_("Removed"),
 	N_("Deleted"),
 	N_("Conflicted"),
-	N_("Outdated"),
+	N_("Up-to-date"),
 	N_("Locked"),
 	N_("Missing"),
-	N_("Unversioned")
+	N_("Unversioned"),
+	N_("Ignored")	
 };
 
 enum

Modified: trunk/plugins/subversion/subversion-vcs-interface.c
==============================================================================
--- trunk/plugins/subversion/subversion-vcs-interface.c	(original)
+++ trunk/plugins/subversion/subversion-vcs-interface.c	Sun Feb  1 17:36:44 2009
@@ -208,7 +208,7 @@
 	SvnStatusCommand *status_command;
 	
 	path = g_file_get_path (file);
-	status_command = svn_status_command_new (path, TRUE, FALSE);
+	status_command = svn_status_command_new (path, TRUE, TRUE);
 	
 	g_free (path);
 	

Modified: trunk/plugins/subversion/svn-status-command.c
==============================================================================
--- trunk/plugins/subversion/svn-status-command.c	(original)
+++ trunk/plugins/subversion/svn-status-command.c	Sun Feb  1 17:36:44 2009
@@ -72,28 +72,15 @@
 	
 	self = SVN_STATUS_COMMAND (baton);
 	
-	/* Right now we only support text status (no properties.) */
+	status_object = svn_status_new ((gchar *) path, 
+									status->text_status);
+	
+	anjuta_async_command_lock (ANJUTA_ASYNC_COMMAND (self));
+	g_queue_push_tail (self->priv->status_queue, status_object);
+	anjuta_async_command_unlock (ANJUTA_ASYNC_COMMAND (self));
+	
+	anjuta_command_notify_data_arrived (ANJUTA_COMMAND (self));
 	
-	switch (status->text_status)
-	{
-		case svn_wc_status_modified:
-		case svn_wc_status_added:
-		case svn_wc_status_deleted:
-		case svn_wc_status_conflicted:
-		case svn_wc_status_missing:
-			status_object = svn_status_new ((gchar *) path, 
-											status->text_status);
-		
-			anjuta_async_command_lock (ANJUTA_ASYNC_COMMAND (self));
-			g_queue_push_tail (self->priv->status_queue, status_object);
-			anjuta_async_command_unlock (ANJUTA_ASYNC_COMMAND (self));
-		
-			anjuta_command_notify_data_arrived (ANJUTA_COMMAND (self));
-		
-			break;
-		default:
-			break;
-	}
 }
 
 static guint 

Modified: trunk/plugins/subversion/svn-status.c
==============================================================================
--- trunk/plugins/subversion/svn-status.c	(original)
+++ trunk/plugins/subversion/svn-status.c	Sun Feb  1 17:36:44 2009
@@ -91,7 +91,13 @@
 	
 	switch (self->priv->status)
 	{
+		case svn_wc_status_external:
+		case svn_wc_status_incomplete:			
+			status = ANJUTA_VCS_STATUS_NONE;
+			break;
 		case svn_wc_status_modified:
+		case svn_wc_status_replaced:
+		case svn_wc_status_merged:			
 			status = ANJUTA_VCS_STATUS_MODIFIED;
 			break;
 		case svn_wc_status_added:
@@ -101,14 +107,20 @@
 			status = ANJUTA_VCS_STATUS_DELETED;
 			break;
 		case svn_wc_status_conflicted:
+		case svn_wc_status_obstructed:
 			status = ANJUTA_VCS_STATUS_CONFLICTED;
 			break;
 		case svn_wc_status_missing:
 			status = ANJUTA_VCS_STATUS_MISSING;
 			break;
-		default:
-			status = ANJUTA_VCS_STATUS_NONE;
+		case svn_wc_status_unversioned:
+			status = ANJUTA_VCS_STATUS_UNVERSIONED;
 			break;
+		case svn_wc_status_ignored:
+			status = ANJUTA_VCS_STATUS_IGNORED;
+			break;		
+		default:
+			status = ANJUTA_VCS_STATUS_UPTODATE;
 	}
 	
 	return status;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]