mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
6212 commits 10 branches 31 tags 48 MiB
Commit graph

61 commits

Author SHA1 Message Date
Thomas Goyne
1d020b851e Add picked colors to the recently used colors 2012-11-25 16:47:39 -08:00
Thomas Goyne
a4311b50f7 Update the correct inputs when typing in the HTML box in the color picker 2012-11-24 10:04:53 -08:00
Thomas Goyne
ded55272a0 Use the correct format for ASS colors in the color picker 2012-11-24 10:04:53 -08:00
Thomas Goyne
67df64e879 Use range-based for loops in a bunch of places 2012-11-12 18:35:25 -08:00
Thomas Goyne
0893ed3f0a Remove references to tr1 2012-11-10 18:05:57 -08:00
Thomas Goyne
ea5428b65f Replace AssColor with agi::Color 
Add agi::Color, and replace AssColor and all uses of wxColor that are
not immediately passed to/from wx with it.
 2012-11-10 18:05:56 -08:00
Thomas Goyne
e44c47c863 Remove $Id$ markers since git doesn't support them 2012-10-25 17:39:49 -07:00
Thomas Goyne
c7fd04a739 Rename ASS -> Ass in symbol names 
Most types and functions used Ass, but a decent number used ASS, so make
them consistent.
 2012-10-16 09:52:19 -07:00
Thomas Goyne
1b68790c4b Convert the subs edit box buttons to commands 
This makes they hotkeyable and extracts a large chunk of logic from the
giant mess that is SubsEditBox.
 2012-10-12 14:54:08 -07:00
Thomas Goyne
87370eb9c0 Fix crash when clicking in the screen dropper area on Windows 
Originally committed to SVN as r6910.
 2012-06-17 20:22:38 +00:00
Thomas Goyne
2db20778fc Mostly rewrite the screen dropper code 
Eliminate a lot of the platform-specific code by just using the portable
versions everywhere, and use CoreGraphics rather than wxScreenDC to grab
an image of the screen on OS X as wxScreenDC doesn't actually work on
10.6+.

Originally committed to SVN as r6898.
 2012-06-12 03:13:55 +00:00
Thomas Goyne
5b9ba0205a Always use change_value for setting spin ctrls in the color picker 
With wxCocoa the change events from SetValue are processed immediately,
resulting in significant breakage as in some cases multiple spin
controls need to be set at once. Even on other platforms where things
appeared to work due to the change notifications being delayed, they
still didn't do anything useful and slowed updates down slightly.

Originally committed to SVN as r6787.
 2012-05-15 13:39:45 +00:00
Thomas Goyne
ad64e8e48a Remove hardcoded widths for the labels in the color picker 
This results in the controls being slightly misaligned, but that's not
as bad as truncating the labels.

Originally committed to SVN as r6786.
 2012-05-15 13:39:40 +00:00
Thomas Goyne
a97c7fa1f6 Fix infinite loop when changing the color in the color picker on OS X 
Originally committed to SVN as r6785.
 2012-05-15 13:39:35 +00:00
Thomas Goyne
75305877f0 Set the initial values of the color picker before binding events 
Originally committed to SVN as r6784.
 2012-05-15 13:39:30 +00:00
Thomas Goyne
db69fdbbcd Vertically center the labels in the color picker dialog. Closes #1467. 
Originally committed to SVN as r6672.
 2012-04-06 15:51:14 +00:00
Thomas Goyne
309bc35af3 Don't accept keyboard focus in the color picker controls which can't be used via the keyboard. Updates #1467. 
Originally committed to SVN as r6671.
 2012-04-06 15:51:07 +00:00
Thomas Goyne
07eb718fa1 Rearrange control creation in the color picker dialog to get a less weird tab order. Updates #1467. 
Originally committed to SVN as r6670.
 2012-04-06 15:51:00 +00:00
Thomas Goyne
0d4846d012 Handle the cancel button in the color picker dialog better 
Return wxNullColor rather than the original color on cancel so that the
calling code can actually tell if it was cancelled.

