mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Make the windows build system work with the XMP buttons.

Browse source 
Originally committed to SVN as r3242.
This commit is contained in:
Thomas Goyne 2009-07-23 23:54:06 +00:00
parent 98dad055ff
commit 87e96be4b5
5 changed files with 127 additions and 252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
View file

@ -1836,6 +1836,10 @@
RelativePath="..\..\src\res.rc" RelativePath="..\..\src\res.rc"
> >
</File> </File>
<File
RelativePath="..\..\src\libresrc\resrc.cpp"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

238
aegisub/src/libresrc/libresrc.h
View file

@ -1,122 +1,122 @@
#ifndef _RES_H #ifndef _RES_H
#define _RES_H #define _RES_H
extern char *wxicon_xpm[]; extern const char *wxicon_xpm[];
extern char *shift_times_toolbutton_xpm[]; extern const char *shift_times_toolbutton_xpm[];
extern char *button_track_movement_xpm[]; extern const char *button_track_movement_xpm[];
extern char *video_to_substart_xpm[]; extern const char *video_to_substart_xpm[];
extern char *null_button_xpm[]; extern const char *null_button_xpm[];
extern char *sort_times_button_xpm[]; extern const char *sort_times_button_xpm[];
extern char *kanji_timer_button_xpm[]; extern const char *kanji_timer_button_xpm[];
extern char *button_underline_xpm[]; extern const char *button_underline_xpm[];
extern char *arrow_down_xpm[]; extern const char *arrow_down_xpm[];
extern char *automation_toolbutton_xpm[]; extern const char *automation_toolbutton_xpm[];
extern char *button_bold_xpm[]; extern const char *button_bold_xpm[];
extern char *exit_button_xpm[]; extern const char *exit_button_xpm[];
extern char *snap_subs_to_scene_xpm[]; extern const char *snap_subs_to_scene_xpm[];
extern char *button_leadin_xpm[]; extern const char *button_leadin_xpm[];
extern char *splash_xpm[]; extern const char *splash_xpm[];
extern char *forums_button_xpm[]; extern const char *forums_button_xpm[];
extern char *visual_move_xpm[]; extern const char *visual_move_xpm[];
extern char *styling_toolbutton_xpm[]; extern const char *styling_toolbutton_xpm[];
extern char *visual_rotatexy_xpm[]; extern const char *visual_rotatexy_xpm[];
extern char *button_track_points_xpm[]; extern const char *button_track_points_xpm[];
extern char *visual_vector_clip_freehand_xpm[]; extern const char *visual_vector_clip_freehand_xpm[];
extern char *button_playline_xpm[]; extern const char *button_playline_xpm[];
extern char *arrow_up_stop_xpm[]; extern const char *arrow_up_stop_xpm[];
extern char *button_audio_goto_xpm[]; extern const char *button_audio_goto_xpm[];
extern char *visual_clip_xpm[]; extern const char *visual_clip_xpm[];
extern char *jumpto_button_xpm[]; extern const char *jumpto_button_xpm[];
extern char *toggle_audio_autocommit_xpm[]; extern const char *toggle_audio_autocommit_xpm[];
extern char *subend_to_video_xpm[]; extern const char *subend_to_video_xpm[];
extern char *toggle_audio_medusa_xpm[]; extern const char *toggle_audio_medusa_xpm[];
extern char *style_toolbutton_xpm[]; extern const char *style_toolbutton_xpm[];
extern char *select_visible_button_xpm[]; extern const char *select_visible_button_xpm[];
extern char *button_color_two_xpm[]; extern const char *button_color_two_xpm[];
extern char *button_leadout_xpm[]; extern const char *button_leadout_xpm[];
extern char *properties_toolbutton_xpm[]; extern const char *properties_toolbutton_xpm[];
extern char *visual_vector_clip_bicubic_xpm[]; extern const char *visual_vector_clip_bicubic_xpm[];
extern char *button_pause_xpm[]; extern const char *button_pause_xpm[];
extern char *redo_button_xpm[]; extern const char *redo_button_xpm[];
extern char *zoom_out_button_xpm[]; extern const char *zoom_out_button_xpm[];
extern char *spellcheck_toolbutton_xpm[]; extern const char *spellcheck_toolbutton_xpm[];
extern char *visual_vector_clip_insert_xpm[]; extern const char *visual_vector_clip_insert_xpm[];
extern char *button_track_point_del_xpm[]; extern const char *button_track_point_del_xpm[];
extern char *resample_toolbutton_xpm[]; extern const char *resample_toolbutton_xpm[];
extern char *visual_standard_xpm[]; extern const char *visual_standard_xpm[];
extern char *button_color_three_xpm[]; extern const char *button_color_three_xpm[];
extern char *shift_to_frame_xpm[]; extern const char *shift_to_frame_xpm[];
extern char *cut_button_xpm[]; extern const char *cut_button_xpm[];
extern char *find_next_button_xpm[]; extern const char *find_next_button_xpm[];
extern char *select_lines_button_xpm[]; extern const char *select_lines_button_xpm[];
extern char *button_italics_xpm[]; extern const char *button_italics_xpm[];
extern char *visual_vector_clip_freehand_smooth_xpm[]; extern const char *visual_vector_clip_freehand_smooth_xpm[];
extern char *button_next_xpm[]; extern const char *button_next_xpm[];
extern char *arrow_up_xpm[]; extern const char *arrow_up_xpm[];
extern char *button_play_xpm[]; extern const char *button_play_xpm[];
extern char *button_track_split_line_xpm[]; extern const char *button_track_split_line_xpm[];
extern char *font_collector_button_xpm[]; extern const char *font_collector_button_xpm[];
extern char *toggle_audio_spectrum_xpm[]; extern const char *toggle_audio_spectrum_xpm[];
extern char *website_button_xpm[]; extern const char *website_button_xpm[];
extern char *button_playsel_xpm[]; extern const char *button_playsel_xpm[];
extern char *timing_processor_toolbutton_xpm[]; extern const char *timing_processor_toolbutton_xpm[];
extern char *button_playfivehbefore_xpm[]; extern const char *button_playfivehbefore_xpm[];
extern char *bugtracker_button_xpm[]; extern const char *bugtracker_button_xpm[];
extern char *visual_rotatez_xpm[]; extern const char *visual_rotatez_xpm[];
extern char *save_as_toolbutton_xpm[]; extern const char *save_as_toolbutton_xpm[];
extern char *button_playtoend_xpm[]; extern const char *button_playtoend_xpm[];
extern char *copy_button_xpm[]; extern const char *copy_button_xpm[];
extern char *visual_vector_clip_remove_xpm[]; extern const char *visual_vector_clip_remove_xpm[];
extern char *visual_vector_clip_drag_xpm[]; extern const char *visual_vector_clip_drag_xpm[];
extern char *toggle_audio_link_xpm[]; extern const char *toggle_audio_link_xpm[];
extern char *irc_button_xpm[]; extern const char *irc_button_xpm[];
extern char *translation_toolbutton_xpm[]; extern const char *translation_toolbutton_xpm[];
extern char *arrow_down_stop_xpm[]; extern const char *arrow_down_stop_xpm[];
extern char *paste_over_button_xpm[]; extern const char *paste_over_button_xpm[];
extern char *substart_to_video_xpm[]; extern const char *substart_to_video_xpm[];
extern char *about_button_xpm[]; extern const char *about_button_xpm[];
extern char *toggle_tag_hiding_xpm[]; extern const char *toggle_tag_hiding_xpm[];
extern char *button_strikeout_xpm[]; extern const char *button_strikeout_xpm[];
extern char *find_button_xpm[]; extern const char *find_button_xpm[];
extern char *button_track_move_xpm[]; extern const char *button_track_move_xpm[];
extern char *arrow_sort_xpm[]; extern const char *arrow_sort_xpm[];
extern char *blank_button_xpm[]; extern const char *blank_button_xpm[];
extern char *button_track_trail_xpm[]; extern const char *button_track_trail_xpm[];
extern char *button_audio_commit_xpm[]; extern const char *button_audio_commit_xpm[];
extern char *delete_button_xpm[]; extern const char *delete_button_xpm[];
extern char *button_fontname_xpm[]; extern const char *button_fontname_xpm[];
extern char *new_toolbutton_xpm[]; extern const char *new_toolbutton_xpm[];
extern char *options_button_xpm[]; extern const char *options_button_xpm[];
extern char *undo_button_xpm[]; extern const char *undo_button_xpm[];
extern char *toggle_audio_ssa_xpm[]; extern const char *toggle_audio_ssa_xpm[];
extern char *visual_vector_clip_xpm[]; extern const char *visual_vector_clip_xpm[];
extern char *contents_button_xpm[]; extern const char *contents_button_xpm[];
extern char *button_playlastfiveh_xpm[]; extern const char *button_playlastfiveh_xpm[];
extern char *hotkeys_button_xpm[]; extern const char *hotkeys_button_xpm[];
extern char *visual_scale_xpm[]; extern const char *visual_scale_xpm[];
extern char *open_with_toolbutton_xpm[]; extern const char *open_with_toolbutton_xpm[];
extern char *zoom_in_button_xpm[]; extern const char *zoom_in_button_xpm[];
extern char *visual_vector_clip_convert_xpm[]; extern const char *visual_vector_clip_convert_xpm[];
extern char *button_track_point_add_xpm[]; extern const char *button_track_point_add_xpm[];
extern char *toggle_video_autoscroll_xpm[]; extern const char *toggle_video_autoscroll_xpm[];
extern char *replace_button_xpm[]; extern const char *replace_button_xpm[];
extern char *visual_move_conv_move_xpm[]; extern const char *visual_move_conv_move_xpm[];
extern char *eyedropper_tool_xpm[]; extern const char *eyedropper_tool_xpm[];
extern char *visual_realtime_xpm[]; extern const char *visual_realtime_xpm[];
extern char *button_color_one_xpm[]; extern const char *button_color_one_xpm[];
extern char *paste_button_xpm[]; extern const char *paste_button_xpm[];
extern char *open_toolbutton_xpm[]; extern const char *open_toolbutton_xpm[];
extern char *visual_help_xpm[]; extern const char *visual_help_xpm[];
extern char *toggle_audio_nextcommit_xpm[]; extern const char *toggle_audio_nextcommit_xpm[];
extern char *button_stop_xpm[]; extern const char *button_stop_xpm[];
extern char *button_prev_xpm[]; extern const char *button_prev_xpm[];
extern char *toggle_audio_autoscroll_xpm[]; extern const char *toggle_audio_autoscroll_xpm[];
extern char *video_to_subend_xpm[]; extern const char *video_to_subend_xpm[];
extern char *visual_move_conv_pos_xpm[]; extern const char *visual_move_conv_pos_xpm[];
extern char *attach_button_xpm[]; extern const char *attach_button_xpm[];
extern char *save_toolbutton_xpm[]; extern const char *save_toolbutton_xpm[];
extern char *assdraw_xpm[]; extern const char *assdraw_xpm[];
extern char *visual_vector_clip_line_xpm[]; extern const char *visual_vector_clip_line_xpm[];
extern char *button_color_four_xpm[]; extern const char *button_color_four_xpm[];
extern char *button_playfirstfiveh_xpm[]; extern const char *button_playfirstfiveh_xpm[];
extern char *button_playfivehafter_xpm[]; extern const char *button_playfivehafter_xpm[];
#endif /* _RES_H */ #endif /* _RES_H */

