From 94965d1277b15865888be8cbc6546f27bdfed2dc Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Tue, 11 Aug 2009 05:35:25 +0000
Subject: [PATCH] Add new icon: kara_timing_copier which replaces
 kanji_timer_button.  Nothing has been changed other than the icon name.
 updates #870

Originally committed to SVN as r3383.
---
 aegisub/src/bitmaps/16/kanji_timer_button.png | Bin 378 -> 0 bytes
 aegisub/src/bitmaps/24/kanji_timer_button.png | Bin 530 -> 0 bytes
 aegisub/src/dialog_kara_timing_copy.cpp       |   2 +-
 aegisub/src/frame_main.cpp                    |   4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 aegisub/src/bitmaps/16/kanji_timer_button.png
 delete mode 100644 aegisub/src/bitmaps/24/kanji_timer_button.png

diff --git a/aegisub/src/bitmaps/16/kanji_timer_button.png b/aegisub/src/bitmaps/16/kanji_timer_button.png
deleted file mode 100644
index 323347f9238d4d45ec1fca2776d2af565a1a16ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 378
zcmV-=0fqjFP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00007bV*G`2iXV-
z1uq!0CV|`l0007FOGiWi|A&vvzW@LMAW1|)R2Ufr!7)fwVE_Q&Pwx~JAxt?;=z(!M
z88|oycR0r_L7>AU!<G|TqRmA_4&rEVDTO!O<{_>@5W*oyi%Ua_xcu;@Y&dW@!s+q*
zeE<MZHVpt3H-aDtg5b9;X8<syCe_rGN<|GV4}u{0p#)0`xm=+kN*ue;^Vw_BEYw|s
zOQ|Rk?CDA^`)?SQ6mq#jL$oGZ(Uscv3!vhKMW5`8>b@G%l{)kV04i<-CrY4e(}F2@
z;+sq+lgVTb45McsVBD^@wzjq-Q49R_9f0Sq1i_V>D8Wm21||UNu2ofCOGOD<PMv!X
zuxg;AV_-v+c<SC;AKWSfCF`1+K6)jZ_tPIECiU$Az%zv?_r^a}@J=59m@{t_V*qA&
Y1fyAAtLS!lZ~y=R07*qoM6N<$f{u5R-~a#s

diff --git a/aegisub/src/bitmaps/24/kanji_timer_button.png b/aegisub/src/bitmaps/24/kanji_timer_button.png
deleted file mode 100644
index b45ab0a4f07cc020f8f2004a553e6e5d662ffcc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 530
zcmV+t0`2{YP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco00007bV*G`2iXV-
z1uqXU^#mIL0007FOGiWi|A&vvzW@LMxJg7oR5;6>)ICU5VHgMS-;J^%kQD3#$s!_6
zaEPnX*HjIS5sF~Z5YZ4VDdeQpBn54K5Hx7e(5)y!h=vfFDsGS#G#OZ%Q|gkT_i6Cl
z)4AT;;`wjydwx8;&-<Li8lIhcYUH#=Cq1#T8oU%WbIn7cr5d!kxGGb^knP?IQ;JDm
z*;6L<?kXg?qu#jCfoWmJvN_Xcg$HHOEzBw^niaYeQ0I?Db$+>r&BCKH=o8vOyU>?_
zqrxW=a9FsJ1tWU&7|DQP;dTo8g;Qm4z*5?qC7lVF5Dul_sj%%|r?$$=%j?vp(MO@f
z2a|FsnDL|5C5|O^N}6quBL$z`tOc$pDthN!W^La6%9rx48m!8IU7%5TT?t<NXEd&p
zwDV^rXmVmz-V5h#0+)o)TuHVVPbX$vQ#u+e^%sQ8m7rIcR8TM}^kzVvd5?WJQ3?8l
zR?wQcX}BQtyQO6RYA|ZhpwSAj-n5e4x`aX&v|C7fGjCrC29lQMe6j3EmaNmDL4y`u
zI(-#79JA=Rz3C~x)%skYC3P0<FsI~9vYzv%x>qZwDJU3o9K+6LcA7nRa1FnhzfyPB
Ujpso$=Kufz07*qoM6N<$f*Ek}8vp<R

diff --git a/aegisub/src/dialog_kara_timing_copy.cpp b/aegisub/src/dialog_kara_timing_copy.cpp
index 8d4948242..2ff0b1b0d 100644
--- a/aegisub/src/dialog_kara_timing_copy.cpp
+++ b/aegisub/src/dialog_kara_timing_copy.cpp
@@ -830,7 +830,7 @@ DialogKanjiTimer::DialogKanjiTimer(wxWindow *parent, SubtitlesGrid *_grid)
 : wxDialog (parent,-1,_("Kanji timing"),wxDefaultPosition)
 {
 	// Set icon
-	SetIcon(BitmapToIcon(GETIMAGE(kanji_timer_button_24)));
+	SetIcon(BitmapToIcon(GETIMAGE(kara_timing_copier_24)));
 
 	// Variables
 	subs = AssFile::top;
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index c1e3b22e2..2d7a17e6b 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -310,7 +310,7 @@ void FrameMain::InitToolbar () {
 	Toolbar->AddTool(Menu_Tools_Translation,_("Translation Assistant"),GETIMAGE(translation_toolbutton_24),_("Open Translation Assistant"));
 	Toolbar->AddTool(Menu_Tools_Resample,_("Resample"),GETIMAGE(resample_toolbutton_24),_("Resample Script Resolution"));
 	Toolbar->AddTool(Menu_Tools_Timing_Processor,_("Timing Post-Processor"),GETIMAGE(timing_processor_toolbutton_24),_("Open Timing Post-processor dialog"));
-	Toolbar->AddTool(Menu_Tools_Kanji_Timer,_("Kanji Timer"),GETIMAGE(kanji_timer_button_24),_("Open Kanji Timer dialog"));
+	Toolbar->AddTool(Menu_Tools_Kanji_Timer,_("Kanji Timer"),GETIMAGE(kara_timing_copier_24),_("Open Kanji Timer dialog"));
 	Toolbar->AddTool(Menu_Tools_SpellCheck,_("Spell Checker"),GETIMAGE(spellcheck_toolbutton_24),_("Open Spell checker"));
 	Toolbar->AddSeparator();
 
@@ -449,7 +449,7 @@ void FrameMain::InitMenu() {
 	AppendBitmapMenuItem(timingMenu,Menu_Edit_Shift, MakeHotkeyText(_("S&hift Times..."), _T("Shift times")), _("Shift subtitles by time or frames"),GETIMAGE(shift_times_toolbutton_16));
 	AppendBitmapMenuItem(timingMenu,Menu_Edit_Sort, _("Sort by Time"), _("Sort all subtitles by their start times"),GETIMAGE(sort_times_button_16));
 	AppendBitmapMenuItem(timingMenu,Menu_Tools_Timing_Processor,_("Timing Post-Processor..."), _("Runs a post-processor for timing to deal with lead-ins, lead-outs, scene timing and etc."), GETIMAGE(timing_processor_toolbutton_16));
-	AppendBitmapMenuItem (timingMenu,Menu_Tools_Kanji_Timer,_("Kanji Timer..."),_("Open Kanji timer"),GETIMAGE(kanji_timer_button_16));
+	AppendBitmapMenuItem (timingMenu,Menu_Tools_Kanji_Timer,_("Kanji Timer..."),_("Open Kanji timer"),GETIMAGE(kara_timing_copier_16));
 	timingMenu->AppendSeparator();
 	AppendBitmapMenuItem(timingMenu,Menu_Subs_Snap_Start_To_Video, MakeHotkeyText(_("Snap Start to Video"), _T("Set Start To Video")), _("Set start of selected subtitles to current video frame"), GETIMAGE(substart_to_video_16));
 	AppendBitmapMenuItem(timingMenu,Menu_Subs_Snap_End_To_Video, MakeHotkeyText(_("Snap End to Video"), _T("Set End to Video")), _("Set end of selected subtitles to current video frame"), GETIMAGE(subend_to_video_16));