Alt + code fix, no enable/disable text original in find replace fix

bjakja · Dec 1, 2018 · 734ddca · 734ddca
1 parent e711182
commit 734ddca
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/Kaiplayer/FindReplaceDialog.cpp b/Kaiplayer/FindReplaceDialog.cpp
@@ -479,7 +479,8 @@ void FindReplaceDialog::OnActivate(wxActivateEvent& event)
 	}
 	TabWindow *currentTab = GetTab();
 	long from, to, fromO, toO;
-	EditBox *edit = Kai->GetTab()->Edit;
+	TabPanel *tab = Kai->GetTab();
+	EditBox *edit = tab->Edit;
 	edit->TextEdit->GetSelection(&from, &to);
 	edit->TextEditOrig->GetSelection(&fromO, &toO);
 	KaiChoice * findOrReplace = (currentTab->FindText->GetValue().Len() > 0 && 
@@ -500,6 +501,10 @@ void FindReplaceDialog::OnActivate(wxActivateEvent& event)
 		FR->textPosition = FR->linePosition = 0;
 	}
 	findOrReplace->SetFocus();
+	//check if is TlMode and change text oryginal enabling
+	if (currentTab->CollumnTextOriginal && tab->Grid->hasTLMode != currentTab->CollumnTextOriginal->IsEnabled())
+		currentTab->CollumnTextOriginal->Enable(tab->Grid->hasTLMode);
+
 	FR->findTextReset = false;
 }
 

diff --git a/Kaiplayer/Hotkeys.cpp b/Kaiplayer/Hotkeys.cpp
@@ -175,8 +175,8 @@ void Hotkeys::LoadDefault(std::map<idAndType, hdata> &_hkeys, bool Audio)
 		_hkeys[idAndType(VolumeMinus, VIDEO_HOTKEY)] = hdata(_("Dźwięk ciszej"), "Num 0");
 		_hkeys[idAndType(NextChapter, VIDEO_HOTKEY)] = hdata(_("Następny rozdział"), "M");
 		_hkeys[idAndType(PreviousChapter, VIDEO_HOTKEY)] = hdata(_("Poprzedni rozdział"), "N");
-		_hkeys[idAndType(PutBold, EDITBOX_HOTKEY)] = hdata(_("Wstaw pogrubienie"), "Ctrl-I");
-		_hkeys[idAndType(PutItalic, EDITBOX_HOTKEY)] = hdata(_("Wstaw kursywę"), "Ctrl-B");
+		_hkeys[idAndType(PutBold, EDITBOX_HOTKEY)] = hdata(_("Wstaw pogrubienie"), "Ctrl-B");
+		_hkeys[idAndType(PutItalic, EDITBOX_HOTKEY)] = hdata(_("Wstaw kursywę"), "Ctrl-I");
 		_hkeys[idAndType(SplitLine, EDITBOX_HOTKEY)] = hdata(_("Wstaw znak podziału"), "Shift-Enter");
 		_hkeys[idAndType(StartDifference, EDITBOX_HOTKEY)] = hdata(_("Wstaw różnicę początkową"), "Ctrl-,");
 		_hkeys[idAndType(EndDifference, EDITBOX_HOTKEY)] = hdata(_("Wstaw różnicę końcową"), "Ctrl-.");

diff --git a/Kaiplayer/KaiTextCtrl.cpp b/Kaiplayer/KaiTextCtrl.cpp
@@ -400,7 +400,8 @@ void KaiTextCtrl::OnCharPress(wxKeyEvent& event)
 	int key = event.GetKeyCode();
 	bool ctrl = event.ControlDown();
 	bool alt = event.AltDown();
-	if (!(((!ctrl && !alt) || (ctrl && alt)) && (key>30 || key == 0))){
+	if (!(((!ctrl && !alt) || (ctrl && alt)) && (key > 30 || key == 0) || 
+		(alt && (key >= WXK_NUMPAD0 && key <= WXK_NUMPAD9)))){
 		event.Skip(); return;
 	}
 	wxUniChar wkey = event.GetUnicodeKey();

diff --git a/Kaiplayer/MyTextEditor.cpp b/Kaiplayer/MyTextEditor.cpp
@@ -331,7 +331,7 @@ void TextEditor::OnKeyPress(wxKeyEvent& event)
 			tagList = NULL;
 		}
 	}
-	if (((!ctrl && !alt) || (ctrl && alt)) && (key > 30 || key == 0)){
+	if (((!ctrl && !alt) || (ctrl && alt)) && (key > 30 || key == 0) || (alt && (key >= WXK_NUMPAD0 && key <= WXK_NUMPAD9))){
 		event.Skip(); return; 
 	}
 }

diff --git a/Kaiplayer/VersionKainote.h b/Kaiplayer/VersionKainote.h
@@ -20,5 +20,5 @@
 //StableReleaseLink: https://github.com/bjakja/Kainote/releases/download/v0.9.3.893/Kainote.x64.zip
 //VersionKainoteX86: 0.9.3.910
 
-#define VersionKainote "0.9.5.1056"
-#define NumVersionKainote 0,9,5,1056
+#define VersionKainote "0.9.5.1057"
+#define NumVersionKainote 0,9,5,1057