Skip to content

Commit

Permalink
Merge pull request mrichards42#36 from jpd236/lua-ui
Browse files Browse the repository at this point in the history
Lua plugin UI fixes.
  • Loading branch information
mrichards42 authored Oct 29, 2016
2 parents d3e50a8 + 1389150 commit 7cbacbd
Show file tree
Hide file tree
Showing 8 changed files with 819 additions and 814 deletions.
6 changes: 4 additions & 2 deletions scripts/download/gui/download.fbp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
<FileVersion major="1" minor="11" />
<FileVersion major="1" minor="13" />
<object class="Project" expanded="1">
<property name="class_decoration">; </property>
<property name="code_generation">Python</property>
Expand Down Expand Up @@ -850,7 +850,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
Expand Down Expand Up @@ -3988,6 +3988,7 @@
<event name="OnSize"></event>
<event name="OnSpinCtrl"></event>
<event name="OnSpinCtrlText"></event>
<event name="OnTextEnter"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
Expand Down Expand Up @@ -5036,6 +5037,7 @@
<property name="minimum_size"></property>
<property name="name">sbSizer1</property>
<property name="orient">wxHORIZONTAL</property>
<property name="parent">1</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="0">
Expand Down
1,460 changes: 730 additions & 730 deletions scripts/download/gui/wxFB.lua

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions scripts/download/gui/wxFB.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

###########################################################################
## Python code generated with wxFormBuilder (version Nov 6 2013)
## Python code generated with wxFormBuilder (version Oct 10 2016)
## http://www.wxformbuilder.org/
##
## PLEASE DO "NOT" EDIT THIS FILE!
Expand Down Expand Up @@ -51,7 +51,7 @@ def __init__( self, parent ):
bSizer2.Add( self.prev, 0, wx.ALIGN_CENTER_VERTICAL, 5 )

self.label = TextButton( self.panel, wx.ID_ANY, u"Label", wx.DefaultPosition, wx.DefaultSize, 0 )
self.label.SetFont( wx.Font( 12, 70, 90, 92, False, wx.EmptyString ) )
self.label.SetFont( wx.Font( 12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, wx.EmptyString ) )
self.label.SetForegroundColour( wx.Colour( 0, 0, 255 ) )
self.label.SetToolTipString( u"Download missing puzzles" )

Expand Down Expand Up @@ -83,7 +83,7 @@ def __init__( self, parent ):
queueCountSizer = wx.BoxSizer( wx.HORIZONTAL )

self.queue_count = TextButton( self.panel, wx.ID_ANY, u"0", wx.DefaultPosition, wx.DefaultSize, 0 )
self.queue_count.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 70, 90, 92, False, wx.EmptyString ) )
self.queue_count.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, wx.EmptyString ) )
self.queue_count.SetForegroundColour( wx.Colour( 0, 0, 255 ) )
self.queue_count.SetToolTipString( u"Download queue" )

Expand All @@ -93,12 +93,12 @@ def __init__( self, parent ):
queueCountSizer.Add( self.queueBmp, 0, wx.ALIGN_CENTER_VERTICAL, 5 )


bSizer3.Add( queueCountSizer, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL|wx.RIGHT|wx.LEFT, 5 )
bSizer3.Add( queueCountSizer, 0, wx.EXPAND|wx.RIGHT|wx.LEFT, 5 )

errorCountSizer = wx.BoxSizer( wx.HORIZONTAL )

self.error_count = TextButton( self.panel, wx.ID_ANY, u"0", wx.DefaultPosition, wx.DefaultSize, 0 )
self.error_count.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 70, 90, 92, False, wx.EmptyString ) )
self.error_count.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, wx.EmptyString ) )
self.error_count.SetForegroundColour( wx.Colour( 0, 0, 255 ) )
self.error_count.SetToolTipString( u"Download missing puzzles" )

Expand Down Expand Up @@ -220,7 +220,7 @@ def __init__( self, parent ):
bSizer8.Add( self.expand_button, 0, wx.ALIGN_CENTER_VERTICAL|wx.RIGHT, 5 )

