Skip to content

Commit

Permalink
Исправил стандартное меню и поправил перевод
Browse files Browse the repository at this point in the history
  • Loading branch information
@veb86
veb86 committed Jan 14, 2025
1 parent c854c47 commit 1e3862b
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 79 deletions.
116 changes: 60 additions & 56 deletions environment/runtimefiles/common/cfg/menu/menuscontent.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
<Action Name="ACN_CUTCLIP"/>
<Action Name="ACN_COPYCLIP"/>
<Action Name="ACN_COPYCLIPBASE"/>
<Separator/>
<Action Name="ACN_PASTE"/>
<Action Name="ACN_DUPLICATE"/>
<Separator/>
<Separator/>
<Action Name="ACN_ERASE"/>
<Separator/>
<Action Name="ACN_SELECTALL"/>
<Action Name="ACN_DESELECTALL"/>
<Action Name="ACN_INVERSESELECTED"/>
<Action Name="ACN_SELSIM"/>
<Action Name="ACN_MATCHPROP"/>
<Separator/>
<Action Name="ACN_FIND"/>
<Action Name="ACN_FINDNEXT"/>
Expand All @@ -46,7 +46,6 @@
</Menu>
<Menu Name="View">
<Action Name="ACN_REGEN"/>
<Action Name="ACN_PROJECTTREE"/>
<Separator/>
<SubMenu Name="View">
<Action Name="ACN_VIEWTOP"/>
Expand Down Expand Up @@ -101,91 +100,94 @@
</SubMenu>
</Menu>
<Menu Name="Format">
<Action Name="ACN_UNITS"/>
<Command Caption="Layers (objinsp)" Command="SetObjInsp(LAYERS)"/>
<Action Name="ACN_LAYER"/>
<SubMenu Name="Text">
<Action Name="ACN_TSTYLES"/>
<Command Caption="Styles (objinsp)" Command="SetObjInsp(TSTYLES)"/>
<Command Caption="Fonts (objinsp)" Command="SetObjInsp(FONTS)"/>
<SubMenu Name="Layer Tools">
<Action Name="ACN_LAYOFF"/>
</SubMenu>
<Separator/>
<Action Name="ACN_TSTYLES"/>
<Action Name="ACN_LTYPES"/>
<Action Name="ACN_DSTYLES"/>
<Command Caption="Line type styles (objinsp)" Command="SetObjInsp(LINETYPESTYLES)"/>
<Command Caption="Table styles (objinsp)" Command="SetObjInsp(TABLESTYLES)"/>
<Command Caption="Dim styles (objinsp)" Command="SetObjInsp(DIMSTYLES)"/>
<Command Caption="Numerators (objinsp)" Command="SetObjInsp(NUMERATORS)"/>
<Command Caption="Layouts (not impl)" Command="fuckoff"/>
</Menu>
<Menu Name="Tools">
<Action Name="ACN_SPELLCHECK"/>
<Separator/>
<Action Name="ACN_UNITS"/>
</Menu>
<Menu Name="Service">
<IFONE Conditions="ActiveDrawing">
<Action Name="ACN_SPELLCHECK"/>
<Separator/>
</IFONE>
<IFONE Conditions="DebugUI">
<Action Name="ACN_REBUILDTREE"/>
<Separator/>
</IFONE>
<SubMenu Name="Docking toolbars">
<Action Name="ACN_DOCKOPT"/>
<Action Name="ACN_SAVELAYOUT"/>
</SubMenu>
<SubMenu Name="Settings">
<Action Name="ACN_OPTIONS"/>
<Action Name="ACN_SAVEOPTIONS"/>
</SubMenu>
</Menu>
<Menu Name="Draw">
<Action Name="ACN_LINE"/>
<Separator/>
<Action Name="ACN_3DPOLY"/>
<Action Name="ACN_RECTANGLE"/>
<SubMenu Name="Polygon">
<Action Name="ACN_POLYGONCC"/>
<Action Name="ACN_POLYGONCV"/>
</SubMenu>
<Separator/>
<SubMenu Name="Circle">
<Action Name="ACN_CIRCLE"/>
<Action Name="ACN_CIRCLECD"/>
<Action Name="ACN_CIRCLE2P"/>
<Action Name="ACN_CIRCLE3P"/>
</SubMenu>
<SubMenu Name="Polygon">
<Action Name="ACN_RECTANGLE"/>
<Action Name="ACN_POLYGONCC"/>
<Action Name="ACN_POLYGONCV"/>
</SubMenu>
<Action Name="ACN_ARC"/>
<Separator/>
<Action Name="ACN_BInsert"/>
<Separator/>
<Action Name="ACN_TEXT"/>
</Menu>
<Menu Name="Dimension">
<Action Name="ACN_DIMALIGNED"/>
<Action Name="ACN_DIMLINEAR"/>
<Action Name="ACN_DIMRADIAL"/>
<Action Name="ACN_DIMDIAMETRIC"/>
<Separator/>
<Action Name="ACN_DSTYLES"/>
<Separator/>
<Action Name="ACN_DIST"/>
</Menu>
<Menu Name="Modify">
<Menu Name="Modify">
<Action Name="ACN_MATCHPROP"/>
<Separator/>
<Action Name="ACN_POLYED"/>
<SubMenu Name="Layers">
<Action Name="ACN_LAYOFF"/>
</SubMenu>
<Separator/>
<Action Name="ACN_BEDIT"/>
<SubMenu Name="Block/Device">
<Action Name="ACN_BEDIT"/>
<Action Name="ACN_ADDTOOWNER"/>
<Action Name="ACN_COPYFROMOWNER"/>
<Separator/>
<Action Name="ACN_BREPLACE"/>
<Action Name="ACN_BSCALE"/>
<Action Name="ACN_BROTATE"/>
</SubMenu>
<Separator/>
<Separator/>
<Action Name="ACN_ERASE"/>
<Action Name="ACN_MOVE"/>
<Action Name="ACN_COPY"/>
<Action Name="ACN_MOVE"/>
<Action Name="ACN_SCALE"/>
<Separator/>
<Action Name="ACN_ROTATE"/>
<Action Name="ACN_SCALE"/>
<Action Name="ACN_STRETCH"/>
<Action Name="ACN_ROTATEENTS_R"/>
<Action Name="ACN_ROTATEENTS_L"/>
<Separator/>
<Action Name="ACN_MIRROR"/>
<Separator/>
<SubMenu Name="Text">
<Action Name="ACN_smtextall"/>
<Action Name="ACN_smtextarea"/>
</SubMenu>
<Separator/>
<Action Name="ACN_VARSED"/>
<Action Name="ACN_VARSEDSEL"/>
</Menu>
<Menu Name="Info">
<Action Name="ACN_DIST"/>
<Separator/>
<Command Caption="Names of entities" Command="VarReport(NMO_Name)"/>
<Command Caption="Names of devices with axis" Command="ExportDevWithAxis"/>
</Menu>
<Menu Name="Settings">
<Action Name="ACN_OPTIONS"/>
<Action Name="ACN_SAVEOPTIONS"/>
<Separator/>
<Action Name="ACN_DOCKOPT"/>
<Action Name="ACN_SAVELAYOUT"/>
<Separator/>
<Action Name="ACN_STRETCH"/>
</Menu>
<Menu Name="Window">
<Action Name="ACN_CLOSE"/>
Expand Down Expand Up @@ -351,16 +353,18 @@
</Menu>
<Menu Name="MAINMENU">
<InsertMenu Name="File"/>
<IFONE Conditions="ActiveDrawing">
<IFONE Conditions="ActiveDrawing">
<InsertMenu Name="Edit"/>
</IFONE>
<InsertMenu Name="View"/>
<IFONE Conditions="ActiveDrawing">
<InsertMenu Name="Format"/>
<InsertMenu Name="Tools"/>
</IFONE>
<InsertMenu Name="Service"/>
<IFONE Conditions="ActiveDrawing">
<InsertMenu Name="Draw"/>
<InsertMenu Name="Dimension"/>
<InsertMenu Name="Modify"/>
<InsertMenu Name="Info"/>
<InsertMenu Name="Settings"/>
<InsertMenu Name="Window"/>
</IFONE>
<InsertMenu Name="Help"/>
Expand Down
6 changes: 3 additions & 3 deletions environment/runtimefiles/common/data/languages/rtzcad.ru.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ msgstr ""

