Hotkeys no English translation

bjakja · Dec 27, 2017 · 669ea8b · 669ea8b
1 parent 72992a3
commit 669ea8b
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 265 deletions.
diff --git a/Kaiplayer/OptionsDialog.cpp b/Kaiplayer/OptionsDialog.cpp
@@ -29,7 +29,6 @@
 #include "KaiStaticText.h"
 #include "OptionsPanels.h"
 
-const wxString windowNames[] = {_("Globalny"),_("Napisy"),_("Edytor"),_("Wideo"),_("Audio")};
 
 void ItemHotkey::OnPaint(wxMemoryDC *dc, int x, int y, int width, int height, KaiListCtrl *theList)
 {
@@ -75,7 +74,7 @@ void ItemHotkey::OnMapHotkey(KaiListCtrl *theList, int y)
 				int result = msg.ShowModal();
 				if(result!=wxCANCEL){
 					if(result==wxNO){hotkey="";}
-					int nitem =theList->FindItem(0, windowNames[cur->first.Type] + " " + cur->second.Name);
+					int nitem = theList->FindItem(0, OptionsDialog::windowNames[cur->first.Type] + " " + cur->second.Name);
 					if(nitem>=0){
 						ItemHotkey* item = (ItemHotkey*)theList->CopyRow(nitem, 1);
 						item->accel = hotkey;
@@ -88,11 +87,11 @@ void ItemHotkey::OnMapHotkey(KaiListCtrl *theList, int y)
 
 		if(!itype){return;}
 		if(hotkeyId.Type != hkd.type){
-			int nitem = theList->FindItem(0, windowNames[hkd.type] + " " + name);
+			int nitem = theList->FindItem(0, OptionsDialog::windowNames[hkd.type] + " " + name);
 			if(nitem<0){
 				ItemHotkey* itemcopied = (ItemHotkey*)theList->CopyRow(y, 1, true);
 				ItemText *itemtext = (ItemText*)theList->GetItem(theList->GetCount()-1, 0);
-				itemtext->name = windowNames[hkd.type] + " " + name;
+				itemtext->name = OptionsDialog::windowNames[hkd.type] + " " + name;
 				itemcopied->accel = hkd.hotkey;
 				itemcopied->modified = true;
 				int pos = theList->GetCount();
@@ -146,13 +145,13 @@ void ItemHotkey::Save()
 		modified=false;
 	}
 }
+wxString *OptionsDialog::windowNames = NULL;
 
 OptionsDialog::OptionsDialog(wxWindow *parent, kainoteFrame *kaiparent)
 	: KaiDialog(parent,-1,_("Opcje"))
 {
+	windowNames = new wxString[5]{ _("Globalny"), _("Napisy"), _("Edytor"), _("Wideo"), _("Audio") };
 	OptionsTree= new KaiTreebook(this,-1);
-	//OptionsTree->SetForegroundColour(text);
-	//OptionsTree->SetBackgroundColour(window);
 
 	Kai=kaiparent;
 	Stylelist=NULL;
@@ -163,9 +162,7 @@ OptionsDialog::OptionsDialog(wxWindow *parent, kainoteFrame *kaiparent)
 	SetIcon(icn);
 
 	wxWindow *Main= new wxWindow(OptionsTree,-1);
-	//Main->SetForegroundColour(Options.GetColour(WindowText));
 	wxWindow *Main1= new wxWindow(OptionsTree,-1);
-	//Main->SetForegroundColour(Options.GetColour(WindowText));
 	wxWindow *ConvOpt= new wxWindow(OptionsTree,-1);
 	wxWindow *Hotkeyss= new wxWindow(OptionsTree,-1);
 	wxWindow *AudioMain= new wxWindow(OptionsTree,-1);
@@ -711,6 +708,7 @@ OptionsDialog::~OptionsDialog()
 			if(Kai->GetTab()->Edit->ABox){Kai->GetTab()->Edit->ABox->SetAccels();}
 		}
 	}*/
+	delete[] windowNames;
 	handles.clear();
 }
 

diff --git a/Kaiplayer/OptionsDialog.h b/Kaiplayer/OptionsDialog.h
@@ -60,7 +60,7 @@ class OptionsDialog : public KaiDialog
 	KaiChoice* Katlist;
 	MappedButton *okok;
 	void ConOpt(wxWindow *ctrl,CONFIG option);
-
+	static wxString *windowNames;
 private:
 	std::vector<OptionsBind> handles;
 

diff --git a/Kaiplayer/VersionKainote.h b/Kaiplayer/VersionKainote.h
@@ -16,5 +16,5 @@
 //  This file is for automatic build change
 //  Autoversioning.exe change it after build using commandline
 
-#define VersionKainote "0.9.2.831"
-#define NumVersionKainote 0,9,2,831
+#define VersionKainote "0.9.2.832"
+#define NumVersionKainote 0,9,2,832
diff --git a/Thirdparty/wxWidgets/Build/msw/wx_vc9_adv.vcxproj b/Thirdparty/wxWidgets/Build/msw/wx_vc9_adv.vcxproj
@@ -236,7 +236,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_advlib.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderOutputFile>vc_mswu\$(Platform)\wxprec_advlib.pch</PrecompiledHeaderOutputFile>
       <ObjectFileName>vc_mswu\adv\x32\</ObjectFileName>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -271,7 +271,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_advlib.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderOutputFile>vc_mswu\$(Platform)\wxprec_advlib.pch</PrecompiledHeaderOutputFile>
       <ObjectFileName>vc_mswu\adv\x64\</ObjectFileName>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>

diff --git a/Thirdparty/wxWidgets/Build/msw/wx_vc9_aui.vcxproj b/Thirdparty/wxWidgets/Build/msw/wx_vc9_aui.vcxproj
@@ -236,7 +236,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_auilib.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderOutputFile>vc_mswu\$(Platform)\wxprec_auilib.pch</PrecompiledHeaderOutputFile>
       <ObjectFileName>vc_mswu\aui\$(Platform)\</ObjectFileName>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -271,7 +271,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_auilib.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderOutputFile>vc_mswu\$(Platform)\wxprec_auilib.pch</PrecompiledHeaderOutputFile>
       <ObjectFileName>vc_mswu\aui\$(Platform)\</ObjectFileName>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>

diff --git a/Thirdparty/wxWidgets/Build/msw/wx_vc9_base.vcxproj b/Thirdparty/wxWidgets/Build/msw/wx_vc9_base.vcxproj
@@ -236,7 +236,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderOutputFile>vc_mswu\$(Platform)\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
       <ObjectFileName>vc_mswu\base\$(Platform)\</ObjectFileName>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -271,7 +271,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderOutputFile>vc_mswu\$(Platform)\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
       <ObjectFileName>vc_mswu\base\$(Platform)\</ObjectFileName>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>