1
aegisub/src/libresrc/resrc.cpp
View file

@ -1,4 +1,5 @@
#define static #define static
#include "libresrc.h"
#include "wxicon_xpm.xpm" #include "wxicon_xpm.xpm"
#include "../bitmaps/shift_times_toolbutton_xpm.xpm" #include "../bitmaps/shift_times_toolbutton_xpm.xpm"
#include "../bitmaps/button_track_movement_xpm.xpm" #include "../bitmaps/button_track_movement_xpm.xpm"

132
aegisub/src/res.rc
View file

@ -36,140 +36,8 @@
// main app icon should always be first // main app icon should always be first
// (windows explorer uses the first icon resource by default) // (windows explorer uses the first icon resource by default)
wxicon ICON "bitmaps/icon.ico" wxicon ICON "bitmaps/icon.ico"
blank_button BITMAP "bitmaps/blank.bmp"
new_toolbutton BITMAP "bitmaps/new.bmp"
open_toolbutton BITMAP "bitmaps/open.bmp"
open_with_toolbutton BITMAP "bitmaps/open_with.bmp"
save_toolbutton BITMAP "bitmaps/save.bmp"
save_as_toolbutton BITMAP "bitmaps/save_as.bmp"
style_toolbutton BITMAP "bitmaps/style_manager.bmp"
styling_toolbutton BITMAP "bitmaps/styling_assistant.bmp"
translation_toolbutton BITMAP "bitmaps/translation.bmp"
properties_toolbutton BITMAP "bitmaps/properties.bmp"
automation_toolbutton BITMAP "bitmaps/automation.bmp"
spellcheck_toolbutton BITMAP "bitmaps/spellcheck.bmp"
resample_toolbutton BITMAP "bitmaps/resample.bmp"
timing_processor_toolbutton BITMAP "bitmaps/timing_processor.bmp"
shift_times_toolbutton BITMAP "bitmaps/shift_times.bmp"
jumpto_button BITMAP "bitmaps/jumpto.bmp"
contents_button BITMAP "bitmaps/contents.bmp"
zoom_in_button BITMAP "bitmaps/zoom_in.bmp"
zoom_out_button BITMAP "bitmaps/zoom_out.bmp"
font_collector_button BITMAP "bitmaps/fontcollect.bmp"
hotkeys_button BITMAP "bitmaps/hotkeys.bmp"
options_button BITMAP "bitmaps/options.bmp"
attach_button BITMAP "bitmaps/attach.bmp"
substart_to_video BITMAP "bitmaps/substart_to_video.bmp"
subend_to_video BITMAP "bitmaps/subend_to_video.bmp"
video_to_substart BITMAP "bitmaps/video_to_substart.bmp"
video_to_subend BITMAP "bitmaps/video_to_subend.bmp"
snap_subs_to_scene BITMAP "bitmaps/snap_to_scene.bmp"
copy_button BITMAP "bitmaps/copy.bmp"
paste_button BITMAP "bitmaps/paste.bmp"
paste_over_button BITMAP "bitmaps/paste_over.bmp"
cut_button BITMAP "bitmaps/cut.bmp"
undo_button BITMAP "bitmaps/undo.bmp"
redo_button BITMAP "bitmaps/redo.bmp"
irc_button BITMAP "bitmaps/irc.bmp"
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"
null_button BITMAP "bitmaps/null_button.bmp"
select_visible_button BITMAP "bitmaps/select_visible.bmp"
toggle_tag_hiding BITMAP "bitmaps/toggle_tag_hiding.bmp"
shift_to_frame BITMAP "bitmaps/shift_to_frame.bmp"
bugtracker_button BITMAP "bitmaps/bugtracker.bmp"
website_button BITMAP "bitmaps/website.bmp"
forums_button BITMAP "bitmaps/forums.bmp"
about_button BITMAP "bitmaps/about.bmp"
exit_button BITMAP "bitmaps/exit.bmp"
sort_times_button BITMAP "bitmaps/sort_times.bmp"
kanji_timer_button BITMAP "bitmaps/kanji_timer.bmp"
select_lines_button BITMAP "bitmaps/select_lines.bmp"
button_play BITMAP "bitmaps/button_play.bmp"
button_pause BITMAP "bitmaps/button_pause.bmp"
button_stop BITMAP "bitmaps/button_stop.bmp"
button_track_points BITMAP "bitmaps/button_track_points.bmp"
button_track_point_add BITMAP "bitmaps/button_track_point_add.bmp"
button_track_point_del BITMAP "bitmaps/button_track_point_del.bmp"
button_track_movement BITMAP "bitmaps/button_track_movement.bmp"
button_track_split_line BITMAP "bitmaps/button_track_split_line.bmp"
button_track_trail BITMAP "bitmaps/button_track_trail.bmp"
button_track_move BITMAP "bitmaps/button_track_move.bmp"
button_bold BITMAP "bitmaps/button_bold.bmp"
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_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_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"
button_leadin BITMAP "bitmaps/button_leadin.bmp"
button_leadout BITMAP "bitmaps/button_leadout.bmp"
toggle_audio_autoscroll BITMAP "bitmaps/toggle_audio_autoscroll.bmp"
toggle_audio_autocommit BITMAP "bitmaps/toggle_audio_autocommit.bmp"
toggle_audio_nextcommit BITMAP "bitmaps/toggle_audio_nextcommit.bmp"
toggle_audio_ssa BITMAP "bitmaps/toggle_audio_ssa.bmp"
toggle_audio_medusa BITMAP "bitmaps/toggle_audio_medusa.bmp"
toggle_audio_spectrum BITMAP "bitmaps/toggle_audio_spectrum.bmp"
toggle_audio_link BITMAP "bitmaps/toggle_audio_link.bmp"
toggle_video_autoscroll BITMAP "bitmaps/toggle_video_autoscroll.bmp"
visual_standard BITMAP "bitmaps/visual_standard.bmp"
visual_move BITMAP "bitmaps/visual_move.bmp"
visual_move_conv_move BITMAP "bitmaps/visual_move_conv_move.bmp"
visual_move_conv_pos BITMAP "bitmaps/visual_move_conv_pos.bmp"
visual_rotatez BITMAP "bitmaps/visual_rotatez.bmp"
visual_rotatexy BITMAP "bitmaps/visual_rotatexy.bmp"
visual_scale BITMAP "bitmaps/visual_scale.bmp"
visual_clip BITMAP "bitmaps/visual_clip.bmp"
visual_vector_clip BITMAP "bitmaps/visual_vector_clip.bmp"
visual_vector_clip_drag BITMAP "bitmaps/visual_vector_clip_drag.bmp"
visual_vector_clip_line BITMAP "bitmaps/visual_vector_clip_line.bmp"
visual_vector_clip_bicubic BITMAP "bitmaps/visual_vector_clip_bicubic.bmp"
visual_vector_clip_remove BITMAP "bitmaps/visual_vector_clip_remove.bmp"
visual_vector_clip_convert BITMAP "bitmaps/visual_vector_clip_convert.bmp"
visual_vector_clip_insert BITMAP "bitmaps/visual_vector_clip_insert.bmp"
visual_vector_clip_freehand BITMAP "bitmaps/visual_vector_clip_freehand.bmp"
visual_vector_clip_freehand_smooth BITMAP "bitmaps/visual_vector_clip_freehand_smooth.bmp"
visual_realtime BITMAP "bitmaps/visual_realtime.bmp"
visual_help BITMAP "bitmaps/visual_help.bmp"
arrow_up BITMAP "bitmaps/arrow_up.bmp"
arrow_down BITMAP "bitmaps/arrow_down.bmp"
arrow_up_stop BITMAP "bitmaps/arrow_up_stop.bmp"
arrow_down_stop BITMAP "bitmaps/arrow_down_stop.bmp"
arrow_sort BITMAP "bitmaps/arrow_sort.bmp"
eyedropper_tool BITMAP "bitmaps/eyedropper.bmp"
//eyedropper_icon ICON "bitmaps/eyedropper.ico"
eyedropper_cursor CURSOR "bitmaps/eyedropper.cur" eyedropper_cursor CURSOR "bitmaps/eyedropper.cur"
splash BITMAP "bitmaps/splash.bmp"
assdraw BITMAP "bitmaps/assdraw.bmp"
// The following define is necessary for Visual Studio // The following define is necessary for Visual Studio
#define wxUSE_NO_MANIFEST 1 #define wxUSE_NO_MANIFEST 1
#include "wx/msw/wx.rc" #include "wx/msw/wx.rc"

4
aegisub/src/stdwx.h
View file

@ -98,6 +98,8 @@
#include <list> #include <list>
#include <map> #include <map>
/////////////
// Resources
#include "libresrc/libresrc.h"
#endif // C++ #endif // C++