Backward/forward navigation in Character Selector introduced

This commit is contained in:
Simon Rozman 2016-05-30 09:43:28 +02:00
parent d46a1d4041
commit 155f12f44e
16 changed files with 4567 additions and 227 deletions

View File

@ -2396,6 +2396,95 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxCheckListBox" expanded="0">
<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="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices"></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="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size">-1,-1</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_categories</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="show">1</property>
<property name="size">-1,60</property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnCheckListBox"></event>
<event name="OnCheckListBoxDClick"></event>
<event name="OnCheckListBoxToggled">OnCategoriesToggle</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 class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_RIGHT</property>
@ -2460,7 +2549,7 @@
<property name="style">wxHL_DEFAULT_STYLE</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="tooltip">Select all categories</property>
<property name="url"></property>
<property name="visited_color"></property>
<property name="window_extra_style"></property>
@ -2547,7 +2636,7 @@
<property name="style">wxHL_DEFAULT_STYLE</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="tooltip">Clear category selection</property>
<property name="url"></property>
<property name="visited_color"></property>
<property name="window_extra_style"></property>
@ -2634,7 +2723,7 @@
<property name="style">wxHL_DEFAULT_STYLE</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="tooltip">Invert category selection</property>
<property name="url"></property>
<property name="visited_color"></property>
<property name="window_extra_style"></property>
@ -2668,95 +2757,6 @@
</object>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxCheckListBox" expanded="0">
<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="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices"></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="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size">-1,-1</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_categories</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="show">1</property>
<property name="size">-1,60</property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnCheckListBox"></event>
<event name="OnCheckListBoxDClick"></event>
<event name="OnCheckListBoxToggled">OnCategoriesToggle</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 class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
@ -3592,6 +3592,191 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_RIGHT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizerNavigateButtons</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxHyperlinkCtrl" expanded="0">
<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="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">0</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="hover_color"></property>
<property name="id">wxID_ANY</property>
<property name="label">« Back</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_navigateBack</property>
<property name="normal_color"></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="show">1</property>
<property name="size"></property>
<property name="style">wxHL_DEFAULT_STYLE</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip">To previously viewed character</property>
<property name="url"></property>
<property name="visited_color"></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="OnHyperlink">OnNavigateBack</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 class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxHyperlinkCtrl" expanded="0">
<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="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">0</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="hover_color"></property>
<property name="id">wxID_ANY</property>
<property name="label">Forward »</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_navigateForward</property>
<property name="normal_color"></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="show">1</property>
<property name="size"></property>
<property name="style">wxHL_DEFAULT_STYLE</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip">To following viewed character</property>
<property name="url"></property>
<property name="visited_color"></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="OnHyperlink">OnNavigateForward</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>
</object>
</object>
<object class="sizeritem" expanded="0">

Binary file not shown.

View File

@ -126,6 +126,8 @@
<None Include="res\edit_copy.ico" />
<None Include="res\edit_cut.ico" />
<None Include="res\edit_paste.ico" />
<None Include="res\navigate_back.ico" />
<None Include="res\navigate_forward.ico" />
<None Include="res\send_abort.ico" />
<None Include="res\send_composed.ico" />
<None Include="res\send_decomposed.ico" />

View File

@ -125,6 +125,12 @@
<None Include="locale\ZRCola.pot">
<Filter>Resource Files\Localization</Filter>
</None>
<None Include="res\navigate_back.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="res\navigate_forward.ico">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ZRCola.rc">

View File

