save and restore more vis settings

Author: jcupitt

TODO

@@ -1,18 +1,12 @@
-- we save and restore scale/offset/falsecolour on imagewindow popup and
-  popdown
-
-	add log, etc.
-
 - "reset" in display bar resets the position of scale/offset widgets, but does
   not reset the menu items (eg. tick on falsecolour)
 
-- shrink as well as expand tiles in tilecache_snapshot
+	I forget how menu items are linked to actions, reread this
 
-- long formula should truncate with an ellipsis
+	gaction bound to a gsetting? do we need to add to the settings
+	schema?
 
-- are we autosizing the sinkscreen threadpool?
-
-	maybe we shouldn't? or maybe it's a good thing?
+- shrink as well as expand tiles in tilecache_snapshot
 
 # menu redesign
 

src/displaybar.c

@@ -176,13 +176,11 @@ displaybar_set_property(GObject *object,
 
 	switch (prop_id) {
 	case PROP_IMAGEWINDOW:
-		displaybar_set_imagewindow(displaybar,
-			g_value_get_object(value));
+		displaybar_set_imagewindow(displaybar, g_value_get_object(value));
 		break;
 
 	case PROP_REVEALED:
-		gtk_action_bar_set_revealed(
-			GTK_ACTION_BAR(displaybar->action_bar),
+		gtk_action_bar_set_revealed(GTK_ACTION_BAR(displaybar->action_bar),
 			g_value_get_boolean(value));
 		break;
 

src/iimage.c

@@ -408,6 +408,8 @@ iimage_init(iImage *iimage)
 	iimage->scale = 0.0;
 	iimage->offset = 0.0;
 	iimage->falsecolour = FALSE;
+	iimage->log = FALSE;
+	iimage->icc = FALSE;
 
 	vips_buf_init_dynamic(&iimage->caption_buffer, MAX_LINELENGTH);
 

src/iimage.h

@@ -71,6 +71,8 @@ struct _iImage {
 	double scale;
 	double offset;
 	gboolean falsecolour;
+	gboolean log;
+	gboolean icc;
 
 	/* Private ... build iobject caption here.
 	 */

src/iimageview.c

@@ -183,6 +183,8 @@ iimageview_refresh(vObject *vobject)
 			"scale", iimage->scale,
 			"offset", iimage->offset,
 			"falsecolour", iimage->falsecolour,
+			"log", iimage->log,
+			"icc", iimage->icc,
 			NULL);
 		VIPS_UNREF(tilesource);
 	}

src/tilesource.c

@@ -1448,6 +1448,8 @@ tilesource_new_from_iimage(iImage *iimage, int priority)
 		"scale", iimage->scale,
 		"offset", iimage->offset,
 		"falsecolour", iimage->falsecolour,
+		"log", iimage->log,
+		"icc", iimage->icc,
 		"priority", priority,
 		NULL);