GUI upgrade: Edit menu added, tool bar added, status bar added
This commit is contained in:
parent
93361f0edb
commit
8fd0437502
@ -134,8 +134,8 @@
|
|||||||
<event name="OnSize"></event>
|
<event name="OnSize"></event>
|
||||||
<event name="OnUpdateUI"></event>
|
<event name="OnUpdateUI"></event>
|
||||||
<object class="wxMenu" expanded="1">
|
<object class="wxMenu" expanded="1">
|
||||||
<property name="label">&File</property>
|
<property name="label">&Program</property>
|
||||||
<property name="name">m_menuFile</property>
|
<property name="name">m_menuProgram</property>
|
||||||
<property name="permission">protected</property>
|
<property name="permission">protected</property>
|
||||||
<object class="wxMenuItem" expanded="1">
|
<object class="wxMenuItem" expanded="1">
|
||||||
<property name="bitmap"></property>
|
<property name="bitmap"></property>
|
||||||
@ -153,6 +153,105 @@
|
|||||||
<event name="OnUpdateUI"></event>
|
<event name="OnUpdateUI"></event>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="wxMenu" expanded="1">
|
||||||
|
<property name="label">&Edit</property>
|
||||||
|
<property name="name">m_menuEdit</property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<object class="wxMenuItem" expanded="1">
|
||||||
|
<property name="bitmap">Load From Icon Resource; edit_cut.ico; [16; 16]</property>
|
||||||
|
<property name="checked">0</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="help">Cuts selected text and puts it on the clipboard</property>
|
||||||
|
<property name="id">wxID_CUT</property>
|
||||||
|
<property name="kind">wxITEM_NORMAL</property>
|
||||||
|
<property name="label">Cut</property>
|
||||||
|
<property name="name">m_menuItemEditCut</property>
|
||||||
|
<property name="permission">none</property>
|
||||||
|
<property name="shortcut">Ctrl+X</property>
|
||||||
|
<property name="unchecked_bitmap"></property>
|
||||||
|
<event name="OnMenuSelection"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
<object class="wxMenuItem" expanded="1">
|
||||||
|
<property name="bitmap">Load From Icon Resource; edit_copy.ico; [16; 16]</property>
|
||||||
|
<property name="checked">0</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="help">Copies selected text to the clipboard</property>
|
||||||
|
<property name="id">wxID_COPY</property>
|
||||||
|
<property name="kind">wxITEM_NORMAL</property>
|
||||||
|
<property name="label">&Copy</property>
|
||||||
|
<property name="name">m_menuItemEditCopy</property>
|
||||||
|
<property name="permission">none</property>
|
||||||
|
<property name="shortcut">Ctrl+C</property>
|
||||||
|
<property name="unchecked_bitmap"></property>
|
||||||
|
<event name="OnMenuSelection"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
<object class="wxMenuItem" expanded="1">
|
||||||
|
<property name="bitmap">Load From Icon Resource; edit_paste.ico; [16; 16]</property>
|
||||||
|
<property name="checked">0</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="help">Inserts text from the clipboard</property>
|
||||||
|
<property name="id">wxID_PASTE</property>
|
||||||
|
<property name="kind">wxITEM_NORMAL</property>
|
||||||
|
<property name="label">&Paste</property>
|
||||||
|
<property name="name">m_menuItemEditPaste</property>
|
||||||
|
<property name="permission">none</property>
|
||||||
|
<property name="shortcut">Ctrl+V</property>
|
||||||
|
<property name="unchecked_bitmap"></property>
|
||||||
|
<event name="OnMenuSelection"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
<object class="separator" expanded="1">
|
||||||
|
<property name="name">m_separatorEdit1</property>
|
||||||
|
<property name="permission">none</property>
|
||||||
|
</object>
|
||||||
|
<object class="wxMenuItem" expanded="1">
|
||||||
|
<property name="bitmap">Load From Icon Resource; send_composed.ico; [16; 16]</property>
|
||||||
|
<property name="checked">0</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="help">Sends composed text to source window</property>
|
||||||
|
<property name="id">wxID_SEND_COMPOSED</property>
|
||||||
|
<property name="kind">wxITEM_NORMAL</property>
|
||||||
|
<property name="label">&Send Composed</property>
|
||||||
|
<property name="name">m_menuItemSendComposed</property>
|
||||||
|
<property name="permission">none</property>
|
||||||
|
<property name="shortcut">F5</property>
|
||||||
|
<property name="unchecked_bitmap"></property>
|
||||||
|
<event name="OnMenuSelection"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
<object class="wxMenuItem" expanded="1">
|
||||||
|
<property name="bitmap">Load From Icon Resource; send_decomposed.ico; [16; 16]</property>
|
||||||
|
<property name="checked">0</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="help">Sends decomposed text to source window</property>
|
||||||
|
<property name="id">wxID_SEND_DECOMPOSED</property>
|
||||||
|
<property name="kind">wxITEM_NORMAL</property>
|
||||||
|
<property name="label">Send &Decomposed</property>
|
||||||
|
<property name="name">m_menuItemSendDecomposed</property>
|
||||||
|
<property name="permission">none</property>
|
||||||
|
<property name="shortcut">F6</property>
|
||||||
|
<property name="unchecked_bitmap"></property>
|
||||||
|
<event name="OnMenuSelection"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
<object class="wxMenuItem" expanded="1">
|
||||||
|
<property name="bitmap">Load From Icon Resource; send_abort.ico; [16; 16]</property>
|
||||||
|
<property name="checked">0</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="help">Aborts composition and returns focus to source window</property>
|
||||||
|
<property name="id">wxID_SEND_ABORT</property>
|
||||||
|
<property name="kind">wxITEM_NORMAL</property>
|
||||||
|
<property name="label">Abort (De)composition</property>
|
||||||
|
<property name="name">m_menuItemSendAbort</property>
|
||||||
|
<property name="permission">none</property>
|
||||||
|
<property name="shortcut">Esc</property>
|
||||||
|
<property name="unchecked_bitmap"></property>
|
||||||
|
<event name="OnMenuSelection"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
<object class="wxMenu" expanded="1">
|
<object class="wxMenu" expanded="1">
|
||||||
<property name="label">&Help</property>
|
<property name="label">&Help</property>
|
||||||
<property name="name">m_menuHelp</property>
|
<property name="name">m_menuHelp</property>
|
||||||
@ -174,7 +273,195 @@
|
|||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<object class="wxBoxSizer" expanded="1">
|
<object class="wxToolBar" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="bitmapsize"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="margins"></property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_toolbar</property>
|
||||||
|
<property name="packing">1</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="separation">5</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style">wxTB_HORIZONTAL</property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
<object class="tool" expanded="1">
|
||||||
|
<property name="bitmap">Load From Icon Resource; edit_cut.ico; [24; 24]</property>
|
||||||
|
<property name="context_menu">0</property>
|
||||||
|
<property name="id">wxID_CUT</property>
|
||||||
|
<property name="kind">wxITEM_NORMAL</property>
|
||||||
|
<property name="label">Cut</property>
|
||||||
|
<property name="name">m_toolEditCut</property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="statusbar">Cuts selected text and puts it on the clipboard</property>
|
||||||
|
<property name="tooltip">Cut</property>
|
||||||
|
<event name="OnAuiToolBarBeginDrag"></event>
|
||||||
|
<event name="OnAuiToolBarMiddleClick"></event>
|
||||||
|
<event name="OnAuiToolBarOverflowClick"></event>
|
||||||
|
<event name="OnAuiToolBarRightClick"></event>
|
||||||
|
<event name="OnAuiToolBarToolDropDown"></event>
|
||||||
|
<event name="OnMenuSelection"></event>
|
||||||
|
<event name="OnToolClicked"></event>
|
||||||
|
<event name="OnToolEnter"></event>
|
||||||
|
<event name="OnToolRClicked"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
<object class="tool" expanded="1">
|
||||||
|
<property name="bitmap">Load From Icon Resource; edit_copy.ico; [24; 24]</property>
|
||||||
|
<property name="context_menu">0</property>
|
||||||
|
<property name="id">wxID_COPY</property>
|
||||||
|
<property name="kind">wxITEM_NORMAL</property>
|
||||||
|
<property name="label">Copy</property>
|
||||||
|
<property name="name">m_toolEditCopy</property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="statusbar">Copies selected text to the clipboard</property>
|
||||||
|
<property name="tooltip">Copy</property>
|
||||||
|
<event name="OnAuiToolBarBeginDrag"></event>
|
||||||
|
<event name="OnAuiToolBarMiddleClick"></event>
|
||||||
|
<event name="OnAuiToolBarOverflowClick"></event>
|
||||||
|
<event name="OnAuiToolBarRightClick"></event>
|
||||||
|
<event name="OnAuiToolBarToolDropDown"></event>
|
||||||
|
<event name="OnMenuSelection"></event>
|
||||||
|
<event name="OnToolClicked"></event>
|
||||||
|
<event name="OnToolEnter"></event>
|
||||||
|
<event name="OnToolRClicked"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
<object class="tool" expanded="1">
|
||||||
|
<property name="bitmap">Load From Icon Resource; edit_paste.ico; [24; 24]</property>
|
||||||
|
<property name="context_menu">0</property>
|
||||||
|
<property name="id">wxID_PASTE</property>
|
||||||
|
<property name="kind">wxITEM_NORMAL</property>
|
||||||
|
<property name="label">Paste</property>
|
||||||
|
<property name="name">m_toolEditPaste</property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="statusbar">Inserts text from the clipboard</property>
|
||||||
|
<property name="tooltip">Paste</property>
|
||||||
|
<event name="OnAuiToolBarBeginDrag"></event>
|
||||||
|
<event name="OnAuiToolBarMiddleClick"></event>
|
||||||
|
<event name="OnAuiToolBarOverflowClick"></event>
|
||||||
|
<event name="OnAuiToolBarRightClick"></event>
|
||||||
|
<event name="OnAuiToolBarToolDropDown"></event>
|
||||||
|
<event name="OnMenuSelection"></event>
|
||||||
|
<event name="OnToolClicked"></event>
|
||||||
|
<event name="OnToolEnter"></event>
|
||||||
|
<event name="OnToolRClicked"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
<object class="toolSeparator" expanded="1">
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
</object>
|
||||||
|
<object class="tool" expanded="1">
|
||||||
|
<property name="bitmap">Load From Icon Resource; send_composed.ico; [24; 24]</property>
|
||||||
|
<property name="context_menu">0</property>
|
||||||
|
<property name="id">wxID_SEND_COMPOSED</property>
|
||||||
|
<property name="kind">wxITEM_NORMAL</property>
|
||||||
|
<property name="label">Send Composed</property>
|
||||||
|
<property name="name">m_toolSendComposed</property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="statusbar">Sends composed text to source window</property>
|
||||||
|
<property name="tooltip">Send Composed</property>
|
||||||
|
<event name="OnAuiToolBarBeginDrag"></event>
|
||||||
|
<event name="OnAuiToolBarMiddleClick"></event>
|
||||||
|
<event name="OnAuiToolBarOverflowClick"></event>
|
||||||
|
<event name="OnAuiToolBarRightClick"></event>
|
||||||
|
<event name="OnAuiToolBarToolDropDown"></event>
|
||||||
|
<event name="OnMenuSelection"></event>
|
||||||
|
<event name="OnToolClicked"></event>
|
||||||
|
<event name="OnToolEnter"></event>
|
||||||
|
<event name="OnToolRClicked"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
<object class="tool" expanded="1">
|
||||||
|
<property name="bitmap">Load From Icon Resource; send_decomposed.ico; [24; 24]</property>
|
||||||
|
<property name="context_menu">0</property>
|
||||||
|
<property name="id">wxID_SEND_DECOMPOSED</property>
|
||||||
|
<property name="kind">wxITEM_NORMAL</property>
|
||||||
|
<property name="label">Send Decomposed</property>
|
||||||
|
<property name="name">m_toolSendDecomposed</property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="statusbar">Sends decomposed text to source window</property>
|
||||||
|
<property name="tooltip">Send Decomposed</property>
|
||||||
|
<event name="OnAuiToolBarBeginDrag"></event>
|
||||||
|
<event name="OnAuiToolBarMiddleClick"></event>
|
||||||
|
<event name="OnAuiToolBarOverflowClick"></event>
|
||||||
|
<event name="OnAuiToolBarRightClick"></event>
|
||||||
|
<event name="OnAuiToolBarToolDropDown"></event>
|
||||||
|
<event name="OnMenuSelection"></event>
|
||||||
|
<event name="OnToolClicked"></event>
|
||||||
|
<event name="OnToolEnter"></event>
|
||||||
|
<event name="OnToolRClicked"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="wxBoxSizer" expanded="0">
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="name">bSizerMain</property>
|
<property name="name">bSizerMain</property>
|
||||||
<property name="orient">wxVERTICAL</property>
|
<property name="orient">wxVERTICAL</property>
|
||||||
@ -265,6 +552,52 @@
|
|||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="wxStatusBar" expanded="1">
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="fields">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="name">m_statusBar</property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style">wxST_SIZEGRIP</property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<object class="Panel" expanded="1">
|
<object class="Panel" expanded="1">
|
||||||
<property name="aui_managed">0</property>
|
<property name="aui_managed">0</property>
|
||||||
@ -354,7 +687,7 @@
|
|||||||
<property name="font">00 ZRCola,90,90,20,70,0</property>
|
<property name="font">00 ZRCola,90,90,20,70,0</property>
|
||||||
<property name="gripper">0</property>
|
<property name="gripper">0</property>
|
||||||
<property name="hidden">0</property>
|
<property name="hidden">0</property>
|
||||||
<property name="id">wxID_DECOMPOSED</property>
|
<property name="id">wxID_ANY</property>
|
||||||
<property name="max_size"></property>
|
<property name="max_size"></property>
|
||||||
<property name="maximize_button">0</property>
|
<property name="maximize_button">0</property>
|
||||||
<property name="maximum_size"></property>
|
<property name="maximum_size"></property>
|
||||||
@ -445,7 +778,7 @@
|
|||||||
<property name="font">00 ZRCola,90,90,20,70,0</property>
|
<property name="font">00 ZRCola,90,90,20,70,0</property>
|
||||||
<property name="gripper">0</property>
|
<property name="gripper">0</property>
|
||||||
<property name="hidden">0</property>
|
<property name="hidden">0</property>
|
||||||
<property name="id">wxID_COMPOSED</property>
|
<property name="id">wxID_ANY</property>
|
||||||
<property name="max_size"></property>
|
<property name="max_size"></property>
|
||||||
<property name="maximize_button">0</property>
|
<property name="maximize_button">0</property>
|
||||||
<property name="maximum_size"></property>
|
<property name="maximum_size"></property>
|
||||||
|
|||||||
BIN
ZRCola/ZRCola.rc
BIN
ZRCola/ZRCola.rc
Binary file not shown.
@ -106,6 +106,12 @@
|
|||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<None Include="res\edit_copy.ico" />
|
||||||
|
<None Include="res\edit_cut.ico" />
|
||||||
|
<None Include="res\edit_paste.ico" />
|
||||||
|
<None Include="res\send_abort.ico" />
|
||||||
|
<None Include="res\send_composed.ico" />
|
||||||
|
<None Include="res\send_decomposed.ico" />
|
||||||
<None Include="res\zrcola.ico" />
|
<None Include="res\zrcola.ico" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@ -62,6 +62,24 @@
|
|||||||
<None Include="res\zrcola.ico">
|
<None Include="res\zrcola.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</None>
|
</None>
|
||||||
|
<None Include="res\send_abort.ico">
|
||||||
|
<Filter>Resource Files</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="res\send_composed.ico">
|
||||||
|
<Filter>Resource Files</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="res\send_decomposed.ico">
|
||||||
|
<Filter>Resource Files</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="res\edit_copy.ico">
|
||||||
|
<Filter>Resource Files</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="res\edit_cut.ico">
|
||||||
|
<Filter>Resource Files</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="res\edit_paste.ico">
|
||||||
|
<Filter>Resource Files</Filter>
|
||||||
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ResourceCompile Include="ZRCola.rc">
|
<ResourceCompile Include="ZRCola.rc">
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: ZRCola\n"
|
"Project-Id-Version: ZRCola\n"
|
||||||
"POT-Creation-Date: 2016-03-14 17:18+0100\n"
|
"POT-Creation-Date: 2016-04-06 12:31+0200\n"
|
||||||
"PO-Revision-Date: 2016-03-14 17:18+0100\n"
|
"PO-Revision-Date: 2016-04-06 12:31+0200\n"
|
||||||
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
|
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
|
||||||
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
|
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
|
||||||
"Language: sl_SI\n"
|
"Language: sl_SI\n"
|
||||||
@ -17,27 +17,27 @@ msgstr ""
|
|||||||
"X-Poedit-KeywordsList: _\n"
|
"X-Poedit-KeywordsList: _\n"
|
||||||
"X-Poedit-SearchPath-0: .\n"
|
"X-Poedit-SearchPath-0: .\n"
|
||||||
|
|
||||||
#: zrcolafrm.cpp:58
|
#: zrcolafrm.cpp:56
|
||||||
msgid ""
|
msgid ""
|
||||||
"ZRCola keyboard shortcut Win+Z could not be registered. Some functionality "
|
"ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
|
||||||
"will not be available."
|
"will not be available."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"ZRColine bližnjice na tipkovnici Win+Z ni mogoče registrirati. Nekaj "
|
"ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj "
|
||||||
"funkcionalnosti ne bo na voljo."
|
"funkcionalnosti ne bo na voljo."
|
||||||
|
|
||||||
#: zrcolafrm.cpp:58 zrcolafrm.cpp:60
|
#: zrcolafrm.cpp:56 zrcolafrm.cpp:58
|
||||||
msgid "Warning"
|
msgid "Warning"
|
||||||
msgstr "Opozorilo"
|
msgstr "Opozorilo"
|
||||||
|
|
||||||
#: zrcolafrm.cpp:60
|
#: zrcolafrm.cpp:58
|
||||||
msgid ""
|
msgid ""
|
||||||
"ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some "
|
"ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
|
||||||
"functionality will not be available."
|
"will not be available."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. Nekaj "
|
"ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj "
|
||||||
"funkcionalnosti ne bo na voljo."
|
"funkcionalnosti ne bo na voljo."
|
||||||
|
|
||||||
#: zrcolafrm.cpp:140
|
#: zrcolafrm.cpp:119
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"ZRCola v%s\n"
|
"ZRCola v%s\n"
|
||||||
@ -46,7 +46,7 @@ msgstr ""
|
|||||||
"ZRCola v%s\n"
|
"ZRCola v%s\n"
|
||||||
"Vse pravice pridržane 2015-%s Amebis"
|
"Vse pravice pridržane 2015-%s Amebis"
|
||||||
|
|
||||||
#: zrcolafrm.cpp:140
|
#: zrcolafrm.cpp:119
|
||||||
msgid "About ZRCola"
|
msgid "About ZRCola"
|
||||||
msgstr "O ZRColi"
|
msgstr "O ZRColi"
|
||||||
|
|
||||||
@ -55,51 +55,123 @@ msgid "E&xit"
|
|||||||
msgstr "I&zhod"
|
msgstr "I&zhod"
|
||||||
|
|
||||||
#: zrcolagui.cpp:35
|
#: zrcolagui.cpp:35
|
||||||
msgid "&File"
|
msgid "&Program"
|
||||||
msgstr "&Datoteka"
|
msgstr "&Program"
|
||||||
|
|
||||||
#: zrcolagui.cpp:39
|
#: zrcolagui.cpp:39 zrcolagui.cpp:106
|
||||||
|
msgid "Cut"
|
||||||
|
msgstr "Izreži"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:39 zrcolagui.cpp:106
|
||||||
|
msgid "Cuts selected text and puts it on the clipboard"
|
||||||
|
msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:48
|
||||||
|
msgid "&Copy"
|
||||||
|
msgstr "&Kopiraj"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:48 zrcolagui.cpp:108
|
||||||
|
msgid "Copies selected text to the clipboard"
|
||||||
|
msgstr "Kopira izbrano besedilo na odložišče"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:57
|
||||||
|
msgid "&Paste"
|
||||||
|
msgstr "&Prilepi"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:57 zrcolagui.cpp:110
|
||||||
|
msgid "Inserts text from the clipboard"
|
||||||
|
msgstr "Vstavi besedilo z odložišča"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:68
|
||||||
|
msgid "&Send Composed"
|
||||||
|
msgstr "Pošlji &sestavljeno"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:68 zrcolagui.cpp:114
|
||||||
|
msgid "Sends composed text to source window"
|
||||||
|
msgstr "Pošlje sestavljeno besedilo izvornemu oknu"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:77
|
||||||
|
msgid "Send &Decomposed"
|
||||||
|
msgstr "Pošlji &razstavljeno"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:77 zrcolagui.cpp:116
|
||||||
|
msgid "Sends decomposed text to source window"
|
||||||
|
msgstr "Pošlje razstavljeno besedilo izvornemu oknu"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:86
|
||||||
|
msgid "Abort (De)composition"
|
||||||
|
msgstr "Prekini raz/sestavljanje"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:86
|
||||||
|
msgid "Aborts composition and returns focus to source window"
|
||||||
|
msgstr "Prekine sestavljanje in vrne fokus nazaj izvornemu oknu"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:94
|
||||||
|
msgid "&Edit"
|
||||||
|
msgstr "Ur&edi"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:98
|
||||||
msgid "&About"
|
msgid "&About"
|
||||||
msgstr "O progr&amu"
|
msgstr "O progr&amu"
|
||||||
|
|
||||||
#: zrcolagui.cpp:42
|
#: zrcolagui.cpp:101
|
||||||
msgid "&Help"
|
msgid "&Help"
|
||||||
msgstr "&Pomoč"
|
msgstr "&Pomoč"
|
||||||
|
|
||||||
#: zrcolagui.h:47 MSIBuild/En.Win32.Debug.Feature-2.idtx:4
|
#: zrcolagui.cpp:108
|
||||||
#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
|
msgid "Copy"
|
||||||
#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
|
msgstr "Kopiraj"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:110
|
||||||
|
msgid "Paste"
|
||||||
|
msgstr "Prilepi"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:114
|
||||||
|
msgid "Send Composed"
|
||||||
|
msgstr "Pošlji sestavljeno"
|
||||||
|
|
||||||
|
#: zrcolagui.cpp:116
|
||||||
|
msgid "Send Decomposed"
|
||||||
|
msgstr "Pošlji razstavljeno"
|
||||||
|
|
||||||
|
#: zrcolagui.h:64 MSIBuild/En.Win32.Release.Feature-2.idtx:4
|
||||||
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
|
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
|
||||||
#: MSIBuild/En.x64.Debug.Feature-2.idtx:4
|
|
||||||
#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4
|
|
||||||
#: MSIBuild/En.x64.Release.Feature-2.idtx:4
|
#: MSIBuild/En.x64.Release.Feature-2.idtx:4
|
||||||
#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
|
#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
|
||||||
msgid "ZRCola"
|
msgid "ZRCola"
|
||||||
msgstr "ZRCola"
|
msgstr "ZRCola"
|
||||||
|
|
||||||
# Windows charset for this language (decimal)
|
# Windows charset for this language (decimal)
|
||||||
#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
|
|
||||||
#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3
|
|
||||||
#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
|
#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
|
||||||
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
|
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
|
||||||
#: MSIBuild/En.x64.Debug.Feature-2.idtx:3
|
|
||||||
#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3
|
|
||||||
#: MSIBuild/En.x64.Release.Feature-2.idtx:3
|
#: MSIBuild/En.x64.Release.Feature-2.idtx:3
|
||||||
#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
|
#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
|
||||||
msgid "1252"
|
msgid "1252"
|
||||||
msgstr "1250"
|
msgstr "1250"
|
||||||
|
|
||||||
#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
|
|
||||||
#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
|
|
||||||
#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
|
#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
|
||||||
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
|
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
|
||||||
#: MSIBuild/En.x64.Debug.Feature-2.idtx:4
|
|
||||||
#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4
|
|
||||||
#: MSIBuild/En.x64.Release.Feature-2.idtx:4
|
#: MSIBuild/En.x64.Release.Feature-2.idtx:4
|
||||||
#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
|
#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
|
||||||
msgid "Input system for linguistic use"
|
msgid "Input system for linguistic use"
|
||||||
msgstr "Vnašalni sistem za jezikoslovno rabo"
|
msgstr "Vnašalni sistem za jezikoslovno rabo"
|
||||||
|
|
||||||
|
#~ msgid "&File"
|
||||||
|
#~ msgstr "&Datoteka"
|
||||||
|
|
||||||
|
#~ msgid "Send Decomposed (F6)"
|
||||||
|
#~ msgstr "Pošlji razstavljeno (F6)"
|
||||||
|
|
||||||
|
#~ msgid "Send Composed (F5)"
|
||||||
|
#~ msgstr "Pošlji sestavljeno (F5)"
|
||||||
|
|
||||||
|
#~ msgid ""
|
||||||
|
#~ "ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some "
|
||||||
|
#~ "functionality will not be available."
|
||||||
|
#~ msgstr ""
|
||||||
|
#~ "ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. "
|
||||||
|
#~ "Nekaj funkcionalnosti ne bo na voljo."
|
||||||
|
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#~ msgid "Authentication progress real time monitor"
|
#~ msgid "Authentication progress real time monitor"
|
||||||
#~ msgstr "Nadzira postopek overovljanja v realnem času"
|
#~ msgstr "Nadzira postopek overovljanja v realnem času"
|
||||||
|
|||||||
BIN
ZRCola/res/edit_copy.ico
Normal file
BIN
ZRCola/res/edit_copy.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
1593
ZRCola/res/edit_copy.pdf
Normal file
1593
ZRCola/res/edit_copy.pdf
Normal file
File diff suppressed because one or more lines are too long
BIN
ZRCola/res/edit_cut.ico
Normal file
BIN
ZRCola/res/edit_cut.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
1707
ZRCola/res/edit_cut.pdf
Normal file
1707
ZRCola/res/edit_cut.pdf
Normal file
File diff suppressed because one or more lines are too long
BIN
ZRCola/res/edit_paste.ico
Normal file
BIN
ZRCola/res/edit_paste.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
1727
ZRCola/res/edit_paste.pdf
Normal file
1727
ZRCola/res/edit_paste.pdf
Normal file
File diff suppressed because one or more lines are too long
BIN
ZRCola/res/send_abort.ico
Normal file
BIN
ZRCola/res/send_abort.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
1603
ZRCola/res/send_abort.pdf
Normal file
1603
ZRCola/res/send_abort.pdf
Normal file
File diff suppressed because one or more lines are too long
BIN
ZRCola/res/send_composed.ico
Normal file
BIN
ZRCola/res/send_composed.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
1688
ZRCola/res/send_composed.pdf
Normal file
1688
ZRCola/res/send_composed.pdf
Normal file
File diff suppressed because one or more lines are too long
BIN
ZRCola/res/send_decomposed.ico
Normal file
BIN
ZRCola/res/send_decomposed.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
1770
ZRCola/res/send_decomposed.pdf
Normal file
1770
ZRCola/res/send_decomposed.pdf
Normal file
File diff suppressed because one or more lines are too long
@ -25,13 +25,13 @@
|
|||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
|
wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
|
||||||
EVT_UPDATE_UI_RANGE(wxZRColaFrame::wxID_SEND_COMPOSED, wxZRColaFrame::wxID_SEND_DECOMPOSED, wxZRColaFrame::OnSendUpdate)
|
EVT_UPDATE_UI_RANGE(wxID_SEND_COMPOSED, wxID_SEND_ABORT, wxZRColaFrame::OnSendUpdate)
|
||||||
|
|
||||||
EVT_MENU(wxZRColaFrame::wxID_SEND_COMPOSED , wxZRColaFrame::OnSendComposed )
|
EVT_MENU(wxID_SEND_COMPOSED , wxZRColaFrame::OnSendComposed )
|
||||||
EVT_MENU(wxZRColaFrame::wxID_SEND_DECOMPOSED , wxZRColaFrame::OnSendDecomposed )
|
EVT_MENU(wxID_SEND_DECOMPOSED, wxZRColaFrame::OnSendDecomposed )
|
||||||
EVT_MENU(wxZRColaFrame::wxID_SEND_ABORT , wxZRColaFrame::OnSendAbort )
|
EVT_MENU(wxID_SEND_ABORT , wxZRColaFrame::OnSendAbort )
|
||||||
EVT_MENU( wxID_EXIT , wxZRColaFrame::OnExit )
|
EVT_MENU(wxID_EXIT , wxZRColaFrame::OnExit )
|
||||||
EVT_MENU( wxID_ABOUT , wxZRColaFrame::OnAbout )
|
EVT_MENU(wxID_ABOUT , wxZRColaFrame::OnAbout )
|
||||||
wxEND_EVENT_TABLE()
|
wxEND_EVENT_TABLE()
|
||||||
|
|
||||||
|
|
||||||
@ -56,15 +56,6 @@ wxZRColaFrame::wxZRColaFrame() :
|
|||||||
wxMessageBox(_("ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
|
wxMessageBox(_("ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
|
||||||
if (!RegisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE, wxMOD_WIN, VK_F6))
|
if (!RegisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE, wxMOD_WIN, VK_F6))
|
||||||
wxMessageBox(_("ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
|
wxMessageBox(_("ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
|
||||||
|
|
||||||
// Register frame specific hotkey(s).
|
|
||||||
{
|
|
||||||
wxAcceleratorEntry entries[3];
|
|
||||||
entries[0].Set(wxACCEL_NORMAL, WXK_F5 , wxID_SEND_COMPOSED);
|
|
||||||
entries[1].Set(wxACCEL_NORMAL, WXK_F6 , wxID_SEND_DECOMPOSED);
|
|
||||||
entries[2].Set(wxACCEL_NORMAL, WXK_ESCAPE, wxID_SEND_ABORT);
|
|
||||||
SetAcceleratorTable(wxAcceleratorTable(_countof(entries), entries));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -107,12 +98,12 @@ void wxZRColaFrame::OnSendAbort(wxCommandEvent& event)
|
|||||||
::SetActiveWindow(m_hWndSource);
|
::SetActiveWindow(m_hWndSource);
|
||||||
::SetForegroundWindow(m_hWndSource);
|
::SetForegroundWindow(m_hWndSource);
|
||||||
m_hWndSource = NULL;
|
m_hWndSource = NULL;
|
||||||
|
|
||||||
// Select all input in composer to prepare for the overwrite next time.
|
|
||||||
m_panel->m_decomposed->SelectAll();
|
|
||||||
m_panel->m_composed->SelectAll();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Select all input in composer to prepare for the overwrite next time.
|
||||||
|
m_panel->m_decomposed->SelectAll();
|
||||||
|
m_panel->m_composed->SelectAll();
|
||||||
|
|
||||||
event.Skip();
|
event.Skip();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -41,13 +41,6 @@ class wxZRColaFrame;
|
|||||||
///
|
///
|
||||||
class wxZRColaFrame : public wxZRColaFrameBase
|
class wxZRColaFrame : public wxZRColaFrameBase
|
||||||
{
|
{
|
||||||
protected:
|
|
||||||
enum {
|
|
||||||
wxID_SEND_COMPOSED = wxID_HIGHEST,
|
|
||||||
wxID_SEND_DECOMPOSED,
|
|
||||||
wxID_SEND_ABORT,
|
|
||||||
};
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
wxZRColaFrame();
|
wxZRColaFrame();
|
||||||
virtual ~wxZRColaFrame();
|
virtual ~wxZRColaFrame();
|
||||||
|
|||||||
@ -27,12 +27,71 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
|
|||||||
this->SetSizeHints( wxSize( 150,150 ), wxDefaultSize );
|
this->SetSizeHints( wxSize( 150,150 ), wxDefaultSize );
|
||||||
|
|
||||||
m_menubar = new wxMenuBar( 0 );
|
m_menubar = new wxMenuBar( 0 );
|
||||||
m_menuFile = new wxMenu();
|
m_menuProgram = new wxMenu();
|
||||||
wxMenuItem* m_menuItemExit;
|
wxMenuItem* m_menuItemExit;
|
||||||
m_menuItemExit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) + wxT('\t') + wxT("Alt+F4"), wxEmptyString, wxITEM_NORMAL );
|
m_menuItemExit = new wxMenuItem( m_menuProgram, wxID_EXIT, wxString( _("E&xit") ) + wxT('\t') + wxT("Alt+F4"), wxEmptyString, wxITEM_NORMAL );
|
||||||
m_menuFile->Append( m_menuItemExit );
|
m_menuProgram->Append( m_menuItemExit );
|
||||||
|
|
||||||
m_menubar->Append( m_menuFile, _("&File") );
|
m_menubar->Append( m_menuProgram, _("&Program") );
|
||||||
|
|
||||||
|
m_menuEdit = new wxMenu();
|
||||||
|
wxMenuItem* m_menuItemEditCut;
|
||||||
|
m_menuItemEditCut = new wxMenuItem( m_menuEdit, wxID_CUT, wxString( _("Cut") ) + wxT('\t') + wxT("Ctrl+X"), _("Cuts selected text and puts it on the clipboard"), wxITEM_NORMAL );
|
||||||
|
#ifdef __WXMSW__
|
||||||
|
m_menuItemEditCut->SetBitmaps( wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
|
||||||
|
m_menuItemEditCut->SetBitmap( wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#endif
|
||||||
|
m_menuEdit->Append( m_menuItemEditCut );
|
||||||
|
|
||||||
|
wxMenuItem* m_menuItemEditCopy;
|
||||||
|
m_menuItemEditCopy = new wxMenuItem( m_menuEdit, wxID_COPY, wxString( _("&Copy") ) + wxT('\t') + wxT("Ctrl+C"), _("Copies selected text to the clipboard"), wxITEM_NORMAL );
|
||||||
|
#ifdef __WXMSW__
|
||||||
|
m_menuItemEditCopy->SetBitmaps( wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
|
||||||
|
m_menuItemEditCopy->SetBitmap( wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#endif
|
||||||
|
m_menuEdit->Append( m_menuItemEditCopy );
|
||||||
|
|
||||||
|
wxMenuItem* m_menuItemEditPaste;
|
||||||
|
m_menuItemEditPaste = new wxMenuItem( m_menuEdit, wxID_PASTE, wxString( _("&Paste") ) + wxT('\t') + wxT("Ctrl+V"), _("Inserts text from the clipboard"), wxITEM_NORMAL );
|
||||||
|
#ifdef __WXMSW__
|
||||||
|
m_menuItemEditPaste->SetBitmaps( wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
|
||||||
|
m_menuItemEditPaste->SetBitmap( wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#endif
|
||||||
|
m_menuEdit->Append( m_menuItemEditPaste );
|
||||||
|
|
||||||
|
m_menuEdit->AppendSeparator();
|
||||||
|
|
||||||
|
wxMenuItem* m_menuItemSendComposed;
|
||||||
|
m_menuItemSendComposed = new wxMenuItem( m_menuEdit, wxID_SEND_COMPOSED, wxString( _("&Send Composed") ) + wxT('\t') + wxT("F5"), _("Sends composed text to source window"), wxITEM_NORMAL );
|
||||||
|
#ifdef __WXMSW__
|
||||||
|
m_menuItemSendComposed->SetBitmaps( wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
|
||||||
|
m_menuItemSendComposed->SetBitmap( wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#endif
|
||||||
|
m_menuEdit->Append( m_menuItemSendComposed );
|
||||||
|
|
||||||
|
wxMenuItem* m_menuItemSendDecomposed;
|
||||||
|
m_menuItemSendDecomposed = new wxMenuItem( m_menuEdit, wxID_SEND_DECOMPOSED, wxString( _("Send &Decomposed") ) + wxT('\t') + wxT("F6"), _("Sends decomposed text to source window"), wxITEM_NORMAL );
|
||||||
|
#ifdef __WXMSW__
|
||||||
|
m_menuItemSendDecomposed->SetBitmaps( wxIcon( wxT("send_decomposed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
|
||||||
|
m_menuItemSendDecomposed->SetBitmap( wxIcon( wxT("send_decomposed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#endif
|
||||||
|
m_menuEdit->Append( m_menuItemSendDecomposed );
|
||||||
|
|
||||||
|
wxMenuItem* m_menuItemSendAbort;
|
||||||
|
m_menuItemSendAbort = new wxMenuItem( m_menuEdit, wxID_SEND_ABORT, wxString( _("Abort (De)composition") ) + wxT('\t') + wxT("Esc"), _("Aborts composition and returns focus to source window"), wxITEM_NORMAL );
|
||||||
|
#ifdef __WXMSW__
|
||||||
|
m_menuItemSendAbort->SetBitmaps( wxIcon( wxT("send_abort.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
|
||||||
|
m_menuItemSendAbort->SetBitmap( wxIcon( wxT("send_abort.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
|
||||||
|
#endif
|
||||||
|
m_menuEdit->Append( m_menuItemSendAbort );
|
||||||
|
|
||||||
|
m_menubar->Append( m_menuEdit, _("&Edit") );
|
||||||
|
|
||||||
m_menuHelp = new wxMenu();
|
m_menuHelp = new wxMenu();
|
||||||
wxMenuItem* m_menuItemAbout;
|
wxMenuItem* m_menuItemAbout;
|
||||||
@ -43,6 +102,21 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
|
|||||||
|
|
||||||
this->SetMenuBar( m_menubar );
|
this->SetMenuBar( m_menubar );
|
||||||
|
|
||||||
|
m_toolbar = this->CreateToolBar( wxTB_HORIZONTAL, wxID_ANY );
|
||||||
|
m_toolEditCut = m_toolbar->AddTool( wxID_CUT, _("Cut"), wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Cut"), _("Cuts selected text and puts it on the clipboard"), NULL );
|
||||||
|
|
||||||
|
m_toolEditCopy = m_toolbar->AddTool( wxID_COPY, _("Copy"), wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Copy"), _("Copies selected text to the clipboard"), NULL );
|
||||||
|
|
||||||
|
m_toolEditPaste = m_toolbar->AddTool( wxID_PASTE, _("Paste"), wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Paste"), _("Inserts text from the clipboard"), NULL );
|
||||||
|
|
||||||
|
m_toolbar->AddSeparator();
|
||||||
|
|
||||||
|
m_toolSendComposed = m_toolbar->AddTool( wxID_SEND_COMPOSED, _("Send Composed"), wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Sends composed text to source window"), NULL );
|
||||||
|
|
||||||
|
m_toolSendDecomposed = m_toolbar->AddTool( wxID_SEND_DECOMPOSED, _("Send Decomposed"), wxIcon( wxT("send_decomposed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Decomposed"), _("Sends decomposed text to source window"), NULL );
|
||||||
|
|
||||||
|
m_toolbar->Realize();
|
||||||
|
|
||||||
wxBoxSizer* bSizerMain;
|
wxBoxSizer* bSizerMain;
|
||||||
bSizerMain = new wxBoxSizer( wxVERTICAL );
|
bSizerMain = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
@ -53,6 +127,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
|
|||||||
|
|
||||||
this->SetSizer( bSizerMain );
|
this->SetSizer( bSizerMain );
|
||||||
this->Layout();
|
this->Layout();
|
||||||
|
m_statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );
|
||||||
|
|
||||||
this->Centre( wxBOTH );
|
this->Centre( wxBOTH );
|
||||||
}
|
}
|
||||||
@ -66,13 +141,13 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow
|
|||||||
wxBoxSizer* bSizerEditor;
|
wxBoxSizer* bSizerEditor;
|
||||||
bSizerEditor = new wxBoxSizer( wxVERTICAL );
|
bSizerEditor = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
m_decomposed = new wxTextCtrl( this, wxID_DECOMPOSED, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE );
|
m_decomposed = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE );
|
||||||
m_decomposed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
|
m_decomposed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
|
||||||
m_decomposed->SetMinSize( wxSize( 100,25 ) );
|
m_decomposed->SetMinSize( wxSize( 100,25 ) );
|
||||||
|
|
||||||
bSizerEditor->Add( m_decomposed, 50, wxALL|wxEXPAND, 5 );
|
bSizerEditor->Add( m_decomposed, 50, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
m_composed = new wxTextCtrl( this, wxID_COMPOSED, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE );
|
m_composed = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE );
|
||||||
m_composed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
|
m_composed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
|
||||||
m_composed->SetMinSize( wxSize( 100,25 ) );
|
m_composed->SetMinSize( wxSize( 100,25 ) );
|
||||||
|
|
||||||
|
|||||||
@ -21,8 +21,10 @@
|
|||||||
#include <wx/font.h>
|
#include <wx/font.h>
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
#include <wx/settings.h>
|
#include <wx/settings.h>
|
||||||
|
#include <wx/toolbar.h>
|
||||||
#include "zrcolacomppnl.h"
|
#include "zrcolacomppnl.h"
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
|
#include <wx/statusbr.h>
|
||||||
#include <wx/frame.h>
|
#include <wx/frame.h>
|
||||||
#include <wx/textctrl.h>
|
#include <wx/textctrl.h>
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
@ -37,10 +39,25 @@ class wxZRColaFrameBase : public wxFrame
|
|||||||
private:
|
private:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
wxID_SEND_COMPOSED = 1000,
|
||||||
|
wxID_SEND_DECOMPOSED,
|
||||||
|
wxID_SEND_ABORT
|
||||||
|
};
|
||||||
|
|
||||||
wxMenuBar* m_menubar;
|
wxMenuBar* m_menubar;
|
||||||
wxMenu* m_menuFile;
|
wxMenu* m_menuProgram;
|
||||||
|
wxMenu* m_menuEdit;
|
||||||
wxMenu* m_menuHelp;
|
wxMenu* m_menuHelp;
|
||||||
|
wxToolBar* m_toolbar;
|
||||||
|
wxToolBarToolBase* m_toolEditCut;
|
||||||
|
wxToolBarToolBase* m_toolEditCopy;
|
||||||
|
wxToolBarToolBase* m_toolEditPaste;
|
||||||
|
wxToolBarToolBase* m_toolSendComposed;
|
||||||
|
wxToolBarToolBase* m_toolSendDecomposed;
|
||||||
wxZRColaComposerPanel* m_panel;
|
wxZRColaComposerPanel* m_panel;
|
||||||
|
wxStatusBar* m_statusBar;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@ -58,12 +75,6 @@ class wxZRColaComposerPanelBase : public wxPanel
|
|||||||
private:
|
private:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
enum
|
|
||||||
{
|
|
||||||
wxID_DECOMPOSED = 1000,
|
|
||||||
wxID_COMPOSED
|
|
||||||
};
|
|
||||||
|
|
||||||
wxTextCtrl* m_decomposed;
|
wxTextCtrl* m_decomposed;
|
||||||
wxTextCtrl* m_composed;
|
wxTextCtrl* m_composed;
|
||||||
|
|
||||||
|
|||||||
@ -56,6 +56,7 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
|
|||||||
// The character event occured.
|
// The character event occured.
|
||||||
ZRCola::keyseq_db::indexKey::size_type start, end;
|
ZRCola::keyseq_db::indexKey::size_type start, end;
|
||||||
bool found;
|
bool found;
|
||||||
|
wxFrame *pFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
|
||||||
|
|
||||||
{
|
{
|
||||||
// Parse key event and save it at the end of the key sequence.
|
// Parse key event and save it at the end of the key sequence.
|
||||||
@ -82,6 +83,9 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
|
|||||||
const ZRCola::keyseq_db::keyseq &ks = m_ks_db.idxKey[start];
|
const ZRCola::keyseq_db::keyseq &ks = m_ks_db.idxKey[start];
|
||||||
m_seq.clear();
|
m_seq.clear();
|
||||||
|
|
||||||
|
if (pFrame && pFrame->GetStatusBar())
|
||||||
|
pFrame->SetStatusText(wxEmptyString);
|
||||||
|
|
||||||
wxObject *obj = event.GetEventObject();
|
wxObject *obj = event.GetEventObject();
|
||||||
if (obj && obj->IsKindOf(wxCLASSINFO(wxTextCtrl))) {
|
if (obj && obj->IsKindOf(wxCLASSINFO(wxTextCtrl))) {
|
||||||
// Push text to source control.
|
// Push text to source control.
|
||||||
@ -95,11 +99,17 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
|
|||||||
ZRCola::keyseq_db::keyseq::CompareSequence(m_seq.data(), m_seq.size(), m_ks_db.idxKey[start].seq, std::min<unsigned __int16>(m_ks_db.idxKey[start].seq_len, m_seq.size())) == 0)
|
ZRCola::keyseq_db::keyseq::CompareSequence(m_seq.data(), m_seq.size(), m_ks_db.idxKey[start].seq, std::min<unsigned __int16>(m_ks_db.idxKey[start].seq_len, m_seq.size())) == 0)
|
||||||
{
|
{
|
||||||
// The sequence is a partial match. Continue watching.
|
// The sequence is a partial match. Continue watching.
|
||||||
|
if (pFrame && pFrame->GetStatusBar())
|
||||||
|
pFrame->SetStatusText(ZRCola::keyseq_db::GetSequenceAsText(m_seq.data(), m_seq.size()));
|
||||||
|
|
||||||
event.StopPropagation();
|
event.StopPropagation();
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
// The key sequence has no future chance to match. Start all over again.
|
// The key sequence has no future chance to match. Start all over again.
|
||||||
m_seq.clear();
|
m_seq.clear();
|
||||||
|
|
||||||
|
if (pFrame && pFrame->GetStatusBar())
|
||||||
|
pFrame->SetStatusText(wxEmptyString);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user