13 Commits

Author	SHA1	Message	Date
Thomas Goyne	dd38e1f07f	Don't swallow errors when parsing json and make agi::json_util::file actually work ... Originally committed to SVN as r5507.	2011-07-26 19:52:47 +00:00
Thomas Goyne	dabcdb2e8b	Uninvert hotkey::Scan's return value ... Originally committed to SVN as r5506.	2011-07-26 19:52:36 +00:00
Thomas Goyne	ffe8c7a5d6	Only enable the 'Always' hotkey context when medusa mode is on ... Originally committed to SVN as r5505.	2011-07-26 19:52:25 +00:00
Thomas Goyne	7deebf759b	Remove the concept of disabled hotkeys; it's unnessesary and wasn't actually used ... Originally committed to SVN as r5504.	2011-07-26 19:52:15 +00:00
Thomas Goyne	a8a30d6ac1	Fix hotkey memory leaks ... Originally committed to SVN as r5472.	2011-07-15 17:36:06 +00:00
Thomas Goyne	3f9bead41a	Use the tr1 version of <tuple> when building with gcc ... Originally committed to SVN as r5235.	2011-01-18 00:29:40 +00:00
Thomas Goyne	04a4c074b0	Add function to get the string representation of the hotkeys for a command, use it when generating the menu ... Originally committed to SVN as r5230.	2011-01-17 23:53:46 +00:00
Thomas Goyne	cd4b032c25	Make agi::hotkey::Scan const ... Originally committed to SVN as r5229.	2011-01-17 23:53:38 +00:00
Thomas Goyne	403d465475	Fix hotkeys with non-alphanumeric keys other than back, return, escape, space and delete ... Originally committed to SVN as r5217.	2011-01-16 07:17:53 +00:00
Amar Takhar	319ac2d4bb	Catch all exceptions when deciding whether to load the default config. ... Originally committed to SVN as r5136.	2011-01-08 12:13:24 +00:00
Amar Takhar	0d7b2c6e76	Add missing headers when not using precompiled header support. Some minor formatting in libaegisub/common/hotkey.cpp. ... Originally committed to SVN as r5135.	2011-01-08 12:10:40 +00:00
Thomas Goyne	e450cb3e7e	Fix include paths ... Originally committed to SVN as r5132.	2011-01-05 18:40:37 +00:00
Amar Takhar	167f09a610	Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258. ... Originally committed to SVN as r5126.	2011-01-05 13:00:46 +00:00