--- a/IDEFrame.py Tue Jul 03 17:09:11 2018 +0300
+++ b/IDEFrame.py Wed Jul 04 16:41:02 2018 +0300
@@ -72,7 +72,8 @@
ID_PLCOPENEDITORDISPLAYMENURESETPERSPECTIVE,
ID_PLCOPENEDITORDISPLAYMENUSWITCHPERSPECTIVE,
-] = [wx.NewId() for _init_coll_DisplayMenu_Items in range(2)]
+ ID_PLCOPENEDITORDISPLAYMENUFULLSCREEN, +] = [wx.NewId() for _init_coll_DisplayMenu_Items in range(3)] # -------------------------------------------------------------------------------
# EditorToolBar definitions
@@ -427,7 +428,8 @@
(wx.ID_COPY, "copy", _(u'Copy'), None),
(wx.ID_PASTE, "paste", _(u'Paste'), None),
- (ID_PLCOPENEDITOREDITMENUSEARCHINPROJECT, "find", _(u'Search in Project'), None)])
+ (ID_PLCOPENEDITOREDITMENUSEARCHINPROJECT, "find", _(u'Search in Project'), None), + (ID_PLCOPENEDITORDISPLAYMENUFULLSCREEN, "fullscreen", _(u'Toggle fullscreen mode'), None)]) def _init_coll_DisplayMenu_Items(self, parent):
AppendMenu(parent, help='', id=wx.ID_REFRESH,
@@ -447,7 +449,11 @@
AppendMenu(parent, help='', id=ID_PLCOPENEDITORDISPLAYMENUSWITCHPERSPECTIVE,
kind=wx.ITEM_NORMAL, text=_(u'Switch perspective') + '\tF12')
- self.Bind(wx.EVT_MENU, self.SwitchFullScrMode, id=ID_PLCOPENEDITORDISPLAYMENUSWITCHPERSPECTIVE)
+ self.Bind(wx.EVT_MENU, self.SwitchPerspective, id=ID_PLCOPENEDITORDISPLAYMENUSWITCHPERSPECTIVE) + AppendMenu(parent, help='', id=ID_PLCOPENEDITORDISPLAYMENUFULLSCREEN, + kind=wx.ITEM_NORMAL, text=_(u'Full screen') + '\tShift-F12') + self.Bind(wx.EVT_MENU, self.SwitchFullScrMode, id=ID_PLCOPENEDITORDISPLAYMENUFULLSCREEN) AppendMenu(parent, help='', id=ID_PLCOPENEDITORDISPLAYMENURESETPERSPECTIVE,
kind=wx.ITEM_NORMAL, text=_(u'Reset Perspective'))
@@ -1484,11 +1490,11 @@
def OnTabsOpenedDClick(event):
pos = event.GetPosition()
if tabctrl.TabHitTest(pos.x, pos.y, None):
- self.SwitchFullScrMode(event)
+ self.SwitchPerspective(event) return OnTabsOpenedDClick
- def SwitchFullScrMode(self, evt):
+ def SwitchPerspective(self, evt): pane = self.AUIManager.GetPane(self.TabsOpened)
self.AUIManager.RestorePane(pane)
@@ -1496,6 +1502,10 @@
self.AUIManager.MaximizePane(pane)
+ def SwitchFullScrMode(self, evt): + show = not self.IsFullScreen() + self.ShowFullScreen(show) # -------------------------------------------------------------------------------
# Types Tree Management Functions
# -------------------------------------------------------------------------------
--- a/images/icons.svg Tue Jul 03 17:09:11 2018 +0300
+++ b/images/icons.svg Wed Jul 04 16:41:02 2018 +0300
@@ -43,15 +43,17 @@
- inkscape:zoom="3.7617187"
- inkscape:cx="555.19855"
- inkscape:cy="478.48693"
+ inkscape:zoom="2.5873931" + inkscape:cx="986.14665" + inkscape:cy="698.07857" inkscape:current-layer="svg2"
inkscape:guide-bbox="true"
- inkscape:window-maximized="1">
+ inkscape:window-maximized="1" + inkscape:measure-start="904.956,703.964" + inkscape:measure-end="930.144,704.058"> @@ -63,6 +65,47 @@
+ inkscape:collect="always" + id="linearGradient16168"> + style="stop-color:#469837;stop-opacity:0" + style="stop-color:#469837;stop-opacity:1" + gradientTransform="matrix(0.29669,0,0,0.35207,1.8805,2.1186)" + gradientUnits="userSpaceOnUse" + id="linearGradient2929-8"> + style="stop-color:#fff;stop-opacity:.2" + style="stop-color:#fff;stop-opacity:0" + inkscape:collect="always" + id="linearGradient28187-2"> + style="stop-color:#000000;stop-opacity:1;" + style="stop-color:#000000;stop-opacity:0;" id="linearGradient47318">
@@ -11804,7 +11847,7 @@
style="stop-color:#003399;stop-opacity:1"
@@ -11829,7 +11872,7 @@
style="stop-color:#0068c6;stop-opacity:1"
@@ -11845,7 +11888,7 @@
style="stop-color:#0093dd;stop-opacity:0"
@@ -11854,8 +11897,7 @@
xlink:href="#linearGradient1556"
gradientUnits="userSpaceOnUse"
@@ -11883,7 +11925,7 @@
style="stop-color:#ccebff;stop-opacity:1"
@@ -11892,8 +11934,7 @@
xlink:href="#linearGradient2186"
gradientUnits="userSpaceOnUse"
@@ -11909,7 +11950,7 @@
style="stop-color:#a4cdec;stop-opacity:1"
@@ -26996,7 +27037,7 @@
style="stop-color:#ffb300;stop-opacity:1"
@@ -27025,7 +27066,7 @@
style="stop-color:#ffd700;stop-opacity:1"
@@ -27066,7 +27107,7 @@
style="stop-color:#ffb300;stop-opacity:1"
@@ -27076,8 +27117,7 @@
xlink:href="#linearGradient18210"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9999,-1.38e-2,1.38e-2,0.9999,-9.362,7.5474)"
@@ -30371,7 +30411,7 @@
style="stop-color:#001b7b;stop-opacity:1"
@@ -30387,7 +30427,7 @@
style="stop-color:#3c5cb2;stop-opacity:1"
@@ -30407,7 +30447,7 @@
style="stop-color:#003399;stop-opacity:1"
@@ -30432,7 +30472,7 @@
style="stop-color:#0068c6;stop-opacity:1"
@@ -30448,7 +30488,7 @@
style="stop-color:#0093dd;stop-opacity:0"
@@ -30457,8 +30497,7 @@
xlink:href="#linearGradient1556"
gradientUnits="userSpaceOnUse"
@@ -30486,7 +30525,7 @@
style="stop-color:#ccebff;stop-opacity:1"
@@ -30495,8 +30534,7 @@
xlink:href="#linearGradient2186"
gradientUnits="userSpaceOnUse"
@@ -30512,7 +30550,7 @@
style="stop-color:#a4cdec;stop-opacity:1"
@@ -45445,7 +45483,7 @@
style="stop-color:#ffb300;stop-opacity:1"
@@ -45474,7 +45512,7 @@
style="stop-color:#ffd700;stop-opacity:1"
@@ -45515,7 +45553,7 @@
style="stop-color:#ffb300;stop-opacity:1"
@@ -45525,8 +45563,7 @@
xlink:href="#linearGradient20002"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9999,-1.38e-2,1.38e-2,0.9999,-9.362,7.5474)"
@@ -45817,7 +45854,7 @@
style="stop-color:#001b7b;stop-opacity:1"
@@ -45833,7 +45870,7 @@
style="stop-color:#3c5cb2;stop-opacity:1"
@@ -45853,7 +45890,7 @@
style="stop-color:#003399;stop-opacity:1"
@@ -45878,7 +45915,7 @@
style="stop-color:#0068c6;stop-opacity:1"
@@ -45894,7 +45931,7 @@
style="stop-color:#0093dd;stop-opacity:0"
@@ -45903,8 +45940,7 @@
xlink:href="#linearGradient1556"
gradientUnits="userSpaceOnUse"
@@ -45932,7 +45968,7 @@
style="stop-color:#ccebff;stop-opacity:1"
@@ -45941,8 +45977,7 @@
xlink:href="#linearGradient2186"
gradientUnits="userSpaceOnUse"
@@ -45951,8 +45986,7 @@
xlink:href="#linearGradient2503"
gradientUnits="userSpaceOnUse"
@@ -47138,7 +47172,7 @@
style="stop-color:#001b7b;stop-opacity:1"
@@ -47154,7 +47188,7 @@
style="stop-color:#3c5cb2;stop-opacity:1"
@@ -47174,7 +47208,7 @@
style="stop-color:#003399;stop-opacity:1"
@@ -47199,7 +47233,7 @@
style="stop-color:#0068c6;stop-opacity:1"
@@ -47215,7 +47249,7 @@
style="stop-color:#0093dd;stop-opacity:0"
@@ -47224,8 +47258,7 @@
xlink:href="#linearGradient1556"
gradientUnits="userSpaceOnUse"
@@ -47253,7 +47286,7 @@
style="stop-color:#ccebff;stop-opacity:1"
@@ -47262,8 +47295,7 @@
xlink:href="#linearGradient2186"
gradientUnits="userSpaceOnUse"
@@ -47279,7 +47311,7 @@
style="stop-color:#a4cdec;stop-opacity:1"
@@ -62399,7 +62431,7 @@
style="stop-color:#ffb300;stop-opacity:1"
@@ -62428,7 +62460,7 @@
style="stop-color:#ffd700;stop-opacity:1"
@@ -62469,7 +62501,7 @@
style="stop-color:#ffb300;stop-opacity:1"
@@ -62479,8 +62511,7 @@
xlink:href="#linearGradient18210"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9999,-1.38e-2,1.38e-2,0.9999,-9.362,7.5474)"
@@ -66853,7 +66884,7 @@
style="stop-color:#ffb300;stop-opacity:1"
@@ -66882,7 +66913,7 @@
style="stop-color:#ffd700;stop-opacity:1"
@@ -66923,7 +66954,7 @@
style="stop-color:#ffb300;stop-opacity:1"
@@ -66940,7 +66971,7 @@
style="stop-color:#ffffff;stop-opacity:0.00549451"
@@ -86765,7 +86796,7 @@
- id="linearGradient2929-8"
+ id="linearGradient2929-8-0" gradientUnits="userSpaceOnUse"
@@ -87317,6 +87348,100 @@
id="feGaussianBlur23088" />
+ id="radialGradient2553-7-9" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.69,0,0,1.0436,-5.449,0.96175)" + style="stop-color:#f0c178" + style="stop-color:#e18941" + style="stop-color:#ec4f18" + id="radialGradient2550-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.016802,1.3943,-1.7966,-0.021651,14.152,2.1566)" + style="stop-color:#fff" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + id="linearGradient3262-6-3" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-17.058)" + style="stop-color:#f6f6f6" + style="stop-color:#ccc" + id="linearGradient3264-0-2" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-17.058)" + style="stop-color:#aaa" + style="stop-color:#8c8c8c" + inkscape:collect="always" + xlink:href="#linearGradient28187-2" + id="radialGradient28189" + gradientTransform="matrix(1,0,0,1.0005911,0,-0.06603901)" + gradientUnits="userSpaceOnUse" /> + inkscape:collect="always" + xlink:href="#linearGradient16168" + id="radialGradient16170" + gradientTransform="matrix(0.95160132,-0.01357563,0.01391374,0.97645493,3.8528826,4.1473681)" + gradientUnits="userSpaceOnUse" /> @@ -92664,7 +92789,7 @@
inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2929-8);fill-rule:evenodd"
+ style="fill:url(#linearGradient2929-8-0);fill-rule:evenodd" d="M 2.8355,4 C 2.37891,4 2.00106,4.44838 2.00106,4.9902 v 5.6331 c 0.00175,0.10077 0.044034,0.21567 0.11126,0.28606 0.067223,0.07039 0.15315,0.10008 0.25033,0.08802 0.00309,9.4e-5 0.00618,9.4e-5 0.00927,0 l 13.351,-2.5081 c 0.1548,-0.028972 0.27598,-0.18812 0.27815,-0.37407 v -3.1246 c 0,-0.54182 -0.37785,-0.9902 -0.83444,-0.9902 h -12.331 z" />
inkscape:connector-curvature="0"
@@ -93125,4 +93250,69 @@
id="tspan3174-7">Free Software for Automation </tspan></text>
+ transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="translate(960.38982,282.02716)" + transform="matrix(0.10746862,0,0,0.10740514,888.79666,364.22053)" + inkscape:connector-curvature="0" + style="opacity:1;fill:url(#radialGradient16170);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:0" + d="M 55.391,29.571 66.976,18.603 C 74.717,10.987 72.715,2.396 62.515,0.009 H 13.448 C 5.313,0.304 -0.131,2.762 0.138,13.516 L 0.066,62.637 c 2.065,10.128 9.136,12.104 15.733,4.398 L 28.823,54.726 69.988,95.873 c 3.576,3.567 9.377,3.576 12.944,0.018 L 95.867,82.956 c 3.567,-3.558 3.558,-9.368 -0.009,-12.935 0,0 -40.467,-40.45 -40.467,-40.45 z m 27.291,98.313 c -3.549,-3.558 -9.341,-3.558 -12.899,0.018 l -41.04,41.004 -12.989,-12.291 c -6.57,-7.688 -13.623,-5.712 -15.688,4.38 L 0.146,210 c -0.259,10.691 5.149,13.176 13.275,13.453 h 48.951 c 10.155,-2.405 12.157,-10.959 4.443,-18.531 L 55.266,193.989 95.582,153.655 c 3.558,-3.558 3.567,-9.35 0.009,-12.89 -10e-4,0 -12.909,-12.881 -12.909,-12.881 z M 140.76,95.882 c 3.549,3.558 9.35,3.549 12.908,-0.018 l 41.049,-41.147 12.989,12.309 c 6.552,7.706 13.605,5.73 15.67,-4.398 L 223.304,13.507 C 223.564,2.753 218.137,0.295 210.031,0 h -48.987 c -10.164,2.396 -12.113,10.986 -4.398,18.594 l 11.567,10.977 -40.343,40.432 c -3.558,3.567 -3.558,9.377 0,12.935 0,0 12.89,12.944 12.89,12.944 z m 66.982,60.724 -12.953,12.291 -40.906,-41.004 c -3.558,-3.576 -9.341,-3.576 -12.872,-0.018 l -12.863,12.881 c -3.54,3.54 -3.531,9.333 0.018,12.89 l 40.199,40.316 -11.54,10.951 c -7.679,7.589 -5.712,16.153 4.416,18.531 h 48.835 c 8.09,-0.277 13.525,-2.762 13.239,-13.453 l 0.072,-49.005 c -2.067,-10.084 -9.102,-12.059 -15.645,-4.38 z" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12.76000023px;line-height:1.25">%% fullscreen %%</tspan></text>