From 174f1177701efef68685afc5e93757fe5f299ff7 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 14 Jul 2016 10:25:54 +0200 Subject: [PATCH 1/5] "00 ZRCola" font renamed to "ZRCola" --- MSI/ZRCola/Main/Makefile | 37 +++++++++--------- MSI/ZRCola/locale/de_DE.po | 4 +- MSI/ZRCola/locale/ru_RU.po | 4 +- MSI/ZRCola/locale/sl_SI.po | 4 +- Makefile | 42 +++++++++++---------- ZRCola/MSIBuild/Makefile | 2 +- ZRCola/ZRCola.fbp | 20 +++++----- ZRCola/zrcolagui.cpp | 20 +++++----- output/{00_ZRCola_BI.otf => ZRCola_BI.otf} | Bin 1495192 -> 1495552 bytes output/{00_ZRCola_Bd.otf => ZRCola_Bd.otf} | Bin 1397596 -> 1397952 bytes output/{00_ZRCola_It.otf => ZRCola_It.otf} | Bin 1358116 -> 1358788 bytes output/{00_ZRCola_Re.otf => ZRCola_Re.otf} | Bin 1496488 -> 1496896 bytes 12 files changed, 69 insertions(+), 64 deletions(-) rename output/{00_ZRCola_BI.otf => ZRCola_BI.otf} (99%) rename output/{00_ZRCola_Bd.otf => ZRCola_Bd.otf} (98%) rename output/{00_ZRCola_It.otf => ZRCola_It.otf} (99%) rename output/{00_ZRCola_Re.otf => ZRCola_Re.otf} (98%) diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index 19dcf30..941bef2 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -61,10 +61,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 0 fileZRCola_Re.otf +compZRCola_It.otf {FFBD408C-9FC1-4CD1-88BF-A0284AD17F96} FontsFolder 0 fileZRCola_It.otf +compZRCola_Bd.otf {E84BB37C-1079-4299-A4BA-4EE48AFE5BCE} FontsFolder 0 fileZRCola_Bd.otf +compZRCola_BI.otf {FDFE77E4-45CC-450A-9543-0A83C01A0A48} FontsFolder 0 fileZRCola_BI.otf +comp00_ZRCola {63E512B4-33AC-4DB1-A762-071099CAA0DE} ZRCOLADATADIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) reg00_ZRCola !IF "$(LANG)" == "Sl" compZRCola.zrcdb.mo.sl_SI {6572EAD1-EE48-46A1-A28E-77985B667F67} ZRCOLALOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola.zrcdb.mo.sl_SI !ENDIF @@ -242,7 +243,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 < 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" \ @@ -251,16 +253,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 a345d69..e93eaec 100644 --- a/ZRCola/MSIBuild/Makefile +++ b/ZRCola/MSIBuild/Makefile @@ -250,7 +250,7 @@ featZRCola compLocalizationRepositoryPath featZRCola compLanguage featZRCola compDatabasePath featZRCola compZRCola.zrcdb -featZRCola comp00_ZRCola_Re.otf +featZRCola compZRCola_Re.otf !IF "$(LANG)" == "Sl" featZRCola compZRCola.mo.sl_SI featZRCola compZRCola.zrcdb.mo.sl_SI 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/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 4da14ffca77cbb295d6a169d7c55b9d4f1b3889d..c952105fdd3b8a2e8cadee0e18d27b79b9a7afbe 100644 GIT binary patch delta 9894 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 diff --git a/output/00_ZRCola_Bd.otf b/output/ZRCola_Bd.otf similarity index 98% rename from output/00_ZRCola_Bd.otf rename to output/ZRCola_Bd.otf index 20e180998943aaef22ce6d6a809c500c34e65e92..fd25ed05ac367d98548071418c6a7d9d17249b54 100644 GIT binary patch delta 9849 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 IHe~Dn1EE6sD*ylh 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 cc5a4bc1a2e7bc41fa26b057f4eaeaae8901b429..311ce2e86c65db48d8bb0b48d51640f02afb23c4 100644 GIT binary patch delta 4387 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 IZwGJxFAq9|od5s; diff --git a/output/00_ZRCola_Re.otf b/output/ZRCola_Re.otf similarity index 98% rename from output/00_ZRCola_Re.otf rename to output/ZRCola_Re.otf index a42e0586fafb51eaacfa52c232e5293cc17144ec..dbbb924a3a1693d3813888ada1f4fbf856f3a5f5 100644 GIT binary patch delta 11128 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 N>bg(fojfn*{{demS7rbJ From 5cd454a757704bd6c54b7d86e9690c62b2b17e25 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 14 Jul 2016 10:56:38 +0200 Subject: [PATCH 2/5] Version set to 2.0-beta7f --- include/zrcola.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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. From 41dfe0c8928079a66998e600a046a52475a9ee8b Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 14 Jul 2016 11:25:01 +0200 Subject: [PATCH 3/5] Font update --- output/ZRCola_BI.otf | Bin 1495552 -> 1495536 bytes output/ZRCola_Bd.otf | Bin 1397952 -> 1397936 bytes output/ZRCola_It.otf | Bin 1358788 -> 1358768 bytes output/ZRCola_Re.otf | Bin 1496896 -> 1496860 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/output/ZRCola_BI.otf b/output/ZRCola_BI.otf index c952105fdd3b8a2e8cadee0e18d27b79b9a7afbe..e4958844dbb1ae2fbf5bcfeedfb0dc7713c5aa5c 100644 GIT binary patch delta 596 zcmX|+!D|yi6o-Gi*~D$P+O$o_Qqis&we6O=327);gsL%8!G^}{p%IMOXevvyCg~w3 zi#-UIRs%u~UIeu_FH&evo<#K4BK9v3&r+xdPyRNHVfbdg_vX#x&C0v{@3;Av$75jt zdiq-Gdg^0h4PtMA@$GbGHoO1x*Ez;6Sg6?*oOq z3T$5dad5YL>QEi>+XLSp@0@L&AEFbh1?5>m@li>DXe3BNo^lCH4JigXnM8@^{)6u{;7g@$O`gGk_$d=SDJ97xv@h9})XREZ4VA2H|WuA15D z`CM~-RGc^!AGd9%Sg9_SmrUQynPsRxi-$un$)38MHQXJ#3xf~QxK^2QA kV+khy=S|FD87}I~#W>Gc>&~Vpn@=r~RZPY3`fgsq+|d)AYj* zQv%QvqhsS^FNfA4K85J7B&H^lU%vl1M}L!kK9QU`pRbl5(0{F7oIKrGD_YD~7WN+HpNIUV9z-~qn>Ci1Nn(ISwTKFIw?M6={t|HLT8oDsxH^!w}v(1s(+XRYy&AwBm-NeK@NG zL)Uxd?DPehjL*&(hP2nh;#9ZUZ$t-E*i#JFxd}B*p>g z>FJr-ZteG5^jp)cPt%JF)@lCx8Tua%vo5DCd(y3K@3G#m-CMY6dQFer>Z3QuVF7%7 ziO93{^+JAa(7t_Cd%wJB#+OZqd>l|-m5P<^*MEM^LO7p+i`7!OP%5E41MGhA?t#KH z0NjuLJXz@(zY4t2X#iig8Yj)~VN^cNDbI6?M}P#0NAO>2#ijI~JVF*z_qtUGD7{;I3o!MsnvzpG9MZ$MfSY>97B_fDcb4!91$6a9w+}S^=FgV++LQ4k^ zAs#x^g0RQLQ_`WJXgdZSJ9H32@=^qOH9V(a9LSn=&&=yT0&@eyx5d-8+wpK902vp29mJKhx{Sz~R&W`8eoqMPNcvjk6J!J-$zgtO z57NGt(1jUa2iWu2*Fju6sV^}gbJ%H7rBXHVcyDRblsDV zZHc5~m#$~aZgtL?7sj9-ANtRTu|>Nk5-}0ijfAeBga*72Us7z`END?hhYry&3tIn_ zfkB!$hLA-WE~=P=gLw%2I}sSeB5c%HO(4cK&Wu6rU6jKFhMBQpVSsEsYg7)M0 E5vt&U;{X5v diff --git a/output/ZRCola_It.otf b/output/ZRCola_It.otf index 311ce2e86c65db48d8bb0b48d51640f02afb23c4..fbd0f5eefbf6da2af5ac68d6c952e83a10fb5a1d 100644 GIT binary patch delta 605 zcmYk0&1(}u7{;I7Y}WM4#!O3sP?$rh7Gl|iQi>HCzZxxQN zLBxXxo74UgMev|j6cNFTG(A~LZ+a0ArCy}8Uc_h9ZII=+^Lw9p=bia{lze%VTn|P@ z0r=uKZcglHcJk32bH+@$t*Jj?U)A&eb}E>mHnMA#s{ZOri=4HD(b$Hr(7Z=p*)iL&P>OZ43L?KP_Z@jsO4v delta 623 zcmY+9O=uHA7>3_Xc4N}CCT43Rfyx{ds>HIpl^~^1tI^m}Y)RUH^`{AKs)4mh^CRRS z9twK!pgAobJSg70cu?vOB7&FF^wc8lP4M7BDu_ruiErwV(!(?ReDBVD^UaIx~CDz?+DlJO6!pJ&(?}6RbB9<725WufA=d^Ieqntwd__j9srhVEwFqVXQmeJapZz z&3(Ms{T}$dj?k|^H*(q8;O3Ld^_N%1t;q6Y=qoDVI$A80E0>;M%|Ksev#o>0Qm$A; zTNf2L@k*Zx2v8b>NGiDf0 ze?vc|889H6g@%4&$V4v-3w=oQK_!%tM*;I3clVFL2&%AAV;V!0tHm=WosFE$hJJb} JysAI?@efhOfn@*y diff --git a/output/ZRCola_Re.otf b/output/ZRCola_Re.otf index dbbb924a3a1693d3813888ada1f4fbf856f3a5f5..ce30113e74376baf6847ce2c9e0dcb3f82cad5d4 100644 GIT binary patch delta 607 zcmYk1-%C?r7{|ZwcD5azzf#XZi{cHW7Kog!Ay^`&)xsNP!(GgvtvZ=B02nn%y*S6`uXx zc=-`HJ3;S0o|~zs{o{dGrSij>o4)rW(Do{9u4U4>mH6B6A86GgM1LfcH8UBs#(_6w zdkzHOE}$~`>G)CS=&5U6r2xJy?>(-6KMbg^lVU9?Y+S@m6yhOX;v*_)A+5wu+DJR; zAf2R(Tp-<~hxG0yg_f(VdeKu~z+Sr%%qd1ravcIMSKgvDy2-OA)tt$twyS)C81fQK@)Y_1coLijSyUP zq0)sy&8l6v>cV9S5@>5S1^)!8x)MQgDJUrEu4n4d>cIEryZ7DmxUV*5cQ$5UhOJ%j z)8pgUZ|o&M3xs!d)}P|jQ^}!o@*V3hfVdJ*&Rlcqiz^6!l=Yiar`v95-l@&~TzT98 z+TSp+gS?%4Fc@9W)SH>@pJWY&vm-$c@TZL4Fy6C zaQzdw Date: Thu, 14 Jul 2016 12:34:27 +0200 Subject: [PATCH 4/5] The font components marked to use reference counter --- MSI/ZRCola/Main/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index 941bef2..75a076d 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -61,10 +61,10 @@ 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 -compZRCola_Re.otf {CE2403F5-DD07-4116-B4D1-010AB0E4F899} FontsFolder 0 fileZRCola_Re.otf -compZRCola_It.otf {FFBD408C-9FC1-4CD1-88BF-A0284AD17F96} FontsFolder 0 fileZRCola_It.otf -compZRCola_Bd.otf {E84BB37C-1079-4299-A4BA-4EE48AFE5BCE} FontsFolder 0 fileZRCola_Bd.otf -compZRCola_BI.otf {FDFE77E4-45CC-450A-9543-0A83C01A0A48} FontsFolder 0 fileZRCola_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)" == "Sl" compZRCola.zrcdb.mo.sl_SI {6572EAD1-EE48-46A1-A28E-77985B667F67} ZRCOLALOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola.zrcdb.mo.sl_SI From 41aa04abad4813abe375b673771e1e8814f028ee Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 14 Jul 2016 13:44:05 +0200 Subject: [PATCH 5/5] A system reboot is scheduled when "00 ZRCola" font substitute is registered --- MSI/ZRCola/Main/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index 75a076d..3a673e7 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -358,6 +358,7 @@ s$(MSIBUILD_LENGTH_ID) S255 I2 InstallExecuteSequence Action caSetZRCOLADIR1 OLDZRCOLADIR AND UILevel < 4 1001 caSetZRCOLADIR2 INSTALLDIR AND UILevel < 4 1002 +ScheduleReboot ?comp00_ZRCola<>3 AND $$comp00_ZRCola=3 1580 <