@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-26 17:15+0200\n"
"POT-Creation-Date: 2016-05-27 09:29+0200\n"
"PO-Revision-Date: 2016-05-13 15:52+0200\n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@ -23,7 +23,7 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr "© 2004-%s ZRC SAZU"
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:781 zrcolagui.h:102
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:809 zrcolagui.h:102
#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
#: MSIBuild/En.x64.Release.Feature-2.idtx:4
@ -235,7 +235,7 @@ msgstr "Prilepi izbor"
msgid "Edit"
msgstr "Urejanje"
#: zrcolagui.cpp:170 zrcolagui.h:232
#: zrcolagui.cpp:170 zrcolagui.h:236
#, fuzzy
msgid "Character Selector"
msgstr "Izbirnik znaka"
@ -290,41 +290,72 @@ msgstr "Unicode sestavljenega"
msgid "&Browse"
msgstr "Pre&brskaj"
#: zrcolagui.cpp:423
#: zrcolagui.cpp:427
#, fuzzy
msgid "All"
msgstr "Vse"
#: zrcolagui.cpp:426
#: zrcolagui.cpp:428
msgid "Select all categories"
msgstr ""
#: zrcolagui.cpp:432
#, fuzzy
msgid "None"
msgstr "Nič"
#: zrcolagui.cpp:429
msgid "Invert"
#: zrcolagui.cpp:433
msgid "Clear category selection"
msgstr ""
#: zrcolagui.cpp:474
#: zrcolagui.cpp:437
#, fuzzy
msgid "Invert"
msgstr "Obrni"
#: zrcolagui.cpp:438
msgid "Invert category selection"
msgstr ""
#: zrcolagui.cpp:480
#, fuzzy
msgid "Re&cently Used"
msgstr "Nedavno &uporabljeni"
#: zrcolagui.cpp:515
#: zrcolagui.cpp:521
#, fuzzy
msgid "Preview"
msgstr "Predogled:"
#: zrcolagui.cpp:520
#: zrcolagui.cpp:526
#, fuzzy
msgid "U+"
msgstr "U+"
#: zrcolagui.cpp:571
#: zrcolagui.cpp:576
#, fuzzy
msgid "« Back"
msgstr "< &Nazaj"
#: zrcolagui.cpp:578
msgid "To previously viewed character"
msgstr ""
#: zrcolagui.cpp:582
#, fuzzy
msgid "Forward »"
msgstr "&Naprej"
#: zrcolagui.cpp:584
msgid "To following viewed character"
msgstr ""
#: zrcolagui.cpp:595
#, fuzzy
msgid "Re&lated"
msgstr "&Sorodni"
#: zrcolagui.cpp:677
#: zrcolagui.cpp:705
#, fuzzy
msgid ""
"Some character native to specific language you are working with should not "
@ -335,22 +366,22 @@ msgstr ""
"razstaviti v dele.\n"
"Za optimalno razstavljanje izberite pravilni jezik."
#: zrcolagui.cpp:681
#: zrcolagui.cpp:709
#, fuzzy
msgid "Select language &automatically according to selected keyboard"
msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
#: zrcolagui.cpp:684
#: zrcolagui.cpp:712
#, fuzzy
msgid "&Manually select the language from the list below:"
msgstr "Ročno izberi jezik na spodnje&m spisku:"
#: zrcolagui.cpp:696
#: zrcolagui.cpp:724
#, fuzzy
msgid "Text Language"
msgstr "Jezik besedila"
#: zrcolagui.cpp:701
#: zrcolagui.cpp:729
#, fuzzy
msgid ""
"ZRCola can be launched every time you log in to your computer.\n"
@ -361,17 +392,17 @@ msgstr ""
"Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
"bližnjic Win+F5 in Win+F6."
#: zrcolagui.cpp:705
#: zrcolagui.cpp:733
#, fuzzy
msgid "Start ZRCola &automatically on logon"
msgstr "S&amodejno zaženi ZRColo ob prijavi"
#: zrcolagui.cpp:712
#: zrcolagui.cpp:740
#, fuzzy
msgid "Startup"
msgstr "Zagon"
#: zrcolagui.cpp:791
#: zrcolagui.cpp:819
#, fuzzy
msgid ""
"Editor: Janoš Ježovnik\n"
@ -382,22 +413,22 @@ msgstr ""
"Razvoj: Amebis d. o. o.\n"
"Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"
#: zrcolagui.cpp:799
#: zrcolagui.cpp:827
#, fuzzy
msgid "www.zrc-sazu.si"
msgstr "www.zrc-sazu.si"
#: zrcolagui.cpp:838
#: zrcolagui.cpp:866
#, fuzzy
msgid "Log"
msgstr "Dnevnik"
#: zrcolagui.cpp:854
#: zrcolagui.cpp:882
#, fuzzy
msgid "&Update"
msgstr "&Posodobi"
#: zrcolagui.cpp:859
#: zrcolagui.cpp:887
#, fuzzy
msgid "&Close"
msgstr "&Zapri"
@ -416,17 +447,17 @@ msgstr ""
msgid "Start ZRCola automatically on logon"
msgstr "Samodejno zaženi ZRColo ob prijavi"
#: zrcolagui.h:269
#: zrcolagui.h:273
#, fuzzy
msgid "Settings"
msgstr "Nastavitve"
#: zrcolagui.h:293
#: zrcolagui.h:297
#, fuzzy
msgid "About ZRCola"
msgstr "O ZRColi"
#: zrcolagui.h:316
#: zrcolagui.h:320
#, fuzzy
msgid "Product Update"
msgstr "Posodabljanje izdelka"

View File

