iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert part of r3260: SIGH, why can't svn let you ctrl-c out of a commit further down in the process? You can only do it if you catch it early, though it's also my fault for not paying attention that I had local changes. 

Originally committed to SVN as r3261.
This commit is contained in:
Amar Takhar 2009-07-25 02:34:33 +00:00
parent 4a757421d9
commit d51396738b
3 changed files with 33 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
View File

@ -1287,10 +1287,6 @@
RelativePath="..\..\src\hotkeys.h" RelativePath="..\..\src\hotkeys.h"
> >
</File> </File>
<File
RelativePath="..\..\src\libresrc\libresrc.h"
>
</File>
<File <File
RelativePath="..\..\src\main.cpp" RelativePath="..\..\src\main.cpp"
> >
@ -1315,10 +1311,6 @@
RelativePath="..\..\src\plugin_manager.h" RelativePath="..\..\src\plugin_manager.h"
> >
</File> </File>
<File
RelativePath="..\..\src\libresrc\resrc.cpp"
>
</File>
<File <File
RelativePath="..\..\src\setup.cpp" RelativePath="..\..\src\setup.cpp"
> >
@ -1844,15 +1836,8 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="Resources"
>
<File <File
RelativePath="..\..\src\resources\icons.cpp" RelativePath="..\..\src\changelog.txt"
>
</File>
<File
RelativePath="..\..\src\resources\icons.h"
> >
</File> </File>
<File <File
@ -1863,11 +1848,6 @@
RelativePath="..\..\src\libresrc\resrc.cpp" RelativePath="..\..\src\libresrc\resrc.cpp"
> >
</File> </File>
</Filter>
<File
RelativePath="..\..\src\changelog.txt"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

34
aegisub/src/frame_main.cpp
View File