self.label = TextButton( self.m_panel4, wx.ID_ANY, u"Source", wx.DefaultPosition, wx.DefaultSize, 0 )
self.label.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 70, 90, 92, False, wx.EmptyString ) )
self.label.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, wx.EmptyString ) )

bSizer8.Add( self.label, 1, wx.ALIGN_CENTER_VERTICAL|wx.RIGHT, 5 )

Expand Down Expand Up @@ -290,19 +290,19 @@ def __init__( self, parent ):
bSizer13.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 )

self.erase_history = TextButton( self, wx.ID_ANY, u"Clear History", wx.DefaultPosition, wx.DefaultSize, 0 )
self.erase_history.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 70, 90, 92, False, wx.EmptyString ) )
self.erase_history.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, wx.EmptyString ) )
self.erase_history.SetForegroundColour( wx.Colour( 0, 0, 255 ) )

bSizer13.Add( self.erase_history, 0, wx.ALL, 5 )

self.cancel_downloads = TextButton( self, wx.ID_ANY, u"Cancel Downloads", wx.DefaultPosition, wx.DefaultSize, 0 )
self.cancel_downloads.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 70, 90, 92, False, wx.EmptyString ) )
self.cancel_downloads.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, wx.EmptyString ) )
self.cancel_downloads.SetForegroundColour( wx.Colour( 0, 0, 255 ) )

bSizer13.Add( self.cancel_downloads, 0, wx.ALL, 5 )

self.close = TextButton( self, wx.ID_ANY, u"X", wx.DefaultPosition, wx.DefaultSize, 0 )
self.close.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 70, 90, 92, False, wx.EmptyString ) )
self.close.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, wx.EmptyString ) )
self.close.SetForegroundColour( wx.Colour( 0, 0, 255 ) )
self.close.SetToolTipString( u"Close" )

Expand Down Expand Up @@ -610,33 +610,33 @@ def __init__( self, parent ):

sbSizer1 = wx.StaticBoxSizer( wx.StaticBox( self.m_panel3, wx.ID_ANY, u"Days available" ), wx.HORIZONTAL )

self.day1 = wx.CheckBox( self.m_panel3, wx.ID_ANY, u"Mon", wx.DefaultPosition, wx.DefaultSize, 0 )
self.day1 = wx.CheckBox( sbSizer1.GetStaticBox(), wx.ID_ANY, u"Mon", wx.DefaultPosition, wx.DefaultSize, 0 )
sbSizer1.Add( self.day1, 0, wx.ALL, 5 )

self.day2 = wx.CheckBox( self.m_panel3, wx.ID_ANY, u"Tue", wx.DefaultPosition, wx.DefaultSize, 0 )
self.day2 = wx.CheckBox( sbSizer1.GetStaticBox(), wx.ID_ANY, u"Tue", wx.DefaultPosition, wx.DefaultSize, 0 )
sbSizer1.Add( self.day2, 0, wx.ALL, 5 )

self.day3 = wx.CheckBox( self.m_panel3, wx.ID_ANY, u"Wed", wx.DefaultPosition, wx.DefaultSize, 0 )
self.day3 = wx.CheckBox( sbSizer1.GetStaticBox(), wx.ID_ANY, u"Wed", wx.DefaultPosition, wx.DefaultSize, 0 )
sbSizer1.Add( self.day3, 0, wx.ALL, 5 )

self.day4 = wx.CheckBox( self.m_panel3, wx.ID_ANY, u"Thu", wx.DefaultPosition, wx.DefaultSize, 0 )
self.day4 = wx.CheckBox( sbSizer1.GetStaticBox(), wx.ID_ANY, u"Thu", wx.DefaultPosition, wx.DefaultSize, 0 )
sbSizer1.Add( self.day4, 0, wx.ALL, 5 )

self.day5 = wx.CheckBox( self.m_panel3, wx.ID_ANY, u"Fri", wx.DefaultPosition, wx.DefaultSize, 0 )
self.day5 = wx.CheckBox( sbSizer1.GetStaticBox(), wx.ID_ANY, u"Fri", wx.DefaultPosition, wx.DefaultSize, 0 )
sbSizer1.Add( self.day5, 0, wx.ALL, 5 )

