save-selected starting

jcupitt · jcupitt · commit 99454ac704e2 · 2013-04-05T09:50:38.000+01:00
diff --git a/TODO b/TODO
@@ -3,8 +3,6 @@
 
 - workspacegroupview_reorder_tab_cb() is never called?
 
-- no longer need to update tab labels? we could remove the set_label stuff
-
 - save selected, various duplicate actions need fixing
 
 - major / minor / micro need to be in workspace, as well as root
diff --git a/src/workspacegroup.c b/src/workspacegroup.c
@@ -92,6 +92,18 @@ workspacegroup_view_new( Model *model, View *parent )
 	return( workspacegroupview_new() );
 }
 
+void *
+workspacegroup_save_workspace( iContainer *icontainer, void *a, void *b )
+{
+	Workspace *ws = WORKSPACE( icontainer );
+	xmlNode *xnode = (xmlNode *) a;
+	Workspacegroup *wsg = WORKSPACEGROUP( b );
+
+	in save-selected mode, save just the current WS
+
+	return( model_save( ws, xnode ) );
+}
+
 static xmlNode *
 workspacegroup_save( Model *model, xmlNode *xnode )
 {
@@ -107,7 +119,7 @@ workspacegroup_save( Model *model, xmlNode *xnode )
 	 */
 
 	if( icontainer_map( ICONTAINER( model ), 
-		(icontainer_map_fn) model_save, xnode, NULL ) )
+		workspacegroup_save_workspace, xnode, model ) )
 		return( NULL );
 
 	return( xnode );
diff --git a/src/workspacegroupview.c b/src/workspacegroupview.c
@@ -94,7 +94,6 @@ workspacegroupview_child_add( View *parent, View *child )
 	label = gtk_label_new( NN( IOBJECT( ws->sym )->name ) );
         gtk_container_add( GTK_CONTAINER( ebox ), label );
         gtk_widget_show( GTK_WIDGET( label ) );
-	workspaceview_set_label( wview, label );
 	popup_attach( ebox, wsgview->tab_menu, wview );
 
 	gtk_notebook_insert_page( GTK_NOTEBOOK( wsgview->notebook ),
@@ -219,8 +218,6 @@ workspacegroupview_page_removed_cb( GtkNotebook *notebook,
 	Workspacegroup *wsg = WORKSPACEGROUP( VOBJECT( wsgview )->iobject );
 	Mainw *mainw = MAINW( iwindow_get_root( notebook ) );
 
-	workspaceview_set_label( wview, NULL );
-
 	if( icontainer_get_n_children( ICONTAINER( wsg ) ) == 0 ) 
 		iwindow_kill( IWINDOW( mainw ) );
 }
diff --git a/src/workspaceview.c b/src/workspaceview.c
@@ -685,40 +685,6 @@ workspaceview_refresh( vObject *vobject )
 
 	workspace_jump_update( ws, wview->popup_jump );
 
-	if( wview->label ) { 
-		char txt[512];
-		VipsBuf buf = VIPS_BUF_STATIC( txt );
-
-		if( FILEMODEL( ws )->modified ) 
-			vips_buf_appendf( &buf, "*" ); 
-		vips_buf_appendf( &buf, "%s", NN( IOBJECT( ws->sym )->name ) );
-		gtk_label_set_text( GTK_LABEL( wview->label ), 
-			vips_buf_all( &buf ) );
-
-		vips_buf_rewind( &buf );
-
-		if( FILEMODEL( ws )->filename )
-			vips_buf_appendf( &buf, "%s", 
-				FILEMODEL( ws )->filename );
-		else 
-			vips_buf_appends( &buf, _( "unsaved workspace" ) );
-
-		if( FILEMODEL( ws )->modified ) {
-			vips_buf_appendf( &buf, ", " ); 
-			vips_buf_appendf( &buf, _( "modified" ) ); 
-		}
-
-		if( ws->compat_major ) {
-			vips_buf_appends( &buf, ", " );
-			vips_buf_appends( &buf, _( "compatibility mode" ) );
-			vips_buf_appendf( &buf, " %d.%d", 
-				ws->compat_major, 
-				ws->compat_minor ); 
-		}
-
-		set_tooltip( wview->label, "%s", vips_buf_all( &buf ) );
-	}
-
 	if( ws->rpane_open && !wview->rpane->open )
 		pane_animate_open( wview->rpane );
 	if( !ws->rpane_open && wview->rpane->open )
@@ -1188,10 +1154,3 @@ workspaceview_new( void )
 	return( VIEW( wview ) );
 }
 
-void 
-workspaceview_set_label( Workspaceview *wview, GtkWidget *label )
-{
-	g_assert( !label || !wview->label );
-
-	wview->label = label;
-}
diff --git a/src/workspaceview.h b/src/workspaceview.h
@@ -55,10 +55,6 @@ struct _Workspaceview {
 	Pane *lpane;
 	Pane *rpane;
 
-	/* Set by our parent: the label we update with the ws name and state.
-	 */
-	GtkWidget *label;
-
 	GtkWidget *popup;
 	GtkWidget *popup_jump;
 
@@ -118,4 +114,3 @@ void workspaceview_set_cursor( Workspaceview *wview, iWindowShape shape );
 GtkType workspaceview_get_type( void );
 View *workspaceview_new( void );
 
-void workspaceview_set_label( Workspaceview *wview, GtkWidget *label );
