diff --git a/assets/images/logo1.bmp b/assets/images/logo1.bmp index 60aa99b..451356d 100644 Binary files a/assets/images/logo1.bmp and b/assets/images/logo1.bmp differ diff --git a/assets/images/logo2.bmp b/assets/images/logo2.bmp index ee0aea0..4086b86 100644 Binary files a/assets/images/logo2.bmp and b/assets/images/logo2.bmp differ diff --git a/assets/text/TODO b/assets/text/TODO index 66c5e25..e45546e 100644 --- a/assets/text/TODO +++ b/assets/text/TODO @@ -13,10 +13,8 @@ c) text (edit, Unicode sets) 11) GUI: a) Settings panel - b) revisit About panel - c) {de,in}crease cell size - d) switch from wxPython to GTK - e) {copy,cut,insert from,paste} - f) {fix,reduce} flickering when viewRect > (0, 0) + b) switch from wxPython to GTK + c) {fix,reduce} flickering when viewRect > (0, 0) + d) {copy,cut,insert from,paste}, {de,in}crease cell size vim:ff=dos tw=0 diff --git a/libroar/RoarWindowAbout.py b/libroar/RoarWindowAbout.py index 420cbe5..b7b5ff2 100644 --- a/libroar/RoarWindowAbout.py +++ b/libroar/RoarWindowAbout.py @@ -17,24 +17,23 @@ class RoarWindowAbout(wx.Dialog): # __init__(self, parent, minSize=(320, 300), title="About roar") def __init__(self, parent, minSize=(320, 300), title="About roar"): super().__init__(parent, size=minSize, title=title) - self.panel, self.sizer, self.sizerH = wx.Panel(self), wx.BoxSizer(wx.VERTICAL), [wx.BoxSizer(wx.HORIZONTAL), wx.BoxSizer(wx.HORIZONTAL), wx.BoxSizer(wx.HORIZONTAL)] + self.panel, self.sizer, self.sizerV = wx.Panel(self), wx.FlexGridSizer(2, 2, 4, 4), wx.BoxSizer(wx.VERTICAL) logoPathNames = glob(os.path.join("assets", "images", "logo*.bmp")) logoPathName = logoPathNames[random.randint(0, len(logoPathNames) - 1)] self.logo = wx.StaticBitmap(self.panel, -1, wx.Bitmap(logoPathName)) - self.sizerH[0].Add(self.logo, 0, wx.ALL | wx.CENTER, 4) self.title = wx.StaticText(self.panel, label="roar -- mIRC art editor for Windows && Linux\nGit revision __ROAR_RELEASE_GIT_SHORT_REV__\nhttps://www.github.com/lalbornoz/roar/\nCopyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz ", style=wx.ALIGN_CENTER) self.title.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, underline=False)) - self.sizerH[1].Add(self.title, 0, wx.ALL | wx.CENTER, 3) - labelsText = ["&roar!", "&ROAR!", "&roaaaaaaar!", "&ROAROARAOR", "_&ROAR_"] labelText = labelsText[random.randint(0, len(labelsText) - 1)] self.buttonRoar = wx.Button(self.panel, label=labelText) self.buttonRoar.Bind(wx.EVT_BUTTON, self.onButtonRoar) - self.sizerH[2].Add(self.buttonRoar, 0, wx.ALL | wx.CENTER, 2) + self.sizerV.AddMany(((self.title, 0, wx.ALL | wx.CENTER, 4), (self.buttonRoar, 0, wx.ALL | wx.CENTER, 4),)) - [self.sizer.Add(sizer, 0, wx.CENTER) for sizer in self.sizerH] + self.sizer.AddMany(( + (self.logo, 0, wx.ALL | wx.CENTER, 4), + (self.sizerV, 0, wx.ALL | wx.CENTER, 3),)) self.panel.SetSizerAndFit(self.sizer) self.SetClientSize(self.sizer.ComputeFittingClientSize(self)); self.Center(); self.SetTitle(title)