From 36ea0678610e9727fb56a1ddf02a0513da70b361 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Thu, 28 Dec 2006 20:20:55 +0000
Subject: [PATCH] More menu work... yay~ <3

Originally committed to SVN as r641.
---
 core/bitmaps/delete.bmp         | Bin 1318 -> 1318 bytes
 core/bitmaps/delete_disable.bmp | Bin 0 -> 1318 bytes
 core/frame_main.cpp             |   2 +-
 core/frame_main_events.cpp      |   2 +-
 core/res.rc                     |   1 +
 5 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 core/bitmaps/delete_disable.bmp

diff --git a/core/bitmaps/delete.bmp b/core/bitmaps/delete.bmp
index 4afd004495554ba604ccea32cfd806c40babdef4..b16595f8ee18ad79aefbd006a89c24d3483a4a70 100644
GIT binary patch
delta 214
zcmZ3+wTx?nCrdp8I|M*!21W=2N;53~2^L^rWQ0gS1Q-~9E{ACVsX%bq*?}s60A?)E
va0WCkBajcZg`M4t9jN&y%o>nt5Eo<!%)aGdn-Bv3p$>#Q0Oo<ojw~VoeIF(G

delta 230
WcmZ3+wTx?nCrds1z=Am1S`PqD#|cIN

diff --git a/core/bitmaps/delete_disable.bmp b/core/bitmaps/delete_disable.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..29b77fd3e48284725d0ee6ab3a3f0b45220ca1b3
GIT binary patch
literal 1318
zcmZwFF|yM@490OW!<$D3M^MFZ0%{FCchFJ3qo`osIaG573LPOmMflrFhD;##Z@=}f
zV|#6V`~LaG&fnMfW?$%i!biNb59j#hZ2#BDjNPOSTDsQV*1y^=Ki|wekYK_KjWG*@
zgH9xbLSxL*;0SP#LZLCY`#Kp&2!+O&(Y0~}5<;OdJfy)9NC<_-n6cY90tune7z^Vu
z&2elAq0pFJnmZXt2!+P%vct(hLMSw5Ur9O{NC<_-?CX+~frL<K%)ZKUGLR4ojoH`S
zP6iS}p)uzth;cHI5DJYkv3{B3Sb5^u3XL(j!4XIZg~se>3nv2!q0pH9r0HZJAru<3
zpPQRVfrL<K%$7nq8Au3)#%!6ilYxX#Xv|qc8Ycq@q0ks>*5Bp`B!t4T&6bus8Au3)
z#%$SzlYxX#Xv~&mIvGd^g~n{T%E>@NC^TkExtt6nghFGs%-hL8LMXfZzS<AY6W24l
zp1WPIM-Obr5Y6kqzx&uN?R7i1JPsb+4(>zGv&ZG{|3CWY@8RU*_-Xz=yTi}df1Ewf
PczVA3<^Ja0^Va?WTP93;

literal 0
HcmV?d00001

diff --git a/core/frame_main.cpp b/core/frame_main.cpp
index 13c34c1f6..270126362 100644
--- a/core/frame_main.cpp
+++ b/core/frame_main.cpp
@@ -253,7 +253,7 @@ void FrameMain::InitMenu() {
 	AppendBitmapMenuItem(editMenu,Menu_Edit_Copy, _("Copy Lines\t") + Hotkeys.GetText(_T("Copy")), _("Copy subtitles"), wxBITMAP(copy_button));
 	AppendBitmapMenuItem(editMenu,Menu_Edit_Paste, _("Paste Lines\t") + Hotkeys.GetText(_T("Paste")), _("Paste subtitles"), wxBITMAP(paste_button));
 	AppendBitmapMenuItem(editMenu,Menu_Edit_Paste_Over, _("Paste Lines Over...\t") + Hotkeys.GetText(_T("Paste Over")) , _("Paste subtitles over others"),wxBITMAP(paste_over_button));
-	AppendBitmapMenuItem(editMenu,Menu_Edit_Delete, _("Delete Lines\t") + Hotkeys.GetText(_T("Grid Delete Rows")), _("Delete selected lines"), wxBITMAP(delete_button));
+	//AppendBitmapMenuItem(editMenu,Menu_Edit_Delete, _("Delete Lines\t") + Hotkeys.GetText(_T("Grid Delete Rows")), _("Delete selected lines"), wxBITMAP(delete_button));
 	editMenu->AppendSeparator();
 	AppendBitmapMenuItem(editMenu,Menu_Edit_Find, _("&Find...\t") + Hotkeys.GetText(_T("Find")), _("Find words in subtitles"),wxBITMAP(find_button));
 	AppendBitmapMenuItem(editMenu,Menu_Edit_Find_Next, _("Find Next\t") + Hotkeys.GetText(_T("Find Next")), _("Find next match of last word"),wxBITMAP(find_next_button));
diff --git a/core/frame_main_events.cpp b/core/frame_main_events.cpp
index ef5ce0b5d..dafae853c 100644
--- a/core/frame_main_events.cpp
+++ b/core/frame_main_events.cpp
@@ -410,7 +410,7 @@ void FrameMain::OnMenuOpen (wxMenuEvent &event) {
 		MenuBar->Enable(MENU_INSERT_BEFORE,state);
 		MenuBar->Enable(MENU_INSERT_AFTER,state);
 		MenuBar->Enable(MENU_SPLIT_BY_KARAOKE,state);
-		MenuBar->Enable(MENU_DELETE,state);
+		RebuildMenuItem(subtitlesMenu,MENU_DELETE,wxBITMAP(delete_button),wxBITMAP(delete_disable_button),state);
 		state2 = count > 0 && videoBox->videoDisplay->loaded;
 		MenuBar->Enable(MENU_INSERT_BEFORE_VIDEO,state2);
 		MenuBar->Enable(MENU_INSERT_AFTER_VIDEO,state2);
diff --git a/core/res.rc b/core/res.rc
index 26a67740c..943e42bf6 100644
--- a/core/res.rc
+++ b/core/res.rc
@@ -83,6 +83,7 @@ find_button BITMAP "bitmaps/find.bmp"
 find_next_button BITMAP "bitmaps/find_next.bmp"
 replace_button BITMAP "bitmaps/replace.bmp"
 delete_button BITMAP "bitmaps/delete.bmp"
+delete_disable_button BITMAP "bitmaps/delete_disable.bmp"
 null_button BITMAP "bitmaps/null_button.bmp"
 select_visible_button BITMAP "bitmaps/select_visible.bmp"
 toggle_tag_hiding BITMAP "bitmaps/toggle_tag_hiding.bmp"