Delete SubtitlesGrid since it's now empty

This commit is contained in:
Thomas Goyne 2013-06-18 19:28:11 -07:00
parent ad58ae14bf
commit 7c7cfc79e6
12 changed files with 13 additions and 104 deletions

View file

@ -220,7 +220,6 @@
<ClInclude Include="$(SrcDir)subs_controller.h" /> <ClInclude Include="$(SrcDir)subs_controller.h" />
<ClInclude Include="$(SrcDir)subs_edit_box.h" /> <ClInclude Include="$(SrcDir)subs_edit_box.h" />
<ClInclude Include="$(SrcDir)subs_edit_ctrl.h" /> <ClInclude Include="$(SrcDir)subs_edit_ctrl.h" />
<ClInclude Include="$(SrcDir)subs_grid.h" />
<ClInclude Include="$(SrcDir)subs_preview.h" /> <ClInclude Include="$(SrcDir)subs_preview.h" />
<ClInclude Include="$(SrcDir)subtitle_format.h" /> <ClInclude Include="$(SrcDir)subtitle_format.h" />
<ClInclude Include="$(SrcDir)subtitle_format_ass.h" /> <ClInclude Include="$(SrcDir)subtitle_format_ass.h" />
@ -417,7 +416,6 @@
<ClCompile Include="$(SrcDir)subs_controller.cpp" /> <ClCompile Include="$(SrcDir)subs_controller.cpp" />
<ClCompile Include="$(SrcDir)subs_edit_box.cpp" /> <ClCompile Include="$(SrcDir)subs_edit_box.cpp" />
<ClCompile Include="$(SrcDir)subs_edit_ctrl.cpp" /> <ClCompile Include="$(SrcDir)subs_edit_ctrl.cpp" />
<ClCompile Include="$(SrcDir)subs_grid.cpp" />
<ClCompile Include="$(SrcDir)subs_preview.cpp" /> <ClCompile Include="$(SrcDir)subs_preview.cpp" />
<ClCompile Include="$(SrcDir)subtitle_format.cpp" /> <ClCompile Include="$(SrcDir)subtitle_format.cpp" />
<ClCompile Include="$(SrcDir)subtitle_format_ass.cpp" /> <ClCompile Include="$(SrcDir)subtitle_format_ass.cpp" />

View file

@ -516,9 +516,6 @@
<ClInclude Include="$(SrcDir)subs_edit_box.h"> <ClInclude Include="$(SrcDir)subs_edit_box.h">
<Filter>Main UI\Edit box</Filter> <Filter>Main UI\Edit box</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SrcDir)subs_grid.h">
<Filter>Main UI\Grid</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)charset_detect.h"> <ClInclude Include="$(SrcDir)charset_detect.h">
<Filter>Features\Import</Filter> <Filter>Features\Import</Filter>
</ClInclude> </ClInclude>
@ -1073,9 +1070,6 @@
<ClCompile Include="$(SrcDir)subs_edit_ctrl.cpp"> <ClCompile Include="$(SrcDir)subs_edit_ctrl.cpp">
<Filter>Main UI\Edit box</Filter> <Filter>Main UI\Edit box</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)subs_grid.cpp">
<Filter>Main UI\Grid</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)charset_detect.cpp"> <ClCompile Include="$(SrcDir)charset_detect.cpp">
<Filter>Features\Import</Filter> <Filter>Features\Import</Filter>
</ClCompile> </ClCompile>

View file

@ -214,7 +214,6 @@ SRC += \
subs_controller.cpp \ subs_controller.cpp \
subs_edit_box.cpp \ subs_edit_box.cpp \
subs_edit_ctrl.cpp \ subs_edit_ctrl.cpp \
subs_grid.cpp \
subs_preview.cpp \ subs_preview.cpp \
subtitle_format.cpp \ subtitle_format.cpp \
subtitle_format_ass.cpp \ subtitle_format_ass.cpp \

View file

@ -50,9 +50,9 @@
#include "../initial_line_state.h" #include "../initial_line_state.h"
#include "../options.h" #include "../options.h"
#include "../search_replace_engine.h" #include "../search_replace_engine.h"
#include "../selection_controller.h"
#include "../subs_controller.h" #include "../subs_controller.h"
#include "../subs_edit_ctrl.h" #include "../subs_edit_ctrl.h"
#include "../subs_grid.h"
#include "../text_selection_controller.h" #include "../text_selection_controller.h"
#include "../utils.h" #include "../utils.h"
#include "../video_context.h" #include "../video_context.h"

View file

@ -47,7 +47,6 @@
#include "../include/aegisub/context.h" #include "../include/aegisub/context.h"
#include "../options.h" #include "../options.h"
#include "../selection_controller.h" #include "../selection_controller.h"
#include "../subs_grid.h"
#include "../video_context.h" #include "../video_context.h"
#include <libaegisub/of_type_adaptor.h> #include <libaegisub/of_type_adaptor.h>

View file

