Extract options and MRU stuff from main.h
Nearly all of the files including main.h are doing so only for OPT_GET and friends, which are rather unrelated to the main things that main.h declares.
This commit is contained in:
parent
bd9a81372d
commit
a99428c49d
95 changed files with 193 additions and 164 deletions
|
@ -255,6 +255,7 @@
|
|||
<ClInclude Include="$(SrcDir)visual_tool_scale.h" />
|
||||
<ClInclude Include="$(SrcDir)visual_tool_vector_clip.h" />
|
||||
<ClInclude Include="$(SrcDir)ass_info.h" />
|
||||
<ClInclude Include="$(SrcDir)options.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="$(SrcDir)aegisublocale.cpp" />
|
||||
|
|
|
@ -682,6 +682,10 @@
|
|||
<ClInclude Include="$(SrcDir)ass_info.h">
|
||||
<Filter>ASS</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(SrcDir)include\aegisub\hotkey.h" />
|
||||
<ClInclude Include="$(SrcDir)options.h">
|
||||
<Filter>Preferences</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="$(SrcDir)ass_dialogue.cpp">
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
#include "ass_info.h"
|
||||
#include "ass_style.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
#include "subtitle_format.h"
|
||||
#include "text_file_reader.h"
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
#include "audio_timing.h"
|
||||
#include "command/command.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "toggle_bitmap.h"
|
||||
#include "selection_controller.h"
|
||||
#include "utils.h"
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
#include "audio_rendering_style.h"
|
||||
#include "colorspace.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
#include <libaegisub/exception.h>
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
#include "include/aegisub/audio_provider.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "pen.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "selection_controller.h"
|
||||
#include "standard_paths.h"
|
||||
#include "utils.h"
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
#include "compat.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "include/aegisub/hotkey.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "selection_controller.h"
|
||||
#include "utils.h"
|
||||
#include "video_context.h"
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include "audio_timing.h"
|
||||
#include "compat.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "selection_controller.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "audio_marker.h"
|
||||
|
||||
#include "include/aegisub/context.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "pen.h"
|
||||
#include "video_context.h"
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
#include "audio_controller.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
AudioPlayer::AudioPlayer(AudioProvider *provider)
|
||||
: provider(provider)
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#include "include/aegisub/audio_provider.h"
|
||||
#include "compat.h"
|
||||
#include "frame_main.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
|
|
|
@ -35,7 +35,6 @@
|
|||
#include "config.h"
|
||||
|
||||
#ifdef WITH_DIRECTSOUND
|
||||
|
||||
#include <mmsystem.h>
|
||||
#include <process.h>
|
||||
#include <dsound.h>
|
||||
|
@ -48,6 +47,7 @@
|
|||
#include "include/aegisub/audio_provider.h"
|
||||
#include "frame_main.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
|
||||
/// @brief RAII support class to init and de-init the COM library
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
#include "audio_controller.h"
|
||||
#include "compat.h"
|
||||
#include "include/aegisub/audio_provider.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
|
||||
DEFINE_SIMPLE_EXCEPTION(OSSError, agi::AudioPlayerOpenError, "audio/player/open/oss")
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#include "audio_controller.h"
|
||||
#include "compat.h"
|
||||
#include "include/aegisub/audio_provider.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
|
||||
DEFINE_SIMPLE_EXCEPTION(PortAudioError, agi::AudioPlayerOpenError, "audio/player/open/portaudio")
|
||||
|
|
|
@ -51,6 +51,7 @@
|
|||
#include "dialog_progress.h"
|
||||
#include "frame_main.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
|
||||
#include <libaegisub/log.h>
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "audio_controller.h"
|
||||
#include "charset_conv.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
#include "audio_controller.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
/// @brief Constructor
|
||||
/// @param filename The filename to open
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
#include "audio_controller.h"
|
||||
#include "audio_provider_pcm.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
#include "audio_controller.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
|
||||
#include <libaegisub/background_runner.h>
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#include "block_cache.h"
|
||||
#include "colorspace.h"
|
||||
#include "include/aegisub/audio_provider.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
enum {
|
||||
/// Only render the peaks
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
#include "audio_timing.h"
|
||||
#include "command/command.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "pen.h"
|
||||
#include "selection_controller.h"
|
||||
#include "utils.h"
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include "audio_timing.h"
|
||||
#include "compat.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "pen.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
|
|
@ -67,7 +67,7 @@
|
|||
#include "compat.h"
|
||||
#include "dialog_progress.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
#include "string_codec.h"
|
||||
#include "subtitle_format.h"
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include "avisynth_wrap.h"
|
||||
|
||||
#include "avisynth.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
// Allocate storage for and initialise static members
|
||||
namespace {
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
#include "audio_box.h"
|
||||
#include "compat.h"
|
||||
#include "frame_main.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
#include "video_context.h"
|
||||
#include "video_slider.h"
|
||||
|
|
|
@ -42,17 +42,17 @@
|
|||
|
||||
#include <libaegisub/log.h>
|
||||
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../main.h"
|
||||
|
||||
#include "../audio_controller.h"
|
||||
#include "../compat.h"
|
||||
#include "../dialog_about.h"
|
||||
#include "../dialog_detached_video.h"
|
||||
#include "../dialog_manager.h"
|
||||
#include "../dialog_log.h"
|
||||
#include "../dialog_manager.h"
|
||||
#include "../dialog_version_check.h"
|
||||
#include "../frame_main.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../main.h"
|
||||
#include "../options.h"
|
||||
#include "../preferences.h"
|
||||
#include "../utils.h"
|
||||
#include "../video_context.h"
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
#include "../audio_timing.h"
|
||||
#include "../compat.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../main.h"
|
||||
#include "../options.h"
|
||||
#include "../selection_controller.h"
|
||||
#include "../video_context.h"
|
||||
|
||||
|
|
|
@ -39,13 +39,14 @@
|
|||
|
||||
#include "command.h"
|
||||
|
||||
#include "../main.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../auto4_base.h"
|
||||
#include "../dialog_automation.h"
|
||||
#include "../dialog_manager.h"
|
||||
#include "../auto4_base.h"
|
||||
#include "../video_context.h"
|
||||
#include "../frame_main.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../main.h"
|
||||
#include "../options.h"
|
||||
#include "../video_context.h"
|
||||
|
||||
namespace {
|
||||
using cmd::Command;
|
||||
|
|
|
@ -52,8 +52,8 @@
|
|||
#include "../dialog_colorpicker.h"
|
||||
#include "../dialog_paste_over.h"
|
||||
#include "../dialog_search_replace.h"
|
||||
#include "../main.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../options.h"
|
||||
#include "../subs_edit_ctrl.h"
|
||||
#include "../subs_grid.h"
|
||||
#include "../text_selection_controller.h"
|
||||
|
|
|
@ -42,9 +42,10 @@
|
|||
#include "../ass_file.h"
|
||||
#include "../audio_controller.h"
|
||||
#include "../audio_timing.h"
|
||||
#include "../frame_main.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../main.h"
|
||||
#include "../frame_main.h"
|
||||
#include "../options.h"
|
||||
#include "../selection_controller.h"
|
||||
#include "../utils.h"
|
||||
|
||||
|
|
|
@ -41,10 +41,10 @@
|
|||
#include <libaegisub/util_osx.h>
|
||||
|
||||
#include "command.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
|
||||
#include "../help_button.h" // help_contents
|
||||
#include "../main.h"
|
||||
#include "../help_button.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../options.h"
|
||||
|
||||
namespace {
|
||||
using cmd::Command;
|
||||
|
|
|
@ -41,9 +41,9 @@
|
|||
|
||||
#include "command.h"
|
||||
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../main.h"
|
||||
#include "../compat.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../options.h"
|
||||
#include "../video_context.h"
|
||||
|
||||
namespace {
|
||||
|
|
|
@ -41,11 +41,12 @@
|
|||
|
||||
#include "command.h"
|
||||
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../audio_controller.h"
|
||||
#include "../main.h"
|
||||
#include "../frame_main.h"
|
||||
#include "../compat.h"
|
||||
#include "../frame_main.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../main.h"
|
||||
#include "../options.h"
|
||||
#include "../video_context.h"
|
||||
|
||||
namespace {
|
||||
|
|
|
@ -57,10 +57,11 @@
|
|||
#include "../frame_main.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../main.h"
|
||||
#include "../options.h"
|
||||
#include "../subs_grid.h"
|
||||
#include "../subtitle_format.h"
|
||||
#include "../video_context.h"
|
||||
#include "../utils.h"
|
||||
#include "../video_context.h"
|
||||
|
||||
namespace {
|
||||
using cmd::Command;
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include "../dialog_manager.h"
|
||||
#include "../dialog_shift_times.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../main.h"
|
||||
#include "../options.h"
|
||||
#include "../selection_controller.h"
|
||||
#include "../subs_grid.h"
|
||||
#include "../video_context.h"
|
||||
|
|
|
@ -41,9 +41,9 @@
|
|||
|
||||
#include "command.h"
|
||||
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../compat.h"
|
||||
#include "../main.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../options.h"
|
||||
#include "../video_context.h"
|
||||
|
||||
namespace {
|
||||
|
|
|
@ -41,22 +41,21 @@
|
|||
|
||||
#include "command.h"
|
||||
|
||||
#include "../include/aegisub/context.h"
|
||||
|
||||
#include "../dialog_fonts_collector.h"
|
||||
#include "../standard_paths.h" // tool_assdraw
|
||||
#include "../video_context.h" // tool_font_collector
|
||||
#include "../compat.h"
|
||||
#include "../dialog_export.h"
|
||||
#include "../dialog_fonts_collector.h"
|
||||
#include "../dialog_kara_timing_copy.h"
|
||||
#include "../dialog_manager.h"
|
||||
#include "../dialog_resample.h"
|
||||
#include "../dialog_selection.h"
|
||||
#include "../dialog_styling_assistant.h"
|
||||
#include "../dialog_style_manager.h"
|
||||
#include "../dialog_styling_assistant.h"
|
||||
#include "../dialog_timing_processor.h"
|
||||
#include "../dialog_translation.h"
|
||||
#include "../dialog_kara_timing_copy.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../standard_paths.h"
|
||||
#include "../subs_grid.h"
|
||||
#include "../video_context.h"
|
||||
|
||||
namespace {
|
||||
using cmd::Command;
|
||||
|
|
|
@ -47,14 +47,15 @@
|
|||
#include "../ass_dialogue.h"
|
||||
#include "../ass_time.h"
|
||||
#include "../compat.h"
|
||||
#include "../frame_main.h"
|
||||
#include "../main.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../dialog_detached_video.h"
|
||||
#include "../dialog_dummy_video.h"
|
||||
#include "../dialog_manager.h"
|
||||
#include "../dialog_jumpto.h"
|
||||
#include "../dialog_manager.h"
|
||||
#include "../dialog_video_details.h"
|
||||
#include "../frame_main.h"
|
||||
#include "../include/aegisub/context.h"
|
||||
#include "../main.h"
|
||||
#include "../options.h"
|
||||
#include "../selection_controller.h"
|
||||
#include "../standard_paths.h"
|
||||
#include "../subs_grid.h"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
#include "compat.h"
|
||||
#include "help_button.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
|
||||
#include <libaegisub/of_type_adaptor.h>
|
||||
|
|
|
@ -35,15 +35,6 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include <wx/button.h>
|
||||
#include <wx/filedlg.h>
|
||||
#include <wx/filename.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/log.h>
|
||||
#include <wx/msgdlg.h>
|
||||
|
||||
#include "dialog_automation.h"
|
||||
|
||||
#include "auto4_base.h"
|
||||
|
@ -52,9 +43,19 @@
|
|||
#include "help_button.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "options.h"
|
||||
#include "main.h"
|
||||
#include "subtitle_format.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include <wx/button.h>
|
||||
#include <wx/filedlg.h>
|
||||
#include <wx/filename.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/log.h>
|
||||
#include <wx/msgdlg.h>
|
||||
|
||||
using std::placeholders::_1;
|
||||
|
||||
DialogAutomation::DialogAutomation(agi::Context *c)
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#include "compat.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
|
||||
#include <boost/range/adaptor/map.hpp>
|
||||
|
|
|
@ -67,7 +67,7 @@
|
|||
#include "dialog_colorpicker.h"
|
||||
#include "help_button.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "persist_location.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
|
|
@ -34,22 +34,22 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <wx/filename.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/display.h> /// Must be included last.
|
||||
|
||||
#include "dialog_detached_video.h"
|
||||
|
||||
#include "include/aegisub/context.h"
|
||||
#include "include/aegisub/hotkey.h"
|
||||
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "persist_location.h"
|
||||
#include "utils.h"
|
||||
#include "video_box.h"
|
||||
#include "video_context.h"
|
||||
#include "video_display.h"
|
||||
|
||||
#include <wx/filename.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/display.h> /// Must be included last.
|
||||
|
||||
DialogDetachedVideo::DialogDetachedVideo(agi::Context *context)
|
||||
: wxDialog(context->parent, -1, "Detached Video", wxDefaultPosition, wxSize(400,300), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxWANTS_CHARS)
|
||||
, context(context)
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include "colour_button.h"
|
||||
#include "help_button.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "video_provider_dummy.h"
|
||||
|
||||
namespace {
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
#include <libaegisub/charset_conv.h>
|
||||
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "text_file_writer.h"
|
||||
|
||||
#include <wx/checkbox.h>
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include "help_button.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "scintilla_text_ctrl.h"
|
||||
#include "selection_controller.h"
|
||||
#include "standard_paths.h"
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
#include "include/aegisub/context.h"
|
||||
#include "kana_table.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "selection_controller.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#include <wx/stattext.h>
|
||||
|
||||
#include "help_button.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
DialogPasteOver::DialogPasteOver(wxWindow *parent)
|
||||
: wxDialog (parent, -1, _("Select Fields to Paste Over"))
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
#include "compat.h"
|
||||
#include "dialog_search_replace.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "selection_controller.h"
|
||||
#include "text_selection_controller.h"
|
||||
#include "subs_edit_ctrl.h"
|
||||
|
|
|
@ -23,6 +23,19 @@
|
|||
|
||||
#include "dialog_selection.h"
|
||||
|
||||
#include "ass_dialogue.h"
|
||||
#include "ass_file.h"
|
||||
#include "compat.h"
|
||||
#include "frame_main.h"
|
||||
#include "help_button.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "selection_controller.h"
|
||||
|
||||
#include <libaegisub/of_type_adaptor.h>
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include <wx/checkbox.h>
|
||||
|
@ -33,18 +46,6 @@
|
|||
#include <wx/regex.h>
|
||||
#include <wx/textctrl.h>
|
||||
|
||||
#include "ass_dialogue.h"
|
||||
#include "ass_file.h"
|
||||
#include "compat.h"
|
||||
#include "frame_main.h"
|
||||
#include "help_button.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "selection_controller.h"
|
||||
|
||||
#include <libaegisub/of_type_adaptor.h>
|
||||
|
||||
enum {
|
||||
ACTION_SET = 0,
|
||||
ACTION_ADD,
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
#include "include/aegisub/context.h"
|
||||
#include "help_button.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
#include "timeedit_ctrl.h"
|
||||
#include "video_context.h"
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include "include/aegisub/context.h"
|
||||
#include "include/aegisub/spellchecker.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "selection_controller.h"
|
||||
#include "text_selection_controller.h"
|
||||
#include "subs_edit_ctrl.h"
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
#include "include/aegisub/context.h"
|
||||
#include "include/aegisub/subtitles_provider.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "persist_location.h"
|
||||
#include "selection_controller.h"
|
||||
#include "subs_grid.h"
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
#include "include/aegisub/context.h"
|
||||
#include "help_button.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "persist_location.h"
|
||||
#include "selection_controller.h"
|
||||
#include "standard_paths.h"
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include <wx/textctrl.h>
|
||||
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
DialogTextImport::DialogTextImport()
|
||||
: wxDialog(nullptr , -1, _("Text import options"))
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
#include "help_button.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "selection_controller.h"
|
||||
#include "utils.h"
|
||||
#include "video_context.h"
|
||||
|
|
|
@ -66,7 +66,7 @@
|
|||
#include <wx/sstream.h>
|
||||
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "string_codec.h"
|
||||
#include "version.h"
|
||||
|
||||
|
|
|
@ -41,6 +41,7 @@
|
|||
#include "dialog_progress.h"
|
||||
#include "frame_main.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
|
|
@ -64,6 +64,7 @@
|
|||
#include "help_button.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
#include "subs_edit_box.h"
|
||||
#include "subs_edit_ctrl.h"
|
||||
|
@ -231,7 +232,6 @@ FrameMain::FrameMain (wxArrayString args)
|
|||
StartupLog("Initializing context frames");
|
||||
context->parent = this;
|
||||
context->previousFocus = 0;
|
||||
wxGetApp().frame = this;
|
||||
|
||||
StartupLog("Install PNG handler");
|
||||
wxImage::AddHandler(new wxPNGHandler);
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "libresrc/libresrc.h"
|
||||
#include "command/command.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
|
||||
namespace {
|
||||
|
|
|
@ -34,16 +34,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include <wx/clipbrd.h>
|
||||
#include <wx/config.h>
|
||||
#include <wx/datetime.h>
|
||||
#include <wx/filefn.h>
|
||||
#include <wx/filename.h>
|
||||
#include <wx/msgdlg.h>
|
||||
#include <wx/stdpaths.h>
|
||||
#include <wx/utils.h>
|
||||
#include "main.h"
|
||||
|
||||
#include "include/aegisub/menu.h"
|
||||
#include "command/command.h"
|
||||
|
@ -61,8 +52,8 @@
|
|||
#include "export_fixstyle.h"
|
||||
#include "export_framerate.h"
|
||||
#include "frame_main.h"
|
||||
#include "main.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "options.h"
|
||||
#include "plugin_manager.h"
|
||||
#include "standard_paths.h"
|
||||
#include "subtitle_format.h"
|
||||
|
@ -75,6 +66,17 @@
|
|||
#include <libaegisub/hotkey.h>
|
||||
#include <libaegisub/scoped_ptr.h>
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include <wx/clipbrd.h>
|
||||
#include <wx/config.h>
|
||||
#include <wx/datetime.h>
|
||||
#include <wx/filefn.h>
|
||||
#include <wx/filename.h>
|
||||
#include <wx/msgdlg.h>
|
||||
#include <wx/stdpaths.h>
|
||||
#include <wx/utils.h>
|
||||
|
||||
namespace config {
|
||||
agi::Options *opt = 0;
|
||||
agi::MRUManager *mru = 0;
|
||||
|
|
|
@ -37,9 +37,6 @@
|
|||
#include <wx/stackwalk.h>
|
||||
|
||||
#include "aegisublocale.h"
|
||||
#include <libaegisub/mru.h>
|
||||
#include <libaegisub/option.h>
|
||||
#include <libaegisub/option_value.h>
|
||||
|
||||
#ifndef wxUSE_EXCEPTIONS
|
||||
#error wxWidgets is compiled without exceptions support. Aegisub requires exceptions support in wxWidgets to run safely.
|
||||
|
@ -48,23 +45,8 @@
|
|||
class FrameMain;
|
||||
class PluginManager;
|
||||
|
||||
/// For holding all configuration-related objects and values.
|
||||
namespace config {
|
||||
extern agi::Options *opt; ///< Options
|
||||
extern agi::MRUManager *mru; ///< Most Recently Used
|
||||
}
|
||||
|
||||
namespace Automation4 { class AutoloadScriptManager; }
|
||||
|
||||
/// Macro to get OptionValue object.
|
||||
#define OPT_GET(x) const_cast<const agi::OptionValue*>(config::opt->Get(x))
|
||||
|
||||
/// Macro to set OptionValue object.
|
||||
#define OPT_SET(x) config::opt->Get(x)
|
||||
|
||||
/// Macro to subscribe to OptionValue changes
|
||||
#define OPT_SUB(x, ...) config::opt->Get(x)->Subscribe(__VA_ARGS__)
|
||||
|
||||
class AegisubApp: public wxApp {
|
||||
PluginManager *plugins;
|
||||
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include "compat.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
|
||||
#include <libaegisub/hotkey.h>
|
||||
|
|
34
aegisub/src/options.h
Normal file
34
aegisub/src/options.h
Normal file
|
@ -0,0 +1,34 @@
|
|||
// Copyright (c) 2011, Thomas Goyne <plorkyeran@aegisub.org>
|
||||
//
|
||||
// Permission to use, copy, modify, and distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice appear in all copies.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
//
|
||||
// Aegisub Project http://www.aegisub.org/
|
||||
|
||||
#include <libaegisub/mru.h>
|
||||
#include <libaegisub/option.h>
|
||||
#include <libaegisub/option_value.h>
|
||||
|
||||
/// For holding all configuration-related objects and values.
|
||||
namespace config {
|
||||
extern agi::Options *opt; ///< Options
|
||||
extern agi::MRUManager *mru; ///< Most Recently Used
|
||||
}
|
||||
|
||||
/// Macro to get OptionValue object
|
||||
#define OPT_GET(x) const_cast<const agi::OptionValue*>(config::opt->Get(x))
|
||||
|
||||
/// Macro to set OptionValue object
|
||||
#define OPT_SET(x) config::opt->Get(x)
|
||||
|
||||
/// Macro to subscribe to OptionValue changes
|
||||
#define OPT_SUB(x, ...) config::opt->Get(x)->Subscribe(__VA_ARGS__)
|
|
@ -19,7 +19,7 @@
|
|||
#include "pen.h"
|
||||
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
void Pen::OnColourChanged(agi::OptionValue const& opt) {
|
||||
impl.SetColour(to_wx(opt.GetColor()));
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include "persist_location.h"
|
||||
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
#include <wx/dialog.h>
|
||||
#include <wx/display.h>
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
#include "include/aegisub/hotkey.h"
|
||||
#include "include/aegisub/subtitles_provider.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "preferences_base.h"
|
||||
#include "video_provider_manager.h"
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include "include/aegisub/audio_player.h"
|
||||
#include "include/aegisub/audio_provider.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "preferences.h"
|
||||
#include "standard_paths.h"
|
||||
#include "video_provider_manager.h"
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
#include "compat.h"
|
||||
#include "include/aegisub/spellchecker.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
agi::SpellChecker *SpellCheckerFactory::GetSpellChecker() {
|
||||
std::vector<std::string> list = GetClasses(OPT_GET("Tool/Spell Checker/Backend")->GetString());
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
#include "charset_conv.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
|
||||
HunspellSpellChecker::HunspellSpellChecker()
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
#include "include/aegisub/context.h"
|
||||
#include "include/aegisub/hotkey.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "placeholder_ctrl.h"
|
||||
#include "scintilla_text_selection_controller.h"
|
||||
#include "subs_edit_ctrl.h"
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include "ass_file.h"
|
||||
#include "command/command.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "include/aegisub/spellchecker.h"
|
||||
#include "selection_controller.h"
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
#include "ass_dialogue.h"
|
||||
#include "ass_file.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
#include "video_context.h"
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "ass_style.h"
|
||||
#include "compat.h"
|
||||
#include "dialog_export_ebu3264.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "text_file_writer.h"
|
||||
|
||||
namespace
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
#include "ass_file.h"
|
||||
#include "ass_time.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
#include <libaegisub/of_type_adaptor.h>
|
||||
#include <boost/range/adaptor/reversed.hpp>
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "ass_file.h"
|
||||
#include "compat.h"
|
||||
#include "dialog_text_import.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "text_file_reader.h"
|
||||
#include "text_file_writer.h"
|
||||
#include "utils.h"
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#ifdef WITH_CSRI
|
||||
#include "subtitles_provider_csri.h"
|
||||
#endif
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
#include "charset_conv.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "text_file_writer.h"
|
||||
|
||||
TextFileWriter::TextFileWriter(wxString const& filename, wxString encoding)
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <libaegisub/util.h>
|
||||
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
|
||||
Thesaurus::Thesaurus()
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include "ass_time.h"
|
||||
#include "compat.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
#include "video_context.h"
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "include/aegisub/context.h"
|
||||
#include "include/aegisub/hotkey.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
#include <libaegisub/hotkey.h>
|
||||
#include <libaegisub/json.h>
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
#endif
|
||||
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
wxDEFINE_EVENT(EVT_CALL_THUNK, wxThreadEvent);
|
||||
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
|
||||
#include <wx/app.h>
|
||||
#include <wx/icon.h>
|
||||
#include <wx/event.h>
|
||||
#include <wx/thread.h>
|
||||
|
||||
class wxMouseEvent;
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
#include "command/command.h"
|
||||
#include "compat.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "selection_controller.h"
|
||||
#include "toggle_bitmap.h"
|
||||
#include "tooltip_manager.h"
|
||||
|
|
|
@ -53,8 +53,8 @@
|
|||
#include "compat.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "include/aegisub/video_provider.h"
|
||||
#include "main.h"
|
||||
#include "mkv_wrap.h"
|
||||
#include "options.h"
|
||||
#include "selection_controller.h"
|
||||
#include "standard_paths.h"
|
||||
#include "time_range.h"
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
#include "include/aegisub/context.h"
|
||||
#include "include/aegisub/hotkey.h"
|
||||
#include "include/aegisub/menu.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "spline_curve.h"
|
||||
#include "threaded_frame_source.h"
|
||||
#include "utils.h"
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
|
||||
#include "charset_conv.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "standard_paths.h"
|
||||
|
||||
AvisynthVideoProvider::AvisynthVideoProvider(wxString filename)
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
#include "video_provider_cache.h"
|
||||
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "video_frame.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
|
|
@ -35,10 +35,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#ifdef WITH_FFMS2
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#include <objbase.h>
|
||||
#endif
|
||||
#include "video_provider_ffmpegsource.h"
|
||||
|
||||
#include <map>
|
||||
|
||||
|
@ -48,10 +45,9 @@
|
|||
|
||||
#include "aegisub_endian.h"
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
#include "video_context.h"
|
||||
#include "video_provider_ffmpegsource.h"
|
||||
|
||||
/// @brief Constructor
|
||||
/// @param filename The filename to open
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include <libaegisub/log.h>
|
||||
|
||||
#include "compat.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
#ifdef WITH_AVISYNTH
|
||||
#include "video_provider_avs.h"
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
#include "include/aegisub/context.h"
|
||||
#include "include/aegisub/hotkey.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "subs_grid.h"
|
||||
#include "utils.h"
|
||||
#include "video_context.h"
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include "ass_time.h"
|
||||
#include "compat.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
#include "video_context.h"
|
||||
#include "video_display.h"
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "ass_file.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "utils.h"
|
||||
#include "video_context.h"
|
||||
#include "video_display.h"
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include "ass_dialogue.h"
|
||||
#include "include/aegisub/context.h"
|
||||
#include "libresrc/libresrc.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "selection_controller.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue