UI Polishing

git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@224 bf6ca9ba-c028-0410-8290-897cf20841d1

1 files changed, 12 insertions, 11 deletions

diff --git a/src/displaywindow.c b/src/displaywindow.c
index 4eef09e..ea03a22 100644
--- a/src/displaywindow.c
+++ b/src/displaywindow.c
@@ -1165,28 +1165,29 @@ static void displaywindow_addmenubar(DisplayWindow *dw) {
 		{ "ViewAction", NULL, "_View", NULL, NULL, NULL },
 		
 		{ "ToolsAction", NULL, "_Tools", NULL, NULL, NULL },
-		{ "DirAxAction", GTK_STOCK_EXECUTE, "Start _DirAx", "<Ctrl>D", NULL, G_CALLBACK(displaywindow_dirax) },
+		{ "DirAxAction", "dtr-dirax", "Start _DirAx", "<Ctrl>D", NULL, G_CALLBACK(displaywindow_dirax) },
 		{ "DirAxReRunAction", NULL, "Run another DirAx cycle", NULL, NULL, G_CALLBACK(displaywindow_dirax_rerun) },
 		{ "StopDirAxAction", NULL, "Stop DirAx", NULL, NULL, G_CALLBACK(displaywindow_dirax_stop) },
-		{ "RefineStepAction", GTK_STOCK_EXECUTE, "Refine Current Image", NULL, NULL, G_CALLBACK(displaywindow_refinestep) },
-		{ "RefineSeqAction", GTK_STOCK_EXECUTE, "Refine Entire Stack", NULL, NULL, G_CALLBACK(displaywindow_refinestack) },
-		{ "SetAxisAction", NULL, "Set Tilt Axis Position...", NULL, NULL, G_CALLBACK(displaywindow_setaxis) },
+		{ "RefineStepAction", "dtr-refine", "Refine Current Image", NULL, NULL, G_CALLBACK(displaywindow_refinestep) },
+		{ "RefineSeqAction", "dtr-refineall", "Refine Entire Stack", NULL, NULL, G_CALLBACK(displaywindow_refinestack) },
+		{ "SetAxisAction", "dtr-tiltaxis", "Set Tilt Axis Position...", NULL, NULL, G_CALLBACK(displaywindow_setaxis) },
 		{ "IncrAxisAction", NULL, "Increase Tilt Axis Position", "<Ctrl>Up", NULL, G_CALLBACK(displaywindow_incraxis) },
 		{ "DecrAxisAction", NULL, "Decrease Tilt Axis Position", "<Ctrl>Down", NULL, G_CALLBACK(displaywindow_decraxis) },
-		{ "ExtractIntensitiesAction", GTK_STOCK_EXECUTE, "Extract Reflection Intensities", NULL, NULL, G_CALLBACK(displaywindow_extract) },
+		{ "ExtractIntensitiesAction", "dtr-quantify", "Quantify Reflection Intensities", NULL, NULL, G_CALLBACK(displaywindow_extract) },
 		
 		{ "HelpAction", NULL, "_Help", NULL, NULL, NULL },
 		{ "AboutAction", GTK_STOCK_ABOUT, "_About DTR...", NULL, NULL, G_CALLBACK(displaywindow_about) },
 		
-		{ "ButtonDirAxAction", GTK_STOCK_EXECUTE, "Run _DirAx", NULL, NULL, G_CALLBACK(displaywindow_dirax) },
-		{ "ButtonTiltAxisAction", GTK_STOCK_PROPERTIES, "Adjust Tilt Axis", NULL, NULL, G_CALLBACK(displaywindow_setaxis) },
-		{ "ButtonRefineStepAction", GTK_STOCK_EXECUTE, "Refine Image", NULL, NULL, G_CALLBACK(displaywindow_refinestep) },
-		{ "ButtonRefineSeqAction", GTK_STOCK_EXECUTE, "Refine Stack", NULL, NULL, G_CALLBACK(displaywindow_refinestack) },
+		{ "ButtonDirAxAction", "dtr-dirax", "Run _DirAx", NULL, NULL, G_CALLBACK(displaywindow_dirax) },
+		{ "ButtonTiltAxisAction", "dtr-tiltaxis", "Tilt Axis", NULL, NULL, G_CALLBACK(displaywindow_setaxis) },
+		{ "ButtonRefineStepAction", "dtr-refine", "Refine Image", NULL, NULL, G_CALLBACK(displaywindow_refinestep) },
+		{ "ButtonRefineSeqAction", "dtr-refineall", "Refine Stack", NULL, NULL, G_CALLBACK(displaywindow_refinestack) },
 		{ "ButtonFirstImageAction", GTK_STOCK_GOTO_FIRST, "First Image", NULL, NULL, G_CALLBACK(displaywindow_image_first) },
 		{ "ButtonPrevImageAction", GTK_STOCK_GO_BACK, "Previous Image", NULL, NULL, G_CALLBACK(displaywindow_image_prev) },
 		{ "ButtonNextImageAction", GTK_STOCK_GO_FORWARD, "Next Image", NULL, NULL, G_CALLBACK(displaywindow_image_next) },
 		{ "ButtonLastImageAction", GTK_STOCK_GOTO_LAST, "Last Image", NULL, NULL, G_CALLBACK(displaywindow_image_last) },
-	
+		{ "ButtonExtractIntensitiesAction", "dtr-quantify", "Quantify", NULL, NULL, G_CALLBACK(displaywindow_extract) },
+		
 	};
 	guint n_entries = G_N_ELEMENTS(entries);
 	
@@ -1384,7 +1385,7 @@ DisplayWindow *displaywindow_open(ControlContext *ctx) {
 	displaywindow_enable_cell_functions(dw, FALSE);
 	displaywindow_update_dirax(ctx, dw);
 	
-	gtk_window_set_default_size(GTK_WINDOW(dw->window), 800, 750);
+	gtk_window_set_default_size(GTK_WINDOW(dw->window), 840, 800);
 	gtk_widget_show_all(dw->window);
 	
 	return dw;