From: Stefano Zacchiroli Date: Thu, 15 Sep 2005 09:15:29 +0000 (+0000) Subject: moved matita logo in the right place X-Git-Tag: LAST_BEFORE_NEW~130 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=5215754e8ad1c83991135e94ad1e7ab63818d1cb;p=helm.git moved matita logo in the right place --- diff --git a/helm/matita/icons/matita.png b/helm/matita/icons/matita.png new file mode 100644 index 000000000..342bcb44c Binary files /dev/null and b/helm/matita/icons/matita.png differ diff --git a/helm/matita/icons/matita_medium.png b/helm/matita/icons/matita_medium.png new file mode 100644 index 000000000..335688af2 Binary files /dev/null and b/helm/matita/icons/matita_medium.png differ diff --git a/helm/matita/icons/matita_small.png b/helm/matita/icons/matita_small.png new file mode 100644 index 000000000..cfb017b0f Binary files /dev/null and b/helm/matita/icons/matita_small.png differ diff --git a/helm/matita/icons/meegg.png b/helm/matita/icons/meegg.png new file mode 100644 index 000000000..4c2be73fb Binary files /dev/null and b/helm/matita/icons/meegg.png differ diff --git a/helm/matita/logo/matita.png b/helm/matita/logo/matita.png deleted file mode 100644 index 342bcb44c..000000000 Binary files a/helm/matita/logo/matita.png and /dev/null differ diff --git a/helm/matita/logo/matita_medium.png b/helm/matita/logo/matita_medium.png deleted file mode 100644 index 335688af2..000000000 Binary files a/helm/matita/logo/matita_medium.png and /dev/null differ diff --git a/helm/matita/logo/matita_small.png b/helm/matita/logo/matita_small.png deleted file mode 100644 index cfb017b0f..000000000 Binary files a/helm/matita/logo/matita_small.png and /dev/null differ diff --git a/helm/matita/matita.glade b/helm/matita/matita.glade index 1076b9192..9c40b8efa 100644 --- a/helm/matita/matita.glade +++ b/helm/matita/matita.glade @@ -18,6 +18,7 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True @@ -347,6 +348,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -370,6 +375,9 @@ False False True + False + False + False @@ -392,6 +400,47 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + True + 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 @@ -422,6 +471,7 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True True @@ -482,6 +532,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -506,6 +560,7 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True True @@ -566,6 +621,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -594,6 +653,7 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True True @@ -631,6 +691,7 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True True @@ -710,6 +771,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -735,6 +800,9 @@ False False True + False + False + False @@ -767,6 +835,7 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True @@ -2163,6 +2232,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -2186,6 +2259,9 @@ False False True + False + False + False @@ -2208,6 +2284,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -2380,6 +2460,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -2413,6 +2497,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -2446,6 +2534,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -2483,6 +2575,7 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True True @@ -2543,6 +2636,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2603,6 +2700,7 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True True @@ -2686,6 +2784,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2783,6 +2885,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2824,6 +2930,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2850,6 +2960,9 @@ False False True + False + False + False @@ -2879,6 +2992,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2936,6 +3053,7 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True @@ -2959,6 +3077,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2983,6 +3105,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -3137,6 +3263,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -3196,6 +3326,7 @@ False GDK_WINDOW_TYPE_HINT_UTILITY GDK_GRAVITY_NORTH_WEST + True @@ -3226,6 +3357,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -3250,6 +3385,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -3422,6 +3561,7 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True @@ -3446,6 +3586,9 @@ False False True + False + False + False @@ -3582,6 +3725,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -3656,6 +3803,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 diff --git a/helm/matita/matitaGui.ml b/helm/matita/matitaGui.ml index 1b46c03a4..a3d35c8e1 100644 --- a/helm/matita/matitaGui.ml +++ b/helm/matita/matitaGui.ml @@ -171,9 +171,7 @@ class gui () = (*~comments:"comments"*) ~copyright:"Copyright (C) 2005, the HELM team" ~license:(String.concat "\n" (parse_txt_file "LICENSE")) - ~logo: - (GdkPixbuf.from_file - (BuildTimeConf.runtime_base_dir ^ "/logo/matita_medium.png")) + ~logo:(GdkPixbuf.from_file (MatitaMisc.image_path "/matita_medium.png")) ~name:"Matita" ~version:BuildTimeConf.version ~website:"http://helm.cs.unibo.it" diff --git a/helm/matita/matitaMathView.ml b/helm/matita/matitaMathView.ml index 532c3dd97..43547b8ff 100644 --- a/helm/matita/matitaMathView.ml +++ b/helm/matita/matitaMathView.ml @@ -404,11 +404,11 @@ class sequentsViewer ~(notebook:GPack.notebook) ~(cicMathView:cicMathView) () = val mutable scrolledWin: GBin.scrolled_window option = None (* scrolled window to which the sequentViewer is currently attached *) val logo = (GMisc.image - ~file:(BuildTimeConf.runtime_base_dir ^ "/logo/matita_medium.png") () + ~file:(MatitaMisc.image_path "matita_medium.png") () :> GObj.widget) val logo_with_qed = (GMisc.image - ~file:(BuildTimeConf.runtime_base_dir ^ "/logo/matita_small.png") () + ~file:(MatitaMisc.image_path "matita_small.png") () :> GObj.widget) method load_logo = @@ -593,6 +593,9 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) with exn -> fail (MatitaExcPp.to_string exn) in let handle_error' f = (fun () -> handle_error (fun () -> f ())) in + let load_easter_egg = lazy ( + win#easterEggImage#set_file (MatitaMisc.image_path "meegg.png")) + in object (self) inherit scriptAccessor @@ -682,9 +685,9 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) * * Use only these functions to switch between the tabs *) - method private _showList = win#mathOrListNotebook#goto_page 1 method private _showMath = win#mathOrListNotebook#goto_page 0 - + method private _showList = win#mathOrListNotebook#goto_page 1 + method private back () = try self#_load (self#_historyPrev ()) @@ -704,7 +707,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) (match entry with | `About `Current_proof -> self#home () | `About `Blank -> self#blank () - | `About `Us -> () (* TODO implement easter egg here :-] *) + | `About `Us -> self#egg () | `Check term -> self#_loadCheck term | `Cic (term, metasenv) -> self#_loadTermCic term metasenv | `Dir dir -> self#_loadDir dir @@ -725,6 +728,10 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) failwith "not implemented _loadCheck"; self#_showMath + method private egg () = + win#mathOrListNotebook#goto_page 2; + Lazy.force load_easter_egg + method private home () = self#_showMath; match self#script#status.proof_status with