@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-26 17:15+0200\n"
"PO-Revision-Date: 2016-05-26 17:15+0200\n"
"POT-Creation-Date: 2016-05-27 09:31+0200\n"
"PO-Revision-Date: 2016-05-27 09:31+0200\n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
"Language: de_DE\n"
@ -20,7 +20,7 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr ""
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:781 zrcolagui.h:102
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:809 zrcolagui.h:102
#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
#: MSIBuild/En.x64.Release.Feature-2.idtx:4
@ -203,7 +203,7 @@ msgstr "Auswahl einfügen"
msgid "Edit"
msgstr "Bearbeiten"
#: zrcolagui.cpp:170 zrcolagui.h:232
#: zrcolagui.cpp:170 zrcolagui.h:236
msgid "Character Selector"
msgstr ""
@ -248,94 +248,126 @@ msgstr ""
msgid "&Browse"
msgstr "Durchsuchen"
#: zrcolagui.cpp:423
#: zrcolagui.cpp:427
#, fuzzy
msgid "All"
msgstr "Alle"
#: zrcolagui.cpp:426
#: zrcolagui.cpp:428
msgid "Select all categories"
msgstr ""
#: zrcolagui.cpp:432
#, fuzzy
msgid "None"
msgstr "Kein"
#: zrcolagui.cpp:429
#: zrcolagui.cpp:433
#, fuzzy
msgid "Clear category selection"
msgstr "Auswahl kopieren"
#: zrcolagui.cpp:437
msgid "Invert"
msgstr ""
#: zrcolagui.cpp:474
#: zrcolagui.cpp:438
#, fuzzy
msgid "Invert category selection"
msgstr "Auswahl einfügen"
#: zrcolagui.cpp:480
msgid "Re&cently Used"
msgstr ""
#: zrcolagui.cpp:515
#: zrcolagui.cpp:521
#, fuzzy
msgid "Preview"
msgstr " Vorschau"
#: zrcolagui.cpp:520
#: zrcolagui.cpp:526
#, fuzzy
msgid "U+"
msgstr "Hilfeverzeichnis %u nicht gefunden."
#: zrcolagui.cpp:571
#: zrcolagui.cpp:576
#, fuzzy
msgid "« Back"
msgstr "< &Zurück"
#: zrcolagui.cpp:578
msgid "To previously viewed character"
msgstr ""
#: zrcolagui.cpp:582
#, fuzzy
msgid "Forward »"
msgstr "&Vorwärts"
#: zrcolagui.cpp:584
msgid "To following viewed character"
msgstr ""
#: zrcolagui.cpp:595
msgid "Re&lated"
msgstr ""
#: zrcolagui.cpp:677
#: zrcolagui.cpp:705
msgid ""
"Some character native to specific language you are working with should not "
"decompose to primitives.\n"
"For optimal decomposition you should set the language correctly."
msgstr ""
#: zrcolagui.cpp:681
#: zrcolagui.cpp:709
msgid "Select language &automatically according to selected keyboard"
msgstr ""
#: zrcolagui.cpp:684
#: zrcolagui.cpp:712
msgid "&Manually select the language from the list below:"
msgstr ""
#: zrcolagui.cpp:696
#: zrcolagui.cpp:724
msgid "Text Language"
msgstr ""
#: zrcolagui.cpp:701
#: zrcolagui.cpp:729
msgid ""
"ZRCola can be launched every time you log in to your computer.\n"
"It will be available on the system tray and via registered shortcuts Win+F5 "
"and Win+F6."
msgstr ""
#: zrcolagui.cpp:705
#: zrcolagui.cpp:733
msgid "Start ZRCola &automatically on logon"
msgstr ""
#: zrcolagui.cpp:712
#: zrcolagui.cpp:740
msgid "Startup"
msgstr ""
#: zrcolagui.cpp:791
#: zrcolagui.cpp:819
msgid ""
"Editor: Janoš Ježovnik\n"
"Development: Amebis d. o. o.\n"
"Development and maintenance (2004-2015): dr. Peter Weiss"
msgstr ""
#: zrcolagui.cpp:799
#: zrcolagui.cpp:827
msgid "www.zrc-sazu.si"
msgstr ""
#: zrcolagui.cpp:838
#: zrcolagui.cpp:866
#, fuzzy
msgid "Log"
msgstr "&Log"
#: zrcolagui.cpp:854
#: zrcolagui.cpp:882
#, fuzzy
msgid "&Update"
msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren."
#: zrcolagui.cpp:859
#: zrcolagui.cpp:887
#, fuzzy
msgid "&Close"
msgstr "&Schließen"
@ -350,15 +382,15 @@ msgstr ""
msgid "Start ZRCola automatically on logon"
msgstr ""
#: zrcolagui.h:269
#: zrcolagui.h:273
msgid "Settings"
msgstr ""
#: zrcolagui.h:293
#: zrcolagui.h:297
msgid "About ZRCola"
msgstr ""
#: zrcolagui.h:316
#: zrcolagui.h:320
msgid "Product Update"
msgstr ""

View File

@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-26 17:15+0200\n"
"PO-Revision-Date: 2016-05-26 17:15+0200\n"
"POT-Creation-Date: 2016-05-27 09:31+0200\n"
"PO-Revision-Date: 2016-05-27 09:31+0200\n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
"Language: ru_RU\n"
@ -21,7 +21,7 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr ""
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:781 zrcolagui.h:102
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:809 zrcolagui.h:102
#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
#: MSIBuild/En.x64.Release.Feature-2.idtx:4
@ -190,7 +190,7 @@ msgstr ""
msgid "Edit"
msgstr ""
#: zrcolagui.cpp:170 zrcolagui.h:232
#: zrcolagui.cpp:170 zrcolagui.h:236
msgid "Character Selector"
msgstr ""
@ -234,89 +234,117 @@ msgstr ""
msgid "&Browse"
msgstr ""
#: zrcolagui.cpp:423
#: zrcolagui.cpp:427
#, fuzzy
msgid "All"
msgstr "Alt"
#: zrcolagui.cpp:426
#: zrcolagui.cpp:428
msgid "Select all categories"
msgstr ""
#: zrcolagui.cpp:432
msgid "None"
msgstr ""
#: zrcolagui.cpp:429
#: zrcolagui.cpp:433
msgid "Clear category selection"
msgstr ""
#: zrcolagui.cpp:437
msgid "Invert"
msgstr ""
#: zrcolagui.cpp:474
#: zrcolagui.cpp:438
msgid "Invert category selection"
msgstr ""
#: zrcolagui.cpp:480
msgid "Re&cently Used"
msgstr ""
#: zrcolagui.cpp:515
#: zrcolagui.cpp:521
msgid "Preview"
msgstr ""
#: zrcolagui.cpp:520
#: zrcolagui.cpp:526
msgid "U+"
msgstr ""
#: zrcolagui.cpp:571
#: zrcolagui.cpp:576
msgid "« Back"
msgstr ""
#: zrcolagui.cpp:578
msgid "To previously viewed character"
msgstr ""
#: zrcolagui.cpp:582
msgid "Forward »"
msgstr ""
#: zrcolagui.cpp:584
msgid "To following viewed character"
msgstr ""
#: zrcolagui.cpp:595
msgid "Re&lated"
msgstr ""
#: zrcolagui.cpp:677
#: zrcolagui.cpp:705
msgid ""
"Some character native to specific language you are working with should not "
"decompose to primitives.\n"
"For optimal decomposition you should set the language correctly."
msgstr ""
#: zrcolagui.cpp:681
#: zrcolagui.cpp:709
msgid "Select language &automatically according to selected keyboard"
msgstr ""
#: zrcolagui.cpp:684
#: zrcolagui.cpp:712
msgid "&Manually select the language from the list below:"
msgstr ""
#: zrcolagui.cpp:696
#: zrcolagui.cpp:724
msgid "Text Language"
msgstr ""
#: zrcolagui.cpp:701
#: zrcolagui.cpp:729
msgid ""
"ZRCola can be launched every time you log in to your computer.\n"
"It will be available on the system tray and via registered shortcuts Win+F5 "
"and Win+F6."
msgstr ""
#: zrcolagui.cpp:705
#: zrcolagui.cpp:733
msgid "Start ZRCola &automatically on logon"
msgstr ""
#: zrcolagui.cpp:712
#: zrcolagui.cpp:740
msgid "Startup"
msgstr ""
#: zrcolagui.cpp:791
#: zrcolagui.cpp:819
msgid ""
"Editor: Janoš Ježovnik\n"
"Development: Amebis d. o. o.\n"
"Development and maintenance (2004-2015): dr. Peter Weiss"
msgstr ""
#: zrcolagui.cpp:799
#: zrcolagui.cpp:827
msgid "www.zrc-sazu.si"
msgstr ""
#: zrcolagui.cpp:838
#: zrcolagui.cpp:866
msgid "Log"
msgstr ""
#: zrcolagui.cpp:854
#: zrcolagui.cpp:882
msgid "&Update"
msgstr ""
#: zrcolagui.cpp:859
#: zrcolagui.cpp:887
msgid "&Close"
msgstr ""
@ -330,15 +358,15 @@ msgstr ""
msgid "Start ZRCola automatically on logon"
msgstr ""
#: zrcolagui.h:269
#: zrcolagui.h:273
msgid "Settings"
msgstr ""
#: zrcolagui.h:293
#: zrcolagui.h:297
msgid "About ZRCola"
msgstr ""
#: zrcolagui.h:316
#: zrcolagui.h:320
msgid "Product Update"
msgstr ""

View File

