From 5c0ac9c717e1cba322739a084832f2138153bbc9 Mon Sep 17 00:00:00 2001 From: taw27 Date: Thu, 6 Dec 2007 23:34:48 +0000 Subject: UI Polishing git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@224 bf6ca9ba-c028-0410-8290-897cf20841d1 --- data/Makefile.am | 4 ++ data/displaywindow.ui | 2 +- data/dtr-dirax.svg | 89 ++++++++++++++++++++++++++++ data/dtr-quantify.svg | 154 +++++++++++++++++++++++++++++++++++++++++++++++++ data/dtr-refine.svg | 98 +++++++++++++++++++++++++++++++ data/dtr-refineall.svg | 119 ++++++++++++++++++++++++++++++++++++++ data/dtr-tiltaxis.svg | 138 ++++++++++++++++++++++++++++++++++++++++++++ src/displaywindow.c | 23 ++++---- 8 files changed, 615 insertions(+), 12 deletions(-) create mode 100644 data/dtr-dirax.svg create mode 100644 data/dtr-quantify.svg create mode 100644 data/dtr-refine.svg create mode 100644 data/dtr-refineall.svg create mode 100644 data/dtr-tiltaxis.svg diff --git a/data/Makefile.am b/data/Makefile.am index 8e13f7b..717d3e5 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,2 +1,6 @@ dtrdir = $(datadir)/dtr dtr_DATA = displaywindow.ui + +iconsdir = $(datadir)/icons/hicolor/scalable/apps +icons_DATA = dtr-tiltaxis.svg dtr-dirax.svg dtr-refine.svg dtr-refineall.svg dtr-quantify.svg + diff --git a/data/displaywindow.ui b/data/displaywindow.ui index ceffd94..2fba3db 100644 --- a/data/displaywindow.ui +++ b/data/displaywindow.ui @@ -54,7 +54,7 @@ - + diff --git a/data/dtr-dirax.svg b/data/dtr-dirax.svg new file mode 100644 index 0000000..70625b2 --- /dev/null +++ b/data/dtr-dirax.svg @@ -0,0 +1,89 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/data/dtr-quantify.svg b/data/dtr-quantify.svg new file mode 100644 index 0000000..75b50ef --- /dev/null +++ b/data/dtr-quantify.svg @@ -0,0 +1,154 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/data/dtr-refine.svg b/data/dtr-refine.svg new file mode 100644 index 0000000..c9d474f --- /dev/null +++ b/data/dtr-refine.svg @@ -0,0 +1,98 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/data/dtr-refineall.svg b/data/dtr-refineall.svg new file mode 100644 index 0000000..fa9f416 --- /dev/null +++ b/data/dtr-refineall.svg @@ -0,0 +1,119 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/data/dtr-tiltaxis.svg b/data/dtr-tiltaxis.svg new file mode 100644 index 0000000..361ce63 --- /dev/null +++ b/data/dtr-tiltaxis.svg @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + 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", "D", NULL, G_CALLBACK(displaywindow_dirax) }, + { "DirAxAction", "dtr-dirax", "Start _DirAx", "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", "Up", NULL, G_CALLBACK(displaywindow_incraxis) }, { "DecrAxisAction", NULL, "Decrease Tilt Axis Position", "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; -- cgit v1.2.3