Change resources filename back to libresrc.cpp/h.

Originally committed to SVN as r3272.
2009-07-25 16:15:13 +00:00 · 2009-07-25 16:15:13 +00:00 · e6d6a056c9
parent fb3431df66
commit e6d6a056c9
27 changed files with 31 additions and 39 deletions
--- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
@ -1840,11 +1840,7 @@
 			Name="Resources"
 			>
 			<File
-				RelativePath="..\..\src\libresrc\icons.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\libresrc\icons.h"
+				RelativePath="..\..\src\libresrc\libresrc.cpp"
 				>
 			</File>
 			<File
@ -1855,10 +1851,6 @@
 				RelativePath="..\..\src\res.rc"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\libresrc\resrc.cpp"
-				>
-			</File>
 		</Filter>
 		<File
 			RelativePath="..\..\src\changelog.txt"
--- a/aegisub/src/audio_box.cpp
+++ b/aegisub/src/audio_box.cpp
@ -52,8 +52,8 @@
 #include "hotkeys.h"
 #include "tooltip_manager.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
-#include "libresrc/icons.h"
+
+

 //#ifdef __WXMAC__
 //#include "bevelButton.h"
--- a/aegisub/src/dialog_about.cpp
+++ b/aegisub/src/dialog_about.cpp
@ -46,7 +46,7 @@
 #include "version.h"
 #include "options.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/dialog_attachments.cpp
+++ b/aegisub/src/dialog_attachments.cpp
@ -51,7 +51,7 @@
 #include "options.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/dialog_automation.cpp
+++ b/aegisub/src/dialog_automation.cpp
@ -49,7 +49,7 @@
 #include <wx/log.h>
 #include <wx/msgdlg.h>
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 DialogAutomation::DialogAutomation(wxWindow *parent, Automation4::ScriptManager *_local_manager)
--- a/aegisub/src/dialog_colorpicker.cpp
+++ b/aegisub/src/dialog_colorpicker.cpp
@ -54,7 +54,7 @@
 #include "help_button.h"
 #include "utils.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+

 #include <stdio.h>

--- a/aegisub/src/dialog_fonts_collector.cpp
+++ b/aegisub/src/dialog_fonts_collector.cpp
@ -58,7 +58,7 @@
 #include "help_button.h"
 #include "scintilla_text_ctrl.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////
--- a/aegisub/src/dialog_jumpto.cpp
+++ b/aegisub/src/dialog_jumpto.cpp
@ -48,7 +48,7 @@
 #include "video_context.h"
 #include "utils.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////
--- a/aegisub/src/dialog_kanji_timer.cpp
+++ b/aegisub/src/dialog_kanji_timer.cpp
@ -53,7 +53,7 @@
 #include "ass_karaoke.h"
 #include <wx/string.h>
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+



--- a/aegisub/src/dialog_options.cpp
+++ b/aegisub/src/dialog_options.cpp
@ -67,7 +67,7 @@
 #include "utils.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////
--- a/aegisub/src/dialog_properties.cpp
+++ b/aegisub/src/dialog_properties.cpp
@ -51,7 +51,7 @@
 #include "utils.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/dialog_resample.cpp
+++ b/aegisub/src/dialog_resample.cpp
@ -50,7 +50,7 @@
 #include "subs_edit_box.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/dialog_shift_times.cpp
+++ b/aegisub/src/dialog_shift_times.cpp
@ -57,7 +57,7 @@
 #include "help_button.h"
 #include "charset_conv.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/dialog_spellchecker.cpp
+++ b/aegisub/src/dialog_spellchecker.cpp
@ -49,7 +49,7 @@
 #include "options.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////
--- a/aegisub/src/dialog_splash.cpp
+++ b/aegisub/src/dialog_splash.cpp
@ -45,7 +45,7 @@
 #include "options.h"
 #include "dialog_tip.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/dialog_style_editor.cpp
+++ b/aegisub/src/dialog_style_editor.cpp
@ -57,7 +57,7 @@
 #include "ass_style_storage.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@ -55,7 +55,7 @@
 #include "utils.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/dialog_styling_assistant.cpp
+++ b/aegisub/src/dialog_styling_assistant.cpp
@ -55,7 +55,7 @@
 #include "help_button.h"
 #include "subs_edit_box.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/dialog_timing_processor.cpp
+++ b/aegisub/src/dialog_timing_processor.cpp
@ -50,7 +50,7 @@
 #include "utils.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/dialog_translation.cpp
+++ b/aegisub/src/dialog_translation.cpp
@ -54,7 +54,7 @@
 #include "utils.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@ -82,7 +82,7 @@
 #endif
 #include "charset_conv.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+



--- a/aegisub/src/frame_main_events.cpp
+++ b/aegisub/src/frame_main_events.cpp
@ -90,7 +90,7 @@
 #include "keyframe.h"
 #include "charset_conv.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ////////////////////
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@ -63,7 +63,7 @@
 #include "tooltip_manager.h"
 #include "osx_bevelButton.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/video_box.cpp
+++ b/aegisub/src/video_box.cpp
@ -62,7 +62,7 @@
 #include "visual_tool.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////////////
--- a/aegisub/src/visual_tool_drag.cpp
+++ b/aegisub/src/visual_tool_drag.cpp
@ -46,7 +46,7 @@
 #include "utils.h"
 #include "vfr.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////
--- a/aegisub/src/visual_tool_vector_clip.cpp
+++ b/aegisub/src/visual_tool_vector_clip.cpp
@ -41,7 +41,7 @@
 #include "visual_tool_vector_clip.h"
 #include "ass_dialogue.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+


 ///////
--- a/aegisub/tools/common-respack.vcproj
+++ b/aegisub/tools/common-respack.vcproj
@ -88,7 +88,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\icons.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
+				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
 			/>
 		</Configuration>
 		<Configuration
@ -163,7 +163,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\icons.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
+				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
 			/>
 		</Configuration>
 		<Configuration
@ -236,7 +236,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\icons.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
+				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
 			/>
 		</Configuration>
 		<Configuration
@ -312,7 +312,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\icons.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
+				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
 			/>
 		</Configuration>
 	</Configurations>