@ -49,6 +49,7 @@
#include "audio_controller.h" #include "audio_controller.h"
#include "audio_box.h" #include "audio_box.h"
#include "auto4_base.h" #include "auto4_base.h"
#include "base_grid.h"
#include "compat.h" #include "compat.h"
#include "command/command.h" #include "command/command.h"
#include "dialog_detached_video.h" #include "dialog_detached_video.h"
@ -63,7 +64,6 @@
#include "subs_controller.h" #include "subs_controller.h"
#include "subs_edit_box.h" #include "subs_edit_box.h"
#include "subs_edit_ctrl.h" #include "subs_edit_ctrl.h"
#include "subs_grid.h"
#include "utils.h" #include "utils.h"
#include "version.h" #include "version.h"
#include "video_box.h" #include "video_box.h"
@ -366,7 +366,7 @@ void FrameMain::InitContents() {
wxPanel *Panel = new wxPanel(this,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL | wxCLIP_CHILDREN); wxPanel *Panel = new wxPanel(this,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL | wxCLIP_CHILDREN);
StartupLog("Create subtitles grid"); StartupLog("Create subtitles grid");
context->subsGrid = SubsGrid = new SubtitlesGrid(Panel, context.get()); context->subsGrid = SubsGrid = new BaseGrid(Panel, context.get(), wxDefaultSize, wxWANTS_CHARS | wxSUNKEN_BORDER);
context->selectionController = context->subsGrid; context->selectionController = context->subsGrid;
context->search = new SearchReplaceEngine(context.get()); context->search = new SearchReplaceEngine(context.get());
context->initialLineState = new InitialLineState(context.get()); context->initialLineState = new InitialLineState(context.get());

View file

@ -49,7 +49,7 @@ class AegisubApp;
class AegisubFileDropTarget; class AegisubFileDropTarget;
class AudioBox; class AudioBox;
class AudioProvider; class AudioProvider;
class SubtitlesGrid; class BaseGrid;
class VideoBox; class VideoBox;
namespace agi { struct Context; class OptionValue; } namespace agi { struct Context; class OptionValue; }
@ -98,7 +98,7 @@ class FrameMain: public wxFrame {
void EnableToolBar(agi::OptionValue const& opt); void EnableToolBar(agi::OptionValue const& opt);
SubtitlesGrid *SubsGrid; ///< The subtitle editing area BaseGrid *SubsGrid; ///< The subtitle editing area
AudioBox *audioBox; ///< The audio area AudioBox *audioBox; ///< The audio area
VideoBox *videoBox; ///< The video area VideoBox *videoBox; ///< The video area

View file

@ -9,7 +9,7 @@ class InitialLineState;
template<class T> class SelectionController; template<class T> class SelectionController;
class SubsController; class SubsController;
class SubsTextEditCtrl; class SubsTextEditCtrl;
class SubtitlesGrid; class BaseGrid;
class TextSelectionController; class TextSelectionController;
class VideoContext; class VideoContext;
class VideoDisplay; class VideoDisplay;
@ -42,7 +42,7 @@ struct Context {
AudioBox *audioBox; AudioBox *audioBox;
AudioKaraoke *karaoke; AudioKaraoke *karaoke;
DialogManager *dialog; DialogManager *dialog;
SubtitlesGrid *subsGrid; BaseGrid *subsGrid;
VideoDisplay *videoDisplay; VideoDisplay *videoDisplay;
}; };

View file

@ -38,6 +38,7 @@
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "ass_file.h" #include "ass_file.h"
#include "base_grid.h"
#include "command/command.h" #include "command/command.h"
#include "compat.h" #include "compat.h"
#include "include/aegisub/context.h" #include "include/aegisub/context.h"
@ -48,7 +49,6 @@
#include "placeholder_ctrl.h" #include "placeholder_ctrl.h"
#include "scintilla_text_selection_controller.h" #include "scintilla_text_selection_controller.h"
#include "subs_edit_ctrl.h" #include "subs_edit_ctrl.h"
#include "subs_grid.h"
#include "timeedit_ctrl.h" #include "timeedit_ctrl.h"
#include "tooltip_manager.h" #include "tooltip_manager.h"
#include "utils.h" #include "utils.h"

View file

@ -1,42 +0,0 @@
// Copyright (c) 2006, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// Aegisub Project http://www.aegisub.org/
/// @file subs_grid.cpp
/// @brief Subtitles grid control in main window
/// @ingroup main_ui
///
#include "config.h"
#include "subs_grid.h"
SubtitlesGrid::SubtitlesGrid(wxWindow *parent, agi::Context *context)
: BaseGrid(parent, context, wxDefaultSize, wxWANTS_CHARS | wxSUNKEN_BORDER)
{
}

View file

@ -1,40 +0,0 @@
// Copyright (c) 2005, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// Aegisub Project http://www.aegisub.org/
/// @file subs_grid.h
/// @see subs_grid.cpp
/// @ingroup main_ui
///
#include "base_grid.h"
class SubtitlesGrid: public BaseGrid {
public:
SubtitlesGrid(wxWindow *parent, agi::Context *context);
};

View file

@ -34,16 +34,17 @@
#include "config.h" #include "config.h"
#include <wx/dcbuffer.h> #include "video_slider.h"
#include <wx/settings.h>
#include "base_grid.h"
#include "include/aegisub/context.h" #include "include/aegisub/context.h"
#include "include/aegisub/hotkey.h" #include "include/aegisub/hotkey.h"
#include "options.h" #include "options.h"
#include "subs_grid.h"
#include "utils.h" #include "utils.h"
#include "video_context.h" #include "video_context.h"
#include "video_slider.h"
#include <wx/dcbuffer.h>
#include <wx/settings.h>
VideoSlider::VideoSlider (wxWindow* parent, agi::Context *c) VideoSlider::VideoSlider (wxWindow* parent, agi::Context *c)
: wxWindow(parent, -1, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE) : wxWindow(parent, -1, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE)