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

4593 commits

Author SHA1 Message Date
Thomas Goyne
a0c92f83f9 Fix some PVS-Studio warnings 2012-10-12 14:51:30 -07:00
Thomas Goyne
189615bf48 Don't use a full-size subbitmap for icons for no apparent reason 2012-10-12 14:51:30 -07:00
Thomas Goyne
7d2da48ddb Remove config_unix.h since the things it was working around were fixed years ago 2012-10-12 14:51:30 -07:00
Thomas Goyne
e42cbe5cd3 Enable HiDPI on OS X 
Everything but the audio and video displays and toolbar icons just work,
and they're not too hideously ugly.
 2012-10-12 14:51:29 -07:00
Thomas Goyne
fc01b8bafe Delete the freetype fonts collector 
It's pretty horribly broken and fixing it would essentially consist of
rewriting fontconfig.
 2012-10-12 14:51:29 -07:00
Thomas Goyne
2dcbf77e29 Use printf rather than echo -n in autogen.sh 2012-10-12 14:51:29 -07:00
Thomas Goyne
a3ff3e966d Bump version to 3.1 2012-10-12 14:51:29 -07:00
Thomas Goyne
67af44b889 Fix compilation with no audio players enabled 2012-10-12 14:51:29 -07:00
Thomas Goyne
d0a7388581 Remove ifdef checks for header inclusion in audio_player.cpp as the headers themselves have the checks 2012-10-12 14:51:29 -07:00
Thomas Goyne
95a1b7e9b5 Remove AudioPlayer::OpenStream and CloseStream 
Instead, just pass the provider to the constructor and let the player
worry about when to create its things. The ability to explicitly open
and close the playback wasn't actually required for anything, and it
complicated the implementations of the players.
 2012-10-12 14:51:29 -07:00
صفا الفليج
6e90d9498d Add partial Arabic translation. Updates #1532. 2012-10-12 14:44:13 -07:00
Thomas Goyne
79ef194238 Fix compilation error with clang 2012-10-12 14:36:29 -07:00
Yuri
ab47cfa1a5 Update Hungarian translation 2012-10-12 14:11:32 -07:00
doplank
c3f56fe5d7 Update Indonesian translation 2012-10-12 14:11:02 -07:00
Thomas Goyne
863e041d4d Honor the configured MRU limits 
Actually use the limits set in the preferences dialog rather than always
limiting the MRU lists to 16.

Currently only the Find and Replace limits can be set to above 16 due to
how the open recent items commands are implemented.

Closes #1528.
 2012-10-11 10:19:49 -07:00
Thomas Goyne
e5251544ea Don't save separate wavs for each selected line 
Instead, save a single wav spanning the full range of all selected
lines.
 2012-10-11 09:41:25 -07:00
Adam Rambousek
254e7564e1 Update Czech translation 2012-10-10 19:49:10 -07:00
Thomas Goyne
f691335e3b Run the icons through ImageOptim 
Knocks 70 KB off the total size.
 2012-10-10 18:49:19 -07:00
