--- a/Beremiz.py Tue Jun 19 21:59:34 2012 +0200
+++ b/Beremiz.py Fri Jul 06 21:00:43 2012 +0200
@@ -85,7 +85,7 @@
wx.InitAllImageHandlers()
- bmp = wx.Image(Bpath("images","splash.png")).ConvertToBitmap()
+ bmp = wx.Image(Bpath("images", "splash.png")).ConvertToBitmap() #splash=AdvancedSplash(None, bitmap=bmp, style=wx.SPLASH_CENTRE_ON_SCREEN, timeout=4000)
splash=AdvancedSplash(None, bitmap=bmp)
@@ -145,10 +145,15 @@
sys.path.append(base_folder)
sys.path.append(os.path.join(base_folder, "plcopeneditor"))
+from utils.BitmapLibrary import AddBitmapFolder, GetBitmap +AddBitmapFolder(os.path.join(CWD, "images")) if __name__ == '__main__':
for extfilename in extensions:
- sys.path.append(os.path.split(os.path.realpath(extfilename))[0])
+ extension_folder = os.path.split(os.path.realpath(extfilename))[0] + sys.path.append(extension_folder) + AddBitmapFolder(os.path.join(extension_folder, "images")) execfile(extfilename, locals())
import wx.lib.buttons, wx.lib.statbmp
@@ -175,12 +180,8 @@
- bitmappath = Bpath( "images", bitmapname)
- if os.path.isfile(bitmappath):
- bitmap = wx.Bitmap(bitmappath)
- wx.lib.statbmp.GenStaticBitmap.__init__(self, parent, ID, bitmap,
+ wx.lib.statbmp.GenStaticBitmap.__init__(self, parent, ID, @@ -335,11 +336,11 @@
self.Bind(wx.EVT_MENU, self.OnPrintMenu, id=wx.ID_PRINT)
self.Bind(wx.EVT_MENU, self.OnQuitMenu, id=wx.ID_EXIT)
- self.AddToMenuToolBar([(wx.ID_NEW, "new.png", _(u'New'), None),
- (wx.ID_OPEN, "open.png", _(u'Open'), None),
- (wx.ID_SAVE, "save.png", _(u'Save'), None),
- (wx.ID_SAVEAS, "saveas.png", _(u'Save As...'), None),
- (wx.ID_PRINT, "print.png", _(u'Print'), None)])
+ self.AddToMenuToolBar([(wx.ID_NEW, "new", _(u'New'), None), + (wx.ID_OPEN, "open", _(u'Open'), None), + (wx.ID_SAVE, "save", _(u'Save'), None), + (wx.ID_SAVEAS, "saveas", _(u'Save As...'), None), + (wx.ID_PRINT, "print", _(u'Print'), None)]) def _init_coll_AddMenu_Items(self, parent):
IDEFrame._init_coll_AddMenu_Items(self, parent, False)
@@ -424,15 +425,15 @@
("VAR_INPUT", LOCATION_VAR_INPUT),
("VAR_OUTPUT", LOCATION_VAR_OUTPUT),
("VAR_LOCAL", LOCATION_VAR_MEMORY)]:
- self.LocationImageDict[itemtype]=self.LocationImageList.Add(wx.Bitmap(os.path.join(base_folder, "plcopeneditor", 'Images', '%s.png'%imgname)))
+ self.LocationImageDict[itemtype] = self.LocationImageList.Add(GetBitmap(imgname)) for imgname, itemtype in [
("Extension", ITEM_CONFNODE)]:
- self.TreeImageDict[itemtype]=self.TreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'images', '%s.png'%imgname)))
+ self.TreeImageDict[itemtype] = self.TreeImageList.Add(GetBitmap(imgname)) # Add beremiz's icon in top left corner of the frame
- self.SetIcon(wx.Icon(Bpath( "images", "brz.ico"), wx.BITMAP_TYPE_ICO))
+ self.SetIcon(wx.Icon(Bpath("images", "brz.ico"), wx.BITMAP_TYPE_ICO)) if ctr is None and projectOpen is None and self.Config.HasEntry("currenteditedproject"):
projectOpen = str(self.Config.Read("currenteditedproject"))
@@ -444,7 +445,7 @@
self.Controler = self.CTR
result = self.CTR.LoadProject(projectOpen, buildpath)
- self.LibraryPanel.SetControler(self.Controler)
+ self.LibraryPanel.SetController(self.Controler) self.ProjectTree.Enable(True)
self.PouInstanceVariablesPanel.SetController(self.Controler)
self.RefreshConfigRecentProjects(os.path.abspath(projectOpen))
@@ -456,7 +457,7 @@
- self.LibraryPanel.SetControler(self.Controler)
+ self.LibraryPanel.SetController(self.Controler) self.ProjectTree.Enable(True)
self.PouInstanceVariablesPanel.SetController(self.Controler)
self._Refresh(PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE)
@@ -561,7 +562,7 @@
- return ("confnode", tab.Controler.CTNFullName())
+ return ("confnode", tab.Controler.CTNFullName(), tab.GetTagName()) elif (isinstance(tab, TextViewer) and
(tab.Controler is None or isinstance(tab.Controler, MiniTextControler))):
return ("confnode", None, tab.GetInstancePath())
@@ -604,12 +605,14 @@
selected = self.TabsOpened.GetSelection()
- graphic_viewer = isinstance(self.TabsOpened.GetPage(selected), Viewer)
+ window = self.TabsOpened.GetPage(selected) + viewer_is_modified = window.IsModified() + is_viewer = isinstance(window, Viewer)
+ viewer_is_modified = is_viewer = False if self.TabsOpened.GetPageCount() > 0:
self.FileMenu.Enable(wx.ID_CLOSE, True)
self.FileMenu.Enable(wx.ID_PREVIEW, True)
self.FileMenu.Enable(wx.ID_PRINT, True)
MenuToolBar.EnableTool(wx.ID_PRINT, True)
@@ -623,7 +626,7 @@
self.FileMenu.Enable(wx.ID_PRINT, False)
MenuToolBar.EnableTool(wx.ID_PRINT, False)
self.FileMenu.Enable(wx.ID_PAGE_SETUP, True)
- project_modified = self.CTR.ProjectTestModified()
+ project_modified = self.CTR.ProjectTestModified() or viewer_is_modified self.FileMenu.Enable(wx.ID_SAVE, project_modified)
MenuToolBar.EnableTool(wx.ID_SAVE, project_modified)
self.FileMenu.Enable(wx.ID_SAVEAS, True)
@@ -697,7 +700,7 @@
if "method" in confnode_method and confnode_method.get("shown",True):
StatusToolBar.AddSimpleTool(id,
- wx.Bitmap(Bpath("images", "%s.png"%confnode_method.get("bitmap", "Unknown"))),
+ GetBitmap(confnode_method.get("bitmap", "Unknown")), confnode_method["tooltip"])
self.Bind(wx.EVT_MENU, self.GetMenuCallBackFunction(confnode_method["method"]), id=id)
@@ -721,10 +724,11 @@
if panel != self.LastPanelSelected:
for i in xrange(self.EditMenuSize, self.EditMenu.GetMenuItemCount()):
item = self.EditMenu.FindItemByPosition(self.EditMenuSize)
- self.EditMenu.RemoveItem(item)
- self.EditMenu.Delete(item.GetId())
+ self.EditMenu.RemoveItem(item) + self.EditMenu.Delete(item.GetId()) self.LastPanelSelected = panel
items = panel.GetConfNodeMenuItems()
@@ -738,7 +742,11 @@
for i in xrange(self.EditMenuSize, self.EditMenu.GetMenuItemCount()):
item = self.EditMenu.FindItemByPosition(i)
- self.EditMenu.Delete(item.GetId())
+ self.EditMenu.RemoveItem(item) + self.EditMenu.Delete(item.GetId()) self.LastPanelSelected = None
self.MenuBar.UpdateMenus()
@@ -807,7 +815,7 @@
self.Controler = self.CTR
- self.LibraryPanel.SetControler(self.Controler)
+ self.LibraryPanel.SetController(self.Controler) self.ProjectTree.Enable(True)
self.PouInstanceVariablesPanel.SetController(self.Controler)
self.RefreshConfigRecentProjects(projectpath)
@@ -844,7 +852,7 @@
self.Controler = self.CTR
result = self.CTR.LoadProject(projectpath)
- self.LibraryPanel.SetControler(self.Controler)
+ self.LibraryPanel.SetController(self.Controler) self.ProjectTree.Enable(True)
self.PouInstanceVariablesPanel.SetController(self.Controler)
self.RefreshConfigRecentProjects(projectpath)
@@ -870,13 +878,23 @@
def OnSaveProjectMenu(self, event):
+ selected = self.TabsOpened.GetSelection() + window = self.TabsOpened.GetPage(selected) self._Refresh(TITLE, FILEMENU, EDITMENU, PAGETITLES)
def OnSaveProjectAsMenu(self, event):
+ selected = self.TabsOpened.GetSelection() + window = self.TabsOpened.GetPage(selected) self._Refresh(TITLE, FILEMENU, EDITMENU, PAGETITLES)
@@ -933,6 +951,17 @@
IDEFrame.OnProjectTreeItemActivated(self, event)
+ def ProjectTreeItemSelect(self, select_item): + name = self.ProjectTree.GetItemText(select_item) + item_infos = self.ProjectTree.GetPyData(select_item) + if item_infos["type"] == ITEM_CONFNODE: + item_infos["confnode"]._OpenView(onlyopened=True) + elif item_infos["type"] == ITEM_PROJECT: + self.CTR._OpenView(onlyopened=True) + IDEFrame.ProjectTreeItemSelect(self, select_item) def SelectProjectTreeItem(self, tagname):
if self.ProjectTree is not None:
root = self.ProjectTree.GetRootItem()
--- a/ConfTreeNodeEditor.py Tue Jun 19 21:59:34 2012 +0200
+++ b/ConfTreeNodeEditor.py Fri Jul 06 21:00:43 2012 +0200
@@ -9,9 +9,9 @@
from PLCOpenEditor import TITLE, FILEMENU, PROJECTTREE, PAGETITLES
-from util.misc import opjimg
from util.TextCtrlAutoComplete import TextCtrlAutoComplete
from util.BrowseValuesLibraryDialog import BrowseValuesLibraryDialog
+from utils.BitmapLibrary import GetBitmap if wx.Platform == '__WXMSW__':
faces = { 'times': 'Times New Roman',
@@ -124,12 +124,8 @@
- bitmappath = Bpath( "images", bitmapname)
- if os.path.isfile(bitmappath):
- bitmap = wx.Bitmap(bitmappath)
- wx.lib.statbmp.GenStaticBitmap.__init__(self, parent, ID, bitmap,
+ wx.lib.statbmp.GenStaticBitmap.__init__(self, parent, ID, @@ -151,15 +147,15 @@
def _init_ConfNodeEditor(self, prnt):
self.ConfNodeEditor = None
- def _init_Editor(self, prnt):
- self.Editor = wx.SplitterWindow(id=self.ID, name='EditorSplitter', parent=prnt,
- size=wx.Size(0, 0), style=wx.SUNKEN_BORDER|wx.SP_3D)
+ def _init_Editor(self, parent): + self.Editor = wx.SplitterWindow(parent, + style=wx.SUNKEN_BORDER|wx.SP_3D) self.SetNeedUpdating(True)
self.SetMinimumPaneSize(1)
- self.ParamsEditor = wx.ScrolledWindow(self.Editor, -1, size=wx.Size(-1, -1),
- style=wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER|wx.HSCROLL|wx.VSCROLL)
+ self.ParamsEditor = wx.ScrolledWindow(self.Editor, + style=wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER|wx.HSCROLL|wx.VSCROLL) self.ParamsEditor.SetBackgroundColour(WINDOW_COLOUR)
self.ParamsEditor.Bind(wx.EVT_SIZE, self.OnWindowResize)
self.ParamsEditor.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
@@ -175,51 +171,45 @@
self.ParamsEditor.SetSizer(self.ParamsEditorSizer)
baseparamseditor_sizer = wx.BoxSizer(wx.HORIZONTAL)
- self.ParamsEditorSizer.AddSizer(baseparamseditor_sizer, 0, border=5,
- flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.TOP)
+ self.ParamsEditorSizer.AddSizer(baseparamseditor_sizer, border=5, + flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.TOP) self.FullIECChannel = wx.StaticText(self.ParamsEditor, -1)
self.FullIECChannel.SetFont(
wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL,
wx.BOLD, faceName = faces["helv"]))
- baseparamseditor_sizer.AddWindow(self.FullIECChannel, 0, border=0, flag=wx.ALIGN_CENTER_VERTICAL)
+ baseparamseditor_sizer.AddWindow(self.FullIECChannel, + flag=wx.ALIGN_CENTER_VERTICAL) updownsizer = wx.BoxSizer(wx.VERTICAL)
- baseparamseditor_sizer.AddSizer(updownsizer, 0, border=5,
- flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL)
- ieccupbutton_id = wx.NewId()
- self.IECCUpButton = wx.lib.buttons.GenBitmapTextButton(
- id=ieccupbutton_id, bitmap=wx.Bitmap(opjimg('IECCDown')),
- name='IECUpButton', parent=self.ParamsEditor, pos=wx.Point(0, 0),
- size=wx.Size(16, 16), style=wx.NO_BORDER)
- self.IECCUpButton.Bind(wx.EVT_BUTTON, self.GetItemChannelChangedFunction(1),
- updownsizer.AddWindow(self.IECCUpButton, 0, border=0, flag=wx.ALIGN_LEFT)
+ baseparamseditor_sizer.AddSizer(updownsizer, border=5, + flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL) - ieccdownbutton_id = wx.NewId()
- self.IECCDownButton = wx.lib.buttons.GenBitmapButton(
- id=ieccdownbutton_id, bitmap=wx.Bitmap(opjimg('IECCUp')),
- name='IECDownButton', parent=self.ParamsEditor, pos=wx.Point(0, 0),
- size=wx.Size(16, 16), style=wx.NO_BORDER)
+ self.IECCUpButton = wx.lib.buttons.GenBitmapTextButton(self.ParamsEditor, + bitmap=GetBitmap('IECCDown'), size=wx.Size(16, 16), style=wx.NO_BORDER) + self.IECCUpButton.Bind(wx.EVT_BUTTON, self.GetItemChannelChangedFunction(1), + updownsizer.AddWindow(self.IECCUpButton, flag=wx.ALIGN_LEFT) + self.IECCDownButton = wx.lib.buttons.GenBitmapButton(self.ParamsEditor, + bitmap=GetBitmap('IECCUp'), size=wx.Size(16, 16), style=wx.NO_BORDER) self.IECCDownButton.Bind(wx.EVT_BUTTON, self.GetItemChannelChangedFunction(-1),
- updownsizer.AddWindow(self.IECCDownButton, 0, border=0, flag=wx.ALIGN_LEFT)
+ updownsizer.AddWindow(self.IECCDownButton, flag=wx.ALIGN_LEFT) - confnodename_id = wx.NewId()
- self.ConfNodeName = wx.TextCtrl(
- self.ParamsEditor, confnodename_id,
+ self.ConfNodeName = wx.TextCtrl(self.ParamsEditor, size=wx.Size(150, 25), style=wx.NO_BORDER)
self.ConfNodeName.SetFont(
wx.Font(faces["size"] * 0.75, wx.DEFAULT, wx.NORMAL,
wx.BOLD, faceName = faces["helv"]))
self.ConfNodeName.Bind(wx.EVT_TEXT,
- self.GetTextCtrlCallBackFunction(self.ConfNodeName, "BaseParams.Name", True),
- baseparamseditor_sizer.AddWindow(self.ConfNodeName, 0, border=5, flag=wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
+ self.GetTextCtrlCallBackFunction(self.ConfNodeName, "BaseParams.Name", True), + baseparamseditor_sizer.AddWindow(self.ConfNodeName, border=5, + flag=wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL) buttons_sizer = self.GenerateMethodButtonSizer()
- baseparamseditor_sizer.AddSizer(buttons_sizer, 0, border=0, flag=wx.ALIGN_CENTER)
+ baseparamseditor_sizer.AddSizer(buttons_sizer, flag=wx.ALIGN_CENTER) self.ParamsEditorSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=1, vgap=5)
@@ -227,8 +217,8 @@
self.ParamsEditorSizer.AddGrowableRow(0)
self.ConfNodeParamsSizer = wx.BoxSizer(wx.VERTICAL)
- self.ParamsEditorSizer.AddSizer(self.ConfNodeParamsSizer, 0, border=5,
- flag=wx.LEFT|wx.RIGHT|wx.BOTTOM)
+ self.ParamsEditorSizer.AddSizer(self.ConfNodeParamsSizer, border=5, + flag=wx.LEFT|wx.RIGHT|wx.BOTTOM) self.RefreshConfNodeParamsSizer()
@@ -250,11 +240,12 @@
def __init__(self, parent, controler, window, tagname=""):
EditorPanel.__init__(self, parent, tagname, window, controler)
- icon_path = self.Controler.GetIconPath()
- icon_path = opjimg("Extension")
- self.SetIcon(wx.Bitmap(icon_path, wx.BITMAP_TYPE_PNG))
+ icon_name = self.Controler.GetIconName() + if icon_name is not None: + self.SetIcon(GetBitmap(icon_name)) + self.SetIcon(GetBitmap("Extension")) self.Controler.OnCloseEditor(self)
@@ -313,20 +304,15 @@
for confnode_method in self.Controler.ConfNodeMethods:
if "method" in confnode_method and confnode_method.get("shown",True):
- label = confnode_method["name"]
- bitmap_path = confnode_method.get("bitmap", "Unknown")
- if os.path.splitext(bitmap_path)[1] == "":
- bitmap_path = Bpath("images", "%s.png" % bitmap_path)
- button = GenBitmapTextButton(id=id, parent=self.ParamsEditor,
- bitmap=wx.Bitmap(bitmap_path), label=label,
- name=label, pos=wx.DefaultPosition, style=wx.NO_BORDER)
+ button = GenBitmapTextButton(self.ParamsEditor, + bitmap=GetBitmap(confnode_method.get("bitmap", "Unknown")), + label=confnode_method["name"], style=wx.NO_BORDER) button.SetFont(normal_bt_font)
button.SetToolTipString(confnode_method["tooltip"])
if confnode_method.get("push", False):
button.Bind(wx.EVT_LEFT_DOWN, self.GetButtonCallBackFunction(confnode_method["method"], True))
- button.Bind(wx.EVT_BUTTON, self.GetButtonCallBackFunction(confnode_method["method"]), id=id)
+ button.Bind(wx.EVT_BUTTON, self.GetButtonCallBackFunction(confnode_method["method"]), button) # a fancy underline on mouseover
@@ -339,7 +325,7 @@
#hack to force size to mini
if not confnode_method.get("enabled",True):
- msizer.AddWindow(button, 0, border=0, flag=wx.ALIGN_CENTER)
+ msizer.AddWindow(button, flag=wx.ALIGN_CENTER) def GenerateSizerElements(self, sizer, elements, path, clean = True):
@@ -353,57 +339,64 @@
element_path = element_infos["name"]
if element_infos["type"] == "element":
label = element_infos["name"]
- staticbox = wx.StaticBox(id=-1, label=_(label),
- name='%s_staticbox'%element_infos["name"], parent=self.ParamsEditor,
- pos=wx.Point(0, 0), size=wx.Size(10, 0), style=0)
+ staticbox = wx.StaticBox(self.ParamsEditor, + label=_(label), size=wx.Size(10, 0)) staticboxsizer = wx.StaticBoxSizer(staticbox, wx.VERTICAL)
- sizer.AddSizer(staticboxsizer, 0, border=5, flag=wx.GROW|wx.TOP|wx.BOTTOM)
+ sizer.AddSizer(staticboxsizer, border=5, + flag=wx.GROW|wx.TOP|wx.BOTTOM) - sizer.AddSizer(staticboxsizer, 0, border=5, flag=wx.GROW|wx.BOTTOM)
- self.GenerateSizerElements(staticboxsizer, element_infos["children"], element_path)
+ sizer.AddSizer(staticboxsizer, border=5, + flag=wx.GROW|wx.BOTTOM) + self.GenerateSizerElements(staticboxsizer, + element_infos["children"], boxsizer = wx.FlexGridSizer(cols=3, rows=1)
boxsizer.AddGrowableCol(1)
- sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.ALL)
+ sizer.AddSizer(boxsizer, border=5, - sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
- staticbitmap = GenStaticBitmap(ID=-1, bitmapname="%s.png"%element_infos["name"],
+ sizer.AddSizer(boxsizer, border=5, + flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM) + staticbitmap = GenStaticBitmap(ID=-1, bitmapname=element_infos["name"], name="%s_bitmap"%element_infos["name"], parent=self.ParamsEditor,
pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
- boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
- label = element_infos["name"]
- statictext = wx.StaticText(id=-1, label="%s:"%_(label),
- name="%s_label"%element_infos["name"], parent=self.ParamsEditor,
- pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
- boxsizer.AddWindow(statictext, 0, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT)
+ boxsizer.AddWindow(staticbitmap, border=5, flag=wx.RIGHT) + statictext = wx.StaticText(self.ParamsEditor, + label="%s:"%_(element_infos["name"])) + boxsizer.AddWindow(statictext, border=5, + flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT) if isinstance(element_infos["type"], types.ListType):
if isinstance(element_infos["value"], types.TupleType):
browse_boxsizer = wx.BoxSizer(wx.HORIZONTAL)
- boxsizer.AddSizer(browse_boxsizer, 0, border=0, flag=0)
+ boxsizer.AddSizer(browse_boxsizer) - textctrl = wx.TextCtrl(id=id, name=element_infos["name"], parent=self.ParamsEditor,
- pos=wx.Point(0, 0), size=wx.Size(275, 25), style=wx.TE_READONLY)
+ textctrl = wx.TextCtrl(self.ParamsEditor, + size=wx.Size(275, 25), style=wx.TE_READONLY) if element_infos["value"] is not None:
textctrl.SetValue(element_infos["value"][0])
value_infos = element_infos["value"][1]
- browse_boxsizer.AddWindow(textctrl, 0, border=0, flag=0)
- button = wx.Button(id=button_id, name="browse_%s" % element_infos["name"], parent=self.ParamsEditor,
- label="...", pos=wx.Point(0, 0), size=wx.Size(25, 25))
- browse_boxsizer.AddWindow(button, 0, border=0, flag=0)
+ browse_boxsizer.AddWindow(textctrl) + button = wx.Button(self.ParamsEditor, + label="...", size=wx.Size(25, 25)) + browse_boxsizer.AddWindow(button) button.Bind(wx.EVT_BUTTON,
self.GetBrowseCallBackFunction(element_infos["name"], textctrl, element_infos["type"],
value_infos, element_path),
- combobox = wx.ComboBox(id=id, name=element_infos["name"], parent=self.ParamsEditor,
- pos=wx.Point(0, 0), size=wx.Size(300, 28), style=wx.CB_READONLY)
- boxsizer.AddWindow(combobox, 0, border=0, flag=0)
+ combobox = wx.ComboBox(self.ParamsEditor, + size=wx.Size(300, 28), style=wx.CB_READONLY) + boxsizer.AddWindow(combobox) if element_infos["use"] == "optional":
if len(element_infos["type"]) > 0 and isinstance(element_infos["type"][0], types.TupleType):
@@ -411,11 +404,11 @@
name = element_infos["name"]
value = element_infos["value"]
- staticbox = wx.StaticBox(id=-1, label="%s - %s"%(_(name), _(value)),
- name='%s_staticbox'%element_infos["name"], parent=self.ParamsEditor,
- pos=wx.Point(0, 0), size=wx.Size(10, 0), style=0)
+ staticbox = wx.StaticBox(self.ParamsEditor, + label="%s - %s"%(_(name), _(value)), size=wx.Size(10, 0)) staticboxsizer = wx.StaticBoxSizer(staticbox, wx.VERTICAL)
- sizer.AddSizer(staticboxsizer, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+ sizer.AddSizer(staticboxsizer, border=5, flag=wx.GROW|wx.BOTTOM) self.GenerateSizerElements(staticboxsizer, element_infos["children"], element_path)
callback = self.GetChoiceContentCallBackFunction(combobox, staticboxsizer, element_path)
@@ -426,7 +419,8 @@
combobox.SetStringSelection("")
combobox.SetStringSelection(element_infos["value"])
- combobox.Bind(wx.EVT_COMBOBOX, callback, id=id)
+ combobox.Bind(wx.EVT_COMBOBOX, callback, combobox) elif isinstance(element_infos["type"], types.DictType):
@@ -434,47 +428,52 @@
scmin = element_infos["type"]["min"]
if "max" in element_infos["type"]:
scmax = element_infos["type"]["max"]
- spinctrl = wx.SpinCtrl(id=id, name=element_infos["name"], parent=self.ParamsEditor,
- pos=wx.Point(0, 0), size=wx.Size(300, 25), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT)
- spinctrl.SetRange(scmin,scmax)
- boxsizer.AddWindow(spinctrl, 0, border=0, flag=0)
+ spinctrl = wx.SpinCtrl(self.ParamsEditor, + size=wx.Size(300, 25), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT) + spinctrl.SetRange(scmin, scmax) + boxsizer.AddWindow(spinctrl) if element_infos["value"] is not None:
spinctrl.SetValue(element_infos["value"])
- spinctrl.Bind(wx.EVT_SPINCTRL, self.GetTextCtrlCallBackFunction(spinctrl, element_path), id=id)
+ spinctrl.Bind(wx.EVT_SPINCTRL, + self.GetTextCtrlCallBackFunction(spinctrl, element_path), if element_infos["type"] == "boolean":
- checkbox = wx.CheckBox(id=id, name=element_infos["name"], parent=self.ParamsEditor,
- pos=wx.Point(0, 0), size=wx.Size(17, 25), style=0)
- boxsizer.AddWindow(checkbox, 0, border=0, flag=0)
+ checkbox = wx.CheckBox(self.ParamsEditor, size=wx.Size(17, 25)) + boxsizer.AddWindow(checkbox) if element_infos["value"] is not None:
checkbox.SetValue(element_infos["value"])
- checkbox.Bind(wx.EVT_CHECKBOX, self.GetCheckBoxCallBackFunction(checkbox, element_path), id=id)
+ checkbox.Bind(wx.EVT_CHECKBOX, + self.GetCheckBoxCallBackFunction(checkbox, element_path), elif element_infos["type"] in ["unsignedLong", "long","integer"]:
if element_infos["type"].startswith("unsigned"):
- spinctrl = wx.SpinCtrl(id=id, name=element_infos["name"], parent=self.ParamsEditor,
- pos=wx.Point(0, 0), size=wx.Size(300, 25), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT)
+ spinctrl = wx.SpinCtrl(self.ParamsEditor, + size=wx.Size(300, 25), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT) spinctrl.SetRange(scmin, scmax)
- boxsizer.AddWindow(spinctrl, 0, border=0, flag=0)
+ boxsizer.AddWindow(spinctrl) if element_infos["value"] is not None:
spinctrl.SetValue(element_infos["value"])
- spinctrl.Bind(wx.EVT_SPINCTRL, self.GetTextCtrlCallBackFunction(spinctrl, element_path), id=id)
+ spinctrl.Bind(wx.EVT_SPINCTRL, + self.GetTextCtrlCallBackFunction(spinctrl, element_path), choices = self.ParentWindow.GetConfigEntry(element_path, [""])
- textctrl = TextCtrlAutoComplete(id=id,
- name=element_infos["name"],
- parent=self.ParamsEditor,
- element_path=element_path,
+ textctrl = TextCtrlAutoComplete(name=element_infos["name"], + parent=self.ParamsEditor, + element_path=element_path, - boxsizer.AddWindow(textctrl, 0, border=0, flag=0)
+ boxsizer.AddWindow(textctrl) if element_infos["value"] is not None:
textctrl.ChangeValue(str(element_infos["value"]))
textctrl.Bind(wx.EVT_TEXT, self.GetTextCtrlCallBackFunction(textctrl, element_path))
--- a/ProjectController.py Tue Jun 19 21:59:34 2012 +0200
+++ b/ProjectController.py Fri Jul 06 21:00:43 2012 +0200
@@ -14,17 +14,18 @@
-from util.misc import opjimg, CheckPathPerm, GetClassImporter
+from util.misc import CheckPathPerm, GetClassImporter from util.MiniTextControler import MiniTextControler
from util.ProcessLogger import ProcessLogger
+from util.FileManagementPanel import FileManagementPanel from PLCControler import PLCControler
-from PLCOpenEditor import CWD
from TextViewer import TextViewer
from plcopen.structures import IEC_KEYWORDS
from targets.typemapping import DebugTypesSize
from util.discovery import DiscoveryDialog
from ConfigTreeNode import ConfigTreeNode
from ProjectNodeEditor import ProjectNodeEditor
+from utils.BitmapLibrary import GetBitmap base_folder = os.path.split(sys.path[0])[0]
@@ -182,8 +183,8 @@
def GetProjectName(self):
return os.path.split(self.ProjectPath)[1]
- return os.path.join(CWD, "Images", "PROJECT.png")
def GetDefaultTargetName(self):
if wx.Platform == '__WXMSW__':
@@ -315,7 +316,7 @@
- "icon": CTNChild.GetIconPath(),
+ "icon": CTNChild.GetIconName(), "values": self.RecursiveConfNodeInfos(CTNChild)})
@@ -933,14 +934,22 @@
def _editIECrawcode(self):
self._OpenView("IEC raw code")
- def _OpenView(self, name=None):
+ _ProjectFilesView = None + def _OpenProjectFiles(self): + self._OpenView("Project files") + def _OpenFileEditor(self, filepath): + self._OpenView(filepath) + def _OpenView(self, name=None, onlyopened=False): - if self._IEC_code_viewer is None:
+ if self._IECCodeView is None: plc_file = self._getIECcodepath()
self._IECCodeView = TextViewer(self.AppFrame.TabsOpened, "", None, None, instancepath=name)
- #self._IECCodeViewr.Enable(False)
+ #self._IECCodeView.Enable(False) self._IECCodeView.SetTextSyntax("ALL")
self._IECCodeView.SetKeywords(IEC_KEYWORDS)
@@ -948,29 +957,75 @@
text = '(* No IEC code have been generated at that time ! *)'
self._IECCodeView.SetText(text = text)
- self._IECCodeView.SetIcon(self.AppFrame.GenerateBitmap("ST"))
+ self._IECCodeView.SetIcon(GetBitmap("ST")) + if self._IECCodeView is not None: self.AppFrame.EditProjectElement(self._IECCodeView, name)
elif name == "IEC raw code":
- if self.IEC_raw_code_viewer is None:
+ if self._IECRawCodeView is None: controler = MiniTextControler(self._getIECrawcodepath())
- self.IEC_raw_code_viewer = TextViewer(self.AppFrame.TabsOpened, "", None, controler, instancepath=name)
- #self.IEC_raw_code_viewer.Enable(False)
- self.IEC_raw_code_viewer.SetTextSyntax("ALL")
- self.IEC_raw_code_viewer.SetKeywords(IEC_KEYWORDS)
- self.IEC_raw_code_viewer.RefreshView()
- self.IEC_raw_code_viewer.SetIcon(self.AppFrame.GenerateBitmap("ST"))
+ self._IECRawCodeView = TextViewer(self.AppFrame.TabsOpened, "", None, controler, instancepath=name) + #self._IECRawCodeView.Enable(False) + self._IECRawCodeView.SetTextSyntax("ALL") + self._IECRawCodeView.SetKeywords(IEC_KEYWORDS) + self._IECRawCodeView.RefreshView() + self._IECRawCodeView.SetIcon(GetBitmap("ST")) + if self._IECRawCodeView is not None: + self.AppFrame.EditProjectElement(self._IECRawCodeView, name) + return self._IECRawCodeView + elif name == "Project files": + if self._ProjectFilesView is None: + self._ProjectFilesView = FileManagementPanel(self.AppFrame.TabsOpened, self, name, self._getProjectFilesPath(), True) + for extension, name, editor in features.file_editors: + if extension not in extensions: + extensions.append(extension) + self._ProjectFilesView.SetEditableFileExtensions(extensions) + if self._ProjectFilesView is not None: + self.AppFrame.EditProjectElement(self._ProjectFilesView, name) + return self._ProjectFilesView + elif name is not None and os.path.isfile(name): + if not self._FileEditors.has_key(name): + file_extension = os.path.splitext(name)[1] + editors = dict([(editor_name, editor) + for extension, editor_name, editor in features.file_editors + if extension == file_extension]) + editor_name = editors.keys()[0] + dialog = wx.SingleChoiceDialog(self.ParentWindow, + _("Select an editor:"), _("Editor selection"), + names, wx.OK|wx.CANCEL) + if dialog.ShowModal() == wx.ID_OK: + editor_name = names[dialog.GetSelection()] + if editor_name is not None: + editor = editors[editor_name]() + self._FileEditors[name] = editor(self.AppFrame.TabsOpened, self, name, self.AppFrame) + self._FileEditors[name].SetIcon(GetBitmap("FILE")) - self.AppFrame.EditProjectElement(self.IEC_raw_code_viewer, name)
- return self.IEC_raw_code_viewer
+ if self._FileEditors.has_key(name): + self.AppFrame.EditProjectElement(self._FileEditors[name], name) + return self._FileEditors[name] - return ConfigTreeNode._OpenView(self, name)
+ return ConfigTreeNode._OpenView(self, self.CTNName(), onlyopened) def OnCloseEditor(self, view):
ConfigTreeNode.OnCloseEditor(self, view)
@@ -978,6 +1033,10 @@
if self._IECRawCodeView == view:
self._IECRawCodeView = None
+ if self._ProjectFilesView == view: + self._ProjectFilesView = None + if view in self._FileEditors.values(): + self._FileEditors.pop(view.GetTagName()) self._CloseView(self._IECCodeView)
@@ -1415,16 +1474,6 @@
wx.CallAfter(self.UpdateMethodsFromPLCStatus)
- def _ImportProjectFile(self):
- dialog = wx.FileDialog(self.AppFrame, _("Choose a file"), os.getcwd(), "", _("All files|*.*"), wx.OPEN)
- if dialog.ShowModal() == wx.ID_OK:
- filepath = dialog.GetPath()
- if os.path.isfile(filepath):
- shutil.copy(filepath, self._getProjectFilesPath())
- self.logger.write_error(_("No such file: %s\n") % filepath)
@@ -1471,10 +1520,10 @@
"name" : _("Raw IEC code"),
"tooltip" : _("Edit raw IEC code added to code generated by PLCGenerator"),
"method" : "_editIECrawcode"},
- {"bitmap" : "ImportFile",
- "name" : _("Import file"),
- "tooltip" : _("Import into project a file to be transfered with PLC"),
- "method" : "_ImportProjectFile"},
+ {"bitmap" : "ManageFolder", + "name" : _("Project Files"), + "tooltip" : _("Open a file explorer to manage project files"), + "method" : "_OpenProjectFiles"}, --- a/c_ext/CFileEditor.py Tue Jun 19 21:59:34 2012 +0200
+++ b/c_ext/CFileEditor.py Fri Jul 06 21:00:43 2012 +0200
@@ -4,10 +4,10 @@
-from util.misc import opjimg
from controls import CustomGrid, CustomTable
from ConfTreeNodeEditor import ConfTreeNodeEditor
+from utils.BitmapLibrary import GetBitmap if wx.Platform == '__WXMSW__':
faces = { 'times': 'Times New Roman',
@@ -790,10 +790,10 @@
for idx, (name, panel_class) in enumerate(CFILE_PARTS):
button = FoldPanelCaption(id=button_id, name='FoldPanelCaption_%s' % name,
- label=name, bitmap=wx.Bitmap(opjimg("CollapsedIconData")),
+ label=name, bitmap=GetBitmap("CollapsedIconData"), parent=self.ConfNodeEditor, pos=wx.Point(0, 0),
size=wx.Size(0, 20), style=wx.NO_BORDER|wx.ALIGN_LEFT)
- button.SetBitmapSelected(wx.Bitmap(opjimg("ExpandedIconData")))
+ button.SetBitmapSelected(GetBitmap("ExpandedIconData")) button.Bind(wx.EVT_BUTTON, self.GenPanelButtonCallback(name), id=button_id)
self.MainSizer.AddWindow(button, 0, border=0, flag=wx.TOP|wx.GROW)
--- a/canfestival/canfestival.py Tue Jun 19 21:59:34 2012 +0200
+++ b/canfestival/canfestival.py Fri Jul 06 21:00:43 2012 +0200
@@ -108,8 +108,8 @@
return self.CanFestivalSlaveNode.getCan_Device()
- ConfigTreeNode._OpenView(self)
+ def _OpenView(self, name=None, onlyopened=False): + ConfigTreeNode._OpenView(self, name, onlyopened) if self._View is not None:
self._View.SetBusId(self.GetCurrentLocation())
@@ -197,7 +197,7 @@
def OnCloseEditor(self, view):
@@ -255,8 +255,9 @@
def _ShowGeneratedMaster(self):
self._OpenView("Generated master")
- def _OpenView(self, name=None):
+ def _OpenView(self, name=None, onlyopened=False): if name == "Generated master":
+ app_frame = self.GetCTRoot().AppFrame if self._GeneratedMasterView is None:
buildpath = self._getBuildPath()
# Eventually create build dir
@@ -269,16 +270,15 @@
self.GetCTRoot().logger.write_error(_("Error: No Master generated\n"))
- app_frame = self.GetCTRoot().AppFrame
manager = MiniNodeManager(self, masterpath, self.CTNFullName() + ".generated_master")
self._GeneratedMasterView = MasterViewer(app_frame.TabsOpened, manager, app_frame)
- app_frame.EditProjectElement(self._GeneratedMasterView, name)
+ if self._GeneratedMasterView is not None: + app_frame.EditProjectElement(self._IECCodeView, name) return self._GeneratedMasterView
- ConfigTreeNode._OpenView(self)
+ ConfigTreeNode._OpenView(self, name, onlyopened) if self._View is not None:
self._View.SetBusId(self.GetCurrentLocation())
--- a/images/icons.svg Tue Jun 19 21:59:34 2012 +0200
+++ b/images/icons.svg Fri Jul 06 21:00:43 2012 +0200
@@ -43,9 +43,9 @@
- inkscape:zoom="2.5600001"
- inkscape:cx="643.14253"
- inkscape:cy="778.71873"
+ inkscape:zoom="28.963095" + inkscape:cx="519.38634" inkscape:current-layer="svg2"
@@ -85902,6 +85902,2133 @@
+ id="linearGradient2915" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7744,0,0,1.9697,-1892.2,-872.89)" + id="radialGradient2917" + xlink:href="#linearGradient5060-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7744,0,0,1.9697,-1891.6,-872.89)" + id="linearGradient5060-1"> + id="radialGradient2919" + xlink:href="#linearGradient5060-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.7744,0,0,1.9697,112.76,-872.89)" + id="linearGradient3035"> + id="linearGradient2932" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.054893,0.013851,0.0025726,0.052482,-0.7128,-0.26741)" + style="stop-color:#f0c178" + style="stop-color:#e18941" + style="stop-color:#ec4f18" + id="linearGradient2934-3" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.0083,0,0,1.0006,-8.2398e-4,-0.0066209)" + style="stop-color:#bb2b12" + style="stop-color:#cd7233" + id="linearGradient2929" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.29669,0,0,0.35207,1.8805,2.1186)" + style="stop-color:#fff;stop-opacity:.2" + style="stop-color:#fff;stop-opacity:0" + id="linearGradient2536" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.32803,0,0,0.32571,4.445,4.532)" + style="stop-color:#ecf5b6" + style="stop-color:#9fba48" + gradientTransform="translate(-40,0)" + gradientUnits="userSpaceOnUse" + id="linearGradient18010-6" + xlink:href="#linearGradient5175-3-7-9-2-7" + inkscape:collect="always" /> + id="linearGradient5175-3-7-9-2-7"> + style="stop-color:#bdcccd;stop-opacity:1;" + id="stop5177-6-9-6-1-9" /> + style="stop-color:#7979ff;stop-opacity:1;" + id="stop5179-73-8-3-1-8" /> + gradientTransform="translate(-40,0)" + gradientUnits="userSpaceOnUse" + id="linearGradient17986" + xlink:href="#linearGradient5175-3-7-9-2-7" + inkscape:collect="always" /> + id="linearGradient3262" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-17.058,0)" + style="stop-color:#f6f6f6" + style="stop-color:#ccc" + id="linearGradient3264" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-17.058,0)" + style="stop-color:#aaa" + style="stop-color:#8c8c8c" + id="linearGradient3260" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.096142,0,0,0.096142,1.8469,1.943)" + style="stop-color:#e5e5e5" + style="stop-color:#ababab" + inkscape:collect="always" + xlink:href="#linearGradient2447-4-6" + id="linearGradient17971-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.035207,0,0,0.0082353,273.01733,211.29633)" + id="linearGradient2447-4-6" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.035207,0,0,0.0082353,-0.72485,18.981)" + inkscape:collect="always" + xlink:href="#linearGradient5060-7" + id="radialGradient17973-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.012049,0,0,0.0082353,284.50318,211.29633)" + id="linearGradient5060-7"> + inkscape:collect="always" + xlink:href="#linearGradient5060-7" + id="radialGradient17975-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.012049,0,0,0.0082353,286.98118,211.29633)" + id="linearGradient18060"> + inkscape:collect="always" + xlink:href="#linearGradient2435-0-5" + id="linearGradient17977-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.48572,0,0,0.47803,274.08501,191.60938)" + id="linearGradient2435-0-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.48572,0,0,0.47803,274.08501,191.60938)" + style="stop-color:#f4f4f4" + style="stop-color:#dbdbdb" + inkscape:collect="always" + xlink:href="#linearGradient2438-2-4" + id="linearGradient17979-6" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.39221,0,0,0.44736,302.94118,191.07663)" + id="linearGradient2438-2-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.39221,0,0,0.44736,302.94118,191.07663)" + style="stop-color:#aaa" + style="stop-color:#c8c8c8" + inkscape:collect="always" + xlink:href="#radialGradient2432-9" + id="radialGradient17981-6" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.17021,0,0,-0.19072,274.84858,216.03233)" + id="radialGradient2432-9" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.17021,0,0,-0.19072,274.84858,216.03233)" + style="stop-color:#b7b8b9" + style="stop-color:#ececec" + style="stop-color:#fafafa;stop-opacity:0" + style="stop-color:#fff;stop-opacity:0" + style="stop-color:#fafafa;stop-opacity:0" + style="stop-color:#ebecec;stop-opacity:0" + style="stop-color:#e1e2e3;stop-opacity:0" + inkscape:collect="always" + xlink:href="#linearGradient2429-7-0" + id="linearGradient17983-3" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.45454,0,0,0.46512,274.83308,192.65256)" + id="linearGradient2429-7-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.45454,0,0,0.46512,274.83308,192.65256)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + inkscape:collect="always" + xlink:href="#linearGradient2425-2-2" + id="linearGradient17985-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.47785,0,0,0.55248,274.11443,192.2392)" + id="linearGradient2425-2-2" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.47785,0,0,0.55248,274.11443,192.2392)" + style="stop-color:#fefefe" + style="stop-color:#cbcbcb" + inkscape:collect="always" + xlink:href="#linearGradient1291-0-8" + id="linearGradient16528-1-6" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3316761,0,0,0.3316761,48.927852,9.2318583)" + id="linearGradient1291-0-8"> + style="stop-color:#ffffff;stop-opacity:1" + style="stop-color:#ffffff;stop-opacity:0" + id="linearGradient2528" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7744,0,0,1.9697,-1892.2,-872.89)" + id="radialGradient2530" + xlink:href="#linearGradient5060-75" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7744,0,0,1.9697,-1891.6,-872.89)" + id="linearGradient5060-75"> + id="radialGradient2532" + xlink:href="#linearGradient5060-75" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.7744,0,0,1.9697,112.76,-872.89)" + id="linearGradient3052"> + id="linearGradient2558" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(34.378,-14.501)" + style="stop-color:#fff" + style="stop-color:#cdcdcd" + style="stop-color:#a1a1a1" + id="linearGradient2560-6" + gradientUnits="userSpaceOnUse" + style="stop-color:#c1c1c1" + style="stop-color:#909090" + id="radialGradient2553-7" + 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="linearGradient2555" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99458,0,0,0.99458,-0.33927,1.7178)" + style="stop-color:#bb2b12" + style="stop-color:#cd7233" + id="radialGradient2550" + 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="linearGradient2547" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.44503,0,0,0.40237,2.8192,3.8499)" + style="stop-color:#fff;stop-opacity:.27451" + style="stop-color:#fff;stop-opacity:.078431" + id="linearGradient2995-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.46913,0,0,0.4663,7.7005,6.8085)" + style="stop-color:#d7e866" + style="stop-color:#8cab2a" + id="linearGradient2992" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2818,0,0,0.2801,12.197,11.015)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + gradientTransform="matrix(0.2818,0,0,0.2801,12.197,11.015)" + gradientUnits="userSpaceOnUse" + id="linearGradient3099" + xlink:href="#linearGradient2992" + inkscape:collect="always" /> + inkscape:collect="always" + xlink:href="#linearGradient2528" + id="linearGradient18360" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7744,0,0,1.9697,-1892.2,-872.89)" + inkscape:collect="always" + xlink:href="#linearGradient5060-75" + id="radialGradient18362" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7744,0,0,1.9697,-1891.6,-872.89)" + inkscape:collect="always" + xlink:href="#linearGradient5060-75" + id="radialGradient18364" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.7744,0,0,1.9697,112.76,-872.89)" + inkscape:collect="always" + xlink:href="#linearGradient2558" + id="linearGradient18366" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(34.378,-14.501)" + inkscape:collect="always" + xlink:href="#linearGradient2560-6" + id="linearGradient18368" + gradientUnits="userSpaceOnUse" + inkscape:collect="always" + xlink:href="#radialGradient2553-7" + id="radialGradient18370" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.69,0,0,1.0436,-5.449,0.96175)" + inkscape:collect="always" + xlink:href="#linearGradient2555" + id="linearGradient18373" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99458,0,0,0.99458,-0.33927,1.7178)" + inkscape:collect="always" + xlink:href="#radialGradient2550" + id="radialGradient18375" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.016802,1.3943,-1.7966,-0.021651,14.152,2.1566)" + inkscape:collect="always" + xlink:href="#linearGradient2547" + id="linearGradient18377" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.44503,0,0,0.40237,2.8192,3.8499)" + inkscape:collect="always" + xlink:href="#linearGradient2995-1" + id="linearGradient18380" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.46913,0,0,0.4663,7.7005,6.8085)" + inkscape:collect="always" + xlink:href="#linearGradient2992" + id="linearGradient18382" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2818,0,0,0.2801,12.197,11.015)" + id="linearGradient3262-6" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-17.058,0)" + style="stop-color:#f6f6f6" + style="stop-color:#ccc" + id="linearGradient3264-0" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-17.058,0)" + style="stop-color:#aaa" + style="stop-color:#8c8c8c" + id="linearGradient3260-9" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.096142,0,0,0.096142,1.8469,1.943)" + style="stop-color:#e5e5e5" + style="stop-color:#ababab" + inkscape:collect="always" + xlink:href="#linearGradient3262-6" + id="linearGradient18422" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-17.058,0)" + inkscape:collect="always" + xlink:href="#linearGradient3264-0" + id="linearGradient18424" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-17.058,0)" + inkscape:collect="always" + xlink:href="#linearGradient3260-9" + id="linearGradient18426" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.096142,0,0,0.096142,1.8469,1.943)" + id="linearGradient2990" + xlink:href="#linearGradient3600" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.51431,0,0,0.46669,705.20699,460.00841)" + id="linearGradient3600"> + style="stop-color:#f4f4f4" + style="stop-color:#dbdbdb" + id="linearGradient2992-8" + xlink:href="#linearGradient3931" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4153,0,0,0.43675,735.76184,459.4883)" + id="linearGradient3931"> + style="stop-color:#787a75" + style="stop-color:#cbcbcb" + id="linearGradient2906" + xlink:href="#linearGradient3600" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.51431,0,0,0.46669,-5.8439,-5.2)" + id="linearGradient3015-2"> + style="stop-color:#f4f4f4" + style="stop-color:#dbdbdb" + id="linearGradient2908-0" + xlink:href="#linearGradient3931" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4153,0,0,0.43675,24.711,-5.7201)" + id="linearGradient3022"> + style="stop-color:#787a75" + style="stop-color:#cbcbcb" + gradientTransform="matrix(0.51431,0,0,0.46669,699.20694,454.00842)" + gradientUnits="userSpaceOnUse" + id="linearGradient3031" + xlink:href="#linearGradient3600" + inkscape:collect="always" /> + gradientTransform="matrix(0.4153,0,0,0.43675,729.76184,453.48832)" + gradientUnits="userSpaceOnUse" + id="linearGradient3033-2" + xlink:href="#linearGradient3931" + inkscape:collect="always" /> + inkscape:collect="always" + xlink:href="#linearGradient3600" + id="linearGradient18516" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.51431,0,0,0.46669,699.20694,454.00842)" + inkscape:collect="always" + xlink:href="#linearGradient3931" + id="linearGradient18518" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4153,0,0,0.43675,729.76184,453.48832)" + inkscape:collect="always" + xlink:href="#linearGradient3600" + id="linearGradient18520" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.51431,0,0,0.46669,705.20699,460.00841)" + inkscape:collect="always" + xlink:href="#linearGradient3931" + id="linearGradient18522" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4153,0,0,0.43675,735.76184,459.4883)" + inkscape:collect="always" + xlink:href="#linearGradient3600-8" + id="linearGradient18516-9" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.51431,0,0,0.46669,699.20694,454.00842)" + id="linearGradient3600-8"> + style="stop-color:#f4f4f4" + style="stop-color:#dbdbdb" + inkscape:collect="always" + xlink:href="#linearGradient3931-4" + id="linearGradient18518-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4153,0,0,0.43675,729.76184,453.48832)" + id="linearGradient3931-4"> + style="stop-color:#787a75" + style="stop-color:#cbcbcb" + inkscape:collect="always" + xlink:href="#linearGradient3600-8" + id="linearGradient18520-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.51431,0,0,0.46669,705.20699,460.00841)" + id="linearGradient18543"> + style="stop-color:#f4f4f4" + style="stop-color:#dbdbdb" + inkscape:collect="always" + xlink:href="#linearGradient3931-4" + id="linearGradient18522-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4153,0,0,0.43675,735.76184,459.4883)" + id="linearGradient18550"> + style="stop-color:#787a75" + style="stop-color:#cbcbcb" + id="linearGradient3732" + xlink:href="#linearGradient3390-178-986-453-4-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.92957,0,0,0.99594,51.302,-181.74)" + id="linearGradient3390-178-986-453-4-5"> + style="stop-color:#bb2b12" + style="stop-color:#cd7233" + id="linearGradient3021" + xlink:href="#linearGradient3390-178-986-453-4-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.92957,0,0,0.99594,51.302,-181.74)" + id="linearGradient3023"> + style="stop-color:#bb2b12" + style="stop-color:#cd7233" + id="linearGradient4322-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.92957,0,0,0.99594,51.302,-181.74)" + style="stop-color:#f0c178" + style="stop-color:#e18941" + style="stop-color:#ec4f18" + id="linearGradient4324" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.92957,0,0,0.99594,51.302,-181.74)" + style="stop-color:#f0c178" + style="stop-color:#e18941" + style="stop-color:#ec4f18" + id="linearGradient3026" + xlink:href="#linearGradient4456" + gradientUnits="userSpaceOnUse" + id="linearGradient4456"> + style="stop-color:#f6daae" + style="stop-color:#f0c178;stop-opacity:0" + id="linearGradient4462-8" + xlink:href="#linearGradient4456" + gradientUnits="userSpaceOnUse" + id="linearGradient3042-4"> + style="stop-color:#f6daae" + style="stop-color:#f0c178;stop-opacity:0" + gradientTransform="matrix(0.92957,0,0,0.99594,51.302,-181.74)" + gradientUnits="userSpaceOnUse" + id="linearGradient3056-3" + xlink:href="#linearGradient3390-178-986-453-4-5" + inkscape:collect="always" /> + id="linearGradient3732-9" + xlink:href="#linearGradient3390-178-986-453-4-5-2" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.92956783,0,0,0.99594396,51.30231,-181.73954)" /> + id="linearGradient3390-178-986-453-4-5-2"> + style="stop-color:#bb2b12;stop-opacity:1" + style="stop-color:#cd7233;stop-opacity:1" + id="linearGradient4452-2" + xlink:href="#linearGradient3390-178-986-453-4-5-2" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.92956783,0,0,0.99594396,51.30231,-181.73954)" /> + id="linearGradient3021-6"> + style="stop-color:#bb2b12;stop-opacity:1" + style="stop-color:#cd7233;stop-opacity:1" + id="linearGradient4322-8" + xlink:href="#linearGradient7012-661-145-733-759-865-745-661-970-94-1-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.92956783,0,0,0.99594396,51.30231,-181.73954)" /> + id="linearGradient7012-661-145-733-759-865-745-661-970-94-1-0"> + style="stop-color:#f0c178;stop-opacity:1" + style="stop-color:#e18941;stop-opacity:1" + style="stop-color:#ec4f18;stop-opacity:1" + id="linearGradient4324-9" + xlink:href="#linearGradient7012-661-145-733-759-865-745-661-970-94-1-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.92956783,0,0,0.99594396,51.30231,-181.73954)" /> + id="linearGradient3033-9"> + style="stop-color:#f0c178;stop-opacity:1" + style="stop-color:#e18941;stop-opacity:1" + style="stop-color:#ec4f18;stop-opacity:1" + id="linearGradient3007-8" + xlink:href="#linearGradient4456-2" + gradientUnits="userSpaceOnUse" /> + id="linearGradient4456-2"> + style="stop-color:#f6daae;stop-opacity:1" + style="stop-color:#f0c178;stop-opacity:0" + id="linearGradient4462-81" + xlink:href="#linearGradient4456-2" + gradientUnits="userSpaceOnUse" /> + id="linearGradient3046-1"> + style="stop-color:#f6daae;stop-opacity:1" + style="stop-color:#f0c178;stop-opacity:0" + id="linearGradient2528-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7744,0,0,1.9697,-1892.2,-872.89)" + id="radialGradient2530-6" + xlink:href="#linearGradient5060-14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7744,0,0,1.9697,-1891.6,-872.89)" + id="linearGradient5060-14"> + id="radialGradient2532-3" + xlink:href="#linearGradient5060-14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.7744,0,0,1.9697,112.76,-872.89)" + id="linearGradient3120"> + id="linearGradient2558-0" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(34.378,-14.501)" + style="stop-color:#fff" + style="stop-color:#cdcdcd" + style="stop-color:#a1a1a1" + id="linearGradient2560-9" + gradientUnits="userSpaceOnUse" + style="stop-color:#c1c1c1" + style="stop-color:#909090" + id="radialGradient2553-0" + 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="linearGradient2555-2" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99458,0,0,0.99458,-0.33927,1.7178)" + style="stop-color:#bb2b12" + style="stop-color:#cd7233" + id="radialGradient2550-0" + 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="linearGradient2547-3" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.44503,0,0,0.40237,2.8192,3.8499)" + style="stop-color:#fff;stop-opacity:.27451" + style="stop-color:#fff;stop-opacity:.078431" + id="linearGradient2995-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.46913,0,0,0.4663,7.7005,6.8085)" + style="stop-color:#d7e866" + style="stop-color:#8cab2a" + id="linearGradient2992-9" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2818,0,0,0.2801,12.197,11.015)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + gradientTransform="matrix(0.2818,0,0,0.2801,12.197,11.015)" + gradientUnits="userSpaceOnUse" + id="linearGradient3167" + xlink:href="#linearGradient2992-9" + inkscape:collect="always" /> + id="linearGradient2517" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.31429,0,0,0.32593,0.45711,-0.32225)" + style="stop-color:#f4f4f4" + style="stop-color:#dbdbdb" + id="linearGradient2519" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.25379,0,0,0.30502,19.129,-0.68549)" + style="stop-color:#aaa" + style="stop-color:#c8c8c8" + id="linearGradient2511-6" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.27273,0,0,0.30232,1.4546,0.7442)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + id="linearGradient2507-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3092,0,0,0.37669,0.47615,0.10718)" + style="stop-color:#fefefe" + style="stop-color:#cbcbcb" + gradientTransform="matrix(0.3092,0,0,0.37669,0.47615,0.10718)" + gradientUnits="userSpaceOnUse" + id="linearGradient3039-3" + xlink:href="#linearGradient2507-5" + inkscape:collect="always" /> + gradientTransform="translate(-40,0)" + gradientUnits="userSpaceOnUse" + id="linearGradient17986-0" + xlink:href="#linearGradient5175-3-7-9-2-7-4" + inkscape:collect="always" /> + id="linearGradient5175-3-7-9-2-7-4"> + style="stop-color:#bdcccd;stop-opacity:1;" + id="stop5177-6-9-6-1-9-8" /> + style="stop-color:#7979ff;stop-opacity:1;" + id="stop5179-73-8-3-1-8-3" /> + id="linearGradient2915-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7744,0,0,1.9697,-1892.2,-872.89)" + id="radialGradient2917-0" + xlink:href="#linearGradient5060-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7744,0,0,1.9697,-1891.6,-872.89)" + id="linearGradient5060-0"> + id="radialGradient2919-7" + xlink:href="#linearGradient5060-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.7744,0,0,1.9697,112.76,-872.89)" + id="linearGradient3035-2"> + id="linearGradient2932-6" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.054893,0.013851,0.0025726,0.052482,-0.7128,-0.26741)" + style="stop-color:#f0c178" + style="stop-color:#e18941" + style="stop-color:#ec4f18" + id="linearGradient2934-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.0083,0,0,1.0006,-8.2398e-4,-0.0066209)" + style="stop-color:#bb2b12" + style="stop-color:#cd7233" + id="linearGradient2929-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.29669,0,0,0.35207,1.8805,2.1186)" + style="stop-color:#fff;stop-opacity:.2" + style="stop-color:#fff;stop-opacity:0" + id="linearGradient2536-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.32803,0,0,0.32571,4.445,4.532)" + style="stop-color:#ecf5b6" + style="stop-color:#9fba48" + gradientTransform="matrix(0.32803,0,0,0.32571,4.445,4.532)" + gradientUnits="userSpaceOnUse" + id="linearGradient3065" + xlink:href="#linearGradient2536-8" + inkscape:collect="always" /> + id="linearGradient8226-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.12421,0,0,0.1864,0.23313,-3.9907)" + style="stop-color:#7a7a7a" + style="stop-color:#474747" + id="linearGradient8223" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.55458,0,0,0.35955,-1.6911,1.3146)" + style="stop-color:#bbb;stop-opacity:0" + id="linearGradient8220" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.55458,0,0,0.35955,-2.1323,1.7913)" + style="stop-color:#eee" + style="stop-color:#eee;stop-opacity:0" + id="radialGradient8215" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1767,1.0377,-0.76928,0.87233,1.0364,-3.2772)" + style="stop-color:#e6e6e6" + style="stop-color:#c8c8c8" + id="linearGradient8217" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.64516,0,0,0.97976,0.25806,-6.7257)" + style="stop-color:#969696" + style="stop-color:#b4b4b4" + id="radialGradient8211" + xlink:href="#linearGradient4035-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.12709,-0.0021289,9.4059e-4,0.12249,-10.298,-14.5)" + id="linearGradient4035-5"> + style="stop-color:#f5f5f5" + style="stop-color:#e7e7e7" + style="stop-color:#8c8c8c" + style="stop-color:#ddd" + style="stop-color:#a8a8a8" + id="radialGradient8208" + xlink:href="#linearGradient4035-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.061651,0,0,-0.065372,-1.0371,17.524)" + id="linearGradient3066"> + style="stop-color:#f5f5f5" + style="stop-color:#e7e7e7" + style="stop-color:#8c8c8c" + style="stop-color:#ddd" + style="stop-color:#a8a8a8" + id="radialGradient8201" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.33333,0,0,0.14286,6.5e-7,8)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + id="radialGradient8198" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.041797,-0.013884,0.0033869,0.037975,-0.54191,-0.79595)" + style="stop-color:#f5f5f5" + style="stop-color:#e7e7e7" + style="stop-color:#8c8c8c" + style="stop-color:#ddd" + style="stop-color:#a8a8a8" + gradientTransform="matrix(0.041797,-0.013884,0.0033869,0.037975,-0.54191,-0.79595)" + gradientUnits="userSpaceOnUse" + id="radialGradient3101" + xlink:href="#radialGradient8198" + inkscape:collect="always" /> + gradientTransform="translate(-40,0)" + gradientUnits="userSpaceOnUse" + id="linearGradient17986-08" + xlink:href="#linearGradient5175-3-7-9-2-7-1" + inkscape:collect="always" /> + id="linearGradient5175-3-7-9-2-7-1"> + style="stop-color:#bdcccd;stop-opacity:1;" + id="stop5177-6-9-6-1-9-0" /> + style="stop-color:#7979ff;stop-opacity:1;" + id="stop5179-73-8-3-1-8-7" /> + gradientTransform="translate(-40,0)" + gradientUnits="userSpaceOnUse" + id="linearGradient18365" + xlink:href="#linearGradient5175-3-7-9-2-7-1" + inkscape:collect="always" /> + id="linearGradient3262-4" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-17.058,0)" + style="stop-color:#f6f6f6" + style="stop-color:#ccc" + id="linearGradient3264-6" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-17.058,0)" + style="stop-color:#aaa" + style="stop-color:#8c8c8c" + id="linearGradient3260-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.096142,0,0,0.096142,1.8469,1.943)" + style="stop-color:#e5e5e5" + style="stop-color:#ababab" + id="linearGradient2517-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.31429,0,0,0.32593,0.45711,-0.32225)" + style="stop-color:#f4f4f4" + style="stop-color:#dbdbdb" + id="linearGradient2519-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.25379,0,0,0.30502,19.129,-0.68549)" + style="stop-color:#aaa" + style="stop-color:#c8c8c8" + id="linearGradient2511-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.27273,0,0,0.30232,1.4546,0.7442)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + id="linearGradient2507-51" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3092,0,0,0.37669,0.47615,0.10718)" + style="stop-color:#fefefe" + style="stop-color:#cbcbcb" + gradientTransform="matrix(0.3092,0,0,0.37669,0.47615,0.10718)" + gradientUnits="userSpaceOnUse" + id="linearGradient3039-9" + xlink:href="#linearGradient2507-51" + inkscape:collect="always" /> @@ -86085,7 +88212,7 @@
- sodipodi:role="line">%% Build Clean editPLC HMIEditor ImportFile ImportDEF ImportSVG NetworkEdit ShowMaster ExportSlave Run ShowIECcode Stop Unknown %%</tspan></text>
+ sodipodi:role="line">%% Build Clean editPLC HMIEditor ImportFile ManageFolder ImportDEF ImportSVG NetworkEdit ShowMaster ExportSlave Run ShowIECcode Stop Unknown %%</tspan></text> style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -86271,7 +88398,7 @@
inkscape:connector-curvature="0" />
- transform="translate(1777.0897,-400.03854)"
+ transform="translate(1869.0897,-400.03854)" @@ -86290,7 +88417,7 @@
inkscape:connector-curvature="0" />
- transform="translate(1560.1847,-369.94418)"
+ transform="translate(1652.1847,-369.94418)" @@ -86567,7 +88694,7 @@
- transform="translate(1830.9892,-430.1329)">
+ transform="translate(1922.9892,-430.1329)"> @@ -86577,7 +88704,7 @@
style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
- transform="matrix(1.6473499,0,0,1.6473499,910.92343,183.57576)"
+ transform="matrix(1.6473499,0,0,1.6473499,1002.9234,183.57576)" style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient19976);fill-opacity:1;stroke:#547c1b;stroke-width:0.1061436;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Andale Mono"><flowRegion
@@ -86591,7 +88718,7 @@
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient34167);fill-opacity:1;stroke:#547c1b;stroke-width:0.1061436;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Andale Mono" /></flowRegion><flowPara
style="fill:url(#linearGradient19974);fill-opacity:1;stroke:#547c1b;stroke-width:0.1061436;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">ST</flowPara></flowRoot> <g
- transform="matrix(0.07159976,0,0,0.07159976,773.18029,195.95335)"
+ transform="matrix(0.07159976,0,0,0.07159976,865.18029,195.95335)" d="m 144.80549,88.557517 c 0,39.134993 -31.76158,70.896673 -70.896401,70.896673 -39.135167,0 -70.8967476,-31.76168 -70.8967476,-70.896673 0,-39.134957 31.7615806,-70.896643 70.8967476,-70.896643 39.134821,0 70.896401,31.761686 70.896401,70.896643 z"
@@ -86681,7 +88808,7 @@
inkscape:connector-curvature="0" />
- transform="translate(1898.8886,-460.22727)"
+ transform="translate(1990.8886,-460.22727)" @@ -86777,7 +88904,7 @@
transform="matrix(0.5724346,-0.3079575,0.3079575,0.5724346,131.42904,887.47867)" />
- transform="translate(1402.788,-309.831)"
+ transform="translate(1494.788,-309.831)" @@ -86857,7 +88984,7 @@
- transform="translate(1474.788,-339.84989)"
+ transform="translate(1566.788,-339.84989)" @@ -86999,7 +89126,7 @@
- sodipodi:role="line">%% Add Delete Disabled Enabled HideVars IECCDown IECCUp Maximize Minimize minus plus ShowVars %%</tspan></text>
+ sodipodi:role="line">%% Add Delete Disabled Enabled HideVars IECCDown IECCUp Maximize Minimize minus plus ShowVars LeftCopy RightCopy%%</tspan></text> transform="matrix(1.0031449,0,0,1.0031449,797.89799,82.2456)" />
@@ -89490,7 +91617,7 @@
- transform="translate(1635.0897,-400.03854)">
+ transform="translate(1727.0897,-400.03854)"> @@ -89787,7 +91914,7 @@
- sodipodi:role="line">%% Extension Cfile Pyfile wxGlade SVGUI %%</tspan></text>
+ sodipodi:role="line">%% Extension Cfile Pyfile wxGlade SVGUI FOLDER FILE %%</tspan></text> inkscape:label="#use3839"
@@ -90756,7 +92883,7 @@
- transform="translate(1715.0897,-400.03854)">
+ transform="translate(1807.0897,-400.03854)"> @@ -90907,4 +93034,586 @@
transform="translate(0,0.99987)" />
+ transform="matrix(0.78594807,0,0,0.80079582,452.62316,322.85138)" + transform="matrix(0.36395,0,0,0.34457,-0.64485,-0.38545)"> + transform="matrix(0.021652,0,0,0.014857,43.008,42.685)"> + style="opacity:0.40206;fill:url(#linearGradient2915)" + inkscape:connector-curvature="0" + style="opacity:0.40206;fill:url(#radialGradient2917)" + d="m -219.62,-150.68 v 478.33 c 142.87,0.90045 345.4,-107.17 345.4,-239.2 0,-132.03 -159.44,-239.13 -345.4,-239.13 z" /> + inkscape:connector-curvature="0" + style="opacity:0.40206;fill:url(#radialGradient2919)" + d="m -1559.3,-150.68 v 478.33 c -142.87,0.90045 -345.4,-107.17 -345.4,-239.2 0,-132.03 159.44,-239.13 345.4,-239.13 z" /> + inkscape:connector-curvature="0" + style="fill:#ffffff;stroke:#a8a8a8;stroke-width:0.97899997;stroke-linecap:round;stroke-linejoin:round" + d="m 0.60164,1.5216 c -0.056258,0 -0.10449,0.060345 -0.10449,0.12267 0,4.6046 0.00337,8.6512 -6.554e-4,12.857 4.7063,-0.02397 9.4151,-0.04826 14.1230004,-0.06552 -0.41713,0 -1.1123,-0.07009 -1.1024,-0.94049 0.0035,-3.597 0.02296,-7.4084 0.01078,-10.981 H 7.4759746 c -0.47749,0 -1.0963,-0.99306 -1.5261,-0.99306 h -5.3477 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2932);stroke:url(#linearGradient2934-3);stroke-width:0.95339;stroke-linecap:round;stroke-linejoin:round" + d="m 2.5254,4.524 c 0.65636,0 12.48,0.031393 12.989,0.031393 0,0.61541 -0.02468,9.9581 -0.05407,9.9581 -4.5588,0.01775 -11.659,-0.01389 -12.987,-0.01389 0,-1.1615 0.05188,-7.5853 0.05188,-9.9756 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2929);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" + style="opacity:0.35;fill:none;stroke:#ffffff;stroke-width:1px" + d="M 3.499,14 V 5.5 h 11.5" /> + transform="translate(490.93931,321.78746)" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient17986);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + d="m -40,0 0,16 16,0 0,-16 -16,0 z m 1,1 14,0 0,14 -14,0 0,-14 z" + sodipodi:nodetypes="cccccccccc" + inkscape:label="#rect2160" /> + transform="matrix(0.39454693,0,0,0.39454693,458.92849,329.94337)" + inkscape:connector-curvature="0" + style="fill:url(#linearGradient3262);stroke:url(#linearGradient3264);stroke-linejoin:round;display:block" + d="M 6.9375,0.5 C 6.6891,0.5 6.5,0.68908 6.5,0.9375 v 1.25 C 5.9461,2.3297 5.4488,2.5594 4.9688,2.8438 L 4.0625,1.9375 c -0.17566,-0.17566 -0.44934,-0.17566 -0.625,0 l -1.5,1.5 c -0.17566,0.17566 -0.17566,0.44934 0,0.625 L 2.8438,4.9688 C 2.5594,5.4488 2.3297,5.9461 2.1875,6.5 h -1.25 C 0.68908,6.5 0.5,6.6891 0.5,6.9375 v 2.125 c 1e-8,0.24842 0.18908,0.4375 0.4375,0.4375 h 1.25 c 0.1422,0.5539 0.37188,1.0512 0.65625,1.5312 l -0.9063,0.907 c -0.17566,0.17566 -0.17566,0.44934 0,0.625 l 1.5,1.5 c 0.17566,0.17566 0.44934,0.17566 0.625,0 l 0.9063,-0.907 c 0.48,0.285 0.9773,0.514 1.5312,0.656 v 1.25 c 1e-7,0.24842 0.18908,0.4375 0.4375,0.4375 h 2.125 c 0.2484,0 0.4375,-0.189 0.4375,-0.438 v -1.25 c 0.5539,-0.1422 1.0512,-0.37188 1.5312,-0.65625 l 0.90625,0.90625 c 0.17566,0.17566 0.44934,0.17566 0.625,0 l 1.5,-1.5 c 0.17566,-0.17566 0.17566,-0.44934 0,-0.625 l -0.906,-0.906 c 0.285,-0.48 0.514,-0.977 0.656,-1.531 h 1.25 c 0.249,0 0.438,-0.1891 0.438,-0.4375 v -2.125 c 0,-0.2484 -0.189,-0.4375 -0.438,-0.4375 h -1.25 c -0.142,-0.5539 -0.371,-1.0512 -0.656,-1.5312 l 0.906,-0.9063 c 0.17566,-0.17566 0.17566,-0.44934 0,-0.625 l -1.5,-1.5 c -0.17566,-0.17566 -0.44934,-0.17566 -0.625,0 l -0.906,0.9063 c -0.48,-0.2844 -0.977,-0.5141 -1.531,-0.6563 v -1.25 C 9.5004,0.68878 9.3113,0.4997 9.0629,0.4997 H 6.9379 z M 8,6 c 1.104,0 2,0.896 2,2 0,1.104 -0.896,2 -2,2 C 6.896,10 6,9.104 6,8 6,6.896 6.896,6 8,6 z" /> + inkscape:connector-curvature="0" + d="M 8,3.4651 C 5.4994,3.4651 3.4651,5.4994 3.4651,8 c 0,2.501 2.0343,4.535 4.5349,4.535 2.501,0 4.535,-2.034 4.535,-4.535 C 12.535,5.4994 10.501,3.4651 8,3.4651 z m 0,2.093 c 1.3479,0 2.4419,1.094 2.4419,2.4419 0,1.3479 -1.094,2.4419 -2.4419,2.4419 -1.3479,0 -2.4419,-1.0941 -2.4419,-2.442 C 5.5581,6.652 6.6521,5.558 8,5.558 z" /> + inkscape:connector-curvature="0" + style="fill:none;stroke:url(#linearGradient3260)" + d="M 8,4 C 5.7944,4 4,5.7944 4,8 c 0,2.206 1.7944,4 4,4 2.206,0 4,-1.794 4,-4 C 12,5.7944 10.206,4 8,4 z" /> + transform="translate(1419.0472,-309.64524)" + style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + transform="translate(-1060.695,499.97716)" + transform="translate(0.036304,-1.2166e-7)"> + style="stroke-width:1.88259995" + transform="matrix(0.54593,0,0,0.51685,-1.002,-0.57818)"> + style="stroke-width:104.95999908" + transform="matrix(0.021652,0,0,0.014857,43.008,42.685)"> + style="opacity:0.40206;fill:url(#linearGradient18360)" + inkscape:connector-curvature="0" + style="opacity:0.40206;fill:url(#radialGradient18362)" + d="m -219.62,-150.68 v 478.33 c 142.88,0.9 345.4,-107.17 345.4,-239.2 0,-132.02 -159.44,-239.13 -345.4,-239.13 z" /> + inkscape:connector-curvature="0" + style="opacity:0.40206;fill:url(#radialGradient18364)" + d="m -1559.3,-150.68 v 478.33 c -142.8,0.9 -345.4,-107.17 -345.4,-239.2 0,-132.02 159.5,-239.13 345.4,-239.13 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient18366);stroke:url(#linearGradient18368);stroke-width:1.01110005;stroke-linecap:round;stroke-linejoin:round" + d="m 0.67728,2.5695 c -0.08554,0 -0.15887,0.0927 -0.15887,0.1885 0,5.8692 -0.04308,12.244 -0.04914,18.225 0.02908,0.895 0.53723,1.505 0.88963,1.508 1.0128,0.009 0.5393,-0.004 1.0486,0 6.4703,-0.016 13.578,-0.078 20.05,-0.094 0.053,0.007 -1.478,-0.108 -1.463,-1.446 0,-4.673 -0.502,-11.187 -0.502,-15.86 0,-0.1865 -0.015,-0.2905 -0.032,-0.3767 -0.012,-0.0665 -0.028,-0.0989 -0.063,-0.1257 -0.028,-0.0244 -0.055,-0.057 -0.096,-0.0628 h -8.82 c -0.815,0 -1.002,-1.992 -2.2134,-1.992 L 0.6768,2.5695 h -2e-5 z" /> + inkscape:connector-curvature="0" + style="fill:url(#radialGradient18370);stroke:url(#linearGradient18373);stroke-linecap:round;stroke-linejoin:round" + d="m 3.4994,6.5471 c 10.57,0 13.031,5e-4 19.994,-0.0275 0,1.5704 0.258,16.04 -0.484,16.04 -0.714,0 -14.046,-0.094 -21.009,-0.066 1.4717,0 1.4994,-0.623 1.4994,-15.947 v 1e-4 z" /> + inkscape:connector-curvature="0" + style="opacity:0.4;fill:none;stroke:url(#radialGradient18375);stroke-width:0.98119998" + d="m 22.939,7.6088 c 0,0 -16.832,0.0937 -18.397,-0.0923 -0.0829,13.83 -0.5009,14.44 -0.5009,14.44" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient18377);fill-rule:evenodd" + d="M 4.2517,6 C 3.5668,6 3,6.5124 3,7.1317 v 6.4373 c 0.0026,0.116 0.0661,0.247 0.1669,0.327 0.1008,0.081 0.2297,0.115 0.3755,0.101 h 0.0139 l 20.027,-2.867 c 0.232,-0.033 0.414,-0.215 0.417,-0.427 V 7.1317 C 24.0003,6.5124 23.4333,6 22.7483,6 H 4.2523 4.252 z" /> + style="fill:#e9a961;display:block" + transform="matrix(0.82971192,0,0,0.82971192,-1050.1806,511.63512)" + inkscape:connector-curvature="0" + style="fill:url(#linearGradient18422);stroke:url(#linearGradient18424);stroke-linejoin:round;display:block" + d="M 6.9375,0.5 C 6.6891,0.5 6.5,0.68908 6.5,0.9375 v 1.25 C 5.9461,2.3297 5.4488,2.5594 4.9688,2.8438 L 4.0625,1.9375 c -0.17566,-0.17566 -0.44934,-0.17566 -0.625,0 l -1.5,1.5 c -0.17566,0.17566 -0.17566,0.44934 0,0.625 L 2.8438,4.9688 C 2.5594,5.4488 2.3297,5.9461 2.1875,6.5 h -1.25 C 0.68908,6.5 0.5,6.6891 0.5,6.9375 v 2.125 c 1e-8,0.24842 0.18908,0.4375 0.4375,0.4375 h 1.25 c 0.1422,0.5539 0.37188,1.0512 0.65625,1.5312 l -0.9063,0.907 c -0.17566,0.17566 -0.17566,0.44934 0,0.625 l 1.5,1.5 c 0.17566,0.17566 0.44934,0.17566 0.625,0 l 0.9063,-0.907 c 0.48,0.285 0.9773,0.514 1.5312,0.656 v 1.25 c 1e-7,0.24842 0.18908,0.4375 0.4375,0.4375 h 2.125 c 0.2484,0 0.4375,-0.189 0.4375,-0.438 v -1.25 c 0.5539,-0.1422 1.0512,-0.37188 1.5312,-0.65625 l 0.90625,0.90625 c 0.17566,0.17566 0.44934,0.17566 0.625,0 l 1.5,-1.5 c 0.17566,-0.17566 0.17566,-0.44934 0,-0.625 l -0.906,-0.906 c 0.285,-0.48 0.514,-0.977 0.656,-1.531 h 1.25 c 0.249,0 0.438,-0.1891 0.438,-0.4375 v -2.125 c 0,-0.2484 -0.189,-0.4375 -0.438,-0.4375 h -1.25 c -0.142,-0.5539 -0.371,-1.0512 -0.656,-1.5312 l 0.906,-0.9063 c 0.17566,-0.17566 0.17566,-0.44934 0,-0.625 l -1.5,-1.5 c -0.17566,-0.17566 -0.44934,-0.17566 -0.625,0 l -0.906,0.9063 c -0.48,-0.2844 -0.977,-0.5141 -1.531,-0.6563 v -1.25 C 9.5004,0.68878 9.3113,0.4997 9.0629,0.4997 H 6.9379 z M 8,6 c 1.104,0 2,0.896 2,2 0,1.104 -0.896,2 -2,2 C 6.896,10 6,9.104 6,8 6,6.896 6.896,6 8,6 z" /> + inkscape:connector-curvature="0" + d="M 8,3.4651 C 5.4994,3.4651 3.4651,5.4994 3.4651,8 c 0,2.501 2.0343,4.535 4.5349,4.535 2.501,0 4.535,-2.034 4.535,-4.535 C 12.535,5.4994 10.501,3.4651 8,3.4651 z m 0,2.093 c 1.3479,0 2.4419,1.094 2.4419,2.4419 0,1.3479 -1.094,2.4419 -2.4419,2.4419 -1.3479,0 -2.4419,-1.0941 -2.4419,-2.442 C 5.5581,6.652 6.6521,5.558 8,5.558 z" /> + inkscape:connector-curvature="0" + style="fill:none;stroke:url(#linearGradient18426)" + d="M 8,4 C 5.7944,4 4,5.7944 4,8 c 0,2.206 1.7944,4 4,4 2.206,0 4,-1.794 4,-4 C 12,5.7944 10.206,4 8,4 z" /> + style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="translate(60.836042,-28.859222)" + inkscape:connector-curvature="0" + style="fill:url(#linearGradient18516-9);stroke:url(#linearGradient18518-4);stroke-width:0.99914002;stroke-linejoin:round" + d="m 707.55044,460.70882 h 13 v 15 h -13 v -15 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient18520-5);stroke:url(#linearGradient18522-8);stroke-width:0.99914002;stroke-linejoin:round" + d="m 713.55044,466.70882 h 13 v 15 h -13 v -15 z" /> + inkscape:connector-curvature="0" + style="opacity:0.2;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" + d="m 715.55084,477.70842 h 7 m -7,-3 h 8 m -8,-3 h 5 m -5,-3 h 9 m -15,3 h 3 m -3,-3 h 3 m -3,-3 h 5 m -5,-3 h 9" /> + transform="matrix(-1,0,0,1,788.67933,437.2062)" + d="M 8.4802,-1.4936 2.5,4.9999 8.4802,11.494" + style="fill:none;stroke:url(#linearGradient3056-3);stroke-width:5;stroke-linecap:round;stroke-linejoin:round;enable-background:new" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:url(#linearGradient3732);stroke-width:6;stroke-linecap:round;stroke-linejoin:round;enable-background:new" + inkscape:connector-curvature="0" /> + d="M 8.5111,-1.5245 2.5,4.9999 8.5112,11.524" + style="fill:none;stroke:url(#linearGradient4322-0);stroke-width:3;stroke-linecap:round;stroke-linejoin:round;enable-background:new" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:url(#linearGradient4324);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;enable-background:new" + inkscape:connector-curvature="0" /> + d="M 9.0423,10.543 6.5,8 C 5.5002,6.9998 6.5,6.5 8,6.5 h 10.5 c 3,0 2.5,-3 0,-3 h -10 c -1.5,0 -3,0 -2,-1.5 l 2.3356,-2.3382 c 1.5,-2 -0.5,-2.5 -1.5,-1.5 L 2,4 C 1.5,4.5 1.4724,5.3333 2,6 l 5.5423,6.0431 c 1,1 2.9997,2.54e-4 1.5,-1.5 z" + style="opacity:0.4;fill:none;stroke:url(#linearGradient3026);stroke-linecap:round;stroke-linejoin:round;enable-background:new" + inkscape:connector-curvature="0" /> + d="m 6.5,2 2.4035,-2.1981 c 1.5,-2 -0.5,-2.5 -1.5,-1.5 L 2,4 C 1.5,4.5 1.4724,5.3333 2,6 l 4.7125,5.2812 c 1,1 2.9702,0.02922 1.5,-1.5 L 6.5,8.0002" + style="opacity:0.4;fill:none;stroke:url(#linearGradient4462-8);stroke-linecap:round;stroke-linejoin:round;enable-background:new" + inkscape:connector-curvature="0" /> + style="opacity:0.23999999;fill:none;stroke:#f6daae;stroke-linecap:round;stroke-linejoin:round;enable-background:new" + inkscape:connector-curvature="0" /> + style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="translate(-5.3861648,-28.726212)" + inkscape:connector-curvature="0" + style="fill:url(#linearGradient18516);stroke:url(#linearGradient18518);stroke-width:0.99914002;stroke-linejoin:round" + d="m 707.55044,460.70882 h 13 v 15 h -13 v -15 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient18520);stroke:url(#linearGradient18522);stroke-width:0.99914002;stroke-linejoin:round" + d="m 713.55044,466.70882 h 13 v 15 h -13 v -15 z" /> + inkscape:connector-curvature="0" + style="opacity:0.2;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" + d="m 715.55084,477.70842 h 7 m -7,-3 h 8 m -8,-3 h 5 m -5,-3 h 9 m -15,3 h 3 m -3,-3 h 3 m -3,-3 h 5 m -5,-3 h 9" /> + transform="translate(700.66938,437.48261)"> + style="fill:none;stroke:url(#linearGradient3732-9);stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" + d="M 8.4801887,-1.4935535 2.5,4.99993 8.4801887,11.493553" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:url(#linearGradient4452-2);stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:url(#linearGradient4322-8);stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" + d="M 8.5110963,-1.5245386 2.5,4.99993 8.3036121,11.524354" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:url(#linearGradient4324-9);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" + inkscape:connector-curvature="0" /> + style="opacity:0.4;fill:none;stroke:url(#linearGradient3007-8);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" + d="M 8.8347091,10.612303 6.5,8 C 5.5575961,6.9455453 6.5,6.5 8,6.5 l 10.5,0 c 3,0 2.5,-3 0,-3 l -10,0 c -1.5,0 -3,0 -2,-1.5 l 2.3355739,-2.54571541 c 1.5000001,-1.99999999 -0.5,-2.49999999 -1.5,-1.49999999 L 2,4 C 1.5,4.5 1.4724356,5.3333333 2,6 l 5.3347091,6.112303 c 1,1 2.9136049,0.08168 1.5,-1.5 z" + inkscape:connector-curvature="0" /> + style="opacity:0.4;fill:none;stroke:url(#linearGradient4462-81);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" + d="m 6.5,2 2.4034591,-2.54398585 c 1.4999999,-1.99999995 -0.5,-2.49999995 -1.5,-1.49999995 L 2,4 C 1.5,4.5 1.4724356,5.3333333 2,6 l 5.3351415,6.111439 c 1,1 2.9140115,0.08132 1.5,-1.5 L 6.5,8" + inkscape:connector-curvature="0" /> + style="opacity:0.41999996;fill:none;stroke:#f6daae;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" + d="M 7.1241352,-1.6267296 2,4" + inkscape:connector-curvature="0" /> + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" + x="394.60934">Tree icons</tspan></text> + sodipodi:linespacing="125%" + style="font-size:12.76000023px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" + sodipodi:role="line">%% tree_drive tree_folder tree_file %%</tspan></text> + transform="translate(711.12206,260.10161)" + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2517);stroke:url(#linearGradient2519);stroke-width:0.99992001;stroke-linejoin:round" + d="M 1.5,0.49997 H 9.9412 C 10.383,0.66176 12.88,2.63277 13.5,3.90907 v 11.591 h -12 v -15 z" /> + inkscape:connector-curvature="0" + style="opacity:0.6;fill:none;stroke:url(#linearGradient2511-6)" + d="m 12.5,4.2151 v 10.285 h -10 v -13 h 7.2363" /> + inkscape:connector-curvature="0" + style="fill:#c1c1c1;fill-rule:evenodd" + d="M 9.2941,0.8409 C 10.142,3.6448 9,5.0341 9,5.0341 c 0,0 1.893,-1.2514 4.171,-0.1023 1.943,0.9798 0.036,-1.008 -0.041,-1.129 C 12.587,2.9553 10.707,1.1697 10.025,0.8726 9.9696,0.84836 9.5814,0.8409 9.2941,0.8409 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient3039-3);fill-rule:evenodd" + d="m 9.2941,0.8409 c 0.9879,0 0.7059,3.181 0.7059,3.181 0,0 2.272,-0.5007 3.171,0.9099 0.163,0.2556 0.036,-1.008 -0.041,-1.129 C 12.587,2.9553 10.707,1.1697 10.025,0.8726 9.9696,0.84836 9.5814,0.8409 9.2941,0.8409 z" /> + transform="translate(750.4138,260.14902)" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + inkscape:connector-curvature="0" + style="fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + d="m -40,0 0,16 16,0 0,-16 -16,0 z m 1,1 14,0 0,14 -14,0 0,-14 z" + id="path3806-1-6-1-9-8" + sodipodi:nodetypes="cccccccccc" + inkscape:label="#rect2160" /> + transform="translate(676.66234,259.77752)" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + inkscape:connector-curvature="0" + style="fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + d="m -40,0 0,16 16,0 0,-16 -16,0 z m 1,1 14,0 0,14 -14,0 0,-14 z" + id="path3806-1-6-1-9-8-0" + sodipodi:nodetypes="cccccccccc" + inkscape:label="#rect2160" /> + transform="translate(636.59356,259.12098)" + transform="matrix(0.36395,0,0,0.34457,-0.64485,-0.38545)"> + transform="matrix(0.021652,0,0,0.014857,43.008,42.685)"> + style="opacity:0.40206;fill:url(#linearGradient2915-8)" + inkscape:connector-curvature="0" + style="opacity:0.40206;fill:url(#radialGradient2917-0)" + d="m -219.62,-150.68 v 478.33 c 142.87,0.90045 345.4,-107.17 345.4,-239.2 0,-132.03 -159.44,-239.13 -345.4,-239.13 z" /> + inkscape:connector-curvature="0" + style="opacity:0.40206;fill:url(#radialGradient2919-7)" + d="m -1559.3,-150.68 v 478.33 c -142.87,0.90045 -345.4,-107.17 -345.4,-239.2 0,-132.03 159.44,-239.13 345.4,-239.13 z" /> + inkscape:connector-curvature="0" + style="fill:#ffffff;stroke:#a8a8a8;stroke-width:0.97899997;stroke-linecap:round;stroke-linejoin:round" + d="m 0.60164,1.5216 c -0.056258,0 -0.10449,0.060345 -0.10449,0.12267 0,4.6046 0.00337,8.6512 -6.554e-4,12.857 4.7063,-0.02397 9.4151,-0.04826 14.1230004,-0.06552 -0.41713,0 -1.1123,-0.07009 -1.1024,-0.94049 0.0035,-3.597 0.02296,-7.4084 0.01078,-10.981 H 7.4759746 c -0.47749,0 -1.0963,-0.99306 -1.5261,-0.99306 h -5.3477 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2932-6);stroke:url(#linearGradient2934-0);stroke-width:0.95339;stroke-linecap:round;stroke-linejoin:round" + d="m 2.5254,4.524 c 0.65636,0 12.48,0.031393 12.989,0.031393 0,0.61541 -0.02468,9.9581 -0.05407,9.9581 -4.5588,0.01775 -11.659,-0.01389 -12.987,-0.01389 0,-1.1615 0.05188,-7.5853 0.05188,-9.9756 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2929-8);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" + style="opacity:0.35;fill:none;stroke:#ffffff;stroke-width:1px" + d="M 3.499,14 V 5.5 h 11.5" /> + transform="translate(567.48083,260.67786)" + inkscape:connector-curvature="0" + style="fill:url(#linearGradient8226-8);stroke:#353537;stroke-linejoin:round" + d="m 15.497,12.5 c -0.30416,2.535 -0.22639,2.9839 -0.77717,2.9839 -0.21573,0.03617 -8.6983,0 -13.47,0 -0.59814,0 -0.447,0.04932 -0.7499,-2.9839 4.8142,0.13977 10.032,-0.37056 14.997,0 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient8223);fill-rule:evenodd" + d="m 2,13 h 10 v 2 H 2.2256 L 2,13 z" /> + inkscape:connector-curvature="0" + style="opacity:0.81142997;fill:url(#linearGradient8220);fill-rule:evenodd" + d="M 2.2256,15 2.07522,13.5577 C 3.09312,14.7008 6.82662,15 9.40042,15 h -7.1749 z" /> + inkscape:connector-curvature="0" + style="fill:url(#radialGradient8215);stroke:url(#linearGradient8217);stroke-linecap:round;stroke-linejoin:round" + d="M 1.4897,1.4658 0.51475,12.4888 C 0.505,12.4888 0.5,12.4918 0.5,12.4998 h 15 c 0,-0.0082 -0.005,-0.01111 -0.01475,-0.01111 l -1.005,-11.241 c 0,0 -0.18775,-0.7434 -0.90964,-0.7434 -0.68815,0 -10.535,-0.004447 -11.26,-0.004447 -0.75868,0 -0.82051,0.96576 -0.82051,0.96576 z" /> + inkscape:connector-curvature="0" + style="opacity:0.7;fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round" + d="m 1.4763,12.5 h 13.047" /> + inkscape:connector-curvature="0" + style="fill:url(#radialGradient8211)" + d="M 9.875,1.0312 C 9.5425,1.0312 9.2896,1.1934 9.2812,1.4375 7.5462,4.2547 3.716,3.331 2.1875,6.6875 2.1073,7.5502 2.3134,8.6701 3.0938,9.375 4.236,10.407 6.138,11.041 8.1562,11 12.322,10.915 15.991,8.1998 12.812,4.6562 12.795,4.4114 12.562,1.4375 12.562,1.4375 12.545,1.1967 12.268,1.0312 11.938,1.0312 H 9.8755 z M 9.84375,1.4687 h 2.0625 c 0.1199,0 0.214,0.027064 0.21875,0.09375 l -0.437,3.0938 c 3.473,2.8052 0.258,5.1235 -3.438,5.25 -3.3581,0.1148 -5.2801,-1.0583 -5.0938,-3.0624 1.1782,-3.3771 5.7075,-1.762 6.4688,-5.2813 -0.0195,-0.0627 0.1015,-0.0937 0.2188,-0.0937 z" /> + inkscape:connector-curvature="0" + style="fill:url(#radialGradient8208)" + d="M 7.9999,8.9999 C 7.3338,9.004 6.6179,8.7648 6.2183,8.2045 5.8879,7.7377 5.9413,7.0421 6.3494,6.638 6.8328,6.1198 7.5867,5.9505 8.2719,6.0129 8.879,6.0691 9.5104,6.3443 9.8354,6.883 10.087,7.317 10.047,7.9042 9.7165,8.2869 9.3098,8.7948 8.6299,8.9998 7.9999,8.9999 z M 8.033429,6.9404 c -0.4657,0.0106 -0.9649,-0.0032 -1.3803,0.2407 -0.2744,0.1909 -0.298,0.6023 -0.1132,0.8636 0.2517,0.392 0.7264,0.5638 1.1687,0.6235 0.5705,0.0718 1.1976,-0.0568 1.6262,-0.4584 0.2414,-0.24 0.3518,-0.6735 0.1113,-0.9512 -0.2382,-0.2503 -0.6084,-0.2735 -0.932,-0.3044 -0.16,-0.0106 -0.3204,-0.0122 -0.4806,-0.0138 z" /> + transform="matrix(-0.046858,0,0,0.077502,4.3055,-2.9911)"> + inkscape:connector-curvature="0" + d="m 37.925,187.15 c 0.31446,3.4586 5.0238,6.279 10.514,6.279 5.4879,0 9.6432,-2.8205 9.2763,-6.279 -0.36437,-3.4402 -5.0712,-6.2181 -10.507,-6.2181 -5.438,0.002 -9.5933,2.7778 -9.2838,6.2181 z" /> + transform="matrix(-0.046858,0,0,0.077502,16.206,-2.9911)"> + inkscape:connector-curvature="0" + d="m 37.925,187.15 c 0.31446,3.4586 5.0238,6.279 10.514,6.279 5.4879,0 9.6432,-2.8205 9.2763,-6.279 -0.36437,-3.4402 -5.0712,-6.2181 -10.507,-6.2181 -5.438,0.002 -9.5933,2.7778 -9.2838,6.2181 z" /> + style="opacity:0.2;fill:url(#radialGradient8201)" + inkscape:connector-curvature="0" + style="fill:url(#radialGradient3101)" + d="M 3.549,1.2794 C 3.5821,1.4639 3.5033,1.6681 3.4766,1.8578 3.3642,2.438 3.2481,3.0174 3.1388,3.5982 3.0365,3.9765 3.4034,3.8226 3.4488,3.861 3.9285,3.6779 4.4038,3.4775 4.8814,3.2862 5.3796,3.0824 5.8809,2.8849 6.3773,2.6771 6.6903,2.4909 6.7821,2.3238 6.8636,2.0429 6.9085,1.799 6.9139,1.5263 6.792,1.3034 6.7139,1.1494 6.5435,1.0842 6.3798,1.1074 H 3.7772 L 3.549,1.2794 z m 0.58899,0.44397 c 0.59213,0 1.1843,-1e-7 1.7764,-1e-7 0.1871,0.070513 0.054625,0.21948 -0.083295,0.23252 -0.6014,0.2439 -1.2028,0.4878 -1.8041,0.7317 -0.1446,0.0544 -0.155,-0.1673 -0.1113,-0.2613 0.037079,-0.20752 0.074157,-0.41504 0.11124,-0.62256 0.041217,-0.021125 0.065659,-0.065363 0.11102,-0.080349 z" /> + transform="translate(607.62908,260.74427)" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + inkscape:connector-curvature="0" + style="fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + d="m -40,0 0,16 16,0 0,-16 -16,0 z m 1,1 14,0 0,14 -14,0 0,-14 z" + id="path3806-1-6-1-9-8-0-5" + sodipodi:nodetypes="cccccccccc" + inkscape:label="#rect2160" /> + transform="matrix(0.83945151,0,0,0.83945151,496.66938,322.90098)" + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2517-1);stroke:url(#linearGradient2519-4);stroke-width:0.99992001;stroke-linejoin:round" + d="M 1.5,0.49997 H 9.9412 C 10.383,0.66176 12.88,2.63277 13.5,3.90907 v 11.591 h -12 v -15 z" /> + inkscape:connector-curvature="0" + style="opacity:0.6;fill:none;stroke:url(#linearGradient2511-5)" + d="m 12.5,4.2151 v 10.285 h -10 v -13 h 7.2363" /> + inkscape:connector-curvature="0" + style="fill:#c1c1c1;fill-rule:evenodd" + d="M 9.2941,0.8409 C 10.142,3.6448 9,5.0341 9,5.0341 c 0,0 1.893,-1.2514 4.171,-0.1023 1.943,0.9798 0.036,-1.008 -0.041,-1.129 C 12.587,2.9553 10.707,1.1697 10.025,0.8726 9.9696,0.84836 9.5814,0.8409 9.2941,0.8409 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient3039-9);fill-rule:evenodd" + d="m 9.2941,0.8409 c 0.9879,0 0.7059,3.181 0.7059,3.181 0,0 2.272,-0.5007 3.171,0.9099 0.163,0.2556 0.036,-1.008 -0.041,-1.129 C 12.587,2.9553 10.707,1.1697 10.025,0.8726 9.9696,0.84836 9.5814,0.8409 9.2941,0.8409 z" /> + transform="translate(534.91586,321.71842)" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient18365);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + d="m -40,0 0,16 16,0 0,-16 -16,0 z m 1,1 14,0 0,14 -14,0 0,-14 z" + id="path3806-1-6-1-9-0" + sodipodi:nodetypes="cccccccccc" + inkscape:label="#rect2160" /> + transform="matrix(0.39454693,0,0,0.39454693,503.03943,330.01484)" + inkscape:connector-curvature="0" + style="fill:url(#linearGradient3262-4);stroke:url(#linearGradient3264-6);stroke-linejoin:round;display:block" + d="M 6.9375,0.5 C 6.6891,0.5 6.5,0.68908 6.5,0.9375 v 1.25 C 5.9461,2.3297 5.4488,2.5594 4.9688,2.8438 L 4.0625,1.9375 c -0.17566,-0.17566 -0.44934,-0.17566 -0.625,0 l -1.5,1.5 c -0.17566,0.17566 -0.17566,0.44934 0,0.625 L 2.8438,4.9688 C 2.5594,5.4488 2.3297,5.9461 2.1875,6.5 h -1.25 C 0.68908,6.5 0.5,6.6891 0.5,6.9375 v 2.125 c 1e-8,0.24842 0.18908,0.4375 0.4375,0.4375 h 1.25 c 0.1422,0.5539 0.37188,1.0512 0.65625,1.5312 l -0.9063,0.907 c -0.17566,0.17566 -0.17566,0.44934 0,0.625 l 1.5,1.5 c 0.17566,0.17566 0.44934,0.17566 0.625,0 l 0.9063,-0.907 c 0.48,0.285 0.9773,0.514 1.5312,0.656 v 1.25 c 1e-7,0.24842 0.18908,0.4375 0.4375,0.4375 h 2.125 c 0.2484,0 0.4375,-0.189 0.4375,-0.438 v -1.25 c 0.5539,-0.1422 1.0512,-0.37188 1.5312,-0.65625 l 0.90625,0.90625 c 0.17566,0.17566 0.44934,0.17566 0.625,0 l 1.5,-1.5 c 0.17566,-0.17566 0.17566,-0.44934 0,-0.625 l -0.906,-0.906 c 0.285,-0.48 0.514,-0.977 0.656,-1.531 h 1.25 c 0.249,0 0.438,-0.1891 0.438,-0.4375 v -2.125 c 0,-0.2484 -0.189,-0.4375 -0.438,-0.4375 h -1.25 c -0.142,-0.5539 -0.371,-1.0512 -0.656,-1.5312 l 0.906,-0.9063 c 0.17566,-0.17566 0.17566,-0.44934 0,-0.625 l -1.5,-1.5 c -0.17566,-0.17566 -0.44934,-0.17566 -0.625,0 l -0.906,0.9063 c -0.48,-0.2844 -0.977,-0.5141 -1.531,-0.6563 v -1.25 C 9.5004,0.68878 9.3113,0.4997 9.0629,0.4997 H 6.9379 z M 8,6 c 1.104,0 2,0.896 2,2 0,1.104 -0.896,2 -2,2 C 6.896,10 6,9.104 6,8 6,6.896 6.896,6 8,6 z" /> + inkscape:connector-curvature="0" + d="M 8,3.4651 C 5.4994,3.4651 3.4651,5.4994 3.4651,8 c 0,2.501 2.0343,4.535 4.5349,4.535 2.501,0 4.535,-2.034 4.535,-4.535 C 12.535,5.4994 10.501,3.4651 8,3.4651 z m 0,2.093 c 1.3479,0 2.4419,1.094 2.4419,2.4419 0,1.3479 -1.094,2.4419 -2.4419,2.4419 -1.3479,0 -2.4419,-1.0941 -2.4419,-2.442 C 5.5581,6.652 6.6521,5.558 8,5.558 z" /> + inkscape:connector-curvature="0" + style="fill:none;stroke:url(#linearGradient3260-1)" + d="M 8,4 C 5.7944,4 4,5.7944 4,8 c 0,2.206 1.7944,4 4,4 2.206,0 4,-1.794 4,-4 C 12,5.7944 10.206,4 8,4 z" />