get rid of numbers in bitmap names

Originally committed to SVN as r1057.

aegisub/audio_box.cpp

@@ -138,16 +138,16 @@ wxPanel(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL|wxBORDER_RAISE
 	temp->SetToolTip(_("Stop (") + Hotkeys.GetText(_T("Audio Stop")) + _T(")"));
 	ButtonSizer->Add(temp,0,wxRIGHT,10);
 
-	temp = new wxBitmapButton(this,Audio_Button_Play_500ms_Before,wxBITMAP(button_play500before),wxDefaultPosition,wxSize(30,-1));
+	temp = new wxBitmapButton(this,Audio_Button_Play_500ms_Before,wxBITMAP(button_playfivehbefore),wxDefaultPosition,wxSize(30,-1));
 	temp->SetToolTip(_("Play 500 ms before selection (") + Hotkeys.GetText(_T("Audio Play 500ms Before")) + _T(")"));
 	ButtonSizer->Add(temp,0,wxRIGHT,0);
-	temp = new wxBitmapButton(this,Audio_Button_Play_500ms_After,wxBITMAP(button_play500after),wxDefaultPosition,wxSize(30,-1));
+	temp = new wxBitmapButton(this,Audio_Button_Play_500ms_After,wxBITMAP(button_playfivehafter),wxDefaultPosition,wxSize(30,-1));
 	temp->SetToolTip(_("Play 500 ms after selection (") + Hotkeys.GetText(_T("Audio Play 500ms after")) + _T(")"));
 	ButtonSizer->Add(temp,0,wxRIGHT,0);
-	temp = new wxBitmapButton(this,Audio_Button_Play_500ms_First,wxBITMAP(button_playfirst500),wxDefaultPosition,wxSize(30,-1));
+	temp = new wxBitmapButton(this,Audio_Button_Play_500ms_First,wxBITMAP(button_playfirstfiveh),wxDefaultPosition,wxSize(30,-1));
 	temp->SetToolTip(_("Play first 500ms of selection (") + Hotkeys.GetText(_T("Audio Play First 500ms")) + _T(")"));
 	ButtonSizer->Add(temp,0,wxRIGHT,0);
-	temp = new wxBitmapButton(this,Audio_Button_Play_500ms_Last,wxBITMAP(button_playlast500),wxDefaultPosition,wxSize(30,-1));
+	temp = new wxBitmapButton(this,Audio_Button_Play_500ms_Last,wxBITMAP(button_playlastfiveh),wxDefaultPosition,wxSize(30,-1));
 	temp->SetToolTip(_("Play last 500ms of selection (") + Hotkeys.GetText(_T("Audio Play Last 500ms")) + _T(")"));
 	ButtonSizer->Add(temp,0,wxRIGHT,0);
 	temp = new wxBitmapButton(this,Audio_Button_Play_To_End,wxBITMAP(button_playtoend),wxDefaultPosition,wxSize(30,-1));

aegisub/res.rc

@@ -100,19 +100,19 @@ button_italics BITMAP "bitmaps/button_italics.bmp"
 button_underline BITMAP "bitmaps/button_underline.bmp"
 button_strikeout BITMAP "bitmaps/button_strikeout.bmp"
 button_fontname BITMAP "bitmaps/button_fontname.bmp"
-button_color1 BITMAP "bitmaps/button_color1.bmp"
-button_color2 BITMAP "bitmaps/button_color2.bmp"
-button_color3 BITMAP "bitmaps/button_color3.bmp"
-button_color4 BITMAP "bitmaps/button_color4.bmp"
+button_color_one BITMAP "bitmaps/button_color_one.bmp"
+button_color_two BITMAP "bitmaps/button_color_two.bmp"
+button_color_three BITMAP "bitmaps/button_color_three.bmp"
+button_color_four BITMAP "bitmaps/button_color_four.bmp"
 
 button_prev BITMAP "bitmaps/button_prev.bmp"
 button_next BITMAP "bitmaps/button_next.bmp"
 button_playsel BITMAP "bitmaps/button_playline.bmp"
 button_playline BITMAP "bitmaps/button_playsel.bmp"
-button_playfirst500 BITMAP "bitmaps/button_playfirst500.bmp"
-button_playlast500 BITMAP "bitmaps/button_playlast500.bmp"
-button_play500before BITMAP "bitmaps/button_play500before.bmp"
-button_play500after BITMAP "bitmaps/button_play500after.bmp"
+button_playfirstfiveh BITMAP "bitmaps/button_playfirstfiveh.bmp"
+button_playlastfiveh BITMAP "bitmaps/button_playlastfiveh.bmp"
+button_playfivehbefore BITMAP "bitmaps/button_playfivehbefore.bmp"
+button_playfivehafter BITMAP "bitmaps/button_playfivehafter.bmp"
 button_playtoend BITMAP "bitmaps/button_playtoend.bmp"
 button_audio_goto BITMAP "bitmaps/button_audio_go.bmp"
 button_audio_commit BITMAP "bitmaps/button_audio_commit.bmp"

aegisub/subs_edit_box.cpp

@@ -124,13 +124,13 @@ SubsEditBox::SubsEditBox (wxWindow *parent,SubtitlesGrid *gridp) : wxPanel(paren
 	Strikeout->SetToolTip(_("Strikeout"));
 	FontName = new wxBitmapButton(this,BUTTON_FONT_NAME,wxBITMAP(button_fontname),wxDefaultPosition,wxSize(30,20));
 	FontName->SetToolTip(_("Font Face Name"));
-	Color1 = new wxBitmapButton(this,BUTTON_COLOR1,wxBITMAP(button_color1),wxDefaultPosition,wxSize(30,20));
+	Color1 = new wxBitmapButton(this,BUTTON_COLOR1,wxBITMAP(button_color_one),wxDefaultPosition,wxSize(30,20));
 	Color1->SetToolTip(_("Primary color"));
-	Color2 = new wxBitmapButton(this,BUTTON_COLOR2,wxBITMAP(button_color2),wxDefaultPosition,wxSize(30,20));
+	Color2 = new wxBitmapButton(this,BUTTON_COLOR2,wxBITMAP(button_color_two),wxDefaultPosition,wxSize(30,20));
 	Color2->SetToolTip(_("Secondary color"));
-	Color3 = new wxBitmapButton(this,BUTTON_COLOR3,wxBITMAP(button_color3),wxDefaultPosition,wxSize(30,20));
+	Color3 = new wxBitmapButton(this,BUTTON_COLOR3,wxBITMAP(button_color_three),wxDefaultPosition,wxSize(30,20));
 	Color3->SetToolTip(_("Outline color"));
-	Color4 = new wxBitmapButton(this,BUTTON_COLOR4,wxBITMAP(button_color4),wxDefaultPosition,wxSize(30,20));
+	Color4 = new wxBitmapButton(this,BUTTON_COLOR4,wxBITMAP(button_color_four),wxDefaultPosition,wxSize(30,20));
 	Color4->SetToolTip(_("Shadow color"));
 	ByTime = new wxRadioButton(this,RADIO_TIME_BY_TIME,_("Time"),wxDefaultPosition,wxDefaultSize,wxRB_GROUP);
 	ByTime->SetToolTip(_("Time by h:mm:ss.cs"));