Thomas Goyne
a7bb608a34 Mark Command::Icon as const 2012-10-10 18:48:47 -07:00
Thomas Goyne
50b70f6979 Remove DOCME placeholders from AssDialogue 2012-10-10 18:48:39 -07:00
Thomas Goyne
9009c963e3 Fix rounding errors that resulted in karaoke syllables drifting 2012-10-09 20:40:49 -07:00
Thomas Goyne
004b41f0eb Switch the Duration field back to time mode when video is closed 2012-10-09 20:40:47 -07:00
Thomas Goyne
05e4a237cb Fix a few errors in the German translation. Closes #1523. 2012-10-09 15:37:21 -07:00
Thomas Goyne
2dc7366871 Delete aegisub.desktop on distclean rather than clean since it's generate at configure time 2012-10-09 15:29:13 -07:00
Thomas Goyne
89d7e0a321 Allow framerate transform to/from variable without external timecodes loaded 
This is a potentially sensible operation (to convert from VFR to/from
the video's average FPS), so there's no reason to require that the input
and output timecodes be from different places.

Closes #1530.
 2012-10-09 09:20:35 -07:00
Thomas Goyne
a56bf25d00 Actually load the fontconfig config file in the fonts collector on OS X 2012-10-09 09:20:34 -07:00
Thomas Goyne
f7ff76a251 Set datarootdir 2012-10-09 07:30:27 -07:00
Thomas Goyne
269dd79230 Increase the undo-group-breaking timer to 30 seconds (from 10) 2012-10-09 07:28:16 -07:00
Thomas Goyne
28e041de6f Bump version number in installer to 3.0.2 2012-10-08 14:06:37 -07:00
Thomas Goyne
b44d53c227 Don't install the somewhat out-of-date automation design docs. Updates #1135. 2012-10-08 14:01:05 -07:00
Thomas Goyne
49184f2d0e Honor docdir and localedir configure variables. Updates #1135. 2012-10-08 14:00:45 -07:00
Thomas Goyne
a13d06318b Remove all glu.h includes since no glu functions are ever used. Updates #1511. 2012-10-08 10:21:20 -07:00
Thomas Goyne
db30fdedbd Use the correct option name for reporting the user's UI language 2012-10-07 19:55:26 -07:00
Xabier Aramendi (Azpidatziak)
695de800c3 Update Basque translations. Updates #1499. 2012-10-07 19:28:46 -07:00
Lasse Liehu
7c990ecd7e Update Finnish translation. Updates #1522. 2012-10-07 19:28:36 -07:00
Thomas Goyne
0f90f8a627 Delete svn-revision-base.h 2012-10-07 09:03:44 -07:00
Thomas Goyne
07257e1bb3 Fix non-precomp header compilation 2012-10-06 09:39:44 -07:00
Daniel Mota
4a62073df0 Fix some errors in the Portuguese Translation 2012-10-06 08:46:37 -07:00
Thomas Goyne
846449cb03 Center the audio display when a line is within 5% of an edge as 2.1 did 2012-10-06 08:46:10 -07:00
Thomas Goyne
8d89e8c268 Bump version number in installer to 3.0.1 2012-10-05 08:21:40 -07:00
Thomas Goyne
de862cb6e8 Remove the correct syllable split on a click on the left side of the split line 2012-10-05 08:21:40 -07:00
Thomas Goyne
5cdcd3dcb3 Increase the hit area for removing syllable splits a little 2012-10-05 08:21:40 -07:00
Thomas Goyne
d0a9f3f7cd Change the karaoke split cursor color to indicate whether it'll add or remove a split 2012-10-05 08:21:40 -07:00
Thomas Goyne
1cd9f2dcf2 Add a default hotkey for "audio/play/line" 2012-10-04 16:56:02 -07:00
Thomas Goyne
d97ad27354 Add the play line button to the audio toolbar 2012-10-04 16:49:55 -07:00
Thomas Goyne
44468fbd3d Add "audio/play/line" command 2012-10-04 16:48:35 -07:00
Thomas Goyne
2db488ee81 Update Greek translation. Closes #1526. 2012-10-04 15:59:02 -07:00
Thomas Goyne
050721a90d Update Russian translation. Closes #1525. 2012-10-04 13:02:24 -07:00
Thomas Goyne
7343392823 Don't use StandardPaths before OnInit is called 
AegisubLocale is created extremely early in the application
initialization, and using StandardPaths in its constructor resulted in
?user being set to an incorrect value as the app name hadn't been set
yet.
 2012-10-04 12:58:01 -07:00
Thomas Goyne
662cf01493 Remove solidbreak from installer flags since there's no longer optional components 2012-10-04 11:33:58 -07:00
Thomas Goyne
782c6310f3 Don't include glu.h in the precompiled header since it's never actually used 2012-10-03 15:58:14 -07:00
Thomas Goyne
2c4de3a635 Remove unused things from osx-bundle.sed.in 2012-10-02 16:06:05 -07:00
Thomas Goyne
0e3fabddfa Set the plist version correctly 2012-10-02 16:06:05 -07:00
Thomas Goyne
f3f9d2c34d Also convert sr_RS to sr_YU in the plist on OS X 2012-10-02 16:06:05 -07:00
Thomas Goyne
4e723184a1 Put the Serbian translation in the right place on windows. Closes #1325. 2012-10-02 16:06:05 -07:00
Thomas Goyne
86a39cc9ac Update config.guess and config.sub to a version that isn't close to a decade old 2012-10-02 16:06:05 -07:00
Thomas Goyne
1f6a6087c6 Remove waf build system since it's pretty out of date 2012-10-02 16:06:05 -07:00
Thomas Goyne
21c2259d94 Rename configure.in to configure.ac 2012-10-02 16:06:05 -07:00
Thomas Goyne
40f97dbfea Redesign AegisubLocale 
Use wxTranslations directly rather than going through wxLocale. This
significantly simplifies the code, eliminates the hardcoded list of
languages for non-windows, and makes it possible to use mismatched
languages and locales.

Closes #1508.
 2012-10-02 16:06:05 -07:00
Thomas Goyne
0346fbf715 Remove all optional components from the installer other than icons 
There's really no reason to present the user with a giant list of
checkboxes that lets them unselect at most a few megabytes of local
files.
 2012-10-02 12:56:35 -07:00
Thomas Goyne
8fad077e88 Don't ignore loaded timecodes when converting frames to times for the subtitle renderer 2012-10-02 12:56:19 -07:00
Thomas Goyne
57a253004d Scroll the audio display after a click near an edge 
When auto scrolling is enabled, scroll the audio display after a click
near an edge to mimic the effect of scrolling to show the new audio
selection (as 2.1.9 did), but hopefully without all the weird
undesirable cases that had.
 2012-10-02 08:09:33 -07:00
Thomas Goyne
05f5d37576 Split AudioDisplay::OnMouseEvent into several methods 2012-10-02 07:40:50 -07:00
Thomas Goyne
3d3a74c5d2 Audio display cosmetics 2012-10-02 07:27:52 -07:00
Thomas Goyne
55bdbf8d48 Add scroll arrows to the karaoke syllable bar when the contents are too wide to fit. Closes #1516. 2012-10-01 16:55:20 -07:00
Thomas Goyne
b020322a3a Update the size of the karaoke syllable bar when the window is resized. Updates #1516. 2012-10-01 15:38:02 -07:00
Thomas Goyne
1b089795f1 Also stop the video when stopping audio playback as 2.1.9 did. Closes #1515. 2012-10-01 10:28:42 -07:00
Thomas Goyne
0d844de245 Fix an error in the Portuguese translations 2012-10-01 09:37:46 -07:00
Thomas Goyne
0a5fa6ff39 Don't use ARC in the Obj-C++ code 
It never allocated any non-autoreleased objects so ARC wasn't actually
doing anything other than breaking compilation with gcc.
 2012-09-29 22:10:45 -07:00
Thomas Goyne
afe0213317 Delete most of the dictionary installers and replace them with a shell script 2012-09-29 21:46:09 -07:00
Thomas Goyne
0c3d321124 Remove the .x from 3.0.x in the dictionary installers 2012-09-29 21:46:09 -07:00
Thomas Goyne
25e65237cd Mark "Action" as translatable in the fonts collector dialog 
Fortunately "Action" is also used in the select lines dialog so it's
already present in the translations.
 2012-09-27 17:10:33 -07:00
Thomas Goyne
17295357e2 Update Indonesian translation 2012-09-25 09:37:49 -07:00
Thomas Goyne
08c9781dfb Actually modify the line time when applying lead-in/out in karaoke mode 2012-09-24 18:56:49 -07:00
Thomas Goyne
7433b814a7 Modify the first syllable when normalizing karaoke syllable lengths 2012-09-24 18:46:15 -07:00
Thomas Goyne
85f2774033 Report the user's UI language in addition to the system language to the update checker 2012-09-24 13:00:52 -07:00
Thomas Goyne
ccf3e94d96 Bundle the Serbian translation as sr_YU on OS X as it doesn't have sr_RS 2012-09-23 08:20:24 -07:00
Thomas Goyne
68fcf90de5 Update Serbian translation 2012-09-23 08:20:23 -07:00
Thomas Goyne
51e23a3c7e Remove the period from the catalog name since gettext seems to not like it 2012-09-22 21:29:44 -07:00
Thomas Goyne
39bf2ab5fd Don't list languages in the language dialog which won't actually work. Updates #1508. 2012-09-22 09:51:39 -07:00
Thomas Goyne
9a6eb70f12 Try to find an English locale ID which is available 
wxLANGUAGE_ENGLISH corresponds to the "en" locale on Linux, which is
generally not installed, which resulted in English actually being the
system default locale.

Updates #1508.
 2012-09-22 09:42:32 -07:00
Thomas Goyne
c4f6e729f9 Add missing period in 2.35 in a string that probably isn't actually visible anywhere 2012-09-21 18:13:10 -07:00
Thomas Goyne
6943b868da Handle file not found errors when opening linked audio from subtitles 2012-09-21 18:07:30 -07:00
Thomas Goyne
ffab39b21f Don't automatically load audio from video if audio from that file is already open 2012-09-21 17:58:22 -07:00
Thomas Goyne
d66c8709ae Update Portuguese translation 2012-09-16 19:18:33 -07:00
Thomas Goyne
7b5bb6f57a Add missing languages to the hardcoded list for non-windows 2012-09-16 19:12:05 -07:00
Thomas Goyne
9c9413a209 Update Portuguese translation 2012-09-16 19:08:07 -07:00
Thomas Goyne
ef99f77087 Make the open/save keyframes dialog title translatable 2012-09-16 18:52:50 -07:00
Thomas Goyne
d2f724afa5 Update Spanish translation 2012-09-14 19:32:23 -07:00
Thomas Goyne
9048d8a59a Fix compilation failure in it.po 2012-09-14 07:55:36 -07:00
Thomas Goyne
2c2f60d4e0 Fix completely incorrect behavior when AR changing is enabled in the resolution resampler 2012-09-14 07:55:31 -07:00
Thomas Goyne
e552dc4c9c Remove some dead assigns 2012-09-14 07:55:01 -07:00
Thomas Goyne
f3fe0b6a0b Update German translation 2012-09-11 09:20:32 -07:00
Thomas Goyne
429dfe08b6 Update Italian translation 2012-09-10 17:45:29 -07:00
Thomas Goyne
d0de419e21 Bump copyright year in dictionary installers 2012-09-07 17:11:53 -07:00
Thomas Goyne
3dcb553203 Add installer for Basque dictionaries 2012-09-07 17:10:47 -07:00
Thomas Goyne
14457fb87e Update Euskara (Basque) translation 2012-09-07 08:04:21 -07:00
Thomas Goyne
32560df6be Update French translation 2012-09-07 07:31:05 -07:00
Thomas Goyne
9ae6e3c538 Fix compilation with precompiled headers disabled 2012-09-06 08:25:38 -07:00
Thomas Goyne
0d1ffbbdf7 Update manual URL 2012-09-03 17:28:45 -07:00
Thomas Goyne
1c9af767e5 Move audio decode error handling to GetAudio 
Errors when not getting with volume need to be handled too.

Updates #1509.
 2012-09-01 21:45:18 -07:00
Thomas Goyne
e995cd2616 Don't stop video playback when undoing or redoing changes 2012-09-01 21:45:17 -07:00
Thomas Goyne
4d15df51f5 Fix the hash of the last SVN revision 2012-08-26 19:19:44 -07:00
Thomas Goyne
9f8e25ed0a Force LC_CTYPE to en_US.UTF-8 on OS X 
When run from an app bundle the locale environment variables are unset,
and the default locale settings are bogus as a result.
 2012-08-26 19:15:48 -07:00
Thomas Goyne
4cb5d411b3 Mark Aegisub as x86_64 rather than i386 2012-08-26 19:15:47 -07:00
Thomas Goyne
9d5d82fc42 Declare Aegisub as the Owner for .ass and .ssa 2012-08-26 19:15:46 -07:00
Thomas Goyne
ca4c29a9f4 Fix tests linking with static libaegisub 2012-08-26 19:15:42 -07:00
Thomas Goyne
748ca154b6 Add a BOM to fragment_Translation.iss so that iscc uses the right charset 2012-08-26 19:15:27 -07:00
Thomas Goyne
09962a56d1 Use the last valid mouse position for VideoDisplay::GetMousePosition 
On Windows opening the context menu triggers a mouse leave event, which
invalidates the current mouse position, so the Copy coordinates to
Clipboard command didn't work.
 2012-08-25 18:33:46 -07:00
Thomas Goyne
fd447927d5 Bump copyright year in installer to 2012 2012-08-21 07:06:20 -07:00
Thomas Goyne
54c4e4ab6e Make building the reporter optional 
It's not actually useful for anything and it drags in cURL as a dependency.
 2012-08-21 07:02:51 -07:00
Thomas Goyne
b0036b4d99 Statically link libaegisub 
Dynamically linking it caused a steady stream of issues for no apparent
benefits.
 2012-08-21 07:02:45 -07:00
Thomas Goyne
4208fa362c Fix stack check failure when a script fails to load in a debug build 2012-08-19 20:32:18 -07:00
Thomas Goyne
1e030289ad Revamp how version tagging works 
Rather than having it be a configurable option, simply build in final
release mode if Aegisub is being built from a signed tag, and get the
version information from that tag.

Drop the version number from the OS X app bundle when not building from
a tag as it done everywhere else. Drop the arch suffix since ppc hasn't
been tested in years and isn't worth testing as it's only going to get
less relevant as time goes on.

Remove some redundant definitions in the build system.
 2012-08-19 14:33:50 -07:00
Thomas Goyne
42a016a83b Update the revision checks to work with a pure-git repo 2012-08-19 14:05:38 -07:00
Thomas Goyne
16cd907fe7 Add a BOM to all of the lua files since they're no longer assumed to be UTF-8 
Originally committed to SVN as r6962.
 2012-08-19 20:43:39 -07:00
Thomas Goyne
18db0b09ac Log audio decoding errors 
Originally committed to SVN as r6961.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
79684d5ad6 Factor out bounds-checking for GetAudio to a single place 
It was being done in inconsistent ways in several places, which did not
include all of the places it needed to be done.

Closes #1509.

Originally committed to SVN as r6960.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
037d385419 Guard uses of audio providers with a mutex when not using a cache as they aren't thread-safe. Updates #1509. 
Originally committed to SVN as r6959.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
5a38d69921 Open files as binary in TextFileReader 
Text mode does undesirable things like stopping when it hits an EOF
byte, which can be a valid part of a UTF-16 character, and line_iterator
handles stripping \r anyway.

Originally committed to SVN as r6958.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
e774902a29 Always write a newline at the end of ASS files 
Originally committed to SVN as r6957.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
b265d1fa0e Actually set the actor when reading from txt files 
Originally committed to SVN as r6956.
 2012-08-19 14:11:29 -07:00
Thomas Goyne
d132364025 Fix check for OS X version in the update checker 
Originally committed to SVN as r6955.
 2012-08-19 14:11:28 -07:00
Thomas Goyne
21841e84a8 Get the locale name for OS X from CF rather than wx 
Originally committed to SVN as r6954.
 2012-08-19 14:11:28 -07:00
Thomas Goyne
f2035d76fc Don't block the source of a drag-and-drop while the dropped audio/video are loading 
Originally committed to SVN as r6953.
 2012-08-04 16:31:44 +00:00
Thomas Goyne
b86a1bfb2d Fix compilation with wx 2.9.4 with 2.8 compatibility enabled. Closes #1504. 
Originally committed to SVN as r6952.
 2012-08-03 02:32:30 +00:00
Thomas Goyne
e2e304f2cb Don't try to shift to a negative start time when shifting lines to frame zero 
Originally committed to SVN as r6951.
 2012-07-29 03:23:27 +00:00
Thomas Goyne
ffe41cdf20 Don't discard frames which are decoded before the video display becomes visible 
Originally committed to SVN as r6950.
 2012-07-29 03:23:24 +00:00
Thomas Goyne
8c42f09235 Don't pass size_t to wxString::Format since there's no portable specifier for it 
Originally committed to SVN as r6949.
 2012-07-24 02:40:39 +00:00
Thomas Goyne
8ba149a7e6 Actually save the video zoom to the subtitles file 
Originally committed to SVN as r6948.
 2012-07-24 02:40:37 +00:00
Thomas Goyne
65d3c4cc2d Save keyframe and timecode file names even if video isn't loaded 
Originally committed to SVN as r6947.
 2012-07-24 02:40:34 +00:00
Thomas Goyne
de7dd7e07f Use the video AR from the script rather than the video's AR when opening linked video 
Originally committed to SVN as r6946.
 2012-07-24 02:40:31 +00:00
Thomas Goyne
269a206053 Fix loading linked audio when automatic opening of audio from video is enabled 
Originally committed to SVN as r6945.
 2012-07-24 02:40:29 +00:00
cantabile
7bd7ef7cd6 Shift times: Make Enter in the time edit do the same as clicking OK 
Originally committed to SVN as r6944.
 2012-07-24 02:39:40 +00:00
cantabile
5ecb89eeec Shift times: Use TimeEdit::SetTime() instead of TimeEdit::SetValue() 
TimeEdit::SetValue() will trigger TimeEdit::OnModified(), but that
doesn't always update the internal "time" property.
TimeEdit::OnModified() seems to be designed to handle editing the value
with the keyboard, not with SetValue().

Originally committed to SVN as r6943.
 2012-07-24 02:39:37 +00:00
cantabile
3193e05747 Use correct format specifier in AssColor::GetSSAFormatted() 
Avoids a ton of assertion failures when saving SSA files.

Originally committed to SVN as r6942.
 2012-07-24 02:39:35 +00:00
cantabile
ef65262920 SRTSubtitleFormat: don't mix line endings in non-Windows 
Originally committed to SVN as r6941.
 2012-07-24 02:39:32 +00:00
Thomas Goyne
b2fb39b67f Fix leak of the Indexer when an audio/video file has already been indexed 
Originally committed to SVN as r6940.
 2012-07-23 00:44:47 +00:00
Thomas Goyne
11a4ede9a0 Add Layer to the things lines can be sorted by 
Originally committed to SVN as r6939.
 2012-07-23 00:44:44 +00:00
Thomas Goyne
f3a935c985 Install all of the automation scripts 
Originally committed to SVN as r6938.
 2012-07-22 23:56:49 +00:00
Thomas Goyne
ef3e75dbe9 Pass the row length rather than frame width to OpenGL for the unpack row length 
Originally committed to SVN as r6937.
 2012-07-21 03:50:38 +00:00
Thomas Goyne
556f0514c2 Fix crash in the Kanji timer when the source begins with whitespace and the dest is empty 
Originally committed to SVN as r6936.
 2012-07-21 03:50:35 +00:00
Thomas Goyne
291a4050d8 Fix manual path generation 
Originally committed to SVN as r6935.
 2012-07-14 16:54:15 +00:00
Thomas Goyne
1ff1a57bdc Regenerate aegisub.pot 
Originally committed to SVN as r6934.
 2012-07-14 16:54:12 +00:00
Thomas Goyne
38217c6c59 Implement the timing adjustment commands 
Originally committed to SVN as r6933.
 2012-07-14 13:35:15 +00:00
Thomas Goyne
60c38bd2e5 Fix potential crash when deleting lines with audio open 
Don't assume that the active line is valid in RegenerateInactiveLines,
as it may get called by the commit signal before the selection is
updated when the active line is deleted.

Closes #1502.

Originally committed to SVN as r6932.
 2012-07-08 23:22:27 +00:00
Thomas Goyne
5162c28684 Check for audio hotkeys in both key down and char hook 
wx doesn't call the keyboard hook when a window has capture, which
results in hotkeys not working while a mouse button is held down. This
usually doesn't matter much, but in the audio display one might want to
play audio while moving a marker. In general checking for hotkeys in
keydown doesn't work, but in the specific cast of marker dragging
keyboard focus is guaranteed to be on the audio display so it works out.

Originally committed to SVN as r6931.
 2012-07-08 23:22:25 +00:00
Thomas Goyne
4e53ab3eab Remove the uses of wxNumberFormatter 
We currently require mismatched locales for non-English since we don't
distinguish between locale-independent things like the config file and
UI things, which wxNumberFormatter barfs on.

Originally committed to SVN as r6930.
 2012-07-06 02:14:46 +00:00
Thomas Goyne
8244271508 Use curl to fetch updates on OS X 
The update checker sometimes triggers crashes on startup on OS X when
trying to release the CFSocket, so hopefully sidestep whatever the issue
is by just using curl to retrieve the update list.

Originally committed to SVN as r6929.
 2012-07-05 23:05:37 +00:00
Thomas Goyne
3dc9e4fbea Don't try to set the zoom dropdown selection if it'd be out of bounds 
Originally committed to SVN as r6928.
 2012-07-05 23:05:34 +00:00