self.day6 = wx.CheckBox( self.m_panel3, wx.ID_ANY, u"Sat", wx.DefaultPosition, wx.DefaultSize, 0 )
self.day6 = wx.CheckBox( sbSizer1.GetStaticBox(), wx.ID_ANY, u"Sat", wx.DefaultPosition, wx.DefaultSize, 0 )
sbSizer1.Add( self.day6, 0, wx.ALL, 5 )

self.day7 = wx.CheckBox( self.m_panel3, wx.ID_ANY, u"Sun", wx.DefaultPosition, wx.DefaultSize, 0 )
self.day7 = wx.CheckBox( sbSizer1.GetStaticBox(), wx.ID_ANY, u"Sun", wx.DefaultPosition, wx.DefaultSize, 0 )
sbSizer1.Add( self.day7, 0, wx.ALL, 5 )


bSizer26.Add( sbSizer1, 0, wx.EXPAND|wx.ALL, 5 )

self.m_staticText122 = wx.StaticText( self.m_panel3, wx.ID_ANY, u"Date format codes for puzzle URL and filename:", wx.DefaultPosition, wx.DefaultSize, 0 )
self.m_staticText122.Wrap( -1 )
self.m_staticText122.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 70, 90, 90, False, wx.EmptyString ) )
self.m_staticText122.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, wx.EmptyString ) )

bSizer26.Add( self.m_staticText122, 0, wx.TOP|wx.RIGHT|wx.LEFT, 5 )

Expand Down Expand Up @@ -714,7 +714,7 @@ def __init__( self, parent ):

self.m_staticText37 = wx.StaticText( self.m_panel4, wx.ID_ANY, u"Note: Authentication may not work for every source. Login is attempted via an HTML form. Any cookies set after a successful login are saved and used to download puzzles.", wx.DefaultPosition, wx.DefaultSize, 0 )
self.m_staticText37.Wrap( 325 )
self.m_staticText37.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 70, 93, 90, False, wx.EmptyString ) )
self.m_staticText37.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_ITALIC, wx.FONTWEIGHT_NORMAL, False, wx.EmptyString ) )

bSizer29.Add( self.m_staticText37, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 5 )

Expand All @@ -731,7 +731,7 @@ def __init__( self, parent ):

self.custom_func_message = wx.StaticText( self.m_panel6, wx.ID_ANY, u"This source uses a custom download function! Not all changes you make in this dialog may have the desired effect. Click to view the function.", wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_CENTRE )
self.custom_func_message.Wrap( 250 )
self.custom_func_message.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 70, 90, 92, False, wx.EmptyString ) )
self.custom_func_message.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, wx.EmptyString ) )
self.custom_func_message.SetBackgroundColour( wx.Colour( 255, 255, 0 ) )
self.custom_func_message.Hide()

Expand Down Expand Up @@ -759,7 +759,7 @@ def __init__( self, parent ):

self.m_staticText21 = wx.StaticText( self.custom_func_panel, wx.ID_ANY, u"Don't edit this function unless you know what you're doing.", wx.DefaultPosition, wx.DefaultSize, 0 )
self.m_staticText21.Wrap( -1 )
self.m_staticText21.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 70, 90, 92, False, wx.EmptyString ) )
self.m_staticText21.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, wx.EmptyString ) )

bSizer34.Add( self.m_staticText21, 0, wx.ALL, 5 )

Expand All @@ -768,13 +768,13 @@ def __init__( self, parent ):

self.m_staticText40 = wx.StaticText( self.m_panel8, wx.ID_ANY, u"function(puzzle)", wx.DefaultPosition, wx.DefaultSize, 0 )
self.m_staticText40.Wrap( -1 )
self.m_staticText40.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 76, 90, 90, False, wx.EmptyString ) )
self.m_staticText40.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_TELETYPE, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, wx.EmptyString ) )
self.m_staticText40.SetForegroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_GRAYTEXT ) )