@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-26 17:15+0200\n"
"PO-Revision-Date: 2016-05-26 17:15+0200\n"
"POT-Creation-Date: 2016-05-27 09:30+0200\n"
"PO-Revision-Date: 2016-05-27 09:31+0200\n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
"Language: sl_SI\n"
@ -21,7 +21,7 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr "© 2004-%s ZRC SAZU"
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:781 zrcolagui.h:102
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:809 zrcolagui.h:102
#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
#: MSIBuild/En.x64.Release.Feature-2.idtx:4
@ -193,7 +193,7 @@ msgstr "Prilepi izbor"
msgid "Edit"
msgstr "Urejanje"
#: zrcolagui.cpp:170 zrcolagui.h:232
#: zrcolagui.cpp:170 zrcolagui.h:236
msgid "Character Selector"
msgstr "Izbirnik znaka"
@ -237,35 +237,63 @@ msgstr "Unicode sestavljenega"
msgid "&Browse"
msgstr "Pre&brskaj"
#: zrcolagui.cpp:423
#: zrcolagui.cpp:427
msgid "All"
msgstr "Vse"
#: zrcolagui.cpp:426
#: zrcolagui.cpp:428
msgid "Select all categories"
msgstr "Izberi vse kategorije"
#: zrcolagui.cpp:432
msgid "None"
msgstr "Nič"
#: zrcolagui.cpp:429
#: zrcolagui.cpp:433
msgid "Clear category selection"
msgstr "Počisti izbor kategorij"
#: zrcolagui.cpp:437
msgid "Invert"
msgstr "Obrni"
#: zrcolagui.cpp:474
#: zrcolagui.cpp:438
msgid "Invert category selection"
msgstr "Obrni izbor kategorij"
#: zrcolagui.cpp:480
msgid "Re&cently Used"
msgstr "Nedavno &uporabljeni"
#: zrcolagui.cpp:515
#: zrcolagui.cpp:521
msgid "Preview"
msgstr "Predogled"
#: zrcolagui.cpp:520
#: zrcolagui.cpp:526
msgid "U+"
msgstr "U+"
#: zrcolagui.cpp:571
#: zrcolagui.cpp:576
msgid "« Back"
msgstr "« Nazaj"
#: zrcolagui.cpp:578
msgid "To previously viewed character"
msgstr "Na prejšnji prikazan znak"
#: zrcolagui.cpp:582
msgid "Forward »"
msgstr "Naprej »"
#: zrcolagui.cpp:584
msgid "To following viewed character"
msgstr "Na naslednji prikazan znak"
#: zrcolagui.cpp:595
msgid "Re&lated"
msgstr "&Sorodni"
#: zrcolagui.cpp:677
#: zrcolagui.cpp:705
msgid ""
"Some character native to specific language you are working with should not "
"decompose to primitives.\n"
@ -275,19 +303,19 @@ msgstr ""
"razstaviti v dele.\n"
"Za optimalno razstavljanje izberite pravilni jezik."
#: zrcolagui.cpp:681
#: zrcolagui.cpp:709
msgid "Select language &automatically according to selected keyboard"
msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
#: zrcolagui.cpp:684
#: zrcolagui.cpp:712
msgid "&Manually select the language from the list below:"
msgstr "Ročno izberi jezik na spodnje&m spisku:"
#: zrcolagui.cpp:696
#: zrcolagui.cpp:724
msgid "Text Language"
msgstr "Jezik besedila"
#: zrcolagui.cpp:701
#: zrcolagui.cpp:729
msgid ""
"ZRCola can be launched every time you log in to your computer.\n"
"It will be available on the system tray and via registered shortcuts Win+F5 "
@ -297,15 +325,15 @@ msgstr ""
"Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
"bližnjic Win+F5 in Win+F6."
#: zrcolagui.cpp:705
#: zrcolagui.cpp:733
msgid "Start ZRCola &automatically on logon"
msgstr "S&amodejno zaženi ZRColo ob prijavi"
#: zrcolagui.cpp:712
#: zrcolagui.cpp:740
msgid "Startup"
msgstr "Zagon"
#: zrcolagui.cpp:791
#: zrcolagui.cpp:819
msgid ""
"Editor: Janoš Ježovnik\n"
"Development: Amebis d. o. o.\n"
@ -315,19 +343,19 @@ msgstr ""
"Razvoj: Amebis d. o. o.\n"
"Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"
#: zrcolagui.cpp:799
#: zrcolagui.cpp:827
msgid "www.zrc-sazu.si"
msgstr "www.zrc-sazu.si"
#: zrcolagui.cpp:838
#: zrcolagui.cpp:866
msgid "Log"
msgstr "Dnevnik"
#: zrcolagui.cpp:854
#: zrcolagui.cpp:882
msgid "&Update"
msgstr "&Posodobi"
#: zrcolagui.cpp:859
#: zrcolagui.cpp:887
msgid "&Close"
msgstr "&Zapri"
@ -343,15 +371,15 @@ msgstr ""
msgid "Start ZRCola automatically on logon"
msgstr "Samodejno zaženi ZRColo ob prijavi"
#: zrcolagui.h:269
#: zrcolagui.h:273
msgid "Settings"
msgstr "Nastavitve"
#: zrcolagui.h:293
#: zrcolagui.h:297
msgid "About ZRCola"
msgstr "O ZRColi"
#: zrcolagui.h:316
#: zrcolagui.h:320
msgid "Product Update"
msgstr "Posodabljanje izdelka"

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

1936
ZRCola/res/navigate_back.pdf Normal file

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

File diff suppressed because one or more lines are too long

View File