If one of the subs edit box color buttons is cancelled, undo the changes
made rather than restoring the original text of the active line. This
makes the cancel button actually work with multiple lines selected, and
eliminates some undo state noise.

Closes #1465.

Originally committed to SVN as r6663.
 2012-04-06 01:55:14 +00:00
Thomas Goyne
4bb707d663 Use "color" in all UI strings 
Previously there were 29 instances of "color" and 9 of "colour".

Originally committed to SVN as r6648.
 2012-04-03 17:38:50 +00:00
Thomas Goyne
bb9859c70f Fix crash when selecting pure black in the color picker when the recent colors list isn't full 
Originally committed to SVN as r6534.
 2012-03-07 01:31:04 +00:00
Thomas Goyne
c2d3c910c7 Replace some uses of "" with wxString() 
Despite special-casing zero-length input, wxString("") takes over four
times as long as wxString() - and on a 10k line script, this change cuts
AssFile's copy constructor's runtime in half.

Originally committed to SVN as r6401.
 2012-01-31 00:44:43 +00:00
Thomas Goyne
eaa1001d7a Don't mark help button page names as translatable 
Originally committed to SVN as r6210.
 2012-01-08 01:05:07 +00:00
Thomas Goyne
7adbe07b4e Silence a bunch of PREFast warnings 
Originally committed to SVN as r6162.
 2011-12-26 22:20:49 +00:00
Thomas Goyne
d02cf5c99f Handle wxMouseCaptureLostEvent in the color picker 
Originally committed to SVN as r6108.
 2011-12-22 21:26:30 +00:00
Thomas Goyne
34a87b1c1e Silence a pile of /W4 warnings 
Originally committed to SVN as r6001.
 2011-12-22 21:09:31 +00:00
Thomas Goyne
374a43cd8b Simplify and speed up the hsl and hsv slider creation code in the color picker dialog 
Originally committed to SVN as r5766.
 2011-10-24 20:17:30 +00:00
Thomas Goyne
2f43ef2fca Clean up the color picker dialog somewhat 
Originally committed to SVN as r5744.
 2011-10-17 17:52:49 +00:00
Thomas Goyne
04e385b4d5 Fix potential crash when opening the colorpicker dialog caused by use of an uninitialized variable 
Originally committed to SVN as r5743.
 2011-10-17 17:52:40 +00:00
Thomas Goyne
d990bbbb99 Eliminate all unnecessary uses of L and _T 
Originally committed to SVN as r5611.
 2011-09-28 19:43:11 +00:00
Thomas Goyne
d3ab35a61f Use PersistLocation for DialogColorPicker 
Originally committed to SVN as r5521.
 2011-07-27 05:36:30 +00:00
Amar Takhar
f576bf912a Add missing headers. 
Originally committed to SVN as r5171.
 2011-01-11 17:22:44 +00:00
Thomas Goyne
9083776b9c Update the color spectrum view when a recently used color is selected in the color picker 
Originally committed to SVN as r4815.
 2010-10-16 20:11:48 +00:00
Thomas Goyne
069581b9be Make the preferences dialog actually update the configuration 
Originally committed to SVN as r4761.
 2010-08-26 18:38:20 +00:00
Thomas Goyne
3f954dadcc Merge OS X color picker fixes in r3996 and r3997 from 2.1.8. Closes #1114. 
Originally committed to SVN as r4724.
 2010-08-03 02:16:26 +00:00
Thomas Goyne
4a8abae3a3 Kill options.h and options.cpp, which have been empty for a while 
Originally committed to SVN as r4676.
 2010-07-12 21:49:48 +00:00
Thomas Goyne
6830fbe1ba Fix bug where the color spectrum sometimes would not repaint when it changed 
Originally committed to SVN as r4546.
 2010-06-18 07:14:11 +00:00
Thomas Goyne
72cbf4939f Fix flickering in color picker 
Originally committed to SVN as r4476.
 2010-06-11 02:25:23 +00:00
