diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index 92809c5..efc01f2 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -58,10 +58,11 @@ compLanguage {B78359AC-9484-402C-8384-3A4595B39389} ZRCOLALOCDIR $(MSIBUILD_COMP compDatabasePath {DF3C720D-50BB-4377-9EE0-9AC21C02B9DD} ZRCOLADATADIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) regDatabasePath compZRCola.zrcdb {0585A51F-1411-43A3-AC50-F04A253FDED4} ZRCOLADATADIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola.zrcdb compZRCola_keyboard.pdf {68AC2C38-10E2-41A3-B92C-844C03FFDF6A} ZRCOLADATADIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola_keyboard.pdf -comp00_ZRCola_Re.otf {A98CF048-44D1-405D-9217-C34900A1ADD5} FontsFolder 0 file00_ZRCola_Re.otf -comp00_ZRCola_It.otf {B3CAE4B5-95D3-4522-9C23-66D015A69C48} FontsFolder 0 file00_ZRCola_It.otf -comp00_ZRCola_Bd.otf {FC3D8EE1-7472-487F-97D5-7F65977CBEF7} FontsFolder 0 file00_ZRCola_Bd.otf -comp00_ZRCola_BI.otf {F72CB82B-70BF-406E-A310-0294425C12A4} FontsFolder 0 file00_ZRCola_BI.otf +compZRCola_Re.otf {CE2403F5-DD07-4116-B4D1-010AB0E4F899} FontsFolder 8 fileZRCola_Re.otf +compZRCola_It.otf {FFBD408C-9FC1-4CD1-88BF-A0284AD17F96} FontsFolder 8 fileZRCola_It.otf +compZRCola_Bd.otf {E84BB37C-1079-4299-A4BA-4EE48AFE5BCE} FontsFolder 8 fileZRCola_Bd.otf +compZRCola_BI.otf {FDFE77E4-45CC-450A-9543-0A83C01A0A48} FontsFolder 8 fileZRCola_BI.otf +comp00_ZRCola {63E512B4-33AC-4DB1-A762-071099CAA0DE} ZRCOLADATADIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) reg00_ZRCola !IF "$(LANG)" == "Ru" compwxstd.mo.ru_RU {342BD930-C88B-4759-A4A8-F62054E7EA88} ZRCOLALOCRURUDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) filewxstd.mo.ru_RU compZRCola.zrcdb.mo.ru_RU {BED0B2D2-CC08-4309-A2DB-A18B904B8D13} ZRCOLALOCRURUDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola.zrcdb.mo.ru_RU @@ -255,7 +256,7 @@ Feature Feature_Parent Title Description Display Level Directory_ Attributes s$(MSIBUILD_LENGTH_ID) S$(MSIBUILD_LENGTH_ID) L64 L255 I2 i2 S$(MSIBUILD_LENGTH_ID) i2 1252 Feature Feature featZRColaFonts Fonts Fonts used by ZRCola 101 1 ZRCOLAFONTDIR 8 -featZRColaFonts00 featZRColaFonts 00 ZRCola Times New Roman based font 1 1 ZRCOLAFONTDIR 8 +featZRColaFontsZRCola featZRColaFonts ZRCola Times New Roman based font 1 1 ZRCOLAFONTDIR 8 featZRColaDoc Documentation ZRCola Documentation 201 3 ZRCOLADATADIR 8 featZRCola_keyboard featZRColaDoc Keyboard Shortcuts PDF document with a list of ZRCola keyboard shortcuts 1 3 ZRCOLADATADIR 8 <3 AND $$comp00_ZRCola=3 1580 <\n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -787,11 +787,6 @@ msgstr "" msgid "+386 1 470 6170" msgstr "01 470 6170" -#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 -#, fuzzy -msgid "00 ZRCola" -msgstr "00 ZRCola" - #: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Property-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 #: En.Win32.Release.Shortcut-2.idtx:3 En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Property-2.idtx:3 #: En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3 @@ -874,6 +869,11 @@ msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v msgid "Times New Roman based font" msgstr "Pisava na osnovi Times New Roman" +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +#, fuzzy +msgid "ZRCola" +msgstr "ZRCola" + #: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 #, fuzzy msgid "ZRCola Documentation" diff --git a/MSI/ZRCola/locale/de_DE.po b/MSI/ZRCola/locale/de_DE.po index 3586ae3..9cf38be 100644 --- a/MSI/ZRCola/locale/de_DE.po +++ b/MSI/ZRCola/locale/de_DE.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola MSI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 10:24+0200\n" +"POT-Creation-Date: 2016-07-15 21:44+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -1520,10 +1520,6 @@ msgstr "" msgid "+386 1 470 6170" msgstr "+386 1 470 6170" -#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 -msgid "00 ZRCola" -msgstr "00 ZRCola" - # Windows charset for this language (decimal) #: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Property-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 #: En.Win32.Release.Shortcut-2.idtx:3 En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Property-2.idtx:3 @@ -1593,6 +1589,10 @@ msgstr "" msgid "Times New Roman based font" msgstr "" +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +msgid "ZRCola" +msgstr "ZRCola" + #: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 msgid "ZRCola Documentation" msgstr "" @@ -1609,5 +1609,8 @@ msgstr "ZRCola:." msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts" msgstr "" +#~ msgid "00 ZRCola" +#~ msgstr "00 ZRCola" + #~ msgid "http://zrcola-2.amebis.si/en/" #~ msgstr "http://zrcola-2.amebis.si/de/" diff --git a/MSI/ZRCola/locale/ru_RU.po b/MSI/ZRCola/locale/ru_RU.po index 3c14fd0..b867656 100644 --- a/MSI/ZRCola/locale/ru_RU.po +++ b/MSI/ZRCola/locale/ru_RU.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola MSI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 10:23+0200\n" +"POT-Creation-Date: 2016-07-15 21:43+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -1520,10 +1520,6 @@ msgstr "" msgid "+386 1 470 6170" msgstr "+386 1 470 6170" -#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 -msgid "00 ZRCola" -msgstr "00 ZRCola" - # Windows charset for this language (decimal) #: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Property-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 #: En.Win32.Release.Shortcut-2.idtx:3 En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Property-2.idtx:3 @@ -1591,6 +1587,10 @@ msgstr "" msgid "Times New Roman based font" msgstr "" +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +msgid "ZRCola" +msgstr "ZRCola" + #: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 msgid "ZRCola Documentation" msgstr "" @@ -1607,6 +1607,9 @@ msgstr "ZRCola:." msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts" msgstr "" +#~ msgid "00 ZRCola" +#~ msgstr "00 ZRCola" + #~ msgid "http://zrcola-2.amebis.si/en/" #~ msgstr "http://zrcola-2.amebis.si/ru/" diff --git a/MSI/ZRCola/locale/sl_SI.po b/MSI/ZRCola/locale/sl_SI.po index 82362d5..55fd8fd 100644 --- a/MSI/ZRCola/locale/sl_SI.po +++ b/MSI/ZRCola/locale/sl_SI.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola MSI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 10:23+0200\n" +"POT-Creation-Date: 2016-07-15 21:43+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -1524,10 +1524,6 @@ msgstr "" msgid "+386 1 470 6170" msgstr "01 470 6170" -#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 -msgid "00 ZRCola" -msgstr "00 ZRCola" - # Windows charset for this language (decimal) #: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Property-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 #: En.Win32.Release.Shortcut-2.idtx:3 En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Property-2.idtx:3 @@ -1595,6 +1591,10 @@ msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v msgid "Times New Roman based font" msgstr "Pisava na osnovi Times New Roman" +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +msgid "ZRCola" +msgstr "ZRCola" + #: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 msgid "ZRCola Documentation" msgstr "Dokumentacija ZRCola" @@ -1611,6 +1611,9 @@ msgstr "ZRCola:." msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts" msgstr "ZRCOLA~1|ZRColine bližnjice na tipkovnici" +#~ msgid "00 ZRCola" +#~ msgstr "00 ZRCola" + #~ msgid "http://zrcola-2.amebis.si/en/" #~ msgstr "http://zrcola-2.amebis.si/" diff --git a/Makefile b/Makefile index 093bbd3..a90e5a6 100644 --- a/Makefile +++ b/Makefile @@ -186,24 +186,26 @@ UnregisterSettings :: !ENDIF InstallFonts :: \ - "$(WINDIR)\Fonts\00_ZRCola_Re.otf" \ - "$(WINDIR)\Fonts\00_ZRCola_It.otf" \ - "$(WINDIR)\Fonts\00_ZRCola_Bd.otf" \ - "$(WINDIR)\Fonts\00_ZRCola_BI.otf" - reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)" /t REG_SZ /d "00_ZRCola_Re.otf" $(REG_FLAGS) > NUL - reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)" /t REG_SZ /d "00_ZRCola_It.otf" $(REG_FLAGS) > NUL - reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)" /t REG_SZ /d "00_ZRCola_Bd.otf" $(REG_FLAGS) > NUL - reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" /t REG_SZ /d "00_ZRCola_BI.otf" $(REG_FLAGS) > NUL + "$(WINDIR)\Fonts\ZRCola_Re.otf" \ + "$(WINDIR)\Fonts\ZRCola_It.otf" \ + "$(WINDIR)\Fonts\ZRCola_Bd.otf" \ + "$(WINDIR)\Fonts\ZRCola_BI.otf" + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola (TrueType)" /t REG_SZ /d "ZRCola_Re.otf" $(REG_FLAGS) > NUL + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola Italic (TrueType)" /t REG_SZ /d "ZRCola_It.otf" $(REG_FLAGS) > NUL + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola Bold (TrueType)" /t REG_SZ /d "ZRCola_Bd.otf" $(REG_FLAGS) > NUL + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola Bold Italic (TrueType)" /t REG_SZ /d "ZRCola_BI.otf" $(REG_FLAGS) > NUL + reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" /v "00 ZRCola" /t REG_SZ /d "ZRCola" $(REG_FLAGS) > NUL UninstallFonts:: - -reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)" $(REG_FLAGS) > NUL - -reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)" $(REG_FLAGS) > NUL - -reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)" $(REG_FLAGS) > NUL - -reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" $(REG_FLAGS) > NUL - -if exist "$(WINDIR)\Fonts\00_ZRCola_Re.otf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Re.otf" - -if exist "$(WINDIR)\Fonts\00_ZRCola_It.otf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_It.otf" - -if exist "$(WINDIR)\Fonts\00_ZRCola_Bd.otf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Bd.otf" - -if exist "$(WINDIR)\Fonts\00_ZRCola_BI.otf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_BI.otf" + -reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola (TrueType)" $(REG_FLAGS) > NUL + -reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola Italic (TrueType)" $(REG_FLAGS) > NUL + -reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola Bold (TrueType)" $(REG_FLAGS) > NUL + -reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola Bold Italic (TrueType)" $(REG_FLAGS) > NUL + -reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" /v "00 ZRCola" $(REG_FLAGS) > NUL + -if exist "$(WINDIR)\Fonts\ZRCola_Re.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_Re.otf" + -if exist "$(WINDIR)\Fonts\ZRCola_It.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_It.otf" + -if exist "$(WINDIR)\Fonts\ZRCola_Bd.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_Bd.otf" + -if exist "$(WINDIR)\Fonts\ZRCola_BI.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_BI.otf" RegisterShortcuts :: \ "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" \ @@ -311,16 +313,16 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi" "$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi" : "$(OUTPUT_DIR)\ZRColaSl64D.3.msi" copy /y $** $@ > NUL -"$(WINDIR)\Fonts\00_ZRCola_Re.otf" : "$(OUTPUT_DIR)\00_ZRCola_Re.otf" +"$(WINDIR)\Fonts\ZRCola_Re.otf" : "$(OUTPUT_DIR)\ZRCola_Re.otf" copy /y $** $@ > NUL -"$(WINDIR)\Fonts\00_ZRCola_It.otf" : "$(OUTPUT_DIR)\00_ZRCola_It.otf" +"$(WINDIR)\Fonts\ZRCola_It.otf" : "$(OUTPUT_DIR)\ZRCola_It.otf" copy /y $** $@ > NUL -"$(WINDIR)\Fonts\00_ZRCola_Bd.otf" : "$(OUTPUT_DIR)\00_ZRCola_Bd.otf" +"$(WINDIR)\Fonts\ZRCola_Bd.otf" : "$(OUTPUT_DIR)\ZRCola_Bd.otf" copy /y $** $@ > NUL -"$(WINDIR)\Fonts\00_ZRCola_BI.otf" : "$(OUTPUT_DIR)\00_ZRCola_BI.otf" +"$(WINDIR)\Fonts\ZRCola_BI.otf" : "$(OUTPUT_DIR)\ZRCola_BI.otf" copy /y $** $@ > NUL "$(PUBLISH_DIR)\ZRColaInstallDe.exe" : "$(OUTPUT_DIR)\Win32.Release\ZRColaInstallDe.exe" diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile index 9bd4d40..7de7882 100644 --- a/ZRCola/MSIBuild/Makefile +++ b/ZRCola/MSIBuild/Makefile @@ -259,7 +259,7 @@ featZRCola compLocalizationRepositoryPath featZRCola compLanguage featZRCola compDatabasePath featZRCola compZRCola.zrcdb -featZRCola comp00_ZRCola_Re.otf +featZRCola compZRCola_Re.otf !IF "$(LANG)" == "Ru" featZRCola compZRCola.mo.ru_RU featZRCola compZRCola.zrcdb.mo.ru_RU diff --git a/ZRCola/ZRCola.fbp b/ZRCola/ZRCola.fbp index adf88d3..22444c8 100644 --- a/ZRCola/ZRCola.fbp +++ b/ZRCola/ZRCola.fbp @@ -1216,7 +1216,7 @@ 1 1 - 00 ZRCola,90,90,20,70,0 + ZRCola,90,90,20,70,0 0 0 wxID_ANY @@ -1682,7 +1682,7 @@ 1 1 - 00 ZRCola,90,90,20,70,0 + ZRCola,90,90,20,70,0 0 0 wxID_ANY @@ -2116,7 +2116,7 @@ 1 wxSYS_COLOUR_BTNFACE - 00 ZRCola,90,90,20,70,0 + ZRCola,90,90,20,70,0 wxALIGN_CENTRE wxALIGN_CENTRE @@ -3072,7 +3072,7 @@ 1 - 00 ZRCola,90,90,20,70,0 + ZRCola,90,90,20,70,0 wxALIGN_CENTRE wxALIGN_CENTRE @@ -3229,7 +3229,7 @@ 1 - 00 ZRCola,90,90,20,70,0 + ZRCola,90,90,20,70,0 wxALIGN_CENTRE wxALIGN_CENTRE @@ -3673,7 +3673,7 @@ 1 - 00 ZRCola,90,90,96,70,0 + ZRCola,90,90,96,70,0 wxALIGN_CENTRE wxALIGN_CENTRE @@ -4197,7 +4197,7 @@ 1 - 00 ZRCola,90,90,20,70,0 + ZRCola,90,90,20,70,0 wxALIGN_CENTRE wxALIGN_CENTRE @@ -5437,7 +5437,7 @@ 1 1 - 00 ZRCola,90,90,20,70,0 + ZRCola,90,90,20,70,0 0 0 wxID_ANY @@ -6615,7 +6615,7 @@ 1 1 - 00 ZRCola,90,90,20,70,0 + ZRCola,90,90,20,70,0 0 0 wxID_ANY @@ -6886,7 +6886,7 @@ 1 1 - 00 ZRCola,90,90,16,70,0 + ZRCola,90,90,16,70,0 0 0 wxID_ANY diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp index 26332a3..ea4973a 100644 --- a/ZRCola/zrcolagui.cpp +++ b/ZRCola/zrcolagui.cpp @@ -234,7 +234,7 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow bSizerDecomposedEdit2 = new wxStaticBoxSizer( new wxStaticBox( m_panelDecomposedEdit, wxID_ANY, _("Decomposed Text") ), wxVERTICAL ); m_decomposed = new wxTextCtrl( bSizerDecomposedEdit2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); - m_decomposed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) ); + m_decomposed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) ); m_decomposed->SetMinSize( wxSize( 100,25 ) ); bSizerDecomposedEdit2->Add( m_decomposed, 1, wxEXPAND, 5 ); @@ -281,7 +281,7 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow bSizerComposedEdit2 = new wxStaticBoxSizer( new wxStaticBox( m_panelComposedEdit, wxID_ANY, _("Composed Text") ), wxVERTICAL ); m_composed = new wxTextCtrl( bSizerComposedEdit2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); - m_composed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) ); + m_composed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) ); m_composed->SetMinSize( wxSize( 100,25 ) ); bSizerComposedEdit2->Add( m_composed, 1, wxEXPAND, 5 ); @@ -380,7 +380,7 @@ wxZRColaCharacterCatalogPanelBase::wxZRColaCharacterCatalogPanelBase( wxWindow* // Cell Defaults m_grid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); - m_grid->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) ); + m_grid->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) ); m_grid->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); m_grid->SetMinSize( wxSize( 35,35 ) ); @@ -505,7 +505,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id, // Label Appearance // Cell Defaults - m_gridResults->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) ); + m_gridResults->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) ); m_gridResults->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); m_gridResults->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); m_gridResults->SetToolTip( _("Character search results") ); @@ -543,7 +543,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id, // Label Appearance // Cell Defaults - m_gridRecent->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) ); + m_gridRecent->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) ); m_gridRecent->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); m_gridRecent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); m_gridRecent->SetToolTip( _("List of recently inserted characters") ); @@ -607,7 +607,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id, // Label Appearance // Cell Defaults - m_gridPreview->SetDefaultCellFont( wxFont( 96, 70, 90, 90, false, wxT("00 ZRCola") ) ); + m_gridPreview->SetDefaultCellFont( wxFont( 96, 70, 90, 90, false, wxT("ZRCola") ) ); m_gridPreview->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); m_gridPreview->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_gridPreview->SetToolTip( _("Character preview") ); @@ -671,7 +671,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id, // Label Appearance // Cell Defaults - m_gridRelated->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) ); + m_gridRelated->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) ); m_gridRelated->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); m_gridRelated->SetToolTip( _("List of related characters") ); @@ -868,7 +868,7 @@ wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxS 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") ) ); + m_staticTextZRCola->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) ); bSizerText->Add( m_staticTextZRCola, 0, wxALL|wxEXPAND, 5 ); @@ -1003,7 +1003,7 @@ wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID i m_character = new wxTextCtrl( sbSizerCharacter->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_character->SetMaxLength( 20 ); - m_character->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) ); + m_character->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) ); m_character->SetToolTip( _("Decomposed character to request") ); sbSizerCharacter->Add( m_character, 0, wxALL|wxEXPAND, 5 ); @@ -1023,7 +1023,7 @@ wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID i sbSizerContext->Add( m_contextLbl, 0, wxALL|wxEXPAND, 5 ); m_context = new wxTextCtrl( sbSizerContext->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); - m_context->SetFont( wxFont( 16, 70, 90, 90, false, wxT("00 ZRCola") ) ); + m_context->SetFont( wxFont( 16, 70, 90, 90, false, wxT("ZRCola") ) ); m_context->SetToolTip( _("Additional notes for character request") ); sbSizerContext->Add( m_context, 1, wxALL|wxEXPAND, 5 ); diff --git a/include/zrcola.h b/include/zrcola.h index 6bcb97f..133b996 100644 --- a/include/zrcola.h +++ b/include/zrcola.h @@ -23,7 +23,7 @@ // Product version as a single DWORD // Note: Used for version comparison within C/C++ code. // -#define ZRCOLA_VERSION 0x01ff0f00 +#define ZRCOLA_VERSION 0x01ff1000 // // Product version by components @@ -33,26 +33,26 @@ // #define ZRCOLA_VERSION_MAJ 1 #define ZRCOLA_VERSION_MIN 255 -#define ZRCOLA_VERSION_REV 15 +#define ZRCOLA_VERSION_REV 16 #define ZRCOLA_VERSION_BUILD 0 // // Human readable product version and build year for UI // -#define ZRCOLA_VERSION_STR "2.0-beta7" +#define ZRCOLA_VERSION_STR "2.0-beta7f" #define ZRCOLA_BUILD_YEAR_STR "2016" // // Numerical version presentation for ProductVersion propery in // MSI packages (syntax: N.N[.N[.N]]) // -#define ZRCOLA_VERSION_INST "1.255.15" +#define ZRCOLA_VERSION_INST "1.255.16" // // The product code for ProductCode property in MSI packages // Replace with new on every version change, regardless how minor it is. // -#define ZRCOLA_VERSION_GUID "{6FD2DCFC-2044-44E6-B9A1-CBCAA9A187F2}" +#define ZRCOLA_VERSION_GUID "{C84103B5-F683-4FAB-932D-B60393CD5678}" // // The product vendor and application name for configuration keeping. diff --git a/output/00_ZRCola_BI.otf b/output/ZRCola_BI.otf similarity index 99% rename from output/00_ZRCola_BI.otf rename to output/ZRCola_BI.otf index c952105..e495884 100644 Binary files a/output/00_ZRCola_BI.otf and b/output/ZRCola_BI.otf differ diff --git a/output/00_ZRCola_Bd.otf b/output/ZRCola_Bd.otf similarity index 99% rename from output/00_ZRCola_Bd.otf rename to output/ZRCola_Bd.otf index fd25ed0..4de9a8c 100644 Binary files a/output/00_ZRCola_Bd.otf and b/output/ZRCola_Bd.otf differ diff --git a/output/00_ZRCola_It.otf b/output/ZRCola_It.otf similarity index 99% rename from output/00_ZRCola_It.otf rename to output/ZRCola_It.otf index 311ce2e..fbd0f5e 100644 Binary files a/output/00_ZRCola_It.otf and b/output/ZRCola_It.otf differ diff --git a/output/00_ZRCola_Re.otf b/output/ZRCola_Re.otf similarity index 99% rename from output/00_ZRCola_Re.otf rename to output/ZRCola_Re.otf index dbbb924..ce30113 100644 Binary files a/output/00_ZRCola_Re.otf and b/output/ZRCola_Re.otf differ