bSizer32.Add( self.m_staticText40, 0, wx.EXPAND, 5 )

self.func = wx.TextCtrl( self.m_panel8, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.TE_DONTWRAP|wx.TE_MULTILINE|wx.NO_BORDER )
self.func.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), 76, 90, 90, False, wx.EmptyString ) )
self.func.SetFont( wx.Font( wx.NORMAL_FONT.GetPointSize(), wx.FONTFAMILY_TELETYPE, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, wx.EmptyString ) )

bSizer32.Add( self.func, 1, wx.EXPAND, 5 )

Expand Down
2 changes: 1 addition & 1 deletion scripts/download/manager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ M:connect{
wx.wxDefaultPosition, wx.wxDefaultSize, flags)
values[label] = ctrl
ctrl:SetMinSize(wx.wxSize(200, -1))
sizer:Add(ctrl, 1, wx.wxALIGN_CENTER_VERTICAL + wx.wxEXPAND)
sizer:Add(ctrl, 1, wx.wxEXPAND)
end
-- Prompt
dlg:Fit()
Expand Down
11 changes: 7 additions & 4 deletions scripts/xworddebug/py2lua.lua
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ local function convert(filename, writefile, luafile)
local f = assert(io.open(filename, 'r'))
local text = f:read('*a')
f:close()

-- Use unix newlines
text = text:gsub('\r\n', '\n')

