diff --git a/ZRCola/ZRCola.fbp b/ZRCola/ZRCola.fbp index e353ba4..3e4a4b6 100644 --- a/ZRCola/ZRCola.fbp +++ b/ZRCola/ZRCola.fbp @@ -9,7 +9,7 @@ 0 0 res - ANSI + UTF-8 connect zrcolagui 1000 @@ -25,7 +25,7 @@ 1 UI 1 - 0 + 1 1 wxAUI_MGR_DEFAULT @@ -2261,7 +2261,7 @@ none 5 - wxEXPAND + wxALL|wxEXPAND 1 @@ -4385,5 +4385,632 @@ + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + wxZRColaAboutBase + + + wxDEFAULT_DIALOG_STYLE + + About ZRCola + + + ZRColaAbout + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bSizerContent + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 1 + + + bSizerColumns + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + Load From Icon Resource; 00_zrcola.ico; [32; 32] + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapIcon + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bSizerText + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + 00 ZRCola,90,90,20,70,0 + 0 + 0 + wxID_ANY + ZRCola + + 0 + + + 0 + + 1 + m_staticTextZRCola + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_staticTextVersion + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Editor: Janoš Ježovnik Development: Amebis d. o. o. Development and maintenance (2004-2015): dr. Peter Weiss + + 0 + + + 0 + + 1 + m_staticTextColophone + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_staticTextCopyright + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + + wxID_ANY + www.zrc-sazu.si + + 0 + + + 0 + + 1 + m_hyperlink + + 1 + + + protected + 1 + + Resizable + 1 + + wxHL_DEFAULT_STYLE + + 0 + + http://www.zrc-sazu.si/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 0 + protected + 0 + + + + 5 + wxALL|wxEXPAND + 0 + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizerButtons + protected + + + + + + + + + + + + diff --git a/ZRCola/ZRCola.vcxproj b/ZRCola/ZRCola.vcxproj index cf92504..e6e3210 100644 --- a/ZRCola/ZRCola.vcxproj +++ b/ZRCola/ZRCola.vcxproj @@ -80,6 +80,7 @@ Create Create + @@ -92,6 +93,7 @@ + diff --git a/ZRCola/ZRCola.vcxproj.filters b/ZRCola/ZRCola.vcxproj.filters index a6db3ef..d7018e2 100644 --- a/ZRCola/ZRCola.vcxproj.filters +++ b/ZRCola/ZRCola.vcxproj.filters @@ -49,6 +49,9 @@ Source Files + + Source Files + @@ -81,6 +84,9 @@ Header Files + + Header Files + diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot index e8f3518..a9fc1e6 100644 --- a/ZRCola/locale/ZRCola.pot +++ b/ZRCola/locale/ZRCola.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-13 19:35+0200\n" +"POT-Creation-Date: 2016-05-24 08:32+0200\n" "PO-Revision-Date: 2016-05-13 15:52+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -18,8 +18,18 @@ msgstr "" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" -#: zrcolafrm.cpp:90 zrcolagui.h:98 MSIBuild/En.Win32.Release.Feature-2.idtx:4 +#: zrcolaabout.cpp:31 +#, fuzzy, c-format +msgid "© 2004-%s ZRC SAZU" +msgstr "© 2004-%s ZRC SAZU" + +#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:754 zrcolagui.h:100 +#: 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.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.Shortcut-2.idtx:4 #, fuzzy @@ -54,20 +64,6 @@ msgstr "" msgid "http://zrcola-2.amebis.si/en/contact/" msgstr "http://zrcola-2.amebis.si/contact/" -#: zrcolafrm.cpp:342 -#, fuzzy, c-format -msgid "" -"ZRCola v%s\n" -"Copyright 2015-%s Amebis" -msgstr "" -"ZRCola v%s\n" -"Vse pravice pridržane 2015-%s Amebis" - -#: zrcolafrm.cpp:342 -#, fuzzy -msgid "About ZRCola" -msgstr "O ZRColi" - #: zrcolagui.cpp:36 #, fuzzy msgid "E&xit" @@ -211,7 +207,7 @@ msgstr "Izreži izbor" #: zrcolagui.cpp:158 #, fuzzy msgid "Copy" -msgstr "Kopiraj" +msgstr "&Kopiraj" #: zrcolagui.cpp:158 #, fuzzy @@ -233,7 +229,7 @@ msgstr "Prilepi izbor" msgid "Edit" msgstr "Urejanje" -#: zrcolagui.cpp:166 zrcolagui.h:222 +#: zrcolagui.cpp:166 zrcolagui.h:224 #, fuzzy msgid "Character Selector" msgstr "Izbirnik znaka" @@ -296,7 +292,7 @@ msgstr "Nedavno &uporabljeni" #: zrcolagui.cpp:494 #, fuzzy msgid "Preview" -msgstr "Predogled" +msgstr "Predogled:" #: zrcolagui.cpp:499 #, fuzzy @@ -355,6 +351,18 @@ msgstr "S&amodejno zaženi ZRColo ob prijavi" msgid "Startup" msgstr "Zagon" +#: zrcolagui.cpp:764 +msgid "" +"Editor: Janoš Ježovnik\n" +"Development: Amebis d. o. o.\n" +"Development and maintenance (2004-2015): dr. Peter Weiss" +msgstr "" + +#: zrcolagui.cpp:772 +#, fuzzy +msgid "www.zrc-sazu.si" +msgstr "www.zrc-sazu.si" + #: zrcolakeyhndlr.cpp:44 #, fuzzy msgid "" @@ -369,21 +377,34 @@ msgstr "" msgid "Start ZRCola automatically on logon" msgstr "Samodejno zaženi ZRColo ob prijavi" -#: zrcolagui.h:259 +#: zrcolagui.h:261 #, fuzzy msgid "Settings" msgstr "Nastavitve" +#: zrcolagui.h:285 +#, fuzzy +msgid "About ZRCola" +msgstr "O ZRColi" + +#: 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.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.Shortcut-2.idtx:3 #, fuzzy msgid "1252" 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.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.Shortcut-2.idtx:4 #, fuzzy diff --git a/ZRCola/locale/de_DE.po b/ZRCola/locale/de_DE.po index 60e73d5..590a2ca 100644 --- a/ZRCola/locale/de_DE.po +++ b/ZRCola/locale/de_DE.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-13 19:37+0200\n" -"PO-Revision-Date: 2016-05-13 19:37+0200\n" +"POT-Creation-Date: 2016-05-24 08:33+0200\n" +"PO-Revision-Date: 2016-05-24 08:33+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: de_DE\n" @@ -15,8 +15,18 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: _\n" -#: zrcolafrm.cpp:90 zrcolagui.h:98 MSIBuild/En.Win32.Release.Feature-2.idtx:4 +#: zrcolaabout.cpp:31 +#, c-format +msgid "© 2004-%s ZRC SAZU" +msgstr "" + +#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:754 zrcolagui.h:100 +#: 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.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.Shortcut-2.idtx:4 #, fuzzy @@ -44,17 +54,6 @@ msgstr "" msgid "http://zrcola-2.amebis.si/en/contact/" msgstr "" -#: zrcolafrm.cpp:342 -#, c-format -msgid "" -"ZRCola v%s\n" -"Copyright 2015-%s Amebis" -msgstr "" - -#: zrcolafrm.cpp:342 -msgid "About ZRCola" -msgstr "" - #: zrcolagui.cpp:36 msgid "E&xit" msgstr "" @@ -200,7 +199,7 @@ msgstr "Auswahl einfügen" msgid "Edit" msgstr "Bearbeiten" -#: zrcolagui.cpp:166 zrcolagui.h:222 +#: zrcolagui.cpp:166 zrcolagui.h:224 msgid "Character Selector" msgstr "" @@ -297,6 +296,17 @@ msgstr "" msgid "Startup" msgstr "" +#: zrcolagui.cpp:764 +msgid "" +"Editor: Janoš Ježovnik\n" +"Development: Amebis d. o. o.\n" +"Development and maintenance (2004-2015): dr. Peter Weiss" +msgstr "" + +#: zrcolagui.cpp:772 +msgid "www.zrc-sazu.si" +msgstr "" + #: zrcolakeyhndlr.cpp:44 msgid "" "INS key is pressed. Type the Unicode code of desired character now (up to " @@ -307,21 +317,33 @@ msgstr "" msgid "Start ZRCola automatically on logon" msgstr "" -#: zrcolagui.h:259 +#: zrcolagui.h:261 msgid "Settings" msgstr "" +#: zrcolagui.h:285 +msgid "About ZRCola" +msgstr "" + # 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.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.Shortcut-2.idtx:3 #, fuzzy msgid "1252" msgstr "1252" +#: 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.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.Shortcut-2.idtx:4 msgid "Input system for linguistic use" diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po index 2f1ea07..d6e9e34 100644 --- a/ZRCola/locale/ru_RU.po +++ b/ZRCola/locale/ru_RU.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-13 19:36+0200\n" -"PO-Revision-Date: 2016-05-13 19:36+0200\n" +"POT-Creation-Date: 2016-05-24 08:33+0200\n" +"PO-Revision-Date: 2016-05-24 08:33+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: ru_RU\n" @@ -16,8 +16,18 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: _\n" -#: zrcolafrm.cpp:90 zrcolagui.h:98 MSIBuild/En.Win32.Release.Feature-2.idtx:4 +#: zrcolaabout.cpp:31 +#, c-format +msgid "© 2004-%s ZRC SAZU" +msgstr "" + +#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:754 zrcolagui.h:100 +#: 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.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.Shortcut-2.idtx:4 #, fuzzy @@ -44,17 +54,6 @@ msgstr "" msgid "http://zrcola-2.amebis.si/en/contact/" msgstr "" -#: zrcolafrm.cpp:342 -#, c-format -msgid "" -"ZRCola v%s\n" -"Copyright 2015-%s Amebis" -msgstr "" - -#: zrcolafrm.cpp:342 -msgid "About ZRCola" -msgstr "" - #: zrcolagui.cpp:36 msgid "E&xit" msgstr "" @@ -187,7 +186,7 @@ msgstr "" msgid "Edit" msgstr "" -#: zrcolagui.cpp:166 zrcolagui.h:222 +#: zrcolagui.cpp:166 zrcolagui.h:224 msgid "Character Selector" msgstr "" @@ -281,6 +280,17 @@ msgstr "" msgid "Startup" msgstr "" +#: zrcolagui.cpp:764 +msgid "" +"Editor: Janoš Ježovnik\n" +"Development: Amebis d. o. o.\n" +"Development and maintenance (2004-2015): dr. Peter Weiss" +msgstr "" + +#: zrcolagui.cpp:772 +msgid "www.zrc-sazu.si" +msgstr "" + #: zrcolakeyhndlr.cpp:44 msgid "" "INS key is pressed. Type the Unicode code of desired character now (up to " @@ -291,21 +301,33 @@ msgstr "" msgid "Start ZRCola automatically on logon" msgstr "" -#: zrcolagui.h:259 +#: zrcolagui.h:261 msgid "Settings" msgstr "" +#: zrcolagui.h:285 +msgid "About ZRCola" +msgstr "" + # 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.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.Shortcut-2.idtx:3 #, fuzzy msgid "1252" msgstr "1251" +#: 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.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.Shortcut-2.idtx:4 msgid "Input system for linguistic use" diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po index 78ed2d3..fa47913 100644 --- a/ZRCola/locale/sl_SI.po +++ b/ZRCola/locale/sl_SI.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-13 15:52+0200\n" -"PO-Revision-Date: 2016-05-13 19:35+0200\n" +"POT-Creation-Date: 2016-05-24 08:32+0200\n" +"PO-Revision-Date: 2016-05-24 08:33+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: sl_SI\n" @@ -16,8 +16,18 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: _\n" -#: zrcolafrm.cpp:90 zrcolagui.h:98 MSIBuild/En.Win32.Release.Feature-2.idtx:4 +#: zrcolaabout.cpp:31 +#, c-format +msgid "© 2004-%s ZRC SAZU" +msgstr "© 2004-%s ZRC SAZU" + +#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:754 zrcolagui.h:100 +#: 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.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.Shortcut-2.idtx:4 msgid "ZRCola" @@ -47,19 +57,6 @@ msgstr "" msgid "http://zrcola-2.amebis.si/en/contact/" msgstr "http://zrcola-2.amebis.si/contact/" -#: zrcolafrm.cpp:342 -#, c-format -msgid "" -"ZRCola v%s\n" -"Copyright 2015-%s Amebis" -msgstr "" -"ZRCola v%s\n" -"Vse pravice pridržane 2015-%s Amebis" - -#: zrcolafrm.cpp:342 -msgid "About ZRCola" -msgstr "O ZRColi" - #: zrcolagui.cpp:36 msgid "E&xit" msgstr "I&zhod" @@ -192,7 +189,7 @@ msgstr "Prilepi izbor" msgid "Edit" msgstr "Urejanje" -#: zrcolagui.cpp:166 zrcolagui.h:222 +#: zrcolagui.cpp:166 zrcolagui.h:224 msgid "Character Selector" msgstr "Izbirnik znaka" @@ -292,6 +289,20 @@ msgstr "S&amodejno zaženi ZRColo ob prijavi" msgid "Startup" msgstr "Zagon" +#: zrcolagui.cpp:764 +msgid "" +"Editor: Janoš Ježovnik\n" +"Development: Amebis d. o. o.\n" +"Development and maintenance (2004-2015): dr. Peter Weiss" +msgstr "" +"Urednik: Janoš Ježovnik\n" +"Razvoj: Amebis d. o. o.\n" +"Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss" + +#: zrcolagui.cpp:772 +msgid "www.zrc-sazu.si" +msgstr "www.zrc-sazu.si" + #: zrcolakeyhndlr.cpp:44 msgid "" "INS key is pressed. Type the Unicode code of desired character now (up to " @@ -300,24 +311,36 @@ msgstr "" "Pritisnjena tipka INS. Zdaj vtpikajte kodo Unicode želenega znaka (do štiri " "šestnajstiške števke: 0-9, A-F), nato izpustite INS." -#: zrcolasettings.cpp:116 +#: zrcolasettings.cpp:93 msgid "Start ZRCola automatically on logon" msgstr "Samodejno zaženi ZRColo ob prijavi" -#: zrcolagui.h:258 +#: zrcolagui.h:261 msgid "Settings" msgstr "Nastavitve" +#: zrcolagui.h:285 +msgid "About ZRCola" +msgstr "O ZRColi" + # 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.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.Shortcut-2.idtx:3 msgid "1252" 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.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.Shortcut-2.idtx:4 msgid "Input system for linguistic use" @@ -570,3 +593,10 @@ msgstr "Vnašalni sistem za jezikoslovno rabo" #~ msgid "Welcome to wxWidgets!" #~ msgstr "Dobrodošli v wxWidgets!" + +#~ msgid "" +#~ "ZRCola v%s\n" +#~ "Copyright 2015-%s Amebis" +#~ msgstr "" +#~ "ZRCola v%s\n" +#~ "Vse pravice pridržane 2015-%s Amebis" diff --git a/ZRCola/stdafx.h b/ZRCola/stdafx.h index 8c88ba5..b4e4e3f 100644 --- a/ZRCola/stdafx.h +++ b/ZRCola/stdafx.h @@ -42,6 +42,7 @@ #endif #include "../include/zrcola.h" +#include "zrcolaabout.h" #include "zrcolaapp.h" #include "zrcolachrgrid.h" #include "zrcolachrcatpnl.h" diff --git a/ZRCola/zrcolaabout.cpp b/ZRCola/zrcolaabout.cpp new file mode 100644 index 0000000..97b7ffa --- /dev/null +++ b/ZRCola/zrcolaabout.cpp @@ -0,0 +1,32 @@ +/* + Copyright 2015-2016 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#include "stdafx.h" + + +////////////////////////////////////////////////////////////////////////// +// wxZRColaAbout +////////////////////////////////////////////////////////////////////////// + +wxZRColaAbout::wxZRColaAbout(wxWindow* parent) : wxZRColaAboutBase(parent) +{ + m_staticTextVersion->SetLabelText(wxT(ZRCOLA_VERSION_STR)); + + m_staticTextCopyright->SetLabelText(wxString::Format(_("© 2004-%s ZRC SAZU"), wxT(ZRCOLA_BUILD_YEAR_STR))); +} diff --git a/ZRCola/zrcolaabout.h b/ZRCola/zrcolaabout.h new file mode 100644 index 0000000..256a95b --- /dev/null +++ b/ZRCola/zrcolaabout.h @@ -0,0 +1,38 @@ +/* + Copyright 2015-2016 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +/// +/// Forward declarations +/// +class wxZRColaAbout; + + +#pragma once + +#include "zrcolagui.h" + + +/// +/// About ZRCola dialog +/// +class wxZRColaAbout : public wxZRColaAboutBase +{ +public: + wxZRColaAbout(wxWindow* parent); +}; diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp index d17307d..ce6b810 100644 --- a/ZRCola/zrcolafrm.cpp +++ b/ZRCola/zrcolafrm.cpp @@ -339,7 +339,8 @@ void wxZRColaFrame::OnHelpReqChar(wxCommandEvent& event) void wxZRColaFrame::OnAbout(wxCommandEvent& event) { - wxMessageBox(wxString::Format(_("ZRCola v%s\nCopyright 2015-%s Amebis"), wxT(ZRCOLA_VERSION_STR), wxT(ZRCOLA_BUILD_YEAR_STR)), _("About ZRCola"), wxOK | wxICON_INFORMATION); + wxZRColaAbout *dlg = new wxZRColaAbout(this); + dlg->ShowModal(); } diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp index 5d6ceaa..819f988 100644 --- a/ZRCola/zrcolagui.cpp +++ b/ZRCola/zrcolagui.cpp @@ -1,4 +1,4 @@ -/////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////// // C++ code generated with wxFormBuilder (version Jun 17 2015) // http://www.wxformbuilder.org/ // @@ -583,7 +583,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id, bSizerColumns->Add( bSizerRight, 0, wxEXPAND, 5 ); - bSizerContent->Add( bSizerColumns, 1, wxEXPAND, 5 ); + bSizerContent->Add( bSizerColumns, 1, wxALL|wxEXPAND, 5 ); bSizerContent->Add( 5, 5, 0, wxALL|wxEXPAND, 5 ); @@ -734,3 +734,68 @@ wxZRColaSettingsBase::~wxZRColaSettingsBase() m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnOKButtonClick ), NULL, this ); } + +wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bSizerContent; + bSizerContent = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bSizerColumns; + bSizerColumns = new wxBoxSizer( wxHORIZONTAL ); + + m_bitmapIcon = new wxStaticBitmap( this, wxID_ANY, wxIcon( wxT("00_zrcola.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 32, 32 ), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerColumns->Add( m_bitmapIcon, 0, wxALL, 5 ); + + wxBoxSizer* bSizerText; + bSizerText = new wxBoxSizer( wxVERTICAL ); + + m_staticTextZRCola = new wxStaticText( this, wxID_ANY, _("ZRCola"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextZRCola->Wrap( -1 ); + m_staticTextZRCola->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) ); + + bSizerText->Add( m_staticTextZRCola, 0, wxALL|wxEXPAND, 5 ); + + m_staticTextVersion = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextVersion->Wrap( -1 ); + bSizerText->Add( m_staticTextVersion, 0, wxALL|wxEXPAND, 5 ); + + m_staticTextColophone = new wxStaticText( this, wxID_ANY, _("Editor: Janoš Ježovnik\nDevelopment: Amebis d. o. o.\nDevelopment and maintenance (2004-2015): dr. Peter Weiss"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextColophone->Wrap( -1 ); + bSizerText->Add( m_staticTextColophone, 0, wxALL|wxEXPAND, 5 ); + + m_staticTextCopyright = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextCopyright->Wrap( -1 ); + bSizerText->Add( m_staticTextCopyright, 0, wxALL|wxEXPAND, 5 ); + + m_hyperlink = new wxHyperlinkCtrl( this, wxID_ANY, _("www.zrc-sazu.si"), wxT("http://www.zrc-sazu.si/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + bSizerText->Add( m_hyperlink, 0, wxALL|wxEXPAND, 5 ); + + + bSizerColumns->Add( bSizerText, 1, wxEXPAND, 5 ); + + + bSizerContent->Add( bSizerColumns, 1, wxALL|wxEXPAND, 5 ); + + + bSizerContent->Add( 0, 0, 0, wxALL|wxEXPAND, 5 ); + + m_sdbSizerButtons = new wxStdDialogButtonSizer(); + m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); + m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); + m_sdbSizerButtons->Realize(); + + bSizerContent->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 5 ); + + + this->SetSizer( bSizerContent ); + this->Layout(); + bSizerContent->Fit( this ); + + this->Centre( wxBOTH ); +} + +wxZRColaAboutBase::~wxZRColaAboutBase() +{ +} diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h index 09c2efb..35de726 100644 --- a/ZRCola/zrcolagui.h +++ b/ZRCola/zrcolagui.h @@ -1,4 +1,4 @@ -/////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////// // C++ code generated with wxFormBuilder (version Jun 17 2015) // http://www.wxformbuilder.org/ // @@ -47,6 +47,8 @@ class wxZRColaComposerPanel; #include #include #include +#include +#include /////////////////////////////////////////////////////////////////////////// @@ -261,4 +263,28 @@ class wxZRColaSettingsBase : public wxDialog }; +/////////////////////////////////////////////////////////////////////////////// +/// Class wxZRColaAboutBase +/////////////////////////////////////////////////////////////////////////////// +class wxZRColaAboutBase : public wxDialog +{ + private: + + protected: + wxStaticBitmap* m_bitmapIcon; + wxStaticText* m_staticTextZRCola; + wxStaticText* m_staticTextVersion; + wxStaticText* m_staticTextColophone; + wxStaticText* m_staticTextCopyright; + wxHyperlinkCtrl* m_hyperlink; + wxStdDialogButtonSizer* m_sdbSizerButtons; + wxButton* m_sdbSizerButtonsOK; + + public: + + wxZRColaAboutBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaAbout") ); + ~wxZRColaAboutBase(); + +}; + #endif //__ZRCOLAGUI_H__