help.html help_ita.html @@ -29,7 +29,7 @@ except: from menubar import MyMenuBar from mangaframe import MangaFrame from dialogs import DownloadDialog -from widgets import DebuggingWindow, AdviserDialog +from widgets import DebuggingWindow, AdviserDialog, HelpDialog from image import BackgroundImage from taskbaricon import TaskBarIcon @@ -44,6 +44,7 @@ class MDIFrame (wx.MDIParentFrame): self.hide_on_iconize = config.ReadInt("hide_on_iconize") or 1 #1:chiedi, 2:non chiedi self.ask_on_close = config.ReadInt("ask_on_close") or 1 #1:chiedi, 2:non chiedi + self.first_run = not config.ReadBool("first_run") self.system_resolution = wx.GetDisplaySize() size = config.ReadInt("sizeW"), config.ReadInt("sizeH") @@ -73,7 +74,7 @@ class MDIFrame (wx.MDIParentFrame): menus = [_("Gmangas2"), _("View"), _("History"), _("Bookmarks"), _("Adviser"), _("Utils"), _("Help")] menu_items = [ [_("New Manga\tCtrl+t"), _("Open a new Manga"), self.OnNewManga, _("Gmangas2")], - [_("Manga News\tCtrl+n"), _("Open a new News Window"), self.OnMangaNews, _("Gmangas2")], + #[_("Manga News\tCtrl+n"), _("Open a new News Window"), self.OnMangaNews, _("Gmangas2")], [_("Close Current\tCtrl+w"), _("Close current child"), self.OnCloseCurrent, _("Gmangas2")], ["<sep>", _("Gmangas2")], [_("Exit\tCtrl+q"), _("Close Gmangas2"), self.OnExit, _("Gmangas2")], #, lambda id:wx.App.SetMacExitMenuItemId(id) @@ -98,6 +99,8 @@ class MDIFrame (wx.MDIParentFrame): ["<sep>", _("Utils")], [_("Save Image"), _("Save current manga's image somewhere"), self.OnSaveImage, _("Utils")], + [_("Help"), _("Help window"), self.OnHelp, _("Help")], + ["<sep>", _("Help")], [_("About"), _("About window"), self.OnAbout, _("Help")]] #, lambda id:wx.App.SetMacAboutMenuItemId(id) self.MenuBar = MyMenuBar(self, menu_items, menus, BackEnds) self.SetMenuBar(self.MenuBar) @@ -112,6 +115,9 @@ class MDIFrame (wx.MDIParentFrame): self.LoadStates() wx.EVT_PAINT(self.ClientWindow, self.OnPaint) + + if not self.first_run: + self.StartHelpDialog() def WakeUp (self): self.Iconize(False) @@ -126,7 +132,14 @@ class MDIFrame (wx.MDIParentFrame): iw, ih = background2.Image.size fw, fh = self.GetSize() dc.DrawBitmap(bmp2, 0,0, True) - + + def StartHelpDialog (self): + if self.IsFullScreen(): + self.FullScreen() + size = self.GetSize() + dialog = HelpDialog(self, (size[0],int(size[1]/1.5))) + dialog.Show() + def LoadStates (self): filename = os.path.join(homedir, "STATE") if os.path.isfile(filename): @@ -358,11 +371,13 @@ class MDIFrame (wx.MDIParentFrame): return result def SaveConfiguration (self): + if self.IsFullScreen(): + self.FullScreen() maximized = self.IsMaximized() config.WriteBool("maximized", maximized) if maximized: - self.Maximize(False) + self.Maximize(False) w,h = self.GetSize() config.WriteInt("sizeW", w) config.WriteInt("sizeH", h) @@ -382,6 +397,7 @@ class MDIFrame (wx.MDIParentFrame): config.WriteInt("hide_on_iconize", self.hide_on_iconize) config.WriteInt("ask_on_close", self.ask_on_close) + config.WriteBool("first_run", True) achild = self.GetActiveChild() if hasattr(achild, "AutoFit"): @@ -433,6 +449,8 @@ class MDIFrame (wx.MDIParentFrame): achild.Close(True) else: wx.MessageBox(_("What are you trying to close?")) + def OnHelp (self, event): + self.StartHelpDialog() def OnAbout (self, event): info = wx.AboutDialogInfo() info.SetIcon(wx.Icon(cdir("..", "pixmaps", "logo.png"), wx.BITMAP_TYPE_PNG)) @@ -447,12 +465,15 @@ class MDIFrame (wx.MDIParentFrame): info.AddArtist("Luciano Ferraro") info.AddTranslator("Luciano Ferraro") wx.AboutBox(info) - - def OnFullScreen (self, event): + + def FullScreen (self): flags = wx.FULLSCREEN_NOTOOLBAR|wx.FULLSCREEN_NOSTATUSBAR|\ wx.FULLSCREEN_NOBORDER|wx.FULLSCREEN_NOCAPTION fs = not self.IsFullScreen() self.ShowFullScreen(fs, flags) + + def OnFullScreen (self, event): + self.FullScreen() child = self.GetActiveChild() if hasattr(child, "FitImage"): gmangas/mdi.py @@ -18,6 +18,7 @@ import wx import wx.py import wx.py.crust +import wx.html try: from wx.lib.agw.buttonpanel import ButtonInfo except: @@ -30,6 +31,21 @@ import os import sys import random +class HelpDialog (wx.Dialog): + def __init__(self, parent, size, *args, **kwargs): + wx.Dialog.__init__(self, parent, wx.NewId(), _("Help"), size=size, *args, **kwargs) + + sizer = wx.BoxSizer(wx.VERTICAL) + html = wx.html.HtmlWindow(self) + if "gtk2" in wx.PlatformInfo: + html.SetStandardFonts() + if __language__ == "ita": + html.LoadFile(gdir("help_ita.html")) + else: + html.LoadFile(gdir("help.html")) + sizer.Add(html, 1, wx.EXPAND) + self.SetSizer(sizer) + class MyButtonBox: def __init__ (self, parent, panel, *args, **kwargs): self.parent, self.panel = parent, panel gmangas/widgets.py @@ -39,9 +39,11 @@ def install (curdir, lang=None): langid = locale.getdefaultlocale()[0] domain = "gmangas2" + __builtin__.__language__ = "en" if not lang: if langid.startswith("it"): lang = gettext.translation(domain, localedir, languages=["it"]) + __builtin__.__language__ = "ita" else: __builtin__._ = lambda s: s return i18n.py locale/it/LC_MESSAGES/gmangas2.mo @@ -45,7 +45,7 @@ data_files = walk_dir("pixmaps") + \ walk_dir("gmangas") + \ walk_dir("backends") + \ walk_dir("locale") + \ - [(".",["BeautifulSoup.py", "image.py", "i18n.py"])] + [(".",["BeautifulSoup.py", "image.py", "i18n.py", "help.html", "help_ita.html"])] lines, chars = 0, 0 for dlist in data_files: if dlist[0].split("\\")[0].split("/")[0] in ("pixmaps", "locale"): setup.py dc7dc91e290dbc244a7598d82f41bf2edc10fa21 unknown lux@.(none) http://github.com/luxkun/gmangas2/commit/0e15250f077628d53019a02318da69642f747604 0e15250f077628d53019a02318da69642f747604 2009-08-19T16:24:47-07:00 2009-08-19T16:24:47-07:00 Added HelpDialog and some minor changes adc77019ca6d077176a09f032b3ee9d4d46d8e40 unknown lux@.(none)