Thomas Goyne
c290b6b811 Silence some prefast warnings 
Originally committed to SVN as r4472.
 2010-06-11 02:24:59 +00:00
Thomas Goyne
d278c99652 Make the color picker dialog update the color instantly when used from the style editor, rather than waiting for the dialog to be closed, and revert if the dialog is cancelled. Updates #355. 
Originally committed to SVN as r4469.
 2010-06-09 08:14:50 +00:00
Amar Takhar
40e12403d5 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 01:13:36 +00:00
Thomas Goyne
624df412ea Kill the horrifying PrettyFloat function and just use g instead of f everywhere it was used. 
Originally committed to SVN as r4280.
 2010-05-13 18:41:46 +00:00
Amar Takhar
e76cfae9bb Merge r3974: asserts in colour picker dialog. 
Originally committed to SVN as r4015.
 2010-01-20 22:49:26 +00:00
Grigori Goronzy
6006fb5bba Redirect mouse events from the color picker dialog to the dropper icon 
to make the color dropper work on Unix/GTK. OS X still needs fixes.

Originally committed to SVN as r3975.
 2010-01-12 03:19:49 +00:00
harukalover
3c2997e906 Fixed a crash that would occur if the mouse was left in a captured state after closing and reopening the color picker. Updates #1025 
Originally committed to SVN as r3754.
 2009-11-01 07:28:09 +00:00
Amar Takhar
d348b4e33e 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 13:06:40 +00:00
Amar Takhar
7a8c5229fd * Remove wxprec.h from all files other than agi_pre.h. Including this in various headers is useless as it includes wx.h which includes dozens of 'common' wx headers. With this we're unable to tell which files rely on which interfaces. This commit removes them and manually places in required headers as-needed. 
* Update agi_pre.h to include some missing headers, also move required windowsheaders to the top of the list
 * Use <> versus "" for the wx header in avisynth_wrap.cpp
 * Remove xx/wx.h from agi_pre.h as it's included by wxprec.h.

Originally committed to SVN as r3513.
 2009-09-10 10:26:50 +00:00
Niels Martin Hansen
64c642c142 Revert r3431, it breaks the clipboard on Windows and is in fact also incorrect usage of the primary selection in X11 context. (I have never heard of anyone claiming clipboard usage not working on X11 before.) 
This comment is in `include/wx/clipbrd.h`:
{{{
    // this allows to choose whether we work with CLIPBOARD (default) or
    // PRIMARY selection on X11-based systems
    //
    // on the other ones, working with primary selection does nothing: this
    // allows to write code which sets the primary selection when something is
    // selected without any ill effects (i.e. without overwriting the
    // clipboard which would be wrong on the platforms without X11 PRIMARY)
}}}
Note that it says that primary selection enabled causes the clipboard to do nothing on platforms that have no concept of primary selection, such as Windows and Mac.

On X11 the primary selection should only reflect an active selection of text (or similar) that the user has performed, and the contents of the primary selection buffer will essentially change all the time as the user changes selection. When the user chooses to explicitly copy something to the clipboard (as is the case with Aegisub, the only operation supported by us currently) the data is placed in a less ephemeral buffer which is the actual clipboard, separate from the primary selection, allowing the user to change the primary selection further without affecting the clipboard.

Originally committed to SVN as r3443.
 2009-08-28 21:45:01 +00:00
Amar Takhar
f5a9af6a6c Call wxTheClipboard->UsePrimarySelection(true) when using wxClipboard, without getting into detail clipboard work very differently on X11. Without calling this copying to the clipboard won't work. I've just put it after every use of ->Open, this is safe as in every case Close() is called right after. This will fix clipboard copying on all unices. 
Originally committed to SVN as r3431.
 2009-08-20 02:31:33 +00:00
Thomas Goyne
4eba7657a2 Fix the slider in the color picker for non-GTK platforms. wx2.9 appears to have synchronized the behavior of changing the value of a slider across all platforms to how it behaved on GTK. 
Originally committed to SVN as r3341.
 2009-07-31 23:42:15 +00:00