Skip to content

Commit 54e4aad

Browse files
committed
New Web-based Learn tab
interface, form.fpb + new Learn tab + simple browser navigation buttons (back, forward, home) + IDs for navigation buttons and version list + warning label and open in default browser link button interface_derived + Event handlers for navigating forward, backwards, home, and when navigating to a page finishes + After 5 minutes, the web view deallocates itself to save CPU and memory + when the tab loads, the web view loads the last page before deallocation
1 parent 49a0d7d commit 54e4aad

File tree

5 files changed

+275
-30
lines changed

5 files changed

+275
-30
lines changed

source/form.fbp

Lines changed: 147 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<property name="font"></property>
9292
<property name="gripper">0</property>
9393
<property name="hidden">0</property>
94-
<property name="id">wxID_ANY</property>
94+
<property name="id">NOTEBOOK</property>
9595
<property name="max_size"></property>
9696
<property name="maximize_button">0</property>
9797
<property name="maximum_size"></property>
@@ -1333,7 +1333,7 @@
13331333
<property name="minimum_size"></property>
13341334
<property name="name">learnSizer</property>
13351335
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
1336-
<property name="permission">none</property>
1336+
<property name="permission">protected</property>
13371337
<property name="vgap">0</property>
13381338
<object class="gbsizeritem" expanded="1">
13391339
<property name="border">5</property>
@@ -1374,7 +1374,7 @@
13741374
<property name="font"></property>
13751375
<property name="gripper">0</property>
13761376
<property name="hidden">0</property>
1377-
<property name="id">wxID_ANY</property>
1377+
<property name="id">Nav_Back</property>
13781378
<property name="label">&lt;</property>
13791379
<property name="margins"></property>
13801380
<property name="markup">0</property>
@@ -1412,9 +1412,9 @@
14121412
</object>
14131413
<object class="gbsizeritem" expanded="1">
14141414
<property name="border">5</property>
1415-
<property name="colspan">1</property>
1415+
<property name="colspan">2</property>
14161416
<property name="column">3</property>
1417-
<property name="flag">wxALL</property>
1417+
<property name="flag">wxALL|wxEXPAND</property>
14181418
<property name="row">0</property>
14191419
<property name="rowspan">1</property>
14201420
<object class="wxStaticText" expanded="1">
@@ -1445,7 +1445,7 @@
14451445
<property name="gripper">0</property>
14461446
<property name="hidden">0</property>
14471447
<property name="id">wxID_ANY</property>
1448-
<property name="label">Title</property>
1448+
<property name="label">Loading Page</property>
14491449
<property name="markup">0</property>
14501450
<property name="max_size"></property>
14511451
<property name="maximize_button">0</property>
@@ -1464,7 +1464,7 @@
14641464
<property name="resize">Resizable</property>
14651465
<property name="show">1</property>
14661466
<property name="size"></property>
1467-
<property name="style"></property>
1467+
<property name="style">wxALIGN_LEFT|wxST_ELLIPSIZE_END|wxST_NO_AUTORESIZE</property>
14681468
<property name="subclass">; ; forward_declare</property>
14691469
<property name="toolbar_pane">0</property>
14701470
<property name="tooltip"></property>
@@ -1513,7 +1513,7 @@
15131513
<property name="font"></property>
15141514
<property name="gripper">0</property>
15151515
<property name="hidden">0</property>
1516-
<property name="id">wxID_ANY</property>
1516+
<property name="id">Nav_Forward</property>
15171517
<property name="label">&gt;</property>
15181518
<property name="margins"></property>
15191519
<property name="markup">0</property>
@@ -1588,7 +1588,7 @@
15881588
<property name="font"></property>
15891589
<property name="gripper">0</property>
15901590
<property name="hidden">0</property>
1591-
<property name="id">wxID_ANY</property>
1591+
<property name="id">Nav_Home</property>
15921592
<property name="label">Home</property>
15931593
<property name="margins"></property>
15941594
<property name="markup">0</property>
@@ -1638,6 +1638,144 @@
16381638
<property name="permission">protected</property>
16391639
</object>
16401640
</object>
1641+
<object class="gbsizeritem" expanded="1">
1642+
<property name="border">5</property>
1643+
<property name="colspan">4</property>
1644+
<property name="column">0</property>
1645+
<property name="flag">wxEXPAND</property>
1646+
<property name="row">2</property>
1647+
<property name="rowspan">1</property>
1648+
<object class="wxBoxSizer" expanded="1">
1649+
<property name="minimum_size"></property>
1650+
<property name="name">warningSizer</property>
1651+
<property name="orient">wxHORIZONTAL</property>
1652+
<property name="permission">none</property>
1653+
<object class="sizeritem" expanded="1">
1654+
<property name="border">5</property>
1655+
<property name="flag">wxALL</property>
1656+
<property name="proportion">0</property>
1657+
<object class="wxStaticText" expanded="1">
1658+
<property name="BottomDockable">1</property>
1659+
<property name="LeftDockable">1</property>
1660+
<property name="RightDockable">1</property>
1661+
<property name="TopDockable">1</property>
1662+
<property name="aui_layer"></property>
1663+
<property name="aui_name"></property>
1664+
<property name="aui_position"></property>
1665+
<property name="aui_row"></property>
1666+
<property name="best_size"></property>
1667+
<property name="bg"></property>
1668+
<property name="caption"></property>
1669+
<property name="caption_visible">1</property>
1670+
<property name="center_pane">0</property>
1671+
<property name="close_button">1</property>
1672+
<property name="context_help"></property>
1673+
<property name="context_menu">1</property>
1674+
<property name="default_pane">0</property>
1675+
<property name="dock">Dock</property>
1676+
<property name="dock_fixed">0</property>
1677+
<property name="docking">Left</property>
1678+
<property name="enabled">1</property>
1679+
<property name="fg"></property>
1680+
<property name="floatable">1</property>
1681+
<property name="font">,90,90,10,70,0</property>
1682+
<property name="gripper">0</property>
1683+
<property name="hidden">0</property>
1684+
<property name="id">wxID_ANY</property>
1685+
<property name="label">Do not use to fill forms or sign into accounts</property>
1686+
<property name="markup">0</property>
1687+
<property name="max_size"></property>
1688+
<property name="maximize_button">0</property>
1689+
<property name="maximum_size"></property>
1690+
<property name="min_size"></property>
1691+
<property name="minimize_button">0</property>
1692+
<property name="minimum_size"></property>
1693+
<property name="moveable">1</property>
1694+
<property name="name">m_staticText9</property>
1695+
<property name="pane_border">1</property>
1696+
<property name="pane_position"></property>
1697+
<property name="pane_size"></property>
1698+
<property name="permission">none</property>
1699+
<property name="pin_button">1</property>
1700+
<property name="pos"></property>
1701+
<property name="resize">Resizable</property>
1702+
<property name="show">1</property>
1703+
<property name="size"></property>
1704+
<property name="style"></property>
1705+
<property name="subclass">; ; forward_declare</property>
1706+
<property name="toolbar_pane">0</property>
1707+
<property name="tooltip"></property>
1708+
<property name="window_extra_style"></property>
1709+
<property name="window_name"></property>
1710+
<property name="window_style"></property>
1711+
<property name="wrap">-1</property>
1712+
</object>
1713+
</object>
1714+
<object class="sizeritem" expanded="1">
1715+
<property name="border">5</property>
1716+
<property name="flag">wxALL</property>
1717+
<property name="proportion">0</property>
1718+
<object class="wxHyperlinkCtrl" expanded="1">
1719+
<property name="BottomDockable">1</property>
1720+
<property name="LeftDockable">1</property>
1721+
<property name="RightDockable">1</property>
1722+
<property name="TopDockable">1</property>
1723+
<property name="aui_layer"></property>
1724+
<property name="aui_name"></property>
1725+
<property name="aui_position"></property>
1726+
<property name="aui_row"></property>
1727+
<property name="best_size"></property>
1728+
<property name="bg"></property>
1729+
<property name="caption"></property>
1730+
<property name="caption_visible">1</property>
1731+
<property name="center_pane">0</property>
1732+
<property name="close_button">1</property>
1733+
<property name="context_help"></property>
1734+
<property name="context_menu">1</property>
1735+
<property name="default_pane">0</property>
1736+
<property name="dock">Dock</property>
1737+
<property name="dock_fixed">0</property>
1738+
<property name="docking">Left</property>
1739+
<property name="enabled">1</property>
1740+
<property name="fg"></property>
1741+
<property name="floatable">1</property>
1742+
<property name="font">,90,90,10,70,0</property>
1743+
<property name="gripper">0</property>
1744+
<property name="hidden">0</property>
1745+
<property name="hover_color"></property>
1746+
<property name="id">wxID_ANY</property>
1747+
<property name="label">Open current page in default browser</property>
1748+
<property name="max_size"></property>
1749+
<property name="maximize_button">0</property>
1750+
<property name="maximum_size"></property>
1751+
<property name="min_size"></property>
1752+
<property name="minimize_button">0</property>
1753+
<property name="minimum_size"></property>
1754+
<property name="moveable">1</property>
1755+
<property name="name">openInBrowserCtrl</property>
1756+
<property name="normal_color"></property>
1757+
<property name="pane_border">1</property>
1758+
<property name="pane_position"></property>
1759+
<property name="pane_size"></property>
1760+
<property name="permission">protected</property>
1761+
<property name="pin_button">1</property>
1762+
<property name="pos"></property>
1763+
<property name="resize">Resizable</property>
1764+
<property name="show">1</property>
1765+
<property name="size"></property>
1766+
<property name="style">wxHL_DEFAULT_STYLE</property>
1767+
<property name="subclass">; ; forward_declare</property>
1768+
<property name="toolbar_pane">0</property>
1769+
<property name="tooltip"></property>
1770+
<property name="url"></property>
1771+
<property name="visited_color"></property>
1772+
<property name="window_extra_style"></property>
1773+
<property name="window_name"></property>
1774+
<property name="window_style"></property>
1775+
</object>
1776+
</object>
1777+
</object>
1778+
</object>
16411779
</object>
16421780
</object>
16431781
</object>

0 commit comments

Comments
 (0)