#: zcadexternal.acn_brotate~caption
msgid "Block rotate"
msgstr "Повернуть блокки"
msgstr "Повернуть блоки"

#: zcadexternal.acn_brotate~textimage
msgctxt "zcadexternal.acn_brotate~textimage"
Expand Down Expand Up @@ -1873,7 +1873,7 @@ msgstr "Закрепление панелей"

#: zcadexternal.menu~draw
msgid "Draw"
msgstr "Чертить"
msgstr "Черчение"

#: zcadexternal.menu~edit
msgid "Edit"
Expand Down Expand Up @@ -1943,7 +1943,7 @@ msgstr "Модель"

#: zcadexternal.menu~modify
msgid "Modify"
msgstr "Изменить"
msgstr "Изменение"

#: zcadexternal.menu~pan
msgid "Pan"
Expand Down
43 changes: 23 additions & 20 deletions environment/runtimefiles/zcad/cfg/components/defaultlayout.xml
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<CONFIG>
<MainConfig>
<Nodes ChildCount="1">
<Item1 Name="DockPanel" Type="CustomSite" ChildCount="1">
<Bounds Top="3" Left="7" Width="931" Height="645"/>
<Nodes Monitor="0" ChildCount="1" PixelsPerInch="0">
<Item1 Name="DockPanel" Type="CustomSite" Monitor="0" ChildCount="1" PixelsPerInch="0">
<Bounds Top="234" Left="1064" Width="1373" Height="935"/>
<Anchors Align="Client"/>
<Item1 Name="AnchorDockSite4" Type="Layout" ChildCount="5">
<Bounds Width="885" Height="541"/>
<Item1 Name="AnchorDockSite4" Type="Layout" Monitor="0" ChildCount="5">
<Bounds Width="1339" Height="848"/>
<Anchors Align="Client"/>
<Item1 Name="CommandLine" Type="Control">
<Bounds Top="411" Left="278" Width="607" Height="130"/>
<Item1 Name="CommandLine" Type="Control" Monitor="0">
<Bounds Top="651" Left="343" Width="996" Height="197"/>
<Anchors Top="AnchorDockSplitter1" Left="AnchorDockSplitter2"/>
</Item1>
<Item2 Name="AnchorDockSplitter1" Type="SplitterHorizontal">
<Bounds Top="407" Left="278" Width="607" Height="4"/>
<Item2 Name="AnchorDockSplitter1" Type="SplitterHorizontal" Monitor="0">
<Bounds Top="647" Left="343" Width="996" Height="4"/>
<Anchors Left="AnchorDockSplitter2"/>
</Item2>
<Item3 Name="PageControl" Type="Control">
<Bounds Left="278" Width="607" Height="407"/>
<Item3 Name="PageControl" Type="Control" Monitor="0">
<Bounds Left="343" Width="996" Height="647"/>
<Anchors Left="AnchorDockSplitter2" Bottom="AnchorDockSplitter1"/>
</Item3>
<Item4 Name="AnchorDockSplitter2" Type="SplitterVertical">
<Bounds Left="274" Width="4" Height="541"/>
<Item4 Name="AnchorDockSplitter2" Type="SplitterVertical" Monitor="0">
<Bounds Left="339" Width="4" Height="848"/>
</Item4>
<Item5 Name="ObjectInspector" Type="Control">
<Bounds Width="274" Height="541"/>
<Item5 Name="ObjectInspector" Type="Control" Monitor="0">
<Bounds Width="339" Height="848"/>
<Anchors Right="AnchorDockSplitter2"/>
</Item5>
</Item1>
Expand All @@ -33,14 +33,17 @@
</MainConfig>
<Settings HeaderStyle="Lines"/>
<ToolBarsConfig ItemCount="4">
<Item0 Name="CoolBarU" Type="CoolBar" ItemCount="1">
<Item0 Name="Standard" Type="ToolBar" Width="1318"/>
<Item0 Name="CoolBarU" Type="CoolBar" ItemCount="4">
<Item0 Name="Standard" Type="ToolBar" Width="383"/>
<Item1 Name="Find" Type="ToolBar" Break="False" Width="294"/>
<Item2 Name="ObjProp" Type="ToolBar" Width="1015"/>
<Item3 Name="ObjectSnap" Type="ToolBar" Break="False" Width="351"/>
</Item0>
<Item1 Name="CoolBarL" Type="CoolBar" ItemCount="0"/>
<Item2 Name="CoolBarR" Type="CoolBar" ItemCount="3">
<Item0 Name="Quick" Type="ToolBar" Width="105"/>
<Item1 Name="Modify" Type="ToolBar" Break="False" Width="213"/>
<Item2 Name="Draw" Type="ToolBar" Break="False" Width="186"/>
<Item0 Name="Quick" Type="ToolBar" Width="102"/>
<Item1 Name="Modify" Type="ToolBar" Break="False" Width="330"/>
<Item2 Name="Draw" Type="ToolBar" Break="False" Width="221"/>
</Item2>
<Item3 Name="CoolBarD" Type="CoolBar" ItemCount="0"/>
</ToolBarsConfig>
Expand Down

0 comments on commit 1e3862b

Please sign in to comment.