@ -45,7 +45,6 @@
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/statline.h> #include <wx/statline.h>
#include <wx/mstream.h>
#include "subs_grid.h" #include "subs_grid.h"
#include "frame_main.h" #include "frame_main.h"
@ -83,7 +82,6 @@
#endif #endif
#include "charset_conv.h" #include "charset_conv.h"
#include "libresrc/libresrc.h" #include "libresrc/libresrc.h"
#include "resources/icons.h"
@ -238,13 +236,13 @@ void FrameMain::InitToolbar () {
Toolbar = CreateToolBar(wxTB_FLAT | wxTB_HORIZONTAL,-1,_T("Toolbar")); Toolbar = CreateToolBar(wxTB_FLAT | wxTB_HORIZONTAL,-1,_T("Toolbar"));
// Subtitle control buttons // Subtitle control buttons
Toolbar->AddTool(Menu_File_New_Subtitles,_("New"), GETIMAGE(new_toolbutton_png), _("New subtitles")); Toolbar->AddTool(Menu_File_New_Subtitles,_("New"),wxBitmap(new_toolbutton_xpm),_("New subtitles"));
Toolbar->AddTool(Menu_File_Open_Subtitles,_("Open"),GETIMAGE(open_toolbutton_png),_("Open subtitles")); Toolbar->AddTool(Menu_File_Open_Subtitles,_("Open"),wxBitmap(open_toolbutton_xpm),_("Open subtitles"));
Toolbar->AddTool(Menu_File_Save_Subtitles,_("Save"),GETIMAGE(save_toolbutton_png),_("Save subtitles")); Toolbar->AddTool(Menu_File_Save_Subtitles,_("Save"),wxBitmap(save_toolbutton_xpm),_("Save subtitles"));
Toolbar->AddSeparator(); Toolbar->AddSeparator();
// Video zoom controls // Video zoom controls
Toolbar->AddTool(Menu_Video_JumpTo,_("Jump To..."),GETIMAGE(jumpto_button_png),wxNullBitmap,wxITEM_NORMAL,_("Jump video to time/frame")); Toolbar->AddTool(Menu_Video_JumpTo,_("Jump To..."),wxBitmap(jumpto_button_xpm),wxNullBitmap,wxITEM_NORMAL,_("Jump video to time/frame"));
Toolbar->AddTool(Menu_Video_Zoom_In,_("Zoom in"),wxBitmap(zoom_in_button_xpm),wxNullBitmap,wxITEM_NORMAL,_("Zoom video in")); Toolbar->AddTool(Menu_Video_Zoom_In,_("Zoom in"),wxBitmap(zoom_in_button_xpm),wxNullBitmap,wxITEM_NORMAL,_("Zoom video in"));
Toolbar->AddTool(Menu_Video_Zoom_Out,_("Zoom out"),wxBitmap(zoom_out_button_xpm),wxNullBitmap,wxITEM_NORMAL,_("Zoom video out")); Toolbar->AddTool(Menu_Video_Zoom_Out,_("Zoom out"),wxBitmap(zoom_out_button_xpm),wxNullBitmap,wxITEM_NORMAL,_("Zoom video out"));
wxArrayString choices; wxArrayString choices;
@ -264,20 +262,20 @@ void FrameMain::InitToolbar () {
Toolbar->AddTool(Menu_Subs_Snap_Start_To_Video,_("Snap start to video"),wxBitmap(substart_to_video_xpm),_("Set start of selected subtitles to current video frame")); Toolbar->AddTool(Menu_Subs_Snap_Start_To_Video,_("Snap start to video"),wxBitmap(substart_to_video_xpm),_("Set start of selected subtitles to current video frame"));
Toolbar->AddTool(Menu_Subs_Snap_End_To_Video,_("Snap end to video"),wxBitmap(subend_to_video_xpm),_("Set end of selected subtitles to current video frame")); Toolbar->AddTool(Menu_Subs_Snap_End_To_Video,_("Snap end to video"),wxBitmap(subend_to_video_xpm),_("Set end of selected subtitles to current video frame"));
Toolbar->AddTool(Menu_Video_Select_Visible,_("Select visible"),wxBitmap(select_visible_button_xpm),_("Selects all lines that are currently visible on video frame")); Toolbar->AddTool(Menu_Video_Select_Visible,_("Select visible"),wxBitmap(select_visible_button_xpm),_("Selects all lines that are currently visible on video frame"));
Toolbar->AddTool(Menu_Video_Snap_To_Scene,_("Snap subtitles to scene"),GETIMAGE(snap_subs_to_scene_png),_("Snap selected subtitles so they match current scene start/end")); Toolbar->AddTool(Menu_Video_Snap_To_Scene,_("Snap subtitles to scene"),wxBitmap(snap_subs_to_scene_xpm),_("Snap selected subtitles so they match current scene start/end"));
Toolbar->AddTool(Menu_Video_Shift_To_Frame,_("Shift subtitles to frame"),wxBitmap(shift_to_frame_xpm),_("Shift selected subtitles so first selected starts at this frame")); Toolbar->AddTool(Menu_Video_Shift_To_Frame,_("Shift subtitles to frame"),wxBitmap(shift_to_frame_xpm),_("Shift selected subtitles so first selected starts at this frame"));
Toolbar->AddSeparator(); Toolbar->AddSeparator();
// Property stuff // Property stuff
Toolbar->AddTool(Menu_Tools_Styles_Manager,_("Styles Manager"),GETIMAGE(style_toolbutton_png),_("Open Styles Manager")); Toolbar->AddTool(Menu_Tools_Styles_Manager,_("Styles Manager"),wxBitmap(style_toolbutton_xpm),_("Open Styles Manager"));
Toolbar->AddTool(Menu_Tools_Properties,_("Properties"),GETIMAGE(properties_toolbutton_png),_("Open Properties")); Toolbar->AddTool(Menu_Tools_Properties,_("Properties"),wxBitmap(properties_toolbutton_xpm),_("Open Properties"));
Toolbar->AddTool(Menu_Tools_Attachments,_("Attachments"),GETIMAGE(attach_button_png),_("Open Attachment List")); Toolbar->AddTool(Menu_Tools_Attachments,_("Attachments"),wxBitmap(attach_button_xpm),_("Open Attachment List"));
Toolbar->AddTool(Menu_Tools_Fonts_Collector,_("Fonts Collector"),GETIMAGE(font_collector_button_png),_("Open Fonts Collector")); Toolbar->AddTool(Menu_Tools_Fonts_Collector,_("Fonts Collector"),wxBitmap(font_collector_button_xpm),_("Open Fonts Collector"));
Toolbar->AddSeparator(); Toolbar->AddSeparator();
// Automation // Automation
#ifdef WITH_AUTOMATION #ifdef WITH_AUTOMATION
Toolbar->AddTool(Menu_Tools_Automation,_("Automation"),GETIMAGE(automation_toolbutton_png),_("Open Automation manager")); Toolbar->AddTool(Menu_Tools_Automation,_("Automation"),wxBitmap(automation_toolbutton_xpm),_("Open Automation manager"));
Toolbar->AddSeparator(); Toolbar->AddSeparator();
#endif #endif
@ -286,18 +284,18 @@ void FrameMain::InitToolbar () {
Toolbar->AddTool(Menu_Tools_ASSDraw,_T("ASSDraw3"),wxBitmap(assdraw_xpm),_("Launches ai-chan's \"ASSDraw3\" tool for vector drawing.")); Toolbar->AddTool(Menu_Tools_ASSDraw,_T("ASSDraw3"),wxBitmap(assdraw_xpm),_("Launches ai-chan's \"ASSDraw3\" tool for vector drawing."));
Toolbar->AddSeparator(); Toolbar->AddSeparator();
} }
Toolbar->AddTool(Menu_Edit_Shift,_("Shift Times"),GETIMAGE(shift_times_toolbutton_png),_("Open Shift Times Dialogue")); Toolbar->AddTool(Menu_Edit_Shift,_("Shift Times"),wxBitmap(shift_times_toolbutton_xpm),_("Open Shift Times Dialogue"));
Toolbar->AddTool(Menu_Tools_Styling,_("Styling Assistant"),wxBitmap(styling_toolbutton_xpm),_("Open Styling Assistant")); Toolbar->AddTool(Menu_Tools_Styling,_("Styling Assistant"),wxBitmap(styling_toolbutton_xpm),_("Open Styling Assistant"));
Toolbar->AddTool(Menu_Tools_Translation,_("Translation Assistant"),wxBitmap(translation_toolbutton_xpm),_("Open Translation Assistant")); Toolbar->AddTool(Menu_Tools_Translation,_("Translation Assistant"),wxBitmap(translation_toolbutton_xpm),_("Open Translation Assistant"));
Toolbar->AddTool(Menu_Tools_Resample,_("Resample"),GETIMAGE(resample_toolbutton_png),_("Resample Script Resolution")); Toolbar->AddTool(Menu_Tools_Resample,_("Resample"),wxBitmap(resample_toolbutton_xpm),_("Resample Script Resolution"));
Toolbar->AddTool(Menu_Tools_Timing_Processor,_("Timing Post-Processor"),wxBitmap(timing_processor_toolbutton_xpm),_("Open Timing Post-processor dialog")); Toolbar->AddTool(Menu_Tools_Timing_Processor,_("Timing Post-Processor"),wxBitmap(timing_processor_toolbutton_xpm),_("Open Timing Post-processor dialog"));
Toolbar->AddTool(Menu_Tools_Kanji_Timer,_("Kanji Timer"),GETIMAGE(kanji_timer_button_png),_("Open Kanji Timer dialog")); Toolbar->AddTool(Menu_Tools_Kanji_Timer,_("Kanji Timer"),wxBitmap(kanji_timer_button_xpm),_("Open Kanji Timer dialog"));
Toolbar->AddTool(Menu_Tools_SpellCheck,_("Spell Checker"),GETIMAGE(spellcheck_toolbutton_png),_("Open Spell checker")); Toolbar->AddTool(Menu_Tools_SpellCheck,_("Spell Checker"),wxBitmap(spellcheck_toolbutton_xpm),_("Open Spell checker"));
Toolbar->AddSeparator(); Toolbar->AddSeparator();
// Options // Options
Toolbar->AddTool(Menu_Tools_Options,_("Options"),GETIMAGE(options_button_png),_("Configure Aegisub")); Toolbar->AddTool(Menu_Tools_Options,_("Options"),wxBitmap(options_button_xpm),_("Configure Aegisub"));
Toolbar->AddTool(Grid_Toggle_Tags,_("Cycle Tag Hidding Mode"),GETIMAGE(toggle_tag_hiding_png),_("Cycle through tag-hiding modes")); Toolbar->AddTool(Grid_Toggle_Tags,_("Cycle Tag Hidding Mode"),wxBitmap(toggle_tag_hiding_xpm),_("Cycle through tag-hiding modes"));
// Update // Update
Toolbar->Realize(); Toolbar->Realize();

19
aegisub/src/subs_edit_box.cpp
View File

@ -63,7 +63,6 @@
#include "tooltip_manager.h" #include "tooltip_manager.h"
#include "osx_bevelButton.h" #include "osx_bevelButton.h"
#include "libresrc/libresrc.h" #include "libresrc/libresrc.h"
#include "resources/icons.h"
/////////////// ///////////////
@ -118,23 +117,23 @@ SubsEditBox::SubsEditBox (wxWindow *parent,SubtitlesGrid *gridp) : wxPanel(paren
MarginV->SetMaxLength(4); MarginV->SetMaxLength(4);
// Middle-bottom controls // Middle-bottom controls
Bold = new wxBitmapButton(this,BUTTON_BOLD,GETIMAGE(button_bold_png),wxDefaultPosition,wxSize(20,20)); Bold = new wxBitmapButton(this,BUTTON_BOLD,wxBitmap(button_bold_xpm),wxDefaultPosition,wxSize(20,20));
Bold->SetToolTip(_("Bold")); Bold->SetToolTip(_("Bold"));
Italics = new wxBitmapButton(this,BUTTON_ITALICS,GETIMAGE(button_italics_png),wxDefaultPosition,wxSize(20,20)); Italics = new wxBitmapButton(this,BUTTON_ITALICS,wxBitmap(button_italics_xpm),wxDefaultPosition,wxSize(20,20));
Italics->SetToolTip(_("Italics")); Italics->SetToolTip(_("Italics"));
Underline = new wxBitmapButton(this,BUTTON_UNDERLINE,GETIMAGE(button_underline_png),wxDefaultPosition,wxSize(20,20)); Underline = new wxBitmapButton(this,BUTTON_UNDERLINE,wxBitmap(button_underline_xpm),wxDefaultPosition,wxSize(20,20));
Underline->SetToolTip(_("Underline")); Underline->SetToolTip(_("Underline"));
Strikeout = new wxBitmapButton(this,BUTTON_STRIKEOUT,GETIMAGE(button_strikeout_png),wxDefaultPosition,wxSize(20,20)); Strikeout = new wxBitmapButton(this,BUTTON_STRIKEOUT,wxBitmap(button_strikeout_xpm),wxDefaultPosition,wxSize(20,20));
Strikeout->SetToolTip(_("Strikeout")); Strikeout->SetToolTip(_("Strikeout"));
FontName = new wxBitmapButton(this,BUTTON_FONT_NAME,GETIMAGE(button_fontname_png),wxDefaultPosition,wxSize(30,20)); FontName = new wxBitmapButton(this,BUTTON_FONT_NAME,wxBitmap(button_fontname_xpm),wxDefaultPosition,wxSize(30,20));
FontName->SetToolTip(_("Font Face Name")); FontName->SetToolTip(_("Font Face Name"));
Color1 = new wxBitmapButton(this,BUTTON_COLOR1,GETIMAGE(button_color_one_png),wxDefaultPosition,wxSize(30,20)); Color1 = new wxBitmapButton(this,BUTTON_COLOR1,wxBitmap(button_color_one_xpm),wxDefaultPosition,wxSize(30,20));
Color1->SetToolTip(_("Primary color")); Color1->SetToolTip(_("Primary color"));
Color2 = new wxBitmapButton(this,BUTTON_COLOR2,GETIMAGE(button_color_two_png),wxDefaultPosition,wxSize(30,20)); Color2 = new wxBitmapButton(this,BUTTON_COLOR2,wxBitmap(button_color_two_xpm),wxDefaultPosition,wxSize(30,20));
Color2->SetToolTip(_("Secondary color")); Color2->SetToolTip(_("Secondary color"));
Color3 = new wxBitmapButton(this,BUTTON_COLOR3,GETIMAGE(button_color_three_png),wxDefaultPosition,wxSize(30,20)); Color3 = new wxBitmapButton(this,BUTTON_COLOR3,wxBitmap(button_color_three_xpm),wxDefaultPosition,wxSize(30,20));
Color3->SetToolTip(_("Outline color")); Color3->SetToolTip(_("Outline color"));
Color4 = new wxBitmapButton(this,BUTTON_COLOR4,GETIMAGE(button_color_four_png),wxDefaultPosition,wxSize(30,20)); Color4 = new wxBitmapButton(this,BUTTON_COLOR4,wxBitmap(button_color_four_xpm),wxDefaultPosition,wxSize(30,20));
Color4->SetToolTip(_("Shadow color")); Color4->SetToolTip(_("Shadow color"));
#ifdef __WXMAC__ #ifdef __WXMAC__
CommitButton = new wxBevelButton(this,BUTTON_COMMIT,_("Commit"),wxDefaultPosition,wxDefaultSize); CommitButton = new wxBevelButton(this,BUTTON_COMMIT,_("Commit"),wxDefaultPosition,wxDefaultSize);