sample.blyte short.blyte @@ -105,7 +105,7 @@ class Config: self.colors = { } # prefix used for temp files - self.tmpPrefix = "oskusoft-nasp-tmp-" + self.tmpPrefix = "oskusoft-blyte-tmp-" # vertical distance between rows, in pixels self.fontYdelta = 18 config.py @@ -1,6 +1,6 @@ # exception classes -class NaspError(Exception): +class BlyteError(Exception): def __init__(self, msg): Exception.__init__(self, msg) self.msg = msg @@ -8,10 +8,10 @@ class NaspError(Exception): def __str__(self): return str(self.msg) -class ConfigError(NaspError): +class ConfigError(BlyteError): def __init__(self, msg): - NaspError.__init__(self, msg) + BlyteError.__init__(self, msg) -class MiscError(NaspError): +class MiscError(BlyteError): def __init__(self, msg): - NaspError.__init__(self, msg) + BlyteError.__init__(self, msg) error.py logo.jpg @@ -369,7 +369,7 @@ class MyCtrl(wxControl): return True - except NaspError, e: + except BlyteError, e: wxMessageBox("Error loading file: %s" % e, "Error", wxOK, mainFrame) @@ -1675,8 +1675,8 @@ class MyCtrl(wxControl): return dlg = wxFileDialog(mainFrame, "Filename to save as", - wildcard = "NASP files (*.nasp)|*.nasp|All files|*", - style = wxSAVE | wxOVERWRITE_PROMPT) + wildcard = "Blyte files (*.blyte)|*.blyte|All files|*", + style = wxSAVE | wxOVERWRITE_PROMPT) if dlg.ShowModal() == wxID_OK: self.saveFile(dlg.GetPath()) @@ -1688,8 +1688,8 @@ class MyCtrl(wxControl): return dlg = wxFileDialog(mainFrame, "Filename to export as", - wildcard = "PDF|*.pdf|Formatted text|*.txt", - style = wxSAVE | wxOVERWRITE_PROMPT) + wildcard = "PDF|*.pdf|Formatted text|*.txt", + style = wxSAVE | wxOVERWRITE_PROMPT) if dlg.ShowModal() == wxID_OK: if dlg.GetFilterIndex() == 0: @@ -1919,7 +1919,7 @@ class MyCtrl(wxControl): # FIXME: debug stuff elif (kc < 256) and (chr(kc) == "å"): - self.loadFile("default.nasp") + self.loadFile("default.blyte") elif (kc < 256) and (chr(kc) == "Å"): self.OnSettings() elif (kc < 256) and (chr(kc) == "¤"): @@ -2260,9 +2260,8 @@ class MyFrame(wxFrame): # these are hidden here because they're somewhat harder to find # here than in misc.pyo misc.isEval = False - misc.licensedTo = "Evaluation version." + misc.licensedTo = "Evaluation copy." misc.version = "0.7" - misc.copyright = "© Oskusoft 2004. All rights reserved." hsizer.Add(self.typeCb) @@ -2330,7 +2329,7 @@ class MyFrame(wxFrame): return newPanel def setTitle(self, text): - self.SetTitle("Nasp - %s" % text) + self.SetTitle("Blyte - %s" % text) def setTabText(self, panel, text): i = self.findPage(panel) @@ -2368,8 +2367,8 @@ class MyFrame(wxFrame): def OnOpen(self, event): dlg = wxFileDialog(self, "File to open", - wildcard = "NASP files (*.nasp)|*.nasp|All files|*", - style = wxOPEN) + wildcard = "Blyte files (*.blyte)|*.blyte|All files|*", + style = wxOPEN) if dlg.ShowModal() == wxID_OK: if not self.notebook.GetPage(self.findPage(self.panel))\ .ctrl.isUntouched(): @@ -2467,7 +2466,7 @@ class MyFrame(wxFrame): dlg.Show() def OnAbout(self, event): - win = splash.SplashWindow(self, 10000) + win = splash.SplashWindow(self, -1) win.Show() def OnTypeCombo(self, event): @@ -2504,7 +2503,7 @@ class MyApp(wxApp): cfg = config.Config() refreshGuiConfig() - mainFrame = MyFrame(NULL, -1, "Nasp") + mainFrame = MyFrame(NULL, -1, "Blyte") mainFrame.init() mainFrame.Show(True) main.py @@ -6,10 +6,8 @@ class SplashWindow(wxFrame): def __init__(self, parent, delay): wxFrame.__init__(self, parent, -1, "Splash", - pos = wxDefaultPosition, - size = (100, 100), - style = wxFRAME_FLOAT_ON_PARENT | wxSTAY_ON_TOP | - wxSIMPLE_BORDER) + pos = wxDefaultPosition, size = (100, 100), + style = wxFRAME_FLOAT_ON_PARENT | wxSTAY_ON_TOP | wxSIMPLE_BORDER) if not SplashWindow.inited: SplashWindow.inited = True @@ -22,18 +20,26 @@ class SplashWindow(wxFrame): self.pic = None self.SetClientSizeWH(512, 384) + # FIXME: check crc32 and w/h of picture, quit if they don't match + self.CenterOnScreen() self.textColor = wxColour(0, 0, 0) self.font = wxFont(12, wxMODERN, wxNORMAL, wxNORMAL) - - self.timer = wxTimer(self) - EVT_TIMER(self, -1, self.OnTimer) - self.timer.Start(delay, True) - + + if delay != -1: + self.timer = wxTimer(self) + EVT_TIMER(self, -1, self.OnTimer) + self.timer.Start(delay, True) + else: + EVT_LEFT_DOWN(self, self.OnClick) + EVT_PAINT(self, self.OnPaint) EVT_CLOSE(self, self.OnCloseWindow) + def OnClick(self, event): + self.Close() + def OnPaint(self, event): dc = wxPaintDC(self) @@ -45,15 +51,9 @@ class SplashWindow(wxFrame): else: dc.DrawText("Splash screen image not found", 50, 50) - dc.DrawText("Version %s" % misc.version, 200, 135) - dc.DrawText(misc.copyright, 125, 165) - - s = misc.licensedTo - w, h = dc.GetTextExtent(s) - w += 15 - h += 15 - size = self.GetClientSize() - dc.DrawText(s, size.width - w, size.height - h) + x = 421 + dc.DrawText("Version %s" % misc.version, x, 346) + dc.DrawText(misc.licensedTo, x, 360) def OnTimer(self, event): self.timer.Stop() splash.py README sample.nasp short.nasp 297279d49f1f55baa9db012ec3d7008ed5e47b65 Osku Salerma osku@iki.fi http://github.com/oskusalerma/blyte/commit/2c3963047da469fd62444ada37e0488453a9c573 2c3963047da469fd62444ada37e0488453a9c573 2004-07-09T03:48:31-07:00 2004-07-09T03:48:31-07:00 Name program 'Blyte'. Rename all references Nasp -> Blyte. Add new splash screen. Splash screen dialog when shown from menu doesn't use a timer, but waits until is clicked on to go away. 9f7e86acad768c0d72d4e7fdae14d3cfac97d216 Osku Salerma osku@iki.fi