Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
// Copyright (c) 2005-2010, Niels Martin Hansen
|
|
|
|
// Copyright (c) 2005-2010, Rodrigo Braz Monteiro
|
|
|
|
// Copyright (c) 2010, Amar Takhar
|
|
|
|
// 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/
|
|
|
|
|
|
|
|
#include "command.h"
|
|
|
|
|
2011-01-18 06:13:26 +01:00
|
|
|
#include "../ass_dialogue.h"
|
|
|
|
#include "../ass_file.h"
|
2012-11-03 23:40:54 +01:00
|
|
|
#include "../audio_controller.h"
|
|
|
|
#include "../audio_timing.h"
|
2014-03-25 17:51:38 +01:00
|
|
|
#include "../frame_main.h"
|
2011-01-05 19:40:37 +01:00
|
|
|
#include "../include/aegisub/context.h"
|
2013-12-25 22:36:37 +01:00
|
|
|
#include "../libresrc/libresrc.h"
|
2013-01-07 02:50:09 +01:00
|
|
|
#include "../options.h"
|
2012-01-14 02:40:21 +01:00
|
|
|
#include "../selection_controller.h"
|
2011-01-18 06:13:26 +01:00
|
|
|
|
2014-04-23 22:53:24 +02:00
|
|
|
#include <libaegisub/make_unique.h>
|
2013-06-08 06:19:40 +02:00
|
|
|
|
2011-07-15 06:05:01 +02:00
|
|
|
namespace {
|
|
|
|
using cmd::Command;
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_line_next final : public Command {
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
CMD_NAME("grid/line/next")
|
|
|
|
STR_MENU("Next Line")
|
|
|
|
STR_DISP("Next Line")
|
2012-02-01 19:47:26 +01:00
|
|
|
STR_HELP("Move to the next subtitle line")
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-01-14 02:40:21 +01:00
|
|
|
c->selectionController->NextLine();
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_line_next_create final : public Command {
|
2012-01-14 02:40:21 +01:00
|
|
|
CMD_NAME("grid/line/next/create")
|
2013-12-25 22:36:37 +01:00
|
|
|
CMD_ICON(button_audio_commit)
|
2012-01-14 02:40:21 +01:00
|
|
|
STR_MENU("Next Line")
|
|
|
|
STR_DISP("Next Line")
|
2012-02-01 19:47:26 +01:00
|
|
|
STR_HELP("Move to the next subtitle line, creating a new one if needed")
|
2012-01-14 02:40:21 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-11-03 23:40:54 +01:00
|
|
|
AudioTimingController *tc = c->audioController->GetTimingController();
|
|
|
|
if (tc)
|
|
|
|
tc->Commit();
|
|
|
|
|
2012-01-14 02:40:21 +01:00
|
|
|
AssDialogue *cur = c->selectionController->GetActiveLine();
|
|
|
|
c->selectionController->NextLine();
|
|
|
|
if (cur == c->selectionController->GetActiveLine()) {
|
2013-11-21 18:13:36 +01:00
|
|
|
auto newline = new AssDialogue;
|
2012-01-14 02:40:21 +01:00
|
|
|
newline->Start = cur->End;
|
|
|
|
newline->End = cur->End + OPT_GET("Timing/Default Duration")->GetInt();
|
|
|
|
newline->Style = cur->Style;
|
|
|
|
|
2014-04-04 17:11:09 +02:00
|
|
|
auto pos = c->ass->iterator_to(*cur);
|
2014-03-07 18:02:24 +01:00
|
|
|
c->ass->Events.insert(++pos, *newline);
|
2012-01-14 02:40:21 +01:00
|
|
|
c->ass->Commit(_("line insertion"), AssFile::COMMIT_DIAG_ADDREM);
|
|
|
|
c->selectionController->NextLine();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_line_prev final : public Command {
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
CMD_NAME("grid/line/prev")
|
|
|
|
STR_MENU("Previous Line")
|
|
|
|
STR_DISP("Previous Line")
|
2012-02-01 19:47:26 +01:00
|
|
|
STR_HELP("Move to the previous line")
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-01-14 02:40:21 +01:00
|
|
|
c->selectionController->PrevLine();
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
}
|
2012-01-31 01:44:34 +01:00
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_actor final : public Command {
|
2012-01-31 01:44:34 +01:00
|
|
|
CMD_NAME("grid/sort/actor")
|
|
|
|
STR_MENU("&Actor Name")
|
|
|
|
STR_DISP("Actor Name")
|
2012-02-01 19:47:26 +01:00
|
|
|
STR_HELP("Sort all subtitles by their actor names")
|
2012-01-31 01:44:34 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-01-31 01:44:34 +01:00
|
|
|
c->ass->Sort(AssFile::CompActor);
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2012-03-07 23:41:12 +01:00
|
|
|
struct validate_sel_multiple : public Command {
|
|
|
|
CMD_TYPE(COMMAND_VALIDATE)
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
bool Validate(const agi::Context *c) override {
|
2012-03-07 23:41:12 +01:00
|
|
|
return c->selectionController->GetSelectedSet().size() > 1;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_actor_selected final : public validate_sel_multiple {
|
2012-03-07 23:41:12 +01:00
|
|
|
CMD_NAME("grid/sort/actor/selected")
|
|
|
|
STR_MENU("&Actor Name")
|
|
|
|
STR_DISP("Actor Name")
|
|
|
|
STR_HELP("Sort selected subtitles by their actor names")
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-03-07 23:41:12 +01:00
|
|
|
c->ass->Sort(AssFile::CompActor, c->selectionController->GetSelectedSet());
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_effect final : public Command {
|
2012-01-31 01:44:34 +01:00
|
|
|
CMD_NAME("grid/sort/effect")
|
|
|
|
STR_MENU("&Effect")
|
|
|
|
STR_DISP("Effect")
|
|
|
|
STR_HELP("Sort all subtitles by their effects")
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-01-31 01:44:34 +01:00
|
|
|
c->ass->Sort(AssFile::CompEffect);
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_effect_selected final : public validate_sel_multiple {
|
2012-03-07 23:41:12 +01:00
|
|
|
CMD_NAME("grid/sort/effect/selected")
|
|
|
|
STR_MENU("&Effect")
|
|
|
|
STR_DISP("Effect")
|
|
|
|
STR_HELP("Sort selected subtitles by their effects")
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-03-07 23:41:12 +01:00
|
|
|
c->ass->Sort(AssFile::CompEffect, c->selectionController->GetSelectedSet());
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_end final : public Command {
|
2012-01-13 21:18:48 +01:00
|
|
|
CMD_NAME("grid/sort/end")
|
|
|
|
STR_MENU("&End Time")
|
|
|
|
STR_DISP("End Time")
|
2012-02-01 19:47:26 +01:00
|
|
|
STR_HELP("Sort all subtitles by their end times")
|
2012-01-13 21:18:48 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-01-13 21:18:48 +01:00
|
|
|
c->ass->Sort(AssFile::CompEnd);
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_end_selected final : public validate_sel_multiple {
|
2012-03-07 23:41:12 +01:00
|
|
|
CMD_NAME("grid/sort/end/selected")
|
|
|
|
STR_MENU("&End Time")
|
|
|
|
STR_DISP("End Time")
|
|
|
|
STR_HELP("Sort selected subtitles by their end times")
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-03-07 23:41:12 +01:00
|
|
|
c->ass->Sort(AssFile::CompEnd, c->selectionController->GetSelectedSet());
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_layer final : public Command {
|
2012-07-23 02:44:44 +02:00
|
|
|
CMD_NAME("grid/sort/layer")
|
|
|
|
STR_MENU("&Layer")
|
|
|
|
STR_DISP("Layer")
|
|
|
|
STR_HELP("Sort all subtitles by their layer number")
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-07-23 02:44:44 +02:00
|
|
|
c->ass->Sort(AssFile::CompLayer);
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_layer_selected final : public validate_sel_multiple {
|
2012-07-23 02:44:44 +02:00
|
|
|
CMD_NAME("grid/sort/layer/selected")
|
|
|
|
STR_MENU("&Layer")
|
|
|
|
STR_DISP("Layer")
|
|
|
|
STR_HELP("Sort selected subtitles by their layer number")
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-07-23 02:44:44 +02:00
|
|
|
c->ass->Sort(AssFile::CompLayer, c->selectionController->GetSelectedSet());
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_start final : public Command {
|
2012-01-13 21:18:48 +01:00
|
|
|
CMD_NAME("grid/sort/start")
|
|
|
|
STR_MENU("&Start Time")
|
|
|
|
STR_DISP("Start Time")
|
2012-02-01 19:47:26 +01:00
|
|
|
STR_HELP("Sort all subtitles by their start times")
|
2012-01-13 21:18:48 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-01-13 21:18:48 +01:00
|
|
|
c->ass->Sort();
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_start_selected final : public validate_sel_multiple {
|
2012-03-07 23:41:12 +01:00
|
|
|
CMD_NAME("grid/sort/start/selected")
|
|
|
|
STR_MENU("&Start Time")
|
|
|
|
STR_DISP("Start Time")
|
|
|
|
STR_HELP("Sort selected subtitles by their start times")
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-03-07 23:41:12 +01:00
|
|
|
c->ass->Sort(AssFile::CompStart, c->selectionController->GetSelectedSet());
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_style final : public Command {
|
2012-01-13 21:18:48 +01:00
|
|
|
CMD_NAME("grid/sort/style")
|
|
|
|
STR_MENU("St&yle Name")
|
|
|
|
STR_DISP("Style Name")
|
2012-02-01 19:47:26 +01:00
|
|
|
STR_HELP("Sort all subtitles by their style names")
|
2012-01-13 21:18:48 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-01-13 21:18:48 +01:00
|
|
|
c->ass->Sort(AssFile::CompStyle);
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
};
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_sort_style_selected final : public validate_sel_multiple {
|
2012-03-07 23:41:12 +01:00
|
|
|
CMD_NAME("grid/sort/style/selected")
|
|
|
|
STR_MENU("St&yle Name")
|
|
|
|
STR_DISP("Style Name")
|
|
|
|
STR_HELP("Sort selected subtitles by their style names")
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2012-03-07 23:41:12 +01:00
|
|
|
c->ass->Sort(AssFile::CompStyle, c->selectionController->GetSelectedSet());
|
|
|
|
c->ass->Commit(_("sort"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_tag_cycle_hiding final : public Command {
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
CMD_NAME("grid/tag/cycle_hiding")
|
2013-12-25 22:36:37 +01:00
|
|
|
CMD_ICON(toggle_tag_hiding)
|
2012-04-10 22:40:14 +02:00
|
|
|
STR_MENU("Cycle Tag Hiding Mode")
|
|
|
|
STR_DISP("Cycle Tag Hiding Mode")
|
2012-02-01 19:47:26 +01:00
|
|
|
STR_HELP("Cycle through tag hiding modes")
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
2014-03-25 17:51:38 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
int tagMode = OPT_GET("Subtitle/Grid/Hide Overrides")->GetInt();
|
|
|
|
|
|
|
|
// Cycle to next
|
|
|
|
tagMode = (tagMode+1)%3;
|
|
|
|
|
|
|
|
// Show on status bar
|
2012-01-08 02:05:13 +01:00
|
|
|
wxString message;
|
|
|
|
if (tagMode == 0) message = _("ASS Override Tag mode set to show full tags.");
|
|
|
|
if (tagMode == 1) message = _("ASS Override Tag mode set to simplify tags.");
|
|
|
|
if (tagMode == 2) message = _("ASS Override Tag mode set to hide tags.");
|
2014-03-25 17:51:38 +01:00
|
|
|
c->frame->StatusTimeout(message,10000);
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
|
|
|
// Set option
|
|
|
|
OPT_SET("Subtitle/Grid/Hide Overrides")->SetInt(tagMode);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_tags_hide final : public Command {
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
CMD_NAME("grid/tags/hide")
|
2011-11-18 06:00:20 +01:00
|
|
|
STR_MENU("&Hide Tags")
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
STR_DISP("Hide Tags")
|
2012-02-01 19:47:26 +01:00
|
|
|
STR_HELP("Hide override tags in the subtitle grid")
|
2011-07-15 06:05:56 +02:00
|
|
|
CMD_TYPE(COMMAND_RADIO)
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
bool IsActive(const agi::Context *) override {
|
2011-07-15 06:06:03 +02:00
|
|
|
return OPT_GET("Subtitle/Grid/Hide Overrides")->GetInt() == 2;
|
|
|
|
}
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *) override {
|
2011-01-16 08:15:24 +01:00
|
|
|
OPT_SET("Subtitle/Grid/Hide Overrides")->SetInt(2);
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_tags_show final : public Command {
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
CMD_NAME("grid/tags/show")
|
2011-11-18 06:00:20 +01:00
|
|
|
STR_MENU("Sh&ow Tags")
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
STR_DISP("Show Tags")
|
2012-02-01 19:47:26 +01:00
|
|
|
STR_HELP("Show full override tags in the subtitle grid")
|
2011-07-15 06:05:56 +02:00
|
|
|
CMD_TYPE(COMMAND_RADIO)
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
bool IsActive(const agi::Context *) override {
|
2011-07-15 06:06:03 +02:00
|
|
|
return OPT_GET("Subtitle/Grid/Hide Overrides")->GetInt() == 0;
|
|
|
|
}
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *) override {
|
2011-01-16 08:15:24 +01:00
|
|
|
OPT_SET("Subtitle/Grid/Hide Overrides")->SetInt(0);
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_tags_simplify final : public Command {
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
CMD_NAME("grid/tags/simplify")
|
2011-11-18 06:00:20 +01:00
|
|
|
STR_MENU("S&implify Tags")
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
STR_DISP("Simplify Tags")
|
2012-02-01 19:47:26 +01:00
|
|
|
STR_HELP("Replace override tags in the subtitle grid with a simplified placeholder")
|
2011-07-15 06:05:56 +02:00
|
|
|
CMD_TYPE(COMMAND_RADIO)
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
bool IsActive(const agi::Context *) override {
|
2011-07-15 06:06:03 +02:00
|
|
|
return OPT_GET("Subtitle/Grid/Hide Overrides")->GetInt() == 1;
|
|
|
|
}
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *) override {
|
2011-01-16 08:15:24 +01:00
|
|
|
OPT_SET("Subtitle/Grid/Hide Overrides")->SetInt(1);
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2011-01-18 06:13:26 +01:00
|
|
|
template<class T, class U>
|
2014-03-25 15:35:05 +01:00
|
|
|
static bool move_one(T begin, T end, U const& to_move, bool swap) {
|
2012-01-13 21:19:06 +01:00
|
|
|
size_t move_count = 0;
|
2013-10-01 02:01:15 +02:00
|
|
|
auto prev = end;
|
2014-03-25 15:35:05 +01:00
|
|
|
for (auto it = begin; it != end; ++it) {
|
2014-03-07 19:58:51 +01:00
|
|
|
auto cur = &*it;
|
2013-10-01 02:01:15 +02:00
|
|
|
if (!to_move.count(cur))
|
|
|
|
prev = it;
|
|
|
|
else if (prev != end) {
|
|
|
|
it->swap_nodes(*prev);
|
2014-03-25 15:35:05 +01:00
|
|
|
if (swap)
|
|
|
|
std::swap(prev, it);
|
|
|
|
else
|
|
|
|
prev = it;
|
2013-10-01 02:01:15 +02:00
|
|
|
if (++move_count == to_move.size())
|
2012-01-13 21:19:06 +01:00
|
|
|
break;
|
|
|
|
}
|
2011-01-18 06:13:26 +01:00
|
|
|
}
|
2012-01-13 21:19:06 +01:00
|
|
|
|
|
|
|
return move_count > 0;
|
2011-01-18 06:13:26 +01:00
|
|
|
}
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_move_up final : public Command {
|
2012-01-13 21:18:57 +01:00
|
|
|
CMD_NAME("grid/move/up")
|
2011-01-18 06:13:26 +01:00
|
|
|
STR_MENU("Move line up")
|
|
|
|
STR_DISP("Move line up")
|
2012-01-13 21:19:06 +01:00
|
|
|
STR_HELP("Move the selected lines up one row")
|
2011-07-15 06:05:56 +02:00
|
|
|
CMD_TYPE(COMMAND_VALIDATE)
|
2011-01-18 06:13:26 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
bool Validate(const agi::Context *c) override {
|
2012-01-13 21:19:06 +01:00
|
|
|
return c->selectionController->GetSelectedSet().size() != 0;
|
2011-07-15 06:05:22 +02:00
|
|
|
}
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2014-03-25 15:35:05 +01:00
|
|
|
if (move_one(c->ass->Events.begin(), c->ass->Events.end(), c->selectionController->GetSelectedSet(), false))
|
2012-01-13 21:19:06 +01:00
|
|
|
c->ass->Commit(_("move lines"), AssFile::COMMIT_ORDER);
|
2011-01-18 06:13:26 +01:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_move_down final : public Command {
|
2012-01-13 21:18:57 +01:00
|
|
|
CMD_NAME("grid/move/down")
|
2011-07-15 06:05:56 +02:00
|
|
|
STR_MENU("Move line down")
|
|
|
|
STR_DISP("Move line down")
|
2012-01-13 21:19:06 +01:00
|
|
|
STR_HELP("Move the selected lines down one row")
|
2011-07-15 06:05:56 +02:00
|
|
|
CMD_TYPE(COMMAND_VALIDATE)
|
2011-01-18 06:13:26 +01:00
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
bool Validate(const agi::Context *c) override {
|
2012-01-13 21:19:06 +01:00
|
|
|
return c->selectionController->GetSelectedSet().size() != 0;
|
2011-07-15 06:05:22 +02:00
|
|
|
}
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2014-03-25 15:35:05 +01:00
|
|
|
if (move_one(c->ass->Events.rbegin(), c->ass->Events.rend(), c->selectionController->GetSelectedSet(), true))
|
2012-01-13 21:19:06 +01:00
|
|
|
c->ass->Commit(_("move lines"), AssFile::COMMIT_ORDER);
|
2011-01-18 06:13:26 +01:00
|
|
|
}
|
|
|
|
};
|
2012-01-13 21:18:57 +01:00
|
|
|
|
2014-03-13 02:39:07 +01:00
|
|
|
struct grid_swap final : public Command {
|
2012-01-13 21:18:57 +01:00
|
|
|
CMD_NAME("grid/swap")
|
2013-12-25 22:36:37 +01:00
|
|
|
CMD_ICON(arrow_sort)
|
2012-01-13 21:18:57 +01:00
|
|
|
STR_MENU("Swap Lines")
|
|
|
|
STR_DISP("Swap Lines")
|
2013-10-25 22:54:20 +02:00
|
|
|
STR_HELP("Swap the two selected lines")
|
2012-01-13 21:18:57 +01:00
|
|
|
CMD_TYPE(COMMAND_VALIDATE)
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
bool Validate(const agi::Context *c) override {
|
2012-01-13 21:18:57 +01:00
|
|
|
return c->selectionController->GetSelectedSet().size() == 2;
|
|
|
|
}
|
|
|
|
|
2013-11-21 18:13:36 +01:00
|
|
|
void operator()(agi::Context *c) override {
|
2014-03-25 01:15:14 +01:00
|
|
|
auto const& sel = c->selectionController->GetSelectedSet();
|
2012-01-13 21:18:57 +01:00
|
|
|
if (sel.size() == 2) {
|
2012-10-12 19:16:39 +02:00
|
|
|
(*sel.begin())->swap_nodes(**sel.rbegin());
|
2012-01-13 21:18:57 +01:00
|
|
|
c->ass->Commit(_("swap lines"), AssFile::COMMIT_ORDER);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2011-07-15 06:05:01 +02:00
|
|
|
}
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
|
2011-07-15 06:05:01 +02:00
|
|
|
namespace cmd {
|
|
|
|
void init_grid() {
|
2014-04-23 22:53:24 +02:00
|
|
|
reg(agi::make_unique<grid_line_next>());
|
|
|
|
reg(agi::make_unique<grid_line_next_create>());
|
|
|
|
reg(agi::make_unique<grid_line_prev>());
|
|
|
|
reg(agi::make_unique<grid_sort_actor>());
|
|
|
|
reg(agi::make_unique<grid_sort_effect>());
|
|
|
|
reg(agi::make_unique<grid_sort_end>());
|
|
|
|
reg(agi::make_unique<grid_sort_layer>());
|
|
|
|
reg(agi::make_unique<grid_sort_start>());
|
|
|
|
reg(agi::make_unique<grid_sort_style>());
|
|
|
|
reg(agi::make_unique<grid_sort_actor_selected>());
|
|
|
|
reg(agi::make_unique<grid_sort_effect_selected>());
|
|
|
|
reg(agi::make_unique<grid_sort_end_selected>());
|
|
|
|
reg(agi::make_unique<grid_sort_layer_selected>());
|
|
|
|
reg(agi::make_unique<grid_sort_start_selected>());
|
|
|
|
reg(agi::make_unique<grid_sort_style_selected>());
|
|
|
|
reg(agi::make_unique<grid_move_down>());
|
|
|
|
reg(agi::make_unique<grid_move_up>());
|
|
|
|
reg(agi::make_unique<grid_swap>());
|
|
|
|
reg(agi::make_unique<grid_tag_cycle_hiding>());
|
|
|
|
reg(agi::make_unique<grid_tags_hide>());
|
|
|
|
reg(agi::make_unique<grid_tags_show>());
|
|
|
|
reg(agi::make_unique<grid_tags_simplify>());
|
2011-07-15 06:05:01 +02:00
|
|
|
}
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
}
|