From 558224e07a053eb99eaba1aed56c686056840dec Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Wed, 23 Jul 2008 21:05:06 +0000 Subject: [PATCH] fixed some GUI glitches --- helm/software/matita/matita.glade | 6736 +++++++++-------------- helm/software/matita/matitaGtkMisc.ml | 29 - helm/software/matita/matitaGtkMisc.mli | 2 - helm/software/matita/matitaGui.ml | 23 +- helm/software/matita/matitaGuiTypes.mli | 3 +- helm/software/matita/matitaMathView.ml | 49 +- helm/software/matita/matitaTypes.ml | 6 + helm/software/matita/matitaTypes.mli | 3 +- 8 files changed, 2690 insertions(+), 4161 deletions(-) diff --git a/helm/software/matita/matita.glade b/helm/software/matita/matita.glade index 2e68ce487..3d8027894 100644 --- a/helm/software/matita/matita.glade +++ b/helm/software/matita/matita.glade @@ -1,4112 +1,2628 @@ - - - + + + - - - True - Cic browser - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - 500 - 500 - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - True - False - - - - True - False - 0 - - - - True - GTK_PACK_DIRECTION_LTR - GTK_PACK_DIRECTION_LTR - - - - True - _File - True - - - - - - - True - gtk-new - True - - - - - - True - Open _Location ... - True - - - - - - - True - - - - - - True - gtk-close - True - - - - - - - - - - True - _Edit - True - - - - - - - True - gtk-copy - True - - - - - - - - - - True - _View - True - - - - - - - True - View the graph of objects on which the current one depends on - (Direct) Dependencies - True - - - - - - True - View the graph of objects which depends on the current one - (Inverse) Dependencies - True - - - - - - True - Universes - True - - - - - - True - HBugs Tutors - True - - - - - - - - - 0 - False - False - - - - - - True - 0 - 0 - GTK_SHADOW_NONE - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NONE - True - - - - True - gtk-new - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NONE - True - - - - True - gtk-go-back - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NONE - True - - - - True - gtk-go-forward - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - refresh - True - True - GTK_RELIEF_NONE - True - - - - True - gtk-refresh - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - home - True - True - GTK_RELIEF_NONE - True - - - - True - gtk-home - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - gtk-jump-to - 2 - 0.5 - 0.5 - 0 - 0 - - - 3 - False - False - - - - - - True - False - 0 - - - - - - - 0 - True - True - - - - - - - 0 - False - True - - - - - - 3 - True - False - 6 - - - - True - gtk-missing-image - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - True - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - - True - False - 0 - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 0 - 0 - - - - - - - 0 - False - False - - - - - 0 - False - True - - - - - 0 - False - True - - - - - - True - True - True - True - GTK_POS_TOP - False - False - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - False - True - - - - - - True - MathView - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - False - True - - - - - - True - WhelpResults - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - GTK_SHADOW_NONE - - - - True - gtk-missing-image - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - False - True - - - - - - True - WhelpEasterEgg - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - False - True - - - - - - True - Graph - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - False - 0 - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - True - GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_BOTH - True - True - - - - True - True - True - False - - - - True - True - gtk-refresh - True - GTK_RELIEF_NORMAL - True - - - - - False - False - - - - - - True - True - True - False - - - - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - - False - False - - - - - - True - True - True - False - - - - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - - False - False - - - - - 0 - False - False - - - - - False - True - - - - - - True - HBugs - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - False - True - - - - - - True - Universes - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - - - - - - DUMMY - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - True - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - DUMMY - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - True - DUMMY - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - DUMMY - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - 10 - Select File - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - True - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - - - - - - Matita - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - True - False - - - - True - False - 0 - - - - True - GTK_SHADOW_OUT - GTK_POS_LEFT - GTK_POS_TOP - - - - True - GTK_PACK_DIRECTION_LTR - GTK_PACK_DIRECTION_LTR - - - - True - _File - True - - - - - - - True - _New - True - - - - - True - gtk-new - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Open... - True - - - - - True - gtk-open - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Save - True - - - - - True - gtk-save - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Save _as ... - True - - - - - True - gtk-save-as - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - _Quit - True - - - - - True - gtk-quit - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - - - - True - _Edit - True - - - - - - - True - False - _Undo - True - - - - - True - gtk-undo - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - False - _Redo - True - - - - - True - gtk-redo - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Cu_t - True - - - - - True - gtk-cut - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Copy - True - - - - - True - gtk-copy - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Paste - True - - - - - True - gtk-paste - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Paste as pattern - True - - - - - - True - Paste Unicode as TeX - True - False - - - - - - True - _Delete - True - - - - True - gtk-delete - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Select _All - True - - - - - - True - - - - - - True - _Find & replace ... - True - - - - - True - gtk-find-and-replace - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Next ligature - True - - - - - - - True - Edit with e_xternal editor - True - - - - - - - - - - True - _Script - True - - - - - - - True - Execute 1 phrase - True - - - - - - - True - Retract 1 phrase - True - - - - - - - True - - - - - - True - Execute all - True - - - - - - - True - Restart - True - - - - - - - True - - - - - - True - Execute until cursor - True - - - - - - - - - - - True - _View - True - - - - - - - True - Show _tactics bar - True - True - - - - - - - True - New CIC _browser - True - - - - - - - True - - - - - - True - _Fullscreen - True - False - - - - - - - True - - - - - - True - Zoom _in - True - - - - - True - gtk-zoom-in - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Zoom _out - True - - - - - True - gtk-zoom-out - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Normal size - True - - - - - True - gtk-zoom-100 - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Pretty print notation - True - True - - - - - - True - Hide coercions - True - True - - - - - - True - - - - - - True - Displays the graph of coercions - Coercions Graph - True - - - - - - True - Displays a window helpful to drive automation - Auto GUI - True - - - - gtk-media-pause - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Displays the term grammar - Show term's grammar - True - - - - - - - - - - True - _Debug - True - - - - - - - True - - - - - - - - - - True - _Help - True - - - - - - - True - _Contents - True - - - - - True - gtk-help - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Displays the Tex/Unicode table - Show Tex/Unicode table - True - - - - - - True - _About - True - - - - True - gtk-about - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - - - - - 0 - False - False - - - - - - True - False - 0 - - - - True - True - - - - True - False - 0 - - - - True - GTK_SHADOW_OUT - GTK_POS_TOP - GTK_POS_TOP - - - - True - False - 0 - - - - - - - - - - - - - - - - - 0 - False - True - - - - - - 400 - True - False - 0 - - - - True - False - 0 - - - - True - GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_BOTH - True - True - - - - True - True - True - False - - - - True - Restart - True - GTK_RELIEF_NONE - True - - - - True - gtk-goto-top - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - False - False - - - - - - True - True - True - False - - - - True - Retract 1 phrase - True - GTK_RELIEF_NONE - True - - - - True - gtk-go-up - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - False - False - - - - - - True - True - True - False - - - - True - Execute until point - True - GTK_RELIEF_NONE - True - - - - True - gtk-jump-to - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - False - False - - - - - - True - True - True - False - - - - True - Execute 1 phrase - True - GTK_RELIEF_NONE - True - - - - True - gtk-go-down - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - False - False - - - - - - True - True - True - False - - - - True - Execute all - True - GTK_RELIEF_NONE - True - - - - True - gtk-goto-bottom - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - False - False - - - - - 0 - True - True - - - - - - True - GTK_ORIENTATION_VERTICAL - GTK_TOOLBAR_BOTH - True - True - - - - True - True - True - False - - - - True - True - GTK_RELIEF_NONE - True - - - - True - gtk-stop - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - False - False - - - - - 0 - False - True - - - - - 0 - False - False - - - - - - True - True - True - True - GTK_POS_BOTTOM - False - False - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - False - True - - - - - - True - script - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - GTK_SHADOW_IN - - - - True - Not implemented. - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - - False - True - - - - - - True - outline - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - 0 - True - True - - - - - True - False - - - - - - 250 - 500 - True - True - 380 - - - - True - True - True - True - GTK_POS_TOP - False - False - - - True - False - - - - - - True - False - 0 - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_CHAR - False - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - True - True - - - - - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - False - - - 0 - True - True - - - - - - True - False - True - GTK_POS_TOP - False - False - - - - True - gtk-missing-image - 4 - 0.5 - 0.5 - 0 - 0 - - - False - True - - - - - - True - label14 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - gtk-missing-image - 4 - 0.5 - 0.5 - 0 - 0 - - - False - True - - - - - - True - label15 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - gtk-missing-image - 4 - 0.5 - 0.5 - 0 - 0 - - - False - True - - - - - - True - label16 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - False - True - - - - - 0 - False - False - - - - - - - - - - DUMMY - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - DUMMY - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - - - - 280 - Uri choice - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 4 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - 0 - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-index - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Try _Selected - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - False - True - True - Try Constants - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - True - True - gtk-copy - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - 0 - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-ok - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - bla bla bla - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - True - gtk-go-forward - True - GTK_RELIEF_NORMAL - True - 0 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 3 - - - - True - some informative message here ... - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 400 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - URI: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - False - True - - - - - 0 - True - True - - - - - - - - 5 - Find & Replace - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_MOUSE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - 3 - 2 - False - 5 - 0 - - - - True - False - 5 - - - - True - False - 0 - - - - - - - - - - - 0 - True - True - - - - - - True - True - gtk-find - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-find-and-replace - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Replace - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - 0 - 2 - 2 - 3 - 5 - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - True - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - Replace with: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - - - - - - - - True - Find: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - - - - - 450 - 400 - title - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - True - -11 - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - -6 - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-zoom-in - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - More - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 0 - - - - True - some informative message here ... - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - 600 - 400 - True - Auto - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_SOUTH_EAST - True - False - - - - True - False - 0 - - - - True - False - 2 - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - GTK_SHADOW_IN - - - - True - 3 - 3 - False - 0 - 0 - - - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-go-up - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - gtk-go-down - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - - - 3 - False - True - - - - - - True - False - 0 - - - - True - Last: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - 4 - True - GTK_BUTTONBOX_END - 4 - - - - True - True - True - gtk-media-pause - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - gtk-media-play - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - gtk-media-next - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - - - True - SearchWin - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - 640 - 480 - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_CENTER - True - False - - - - True - False - 0 - - - - 4 - True - False - 4 - - - - True - False - 0 - - - - - - - - - - - 0 - True - True - - - - - - True - True - True - True - 0 - - True - ● - False - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-find - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Search - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - 0 - False - True - - - - - - 3 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - - - - 0 - True - True - - - - - - True - - - 4 - False - True - - - - - - 4 - True - False - 0 - - - - True - False - 0 - - - - - - - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-close - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Close - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - True - - - - - 0 - False - True - - - - - - + + 640 + 480 + True + Cic browser + GTK_WIN_POS_CENTER_ON_PARENT + 640 + 480 + True + MainWin + + + True + + + True + + + True + + + True + _File + True + + + + + True + gtk-new + True + True + + + + + True + Open _Location ... + True + + + + + + True + + + + + True + gtk-close + True + True + + + + + + + + + True + _Edit + True + + + + + True + gtk-copy + True + True + + + + + + + + + True + _View + True + + + + + True + View the graph of objects on which the current one depends on + (Direct) Dependencies + True + + + + + True + View the graph of objects which depends on the current one + (Inverse) Dependencies + True + + + + + True + Universes + True + + + + + True + HBugs Tutors + True + + + + + + + + + False + False + + + + + True + 0 + 0 + GTK_SHADOW_NONE + + + True + + + True + True + GTK_RELIEF_NONE + 0 + + + True + gtk-new + + + + + False + False + + + + + True + True + GTK_RELIEF_NONE + 0 + + + True + gtk-go-back + + + + + False + False + 1 + + + + + True + True + GTK_RELIEF_NONE + 0 + + + True + gtk-go-forward + + + + + False + False + 2 + + + + + True + True + True + refresh + GTK_RELIEF_NONE + 0 + + + True + gtk-refresh + + + + + False + False + 3 + + + + + True + True + True + home + GTK_RELIEF_NONE + 0 + + + True + gtk-home + + + + + False + False + 4 + + + + + True + gtk-jump-to + 2 + + + False + False + 3 + 5 + + + + + True + + + + + + 6 + + + + + + + False + 1 + + + + + True + 3 + 6 + + + True + gtk-missing-image + + + False + + + + + True + True + * + + + 1 + + + + + True + + + True + + + + + + False + False + + + + + False + 2 + + + + + False + 2 + + + + + True + True + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + + + + + + True + MathView + + + tab + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + False + + + + + 1 + + + + + True + WhelpResults + + + tab + 1 + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + GTK_SHADOW_NONE + + + True + gtk-missing-image + + + + + + + 2 + + + + + True + WhelpEasterEgg + + + tab + 2 + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + + + + 3 + + + + + True + Graph + + + tab + 3 + False + + + + + True + + + True + True + + + True + True + + + + + + + True + GTK_TOOLBAR_BOTH + + + True + + + True + True + gtk-refresh + True + 0 + + + + + False + False + + + + + True + + + True + True + gtk-remove + True + 0 + + + + + False + False + + + + + True + + + True + True + gtk-add + True + 0 + + + + + False + False + + + + + False + False + 1 + + + + + 4 + + + + + True + HBugs + + + tab + 4 + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + True + + + + + 5 + + + + + True + Universes + + + tab + 5 + False + + + + + True + + + True + True + 3 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + + + + + + True + 4 + 4 + + + True + + + + + + + + + + + True + True + + + 1 + + + + + True + True + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-find + + + False + False + + + + + True + Search + True + + + False + False + 1 + + + + + + + + + False + False + 2 + + + + + False + 1 + + + + + 6 + + + + + True + SearchText + + + tab + 6 + False + + + + + 3 + + + + + + + + + DUMMY + False + True + GTK_WIN_POS_CENTER + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + DUMMY + GTK_JUSTIFY_CENTER + + + False + False + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + + + True + DUMMY + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + DUMMY + + + False + False + 2 + + + + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + + + 10 + Select File + True + GTK_WIN_POS_CENTER + GDK_WINDOW_TYPE_HINT_DIALOG + True + + + True + True + True + 0 + + + + + True + True + True + 0 + + + + + Matita + + + True + + + True + + + True + GTK_SHADOW_OUT + + + True + + + True + _File + True + + + + + True + _New + True + + + + True + gtk-new + 1 + + + + + + + True + _Open... + True + + + + True + gtk-open + 1 + + + + + + + True + _Save + True + + + + True + gtk-save + 1 + + + + + + + True + Save _as ... + True + + + + True + gtk-save-as + 1 + + + + + + + True + + + + + True + _Quit + True + + + + True + gtk-quit + 1 + + + + + + + + + + + True + _Edit + True + + + + + True + False + _Undo + True + + + + True + gtk-undo + 1 + + + + + + + True + False + _Redo + True + + + + True + gtk-redo + 1 + + + + + + + True + + + + + True + Cu_t + True + + + + True + gtk-cut + 1 + + + + + + + True + _Copy + True + + + + True + gtk-copy + 1 + + + + + + + True + _Paste + True + + + + True + gtk-paste + 1 + + + + + + + True + Paste as pattern + True + + + + + True + Paste Unicode as TeX + True + + + + + True + _Delete + True + + + True + gtk-delete + 1 + + + + + + + True + + + + + True + Select _All + True + + + + + True + + + + + True + _Find & replace ... + True + + + + True + gtk-find-and-replace + 1 + + + + + + + True + + + + + True + Next ligature + True + + + + + + True + Edit with e_xternal editor + True + + + + + + + + + True + _Script + True + + + + + True + Execute 1 phrase + True + + + + + + True + Retract 1 phrase + True + + + + + + True + + + + + True + Execute all + True + + + + + + True + Restart + True + + + + + + True + + + + + True + Execute until cursor + True + + + + + + + + + + True + _View + True + + + + + True + Show _tactics bar + True + True + + + + + + True + New CIC _browser + True + + + + + + True + + + + + True + _Fullscreen + True + + + + + + True + + + + + True + Zoom _in + True + + + + True + gtk-zoom-in + 1 + + + + + + + True + Zoom _out + True + + + + True + gtk-zoom-out + 1 + + + + + + + True + _Normal size + True + + + + True + gtk-zoom-100 + 1 + + + + + + + True + + + + + True + Pretty print notation + True + True + + + + + True + Hide coercions + True + True + + + + + True + + + + + True + Displays the graph of coercions + Coercions Graph + True + + + + + True + Displays a window helpful to drive automation + Auto GUI + True + + + gtk-media-pause + + + + + + + True + Displays the term grammar + Show term's grammar + True + + + + + + + + + True + _Debug + True + + + + + True + + + + + + + + + True + _Help + True + + + + + True + _Contents + True + + + + True + gtk-help + 1 + + + + + + + True + Displays the Tex/Unicode table + Show Tex/Unicode table + True + + + + + True + _About + True + + + True + gtk-about + 1 + + + + + + + + + + + + + False + False + + + + + True + + + True + True + + + True + + + True + GTK_SHADOW_OUT + GTK_POS_TOP + + + True + + + + + + + + + + + + + + False + + + + + 400 + True + + + True + + + True + GTK_TOOLBAR_BOTH + + + True + + + True + True + Restart + GTK_RELIEF_NONE + 0 + + + True + gtk-goto-top + + + + + + + False + False + + + + + True + + + True + True + Retract 1 phrase + GTK_RELIEF_NONE + 0 + + + True + gtk-go-up + + + + + + + False + False + + + + + True + + + True + True + Execute until point + GTK_RELIEF_NONE + 0 + + + True + gtk-jump-to + + + + + + + False + False + + + + + True + + + True + True + Execute 1 phrase + GTK_RELIEF_NONE + 0 + + + True + gtk-go-down + + + + + + + False + False + + + + + True + + + True + True + Execute all + GTK_RELIEF_NONE + 0 + + + True + gtk-goto-bottom + + + + + + + False + False + + + + + + + True + GTK_ORIENTATION_VERTICAL + GTK_TOOLBAR_BOTH + + + True + + + True + True + GTK_RELIEF_NONE + 0 + + + True + gtk-stop + + + + + + + False + False + + + + + False + 1 + + + + + False + False + + + + + True + True + GTK_POS_BOTTOM + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + + + + + + True + script + + + tab + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + + + True + Not implemented. + + + + + + + 1 + + + + + True + outline + + + tab + 1 + False + + + + + 1 + + + + + 1 + + + + + False + True + + + + + 250 + 500 + True + True + 380 + + + True + True + + + False + True + + + + + True + + + True + True + GTK_POLICY_NEVER + GTK_SHADOW_IN + + + True + True + False + GTK_WRAP_CHAR + False + + + + + + + True + True + + + + + True + True + + + + + + + 1 + + + + + True + + + True + False + + + + + True + False + + + True + gtk-missing-image + + + + + True + label14 + + + tab + False + + + + + True + gtk-missing-image + + + 1 + + + + + True + label15 + + + tab + 1 + False + + + + + True + gtk-missing-image + + + 2 + + + + + True + label16 + + + tab + 2 + False + + + + + False + 1 + + + + + False + False + 2 + + + + + + + + + DUMMY + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + DUMMY + + + False + False + 2 + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + + + + + 3 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + + + 280 + Uri choice + True + GTK_WIN_POS_CENTER + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + 4 + + + True + 3 + + + True + some informative message here ... + + + False + False + + + + + 400 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + True + False + + + + + 1 + + + + + True + + + True + URI: + + + False + False + + + + + True + True + * + + + 1 + + + + + False + 2 + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-index + + + False + False + + + + + True + Try _Selected + True + + + False + False + 1 + + + + + + + + + 1 + + + + + True + False + True + True + Try Constants + True + 0 + + + 2 + + + + + True + True + gtk-copy + True + 0 + + + 3 + + + + + True + True + True + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-ok + + + False + False + + + + + True + bla bla bla + True + + + False + False + 1 + + + + + + + + + 4 + + + + + True + True + True + gtk-go-forward + True + 0 + + + 5 + + + + + False + GTK_PACK_END + + + + + + + 5 + Find & Replace + False + GTK_WIN_POS_MOUSE + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + 3 + 2 + 5 + + + True + 5 + + + True + + + + + + + + + + + True + True + gtk-find + True + 0 + + + False + False + 1 + + + + + True + True + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-find-and-replace + + + False + False + + + + + True + _Replace + True + + + False + False + 1 + + + + + + + + + False + False + 2 + + + + + True + True + gtk-cancel + True + 0 + + + False + False + 3 + + + + + 2 + 2 + 3 + 5 + + + + + True + True + * + + + 1 + 2 + 1 + 2 + + + + + + True + True + True + True + True + * + + + 1 + 2 + + + + + + True + 0 + Replace with: + + + 1 + 2 + + + + + + + True + 0 + Find: + + + + + + + + + + + 450 + 400 + title + True + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + + + True + some informative message here ... + + + False + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + False + + + + + 1 + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-help + True + -11 + + + + + True + True + True + -6 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-zoom-in + + + False + False + + + + + True + More + True + + + False + False + 1 + + + + + + + + + 1 + + + + + True + True + True + True + gtk-cancel + True + -6 + + + 2 + + + + + True + True + True + gtk-ok + True + -5 + + + 3 + + + + + False + GTK_PACK_END + + + + + + + 600 + 400 + True + Auto + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_SOUTH_EAST + + + True + + + True + 2 + + + True + True + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + + + True + 3 + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + + + True + True + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-go-up + + + False + False + + + + + True + True + + + False + False + 1 + + + + + + + + + + + True + True + 0 + + + True + gtk-go-down + + + + + 1 + + + + + False + False + 1 + + + + + + + True + + + False + 3 + 1 + + + + + True + + + True + 0 + Last: + + + + + True + 4 + 4 + GTK_BUTTONBOX_END + + + True + True + True + gtk-media-pause + True + 0 + + + + + True + True + True + gtk-media-play + True + 0 + + + 1 + + + + + True + True + True + gtk-media-next + True + 0 + + + 2 + + + + + True + True + True + gtk-close + True + 0 + + + 3 + + + + + 1 + + + + + False + 2 + + + + + diff --git a/helm/software/matita/matitaGtkMisc.ml b/helm/software/matita/matitaGtkMisc.ml index 09a5c3982..9c00dfdde 100644 --- a/helm/software/matita/matitaGtkMisc.ml +++ b/helm/software/matita/matitaGtkMisc.ml @@ -412,32 +412,3 @@ let utf8_string_length s = assert(Glib.Utf8.validate s); Glib.Utf8.length s -let new_search_win title text = - let w = new MatitaGeneratedGui.searchWin () in - let t = - GSourceView.source_view ~auto_indent:false ~editable:false () - in - let callback () = - let text = w#entrySearch#text in - let highlight start end_ = - t#source_buffer#move_mark `INSERT ~where:start; - t#source_buffer#move_mark `SEL_BOUND ~where:end_; - t#scroll_mark_onscreen `INSERT - in - let iter = t#source_buffer#get_iter `SEL_BOUND in - match iter#forward_search text with - | None -> - (match t#source_buffer#start_iter#forward_search text with - | None -> () - | Some (start,end_) -> highlight start end_) - | Some (start,end_) -> highlight start end_ - in - t#source_buffer#insert text; - w#toplevel#set_title title; - w#scrolledwinContent#add (t :> GObj.widget); - ignore(w#entrySearch#connect#activate ~callback); - ignore(w#buttonSearch#connect#clicked ~callback); - ignore(w#buttonClose#connect#clicked ~callback:(fun () -> - w#toplevel#misc#hide (); w#toplevel#destroy ())); - w -;; diff --git a/helm/software/matita/matitaGtkMisc.mli b/helm/software/matita/matitaGtkMisc.mli index 03d89cd27..e7d572658 100644 --- a/helm/software/matita/matitaGtkMisc.mli +++ b/helm/software/matita/matitaGtkMisc.mli @@ -150,5 +150,3 @@ val utf8_parsed_text: string -> Stdpp.location -> string * int (* the length in characters, not bytes *) val utf8_string_length: string -> int - -val new_search_win: string -> string -> MatitaGeneratedGui.searchWin diff --git a/helm/software/matita/matitaGui.ml b/helm/software/matita/matitaGui.ml index c1f9a992a..a77800c1e 100644 --- a/helm/software/matita/matitaGui.ml +++ b/helm/software/matita/matitaGui.ml @@ -42,7 +42,7 @@ class type browserWin = * lablgladecc :-(((( *) object inherit MatitaGeneratedGui.browserWin - method browserUri: GEdit.combo_box_entry + method browserUri: GEdit.entry end class console ~(buffer: GText.buffer) () = @@ -907,18 +907,12 @@ class gui () = (fun _ -> MatitaAutoGui.auto_dialog Auto.get_auto_status); connect_menu_item main#showTermGrammarMenuItem (fun _ -> - let w = MatitaGtkMisc.new_search_win "Terms grammar" (Print_grammar.ebnf_of_term ()) in - w#toplevel#set_transient_for (main#toplevel#as_window); - w#toplevel#show ()); + let c = MatitaMathView.cicBrowser () in + c#load (`About `Grammar)); connect_menu_item main#showUnicodeTable (fun _ -> - let text = String.concat "\n" - (List.map (fun (k,vs) -> k ^ "\t" ^ String.concat ", " vs) - (Utf8Macro.pp_table ())) - in - let w = MatitaGtkMisc.new_search_win "TeX/UTF8 table" text in - w#toplevel#set_transient_for (main#toplevel#as_window); - w#toplevel#show ()); + let c = MatitaMathView.cicBrowser () in + c#load (`About `TeX)); (* script monospace font stuff *) self#updateFontSize (); (* debug menu *) @@ -968,7 +962,7 @@ class gui () = end)); (* math view handling *) connect_menu_item main#newCicBrowserMenuItem (fun () -> - ignore (MatitaMathView.cicBrowser ())); + ignore(MatitaMathView.cicBrowser ())); connect_menu_item main#increaseFontSizeMenuItem (fun () -> self#increaseFontSize (); MatitaMathView.increase_font_size (); @@ -1167,12 +1161,13 @@ class gui () = method newBrowserWin () = object (self) inherit browserWin () - val combo = GEdit.combo_box_entry () + val combo = GEdit.entry () initializer self#check_widgets (); let combo_widget = combo#coerce in uriHBox#pack ~from:`END ~fill:true ~expand:true combo_widget; - combo#entry#misc#grab_focus () + self#toplevel#set_transient_for main#toplevel#as_window; + combo#misc#grab_focus () method browserUri = combo end diff --git a/helm/software/matita/matitaGuiTypes.mli b/helm/software/matita/matitaGuiTypes.mli index c9ef86123..d42775827 100644 --- a/helm/software/matita/matitaGuiTypes.mli +++ b/helm/software/matita/matitaGuiTypes.mli @@ -37,7 +37,7 @@ end class type browserWin = object inherit MatitaGeneratedGui.browserWin - method browserUri: GEdit.combo_box_entry + method browserUri: GEdit.entry end class type gui = @@ -145,5 +145,6 @@ object (* method loadList: string list -> MatitaTypes.mathViewer_entry -> unit *) method loadInput: string -> unit method mathView: clickableMathView + method win: browserWin end diff --git a/helm/software/matita/matitaMathView.ml b/helm/software/matita/matitaMathView.ml index d8c02af44..1f5b2a22c 100644 --- a/helm/software/matita/matitaMathView.ml +++ b/helm/software/matita/matitaMathView.ml @@ -814,6 +814,29 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) win#queryInputText#set_text input; combo#set_active (aux 0 queries); in + let searchText = + GSourceView.source_view ~auto_indent:false ~editable:false () + in + let _ = + win#scrolledwinContent#add (searchText :> GObj.widget); + let callback () = + let text = win#entrySearch#text in + let highlight start end_ = + searchText#source_buffer#move_mark `INSERT ~where:start; + searchText#source_buffer#move_mark `SEL_BOUND ~where:end_; + searchText#scroll_mark_onscreen `INSERT + in + let iter = searchText#source_buffer#get_iter `SEL_BOUND in + match iter#forward_search text with + | None -> + (match searchText#source_buffer#start_iter#forward_search text with + | None -> () + | Some (start,end_) -> highlight start end_) + | Some (start,end_) -> highlight start end_ + in + ignore(win#entrySearch#connect#activate ~callback); + ignore(win#buttonSearch#connect#clicked ~callback); + in let set_whelp_query txt = let query, arg = try @@ -890,8 +913,8 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) win#mathOrListNotebook#set_show_tabs false; win#browserForwardButton#misc#set_sensitive false; win#browserBackButton#misc#set_sensitive false; - ignore (win#browserUri#entry#connect#activate (handle_error' (fun () -> - self#loadInput win#browserUri#entry#text))); + ignore (win#browserUri#connect#activate (handle_error' (fun () -> + self#loadInput win#browserUri#text))); ignore (win#browserHomeButton#connect#clicked (handle_error' (fun () -> self#load (`About `Current_proof)))); ignore (win#browserRefreshButton#connect#clicked @@ -933,7 +956,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) *) win#hBugsTutorsMenuItem#misc#hide (); connect_menu_item win#browserUrlMenuItem (fun () -> - win#browserUri#entry#misc#grab_focus ()); + win#browserUri#misc#grab_focus ()); connect_menu_item win#univMenuItem (fun () -> match self#currentCicUri with | Some uri -> self#load (`Univs uri) @@ -1018,6 +1041,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) method private _showMath = win#mathOrListNotebook#goto_page 0 method private _showList = win#mathOrListNotebook#goto_page 1 method private _showList2 = win#mathOrListNotebook#goto_page 5 + method private _showSearch = win#mathOrListNotebook#goto_page 6 method private _showGviz = win#mathOrListNotebook#goto_page 3 method private _showHBugs = win#mathOrListNotebook#goto_page 4 @@ -1044,6 +1068,8 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) | `About `Us -> self#egg () | `About `CoercionsFull -> self#coerchgraph false () | `About `Coercions -> self#coerchgraph true () + | `About `TeX -> self#tex () + | `About `Grammar -> self#grammar () | `Check term -> self#_loadCheck term | `Cic (term, metasenv) -> self#_loadTermCic term metasenv | `Dir dir -> self#_loadDir dir @@ -1096,6 +1122,21 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) load_coerchgraph tred (); self#_showGviz + method private tex () = + let text = String.concat "\n" + (List.map (fun (k,vs) -> k ^ "\t" ^ String.concat ", " vs) + (Utf8Macro.pp_table ())) + in + self#_loadText text + + method private _loadText text = + searchText#source_buffer#set_text text; + win#entrySearch#misc#grab_focus (); + self#_showSearch + + method private grammar () = + self#_loadText (Print_grammar.ebnf_of_term ()); + method private home () = self#_showMath; match self#script#grafite_status.proof_status with @@ -1146,7 +1187,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) self#_showHBugs method private setEntry entry = - win#browserUri#entry#set_text (MatitaTypes.string_of_entry entry); + win#browserUri#set_text (MatitaTypes.string_of_entry entry); current_entry <- entry method private _loadObj obj = diff --git a/helm/software/matita/matitaTypes.ml b/helm/software/matita/matitaTypes.ml index 18aaa2e65..adbc7d3b3 100644 --- a/helm/software/matita/matitaTypes.ml +++ b/helm/software/matita/matitaTypes.ml @@ -37,6 +37,8 @@ type abouts = | `Us | `Coercions | `CoercionsFull + | `TeX + | `Grammar ] type mathViewer_entry = @@ -57,6 +59,8 @@ let string_of_entry = function | `About `Us -> "about:us" | `About `Coercions -> "about:coercions?tred=true" | `About `CoercionsFull -> "about:coercions" + | `About `TeX -> "about:tex" + | `About `Grammar -> "about:grammar" | `Check _ -> "check:" | `Cic (_, _) -> "term:" | `Dir uri -> uri @@ -81,6 +85,8 @@ let entry_of_string = function | "about:us" -> `About `Us | "about:coercions?tred=true" -> `About `Coercions | "about:coercions" -> `About `CoercionsFull + | "about:tex" -> `About `TeX + | "about:grammar" -> `About `Grammar | _ -> (* only about entries supported ATM *) raise (Invalid_argument "entry_of_string") diff --git a/helm/software/matita/matitaTypes.mli b/helm/software/matita/matitaTypes.mli index 20d042596..4dfb7c790 100644 --- a/helm/software/matita/matitaTypes.mli +++ b/helm/software/matita/matitaTypes.mli @@ -25,7 +25,8 @@ exception Cancel -type abouts = [ `Blank | `Current_proof | `Us | `Coercions | `CoercionsFull] +type abouts = [ `Blank | `Current_proof | `Us | `Coercions + | `CoercionsFull | `TeX | `Grammar] type mathViewer_entry = [ `About of abouts -- 2.39.2