@ -48,6 +48,12 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
}
ResetResults();
NavigationState state;
state.m_char = m_char;
state.m_related.m_selected.SetCol(m_gridRelated->GetGridCursorCol());
state.m_related.m_selected.SetRow(m_gridRelated->GetGridCursorRow());
m_historyCursor = m_history.insert(m_history.end(), state);
}
@ -75,7 +81,7 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
size_t start;
if (app->m_chr_db.idxChr.find(*(ZRCola::character_db::character*)chr, start)) {
const ZRCola::character_db::character &chr = app->m_chr_db.idxChr[start];
// Update characted rescription.
// Update characted description.
m_description->SetValue(wxString(chr.data, chr.desc_len));
{
char cc[sizeof(ZRCola::chrcat_db::chrcat)] = {};
@ -95,7 +101,8 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
m_category->SetValue(wxEmptyString);
m_gridRelated->ClearGrid();
}
m_gridRelated->Scroll(0, 0);
m_gridRelated->GoToCell(m_historyCursor->m_related.m_selected);
wxGridCellCoords coord(m_gridResults->GetCharacterCoords(m_char));
if (coord.GetRow() != -1 && coord.GetCol() != -1) {
@ -212,12 +219,11 @@ void wxZRColaCharSelect::OnSearchComplete(wxThreadEvent& event)
void wxZRColaCharSelect::OnResultSelectCell(wxGridEvent& event)
{
if (m_unicodeChanged) return;
wxString val(m_gridResults->GetCellValue(event.GetRow(), event.GetCol()));
wchar_t c = val.IsEmpty() ? 0 : val[0];
if (m_char != c) {
m_char = c;
m_unicode->GetValidator()->TransferToWindow();
}
if (!val.IsEmpty())
NavigateTo(val[0]);
}
@ -227,7 +233,7 @@ void wxZRColaCharSelect::OnResultCellDClick(wxGridEvent& event)
wxString val(m_gridResults->GetCellValue(event.GetRow(), event.GetCol()));
if (!val.IsEmpty()) {
m_char = val[0];
NavigateTo(val[0]);
wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
}
@ -241,7 +247,7 @@ void wxZRColaCharSelect::OnResultsKeyDown(wxKeyEvent& event)
case WXK_NUMPAD_ENTER:
wxString val(m_gridResults->GetCellValue(m_gridResults->GetCursorRow(), m_gridResults->GetCursorColumn()));
if (!val.IsEmpty()) {
m_char = val[0];
NavigateTo(val[0]);
wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
@ -256,9 +262,11 @@ void wxZRColaCharSelect::OnResultsKeyDown(wxKeyEvent& event)
void wxZRColaCharSelect::OnRecentSelectCell(wxGridEvent& event)
{
if (m_unicodeChanged) return;
wxString val(m_gridRecent->GetCellValue(event.GetRow(), event.GetCol()));
m_char = val.IsEmpty() ? 0 : val[0];
m_unicode->GetValidator()->TransferToWindow();
if (!val.IsEmpty())
NavigateTo(val[0]);
}
@ -268,7 +276,7 @@ void wxZRColaCharSelect::OnRecentCellDClick(wxGridEvent& event)
wxString val(m_gridRecent->GetCellValue(event.GetRow(), event.GetCol()));
if (!val.IsEmpty()) {
m_char = val[0];
NavigateTo(val[0]);
wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
}
@ -282,7 +290,7 @@ void wxZRColaCharSelect::OnRecentKeyDown(wxKeyEvent& event)
case WXK_NUMPAD_ENTER:
wxString val(m_gridRecent->GetCellValue(m_gridRecent->GetCursorRow(), m_gridRecent->GetCursorColumn()));
if (!val.IsEmpty()) {
m_char = val[0];
NavigateTo(val[0]);
wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
@ -295,14 +303,6 @@ void wxZRColaCharSelect::OnRecentKeyDown(wxKeyEvent& event)
}
void wxZRColaCharSelect::OnRelatedSelectCell(wxGridEvent& event)
{
wxString val(m_gridRelated->GetCellValue(event.GetRow(), event.GetCol()));
m_char = val.IsEmpty() ? 0 : val[0];
m_unicode->GetValidator()->TransferToWindow();
}
void wxZRColaCharSelect::OnUnicodeText(wxCommandEvent& event)
{
event.Skip();
@ -311,6 +311,33 @@ void wxZRColaCharSelect::OnUnicodeText(wxCommandEvent& event)
}
void wxZRColaCharSelect::OnNavigateBack(wxHyperlinkEvent& event)
{
event.StopPropagation();
NavigateBy(-1);
}
void wxZRColaCharSelect::OnNavigateForward(wxHyperlinkEvent& event)
{
event.StopPropagation();
NavigateBy(+1);
}
void wxZRColaCharSelect::OnRelatedSelectCell(wxGridEvent& event)
{
if (m_unicodeChanged) return;
wxString val(m_gridRelated->GetCellValue(event.GetRow(), event.GetCol()));
if (!val.IsEmpty())
NavigateTo(val[0]);
}
void wxZRColaCharSelect::OnOKButtonClick(wxCommandEvent& event)
{
event.Skip();
@ -345,6 +372,73 @@ void wxZRColaCharSelect::ResetResults()
}
void wxZRColaCharSelect::NavigateBy(int offset)
{
if (offset != 0) {
// Update history state
m_historyCursor->m_related.m_selected.SetCol(m_gridRelated->GetGridCursorCol());
m_historyCursor->m_related.m_selected.SetRow(m_gridRelated->GetGridCursorRow());
if (offset < 0) {
while (m_historyCursor != m_history.begin() && offset) {
--m_historyCursor; offset++;
m_char = m_historyCursor->m_char;
m_unicodeChanged = true;
}
} else {
while (offset) {
++m_historyCursor;
if (m_historyCursor == m_history.end()) {
// We're past the last history entry.
--m_historyCursor;
break;
}
offset--;
m_char = m_historyCursor->m_char;
m_unicodeChanged = true;
}
}
m_navigateBack->Enable(m_historyCursor != m_history.begin());
std::list<NavigationState>::iterator cursor_next(m_historyCursor);
++cursor_next;
m_navigateForward->Enable(cursor_next != m_history.end());
if (m_unicodeChanged)
m_unicode->GetValidator()->TransferToWindow();
}
}
void wxZRColaCharSelect::NavigateTo(wchar_t c)
{
if (m_char != c) {
// Update history state
m_historyCursor->m_related.m_selected.SetCol(m_gridRelated->GetGridCursorCol());
m_historyCursor->m_related.m_selected.SetRow(m_gridRelated->GetGridCursorRow());
++m_historyCursor;
// Create new state.
NavigationState state;
state.m_char = m_char = c;
state.m_related.m_selected.SetCol(0);
state.m_related.m_selected.SetRow(0);
m_historyCursor = m_history.insert(m_historyCursor, state);
// Purge the history's tail.
std::list<NavigationState>::iterator cursor_next(m_historyCursor);
++cursor_next;
m_history.erase(cursor_next, m_history.end());
m_unicode->GetValidator()->TransferToWindow();
m_navigateBack->Enable(true);
m_navigateForward->Enable(false);
}
}
wxZRColaCharSelect::SearchThread::SearchThread(wxZRColaCharSelect *parent) :
m_parent(parent),
wxThread(wxTHREAD_JOINABLE)

View File

@ -32,6 +32,7 @@ class wxPersistentZRColaCharSelect;
#include <wxex/persist/dialog.h>
#include <wx/event.h>
#include <wx/thread.h>
#include <list>
#include <map>
@ -64,11 +65,15 @@ protected:
virtual void OnRecentSelectCell(wxGridEvent& event);
virtual void OnRecentCellDClick(wxGridEvent& event);
virtual void OnRecentKeyDown(wxKeyEvent& event);
virtual void OnRelatedSelectCell(wxGridEvent& event);
virtual void OnNavigateBack(wxHyperlinkEvent& event);
virtual void OnNavigateForward(wxHyperlinkEvent& event);
virtual void OnUnicodeText(wxCommandEvent& event);
virtual void OnRelatedSelectCell(wxGridEvent& event);
virtual void OnOKButtonClick(wxCommandEvent& event);
void ResetResults();
void NavigateBy(int offset);
void NavigateTo(wchar_t c);
public:
wchar_t m_char; ///< Currently selected character (0 when none)
@ -100,6 +105,20 @@ protected:
protected:
wxZRColaCharSelect *m_parent; ///< Thread owner
} *m_searchThread; ///< Search thread
///
/// Navigation state
///
struct NavigationState
{
wchar_t m_char;
struct {
wxGridCellCoords m_selected;
} m_related;
};
std::list<NavigationState> m_history; ///< Navigation history
std::list<NavigationState>::iterator m_historyCursor; ///< Navigation history cursor
};

View File

@ -417,25 +417,31 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
m_search->ShowCancelButton( true );
sbSizerBrowse->Add( m_search, 0, wxALL|wxEXPAND, 5 );
wxArrayString m_categoriesChoices;
m_categories = new wxCheckListBox( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,60 ), m_categoriesChoices, 0 );
sbSizerBrowse->Add( m_categories, 0, wxALL|wxEXPAND, 5 );
wxBoxSizer* bSizerCategoriesCtrl;
bSizerCategoriesCtrl = new wxBoxSizer( wxHORIZONTAL );
m_categoriesAll = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("All"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_categoriesAll->SetToolTip( _("Select all categories") );
bSizerCategoriesCtrl->Add( m_categoriesAll, 0, wxALL, 5 );
m_categoriesNone = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("None"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_categoriesNone->SetToolTip( _("Clear category selection") );
bSizerCategoriesCtrl->Add( m_categoriesNone, 0, wxALL, 5 );
m_categoriesInvert = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("Invert"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_categoriesInvert->SetToolTip( _("Invert category selection") );
bSizerCategoriesCtrl->Add( m_categoriesInvert, 0, wxALL, 5 );
sbSizerBrowse->Add( bSizerCategoriesCtrl, 0, wxALIGN_RIGHT, 5 );
wxArrayString m_categoriesChoices;
m_categories = new wxCheckListBox( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,60 ), m_categoriesChoices, 0 );
sbSizerBrowse->Add( m_categories, 0, wxALL|wxEXPAND, 5 );
m_gridResults = new wxZRColaCharGrid( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSTATIC_BORDER );
// Grid
@ -564,6 +570,24 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
m_category = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_READONLY );
sbSizerPreview->Add( m_category, 0, wxALL|wxEXPAND, 5 );
wxBoxSizer* bSizerNavigateButtons;
bSizerNavigateButtons = new wxBoxSizer( wxHORIZONTAL );
m_navigateBack = new wxHyperlinkCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, _("« Back"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_navigateBack->Enable( false );
m_navigateBack->SetToolTip( _("To previously viewed character") );
bSizerNavigateButtons->Add( m_navigateBack, 0, wxALL, 5 );
m_navigateForward = new wxHyperlinkCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, _("Forward »"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_navigateForward->Enable( false );
m_navigateForward->SetToolTip( _("To following viewed character") );
bSizerNavigateButtons->Add( m_navigateForward, 0, wxALL, 5 );
sbSizerPreview->Add( bSizerNavigateButtons, 0, wxALIGN_RIGHT, 5 );
bSizerRight->Add( sbSizerPreview, 70, wxALL|wxEXPAND, 5 );
@ -626,10 +650,10 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
// Connect Events
this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaCharSelectBase::OnIdle ) );
m_search->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnSearchText ), NULL, this );
m_categories->Connect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this );
m_categoriesAll->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesAll ), NULL, this );
m_categoriesNone->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesNone ), NULL, this );
m_categoriesInvert->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesInvert ), NULL, this );
m_categories->Connect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this );
m_gridResults->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( wxZRColaCharSelectBase::OnResultCellDClick ), NULL, this );
m_gridResults->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnResultSelectCell ), NULL, this );
m_gridResults->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( wxZRColaCharSelectBase::OnResultsKeyDown ), NULL, this );
@ -637,6 +661,8 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
m_gridRecent->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnRecentSelectCell ), NULL, this );
m_gridRecent->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( wxZRColaCharSelectBase::OnRecentKeyDown ), NULL, this );
m_unicode->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnUnicodeText ), NULL, this );
m_navigateBack->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateBack ), NULL, this );
m_navigateForward->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateForward ), NULL, this );
m_gridRelated->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnRelatedSelectCell ), NULL, this );
m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnOKButtonClick ), NULL, this );
}
@ -646,10 +672,10 @@ wxZRColaCharSelectBase::~wxZRColaCharSelectBase()
// Disconnect Events
this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaCharSelectBase::OnIdle ) );
m_search->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnSearchText ), NULL, this );
m_categories->Disconnect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this );
m_categoriesAll->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesAll ), NULL, this );
m_categoriesNone->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesNone ), NULL, this );
m_categoriesInvert->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesInvert ), NULL, this );
m_categories->Disconnect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this );
m_gridResults->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( wxZRColaCharSelectBase::OnResultCellDClick ), NULL, this );
m_gridResults->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnResultSelectCell ), NULL, this );
m_gridResults->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( wxZRColaCharSelectBase::OnResultsKeyDown ), NULL, this );
@ -657,6 +683,8 @@ wxZRColaCharSelectBase::~wxZRColaCharSelectBase()
m_gridRecent->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnRecentSelectCell ), NULL, this );
m_gridRecent->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( wxZRColaCharSelectBase::OnRecentKeyDown ), NULL, this );
m_unicode->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnUnicodeText ), NULL, this );
m_navigateBack->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateBack ), NULL, this );
m_navigateForward->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateForward ), NULL, this );
m_gridRelated->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnRelatedSelectCell ), NULL, this );
m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnOKButtonClick ), NULL, this );