-- Remove coding
text = text:gsub('#.-coding:.-\n', '\n')
Expand Down Expand Up @@ -213,7 +216,7 @@ local function convert(filename, writefile, luafile)
if not luafile then
luafile = filename:gsub('%.py', '%.lua')
end
f = io.open(luafile, 'w')
f = io.open(luafile, 'wb')
-- Keep track of filename and modification time
f:write(([[
-- Converted from python by py2lua
Expand Down Expand Up @@ -315,8 +318,8 @@ local function is_modified(luafile)
local f = io.open(luafile, 'r')
if f then
f:read("*line") -- py2lua line
local pyfile = f:read("*line"):match("--.*:%s+(.*)") -- python file
local mtime = tonumber(f:read("*line"):match("--.*:%s+(.*)")) -- modified time
local pyfile = f:read("*line"):match("--.*:%s+(.*%.py)") -- python file
local mtime = tonumber(f:read("*line"):match("--.*:%s+(%d*)")) -- modified time
f:close()
if pyfile and mtime then
-- Get the full path of the python file
Expand Down Expand Up @@ -391,4 +394,4 @@ else
end
return old_require(modname)
end
end
end
2 changes: 1 addition & 1 deletion scripts/xworddebug/wxFB.fbp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
<FileVersion major="1" minor="11" />
<FileVersion major="1" minor="13" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">Python</property>
Expand Down
104 changes: 52 additions & 52 deletions scripts/xworddebug/wxFB.lua
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
-- Converted from python by py2lua
-- python file: wxFB.py
-- modtime: 1475969738
-- ----------------------------------

local wxfb = {} -- Table to hold classes

---------------------------------------------------------------------------
-- Python code generated with wxFormBuilder (version Nov 6 2013)
-- http://www.wxformbuilder.org/
--
-- PLEASE DO "NOT" EDIT THIS FILE!
---------------------------------------------------------------------------

---------------------------------------------------------------------------
-- Class DebugDialog
---------------------------------------------------------------------------

function wxfb.DebugDialog(parent)

local self = wx.wxFrame ( parent, wx.wxID_ANY, "Lua Debug", wx.wxDefaultPosition, wx.wxSize( 400,600 ), wx.wxDEFAULT_FRAME_STYLE+wx.wxFRAME_FLOAT_ON_PARENT+wx.wxFRAME_TOOL_WINDOW+wx.wxTAB_TRAVERSAL )

self:SetSizeHints( wx.wxDefaultSize, wx.wxDefaultSize )

local bSizer1 = wx.wxBoxSizer( wx.wxVERTICAL )

self.panel = wx.wxPanel( self, wx.wxID_ANY, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxTAB_TRAVERSAL )
local bSizer2 = wx.wxBoxSizer( wx.wxVERTICAL )

self.text = wx.wxTextCtrl( self.panel, wx.wxID_ANY, "", wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxHSCROLL+wx.wxTE_MULTILINE )
self.text:SetFont( wx.wxFont( 8, 75, 90, 90, false, "Consolas" ) )

bSizer2:Add( self.text, 1, wx.wxALL+wx.wxEXPAND, 5 )


self.panel:SetSizer( bSizer2 )
self.panel:Layout()
bSizer2:Fit( self.panel )
bSizer1:Add( self.panel, 1, wx.wxEXPAND, 5 )


self:SetSizer( bSizer1 )
self:Layout()

self:Centre( wx.wxBOTH )

-- Connect Events
self:Connect(wx.wxEVT_CLOSE_WINDOW, function(evt) self:Hide(evt) end)

return self
end

-- Converted from python by py2lua
-- python file: wxFB.py
-- modtime: 1477182147
-- ----------------------------------

local wxfb = {} -- Table to hold classes

---------------------------------------------------------------------------
-- Python code generated with wxFormBuilder (version Oct 10 2016)
-- http://www.wxformbuilder.org/
--
-- PLEASE DO "NOT" EDIT THIS FILE!
---------------------------------------------------------------------------

---------------------------------------------------------------------------
-- Class DebugDialog
---------------------------------------------------------------------------

function wxfb.DebugDialog(parent)

local self = wx.wxFrame ( parent, wx.wxID_ANY, "Lua Debug", wx.wxDefaultPosition, wx.wxSize( 400,600 ), wx.wxDEFAULT_FRAME_STYLE+wx.wxFRAME_FLOAT_ON_PARENT+wx.wxFRAME_TOOL_WINDOW+wx.wxTAB_TRAVERSAL )

self:SetSizeHints( wx.wxDefaultSize, wx.wxDefaultSize )

local bSizer1 = wx.wxBoxSizer( wx.wxVERTICAL )

self.panel = wx.wxPanel( self, wx.wxID_ANY, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxTAB_TRAVERSAL )
local bSizer2 = wx.wxBoxSizer( wx.wxVERTICAL )

self.text = wx.wxTextCtrl( self.panel, wx.wxID_ANY, "", wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxHSCROLL+wx.wxTE_MULTILINE )
self.text:SetFont( wx.wxFont( 8, wx.wxFONTFAMILY_MODERN, wx.wxFONTSTYLE_NORMAL, wx.wxFONTWEIGHT_NORMAL, false, "Consolas" ) )

bSizer2:Add( self.text, 1, wx.wxALL+wx.wxEXPAND, 5 )


self.panel:SetSizer( bSizer2 )
self.panel:Layout()
bSizer2:Fit( self.panel )
bSizer1:Add( self.panel, 1, wx.wxEXPAND, 5 )


self:SetSizer( bSizer1 )
self:Layout()

self:Centre( wx.wxBOTH )

-- Connect Events
self:Connect(wx.wxEVT_CLOSE_WINDOW, function(evt) self:Hide(evt) end)

return self
end

return wxfb
4 changes: 2 additions & 2 deletions scripts/xworddebug/wxFB.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

###########################################################################
## Python code generated with wxFormBuilder (version Nov 6 2013)
## Python code generated with wxFormBuilder (version Oct 10 2016)
## http://www.wxformbuilder.org/
##
## PLEASE DO "NOT" EDIT THIS FILE!
Expand All @@ -27,7 +27,7 @@ def __init__( self, parent ):
bSizer2 = wx.BoxSizer( wx.VERTICAL )

self.text = wx.TextCtrl( self.panel, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.HSCROLL|wx.TE_MULTILINE )
self.text.SetFont( wx.Font( 8, 75, 90, 90, False, "Consolas" ) )
self.text.SetFont( wx.Font( 8, wx.FONTFAMILY_MODERN, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, "Consolas" ) )

bSizer2.Add( self.text, 1, wx.ALL|wx.EXPAND, 5 )

Expand Down

0 comments on commit 7cbacbd

Please sign in to comment.