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

933 lines
29 KiB
C++
Raw Normal View History

Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
// 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.
//
Switch all headers to using Doxygen and cleanup contact info * Swap old email + website address with 'Aegisub Project http://www.aegisub.org/' * Set categories for all files (jfs) * Add descriptions for each file (jfs) * Add $Id$ keyword Originally committed to SVN as r3310.
2009-07-29 07:43:02 +02:00
// Aegisub Project http://www.aegisub.org/
Various Unicode-related fixes. Changed some types to lower the amount of int/size_t inconsistencies. This might have introduced some stupid bugs... beware! Removed old, unused "project file" code. (cleanup) Fixed bug #195: "Join (as karaoke)" is broken when 2 lines don't follow immediately after another Implemented feature req #184: Text Only Export Fixed bug #180: conversion from srt to ass doesn't specify WrapStyle Implemented feature req #188: highlighting of currently selected style in the styles manager Originally committed to SVN as r537.
2006-10-20 00:53:06 +02:00
#include "ass_dialogue.h"
Fix all the headers in *.cpp, this includes: * Wrapping all headers that are in agi_pre.h with AGI_PRE. * Sorting alphabetically. Originally committed to SVN as r3515.
2009-09-10 15:06:40 +02:00
#include "ass_file.h"
#include "ass_style.h"
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
#include "ass_style_storage.h"
Fix importing styles from files in non-local charsets (i.e. hopefully all of them)
2013-06-09 16:53:07 +02:00
#include "charset_detect.h"
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
#include "compat.h"
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
#include "dialog_manager.h"
Fix all the headers in *.cpp, this includes: * Wrapping all headers that are in agi_pre.h with AGI_PRE. * Sorting alphabetically. Originally committed to SVN as r3515.
2009-09-10 15:06:40 +02:00
#include "dialog_style_editor.h"
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
#include "dialogs.h"
Replace wxString::Format with agi::format It's modestly faster, significantly more type-safe, and doesn't assert when there's too few arguments, which causes problems for plural forms. Closes #1733.
2014-05-29 17:28:37 +02:00
#include "format.h"
Fix all the headers in *.cpp, this includes: * Wrapping all headers that are in agi_pre.h with AGI_PRE. * Sorting alphabetically. Originally committed to SVN as r3515.
2009-09-10 15:06:40 +02:00
#include "help_button.h"
Replace wxString::Format with agi::format It's modestly faster, significantly more type-safe, and doesn't assert when there's too few arguments, which causes problems for plural forms. Closes #1733.
2014-05-29 17:28:37 +02:00
#include "include/aegisub/context.h"
Fix all the headers in *.cpp, this includes: * Wrapping all headers that are in agi_pre.h with AGI_PRE. * Sorting alphabetically. Originally committed to SVN as r3515.
2009-09-10 15:06:40 +02:00
#include "libresrc/libresrc.h"
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.
2013-01-07 02:50:09 +01:00
#include "options.h"
Use PersistLocation for DialogStyleManager Originally committed to SVN as r5520.
2011-07-27 07:36:24 +02:00
#include "persist_location.h"
Merge audio_display_rewrite branch to trunk. This is not a complete work, don't expect to time anything for a while. Originally committed to SVN as r4903.
2010-12-08 04:36:10 +01:00
#include "selection_controller.h"
Kill AssFile::GetWildcardList It did not actually simplify or clarify any of the code that called it.
2012-10-12 05:08:38 +02:00
#include "subtitle_format.h"
Note: This was done using a script! it's far from perfect but 95% of the work has been done already formatting-wise. Document all functions, class, struct, union, enum, macro, variable, typedefs. This isn't the actual document in itself but empty documentation using any old documentation if it was there. This was done using exuberant ctags to get tag info, then a TCL script to parse/remove old comments and convert them into Doxygen-style. Some notes: * Anything labeled 'DOCME' needs to be documented, @param and @return have been left blank as it would be annoying to delete the 'DOCME' from every one of those. * Some multiline comments may have been munged into single line comments * Leave the /// comments above global variables with a space, if they're harder to read then we'll be less likey to use them. * Enum comments can go after the enumeration itself '[value] /// comment' * include/aegisub/*.h haven't been converted yet, this will be done in a later commit * Some documentation blocks are in the wrong place, in the .h when it should be in the .cpp, or vice versa. See http://devel.aegisub.org/wiki/Doxygen for some details on Doxygen and a 'style guide'. Originally committed to SVN as r3312.
2009-07-30 00:59:22 +02:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <libaegisub/fs.h>
Kill StandardPaths It's now just a pointless wrapper around agi::Path.
2013-01-30 04:35:37 +01:00
#include <libaegisub/path.h>
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
#include <libaegisub/signal.h>
Fix crash when pasting styles in the styles manager
2013-08-09 05:36:12 +02:00
#include <libaegisub/split.h>
Move make_unique to its own header file Rebuilding the entire project after touching util.h gets old fast.
2014-04-23 22:53:24 +02:00
#include <libaegisub/make_unique.h>
Add range adaptor for filtering to a specific subclass from a heterogeneous range This makes looping over the subtitle file and parsed dialogue lines less awkward in many cases.
2012-11-05 17:20:58 +01:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <algorithm>
#include <boost/algorithm/string/trim.hpp>
#include <functional>
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
#include <future>
#include <memory>
#include <vector>
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <wx/bmpbuttn.h>
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
#include <wx/button.h>
Clean up unused includes
2014-05-23 00:40:16 +02:00
#include <wx/checkbox.h>
#include <wx/combobox.h>
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
#include <wx/combobox.h>
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <wx/filename.h>
Prefetch the list of fonts for the style editor dialog On my machine (with ~5000 fonts installed), enumerating the installed fonts was about 75% of the total construction time of the style editor dialog.
2013-07-08 23:43:43 +02:00
#include <wx/fontenum.h>
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <wx/intl.h>
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
#include <wx/listbox.h>
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <wx/msgdlg.h>
Clean up unused includes
2014-05-23 00:40:16 +02:00
#include <wx/radiobox.h>
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <wx/sizer.h>
Clean up unused includes
2014-05-23 00:40:16 +02:00
#include <wx/spinctrl.h>
#include <wx/textctrl.h>
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <wx/textdlg.h>
#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
namespace {
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
class DialogStyleManager final : public wxDialog {
agi::Context *c; ///< Project context
std::unique_ptr<PersistLocation> persist;
agi::signal::Connection commit_connection;
agi::signal::Connection active_line_connection;
std::shared_future<wxArrayString> font_list;
/// Styles in the current subtitle file
std::vector<AssStyle*> styleMap;
/// Style storage manager
AssStyleStorage Store;
wxComboBox *CatalogList;
wxListBox *StorageList;
wxListBox *CurrentList;
wxButton *CatalogDelete;
wxButton *MoveToLocal;
wxButton *MoveToStorage;
wxButton *StorageNew;
wxButton *StorageEdit;
wxButton *StorageCopy;
wxButton *StorageDelete;
wxButton *StorageMoveUp;
wxButton *StorageMoveDown;
wxButton *StorageMoveTop;
wxButton *StorageMoveBottom;
wxButton *StorageSort;
wxButton *CurrentNew;
wxButton *CurrentEdit;
wxButton *CurrentCopy;
wxButton *CurrentDelete;
wxButton *CurrentMoveUp;
wxButton *CurrentMoveDown;
wxButton *CurrentMoveTop;
wxButton *CurrentMoveBottom;
wxButton *CurrentSort;
/// Load the list of available storages
void LoadCatalog();
/// Load the style list from the subtitles file
void LoadCurrentStyles(int commit_type);
/// Enable/disable all of the buttons as appropriate
void UpdateButtons();
/// Move styles up or down
/// @param storage Storage or current file styles
/// @param type 0: up; 1: top; 2: down; 3: bottom; 4: sort
void MoveStyles(bool storage, int type);
/// Open the style editor for the given style on the script
/// @param style Style to edit, or nullptr for new
/// @param new_name Default new name for copies
void ShowCurrentEditor(AssStyle *style, std::string const& new_name = "");
/// Open the style editor for the given style in the storage
/// @param style Style to edit, or nullptr for new
/// @param new_name Default new name for copies
void ShowStorageEditor(AssStyle *style, std::string const& new_name = "");
/// Save the storage and update the view after a change
void UpdateStorage();
void OnChangeCatalog();
void OnCatalogNew();
void OnCatalogDelete();
void OnCopyToCurrent();
void OnCopyToStorage();
void OnCurrentCopy();
void OnCurrentDelete();
void OnCurrentEdit();
void OnCurrentImport();
void OnCurrentNew();
void OnStorageCopy();
void OnStorageDelete();
void OnStorageEdit();
void OnStorageNew();
void OnKeyDown(wxKeyEvent &event);
void PasteToCurrent();
void PasteToStorage();
template<class T>
void CopyToClipboard(wxListBox *list, T const& v);
void OnActiveLineChanged(AssDialogue *new_line);
public:
DialogStyleManager(agi::Context *context);
};
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
wxBitmapButton *add_bitmap_button(wxWindow *parent, wxSizer *sizer, wxBitmap const& img, wxString const& tooltip) {
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
wxBitmapButton *btn = new wxBitmapButton(parent, -1, img);
btn->SetToolTip(tooltip);
sizer->Add(btn, wxSizerFlags().Expand());
return btn;
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
wxSizer *make_move_buttons(wxWindow *parent, wxButton **up, wxButton **down, wxButton **top, wxButton **bottom, wxButton **sort) {
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
sizer->AddStretchSpacer(1);
Remove periods from single-sentence tooltips Originally committed to SVN as r6449.
2012-02-07 02:22:32 +01:00
*up = add_bitmap_button(parent, sizer, GETIMAGE(arrow_up_24), _("Move style up"));
*down = add_bitmap_button(parent, sizer, GETIMAGE(arrow_down_24), _("Move style down"));
*top = add_bitmap_button(parent, sizer, GETIMAGE(arrow_up_stop_24), _("Move style to top"));
*bottom = add_bitmap_button(parent, sizer, GETIMAGE(arrow_down_stop_24), _("Move style to bottom"));
*sort = add_bitmap_button(parent, sizer, GETIMAGE(arrow_sort_24), _("Sort styles alphabetically"));
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
sizer->AddStretchSpacer(1);
return sizer;
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
wxSizer *make_edit_buttons(wxWindow *parent, wxString move_label, wxButton **move, wxButton **nw, wxButton **edit, wxButton **copy, wxButton **del) {
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
*move = new wxButton(parent, -1, move_label);
*nw = new wxButton(parent, -1, _("&New"));
*edit = new wxButton(parent, -1, _("&Edit"));
*copy = new wxButton(parent, -1, _("&Copy"));
*del = new wxButton(parent, -1, _("&Delete"));
sizer->Add(*nw, wxSizerFlags(1).Expand().Border(wxRIGHT));
sizer->Add(*edit, wxSizerFlags(1).Expand().Border(wxRIGHT));
sizer->Add(*copy, wxSizerFlags(1).Expand().Border(wxRIGHT));
sizer->Add(*del, wxSizerFlags(1).Expand());
return sizer;
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
template<class Func>
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
std::string unique_name(Func name_checker, std::string const& source_name) {
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
if (name_checker(source_name)) {
Replace wxString::Format with agi::format It's modestly faster, significantly more type-safe, and doesn't assert when there's too few arguments, which causes problems for plural forms. Closes #1733.
2014-05-29 17:28:37 +02:00
std::string name = agi::format(_("%s - Copy"), source_name);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
for (int i = 2; name_checker(name); ++i)
Replace wxString::Format with agi::format It's modestly faster, significantly more type-safe, and doesn't assert when there's too few arguments, which causes problems for plural forms. Closes #1733.
2014-05-29 17:28:37 +02:00
name = agi::format(_("%s - Copy (%d)"), source_name, i);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
return name;
}
return source_name;
}
template<class Func1, class Func2>
void add_styles(Func1 name_checker, Func2 style_adder) {
Fix crash when pasting styles in the styles manager
2013-08-09 05:36:12 +02:00
auto cb = GetClipboard();
Don't spam the user with many dialogs when pasting invalid styles Just show a single error dialog regardless of the number of styles that failed to parse.
2013-12-23 15:50:30 +01:00
int failed_to_parse = 0;
Fix crash when pasting styles in the styles manager
2013-08-09 05:36:12 +02:00
for (auto tok : agi::Split(cb, '\n')) {
tok = boost::trim_copy(tok);
if (tok.empty()) continue;
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
try {
Fix crash when pasting styles in the styles manager
2013-08-09 05:36:12 +02:00
AssStyle *s = new AssStyle(agi::str(tok));
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
s->name = unique_name(name_checker, s->name);
style_adder(s);
}
catch (...) {
Don't spam the user with many dialogs when pasting invalid styles Just show a single error dialog regardless of the number of styles that failed to parse.
2013-12-23 15:50:30 +01:00
++failed_to_parse;
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
}
}
Don't spam the user with many dialogs when pasting invalid styles Just show a single error dialog regardless of the number of styles that failed to parse.
2013-12-23 15:50:30 +01:00
if (failed_to_parse)
wxMessageBox(_("Could not parse style"), _("Could not parse style"), wxOK | wxICON_EXCLAMATION);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
}
int confirm_delete(int n, wxWindow *parent, wxString const& title) {
Use proper plural forms for some UI strings
2014-03-12 17:13:46 +01:00
return wxMessageBox(
Replace wxString::Format with agi::format It's modestly faster, significantly more type-safe, and doesn't assert when there's too few arguments, which causes problems for plural forms. Closes #1733.
2014-05-29 17:28:37 +02:00
fmt_plural(n, "Are you sure you want to delete this style?", "Are you sure you want to delete these %d styles?", n),
Use proper plural forms for some UI strings
2014-03-12 17:13:46 +01:00
title, wxYES_NO | wxICON_EXCLAMATION, parent);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
}
int get_single_sel(wxListBox *lb) {
wxArrayInt selections;
int n = lb->GetSelections(selections);
return n == 1 ? selections[0] : -1;
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
DialogStyleManager::DialogStyleManager(agi::Context *context)
Prompt to update uses of the style when "Default" is renamed As far as I can tell, Default was only excluded to avoid prompting when creating a new style, but whether or not a style is new is now an explicit parameter to the editor so it's unneeded. Originally committed to SVN as r6453.
2012-02-07 21:42:44 +01:00
: wxDialog(context->parent, -1, _("Styles Manager"))
Kill SubtitlesGrid::ass and SubtitlesGrid::EditBox and convert everything that used them over to agi::Context Originally committed to SVN as r5215.
2011-01-16 08:17:36 +01:00
, c(context)
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
, commit_connection(c->ass->AddCommitListener(&DialogStyleManager::LoadCurrentStyles, this))
Use signals for selection change notifications
2012-10-05 05:22:54 +02:00
, active_line_connection(c->selectionController->AddActiveLineListener(&DialogStyleManager::OnActiveLineChanged, this))
Prefetch the list of fonts for the style editor dialog On my machine (with ~5000 fonts installed), enumerating the installed fonts was about 75% of the total construction time of the style editor dialog.
2013-07-08 23:43:43 +02:00
, font_list(std::async(std::launch::async, []() -> wxArrayString {
wxArrayString fontList = wxFontEnumerator::GetFacenames();
fontList.Sort();
return fontList;
}))
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
{
Remove references to tr1
2012-09-25 01:35:27 +02:00
using std::bind;
Use 16x16 icons for dialogs rather than cropping the 24x24 icons to 16x16 Originally committed to SVN as r6650.
2012-04-03 22:40:24 +02:00
SetIcon(GETICON(style_toolbutton_16));
Fixed some video display bugs and added overscan mask drawing (disabled for now). Originally committed to SVN as r1308.
2007-06-28 22:29:56 +02:00
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
// Catalog
wxSizer *CatalogBox = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Catalog of available storages"));
NULL -> nullptr
2012-11-13 17:51:01 +01:00
CatalogList = new wxComboBox(this,-1, "", wxDefaultPosition, wxSize(-1,-1), 0, nullptr, wxCB_READONLY);
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
wxButton *CatalogNew = new wxButton(this, -1, _("New"));
Ensure that there is always at least one style catalog existing and selected so that the style manager doesn't have to check if there is one Originally committed to SVN as r6543.
2012-03-08 05:17:17 +01:00
CatalogDelete = new wxButton(this, -1, _("Delete"));
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
CatalogBox->Add(CatalogList,1,wxEXPAND | wxRIGHT | wxALIGN_RIGHT,5);
CatalogBox->Add(CatalogNew,0,wxRIGHT,5);
CatalogBox->Add(CatalogDelete,0,0,0);
// Storage styles list
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
wxSizer *StorageButtons = make_edit_buttons(this, _("Copy to &current script ->"), &MoveToLocal, &StorageNew, &StorageEdit, &StorageCopy, &StorageDelete);
Redesigned the layout of the styles manager. Originally committed to SVN as r1334.
2007-07-02 08:18:28 +02:00
wxSizer *StorageListSizer = new wxBoxSizer(wxHORIZONTAL);
NULL -> nullptr
2012-11-13 17:51:01 +01:00
StorageList = new wxListBox(this, -1, wxDefaultPosition, wxSize(240,250), 0, nullptr, wxLB_EXTENDED);
Redesigned the layout of the styles manager. Originally committed to SVN as r1334.
2007-07-02 08:18:28 +02:00
StorageListSizer->Add(StorageList,1,wxEXPAND | wxRIGHT,0);
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
StorageListSizer->Add(make_move_buttons(this, &StorageMoveUp, &StorageMoveDown, &StorageMoveTop, &StorageMoveBottom, &StorageSort), wxSizerFlags().Expand());
wxSizer *StorageBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Storage"));
Redesigned the layout of the styles manager. Originally committed to SVN as r1334.
2007-07-02 08:18:28 +02:00
StorageBox->Add(StorageListSizer,1,wxEXPAND | wxBOTTOM,5);
StorageBox->Add(MoveToLocal,0,wxEXPAND | wxBOTTOM,5);
StorageBox->Add(StorageButtons,0,wxEXPAND | wxBOTTOM,0);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
// Local styles list
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
wxButton *CurrentImport = new wxButton(this, -1, _("&Import from script..."));
wxSizer *CurrentButtons = make_edit_buttons(this, _("<- Copy to &storage"), &MoveToStorage, &CurrentNew, &CurrentEdit, &CurrentCopy, &CurrentDelete);
Redesigned the layout of the styles manager. Originally committed to SVN as r1334.
2007-07-02 08:18:28 +02:00
wxSizer *MoveImportSizer = new wxBoxSizer(wxHORIZONTAL);
Fix tab order issues in various dialogues - bug #518. Still a couple left with more serious issues. (Export, style editor, translation assistant, fonts collector, kanji timer, more I'm forgetting.) Originally committed to SVN as r1494.
2007-08-16 01:17:42 +02:00
MoveImportSizer->Add(MoveToStorage,1,wxEXPAND | wxRIGHT,5);
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
MoveImportSizer->Add(CurrentImport,1,wxEXPAND,0);
wxSizer *CurrentListSizer = new wxBoxSizer(wxHORIZONTAL);
NULL -> nullptr
2012-11-13 17:51:01 +01:00
CurrentList = new wxListBox(this, -1, wxDefaultPosition, wxSize(240,250), 0, nullptr, wxLB_EXTENDED);
Redesigned the layout of the styles manager. Originally committed to SVN as r1334.
2007-07-02 08:18:28 +02:00
CurrentListSizer->Add(CurrentList,1,wxEXPAND | wxRIGHT,0);
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
CurrentListSizer->Add(make_move_buttons(this, &CurrentMoveUp, &CurrentMoveDown, &CurrentMoveTop, &CurrentMoveBottom, &CurrentSort), wxSizerFlags().Expand());
wxSizer *CurrentBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Current script"));
Redesigned the layout of the styles manager. Originally committed to SVN as r1334.
2007-07-02 08:18:28 +02:00
CurrentBox->Add(CurrentListSizer,1,wxEXPAND | wxBOTTOM,5);
CurrentBox->Add(MoveImportSizer,0,wxEXPAND | wxBOTTOM,5);
CurrentBox->Add(CurrentButtons,0,wxEXPAND | wxBOTTOM,0);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Started adding non-functional help buttons to dialogs and replacing buttons with wxStdDialogButtonSizer. Originally committed to SVN as r1297.
2007-06-23 09:27:09 +02:00
// Buttons
Kill DialogStyleManager::OnClose as it just does the default thing Originally committed to SVN as r6415.
2012-02-01 01:48:42 +01:00
wxStdDialogButtonSizer *buttonSizer = CreateStdDialogButtonSizer(wxCANCEL | wxHELP);
buttonSizer->GetCancelButton()->SetLabel(_("Close"));
Use the new much shorter event names
2013-12-12 03:25:13 +01:00
Bind(wxEVT_BUTTON, bind(&HelpButton::OpenPage, "Styles Manager"), wxID_HELP);
Started adding non-functional help buttons to dialogs and replacing buttons with wxStdDialogButtonSizer. Originally committed to SVN as r1297.
2007-06-23 09:27:09 +02:00
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
// General layout
wxSizer *StylesSizer = new wxBoxSizer(wxHORIZONTAL);
Added an "Import from script..." button to Styles Manager, to import styles directly from other subtitle files. Originally committed to SVN as r625.
2006-12-26 05:48:53 +01:00
StylesSizer->Add(StorageBox,0,wxRIGHT | wxEXPAND,5);
StylesSizer->Add(CurrentBox,0,wxLEFT | wxEXPAND,0);
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
MainSizer->Add(CatalogBox,0,wxEXPAND | wxLEFT | wxRIGHT | wxTOP,5);
Started adding non-functional help buttons to dialogs and replacing buttons with wxStdDialogButtonSizer. Originally committed to SVN as r1297.
2007-06-23 09:27:09 +02:00
MainSizer->Add(StylesSizer,1,wxEXPAND | wxALL,5);
MainSizer->Add(buttonSizer,0,wxBOTTOM | wxEXPAND,5);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
SetSizerAndFit(MainSizer);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
// Position window
Move make_unique to its own header file Rebuilding the entire project after touching util.h gets old fast.
2014-04-23 22:53:24 +02:00
persist = agi::make_unique<PersistLocation>(this, "Tool/Style Manager");
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
// Populate lists
LoadCatalog();
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
LoadCurrentStyles(AssFile::COMMIT_STYLES | AssFile::COMMIT_DIAG_META);
Various Unicode-related fixes. Changed some types to lower the amount of int/size_t inconsistencies. This might have introduced some stupid bugs... beware! Removed old, unused "project file" code. (cleanup) Fixed bug #195: "Join (as karaoke)" is broken when 2 lines don't follow immediately after another Implemented feature req #184: Text Only Export Fixed bug #180: conversion from srt to ass doesn't specify WrapStyle Implemented feature req #188: highlighting of currently selected style in the styles manager Originally committed to SVN as r537.
2006-10-20 00:53:06 +02:00
Added keyboard shortcuts escape and delete to style manager Originally committed to SVN as r924.
2007-02-05 20:09:45 +01:00
//Set key handlers for lists
Kill SubtitlesGrid::ass and SubtitlesGrid::EditBox and convert everything that used them over to agi::Context Originally committed to SVN as r5215.
2011-01-16 08:17:36 +01:00
CatalogList->Bind(wxEVT_KEY_DOWN, &DialogStyleManager::OnKeyDown, this);
StorageList->Bind(wxEVT_KEY_DOWN, &DialogStyleManager::OnKeyDown, this);
CurrentList->Bind(wxEVT_KEY_DOWN, &DialogStyleManager::OnKeyDown, this);
Added keyboard shortcuts escape and delete to style manager Originally committed to SVN as r924.
2007-02-05 20:09:45 +01:00
Clean up unused includes
2014-05-23 00:40:16 +02:00
StorageMoveUp->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { MoveStyles(true, 0); });
StorageMoveTop->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { MoveStyles(true, 1); });
StorageMoveDown->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { MoveStyles(true, 2); });
StorageMoveBottom->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { MoveStyles(true, 3); });
StorageSort->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { MoveStyles(true, 4); });
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
Clean up unused includes
2014-05-23 00:40:16 +02:00
CurrentMoveUp->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { MoveStyles(false, 0); });
CurrentMoveTop->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { MoveStyles(false, 1); });
CurrentMoveDown->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { MoveStyles(false, 2); });
CurrentMoveBottom->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { MoveStyles(false, 3); });
CurrentSort->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { MoveStyles(false, 4); });
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
Clean up unused includes
2014-05-23 00:40:16 +02:00
CatalogNew->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnCatalogNew(); });
CatalogDelete->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnCatalogDelete(); });
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
Clean up unused includes
2014-05-23 00:40:16 +02:00
StorageNew->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnStorageNew(); });
StorageEdit->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnStorageEdit(); });
StorageCopy->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnStorageCopy(); });
StorageDelete->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnStorageDelete(); });
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
Clean up unused includes
2014-05-23 00:40:16 +02:00
CurrentNew->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnCurrentNew(); });
CurrentEdit->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnCurrentEdit(); });
CurrentCopy->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnCurrentCopy(); });
CurrentDelete->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnCurrentDelete(); });
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
Clean up unused includes
2014-05-23 00:40:16 +02:00
CurrentImport->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnCurrentImport(); });
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
Clean up unused includes
2014-05-23 00:40:16 +02:00
MoveToLocal->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnCopyToCurrent(); });
MoveToStorage->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { OnCopyToStorage(); });
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
Clean up unused includes
2014-05-23 00:40:16 +02:00
CatalogList->Bind(wxEVT_COMBOBOX, [=](wxCommandEvent&) { OnChangeCatalog(); });
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
Clean up unused includes
2014-05-23 00:40:16 +02:00
StorageList->Bind(wxEVT_LISTBOX, [=](wxCommandEvent&) { UpdateButtons(); });
StorageList->Bind(wxEVT_LISTBOX_DCLICK, [=](wxCommandEvent&) { OnStorageEdit(); });
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
Clean up unused includes
2014-05-23 00:40:16 +02:00
CurrentList->Bind(wxEVT_LISTBOX, [=](wxCommandEvent&) { UpdateButtons(); });
CurrentList->Bind(wxEVT_LISTBOX_DCLICK, [=](wxCommandEvent&) { OnCurrentEdit(); });
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
void DialogStyleManager::LoadCurrentStyles(int commit_type) {
if (commit_type & AssFile::COMMIT_STYLES || commit_type == AssFile::COMMIT_NEW) {
CurrentList->Clear();
styleMap.clear();
Make the entry lists be of the appropriate type rather than just AssEntry Eliminates a bajillion dynamic casts.
2014-03-07 19:58:51 +01:00
for (auto& style : c->ass->Styles) {
CurrentList->Append(to_wx(style.name));
styleMap.push_back(&style);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
}
}
if (commit_type & AssFile::COMMIT_DIAG_META) {
AssDialogue *dia = c->selectionController->GetActiveLine();
Make the style manager dialog modeless Originally committed to SVN as r6547.
2012-03-08 05:17:42 +01:00
CurrentList->DeselectAll();
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
if (dia && commit_type != AssFile::COMMIT_NEW)
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
CurrentList->SetStringSelection(to_wx(dia->Style));
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
else
CurrentList->SetSelection(0);
}
UpdateButtons();
}
Make the style manager dialog modeless Originally committed to SVN as r6547.
2012-03-08 05:17:42 +01:00
void DialogStyleManager::OnActiveLineChanged(AssDialogue *new_line) {
if (new_line) {
CurrentList->DeselectAll();
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
CurrentList->SetStringSelection(to_wx(new_line->Style));
Make the style manager dialog modeless Originally committed to SVN as r6547.
2012-03-08 05:17:42 +01:00
UpdateButtons();
}
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
void DialogStyleManager::UpdateStorage() {
Store.Save();
StorageList->Clear();
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
StorageList->Append(to_wx(Store.GetNames()));
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
UpdateButtons();
}
void DialogStyleManager::OnChangeCatalog() {
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
std::string catalog(from_wx(CatalogList->GetStringSelection()));
Redesign how project metadata is stored in the file Remove it from the script info section and put it in its own section that isn't tracked by undo and make it not stringly typed. Removes the need for the gross hack where changes are slipped in just before saving to circumvent the undo system, cuts down on the uses of string literals to identify fields, and probably improves performance a little.
2014-05-22 03:32:42 +02:00
c->ass->Properties.style_storage = catalog;
Move style catalog indexing and naming logic
2014-05-04 13:03:04 +02:00
Store.LoadCatalog(catalog);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
UpdateStorage();
}
Uncrustify AssStyleStorage a bit Originally committed to SVN as r6413.
2012-02-01 01:48:24 +01:00
void DialogStyleManager::LoadCatalog() {
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
CatalogList->Clear();
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
// Get saved style catalogs
Move style catalog indexing and naming logic
2014-05-04 13:03:04 +02:00
auto catalogs = AssStyleStorage::GetCatalogs();
for (auto const& c : catalogs)
CatalogList->Append(c);
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
// Create a default storage if there are none
Automatically add a "Default" style to the "Default" catalog as 2.1.x did. Patch by cantabile. Closes #1487. Originally committed to SVN as r6765.
2012-05-13 02:57:34 +02:00
if (CatalogList->IsListEmpty()) {
Move style catalog indexing and naming logic
2014-05-04 13:03:04 +02:00
Store.LoadCatalog("Default");
Move make_unique to its own header file Rebuilding the entire project after touching util.h gets old fast.
2014-04-23 22:53:24 +02:00
Store.push_back(agi::make_unique<AssStyle>());
Automatically add a "Default" style to the "Default" catalog as 2.1.x did. Patch by cantabile. Closes #1487. Originally committed to SVN as r6765.
2012-05-13 02:57:34 +02:00
Store.Save();
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
CatalogList->Append("Default");
Automatically add a "Default" style to the "Default" catalog as 2.1.x did. Patch by cantabile. Closes #1487. Originally committed to SVN as r6765.
2012-05-13 02:57:34 +02:00
}
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
// Set to default if available
Redesign how project metadata is stored in the file Remove it from the script info section and put it in its own section that isn't tracked by undo and make it not stringly typed. Removes the need for the gross hack where changes are slipped in just before saving to circumvent the undo system, cuts down on the uses of string literals to identify fields, and probably improves performance a little.
2014-05-22 03:32:42 +02:00
std::string pickStyle = c->ass->Properties.style_storage;
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
if (pickStyle.empty())
pickStyle = "Default";
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
int opt = CatalogList->FindString(to_wx(pickStyle), false);
Redesign how project metadata is stored in the file Remove it from the script info section and put it in its own section that isn't tracked by undo and make it not stringly typed. Removes the need for the gross hack where changes are slipped in just before saving to circumvent the undo system, cuts down on the uses of string literals to identify fields, and probably improves performance a little.
2014-05-22 03:32:42 +02:00
CatalogList->SetSelection(opt == wxNOT_FOUND ? 0 : opt);
Ensure that there is always at least one style catalog existing and selected so that the style manager doesn't have to check if there is one Originally committed to SVN as r6543.
2012-03-08 05:17:17 +01:00
OnChangeCatalog();
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
void DialogStyleManager::OnCatalogNew() {
Eliminate all unnecessary uses of L and _T Originally committed to SVN as r5611.
2011-09-28 21:43:11 +02:00
wxString name = wxGetTextFromUser(_("New storage name:"), _("New catalog entry"), "", this);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
if (!name) return;
// Remove bad characters from the name
Always use wxPATH_WIN for wxFileName::GetForbiddenChars While it's possible to have files with the DOS-only forbidden characters on other platforms, wx doesn't actually support them very well. Closes #1489. Originally committed to SVN as r6792.
2012-05-15 15:40:10 +02:00
wxString badchars = wxFileName::GetForbiddenChars(wxPATH_DOS);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
int badchars_removed = 0;
Use range-based for loops in a bunch of places
2012-11-04 04:53:03 +01:00
for (wxUniCharRef chr : name) {
if (badchars.find(chr) != badchars.npos) {
chr = '_';
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
++badchars_removed;
Fixed #162, subsgrid scrollbar didn't update to to reflect changed line counts in the grid after various operations. Fixed #171, style storages can no longer be created with illegal filename characters, they are replaced with underscores. Originally committed to SVN as r553.
2006-11-23 20:08:46 +01:00
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
}
Fixed #162, subsgrid scrollbar didn't update to to reflect changed line counts in the grid after various operations. Fixed #171, style storages can no longer be created with illegal filename characters, they are replaced with underscores. Originally committed to SVN as r553.
2006-11-23 20:08:46 +01:00
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
// Make sure that there is no storage with the same name (case insensitive search since Windows filenames are case insensitive)
if (CatalogList->FindString(name, false) != wxNOT_FOUND) {
Center most of the message boxes over their parent windows Originally committed to SVN as r6629.
2012-03-29 01:59:19 +02:00
wxMessageBox(_("A catalog with that name already exists."), _("Catalog name conflict"), wxOK | wxICON_ERROR | wxCENTER);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
return;
}
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
// Warn about bad characters
if (badchars_removed) {
wxMessageBox(
Replace wxString::Format with agi::format It's modestly faster, significantly more type-safe, and doesn't assert when there's too few arguments, which causes problems for plural forms. Closes #1733.
2014-05-29 17:28:37 +02:00
fmt_tl("The specified catalog name contains one or more illegal characters. They have been replaced with underscores instead.\nThe catalog has been renamed to \"%s\".", name),
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
_("Invalid characters"));
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
// Add to list of storages
CatalogList->Append(name);
CatalogList->SetStringSelection(name);
OnChangeCatalog();
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
void DialogStyleManager::OnCatalogDelete() {
Ensure that there is always at least one style catalog existing and selected so that the style manager doesn't have to check if there is one Originally committed to SVN as r6543.
2012-03-08 05:17:17 +01:00
if (CatalogList->GetCount() == 1) return;
wxString name = CatalogList->GetStringSelection();
Replace wxString::Format with agi::format It's modestly faster, significantly more type-safe, and doesn't assert when there's too few arguments, which causes problems for plural forms. Closes #1733.
2014-05-29 17:28:37 +02:00
wxString message = fmt_tl("Are you sure you want to delete the storage \"%s\" from the catalog?", name);
Ensure that there is always at least one style catalog existing and selected so that the style manager doesn't have to check if there is one Originally committed to SVN as r6543.
2012-03-08 05:17:17 +01:00
int option = wxMessageBox(message, _("Confirm delete"), wxYES_NO | wxICON_EXCLAMATION , this);
if (option == wxYES) {
Kill StandardPaths It's now just a pointless wrapper around agi::Path.
2013-01-30 04:35:37 +01:00
agi::fs::Remove(config::path->Decode("?user/catalog/" + from_wx(name) + ".sty"));
Ensure that there is always at least one style catalog existing and selected so that the style manager doesn't have to check if there is one Originally committed to SVN as r6543.
2012-03-08 05:17:17 +01:00
CatalogList->Delete(CatalogList->GetSelection());
CatalogList->SetSelection(0);
OnChangeCatalog();
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
void DialogStyleManager::OnCopyToStorage() {
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
wxArrayInt selections;
int n = CurrentList->GetSelections(selections);
Switch lists of pointers to vectors of pointers
2012-11-28 16:46:33 +01:00
wxArrayString copied;
copied.reserve(n);
Rewrote code for copying styles to and from storages, making it correctly replace styles of the same name that already exist in the target. Updates #922. Originally committed to SVN as r3160.
2009-07-18 04:52:46 +02:00
for (int i = 0; i < n; i++) {
wxString styleName = CurrentList->GetString(selections[i]);
Uncrustify AssStyleStorage a bit Originally committed to SVN as r6413.
2012-02-01 01:48:24 +01:00
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
if (AssStyle *style = Store.GetStyle(from_wx(styleName))) {
Replace wxString::Format with agi::format It's modestly faster, significantly more type-safe, and doesn't assert when there's too few arguments, which causes problems for plural forms. Closes #1733.
2014-05-29 17:28:37 +02:00
if (wxYES == wxMessageBox(fmt_tl("There is already a style with the name \"%s\" in the current storage. Overwrite?", styleName), _("Style name collision"), wxYES_NO)) {
Uncrustify AssStyleStorage a bit Originally committed to SVN as r6413.
2012-02-01 01:48:24 +01:00
*style = *styleMap.at(selections[i]);
copied.push_back(styleName);
"Copy to storage" in the styles manager now prompts the user if he wants to overwrite if the style already exists in the storage (previously it would do nothing, goggles etc.). Fixes #573. Originally committed to SVN as r1697.
2008-01-13 07:42:34 +01:00
}
Rewrote code for copying styles to and from storages, making it correctly replace styles of the same name that already exist in the target. Updates #922. Originally committed to SVN as r3160.
2009-07-18 04:52:46 +02:00
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
else {
Move make_unique to its own header file Rebuilding the entire project after touching util.h gets old fast.
2014-04-23 22:53:24 +02:00
Store.push_back(agi::make_unique<AssStyle>(*styleMap.at(selections[i])));
Make the style manager dialog select the new styles when copying styles between the current script and storage, and fix a few cases where buttons were incorrectly enabled or disabled. Updates #1186. Originally committed to SVN as r4244.
2010-04-24 23:48:06 +02:00
copied.push_back(styleName);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
}
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
UpdateStorage();
Use range-based for loops in a bunch of places
2012-11-04 04:53:03 +01:00
for (auto const& style_name : copied)
StorageList->SetStringSelection(style_name, true);
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
UpdateButtons();
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
void DialogStyleManager::OnCopyToCurrent() {
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
wxArrayInt selections;
int n = StorageList->GetSelections(selections);
Switch lists of pointers to vectors of pointers
2012-11-28 16:46:33 +01:00
wxArrayString copied;
copied.reserve(n);
Rewrote code for copying styles to and from storages, making it correctly replace styles of the same name that already exist in the target. Updates #922. Originally committed to SVN as r3160.
2009-07-18 04:52:46 +02:00
for (int i = 0; i < n; i++) {
wxString styleName = StorageList->GetString(selections[i]);
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
if (AssStyle *style = c->ass->GetStyle(from_wx(styleName))) {
Replace wxString::Format with agi::format It's modestly faster, significantly more type-safe, and doesn't assert when there's too few arguments, which causes problems for plural forms. Closes #1733.
2014-05-29 17:28:37 +02:00
if (wxYES == wxMessageBox(fmt_tl("There is already a style with the name \"%s\" in the current script. Overwrite?", styleName), _("Style name collision"), wxYES_NO)) {
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
*style = *Store[selections[i]];
copied.push_back(styleName);
Rewrote code for copying styles to and from storages, making it correctly replace styles of the same name that already exist in the target. Updates #922. Originally committed to SVN as r3160.
2009-07-18 04:52:46 +02:00
}
Style name collisions (when moving from storage, creating or renaming) will now prompt the user before performing the action. Originally committed to SVN as r568.
2006-12-17 21:30:59 +01:00
}
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
else {
Split AssFile into separate lists for each section
2014-03-07 18:02:24 +01:00
c->ass->Styles.push_back(*new AssStyle(*Store[selections[i]]));
Make the style manager dialog select the new styles when copying styles between the current script and storage, and fix a few cases where buttons were incorrectly enabled or disabled. Updates #1186. Originally committed to SVN as r4244.
2010-04-24 23:48:06 +02:00
copied.push_back(styleName);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
c->ass->Commit(_("style copy"), AssFile::COMMIT_STYLES);
Rework handling of copied styles in the style manager a bit Generate the new name in the style manager rather than the editor so that the naming scheme of copies is consistent between the Copy buttons and pasting styles. Name the second copy of style X "X - Copy (2)" rather than "X - Copy - Copy", and so on for further copies. (Copies of style "X - Copy" would still be named "X - Copy - Copy"). Select the new style when a copy is created. Originally committed to SVN as r6536.
2012-03-07 23:40:15 +01:00
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
CurrentList->DeselectAll();
Kill config.h and just force-include acconf.h in non-pch builds
2014-04-16 04:33:37 +02:00
for (auto const& style_name : copied)
Use range-based for loops in a bunch of places
2012-11-04 04:53:03 +01:00
CurrentList->SetStringSelection(style_name, true);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
UpdateButtons();
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
template<class T>
void DialogStyleManager::CopyToClipboard(wxListBox *list, T const& v) {
Added copy+paste to style manager, ctrl+c/v only (so far, anyway) Originally committed to SVN as r925.
2007-02-06 04:25:14 +01:00
wxArrayInt selections;
list->GetSelections(selections);
Eliminate a pointless roundtrip through wxString when copying styles to the clipboard
2013-08-09 05:18:12 +02:00
std::string data;
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
for(size_t i = 0; i < selections.size(); ++i) {
if (i) data += "\r\n";
AssStyle *s = v[selections[i]];
Added copy+paste to style manager, ctrl+c/v only (so far, anyway) Originally committed to SVN as r925.
2007-02-06 04:25:14 +01:00
s->UpdateData();
Eliminate a pointless roundtrip through wxString when copying styles to the clipboard
2013-08-09 05:18:12 +02:00
data += s->GetEntryData();
Added copy+paste to style manager, ctrl+c/v only (so far, anyway) Originally committed to SVN as r925.
2007-02-06 04:25:14 +01:00
}
Factor out a bunch of duplicated code for clipboard stuff
2012-10-25 17:13:13 +02:00
SetClipboard(data);
Added copy+paste to style manager, ctrl+c/v only (so far, anyway) Originally committed to SVN as r925.
2007-02-06 04:25:14 +01:00
}
Note: This was done using a script! it's far from perfect but 95% of the work has been done already formatting-wise. Document all functions, class, struct, union, enum, macro, variable, typedefs. This isn't the actual document in itself but empty documentation using any old documentation if it was there. This was done using exuberant ctags to get tag info, then a TCL script to parse/remove old comments and convert them into Doxygen-style. Some notes: * Anything labeled 'DOCME' needs to be documented, @param and @return have been left blank as it would be annoying to delete the 'DOCME' from every one of those. * Some multiline comments may have been munged into single line comments * Leave the /// comments above global variables with a space, if they're harder to read then we'll be less likey to use them. * Enum comments can go after the enumeration itself '[value] /// comment' * include/aegisub/*.h haven't been converted yet, this will be done in a later commit * Some documentation blocks are in the wrong place, in the .h when it should be in the .cpp, or vice versa. See http://devel.aegisub.org/wiki/Doxygen for some details on Doxygen and a 'style guide'. Originally committed to SVN as r3312.
2009-07-30 00:59:22 +02:00
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
void DialogStyleManager::PasteToCurrent() {
add_styles(
Pull some of the context (de)init out of FrameMain And actually do deinitialize more of the stuff in the context.
2014-03-25 22:49:26 +01:00
[=](std::string const& str) { return c->ass->GetStyle(str); },
Split AssFile into separate lists for each section
2014-03-07 18:02:24 +01:00
[=](AssStyle *s) { c->ass->Styles.push_back(*s); });
Added copy+paste to style manager, ctrl+c/v only (so far, anyway) Originally committed to SVN as r925.
2007-02-06 04:25:14 +01:00
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
c->ass->Commit(_("style paste"), AssFile::COMMIT_STYLES);
}
Needed to call updatedata when changing style name. Also, add some error handling to pasting styles. Originally committed to SVN as r1551.
2007-09-02 21:31:17 +02:00
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
void DialogStyleManager::PasteToStorage() {
add_styles(
Eliminate some uses of std::bind
2014-03-26 18:36:34 +01:00
[=](std::string const& str) { return Store.GetStyle(str); },
Use unique_ptr for most non-wx owning pointers
2013-06-08 06:19:40 +02:00
[=](AssStyle *s) { Store.push_back(std::unique_ptr<AssStyle>(s)); });
Needed to call updatedata when changing style name. Also, add some error handling to pasting styles. Originally committed to SVN as r1551.
2007-09-02 21:31:17 +02:00
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
UpdateStorage();
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
StorageList->SetStringSelection(to_wx(Store.back()->name));
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
UpdateButtons();
Added copy+paste to style manager, ctrl+c/v only (so far, anyway) Originally committed to SVN as r925.
2007-02-06 04:25:14 +01:00
}
Note: This was done using a script! it's far from perfect but 95% of the work has been done already formatting-wise. Document all functions, class, struct, union, enum, macro, variable, typedefs. This isn't the actual document in itself but empty documentation using any old documentation if it was there. This was done using exuberant ctags to get tag info, then a TCL script to parse/remove old comments and convert them into Doxygen-style. Some notes: * Anything labeled 'DOCME' needs to be documented, @param and @return have been left blank as it would be annoying to delete the 'DOCME' from every one of those. * Some multiline comments may have been munged into single line comments * Leave the /// comments above global variables with a space, if they're harder to read then we'll be less likey to use them. * Enum comments can go after the enumeration itself '[value] /// comment' * include/aegisub/*.h haven't been converted yet, this will be done in a later commit * Some documentation blocks are in the wrong place, in the .h when it should be in the .cpp, or vice versa. See http://devel.aegisub.org/wiki/Doxygen for some details on Doxygen and a 'style guide'. Originally committed to SVN as r3312.
2009-07-30 00:59:22 +02:00
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
void DialogStyleManager::ShowStorageEditor(AssStyle *style, std::string const& new_name) {
Prefetch the list of fonts for the style editor dialog On my machine (with ~5000 fonts installed), enumerating the installed fonts was about 75% of the total construction time of the style editor dialog.
2013-07-08 23:43:43 +02:00
DialogStyleEditor editor(this, style, c, &Store, new_name, font_list.get());
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
if (editor.ShowModal()) {
UpdateStorage();
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
StorageList->SetStringSelection(to_wx(editor.GetStyleName()));
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
UpdateButtons();
}
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
void DialogStyleManager::OnStorageNew() {
Prefetch the list of fonts for the style editor dialog On my machine (with ~5000 fonts installed), enumerating the installed fonts was about 75% of the total construction time of the style editor dialog.
2013-07-08 23:43:43 +02:00
ShowStorageEditor(nullptr);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
void DialogStyleManager::OnStorageEdit() {
int sel = get_single_sel(StorageList);
if (sel == -1) return;
ShowStorageEditor(Store[sel]);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
void DialogStyleManager::OnStorageCopy() {
int sel = get_single_sel(StorageList);
if (sel == -1) return;
Eliminate some uses of std::bind
2014-03-26 18:36:34 +01:00
ShowStorageEditor(Store[sel], unique_name(
[=](std::string const& str) { return Store.GetStyle(str); }, Store[sel]->name));
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
}
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
void DialogStyleManager::OnStorageDelete() {
wxArrayInt selections;
int n = StorageList->GetSelections(selections);
if (confirm_delete(n, this, _("Confirm delete from storage")) == wxYES) {
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
for (int i = 0; i < n; i++)
Store.Delete(selections[i] - i);
UpdateStorage();
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
}
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
void DialogStyleManager::ShowCurrentEditor(AssStyle *style, std::string const& new_name) {
Prefetch the list of fonts for the style editor dialog On my machine (with ~5000 fonts installed), enumerating the installed fonts was about 75% of the total construction time of the style editor dialog.
2013-07-08 23:43:43 +02:00
DialogStyleEditor editor(this, style, c, nullptr, new_name, font_list.get());
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
if (editor.ShowModal()) {
CurrentList->DeselectAll();
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
CurrentList->SetStringSelection(to_wx(editor.GetStyleName()));
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
UpdateButtons();
}
}
void DialogStyleManager::OnCurrentNew() {
Prefetch the list of fonts for the style editor dialog On my machine (with ~5000 fonts installed), enumerating the installed fonts was about 75% of the total construction time of the style editor dialog.
2013-07-08 23:43:43 +02:00
ShowCurrentEditor(nullptr);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
}
void DialogStyleManager::OnCurrentEdit() {
int sel = get_single_sel(CurrentList);
if (sel == -1) return;
ShowCurrentEditor(styleMap[sel]);
}
void DialogStyleManager::OnCurrentCopy() {
int sel = get_single_sel(CurrentList);
if (sel == -1) return;
Pull some of the context (de)init out of FrameMain And actually do deinitialize more of the stuff in the context.
2014-03-25 22:49:26 +01:00
ShowCurrentEditor(styleMap[sel], unique_name(
[=](std::string const& str) { return c->ass->GetStyle(str); },
styleMap[sel]->name));
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
void DialogStyleManager::OnCurrentDelete() {
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
wxArrayInt selections;
int n = CurrentList->GetSelections(selections);
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
if (confirm_delete(n, this, _("Confirm delete from current")) == wxYES) {
Convert AssFile::Line to an intrusive list Gives O(1) pointer -> iterator conversions, better memory usage, better performance, and overall slightly simplifies the code using it.
2012-10-12 19:16:39 +02:00
for (int i = 0; i < n; i++) {
delete styleMap.at(selections[i]);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Refine the commit types Switch to a bitmask with much more finely-grained information about what changed in the commit, fixing a few potential correctness problems and significantly improving the performance of several scenarios where commits are spammed very frequently. Originally committed to SVN as r5590.
2011-09-15 07:16:32 +02:00
c->ass->Commit(_("style delete"), AssFile::COMMIT_STYLES);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
void DialogStyleManager::OnCurrentImport() {
Extract some duplicated wxFileSelector code to a helper function
2013-01-22 05:27:56 +01:00
auto filename = OpenFileSelector(_("Open subtitles file"), "Path/Last/Subtitles", "", "", SubtitleFormat::GetWildcards(0), this);
if (filename.empty()) return;
Added an "Import from script..." button to Styles Manager, to import styles directly from other subtitle files. Originally committed to SVN as r625.
2006-12-26 05:48:53 +01:00
Fix importing styles from files in non-local charsets (i.e. hopefully all of them)
2013-06-09 16:53:07 +02:00
std::string charset;
try {
charset = CharSetDetect::GetEncoding(filename);
}
catch (agi::UserCancelException const&) {
return;
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
AssFile temp;
try {
Pass the detected or chosen charset to SubtitleFormat::CanReadFile The MicroDVD format needs it since it also probes the file contents.
2013-10-05 15:58:15 +02:00
auto reader = SubtitleFormat::GetReader(filename, charset);
Extract Loading/Saving/Undo stuff from AssFile Add SubsController, which deals with things like what subtitle file is currently open, rather than the contents of the current subtitle file. Move the rest of the relevant logic from FrameMain there in addition to all of the stuff from AssFile.
2013-01-26 02:57:46 +01:00
if (!reader)
wxMessageBox("Unsupported subtitle format", "Error", wxOK | wxICON_ERROR | wxCENTER, this);
else
Kill VideoContext::Get()
2014-03-26 16:14:08 +01:00
reader->ReadFile(&temp, filename, 0, charset);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
}
Get wxMessageBox out of AssFile
2012-10-12 05:18:47 +02:00
catch (agi::Exception const& err) {
Remove a bunch of unused functionalty from agi::Exception
2014-05-29 14:57:27 +02:00
wxMessageBox(to_wx(err.GetMessage()), "Error", wxOK | wxICON_ERROR | wxCENTER, this);
Get wxMessageBox out of AssFile
2012-10-12 05:18:47 +02:00
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
catch (...) {
Get wxMessageBox out of AssFile
2012-10-12 05:18:47 +02:00
wxMessageBox("Unknown error", "Error", wxOK | wxICON_ERROR | wxCENTER, this);
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
return;
}
Added an "Import from script..." button to Styles Manager, to import styles directly from other subtitle files. Originally committed to SVN as r625.
2006-12-26 05:48:53 +01:00
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
// Get styles
Extract some duplicated wxFileSelector code to a helper function
2013-01-22 05:27:56 +01:00
auto styles = temp.GetStyles();
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
if (styles.empty()) {
wxMessageBox(_("The selected file has no available styles."), _("Error Importing Styles"));
return;
}
Added an "Import from script..." button to Styles Manager, to import styles directly from other subtitle files. Originally committed to SVN as r625.
2006-12-26 05:48:53 +01:00
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
// Get selection
wxArrayInt selections;
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
int res = GetSelectedChoices(this, selections, _("Choose styles to import:"), _("Import Styles"), to_wx(styles));
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
if (res == -1 || selections.empty()) return;
bool modified = false;
// Loop through selection
Use range-based for loops in a bunch of places
2012-11-04 04:53:03 +01:00
for (auto const& sel : selections) {
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
// Check if there is already a style with that name
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
if (AssStyle *existing = c->ass->GetStyle(styles[sel])) {
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
int answer = wxMessageBox(
Replace wxString::Format with agi::format It's modestly faster, significantly more type-safe, and doesn't assert when there's too few arguments, which causes problems for plural forms. Closes #1733.
2014-05-29 17:28:37 +02:00
fmt_tl("There is already a style with the name \"%s\" in the current script. Overwrite?", styles[sel]),
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
_("Style name collision"),
wxYES_NO);
if (answer == wxYES) {
Added an "Import from script..." button to Styles Manager, to import styles directly from other subtitle files. Originally committed to SVN as r625.
2006-12-26 05:48:53 +01:00
modified = true;
Partially de-wxify AssStyle
2012-12-30 01:32:36 +01:00
*existing = *temp.GetStyle(styles[sel]);
Added an "Import from script..." button to Styles Manager, to import styles directly from other subtitle files. Originally committed to SVN as r625.
2006-12-26 05:48:53 +01:00
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
continue;
Added an "Import from script..." button to Styles Manager, to import styles directly from other subtitle files. Originally committed to SVN as r625.
2006-12-26 05:48:53 +01:00
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
// Copy
modified = true;
Remove AssEntry::Clone
2014-03-08 01:44:49 +01:00
c->ass->Styles.push_back(*new AssStyle(*temp.GetStyle(styles[sel])));
Added an "Import from script..." button to Styles Manager, to import styles directly from other subtitle files. Originally committed to SVN as r625.
2006-12-26 05:48:53 +01:00
}
Refactor New/Copy/Edit in the style manager a bit and do a better job of selecting the right style in the lists Originally committed to SVN as r6546.
2012-03-08 05:17:36 +01:00
// Update
if (modified)
c->ass->Commit(_("style import"), AssFile::COMMIT_STYLES);
Added an "Import from script..." button to Styles Manager, to import styles directly from other subtitle files. Originally committed to SVN as r625.
2006-12-26 05:48:53 +01:00
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
void DialogStyleManager::UpdateButtons() {
Ensure that there is always at least one style catalog existing and selected so that the style manager doesn't have to check if there is one Originally committed to SVN as r6543.
2012-03-08 05:17:17 +01:00
CatalogDelete->Enable(CatalogList->GetCount() > 1);
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
// Get storage selection
wxArrayInt sels;
int n = StorageList->GetSelections(sels);
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
StorageEdit->Enable(n == 1);
StorageCopy->Enable(n == 1);
StorageDelete->Enable(n > 0);
MoveToLocal->Enable(n > 0);
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
int firstStor = -1;
int lastStor = -1;
if (n) {
firstStor = sels[0];
lastStor = sels[n-1];
}
Forced move buttons to only work on continuous selection Originally committed to SVN as r630.
2006-12-26 23:02:17 +01:00
// Check if selection is continuous
bool contStor = true;
Make the style manager dialog select the new styles when copying styles between the current script and storage, and fix a few cases where buttons were incorrectly enabled or disabled. Updates #1186. Originally committed to SVN as r4244.
2010-04-24 23:48:06 +02:00
for (int i = 1; i < n; ++i) {
if (sels[i] != sels[i-1]+1) {
contStor = false;
break;
Forced move buttons to only work on continuous selection Originally committed to SVN as r630.
2006-12-26 23:02:17 +01:00
}
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
int itemsStor = StorageList->GetCount();
StorageMoveUp->Enable(contStor && firstStor > 0);
StorageMoveTop->Enable(contStor && firstStor > 0);
StorageMoveDown->Enable(contStor && lastStor != -1 && lastStor < itemsStor-1);
StorageMoveBottom->Enable(contStor && lastStor != -1 && lastStor < itemsStor-1);
StorageSort->Enable(itemsStor > 1);
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
// Get current selection
n = CurrentList->GetSelections(sels);
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
CurrentEdit->Enable(n == 1);
CurrentCopy->Enable(n == 1);
CurrentDelete->Enable(n > 0);
MoveToStorage->Enable(n > 0);
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
int firstCurr = -1;
int lastCurr = -1;
if (n) {
firstCurr = sels[0];
lastCurr = sels[n-1];
}
Forced move buttons to only work on continuous selection Originally committed to SVN as r630.
2006-12-26 23:02:17 +01:00
// Check if selection is continuous
bool contCurr = true;
Make the style manager dialog select the new styles when copying styles between the current script and storage, and fix a few cases where buttons were incorrectly enabled or disabled. Updates #1186. Originally committed to SVN as r4244.
2010-04-24 23:48:06 +02:00
for (int i = 1; i < n; ++i) {
if (sels[i] != sels[i-1]+1) {
contCurr = false;
break;
Forced move buttons to only work on continuous selection Originally committed to SVN as r630.
2006-12-26 23:02:17 +01:00
}
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
int itemsCurr = CurrentList->GetCount();
Forced move buttons to only work on continuous selection Originally committed to SVN as r630.
2006-12-26 23:02:17 +01:00
CurrentMoveUp->Enable(contCurr && firstCurr > 0);
CurrentMoveTop->Enable(contCurr && firstCurr > 0);
CurrentMoveDown->Enable(contCurr && lastCurr != -1 && lastCurr < itemsCurr-1);
CurrentMoveBottom->Enable(contCurr && lastCurr != -1 && lastCurr < itemsCurr-1);
Added sorting functionality to Styles Manager, for both storage and current script. Originally committed to SVN as r631.
2006-12-26 23:28:44 +01:00
CurrentSort->Enable(itemsCurr > 1);
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
}
Use unique_ptr for most non-wx owning pointers
2013-06-08 06:19:40 +02:00
struct cmp_name {
template<typename T>
bool operator()(T const& lft, T const& rgt) const { return lft->name < rgt->name; }
};
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
template<class Cont>
static void do_move(Cont& styls, int type, int& first, int& last, bool storage) {
Replace most uses of type::iterator with auto
2012-12-23 00:35:13 +01:00
auto begin = styls.begin();
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
// Move up
if (type == 0) {
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
if (first == 0) return;
rotate(begin + first - 1, begin + first, begin + last + 1);
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
first--;
last--;
}
// Move to top
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
else if (type == 1) {
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
rotate(begin, begin + first, begin + last + 1);
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
last = last - first;
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
first = 0;
}
// Move down
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
else if (type == 2) {
Fix gcc compilation errors Originally committed to SVN as r6554.
2012-03-09 01:23:53 +01:00
if (last + 1 == (int)styls.size()) return;
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
rotate(begin + first, begin + last + 1, begin + last + 2);
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
first++;
last++;
}
// Move to bottom
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
else if (type == 3) {
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
rotate(begin + first, begin + last + 1, styls.end());
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
first = styls.size() - (last - first + 1);
last = styls.size() - 1;
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
}
Added sorting functionality to Styles Manager, for both storage and current script. Originally committed to SVN as r631.
2006-12-26 23:28:44 +01:00
// Sort
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
else if (type == 4) {
Added sorting functionality to Styles Manager, for both storage and current script. Originally committed to SVN as r631.
2006-12-26 23:28:44 +01:00
// Get confirmation
if (storage) {
Center most of the message boxes over their parent windows Originally committed to SVN as r6629.
2012-03-29 01:59:19 +02:00
int res = wxMessageBox(_("Are you sure? This cannot be undone!"), _("Sort styles"), wxYES_NO | wxCENTER);
Added sorting functionality to Styles Manager, for both storage and current script. Originally committed to SVN as r631.
2006-12-26 23:28:44 +01:00
if (res == wxNO) return;
}
Use unique_ptr for most non-wx owning pointers
2013-06-08 06:19:40 +02:00
sort(styls.begin(), styls.end(), cmp_name());
Added sorting functionality to Styles Manager, for both storage and current script. Originally committed to SVN as r631.
2006-12-26 23:28:44 +01:00
first = 0;
last = 0;
}
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
}
void DialogStyleManager::MoveStyles(bool storage, int type) {
wxListBox *list = storage ? StorageList : CurrentList;
// Get selection
wxArrayInt sels;
int n = list->GetSelections(sels);
if (n == 0 && type != 4) return;
Fix crash when clicking the sort button in the style manager with no styles selected Originally committed to SVN as r6628.
2012-03-29 01:59:10 +02:00
int first = 0, last = 0;
if (n) {
first = sels.front();
last = sels.back();
}
Added sorting functionality to Styles Manager, for both storage and current script. Originally committed to SVN as r631.
2006-12-26 23:28:44 +01:00
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
if (storage) {
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
do_move(Store, type, first, last, true);
UpdateStorage();
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
}
else {
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
do_move(styleMap, type, first, last, false);
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
// Replace styles
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
size_t curn = 0;
Split AssFile into separate lists for each section
2014-03-07 18:02:24 +01:00
for (auto it = c->ass->Styles.begin(); it != c->ass->Styles.end(); ++it) {
auto new_style_at_pos = c->ass->Styles.iterator_to(*styleMap[curn]);
Make the entry lists be of the appropriate type rather than just AssEntry Eliminates a bajillion dynamic casts.
2014-03-07 19:58:51 +01:00
EntryList<AssStyle>::node_algorithms::swap_nodes(it.pointed_node(), new_style_at_pos.pointed_node());
Fix crash when rearranging styles in the style manager Inserting lines already in an intrusive list at a different position does not work, unlike with unintrusive lists. Instead, swap each item in to the correct place.
2012-11-21 16:32:04 +01:00
if (++curn == styleMap.size()) break;
it = new_style_at_pos;
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
}
Refine the commit types Switch to a bitmask with much more finely-grained information about what changed in the commit, fixing a few potential correctness problems and significantly improving the performance of several scenarios where commits are spammed very frequently. Originally committed to SVN as r5590.
2011-09-15 07:16:32 +02:00
c->ass->Commit(_("style move"), AssFile::COMMIT_STYLES);
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
}
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
for (int i = 0 ; i < (int)list->GetCount(); ++i) {
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
if (i < first || i > last)
list->Deselect(i);
else
list->Select(i);
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
}
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
UpdateButtons();
Added buttons to Styles Manager to move styles up, down, to top or to bottom, on both storage and current script. Originally committed to SVN as r629.
2006-12-26 22:45:23 +01:00
}
Added keyboard shortcuts escape and delete to style manager Originally committed to SVN as r924.
2007-02-05 20:09:45 +01:00
void DialogStyleManager::OnKeyDown(wxKeyEvent &event) {
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
wxWindow *focus = wxWindow::FindFocus();
Added keyboard shortcuts escape and delete to style manager Originally committed to SVN as r924.
2007-02-05 20:09:45 +01:00
switch(event.GetKeyCode()) {
case WXK_DELETE :
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
if (focus == StorageList)
OnStorageDelete();
else if (focus == CurrentList)
OnCurrentDelete();
Added keyboard shortcuts escape and delete to style manager Originally committed to SVN as r924.
2007-02-05 20:09:45 +01:00
break;
Added copy+paste to style manager, ctrl+c/v only (so far, anyway) Originally committed to SVN as r925.
2007-02-06 04:25:14 +01:00
case 'C' :
case 'c' :
Change more places to check for Cmd key on Mac rather than Ctrl key. Originally committed to SVN as r1574.
2007-09-22 00:56:44 +02:00
if (event.CmdDown()) {
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
if (focus == StorageList)
Move more of the style storage management logic to AssStyleStorage Originally committed to SVN as r6545.
2012-03-08 05:17:29 +01:00
CopyToClipboard(StorageList, Store);
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
else if (focus == CurrentList)
CopyToClipboard(CurrentList, styleMap);
Added copy+paste to style manager, ctrl+c/v only (so far, anyway) Originally committed to SVN as r925.
2007-02-06 04:25:14 +01:00
}
break;
case 'V' :
case 'v' :
Change more places to check for Cmd key on Mac rather than Ctrl key. Originally committed to SVN as r1574.
2007-09-22 00:56:44 +02:00
if (event.CmdDown()) {
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
if (focus == StorageList)
Added copy+paste to style manager, ctrl+c/v only (so far, anyway) Originally committed to SVN as r925.
2007-02-06 04:25:14 +01:00
PasteToStorage();
Clean up DialogStyleManager a bit, eliminating a decent amount of duplicated code and fixing issues with the logic for enabling and disabling the buttons. Originally committed to SVN as r6416.
2012-02-01 01:48:50 +01:00
else if (focus == CurrentList)
PasteToCurrent();
Added copy+paste to style manager, ctrl+c/v only (so far, anyway) Originally committed to SVN as r925.
2007-02-06 04:25:14 +01:00
}
Skip unprocessed key events in the style manager Originally committed to SVN as r6414.
2012-02-01 01:48:33 +01:00
break;
default:
event.Skip();
Added copy+paste to style manager, ctrl+c/v only (so far, anyway) Originally committed to SVN as r925.
2007-02-06 04:25:14 +01:00
break;
Added keyboard shortcuts escape and delete to style manager Originally committed to SVN as r924.
2007-02-05 20:09:45 +01:00
}
}
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
}
void ShowStyleManagerDialog(agi::Context *c) {
c->dialog->Show<DialogStyleManager>(c);
}