View File

@ -38,8 +38,8 @@ class wxZRColaComposerPanel;
#include <wx/choice.h>
#include <wx/grid.h>
#include <wx/srchctrl.h>
#include <wx/hyperlink.h>
#include <wx/checklst.h>
#include <wx/hyperlink.h>
#include <wx/stattext.h>
#include <wx/button.h>
#include <wx/dialog.h>
@ -193,10 +193,10 @@ class wxZRColaCharSelectBase : public wxDialog
protected:
wxSearchCtrl* m_search;
wxCheckListBox* m_categories;
wxHyperlinkCtrl* m_categoriesAll;
wxHyperlinkCtrl* m_categoriesNone;
wxHyperlinkCtrl* m_categoriesInvert;
wxCheckListBox* m_categories;
wxZRColaCharGrid* m_gridResults;
wxZRColaCharGrid* m_gridRecent;
wxStaticText* m_labelUnicode;
@ -204,6 +204,8 @@ class wxZRColaCharSelectBase : public wxDialog
wxGrid* m_gridPreview;
wxTextCtrl* m_description;
wxTextCtrl* m_category;
wxHyperlinkCtrl* m_navigateBack;
wxHyperlinkCtrl* m_navigateForward;
wxZRColaCharGrid* m_gridRelated;
wxStdDialogButtonSizer* m_sdbSizerButtons;
wxButton* m_sdbSizerButtonsOK;
@ -212,10 +214,10 @@ class wxZRColaCharSelectBase : public wxDialog
// Virtual event handlers, overide them in your derived class
virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
virtual void OnSearchText( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCategoriesToggle( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCategoriesAll( wxHyperlinkEvent& event ) { event.Skip(); }
virtual void OnCategoriesNone( wxHyperlinkEvent& event ) { event.Skip(); }
virtual void OnCategoriesInvert( wxHyperlinkEvent& event ) { event.Skip(); }
virtual void OnCategoriesToggle( wxCommandEvent& event ) { event.Skip(); }
virtual void OnResultCellDClick( wxGridEvent& event ) { event.Skip(); }
virtual void OnResultSelectCell( wxGridEvent& event ) { event.Skip(); }
virtual void OnResultsKeyDown( wxKeyEvent& event ) { event.Skip(); }
@ -223,6 +225,8 @@ class wxZRColaCharSelectBase : public wxDialog
virtual void OnRecentSelectCell( wxGridEvent& event ) { event.Skip(); }
virtual void OnRecentKeyDown( wxKeyEvent& event ) { event.Skip(); }
virtual void OnUnicodeText( wxCommandEvent& event ) { event.Skip(); }
virtual void OnNavigateBack( wxHyperlinkEvent& event ) { event.Skip(); }
virtual void OnNavigateForward( wxHyperlinkEvent& event ) { event.Skip(); }
virtual void OnRelatedSelectCell( wxGridEvent& event ) { event.Skip(); }
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }