You can subscribe to this list here.
2008 |
Jan
|
Feb
(150) |
Mar
(220) |
Apr
(37) |
May
(123) |
Jun
(58) |
Jul
(20) |
Aug
(6) |
Sep
(35) |
Oct
(33) |
Nov
(44) |
Dec
(32) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(48) |
Feb
(54) |
Mar
(56) |
Apr
(49) |
May
(77) |
Jun
(29) |
Jul
(36) |
Aug
(8) |
Sep
(56) |
Oct
(120) |
Nov
(101) |
Dec
(95) |
2010 |
Jan
(64) |
Feb
(151) |
Mar
(40) |
Apr
(57) |
May
(24) |
Jun
(28) |
Jul
(39) |
Aug
(8) |
Sep
(31) |
Oct
(46) |
Nov
(75) |
Dec
(100) |
2011 |
Jan
(76) |
Feb
(21) |
Mar
(32) |
Apr
(70) |
May
(91) |
Jun
(17) |
Jul
(88) |
Aug
(26) |
Sep
(74) |
Oct
(42) |
Nov
(81) |
Dec
(58) |
2012 |
Jan
(58) |
Feb
(44) |
Mar
(122) |
Apr
(88) |
May
(128) |
Jun
(74) |
Jul
(47) |
Aug
(29) |
Sep
(53) |
Oct
(33) |
Nov
(48) |
Dec
(110) |
2013 |
Jan
(36) |
Feb
(28) |
Mar
(172) |
Apr
(221) |
May
(147) |
Jun
(76) |
Jul
(33) |
Aug
(14) |
Sep
(70) |
Oct
(55) |
Nov
(91) |
Dec
(75) |
2014 |
Jan
(90) |
Feb
(95) |
Mar
(89) |
Apr
(53) |
May
(81) |
Jun
(139) |
Jul
(116) |
Aug
(50) |
Sep
(83) |
Oct
(69) |
Nov
(66) |
Dec
(60) |
2015 |
Jan
(29) |
Feb
(103) |
Mar
(80) |
Apr
(132) |
May
(147) |
Jun
(167) |
Jul
(64) |
Aug
(89) |
Sep
(91) |
Oct
(91) |
Nov
(110) |
Dec
(109) |
2016 |
Jan
(102) |
Feb
(77) |
Mar
(345) |
Apr
(136) |
May
(102) |
Jun
(100) |
Jul
(167) |
Aug
(47) |
Sep
(132) |
Oct
(46) |
Nov
(51) |
Dec
(46) |
2017 |
Jan
(116) |
Feb
(11) |
Mar
(148) |
Apr
(101) |
May
(47) |
Jun
(62) |
Jul
(73) |
Aug
(36) |
Sep
(17) |
Oct
(39) |
Nov
(64) |
Dec
(40) |
2018 |
Jan
(8) |
Feb
(26) |
Mar
(22) |
Apr
(59) |
May
(19) |
Jun
(33) |
Jul
(15) |
Aug
(10) |
Sep
(12) |
Oct
(4) |
Nov
(29) |
Dec
(10) |
2019 |
Jan
(5) |
Feb
(31) |
Mar
(32) |
Apr
(99) |
May
(49) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <am...@us...> - 2019-05-14 04:15:48
|
Revision: 10701 http://sourceforge.net/p/omegat/svn/10701 Author: amake Date: 2019-05-14 04:15:40 +0000 (Tue, 14 May 2019) Log Message: ----------- Move doc_src4/en to doc_src/en Added Paths: ----------- trunk/doc_src/en/ trunk/doc_src/en/App_Dictionaries.xml trunk/doc_src/en/App_Glossaries.xml trunk/doc_src/en/App_Regexp.xml trunk/doc_src/en/App_ShortCutCustomization.xml trunk/doc_src/en/App_Spellchecker.xml trunk/doc_src/en/Dialogs_Preferences.xml trunk/doc_src/en/Dialogs_ProjectProperties.xml trunk/doc_src/en/HowTo_ManageRTL.xml trunk/doc_src/en/HowTo_PreventDataLoss.xml trunk/doc_src/en/HowTo_ReuseTM.xml trunk/doc_src/en/HowTo_SetUpTeamProject.xml trunk/doc_src/en/HowTo_TranslatePDF.xml trunk/doc_src/en/HowTo_UseTeamProject.xml trunk/doc_src/en/InstallingAndRunning.xml trunk/doc_src/en/InstantStartGuide.xml trunk/doc_src/en/Menus_Edit.xml trunk/doc_src/en/Menus_GoTo.xml trunk/doc_src/en/Menus_Help.xml trunk/doc_src/en/Menus_Options.xml trunk/doc_src/en/Menus_Project.xml trunk/doc_src/en/Menus_Tools.xml trunk/doc_src/en/Menus_View.xml trunk/doc_src/en/OmegaT.css trunk/doc_src/en/OmegaT4_Appendices.xml trunk/doc_src/en/OmegaT4_EditorsPanes.xml trunk/doc_src/en/OmegaT4_HowTo.xml trunk/doc_src/en/OmegaT4_Menus.xml trunk/doc_src/en/OmegaT4_ProjectFolder.xml trunk/doc_src/en/OmegaT4_Troubleshooting.xml trunk/doc_src/en/OmegaT4_WindowsAndDialogs.xml trunk/doc_src/en/OmegaTUsersManual_xinclude full.xml trunk/doc_src/en/Windows_Aligner.xml trunk/doc_src/en/Windows_ProjectFiles.xml trunk/doc_src/en/Windows_Scripts.xml trunk/doc_src/en/Windows_TextReplace.xml trunk/doc_src/en/Windows_TextSearch.xml trunk/doc_src/en/images/ trunk/doc_src/en/images/DictMerriamWebster.png trunk/doc_src/en/images/Dock.gif trunk/doc_src/en/images/GlossaryEntry_25.png trunk/doc_src/en/images/GlossaryPane_25.png trunk/doc_src/en/images/InstantGuide_1.png trunk/doc_src/en/images/InstantGuide_2.png trunk/doc_src/en/images/Maximize.gif trunk/doc_src/en/images/Minimize.gif trunk/doc_src/en/images/MultiTerm_Glossary_25.png trunk/doc_src/en/images/RegexTester.png trunk/doc_src/en/images/Restore.gif trunk/doc_src/en/images/SpellcheckerSetup_25.png trunk/doc_src/en/images/SpellcheckingText.png trunk/doc_src/en/images/Undock.gif trunk/doc_src/en/version.properties Removed Paths: ------------- trunk/doc_src/en/ trunk/doc_src4/ Property Changed: ---------------- trunk/doc_src/ Index: trunk/doc_src =================================================================== --- trunk/doc_src 2019-05-13 15:23:08 UTC (rev 10700) +++ trunk/doc_src 2019-05-14 04:15:40 UTC (rev 10701) Property changes on: trunk/doc_src ___________________________________________________________________ Added: svn:auto-props ## -0,0 +1,2 ## +*.xml = svn:eol-style=native;svn:mime-type=text/xml +*.css = svn:eol-style=native;svn:mime-type=text/plain Added: trunk/doc_src/en/App_Dictionaries.xml =================================================================== --- trunk/doc_src/en/App_Dictionaries.xml (rev 0) +++ trunk/doc_src/en/App_Dictionaries.xml 2019-05-14 04:15:40 UTC (rev 10701) @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "../../../docbook-xml-4.5/docbookx.dtd"> +<appendix id="appendix.dictionaries"> + <title>Dictionaries</title> + + <section> + <title>How to download and install dictionaries</title> + + <para>Dictionaries in <application>OmegaT</application> are based on the + StarDict or on the Lingvo DSL format. To install the necessary files for + the StarDict format, proceed as follows:</para> + + <itemizedlist> + <listitem> + <para>Search for the required language combination - for instance on + the <ulink url="https://sourceforge.net/p/omegat/wiki/Reference%20Material/">dictionary links given by the OmegaT + Wiki</ulink>.</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>Download the file - it should be a <filename>tarball</filename> + archive (extension <emphasis>tar.bz</emphasis> or + <emphasis>tar.bz2</emphasis>).</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>Use untar utility (or its equivalent, for instance<filename> + winrar</filename> in Windows) to extract its contents into the project + folder "Dictionary". There should be three files, with extensions + <emphasis>dz, idx </emphasis>and <emphasis>ifo</emphasis>.</para> + </listitem> + </itemizedlist> + + <para>Note that in addition to "source-target" dictionaries you can, using + the Dictionary feature, obtain access to information such as:</para> + + <itemizedlist> + <listitem> + <para>Webster's Revised Unabridged Dictionary (1913)</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>Longman Dictionary of Contemporary English</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>The Britannica Concise Encyclopedia</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>etc...</para> + </listitem> + </itemizedlist> + + <para>Some of the dictionaries have no strings attached - i.e. are "Free + to use", and others, like the selection above, are under the GPL license. + The following example shows Merriam Webster 10th dictionary "in + action":</para> + + <figure id="Dict.Merriam.Webster"> + <title>Merriam Webster dictionary - use</title> + + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/DictMerriamWebster.png"/> + </imageobject> + + <imageobject role="fo"> + <imagedata fileref="images/DictMerriamWebster.png" width="60%"/> + </imageobject> + </mediaobject> + </figure> + </section> + + <section> + <title>Problems with dictionaries</title> + + <itemizedlist> + <listitem> + <para>Check that your dict files are in the correct folder (or in a + subfolder below it). Check in <menuchoice> + <shortcut> + <keycombo> + <keycap>Ctrl</keycap> + + <keycap>E</keycap> + </keycombo> + </shortcut> + + <guimenu>Project</guimenu> + + <guimenuitem>Properties</guimenuitem> + </menuchoice>.</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>Does the folder contain three files of the same name, with + extensions? If only one file is present, check its extension. If it is + <emphasis>tar.bz</emphasis>, you have forgotten to unpack (untar) + it.</para> + </listitem> + </itemizedlist> + </section> +</appendix> \ No newline at end of file Property changes on: trunk/doc_src/en/App_Dictionaries.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/xml \ No newline at end of property Added: trunk/doc_src/en/App_Glossaries.xml =================================================================== --- trunk/doc_src/en/App_Glossaries.xml (rev 0) +++ trunk/doc_src/en/App_Glossaries.xml 2019-05-14 04:15:40 UTC (rev 10701) @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "../../../docbook-xml-4.5/docbookx.dtd"> +<appendix id="appendix.glossaries"> + <title>Glossaries</title> + + <para>Glossaries are files created and updated manually for use in + <application>OmegaT</application>.</para> + + <para>If an <application>OmegaT</application> project contains one or more + glossaries, any terms in the glossary which are also found in the current + segment will be automatically displayed in the Glossary viewer.</para> + + <para>You define its location and name in the project properties dialog. The + extension must be <filename>.txt</filename> or <filename>.utf8</filename> + (if not, it will be added). The location of the file must be within the + <filename>/glossary</filename> folder, but it can be in a deeper folder + (e.g., <filename>glossary/sub/glossary.txt</filename>). The file does not + need to exist when setting it, it will be created (if necessary) when adding + a glossary entry. If the file already exists, no attempt is done to verify + the format or the character set of the file: the new entries will always be + in tab-separated format and UTF-8. As the existing content will not be + touched, damage to an existing file would be limited.</para> + + <section> + <title>Usage</title> + + <para>To use an existing glossary, simply place it in the + <filename>/glossary</filename> folder after creating the project. + <application>OmegaT</application> automatically detects glossary files in + this folder when a project is opened. Terms in the current segment which + <application>OmegaT</application> finds in the glossary file(s) are + displayed in the Glossary pane:</para> + + <figure> + <title>Glossary pane</title> + + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/GlossaryPane_25.png"/> + </imageobject> + + <imageobject role="fo"> + <imagedata fileref="images/GlossaryPane_25.png" width="60%"/> + </imageobject> + </mediaobject> + </figure> + + <para>The word before the = sign is the source term, and its translation + is (or are) the words after =. The vocabulary entry can have a comment + added. The glossary function only finds exact matches with the glossary + entry (e.g. does not find inflected forms etc.). New terms can be added + manually to the glossary file(s) during translation, for example in a text + editor. Newly added terms will not be recognized once the changes in the + text file have been saved.</para> + + <para>The source term does not have to be a single-word item, as the next + example shows:</para> + + <figure> + <title>multiple words entries in glossaries - example</title> + + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/MultiTerm_Glossary_25.png"/> + </imageobject> + + <imageobject role="fo"> + <imagedata fileref="images/MultiTerm_Glossary_25.png" width="80%"/> + </imageobject> + </mediaobject> + </figure> + + <para>The underlined item "pop-up menu" can be found in the glossary pane + as "pojavni menu". Highlighting it in the Glossary pane and then + rightclicking insets at the cursor position in the target + segment.<footnote> + <para>Note that in the above case, this is just half (or even less) of + the story, as the target language (Slovenian) uses declension. So the + inserted "pojavni meni" in the nominative form - has to be changed to + "pojavnem meniju" , i.e. to the locative. So it is probably faster to + type the term correctly right away without bothering with the glossary + and its shortcuts.</para> + </footnote></para> + </section> + + <section> + <title>File format</title> + + <para>Glossary files are simple plain text files containing three-column, + tab-delimited lists with the source and target terms in the first and + second columns respectively. The third column can be used for additional + information. You can have entries with the target column missing, i.e. + just containing the source term and the comment.</para> + + <para>The encoding of glossaries is determined automatically. Of course, + the encoding must be compatible with both the languages contained, so + Unicode is recommended.</para> + + <para>Also supported is the CSV format. This format is the same as the tab + separated one: source term, target term. Comment fields are separated by a + comma ','. Strings can be enclosed by quotes ", which allows having a + comma inside a string:</para> + + <para><literal>"This is a source term, which contains a comma","c'est un + terme, qui contient une virgule"</literal></para> + + <para>In addition to the plain text format, TBX format is also supported as a read-only glossary format. The + location of the <filename>.tbx</filename> file must be within the + <filename>/glossary</filename> folder, but it can be in a deeper folder + (e.g., <filename>glossary/sub/MyGlossary.tbx</filename>).</para> + + <para>TBX - Term Base eXchange - is the open, XML-based standard for + exchanging structured terminological data, TBX has been approved as an + international standard by LISA and ISO. If you have an existing + terminology handling system it is quite possible it offers the export of + terminology data via TBX format. <ulink url="http://www.microsoft.com/Language/en-US/Terminology.aspx">Microsoft + Terminology Collection</ulink> can be downloaded in nearly 100 languages and can serve as + a cornerstone IT glossary.</para> + + <para>Note: the <filename>.tbx</filename> output of MultiTerm seems to not + be reliable (November 2013), it is better to use the + <filename>.tab</filename> output of MultiTerm instead.</para> + </section> + + <section> + <title>How to create glossaries</title> + + <para>The project setting allows one to enter a name for a writable + glossary file (see beginning of this chapter). Right-click in the glossary + pane or press <keycap>Ctrl+Shift+G</keycap> to add a new entry. A dialog + opens, allowing you to enter the source term, target term and any comments + you may have:</para> + + <mediaobject role="html"> + <imageobject> + <imagedata fileref="images/GlossaryEntry_25.png"/> + </imageobject> + + <imageobject role="fo"> + <imagedata fileref="images/GlossaryEntry_25.png" width="80%"/> + </imageobject> + </mediaobject> + + <para>The contents of glossary files are kept in memory and are loaded + when the project is opened or reloaded. Updating a glossary file is thus + rather simple: press <keycap>Ctrl+Shift+G</keycap> and enter the new term, + its translation and any comments you may have (ensuring you press tab + between the fields) and save the file. The contents of the glossary pane + will be updated accordingly.</para> + + <para>The location of the writable glossary file can be set in the + <guimenuitem>Project > Properties ... </guimenuitem>dialog. The + recognized extensions are <filename>TXT</filename> and + <filename>UTF8</filename></para> + + <para><emphasis role="bold">Note: </emphasis>Of course there are other + ways and means to create a simple file with tab delimited entries. Nothing + speaks against using Notepad++ on Windows, GEdit on Linux for instance or + some spreadsheet program for this purpose: any application, that can + handle UTF-8 (or UTF-16 LE) and that can show white space (so that you do + not miss the required <keycap>TAB</keycap> characters) can be used.</para> + </section> + + <section> + <title>Priority glossary</title> + + <para>The results from the priority glossary (by default, + glossary/glossary.txt) appear in first places in the Glossary pane and in + TransTips.</para> + + <para>As entries can mix words from priority and non priority glossaries, + the words from the priority glossary are displayed in bold.</para> + </section> + + <section> + <title>Common glossary problems</title> + + <para><emphasis role="bold">Problem: No glossary terms are displayed - + possible causes:</emphasis></para> + + <itemizedlist> + <listitem> + <para>No glossary file found in the "glossary" folder.</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>The glossary file is empty.</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>The items are not separated with a TAB character.</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>The glossary file does not have the correct extension (.tab, + .utf8 or .txt).</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>There is no EXACT match between the glossary entry and the + source text in your document - for instance plurals.</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>The glossary file does not have the correct encoding.</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>There are no terms in the current segment which match any terms + in the glossary.</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>One or more of the above problems may have been fixed, but the + project has not been reloaded.</para> + </listitem> + </itemizedlist> + + <para><emphasis role="bold">Problem: In the glossary pane, some characters + are not displayed properly</emphasis></para> + + <itemizedlist> + <listitem> + <para>...but the same characters are displayed properly in the Editing + pane: the extension and the file encoding do not match.</para> + </listitem> + </itemizedlist> + </section> +</appendix> \ No newline at end of file Property changes on: trunk/doc_src/en/App_Glossaries.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/xml \ No newline at end of property Added: trunk/doc_src/en/App_Regexp.xml =================================================================== --- trunk/doc_src/en/App_Regexp.xml (rev 0) +++ trunk/doc_src/en/App_Regexp.xml 2019-05-14 04:15:40 UTC (rev 10701) @@ -0,0 +1,598 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "../../../docbook-xml-4.5/docbookx.dtd"> +<appendix id="appendix.regexp"> + <title>Regular expressions</title> + + <para>The regular expressions (or regex for short) used in searches and + segmentation rules are those supported by Java. Should you need more + specific information, consult the <ulink url="http://download.oracle.com/javase/1.6.0/docs/api/java/util/regex/Pattern.html">Java + Regex documentation</ulink>. See additional references and examples + below.</para> + + <note> + <para>This chapter is intended for advanced users, who need to define + their own variants of segmentation rules or devise more complex and + powerful key search items.</para> + </note> + + <table> + <title>Regex - Flags</title> + + <tgroup align="left" cols="2" rowsep="1"> + <colspec align="left" colnum="1"/> + + <thead> + <row> + <entry align="left">The construct</entry> + + <entry align="left">... matches the following</entry> + </row> + </thead> + + <tbody> + <row> + <entry>(?i)</entry> + + <entry>Enables case-insensitive matching (by default, the pattern is + case-sensitive).</entry> + </row> + </tbody> + </tgroup> + </table> + + <table> + <title>Regex - Character</title> + + <tgroup align="left" cols="2" rowsep="1"> + <colspec align="left" colnum="1"/> + + <thead> + <row> + <entry align="left">The construct</entry> + + <entry align="left">... matches the following</entry> + </row> + </thead> + + <tbody> + <row> + <entry>x</entry> + + <entry>The character x, except the following...</entry> + </row> + + <row> + <entry>\uhhhh</entry> + + <entry>The character with hexadecimal value 0xhhhh</entry> + </row> + + <row> + <entry>\t</entry> + + <entry>The tab character ('\u0009')</entry> + </row> + + <row> + <entry>\n</entry> + + <entry>The newline (line feed) character ('\u000A')</entry> + </row> + + <row> + <entry>\r</entry> + + <entry>The carriage-return character ('\u000D')</entry> + </row> + + <row> + <entry>\f</entry> + + <entry>The form-feed character ('\u000C')</entry> + </row> + + <row> + <entry>\a</entry> + + <entry>The alert (bell) character ('\u0007')</entry> + </row> + + <row> + <entry>\e</entry> + + <entry>The escape character ('\u001B')</entry> + </row> + + <row> + <entry>\cx</entry> + + <entry>The control character corresponding to x</entry> + </row> + + <row> + <entry>\0n</entry> + + <entry>The character with octal value 0n (0 <= n <= 7)</entry> + </row> + + <row> + <entry>\0nn</entry> + + <entry>The character with octal value 0nn (0 <= n <= + 7)</entry> + </row> + + <row> + <entry>\0mnn</entry> + + <entry>The character with octal value 0mnn (0 <= m <= 3, 0 + <= n <= 7)</entry> + </row> + + <row> + <entry>\xhh</entry> + + <entry>The character with hexadecimal value 0xhh</entry> + </row> + </tbody> + </tgroup> + </table> + + <table> + <title>Regex - Quotation</title> + + <tgroup align="left" cols="2" rowsep="1"> + <colspec align="left" colnum="1"/> + + <thead> + <row> + <entry align="left">The construct</entry> + + <entry align="left">...matches the following</entry> + </row> + </thead> + + <tbody> + <row> + <entry>\</entry> + + <entry>Nothing, but quotes the following character. This is required + if you would like to enter any of the meta characters + !$()*+.<>?[\]^{|} to match as themselves.</entry> + </row> + + <row> + <entry>\\</entry> + + <entry>For example, this is the backslash character</entry> + </row> + + <row> + <entry>\Q</entry> + + <entry>Nothing, but quotes all characters until \E</entry> + </row> + + <row> + <entry>\E</entry> + + <entry>Nothing, but ends quoting started by \Q</entry> + </row> + </tbody> + </tgroup> + </table> + + <table> + <title>Regex - Classes for Unicode blocks and categories</title> + + <tgroup align="left" cols="2" rowsep="1"> + <colspec align="left" colnum="1"/> + + <thead> + <row> + <entry align="left">The construct</entry> + + <entry align="left">...matches the following</entry> + </row> + </thead> + + <tbody> + <row> + <entry>\p{InGreek}</entry> + + <entry>A character in the Greek block (simple <ulink url="http://download.oracle.com/javase/1.6.0/docs/api/java/util/regex/Pattern.html#ubc"> + block</ulink>)</entry> + </row> + + <row> + <entry>\p{Lu}</entry> + + <entry>An uppercase letter (simple <ulink url="http://download.oracle.com/javase/1.6.0/docs/api/java/util/regex/Pattern.html#ubc"> + category</ulink>)</entry> + </row> + + <row> + <entry>\p{Sc}</entry> + + <entry>A currency symbol</entry> + </row> + + <row> + <entry>\P{InGreek}</entry> + + <entry>Any character except one in the Greek block + (negation)</entry> + </row> + + <row> + <entry>[\p{L}&&[^\p{Lu}]]</entry> + + <entry>Any letter except an uppercase letter (subtraction)</entry> + </row> + </tbody> + </tgroup> + </table> + + <table> + <title>Regex - Character classes</title> + + <tgroup align="left" cols="2" rowsep="1"> + <colspec align="left" colnum="1"/> + + <thead> + <row> + <entry align="left">The construct</entry> + + <entry align="left">...matches the following</entry> + </row> + </thead> + + <tbody> + <row> + <entry>[abc]</entry> + + <entry>a, b, or c (simple class)</entry> + </row> + + <row> + <entry>[^abc]</entry> + + <entry>Any character except a, b, or c (negation)</entry> + </row> + + <row> + <entry>[a-zA-Z]</entry> + + <entry>a through z or A through Z, inclusive (range)</entry> + </row> + </tbody> + </tgroup> + </table> + + <table> + <title>Regex - Predefined character classes</title> + + <tgroup align="left" cols="2" rowsep="1"> + <colspec align="left" colnum="1"/> + + <thead> + <row> + <entry align="left">The construct</entry> + + <entry align="left">...matches the following</entry> + </row> + </thead> + + <tbody> + <row> + <entry>.</entry> + + <entry>Any character (except for line terminators)</entry> + </row> + + <row> + <entry>\d</entry> + + <entry>A digit: [0-9]</entry> + </row> + + <row> + <entry>\D</entry> + + <entry>A non-digit: [^0-9]</entry> + </row> + + <row> + <entry>\s</entry> + + <entry>A whitespace character: [ \t\n\x0B\f\r]</entry> + </row> + + <row> + <entry>\S</entry> + + <entry>A non-whitespace character: [^\s]</entry> + </row> + + <row> + <entry>\w</entry> + + <entry>A word character: [a-zA-Z_0-9]</entry> + </row> + + <row> + <entry>\W</entry> + + <entry>A non-word character: [^\w]</entry> + </row> + </tbody> + </tgroup> + </table> + + <table> + <title>Regex - Boundary matchers</title> + + <tgroup align="left" cols="2" rowsep="1"> + <colspec align="left" colnum="1"/> + + <thead> + <row> + <entry align="left">The construct</entry> + + <entry align="left">...matches the following</entry> + </row> + </thead> + + <tbody> + <row> + <entry>^</entry> + + <entry>The beginning of a line</entry> + </row> + + <row> + <entry>$</entry> + + <entry>The end of a line</entry> + </row> + + <row> + <entry>\b</entry> + + <entry>A word boundary</entry> + </row> + + <row> + <entry>\B</entry> + + <entry>A non-word boundary</entry> + </row> + </tbody> + </tgroup> + </table> + + <table> + <title>Regex - Greedy quantifiers</title> + + <tgroup align="left" cols="2" rowsep="1"> + <colspec align="left" colnum="1"/> + + <thead> + <row> + <entry align="left">The construct</entry> + + <entry align="left">...matches the following</entry> + </row> + </thead> + + <tbody> + <row> + <entry>X<emphasis>?</emphasis></entry> + + <entry>X, once or not at all</entry> + </row> + + <row> + <entry>X<emphasis>*</emphasis></entry> + + <entry>X, zero or more times</entry> + </row> + + <row> + <entry>X<emphasis>+</emphasis></entry> + + <entry>X, one or more times</entry> + </row> + </tbody> + </tgroup> + </table> + + <note> + <para>greedy quantifiers will match as much as they can. For example, + <emphasis>a+</emphasis> will match the aaa in + <emphasis>aaabbb</emphasis></para> + </note> + + <table> + <title>Regex - Reluctant (non-greedy) quantifiers</title> + + <tgroup align="left" cols="2" rowsep="1"> + <colspec align="left" colnum="1"/> + + <thead> + <row> + <entry align="left">The construct</entry> + + <entry align="left">...matches the following</entry> + </row> + </thead> + + <tbody> + <row> + <entry>X??</entry> + + <entry>X, once or not at all</entry> + </row> + + <row> + <entry>X*?</entry> + + <entry>X, zero or more times</entry> + </row> + + <row> + <entry>X+?</entry> + + <entry>X, one or more times</entry> + </row> + </tbody> + </tgroup> + </table> + + <note> + <para>non-greedy quantifiers will match as little as they can. For + example, <emphasis>a+?</emphasis> will match the first + <emphasis>a</emphasis> in <emphasis>aaabbb</emphasis></para> + </note> + + <table> + <title>Regex - Logical operators</title> + + <tgroup align="left" cols="2" rowsep="1"> + <colspec align="left" colnum="1"/> + + <thead> + <row> + <entry align="left">The construct</entry> + + <entry align="left">...matches the following</entry> + </row> + </thead> + + <tbody> + <row> + <entry>XY</entry> + + <entry>X followed by Y</entry> + </row> + + <row> + <entry>X|Y</entry> + + <entry>Either X or Y</entry> + </row> + + <row> + <entry>(XY)</entry> + + <entry>XY as a single group</entry> + </row> + </tbody> + </tgroup> + </table> + + <section id="regex.tools.and.examples.of.use"> + <title>Regex tools and examples of use</title> + + <para>A number of interactive tools are available to develop and test + regular expressions. They generally follow much the same pattern (for an + example from the Regular Expression Tester see below): the regular + expression (top entry) analyzes the search text (Text box in the middle) , + yielding the hits, shown in the result Text box.</para> + + <figure id="regerx.tester"> + <title>Regex Tester</title> + + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/RegexTester.png"/> + </imageobject> + + <imageobject role="fo"> + <imagedata fileref="images/RegexTester.png" width="80%"/> + </imageobject> + </mediaobject> + </figure> + + <para>See <ulink url="http://weitz.de/regex-coach/">The Regex + Coach</ulink> for Windows,Linux, FreeBSD versions of a stand-alone tool. + This is much the same as the above example.</para> + + <para>A nice collection of useful regex cases can be found in + <application>OmegaT</application> itself (see Options > Segmentation). + The following list includes expressions you may find useful when searching + through the translation memory:</para> + + <table> + <title>Regex - Examples of regular expressions in translations</title> + + <tgroup align="left" cols="2" rowsep="1"> + <colspec align="left" colnum="1"/> + + <thead> + <row> + <entry>Regular expression</entry> + + <entry>Finds the following:</entry> + </row> + </thead> + + <tbody> + <row> + <entry>(\b\w+\b)\s\1\b</entry> + + <entry>double words</entry> + </row> + + <row> + <entry>[\.,]\s*[\.,]+</entry> + + <entry>comma or a period, followed by spaces and yet another comma + or period</entry> + </row> + + <row> + <entry>\. \s+$</entry> + + <entry>extra spaces after the period at the end of the + line</entry> + </row> + + <row> + <entry>\s+a\s+[aeiou]</entry> + + <entry>English: words, beginning with vowels, should generally be + preceded by "an", not "a"</entry> + </row> + + <row> + <entry>\s+an\s+[^aeiou]</entry> + + <entry>English: the same check as above, but concerning consonants + ("a", not "an")</entry> + </row> + + <row> + <entry>\s{2,}</entry> + + <entry>more than one space</entry> + </row> + + <row> + <entry>\.[A-Z]</entry> + + <entry>Period, followed by an upper-case letter - possibly a space + is missing between the period and the start of a new + sentence?</entry> + </row> + + <row> + <entry>\bis\b</entry> + + <entry>search for “is”, not “this” or “isn't” etc.</entry> + </row> + </tbody> + </tgroup> + </table> + </section> +</appendix> \ No newline at end of file Property changes on: trunk/doc_src/en/App_Regexp.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/xml \ No newline at end of property Added: trunk/doc_src/en/App_ShortCutCustomization.xml =================================================================== --- trunk/doc_src/en/App_ShortCutCustomization.xml (rev 0) +++ trunk/doc_src/en/App_ShortCutCustomization.xml 2019-05-14 04:15:40 UTC (rev 10701) @@ -0,0 +1,1197 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "../../../docbook-xml-4.5/docbookx.dtd"> +<appendix id="appendix.shortcut.custom"> + <title>Shortcuts customization</title> + + <section id="ch04.shortcuts.customization"> + <title>Shortcuts customization</title> + + <para>Most of the items that appear in the main menu can have a new + shortcut assigned. You can change the already assigned shortcuts and add + new shortcuts by putting a shortcut definition file in your + <application>OmegaT</application> preferences folder (accessible by + <menuchoice> + <guimenuitem>Options</guimenuitem> + + <guimenuitem>Access Configuration Folder</guimenuitem> + </menuchoice> menu).</para> + + <para>The shortcut definition file must be named + <filename>MainMenuShortcuts.properties</filename> and must contain at most + one shortcut definition per line. Empty lines are accepted and comment + lines should start with "//". Anything after the "//" will be + ignored.</para> + + <para>Once the <filename>MainMenuShortcuts.properties</filename> file is + modified, <application>OmegaT</application> must be relaunched to take the + new shortcuts into account.</para> + + <para>The shortcut definition syntax is the following: <code><menu item + code>=<shortcut></code>, where <emphasis><menu item + code></emphasis> is a code taken from the tables below and + <emphasis><shortcut></emphasis> is a combination of pressed keys + specified by the user<footnote> + <para>The full syntax for keystrokes (shortcuts) is defined in the + following Java 1.6 documentation from Oracle (bottom of page): <ulink url="http://docs.oracle.com/javase/6/docs/api/javax/swing/KeyStroke.html">Java + 1.6 keystrokes shortcuts</ulink></para> + </footnote>.</para> + + <para><shortcut> must be of the following form: 0 or more + <code><modifier></code> followed by 0 or 1 + <code><event></code> followed by 1 <code><key></code>, + where:<itemizedlist> + <listitem> + <para><code><modifier></code> can be: + <emphasis>shift</emphasis>, <emphasis>control</emphasis>, + <emphasis>ctrl</emphasis>, <emphasis>meta</emphasis><footnote> + <para>On the Mac, the modifier <emphasis>meta</emphasis> must be + used to specify the <emphasis>command</emphasis> key.</para> + </footnote>, <emphasis>alt</emphasis>, + <emphasis>altGraph</emphasis></para> + </listitem> + + <listitem> + <para><code><event></code> can be: <emphasis>typed</emphasis>, + <emphasis>pressed</emphasis>, <emphasis>released</emphasis></para> + </listitem> + + <listitem> + <para>and <code><key></code> can be any key available on your + keyboard<footnote> + <para>The possible keyevents (keys) are listed in the following + Java 1.6 documentation from Oracle: <ulink url="http://docs.oracle.com/javase/6/docs/api/java/awt/event/KeyEvent.html">Java + 1.6 keyEvents description</ulink></para> + </footnote>.</para> + </listitem> + </itemizedlist></para> + + <para>For example, in the default OmegaT shortcuts<footnote> + <para>The default OmegaT shortcuts are available from Sourceforge: + <ulink url="https://sourceforge.net/p/omegat/svn/HEAD/tree/trunk/src/org/omegat/gui/main/MainMenuShortcuts.properties">Default + OmegaT Shortcuts</ulink></para> + + <para>The default OmegaT shortcuts for the Mac are also available from + Sourceforge, they all use "meta" instead of "ctrl": <ulink url="https://sourceforge.net/p/omegat/svn/HEAD/tree/trunk/src/org/omegat/gui/main/MainMenuShortcuts.mac.properties">Default + OmegaT Shortcuts for the Mac</ulink></para> + </footnote>, one can find:</para> + + <itemizedlist> + <listitem> + <para><code>projectOpenMenuItem=ctrl O</code></para> + </listitem> + + <listitem> + <para><code>editCreateGlossaryEntryMenuItem=ctrl shift G</code></para> + </listitem> + </itemizedlist> + + <para>The first is the shortcut for <guimenuitem>Open + Project</guimenuitem>, the second for <guimenuitem>Create Glossary + Entry</guimenuitem>.</para> + + <para>If you want to use <keycombo> + <keycap>Shift</keycap> + + <keycap>Ctrl</keycap> + + <keycap>O</keycap> + </keycombo> to open a project, modify your + <filename>MainMenuShortcuts.properties</filename> as follows:<code> + </code></para> + + <para><code>projectOpenMenuItem=shift ctrl O</code>.</para> + + <para>If you are on a Mac and you want to add a <keycombo> + <keycap>Shift</keycap> + + <keycap>Command</keycap> + + <keycap>S</keycap> + </keycombo> shortcut to <menuchoice> + <guimenu>Tools</guimenu> + + <guimenuitem>Statistics</guimenuitem> + </menuchoice>, add the following line to your + <filename>MainMenuShortcuts.properties</filename>:<code/></para> + + <para><code> toolsShowStatisticsStandardMenuItem=shift meta + S</code></para> + + <para>Save then the file and relaunch <application>OmegaT</application>. + Your new shortcuts should now appear next to the menu items you have + modified. If they do not conflict with system shortcuts, they should be + available from within OmegaT.</para> + </section> + + <section id="ch04.shortcuts.ProjectMenu"> + <title>Project Menu</title> + + <table> + <title>Project Menu</title> + + <tgroup cols="3" colsep="1"> + <colspec align="left" colname="1" colnum="1"/> + + <colspec align="left" colname="2" colnum="2"/> + + <colspec align="left" colname="3" colnum="3"/> + + <thead> + <row> + <entry>Menu Item</entry> + + <entry>Default shortcut</entry> + + <entry>Menu Item Code</entry> + </row> + </thead> + + <tbody> + <row> + <entry>New</entry> + + <entry><keycap>Ctrl+Shift+N</keycap></entry> + + <entry>projectNewMenuItem</entry> + </row> + + <row> + <entry>Download Team Project</entry> + + <entry/> + + <entry>projectTeamNewMenuItem</entry> + </row> + + <row> + <entry>Open</entry> + + <entry><keycap>Ctrl+O</keycap></entry> + + <entry>projectOpenMenuItem</entry> + </row> + + <row> + <entry>Open Recent Project</entry> + + <entry/> + + <entry>projectOpenRecentMenuItem</entry> + </row> + + <row> + <entry>Copy Files to Source Folder...</entry> + + <entry/> + + <entry>projectImportMenuItem</entry> + </row> + + <row> + <entry>Download MediaWiki Page...</entry> + + <entry/> + + <entry>projectWikiImportMenuItem</entry> + </row> + + <row> + <entry>Reload</entry> + + <entry><keycap>F5</keycap></entry> + + <entry>projectReloadMenuItem</entry> + </row> + + <row> + <entry>Close</entry> + + <entry><keycap>Ctrl+Shift+W</keycap></entry> + + <entry>projectCloseMenuItem</entry> + </row> + + <row> + <entry>Save</entry> + + <entry><keycap>Ctrl+S</keycap></entry> + + <entry>projectSaveMenuItem</entry> + </row> + + <row> + <entry>Create Translated Documents</entry> + + <entry><keycap>Ctrl+D</keycap></entry> + + <entry>projectCompileMenuItem</entry> + </row> + + <row> + <entry>Create Current Translated Documents</entry> + + <entry><keycap>Ctrl+Shift+D</keycap></entry> + + <entry>projectSingleCompileMenuItem</entry> + </row> + + <row> + <entry>Properties...</entry> + + <entry><keycap>Ctrl+E</keycap></entry> + + <entry>projectEditMenuItem</entry> + </row> + + <row> + <entry>Project Files...</entry> + + <entry><keycap>Ctrl+L</keycap></entry> + + <entry>viewFileListMenuItem</entry> + </row> + + <row> + <entry>Access Project Contents/Root</entry> + + <entry/> + + <entry>projectAccessRootMenuItem</entry> + </row> + + <row> + <entry>Access Project Contents/Dictionaries</entry> + + <entry/> + + <entry>projectAccessDictionaryMenuItem</entry> + </row> + + <row> + <entry>Access Project Contents/Glossaries</entry> + + <entry/> + + <entry>projectAccessGlossaryMenuItem</entry> + </row> + + <row> + <entry>Access Project Contents/Source Files</entry> + + <entry/> + + <entry>projectAccessSourceMenuItem </entry> + </row> + + <row> + <entry>Access Project Contents/Target Files</entry> + + <entry/> + + <entry>projectAccessTargetMenuItem</entry> + </row> + + <row> + <entry>Access Project Contents/Current Source Document</entry> + + <entry/> + + <entry>projectAccessCurrentSourceDocumentMenuItem</entry> + </row> + + <row> + <entry>Access Project Contents/Current Target Document</entry> + + <entry/> + + <entry>projectAccessCurrentTargetDocumentMenuItem</entry> + </row> + + <row> + <entry>Access Project Contents/Writeable Glossary</entry> + + <entry/> + + <entry>projectAccessWriteableGlossaryMenuItem</entry> + </row> + + <row> + <entry>Quit</entry> + + <entry><keycap>Ctrl+Q</keycap></entry> + + <entry>projectExitMenuItem</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + + <section id="ch04.shortcuts.EditMenu"> + <title>Edit Menu</title> + + <table> + <title>Edit Menu</title> + + <tgroup cols="3" colsep="1"> + <colspec align="left" colname="1" colnum="1"/> + + <colspec align="left" colname="2" colnum="2"/> + + <colspec align="left" colname="3" colnum="3"/> + + <thead> + <row> + <entry>Menu Item</entry> + + <entry>Default shortcut</entry> + + <entry>Menu Item Code</entry> + </row> + </thead> + + <tbody> + <row> + <entry>Undo Last Action</entry> + + <entry><keycap>Ctrl+Z</keycap></entry> + + <entry>editUndoMenuItem</entry> + </row> + + <row> + <entry>Redo Last Action</entry> + + <entry><keycap>Ctrl+Y</keycap></entry> + + <entry>editRedoMenuItem</entry> + </row> + + <row> + <entry>Replace With Match or Selection</entry> + + <entry><keycap>Ctrl+R</keycap></entry> + + <entry>editOverwriteTranslationMenuItem</entry> + </row> + + <row> + <entry>Insert Match or Selection</entry> + + <entry><keycap>Ctrl+I</keycap></entry> + + <entry>editInsertTranslationMenuItem</entry> + </row> + + <row> + <entry>Replace with Machine Translation</entry> + + <entry><keycap>Ctrl+M</keycap></entry> + + <entry>editOverwriteMachineTranslationMenuItem</entry> + </row> + + <row> + <entry>Replace With Source</entry> + + <entry><keycap>Ctrl+Shift+R</keycap></entry> + + <entry>editOverwriteSourceMenuItem</entry> + </row> + + <row> + <entry>Insert Source</entry> + + <entry><keycap>Ctrl+Shift+I</keycap></entry> + + <entry>editInsertSourceMenuItem</entry> + </row> + + <row> + <entry>Insert Missing Source Tags</entry> + + <entry><keycap>Ctrl+Shift+T</keycap></entry> + + <entry>editTagPainterMenuItem</entry> + </row> + + <row> + <entry>Insert Next Missing Tag</entry> + + <entry><keycap>Ctrl+T</keycap></entry> + + <entry>editTagNextMissedMenuItem</entry> + </row> + + <row> + <entry>Export Selection</entry> + + <entry><keycap>Ctrl+Shift+C</keycap></entry> + + <entry>editExportSelectionMenuItem</entry> + </row> + + <row> + <entry>Create Glossary Entry</entry> + + <entry><keycap>Ctrl+Shift+G</keycap></entry> + + <entry>editCreateGlossaryEntryMenuItem</entry> + </row> + + <row> + <entry>Search Project...</entry> + + <entry><keycap>Ctrl+F</keycap></entry> + + <entry>editFindInProjectMenuItem</entry> + </row> + + <row> + <entry/> + + <entry><keycap>Ctrl+Shift+F</keycap></entry> + + <entry>findInProjectReuseLastWindow</entry> + </row> + + <row> + <entry>Search and Replace...</entry> + + <entry><keycap>Ctrl+K</keycap></entry> + + <entry>editReplaceInProjectMenuItem</entry> + </row> + + <row> + <entry>Switch Case To/Lower Case</entry> + + <entry/> + + <entry>lowerCaseMenuItem</entry> + </row> + + <row> + <entry>Switch Case To/Upper Case</entry> + + <entry/> + + <entry>upperCaseMenuItem</entry> + </row> + + <row> + <entry>Switch Case To/Title Case</entry> + + <entry/> + + <entry>titleCaseMenuItem</entry> + </row> + + <row> + <entry>Switch Case To/Sentence Case</entry> + + <entry/> + + <entry>sentenceCaseMenuItem</entry> + </row> + + <row> + <entry>Switch Case To/Cycle</entry> + + <entry><keycap>Shift+F3</keycap></entry> + + <entry>cycleSwitchCaseMenuItem</entry> + </row> + + <row> + <entry>Select Previous Match</entry> + + <entry><keycap>Ctrl+↑</keycap></entry> + + <entry>editSelectFuzzyPrevMenuItem</entry> + </row> + + <row> + <entry>Select Next Match</entry> + + <entry><keycap>Ctrl+↓</keycap></entry> + + <entry>editSelectFuzzyNextMenuItem</entry> + </row> + + <row> + <entry>Select Match #1</entry> + + <entry><keycap>Ctrl+1</keycap></entry> + + <entry>editSelectFuzzy1MenuItem</entry> + </row> + + <row> + <entry>Select Match #2</entry> + + <entry><keycap>Ctrl+2</keycap></entry> + + <entry>editSelectFuzzy2MenuItem</entry> + </row> + + <row> + <entry>Select Match #3</entry> + + <entry><keycap>Ctrl+3</keycap></entry> + + <entry>editSelectFuzzy3MenuItem</entry> + </row> + + <row> + <entry>Select Match #4</entry> + + <entry><keycap>Ctrl+4</keycap></entry> + + <entry>editSelectFuzzy4MenuItem</entry> + </row> + + <row> + <entry>Select Match #5</entry> + + <entry><keycap>Ctrl+5</keycap></entry> + + <entry>editSelectFuzzy5MenuItem</entry> + </row> + + <row> + <entry>Use as Default Translation</entry> + + <entry/> + + <entry>editMultipleDefault</entry> + </row> + + <row> + <entry>Create Alternative Translation</entry> + + <entry/> + + <entry>editMultipleAlternate</entry> + </row> + + <row> + <entry>Remove translation</entry> + + <entry/> + + <entry>editRegisterUntranslatedMenuItem</entry> + </row> + + <row> + <entry>Set empty translation</entry> + + <entry/> + + <entry>editRegisterEmptyMenuItem</entry> + </row> + + <row> + <entry>Register Identical Translation</entry> + + <entry><keycap>Ctrl+Shift+S</keycap></entry> + + <entry>editRegisterIdenticalMenuItem</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + + <section id="ch04.shortcuts.GoToMenu"> + <title>GoTo Menu</title> + + <table> + <title>GoTo Menu</title> + + <tgroup cols="3" colsep="1"> + <colspec align="left" colname="1" colnum="1"/> + + <colspec align="left" colname="2" colnum="2"/> + + <colspec align="left" colname="3" colnum="3"/> + + <thead> + <row> + <entry>Menu Item</entry> + + <entry>Default shortcut</entry> + + <entry>Menu Item Code</entry> + </row> + </thead> + + <tbody> + <row> + <entry>Next Untranslated Segment</entry> + + <entry><keycap>Ctrl+U</keycap></entry> + + <entry>gotoNextUntranslatedMenuItem</entry> + </row> + + <row> + <entry>Next Translated Segment</entry> + + <entry><keycap>Ctrl+Shift+U</keycap></entry> + + <entry>gotoNextTranslatedMenuItem</entry> + </row> + + <row> + <entry>Next Segment</entry> + + <entry><keycap>Ctrl+N</keycap> or <keycap>Enter</keycap> or + <keycap>Tab</keycap></entry> + + <entry>gotoNextSegmentMenuItem</entry> + </row> + + <row> + <entry>Previous Segment</entry> + + <entry><keycap>Ctrl+P</keycap> or <keycap>Ctrl+Enter</keycap> or + <keycap>Ctrl+Tab</keycap></entry> + + <entry>gotoPreviousSegmentMenuItem</entry> + </row> + + <row> + <entry>Segment number...</entry> + + <entry><keycap>Ctrl+J</keycap></entry> + + <entry>gotoSegmentMenuItem</entry> + </row> + + <row> + <entry>Next Note</entry> + + <entry/> + + <entry>gotoNextNoteMenuItem</entry> + </row> + + <row> + <entry>Previous Note</entry> + + <entry/> + + <entry>gotoPreviousNoteMenuItem</entry> + </row> + + <row> + <entry>Next Unique Segment</entry> + + <entry><keycap>Ctrl+Shift+Q</keycap></entry> + + <entry>gotoNextUniqueMenuItem</entry> + </row> + + <row> + <entry>Source of Selected Match</entry> + + <entry><keycap>Ctrl+Shift+M</keycap></entry> + + <entry>gotoMatchSourceSegment</entry> + </row> + + <row> + <entry>Forward in history...</entry> + + <entry><keycap>Ctrl+Shift+N</keycap></entry> + + <entry>gotoHistoryForwardMenuItem</entry> + </row> + + <row> + <entry>Back in history...</entry> + + <entry><keycap>Ctrl+Shift+P</keycap></entry> + + <entry>gotoHistoryBackMenuItem</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + + <section id="ch04.shortcuts.ViewMenu"> + <title>View Menu</title> + + <table> + <title>View Menu</title> + + <tgroup cols="3" colsep="1"> + <colspec align="left" colname="1" colnum="1"/> + + <colspec align="left" colname="2" colnum="2"/> + + <colspec align="left" colname="3" colnum="3"/> + + <thead> + <row> + <entry>Menu Item</entry> + + <entry>Default shortcut</entry> + + <entry>Menu Item Code</entry> + </row> + </thead> + + <tbody> + <row> + <entry>Mark Translated Segments</entry> + + <entry/> + + <entry>viewMarkTranslatedSegmentsCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Mark Untranslated Segments</entry> + + <entry/> + + <entry>viewMarkUntranslatedSegmentsCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Display Source Segments</entry> + + <entry/> + + <entry>viewDisplaySegmentSourceCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Mark Non-Unique Segments</entry> + + <entry/> + + <entry>viewMarkNonUniqueSegmentsCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Mark Segments with Notes</entry> + + <entry/> + + <entry>viewMarkNotedSegmentsCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Mark Non-breakable Spaces</entry> + + <entry/> + + <entry>viewMarkNBSPCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Mark Whitespace</entry> + + <entry/> + + <entry>viewMarkWhitespaceCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Mark Bidirectional Algorithm Control Characters</entry> + + <entry/> + + <entry>viewMarkBidiCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Mark Auto-Populated Segments</entry> + + <entry/> + + <entry>viewMarkAutoPopulatedCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Modification Info/Display None</entry> + + <entry/> + + <entry>viewDisplayModificationInfoNoneRadioButtonMenuItem</entry> + </row> + + <row> + <entry>Modification Info/Display Selected</entry> + + <entry/> + + <entry>viewDisplayModificationInfoSelectedRadioButtonMenuItem</entry> + </row> + + <row> + <entry>Modification Info/Display All</entry> + + <entry/> + + <entry>viewDisplayModificationInfoAllRadioButtonMenuItem</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + + <section id="ch04.shortcuts.ToolsMenu"> + <title>Tools Menu</title> + + <table> + <title>Tools Menu</title> + + <tgroup cols="3" colsep="1"> + <colspec align="left" colname="1" colnum="1"/> + + <colspec align="left" colname="2" colnum="2"/> + + <colspec align="left" colname="3" colnum="3"/> + + <thead> + <row> + <entry>Menu Item</entry> + + <entry>Default shortcut</entry> + + <entry>Menu Item Code</entry> + </row> + </thead> + + <tbody> + <row> + <entry>Validate Tags</entry> + + <entry><keycap>Ctrl+Shift+V</keycap></entry> + + <entry>toolsValidateTagsMenuItem</entry> + </row> + + <row> + <entry>Validate Tags for Current Document</entry> + + <entry/> + + <entry>toolsSingleValidateTagsMenuItem</entry> + </row> + + <row> + <entry>Statistics</entry> + + <entry/> + + <entry>toolsShowStatisticsStandardMenuItem</entry> + </row> + + <row> + <entry>Match Statistics</entry> + + <entry/> + + <entry>toolsShowStatisticsMatchesMenuItem</entry> + </row> + + <row> + <entry>Match Statistics per File</entry> + + <entry/> + + <entry>toolsShowStatisticsMatchesPerFileMenuItem</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + + <section id="ch04.shortcuts.OptionsMenu"> + <title>Options Menu</title> + + <table> + <title>Options Menu</title> + + <tgroup cols="3" colsep="1"> + <colspec align="left" colname="1" colnum="1"/> + + <colspec align="left" colname="2" colnum="2"/> + + <colspec align="left" colname="3" colnum="3"/> + + <thead> + <row> + <entry>Menu Item</entry> + + <entry>Default shortcut</entry> + + <entry>Menu Item Code</entry> + </row> + </thead> + + <tbody> + <row> + <entry>Use TAB To Advance</entry> + + <entry/> + + <entry>optionsTabAdvanceCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Always Confirm Quit</entry> + + <entry/> + + <entry>optionsAlwaysConfirmQuitCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Glossary/Display Context Description for TBX + Glossaries</entry> + + <entry/> + + <entry>optionsGlossaryTBXDisplayContextCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Use Terms Appearing Separately in the Source Text</entry> + + <entry/> + + <entry>optionsGlossaryExactMatchCheckBoxMenuItem</entry> + </row> + + <row> + <entry>Glossary/Use Stemming for Glossary Entries</entry> + + <entry/> + + <entry>optionsGlossaryStemmingCheckBoxMenuItem</entry> + </row> + + <row> + <entry>TransTips/Enable Transtips</entry> + + <entry/> + + <entry>optionsTransTipsEnableMenuItem</entry> + </row> + + <row> + <entry>Auto-completion/Show Relevant Suggestions + Automatically</entry> + + <entry/> + + <entry>optionsAutoCompleteShowAutomaticallyItem</entry> + </row> + + <row> + <entry>Auto-completion/Glossary...</entry> + + <entry/> + + <entry>optionsAutoCompleteGlossaryMenuItem</entry> + </row> + + <row> + <entry>Auto-completion/Auto-text...</entry> + + <entry/> + + <entry>optionsAutoCompleteAutoTextMenuItem</entry> + </row> + + <row> + <entry>Auto-completion/Character Table...</entry> + + <entry/> + + <entry>optionsAutoCompleteCharTableMenuItem</entry> + </row> + + <row> + <entry>Font...</entry> + + <entry/> + + <entry>optionsFontSelectionMenuItem</entry> + </row> + + <row> + <entry>Custom Colours...</entry> + + <entry/> + + <entry>optionsColorsSelection... [truncated message content] |
From: <bri...@us...> - 2019-05-13 15:23:14
|
Revision: 10700 http://sourceforge.net/p/omegat/svn/10700 Author: briac_pilpre Date: 2019-05-13 15:23:08 +0000 (Mon, 13 May 2019) Log Message: ----------- Restore mistakenly erased line. Modified Paths: -------------- trunk/src/org/omegat/gui/editor/EditorController.java Modified: trunk/src/org/omegat/gui/editor/EditorController.java =================================================================== --- trunk/src/org/omegat/gui/editor/EditorController.java 2019-05-13 15:16:49 UTC (rev 10699) +++ trunk/src/org/omegat/gui/editor/EditorController.java 2019-05-13 15:23:08 UTC (rev 10700) @@ -448,6 +448,7 @@ case FIRST_ENTRY: displayedFileIndex = 0; displayedEntryIndex = 0; + updatedTitle = StringUtil.format(OStrings.getString("GUI_SUBWINDOWTITLE_Editor"), getCurrentFile()); data = editor; SwingUtilities.invokeLater(() -> { // need to run later because some other event listeners This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-13 15:16:52
|
Revision: 10699 http://sourceforge.net/p/omegat/svn/10699 Author: briac_pilpre Date: 2019-05-13 15:16:49 +0000 (Mon, 13 May 2019) Log Message: ----------- Make sure the Editor Title is always updated after activating/jumping segments. [bugs:#909] Modified Paths: -------------- trunk/src/org/omegat/gui/editor/EditorController.java Modified: trunk/src/org/omegat/gui/editor/EditorController.java =================================================================== --- trunk/src/org/omegat/gui/editor/EditorController.java 2019-05-13 12:59:17 UTC (rev 10698) +++ trunk/src/org/omegat/gui/editor/EditorController.java 2019-05-13 15:16:49 UTC (rev 10699) @@ -435,19 +435,19 @@ JComponent data = null; + String updatedTitle = null; switch (showType) { case INTRO: data = introPane; - title = introPaneTitle; + updatedTitle = introPaneTitle; break; case EMPTY_PROJECT: data = emptyProjectPane; - title = emptyProjectPaneTitle; + updatedTitle = emptyProjectPaneTitle; break; case FIRST_ENTRY: displayedFileIndex = 0; displayedEntryIndex = 0; - title = StringUtil.format(OStrings.getString("GUI_SUBWINDOWTITLE_Editor"), getCurrentFile()); data = editor; SwingUtilities.invokeLater(() -> { // need to run later because some other event listeners @@ -454,16 +454,16 @@ // should be called before loadDocument(); gotoEntry(LastSegmentManager.getLastSegmentNumber()); + updateTitleCurrentFile(); }); break; case NO_CHANGE: - title = StringUtil.format(OStrings.getString("GUI_SUBWINDOWTITLE_Editor"), getCurrentFile()); + updatedTitle = StringUtil.format(OStrings.getString("GUI_SUBWINDOWTITLE_Editor"), getCurrentFile()); data = editor; break; } - updateTitle(); - pane.setToolTipText(title); + updateTitle(updatedTitle); if (scrollPane.getViewport().getView() != data) { if (UIManager.getBoolean("OmegaTDockablePanel.isProportionalMargins")) { @@ -547,9 +547,19 @@ }; private void updateTitle() { - pane.setName(StaticUIUtils.truncateToFit(title, pane, 70)); + pane.setName(StaticUIUtils.truncateToFit(title, pane, 70)); + pane.setToolTipText(title); } + private void updateTitleCurrentFile() { + updateTitle(StringUtil.format(OStrings.getString("GUI_SUBWINDOWTITLE_Editor"), getCurrentFile())); + } + + private void updateTitle(String title) { + this.title = title; + updateTitle(); + } + private void setFont(final Font font) { this.font = font; editor.setFont(font); @@ -1538,6 +1548,7 @@ } activateEntry(pos); editor.setCursor(oldCursor); + updateTitleCurrentFile(); } public void gotoEntry(String srcString, EntryKey key) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <am...@us...> - 2019-05-13 12:59:27
|
Revision: 10698 http://sourceforge.net/p/omegat/svn/10698 Author: amake Date: 2019-05-13 12:59:17 +0000 (Mon, 13 May 2019) Log Message: ----------- Change Mac overtype toggle key to F3 The Insert key is rarely present on Mac keyboards Modified Paths: -------------- trunk/src/org/omegat/gui/main/EditorShortcuts.mac.properties Modified: trunk/src/org/omegat/gui/main/EditorShortcuts.mac.properties =================================================================== --- trunk/src/org/omegat/gui/main/EditorShortcuts.mac.properties 2019-05-13 08:25:25 UTC (rev 10697) +++ trunk/src/org/omegat/gui/main/EditorShortcuts.mac.properties 2019-05-13 12:59:17 UTC (rev 10698) @@ -16,7 +16,7 @@ editorSkipNextTokenWithSelection=alt shift RIGHT editorSkipPrevTokenWithSelection=alt shift LEFT editorToggleCursorLock=F2 -editorToggleOvertype=INSERT +editorToggleOvertype=F3 ## Autocompleter ## autocompleterTrigger=ESCAPE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-13 08:25:28
|
Revision: 10697 http://sourceforge.net/p/omegat/svn/10697 Author: briac_pilpre Date: 2019-05-13 08:25:25 +0000 (Mon, 13 May 2019) Log Message: ----------- - When switching to overwrite mode, we force the caret damage to have the rectangle to correctly show up instead of half of it. - The overwrite caret should follow the size of the current character. Modified Paths: -------------- trunk/src/org/omegat/gui/editor/EditorTextArea3.java Modified: trunk/src/org/omegat/gui/editor/EditorTextArea3.java =================================================================== --- trunk/src/org/omegat/gui/editor/EditorTextArea3.java 2019-05-13 01:03:48 UTC (rev 10696) +++ trunk/src/org/omegat/gui/editor/EditorTextArea3.java 2019-05-13 08:25:25 UTC (rev 10697) @@ -32,6 +32,7 @@ import java.awt.Cursor; import java.awt.Font; +import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Point; import java.awt.Rectangle; @@ -502,21 +503,14 @@ if (overtypeMode) { // Change the caret shape, width and color setCaretColor(Styles.EditorColor.COLOR_BACKGROUND.getColor()); + putClientProperty("caretWidth", getCaretWidth()); + + // We need to force the caret damage to have the rectangle to correctly show up, + // otherwise half of the caret is shown. try { - int pos = getCaretPosition(); - Rectangle v = Java8Compat.modelToView(this, pos); - Rectangle rPos = v != null ? v.getBounds() : new Rectangle(); - int caretX = rPos.x; - int caretEndX = rPos.x; - if (pos < getDocument().getLength()) { - v = Java8Compat.modelToView(this, pos + 1); - Rectangle rNextPos = v != null ? v.getBounds() : new Rectangle(); - - if (rPos.y == rNextPos.y) { - caretEndX = rNextPos.x; - } - } - putClientProperty("caretWidth", Math.max(1, caretEndX - caretX + 1)); + OvertypeCaret caret = (OvertypeCaret) getCaret(); + Rectangle r = Java8Compat.modelToView(this, caret.getDot()); + caret.damage(r); } catch (BadLocationException e) { e.printStackTrace(); } @@ -842,13 +836,26 @@ super.replaceSelection(content); } + /** Get the caret width from the size of the current letter. */ + private int getCaretWidth() { + FontMetrics fm = getFontMetrics(getFont()); + int carWidth = 1; + try { + carWidth = fm.stringWidth(getText(getCaretPosition(), 1)); + } catch (BadLocationException e) { + /* empty */ + } + return carWidth; + } + private class OvertypeCaret extends DefaultCaret { @Override public void paint(Graphics g) { if (overtypeMode) { - int w = (Integer) getClientProperty("caretWidth"); + int caretWidth = getCaretWidth(); + putClientProperty("caretWidth", caretWidth); g.setXORMode(Styles.EditorColor.COLOR_FOREGROUND.getColor()); - g.translate(w / 2, 0); + g.translate(caretWidth / 2, 0); super.paint(g); } else { super.paint(g); @@ -859,7 +866,7 @@ protected synchronized void damage(Rectangle r) { if (overtypeMode) { if (r != null) { - int damageWidth = (Integer) getClientProperty("caretWidth"); + int damageWidth = getCaretWidth(); x = r.x - 4 - (damageWidth / 2); y = r.y; width = 9 + 3 * damageWidth / 2; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <am...@us...> - 2019-05-13 01:03:51
|
Revision: 10696 http://sourceforge.net/p/omegat/svn/10696 Author: amake Date: 2019-05-13 01:03:48 +0000 (Mon, 13 May 2019) Log Message: ----------- Fix Mac crash on launch due to missing shortcut definition Modified Paths: -------------- trunk/src/org/omegat/gui/main/EditorShortcuts.mac.properties Modified: trunk/src/org/omegat/gui/main/EditorShortcuts.mac.properties =================================================================== --- trunk/src/org/omegat/gui/main/EditorShortcuts.mac.properties 2019-05-12 09:03:38 UTC (rev 10695) +++ trunk/src/org/omegat/gui/main/EditorShortcuts.mac.properties 2019-05-13 01:03:48 UTC (rev 10696) @@ -16,6 +16,7 @@ editorSkipNextTokenWithSelection=alt shift RIGHT editorSkipPrevTokenWithSelection=alt shift LEFT editorToggleCursorLock=F2 +editorToggleOvertype=INSERT ## Autocompleter ## autocompleterTrigger=ESCAPE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-12 09:03:40
|
Revision: 10695 http://sourceforge.net/p/omegat/svn/10695 Author: briac_pilpre Date: 2019-05-12 09:03:38 +0000 (Sun, 12 May 2019) Log Message: ----------- Updated test by adding showLockInsertMessage message to IMainWindow. Modified Paths: -------------- trunk/test-integration/src/org/omegat/core/data/TestTeamIntegrationChild.java Modified: trunk/test-integration/src/org/omegat/core/data/TestTeamIntegrationChild.java =================================================================== --- trunk/test-integration/src/org/omegat/core/data/TestTeamIntegrationChild.java 2019-05-12 08:25:09 UTC (rev 10694) +++ trunk/test-integration/src/org/omegat/core/data/TestTeamIntegrationChild.java 2019-05-12 09:03:38 UTC (rev 10695) @@ -518,6 +518,9 @@ public void addDockable(Dockable pane) { } + + public void showLockInsertMessage(String messageText, String toolTip) { + } }; /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-12 08:25:12
|
Revision: 10694 http://sourceforge.net/p/omegat/svn/10694 Author: briac_pilpre Date: 2019-05-12 08:25:09 +0000 (Sun, 12 May 2019) Log Message: ----------- Updated test by adding showLockInsertMessage message to IMainWindow. Modified Paths: -------------- trunk/test/src/org/omegat/core/TestCore.java Modified: trunk/test/src/org/omegat/core/TestCore.java =================================================================== --- trunk/test/src/org/omegat/core/TestCore.java 2019-05-12 08:07:01 UTC (rev 10693) +++ trunk/test/src/org/omegat/core/TestCore.java 2019-05-12 08:25:09 UTC (rev 10694) @@ -155,6 +155,9 @@ public void showMessageDialog(String message) { } + + public void showLockInsertMessage(String messageText, String toolTip) { + } }); Core.setCurrentProject(new NotLoadedProject()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-12 08:07:04
|
Revision: 10693 http://sourceforge.net/p/omegat/svn/10693 Author: briac_pilpre Date: 2019-05-12 08:07:01 +0000 (Sun, 12 May 2019) Log Message: ----------- Cursor lock and Insert/Overwrite mode status indicator (RFE#1165) Modified Paths: -------------- trunk/release/changes.txt Modified: trunk/release/changes.txt =================================================================== --- trunk/release/changes.txt 2019-05-12 07:57:20 UTC (rev 10692) +++ trunk/release/changes.txt 2019-05-12 08:07:01 UTC (rev 10693) @@ -1,7 +1,7 @@ ---------------------------------------------------------------------- OmegaT 4.2.1 ---------------------------------------------------------------------- - 4 Enhancements + 5 Enhancements 0 Bug fixes 0 Localisation updates ---------------------------------------------------------------------- @@ -22,6 +22,9 @@ - In the editor, the "Insert" key switches between Edit and Overwrite mode. https://sourceforge.net/p/omegat/feature-requests/45/ + - Cursor lock and Insert/Overwrite mode status indicator (LCK/UNL | INS/OVR at the bottom right of the status bar) + https://sourceforge.net/p/omegat/feature-requests/1165/ + ---------------------------------------------------------------------- OmegaT 4.2.0 (2019-04-23) ---------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-12 07:57:23
|
Revision: 10692 http://sourceforge.net/p/omegat/svn/10692 Author: briac_pilpre Date: 2019-05-12 07:57:20 +0000 (Sun, 12 May 2019) Log Message: ----------- Cursor lock and Insert/Overwrite mode status indicator (RFE#1165) Modified Paths: -------------- trunk/src/org/omegat/Bundle.properties trunk/src/org/omegat/gui/editor/EditorTextArea3.java trunk/src/org/omegat/gui/main/ConsoleWindow.java trunk/src/org/omegat/gui/main/IMainWindow.java trunk/src/org/omegat/gui/main/MainWindow.java trunk/src/org/omegat/gui/main/MainWindowUI.java Modified: trunk/src/org/omegat/Bundle.properties =================================================================== --- trunk/src/org/omegat/Bundle.properties 2019-05-11 17:08:57 UTC (rev 10691) +++ trunk/src/org/omegat/Bundle.properties 2019-05-12 07:57:20 UTC (rev 10692) @@ -518,12 +518,15 @@ MW_STATUS_SAVED=Project saved -MW_STATUS_CURSOR_LOCK_ON=Cursor lock on -MW_STATUS_CURSOR_LOCK_OFF=Cursor lock off +MW_STATUS_TIP_CURSOR_LOCK_ON=Cursor locked +MW_STATUS_TIP_CURSOR_LOCK_OFF=Cursor unlocked +MW_STATUS_TIP_CURSOR_OVERTYPE_ON=Overwrite Mode +MW_STATUS_TIP_CURSOR_OVERTYPE_OFF=Insert Mode +MW_STATUS_CURSOR_LOCK_ON=LCK +MW_STATUS_CURSOR_LOCK_OFF=UNL +MW_STATUS_CURSOR_OVERTYPE_ON=OVR +MW_STATUS_CURSOR_OVERTYPE_OFF=INS -MW_STATUS_INSERT_MODE=Insert Mode -MW_STATUS_OVERWRITE_MODE=Overwrite Mode - MW_SEGMENT_LENGTH_DEFAULT=\ --/-- MW_QUIT_CONFIRM=Do you really want to quit? MW_SEGMENT_LENGTH_TOOLTIP=Source/translation lengths (characters) Modified: trunk/src/org/omegat/gui/editor/EditorTextArea3.java =================================================================== --- trunk/src/org/omegat/gui/editor/EditorTextArea3.java 2019-05-11 17:08:57 UTC (rev 10691) +++ trunk/src/org/omegat/gui/editor/EditorTextArea3.java 2019-05-12 07:57:20 UTC (rev 10692) @@ -67,6 +67,7 @@ import org.omegat.gui.editor.autocompleter.AutoCompleter; import org.omegat.gui.shortcuts.PropertiesShortcuts; import org.omegat.util.Java8Compat; +import org.omegat.util.OStrings; import org.omegat.util.StringUtil; import org.omegat.util.gui.DockingUI; import org.omegat.util.gui.StaticUIUtils; @@ -190,6 +191,8 @@ setForeground(Styles.EditorColor.COLOR_FOREGROUND.getColor()); setCaretColor(Styles.EditorColor.COLOR_FOREGROUND.getColor()); setBackground(Styles.EditorColor.COLOR_BACKGROUND.getColor()); + + updateLockInsertMessage(); } @Override @@ -448,11 +451,11 @@ processed = moveCursorOverTag(true, true); } else if (s.equals(KEYSTROKE_TOGGLE_CURSOR_LOCK)) { boolean lockEnabled = !lockCursorToInputArea; - final String key = lockEnabled ? "MW_STATUS_CURSOR_LOCK_ON" : "MW_STATUS_CURSOR_LOCK_OFF"; - Core.getMainWindow().showStatusMessageRB(key); lockCursorToInputArea = lockEnabled; + updateLockInsertMessage(); } else if (s.equals(KEYSTROKE_TOGGLE_OVERTYPE)) { processed = switchOvertypeMode(); + updateLockInsertMessage(); } // leave standard processing if need @@ -483,10 +486,17 @@ } } + private void updateLockInsertMessage() { + String lock = OStrings.getString("MW_STATUS_CURSOR_LOCK_" + (lockCursorToInputArea ? "ON" : "OFF")); + String ins = OStrings.getString("MW_STATUS_CURSOR_OVERTYPE_" + (overtypeMode ? "ON" : "OFF")); + + String lockTip = OStrings.getString("MW_STATUS_TIP_CURSOR_LOCK_" + (lockCursorToInputArea ? "ON" : "OFF")); + String insTip = OStrings.getString("MW_STATUS_TIP_CURSOR_OVERTYPE_" + (overtypeMode ? "ON" : "OFF")); + Core.getMainWindow().showLockInsertMessage(lock + " | " + ins, lockTip + " | " + insTip); + } + private boolean switchOvertypeMode() { boolean switchOvertypeMode = !overtypeMode; - final String key = switchOvertypeMode ? "MW_STATUS_OVERWRITE_MODE" : "MW_STATUS_INSERT_MODE"; - Core.getMainWindow().showTimedStatusMessageRB(key); overtypeMode = switchOvertypeMode; if (overtypeMode) { Modified: trunk/src/org/omegat/gui/main/ConsoleWindow.java =================================================================== --- trunk/src/org/omegat/gui/main/ConsoleWindow.java 2019-05-11 17:08:57 UTC (rev 10691) +++ trunk/src/org/omegat/gui/main/ConsoleWindow.java 2019-05-12 07:57:20 UTC (rev 10692) @@ -157,4 +157,9 @@ System.out.println(message); } + @Override + public void showLockInsertMessage(String messageText, String toolTip) { + /* empty */ + } + } Modified: trunk/src/org/omegat/gui/main/IMainWindow.java =================================================================== --- trunk/src/org/omegat/gui/main/IMainWindow.java 2019-05-11 17:08:57 UTC (rev 10691) +++ trunk/src/org/omegat/gui/main/IMainWindow.java 2019-05-12 07:57:20 UTC (rev 10692) @@ -97,6 +97,14 @@ void showLengthMessage(String messageText); /** + * Show message indicating the state of the Lock cursor and Insert/overwrite mode + * + * @param messageText + * message text + */ + void showLockInsertMessage(String messageText, String toolTip); + + /** * Display warning. * * @param warningKey Modified: trunk/src/org/omegat/gui/main/MainWindow.java =================================================================== --- trunk/src/org/omegat/gui/main/MainWindow.java 2019-05-11 17:08:57 UTC (rev 10691) +++ trunk/src/org/omegat/gui/main/MainWindow.java 2019-05-12 07:57:20 UTC (rev 10692) @@ -109,6 +109,7 @@ protected JLabel lengthLabel; protected JLabel progressLabel; protected JLabel statusLabel; + protected JLabel lockInsertLabel; protected DockingDesktop desktop; @@ -401,6 +402,11 @@ lengthLabel.setText(messageText); } + public void showLockInsertMessage(String messageText, String toolTip) { + lockInsertLabel.setText(messageText); + lockInsertLabel.setToolTipText(toolTip); + } + // ///////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////// // display oriented code Modified: trunk/src/org/omegat/gui/main/MainWindowUI.java =================================================================== --- trunk/src/org/omegat/gui/main/MainWindowUI.java 2019-05-11 17:08:57 UTC (rev 10691) +++ trunk/src/org/omegat/gui/main/MainWindowUI.java 2019-05-12 07:57:20 UTC (rev 10692) @@ -191,6 +191,7 @@ mainWindow.statusLabel = new JLabel(); mainWindow.progressLabel = new JLabel(); mainWindow.lengthLabel = new JLabel(); + mainWindow.lockInsertLabel = new JLabel(); mainWindow.statusLabel.setFont(mainWindow.statusLabel.getFont().deriveFont(11f)); @@ -241,6 +242,7 @@ mainWindow.lengthLabel.setFocusable(false); JPanel statusPanel2 = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + statusPanel2.add(mainWindow.lockInsertLabel); statusPanel2.add(mainWindow.progressLabel); statusPanel2.add(mainWindow.lengthLabel); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-11 17:09:06
|
Revision: 10691 http://sourceforge.net/p/omegat/svn/10691 Author: briac_pilpre Date: 2019-05-11 17:08:57 +0000 (Sat, 11 May 2019) Log Message: ----------- In the editor, the "Insert" key switches between Edit and Overwrite mode. (RFE #45) Modified Paths: -------------- trunk/release/changes.txt trunk/src/org/omegat/Bundle.properties trunk/src/org/omegat/gui/editor/EditorTextArea3.java trunk/src/org/omegat/gui/main/EditorShortcuts.properties Modified: trunk/release/changes.txt =================================================================== --- trunk/release/changes.txt 2019-05-09 17:11:08 UTC (rev 10690) +++ trunk/release/changes.txt 2019-05-11 17:08:57 UTC (rev 10691) @@ -1,7 +1,7 @@ ---------------------------------------------------------------------- OmegaT 4.2.1 ---------------------------------------------------------------------- - 3 Enhancements + 4 Enhancements 0 Bug fixes 0 Localisation updates ---------------------------------------------------------------------- @@ -19,6 +19,9 @@ Multiple Translations panes https://sourceforge.net/p/omegat/feature-requests/1415/ + - In the editor, the "Insert" key switches between Edit and Overwrite mode. + https://sourceforge.net/p/omegat/feature-requests/45/ + ---------------------------------------------------------------------- OmegaT 4.2.0 (2019-04-23) ---------------------------------------------------------------------- Modified: trunk/src/org/omegat/Bundle.properties =================================================================== --- trunk/src/org/omegat/Bundle.properties 2019-05-09 17:11:08 UTC (rev 10690) +++ trunk/src/org/omegat/Bundle.properties 2019-05-11 17:08:57 UTC (rev 10691) @@ -521,6 +521,9 @@ MW_STATUS_CURSOR_LOCK_ON=Cursor lock on MW_STATUS_CURSOR_LOCK_OFF=Cursor lock off +MW_STATUS_INSERT_MODE=Insert Mode +MW_STATUS_OVERWRITE_MODE=Overwrite Mode + MW_SEGMENT_LENGTH_DEFAULT=\ --/-- MW_QUIT_CONFIRM=Do you really want to quit? MW_SEGMENT_LENGTH_TOOLTIP=Source/translation lengths (characters) Modified: trunk/src/org/omegat/gui/editor/EditorTextArea3.java =================================================================== --- trunk/src/org/omegat/gui/editor/EditorTextArea3.java 2019-05-09 17:11:08 UTC (rev 10690) +++ trunk/src/org/omegat/gui/editor/EditorTextArea3.java 2019-05-11 17:08:57 UTC (rev 10691) @@ -32,7 +32,9 @@ import java.awt.Cursor; import java.awt.Font; +import java.awt.Graphics; import java.awt.Point; +import java.awt.Rectangle; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -48,6 +50,7 @@ import javax.swing.text.BadLocationException; import javax.swing.text.BoxView; import javax.swing.text.ComponentView; +import javax.swing.text.DefaultCaret; import javax.swing.text.Element; import javax.swing.text.IconView; import javax.swing.text.MutableAttributeSet; @@ -114,6 +117,8 @@ .getKeyStroke("editorSkipPrevTokenWithSelection"); private static final KeyStroke KEYSTROKE_TOGGLE_CURSOR_LOCK = PropertiesShortcuts.getEditorShortcuts() .getKeyStroke("editorToggleCursorLock"); + private static final KeyStroke KEYSTROKE_TOGGLE_OVERTYPE = PropertiesShortcuts.getEditorShortcuts() + .getKeyStroke("editorToggleOvertype"); /** Undo Manager to store edits */ protected final TranslationUndoManager undoManager = new TranslationUndoManager(this); @@ -134,6 +139,11 @@ */ protected boolean lockCursorToInputArea = true; + /** + * Flag indicating if the editor is in Insert (false) or Overwrite (true) mode. + */ + protected boolean overtypeMode = false; + public EditorTextArea3(EditorController controller) { this.controller = controller; setEditorKit(new StyledEditorKit() { @@ -153,6 +163,11 @@ addMouseListener(mouseListener); + // Custom caret for overtype mode + OvertypeCaret c = new OvertypeCaret(); + c.setBlinkRate(getCaret().getBlinkRate()); + setCaret(c); + addCaretListener(e -> { try { int start = EditorUtils.getWordStart(EditorTextArea3.this, e.getMark()); @@ -436,6 +451,8 @@ final String key = lockEnabled ? "MW_STATUS_CURSOR_LOCK_ON" : "MW_STATUS_CURSOR_LOCK_OFF"; Core.getMainWindow().showStatusMessageRB(key); lockCursorToInputArea = lockEnabled; + } else if (s.equals(KEYSTROKE_TOGGLE_OVERTYPE)) { + processed = switchOvertypeMode(); } // leave standard processing if need @@ -466,6 +483,41 @@ } } + private boolean switchOvertypeMode() { + boolean switchOvertypeMode = !overtypeMode; + final String key = switchOvertypeMode ? "MW_STATUS_OVERWRITE_MODE" : "MW_STATUS_INSERT_MODE"; + Core.getMainWindow().showTimedStatusMessageRB(key); + overtypeMode = switchOvertypeMode; + + if (overtypeMode) { + // Change the caret shape, width and color + setCaretColor(Styles.EditorColor.COLOR_BACKGROUND.getColor()); + try { + int pos = getCaretPosition(); + Rectangle v = Java8Compat.modelToView(this, pos); + Rectangle rPos = v != null ? v.getBounds() : new Rectangle(); + int caretX = rPos.x; + int caretEndX = rPos.x; + if (pos < getDocument().getLength()) { + v = Java8Compat.modelToView(this, pos + 1); + Rectangle rNextPos = v != null ? v.getBounds() : new Rectangle(); + + if (rPos.y == rNextPos.y) { + caretEndX = rNextPos.x; + } + } + putClientProperty("caretWidth", Math.max(1, caretEndX - caretX + 1)); + } catch (BadLocationException e) { + e.printStackTrace(); + } + } else { + // reset to default insert caret + setCaretColor(Styles.EditorColor.COLOR_FOREGROUND.getColor()); + putClientProperty("caretWidth", 1); + } + return true; + } + private boolean isNavigationKey(int keycode) { switch (keycode) { // if caret is moved over existing chars, check and fix caret position @@ -766,4 +818,47 @@ this.constructor = constructor; } } + + @Override + public void replaceSelection(String content) { + // Overwrite current selection, and if at the end of the segment, allow + // inserting new text. + if (isEditable() && overtypeMode && getSelectionStart() == getSelectionEnd() + && getCaretPosition() < getOmDocument().getTranslationEnd()) { + int pos = getCaretPosition(); + int lastPos = Math.min(getDocument().getLength(), pos + content.length()); + select(pos, lastPos); + } + super.replaceSelection(content); + } + + private class OvertypeCaret extends DefaultCaret { + @Override + public void paint(Graphics g) { + if (overtypeMode) { + int w = (Integer) getClientProperty("caretWidth"); + g.setXORMode(Styles.EditorColor.COLOR_FOREGROUND.getColor()); + g.translate(w / 2, 0); + super.paint(g); + } else { + super.paint(g); + } + } + + @Override + protected synchronized void damage(Rectangle r) { + if (overtypeMode) { + if (r != null) { + int damageWidth = (Integer) getClientProperty("caretWidth"); + x = r.x - 4 - (damageWidth / 2); + y = r.y; + width = 9 + 3 * damageWidth / 2; + height = r.height; + repaint(); + } + } else { + super.damage(r); + } + } + } } Modified: trunk/src/org/omegat/gui/main/EditorShortcuts.properties =================================================================== --- trunk/src/org/omegat/gui/main/EditorShortcuts.properties 2019-05-09 17:11:08 UTC (rev 10690) +++ trunk/src/org/omegat/gui/main/EditorShortcuts.properties 2019-05-11 17:08:57 UTC (rev 10691) @@ -16,6 +16,7 @@ editorSkipNextTokenWithSelection=ctrl shift RIGHT editorSkipPrevTokenWithSelection=ctrl shift LEFT editorToggleCursorLock=F2 +editorToggleOvertype=INSERT ## Autocompleter ## autocompleterTrigger=ctrl SPACE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <am...@us...> - 2019-05-09 17:11:14
|
Revision: 10690 http://sourceforge.net/p/omegat/svn/10690 Author: amake Date: 2019-05-09 17:11:08 +0000 (Thu, 09 May 2019) Log Message: ----------- Regenerate OmegaT.exe with Launch4j 3.12 Modified Paths: -------------- trunk/release/win32-specific/L4j_OMT.xml trunk/release/win32-specific/OmegaT.exe Property Changed: ---------------- trunk/release/win32-specific/OmegaT.exe Modified: trunk/release/win32-specific/L4j_OMT.xml =================================================================== --- trunk/release/win32-specific/L4j_OMT.xml 2019-05-09 13:59:29 UTC (rev 10689) +++ trunk/release/win32-specific/L4j_OMT.xml 2019-05-09 17:11:08 UTC (rev 10690) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <launch4jConfig> <dontWrapJar>true</dontWrapJar> <headerType>gui</headerType> @@ -8,15 +9,18 @@ <chdir></chdir> <priority>normal</priority> <downloadUrl>http://java.com/download</downloadUrl> - <supportUrl>http://groups.yahoo.com/group/OmegaT/</supportUrl> - <customProcName>true</customProcName> + <supportUrl>https://groups.yahoo.com/neo/groups/OmegaT/info</supportUrl> <stayAlive>false</stayAlive> + <restartOnCrash>false</restartOnCrash> <manifest></manifest> - <icon>..\..\images\OmegaT.ico</icon> + <icon>../../images/OmegaT.ico</icon> <jre> <path>jre</path> + <bundledJre64Bit>false</bundledJre64Bit> + <bundledJreAsFallback>false</bundledJreAsFallback> <minVersion>1.8.0</minVersion> <maxVersion></maxVersion> <jdkPreference>jreOnly</jdkPreference> + <runtimeBits>64/32</runtimeBits> </jre> </launch4jConfig> \ No newline at end of file Modified: trunk/release/win32-specific/OmegaT.exe =================================================================== (Binary files differ) Index: trunk/release/win32-specific/OmegaT.exe =================================================================== --- trunk/release/win32-specific/OmegaT.exe 2019-05-09 13:59:29 UTC (rev 10689) +++ trunk/release/win32-specific/OmegaT.exe 2019-05-09 17:11:08 UTC (rev 10690) Property changes on: trunk/release/win32-specific/OmegaT.exe ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <am...@us...> - 2019-05-09 13:59:35
|
Revision: 10689 http://sourceforge.net/p/omegat/svn/10689 Author: amake Date: 2019-05-09 13:59:29 +0000 (Thu, 09 May 2019) Log Message: ----------- Use innosetup5 tag Modified Paths: -------------- trunk/release/ci/iscc Modified: trunk/release/ci/iscc =================================================================== --- trunk/release/ci/iscc 2019-05-08 23:52:06 UTC (rev 10688) +++ trunk/release/ci/iscc 2019-05-09 13:59:29 UTC (rev 10689) @@ -12,4 +12,4 @@ done } -exec docker run --rm -i -v "$PWD":/work $(bindpaths "$@") amake/innosetup $(relpaths "$@") +exec docker run --rm -i -v "$PWD":/work $(bindpaths "$@") amake/innosetup:innosetup5 $(relpaths "$@") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <am...@us...> - 2019-05-08 23:52:09
|
Revision: 10688 http://sourceforge.net/p/omegat/svn/10688 Author: amake Date: 2019-05-08 23:52:06 +0000 (Wed, 08 May 2019) Log Message: ----------- Add direct(er) download links for Docker Modified Paths: -------------- trunk/doc_src/Readme.md Modified: trunk/doc_src/Readme.md =================================================================== --- trunk/doc_src/Readme.md 2019-05-08 23:12:44 UTC (rev 10687) +++ trunk/doc_src/Readme.md 2019-05-08 23:52:06 UTC (rev 10688) @@ -11,6 +11,12 @@ script provided in `doc_src`. Arguments to `docgen` are the same as the arguments to `ant` described below in the Usage section. +Get Docker without needing to make an account: + +- [Docker Desktop for Windows](https://docs.docker.com/docker-for-windows/install/#install-docker-desktop-for-windows-desktop-app) +- [Docker Desktop for Mac](https://docs.docker.com/docker-for-mac/release-notes/) +- [Docker CE for Linux](https://docs.docker.com/install/#supported-platforms) + See also: - [docgen-docker](https://github.com/omegat-org/docgen-docker): source for the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <am...@us...> - 2019-05-08 23:12:51
|
Revision: 10687 http://sourceforge.net/p/omegat/svn/10687 Author: amake Date: 2019-05-08 23:12:44 +0000 (Wed, 08 May 2019) Log Message: ----------- Clarify, clean up changes.txt Modified Paths: -------------- trunk/release/changes.txt Modified: trunk/release/changes.txt =================================================================== --- trunk/release/changes.txt 2019-05-08 21:30:02 UTC (rev 10686) +++ trunk/release/changes.txt 2019-05-08 23:12:44 UTC (rev 10687) @@ -1,7 +1,7 @@ ---------------------------------------------------------------------- OmegaT 4.2.1 ---------------------------------------------------------------------- - 2 Enhancements + 3 Enhancements 0 Bug fixes 0 Localisation updates ---------------------------------------------------------------------- @@ -11,11 +11,12 @@ - Search results panel supports custom color scheme https://sourceforge.net/p/omegat/feature-requests/1065/ - + - Added a shortcut to jump to the selected search result (Ctrl+J by default). https://sourceforge.net/p/omegat/feature-requests/1416/ - - - Context menu is available on most panels (Glossary, Fuzzy Matches, Multiple Translations) + + - Context menu keyboard shortcut supported in Glossary, Fuzzy Matches, + Multiple Translations panes https://sourceforge.net/p/omegat/feature-requests/1415/ ---------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-08 21:30:11
|
Revision: 10686 http://sourceforge.net/p/omegat/svn/10686 Author: briac_pilpre Date: 2019-05-08 21:30:02 +0000 (Wed, 08 May 2019) Log Message: ----------- Context menu is available on most panels (Glossary, Fuzzy Matches, Multiple Translations) (RFE 1415) Modified Paths: -------------- trunk/release/changes.txt trunk/src/org/omegat/gui/glossary/GlossaryTextArea.java trunk/src/org/omegat/gui/matches/MatchesTextArea.java trunk/src/org/omegat/gui/multtrans/MultipleTransPane.java Modified: trunk/release/changes.txt =================================================================== --- trunk/release/changes.txt 2019-05-08 21:01:06 UTC (rev 10685) +++ trunk/release/changes.txt 2019-05-08 21:30:02 UTC (rev 10686) @@ -15,6 +15,8 @@ - Added a shortcut to jump to the selected search result (Ctrl+J by default). https://sourceforge.net/p/omegat/feature-requests/1416/ + - Context menu is available on most panels (Glossary, Fuzzy Matches, Multiple Translations) + https://sourceforge.net/p/omegat/feature-requests/1415/ ---------------------------------------------------------------------- OmegaT 4.2.0 (2019-04-23) Modified: trunk/src/org/omegat/gui/glossary/GlossaryTextArea.java =================================================================== --- trunk/src/org/omegat/gui/glossary/GlossaryTextArea.java 2019-05-08 21:01:06 UTC (rev 10685) +++ trunk/src/org/omegat/gui/glossary/GlossaryTextArea.java 2019-05-08 21:30:02 UTC (rev 10686) @@ -39,6 +39,7 @@ import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; @@ -54,7 +55,9 @@ import javax.swing.JCheckBoxMenuItem; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; +import javax.swing.KeyStroke; import javax.swing.text.AttributeSet; +import javax.swing.text.Caret; import javax.swing.text.JTextComponent; import javax.swing.text.StyledDocument; @@ -67,6 +70,7 @@ import org.omegat.gui.editor.EditorUtils; import org.omegat.gui.main.DockableScrollPane; import org.omegat.gui.main.IMainWindow; +import org.omegat.gui.shortcuts.PropertiesShortcuts; import org.omegat.util.Log; import org.omegat.util.OConsts; import org.omegat.util.OStrings; @@ -99,7 +103,6 @@ private static final AttributeSet NO_ATTRIBUTES = Styles.createAttributeSet(null, null, false, null); private static final AttributeSet PRIORITY_ATTRIBUTES = Styles.createAttributeSet(null, null, true, null); - /** * Currently processed entry. Used to detect if user moved into new entry. In this case, new find should * be started. @@ -297,6 +300,20 @@ } @Override + protected void processKeyEvent(KeyEvent e) { + KeyStroke s = KeyStroke.getKeyStrokeForEvent(e); + if (s.equals(PropertiesShortcuts.getEditorShortcuts().getKeyStroke("editorContextMenu"))) { + JPopupMenu popup = new JPopupMenu(); + populateContextMenu(popup); + Caret caret = getCaret(); + Point p = caret == null ? getMousePosition() : caret.getMagicCaretPosition(); + popup.show(this, (int) p.getX(), (int) p.getY()); + e.consume(); + } + super.processKeyEvent(e); + } + + @Override public void showCreateGlossaryEntryDialog(final Frame parent) { CreateGlossaryEntry d = createGlossaryEntryDialog; if (d != null) { @@ -404,4 +421,5 @@ }); menu.add(notify); } + } Modified: trunk/src/org/omegat/gui/matches/MatchesTextArea.java =================================================================== --- trunk/src/org/omegat/gui/matches/MatchesTextArea.java 2019-05-08 21:01:06 UTC (rev 10685) +++ trunk/src/org/omegat/gui/matches/MatchesTextArea.java 2019-05-08 21:30:02 UTC (rev 10686) @@ -36,6 +36,7 @@ import java.awt.Point; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; @@ -54,8 +55,10 @@ import javax.swing.JCheckBoxMenuItem; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; +import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import javax.swing.text.AttributeSet; +import javax.swing.text.Caret; import javax.swing.text.StyledDocument; import org.omegat.core.Core; @@ -71,6 +74,7 @@ import org.omegat.gui.main.IMainWindow; import org.omegat.gui.preferences.PreferencesWindowController; import org.omegat.gui.preferences.view.TMMatchesPreferencesController; +import org.omegat.gui.shortcuts.PropertiesShortcuts; import org.omegat.tokenizer.ITokenizer; import org.omegat.util.Java8Compat; import org.omegat.util.OConsts; @@ -673,4 +677,18 @@ .show(Core.getMainWindow().getApplicationFrame(), TMMatchesPreferencesController.class)); menu.add(prefs); } + + @Override + protected void processKeyEvent(KeyEvent e) { + KeyStroke s = KeyStroke.getKeyStrokeForEvent(e); + if (s.equals(PropertiesShortcuts.getEditorShortcuts().getKeyStroke("editorContextMenu"))) { + JPopupMenu popup = new JPopupMenu(); + populateContextMenu(popup, activeMatch); + Caret caret = getCaret(); + Point p = caret == null ? getMousePosition() : caret.getMagicCaretPosition(); + popup.show(this, (int) p.getX(), (int) p.getY()); + e.consume(); + } + super.processKeyEvent(e); + } } Modified: trunk/src/org/omegat/gui/multtrans/MultipleTransPane.java =================================================================== --- trunk/src/org/omegat/gui/multtrans/MultipleTransPane.java 2019-05-08 21:01:06 UTC (rev 10685) +++ trunk/src/org/omegat/gui/multtrans/MultipleTransPane.java 2019-05-08 21:30:02 UTC (rev 10686) @@ -30,6 +30,7 @@ import java.awt.Point; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; @@ -39,6 +40,8 @@ import javax.swing.JCheckBoxMenuItem; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; +import javax.swing.KeyStroke; +import javax.swing.text.Caret; import javax.swing.text.JTextComponent; import org.omegat.core.Core; @@ -48,6 +51,7 @@ import org.omegat.gui.editor.SegmentBuilder; import org.omegat.gui.main.DockableScrollPane; import org.omegat.gui.main.IMainWindow; +import org.omegat.gui.shortcuts.PropertiesShortcuts; import org.omegat.util.Java8Compat; import org.omegat.util.OStrings; import org.omegat.util.Preferences; @@ -266,4 +270,18 @@ notify.isSelected())); menu.add(notify); } + + @Override + protected void processKeyEvent(KeyEvent e) { + KeyStroke s = KeyStroke.getKeyStrokeForEvent(e); + if (s.equals(PropertiesShortcuts.getEditorShortcuts().getKeyStroke("editorContextMenu"))) { + JPopupMenu popup = new JPopupMenu(); + Caret caret = getCaret(); + Point p = caret == null ? getMousePosition() : caret.getMagicCaretPosition(); + populateContextMenu(popup, Java8Compat.viewToModel(MultipleTransPane.this, p)); + popup.show(this, (int) p.getX(), (int) p.getY()); + e.consume(); + } + super.processKeyEvent(e); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-08 21:01:14
|
Revision: 10685 http://sourceforge.net/p/omegat/svn/10685 Author: briac_pilpre Date: 2019-05-08 21:01:06 +0000 (Wed, 08 May 2019) Log Message: ----------- Updated documentation screenshots for 4.2 on Windows 10. Modified Paths: -------------- trunk/doc_src4/en/images/DictMerriamWebster.png trunk/doc_src4/en/images/GlossaryEntry_25.png trunk/doc_src4/en/images/GlossaryPane_25.png trunk/doc_src4/en/images/MultiTerm_Glossary_25.png trunk/doc_src4/en/images/SpellcheckerSetup_25.png trunk/doc_src4/en/images/SpellcheckingText.png Modified: trunk/doc_src4/en/images/DictMerriamWebster.png =================================================================== (Binary files differ) Modified: trunk/doc_src4/en/images/GlossaryEntry_25.png =================================================================== (Binary files differ) Modified: trunk/doc_src4/en/images/GlossaryPane_25.png =================================================================== (Binary files differ) Modified: trunk/doc_src4/en/images/MultiTerm_Glossary_25.png =================================================================== (Binary files differ) Modified: trunk/doc_src4/en/images/SpellcheckerSetup_25.png =================================================================== (Binary files differ) Modified: trunk/doc_src4/en/images/SpellcheckingText.png =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <am...@us...> - 2019-05-08 14:28:11
|
Revision: 10684 http://sourceforge.net/p/omegat/svn/10684 Author: amake Date: 2019-05-08 14:28:02 +0000 (Wed, 08 May 2019) Log Message: ----------- Cleanup, corrections to Installing And Running manual chapter - Update OmegaT major version in distfile names - Update memory usage info - Correct outdated info about macOS configuration - Fix incorrect Docbook tag usage, tag nesting - Remove erroneous CLI options: - --output-tag-validation- doesn't exist - --tag-validation described twice Modified Paths: -------------- trunk/doc_src4/en/InstallingAndRunning.xml Modified: trunk/doc_src4/en/InstallingAndRunning.xml =================================================================== --- trunk/doc_src4/en/InstallingAndRunning.xml 2019-05-08 14:27:28 UTC (rev 10683) +++ trunk/doc_src4/en/InstallingAndRunning.xml 2019-05-08 14:28:02 UTC (rev 10684) @@ -17,12 +17,12 @@ <itemizedlist> <listitem> <para><emphasis role="bold">Yes: </emphasis>download - <emphasis>OmegaT_3.n.n_Windows_without_JRE.exe</emphasis>.</para> + <filename>OmegaT_4.n.n_Windows_without_JRE.exe</filename>.</para> </listitem> <listitem> - <para><emphasis role="bold">No / I don't know:</emphasis> - download<emphasis> OmegaT_3.n.n_Windows.exe.</emphasis></para> + <para><emphasis role="bold">No / I don't know:</emphasis> download + <filename>OmegaT_4.n.n_Windows.exe</filename>.</para> <para>This package is bundled with Oracle's Java Runtime Environment. This JRE will not interfere with other Java @@ -37,19 +37,19 @@ <para>To install <application>OmegaT</application>, double-click on the program you have downloaded.</para> - <para>At the beginning of the installation you can select the language - to be used during the installation. In the following window you can - indicate that the language selected is to be used in OmegaT. If you - check the corresponding checkbox, the OmegaT.l4J.ini file is modified to - use the language selected (see next section for details). Later, after - you have accepted the license agreement, the setup program asks you - whether you wish to create a folder in the <emphasis>start</emphasis> - menu, and whether you wish to create a shortcut on the desktop and in - the quick launch bar - you can create these shortcuts later by dragging - <emphasis><application>OmegaT</application>.exe</emphasis> to the - desktop or to the start menu to link it from there. The last frame - offers you to have a look at the readme and changes files for the - version you have installed.</para> + <para>At the beginning of the installation you can select the language to + be used during the installation. In the following window you can indicate + that the language selected is to be used in OmegaT. If you check the + corresponding checkbox, the <filename>OmegaT.l4J.ini</filename> file is + modified to use the language selected (see next section for + details). Later, after you have accepted the license agreement, the setup + program asks you whether you wish to create a folder in the + <emphasis>Start</emphasis> menu, and whether you wish to create a shortcut + on the desktop and in the quick launch bar - you can create these + shortcuts later by dragging <filename>OmegaT.exe</filename> to the desktop + or to the Start menu to link it from there. The last frame offers you to + have a look at the readme and changes files for the version you have + installed.</para> </section> <section id="running.OmegaT.Windows"> @@ -56,19 +56,18 @@ <title>Running <application>OmegaT</application></title> <para>Once <application>OmegaT</application> is installed, you can click - on <emphasis><application>OmegaT</application>.jar</emphasis> to launch - it directly or you can launch it directly from the command line.</para> + on <filename>OmegaT.jar</filename> to launch it directly or you can launch + it directly from the command line.</para> - <para>The simplest way to launch OmegaT, however, is to execute - the<emphasis> <application>OmegaT</application>.exe</emphasis> program. - The options for the program start-up in this case will be read from the - <emphasis><application>OmegaT</application>.l4J.ini </emphasis>file, - which resides in the same folder as the exe file and which you can edit - to reflect your setup. The following example for the INI file reserves - 1GB of memory, requests French as the user language and Canada as the - country:</para> + <para>The simplest way to launch OmegaT, however, is to execute the + <filename>OmegaT.exe</filename> program. The options for the program + start-up in this case will be read from the + <filename>OmegaT.l4J.ini</filename> file, which resides in the same folder + as the exe file and which you can edit to reflect your setup. The + following example for the INI file reserves 1 GB of memory, requests French + as the user language and Canada as the country:</para> - <literallayout><code># OmegaT.exe runtime configuration + <programlisting># OmegaT.exe runtime configuration # To use a parameter, remove the '#' before the '-' # Memory -Xmx1024M @@ -75,12 +74,12 @@ # Language -Duser.language=FR # Country --Duser.country=CA </code></literallayout> +-Duser.country=CA</programlisting> <para>Advice: if OmegaT works slowly in Remote Desktop sessions under Windows, you may use this option:</para> - <literallayout><code>-Dsun.java2d.noddraw=false</code></literallayout> + <programlisting>-Dsun.java2d.noddraw=false</programlisting> </section> <section> @@ -96,14 +95,14 @@ <itemizedlist> <listitem> - <para><emphasis role="bold">Install over the existing installation. - </emphasis>To do this, simply select the same installation folder as - the existing installation when installing the new version. The "old" - version of OmegaT will be overwritten, but any settings from it will - be retained. This includes preferences set from within OmegaT, any - changes you have made to your<filename> OmegaT.l4J.ini</filename> - file, and also your launch script (.bat file), if you are using - one.</para> + <para><emphasis role="bold">Install over the existing + installation.</emphasis> To do this, simply select the same + installation folder as the existing installation when installing the + new version. The "old" version of OmegaT will be overwritten, but any + settings from it will be retained. This includes preferences set from + within OmegaT, any changes you have made to your + <filename>OmegaT.l4J.ini</filename> file, and also your launch script + (<filename>.bat</filename> file), if you are using one.</para> </listitem> </itemizedlist> @@ -112,17 +111,17 @@ <itemizedlist> <listitem> - <para><emphasis role="bold">Install to a new folder. </emphasis>This - will enable you to keep both versions side-by-side, which you may - wish to do until you feel comfortable with the new version. This - method will also use preferences and settings you have made from - within OmegaT. In this case, however:</para> + <para><emphasis role="bold">Install to a new folder.</emphasis> This + will enable you to keep both versions side-by-side, which you may wish + to do until you feel comfortable with the new version. This method + will also use preferences and settings you have made from within + OmegaT. In this case, however:</para> <itemizedlist> <listitem> - <para>If you have made changes to your<filename> OmegaT.l4J.ini - </filename>file and/or are using a .bat file, you must copy - these over.</para> + <para>If you have made changes to your + <filename>OmegaT.l4J.ini</filename> file and/or are using a .bat + file, you must copy these over.</para> </listitem> </itemizedlist> @@ -150,12 +149,12 @@ <itemizedlist> <listitem> <para><emphasis role="bold">Yes: </emphasis>download - <emphasis>OmegaT_3.n.n_Without_JRE.zip</emphasis>.</para> + <filename>OmegaT_4.n.n_Without_JRE.zip</filename>.</para> </listitem> <listitem> <para><emphasis role="bold">No / I don't know:</emphasis> download - <emphasis>OmegaT_3.n.n_Linux.tar.bz2.</emphasis></para> + <filename>OmegaT_4.n.n_Linux.tar.bz2</filename>.</para> <para>This package is bundled with Oracle's Java Runtime Environment. This JRE will not interfere with other Java @@ -167,12 +166,13 @@ <section id="OmegaT.installation.Linux"> <title><application>Installing OmegaT</application></title> - <para>Unpack/untar the downloaded file. This will create an omegat/ - folder in the working folder in which you will find all the files needed - to run <application>OmegaT</application>. To untar the - <emphasis>.tar.gz</emphasis> file:</para> + <para>Unpack/untar the downloaded file. This will create an + <filename>omegat/</filename> folder in the working folder in which you + will find all the files needed to run + <application>OmegaT</application>. To untar the + <filename>.tar.gz</filename> file:</para> - <para><emphasis>$ tar xf downloaded_file.tar.gz</emphasis></para> + <programlisting>$ tar xf downloaded_file.tar.gz</programlisting> </section> <section id="adding.OmegaT.to.your.menus.or.panels"> @@ -190,7 +190,7 @@ <para>Press <emphasis role="bold"> <keysym>Alt+F2</keysym> </emphasis> to show KRunner. Type <emphasis>kmenuedit+enter</emphasis> to run the command. The - KMenuEditor appears. In KMenuEditor select <emphasis>File -> + KMenuEditor appears. In KMenuEditor select <emphasis>File > New Item.</emphasis></para> </listitem> @@ -214,9 +214,10 @@ </listitem> <listitem> - <para>Other Icons - Browse, and navigate to the /images subfolder - in the <application>OmegaT</application> application folder. - Select the <application>OmegaT</application>.png icon.</para> + <para>Other Icons - Browse, and navigate to the + <filename>/images</filename> subfolder in the + <application>OmegaT</application> application folder. Select the + <filename>OmegaT.png</filename> icon.</para> </listitem> <listitem> @@ -235,7 +236,7 @@ <itemizedlist> <listitem> <para>Right-click on the panel - <emphasis>Add New - Launcher.</emphasis></para> + Launcher</emphasis>.</para> </listitem> <listitem> @@ -248,14 +249,13 @@ <listitem> <para>Click on the icon button, then hit - <emphasis>Browse...</emphasis> and navigate to the /images - subfolder in the <application>OmegaT</application> application - folder. Select the - <emphasis><application>OmegaT</application>.png</emphasis> icon. - GNOME may fail to display the icon files in the available formats - and initially appear to expect an SVG file, but if the folder is - selected, the files should appear and - <application>OmegaT</application>.png can be selected.</para> + <guibutton>Browse...</guibutton> and navigate to the + <filename>/images</filename> subfolder in the + <application>OmegaT</application> application folder. Select the + <filename>OmegaT.png</filename> icon. GNOME may fail to display the + icon files in the available formats and initially appear to expect + an SVG file, but if the folder is selected, the files should appear + and <filename>OmegaT.png</filename> can be selected.</para> </listitem> </itemizedlist> </section> @@ -266,17 +266,16 @@ <para>You can launch OmegaT from the command line with a script that includes start-up options or you can click on - <emphasis><application>OmegaT</application>.jar</emphasis> to launch it - directly. Methods differ depending on the distribution. Make sure that - your <emphasis>PATH </emphasis>settings are correct and that - .<emphasis>jar</emphasis> files are properly associated with a Java - launcher. Check "Command line launching" below for more - information.</para> + <filename>OmegaT.jar</filename> to launch it directly. Methods differ + depending on the distribution. Make sure that your <varname>PATH</varname> + settings are correct and that <filename>.jar</filename> files are properly + associated with a Java launcher. Check "Command line launching" below for + more information.</para> </section> </section> <section id="MAC.OSX.users"> - <title>Mac OS X Users</title> + <title>macOS Users</title> <section id="which.package.to.download.OSX"> <title>Downloading the package</title> @@ -283,87 +282,78 @@ <para><application>OmegaT</application> contains the Java JRE 1.8</para> - <para>Download <emphasis>OmegaT_3.n.n_Mac.zip.</emphasis></para> + <para>Download <filename>OmegaT_4.n.n_Mac.zip</filename>.</para> </section> <section id="OmegaT.installation.OSX"> - <title><application>Installing OmegaT </application></title> + <title>Installing <application>OmegaT</application></title> - <para>Double click on <emphasis>OmegaT_3.n.n_Mac.zip</emphasis> to - unpack it. This creates a folder called <emphasis> - <application>OmegaT</application> </emphasis>. The folder contains 2 - files: index.html and - <emphasis><application>OmegaT</application>.app.</emphasis> Copy the - folder to a suitable folder (e.g. Applications). Once you have done - this, you can delete the <emphasis>OmegaT_3.n.n_Mac.zip</emphasis> file, - it is no longer needed.</para> + <para>Double click on <filename>OmegaT_4.n.n_Mac.zip</filename> to unpack + it. This creates a folder called <filename>OmegaT</filename>. The folder + contains 2 files: <filename>index.html</filename> and + <filename>OmegaT.app</filename>. Copy the folder to a suitable folder + (e.g. Applications). Once you have done this, you can delete the + <filename>OmegaT_4.n.n_Mac.zip</filename> file, it is no longer + needed.</para> </section> <section id="adding.OmegaT.to.the.dock"> <title>Adding <application>OmegaT</application> to the Dock</title> - <para>Drag and drop - <emphasis><application>OmegaT</application>.app</emphasis> onto the - Dock.</para> + <para>Drag and drop <filename>OmegaT.app</filename> onto the Dock.</para> </section> <section id="running.OmegaT.OSX"> <title>Running <application>OmegaT</application></title> - <para>Double-click on<emphasis> - <application>OmegaT</application>.app</emphasis> or click on its - location in the Dock.</para> + <para>Double-click on <filename>OmegaT.app</filename> or click + on its location in the Dock.</para> <para>You can modify OmegaT's behaviour by editing the <emphasis>Properties</emphasis> as well as the - <emphasis>Configuration.properties</emphasis> file in the + <filename>Configuration.properties</filename> file in the package.</para> - <para>To access - <application><emphasis>Configuration.properties</emphasis></application>, - right-click on - <emphasis><application>OmegaT</application>.app</emphasis> and select - "Show Package Contents", then open the file in Contents/Resources by + <para>To access <filename>Configuration.properties</filename>, right-click + on <filename>OmegaT.app</filename> and select "Show Package Contents", + then open the file in <filename>Contents/Resources</filename> by right-clicking on it and selecting your text editor of choice. You can - also "cd" there directly from the command line and open - <application><emphasis>Configuration.properties</emphasis> in a command - line editor like emacs or vi</application>.</para> + also <command>cd</command> there directly from the command line and open + <filename>Configuration.properties</filename> in a command line editor + like emacs or vi.</para> <para>Options are changed by modifying - <emphasis>Configuration.properties</emphasis>. For pre-defined options, - remove the # before a parameter to enable it. For example, - <filename>LANGUAGE="-Duser.language=ja"</filename> (without the #) will - launch <application>OmegaT</application> with the user interface in - Japanese.</para> + <filename>Configuration.properties</filename>. For pre-defined options, + remove the <literal>#</literal> before a parameter to enable it. For + example, <literal>user.language=ja</literal> (without the + <literal>#</literal>) will launch <application>OmegaT</application> with + the user interface in Japanese.</para> <para>To change the amount of memory available, edit - <emphasis>OmegaT.app/Contents/Info.plist</emphasis> file and change the - content of <string>-Xmx1024M</string>. For instance, - <string>-Xmx2048M</string> will launch OmegaT with 2 gigas - of memory.</para> + <filename>OmegaT.app/Contents/MacOS/OmegaT</filename> file and remove the + <literal>#</literal> before the + <literal>MEMORY=-Xmx<parameter>?</parameter>g</literal> entry. For + instance, <literal>MEMORY=-Xmx6g</literal> will launch OmegaT with 6 GB of + memory.</para> - <para>To launch multiple instances of - <emphasis><application>OmegaT</application>.app</emphasis>, double-click - the file <emphasis>OmegaT.sh</emphasis> located in - <emphasis><application>OmegaT</application>.app/ - Contents/MacOS/</emphasis>.</para> + <para>To launch multiple instances of <filename>OmegaT.app</filename>, + double-click the file <emphasis>OmegaT</emphasis> located in + <filename>OmegaT.app/Contents/MacOS/</filename>.</para> - <para>Use the <emphasis><application>OmegaT</application>.jar</emphasis> - file located in - <emphasis><application>OmegaT</application>.app/Contents/MacOS/Java/</emphasis> - to launch <application>OmegaT</application> from the command line. Check - "Command line launching" below for more information.</para> + <para>Use the <filename>OmegaT.jar</filename> file located in + <filename>OmegaT.app/Contents/MacOS/Java/</filename> to launch + <application>OmegaT</application> from the command line. Check "Command + line launching" below for more information.</para> </section> <section id="Mac.OSX.goodies"> - <title>Mac OS X goodies</title> + <title>macOS goodies</title> - <para><emphasis><application>OmegaT</application>.app</emphasis> can be - accessed from the Mac OS X Services. You can thus select a word anywhere - in <application>OmegaT</application> and use Services to check this - word, for instance in Spotlight or in Google. You can also use - AppleScript or Automator to create Services or scripts that will - automate frequent actions</para> + <para><filename>OmegaT.app</filename> can make use of macOS Services. You + can thus select a word anywhere in <application>OmegaT</application> and + use Services to check this word, for instance in Spotlight or in + Google. You can also use AppleScript or Automator to create Services or + scripts that will automate frequent actions.</para> </section> </section> @@ -371,7 +361,7 @@ <title>Other Systems</title> <para>This information applies to systems such as Solaris SPARC/x86/x64, - Linux x64/PowerPC, Windows x64</para> + Linux x64/PowerPC, Windows x64.</para> <section> <title id="which.package.to.download.other">Downloading the right @@ -388,30 +378,30 @@ <itemizedlist> <listitem> - <para><emphasis role="bold">Yes: </emphasis>download - <emphasis>OmegaT_3.n.n_Windows_without_JRE.</emphasis>zip. This - package can be used on any platform where a Java 8 JRE compatible - JRE is installed.</para> + <para><emphasis role="bold">Yes:</emphasis> download + <filename>OmegaT_4.n.n_Windows_without_JRE.zip</filename>. This + package can be used on any platform where a Java 8 compatible JRE + is installed.</para> </listitem> <listitem> <para><emphasis role="bold">I don't know:</emphasis> open a terminal - and type "java -version". If a "command not found" or similar - message is returned, it is likely that Java is not installed on your - system</para> + and type <command>java -version</command>. If a "command not found" or + similar message is returned, it is likely that Java is not installed + on your system.</para> </listitem> <listitem> - <para><emphasis role="bold">No:</emphasis> obtain a Java JRE for - your system (see below) and download - <emphasis>OmegaT_3.n.n_Without_JRE.zip</emphasis>.</para> + <para><emphasis role="bold">No:</emphasis> obtain a Java JRE for your + system (see below) and download + <filename>OmegaT_4.n.n_Without_JRE.zip</filename>.</para> <para>Oracle provides JREs for Solaris SPARC/x86 (Java 8) and for Linux x64, Solaris x64, Windows x64 (Java 8) at <ulink - url="http://www.oracle.com/technetwork/java/archive-139210.html">http://www.oracle.com/technetwork/java/archive-139210.html</ulink></para> + url="http://www.oracle.com/technetwork/java/archive-139210.html"/>.</para> <para>IBM provides JREs for Linux PowerPC at <ulink - url="http://www.ibm.com/developerworks/java/jdk/linux/download.html">http://www.ibm.com/developerworks/java/jdk/linux/download.htm</ulink></para> + url="http://www.ibm.com/developerworks/java/jdk/linux/download.html"/>.</para> <para>Follow the installation instructions of the package you need.</para> @@ -420,11 +410,11 @@ </section> <section id="OmegaT.installation.other"> - <title><application>Installing OmegaT</application></title> + <title>Installing <application>OmegaT</application></title> <para>To install <application>OmegaT</application>, simply unpack the - <emphasis role="bold">OmegaT_3.n.n_Without_JRE.zip</emphasis> file. This - creates an <emphasis>./OmegaT_3.n.n_Without_JRE/</emphasis> folder in + <filename>OmegaT_4.n.n_Without_JRE.zip</filename> file. This + creates an <filename>./OmegaT_4.n.n_Without_JRE/</filename> folder in the working folder with all the files necessary to run <application>OmegaT</application>.</para> </section> @@ -440,15 +430,14 @@ <section id="running.OmegaT.other"> <title>Running <application>OmegaT</application></title> - <para>Once <application>OmegaT</application> is installed, you can - launch it directly from the command line, you can create a script that - includes launch parameters for the command line or you can click on - <emphasis><application>OmegaT</application>.jar</emphasis> to launch it - directly. Methods differ depending on the distribution. Make sure that - your <emphasis>PATH</emphasis> settings are correct and that - <emphasis>.jar </emphasis> files are properly associated with a Java - launcher. Check "Command line launching" below for more - information.</para> + <para>Once <application>OmegaT</application> is installed, you can launch + it directly from the command line, you can create a script that includes + launch parameters for the command line or you can click on + <filename>OmegaT.jar</filename> to launch it directly. Methods differ + depending on the distribution. Make sure that your <varname>PATH</varname> + settings are correct and that <filename>.jar</filename> files are properly + associated with a Java launcher. Check "Command line launching" below for + more information.</para> </section> </section> @@ -471,29 +460,25 @@ Environment (JRE) used. To start OmegaT for the first time with Java Web Start, load the following URL in your browser:</para> - <para><emphasis>https://omegat.sourceforge.io/webstart/<application>OmegaT</application>.jnlp</emphasis></para> + <para><ulink url="https://omegat.sourceforge.io/webstart/OmegaT.jnlp"/></para> - <para>Download the file<emphasis> - <application>OmegaT</application>.jnlp</emphasis> and then click on it. - During the installation, depending on your operating system, you may - receive several security warnings. The permissions you give to this - version (which may appear as "unrestricted access to the computer") are - identical to the permissions you give to the local version, i.e., they - allow access to the hard drive of the computer. Subsequent clicks on - <emphasis><application>OmegaT</application>.jnlp</emphasis> will check for - any upgrades, install them, if there are any, and then start - <application>OmegaT</application>. After the initial installation you can, - of course, also use - <emphasis><application>OmegaT</application>.jnlp</emphasis> also when you - are offline.</para> + <para>Download the file <filename>OmegaT.jnlp</filename> and then click on + it. During the installation, depending on your operating system, you may + receive several security warnings. The permissions you give to this version + (which may appear as "unrestricted access to the computer") are identical to + the permissions you give to the local version, i.e., they allow access to + the hard drive of the computer. Subsequent clicks on + <filename>OmegaT.jnlp</filename> will check for any upgrades, install them, + if there are any, and then start <application>OmegaT</application>. After + the initial installation you can, of course, also use + <filename>OmegaT.jnlp</filename> also when you are offline.</para> <para><emphasis role="bold">Privacy</emphasis>: <application>OmegaT</application> Java Web Start does not save any of your - information beyond the computer on which you are running it. The - application runs on your machine only. Your documents and translation - memories remain on your computer, and the - <application>OmegaT</application> project will have no access to your work - or information.</para> + information beyond the computer on which you are running it. The application + runs on your machine only. Your documents and translation memories remain on + your computer, and the <application>OmegaT</application> project will have + no access to your work or information.</para> <para>Note that if you need or wish to use any of the launch command arguments (see above), you must use the normal installation.</para> @@ -512,36 +497,32 @@ <title>Opening a command line window</title> <para>A command line window is also referred to as a "terminal window". - On Windows it is called an "MS-DOS window" and is available from the - Start Menu, inside Programs, through the "MS-DOS" item. The Mac OS X - equivalent is the application Terminal located in Applications → - Utilities.</para> + On Windows it is called an "MS-DOS window" and is available from the Start + Menu, inside Programs, through the "MS-DOS" item. The macOS equivalent is + the application Terminal located in + <filename>Applications/Utilities</filename>.</para> <para>To launch <application>OmegaT</application>, you must normally type two commands. The first of these is:</para> - <para><emphasis> <literal>cd {folder}</literal> </emphasis></para> + <programlisting>cd <parameter>folder</parameter></programlisting> - <para>where<emphasis> {folder}</emphasis> is the name of the folder, - with complete path, in which your <application>OmegaT</application> - program - specifically, the file - <emphasis><application>OmegaT</application>.jar</emphasis> - is located. - In practice, this command will therefore be something like this:</para> + <para>where <parameter>folder</parameter> is the name of the folder, with + complete path, in which your <application>OmegaT</application> program - + specifically, the file <filename>OmegaT.jar</filename> - is located. In + practice, this command will therefore be something like this:</para> <para>On Windows</para> - <para><emphasis> <literal>cd C:\Program - Files\<application>OmegaT</application></literal> </emphasis></para> + <programlisting>cd C:\Program Files\OmegaT</programlisting> - <para>On Mac OS X</para> + <para>On macOS</para> - <para><literal> <literal>cd <<application>OmegaT</application>.app - location>/<application>OmegaT</application>.app/Contents/Resources/Java/</literal> - </literal></para> + <programlisting>cd <parameter><OmegaT.app location></parameter>/OmegaT.app/Contents/Resources/Java/</programlisting> <para>On Linux</para> - <para><literal>cd /usr/local/omegat</literal></para> + <programlisting>cd /usr/local/omegat</programlisting> <para>This command changes the folder to the folder containing the executable <application>OmegaT</application> file. The second command is @@ -548,12 +529,11 @@ the command which actually launches <application>OmegaT</application>. In its most basic form, this command is:</para> - <para><literal>java -jar - <application>OmegaT</application>.jar</literal></para> + <programlisting>java -jar OmegaT.jar</programlisting> - <para>Pay attention to the capitalization - in OS other than Windows, - the program will not start, if you enter <emphasis>omegat</emphasis> - instead of <emphasis>OmegaT </emphasis>!</para> + <para>Pay attention to the capitalization - in OS other than Windows, the + program will not start, if you enter <literal>omegat</literal> instead of + <literal>OmegaT</literal>!</para> <para>This method has a particular benefit of being suitable for finding causes of problems: if an error occurs during use of the program, an @@ -561,9 +541,9 @@ information on the cause of the error.</para> <para>The above method somewhat impractical way of launching a program - routinely. For this reason, the two commands described above are - contained in a file (a "script", also called a ".bat file" on Windows - systems).</para> + routinely. For this reason, the two commands described above are contained + in a file (a "script", also called a "<filename>.bat</filename> file" on + Windows systems).</para> <para>When this file is executed, the commands within it are automatically carried out. Consequently, to make changes to the launch @@ -573,12 +553,12 @@ <section id="launch.command.arguments"> <title>Launch command arguments</title> - <para>The basic command has already been mentioned above. Changes to - this command involve the addition of "arguments" to it. Arguments are - added after the initial <emphasis>"java"</emphasis>, and before the - <emphasis>"-jar <application>OmegaT</application>.jar"</emphasis>. Note - that in Windows you can change the <filename>OmegaT.l4J.ini</filename> - file to reflect your preferences. In other platforms, you can modify + <para>The basic command has already been mentioned above. Changes to this + command involve the addition of "arguments" to it. Arguments are added + after the initial <command>java</command>, and before the <literal>-jar + OmegaT.jar</literal>. Note that in Windows you can change the + <filename>OmegaT.l4J.ini</filename> file to reflect your preferences. In + other platforms, you can modify <filename>Configuration.properties</filename> file on the Mac, or <filename>OmegaT</filename> launcher under Linux to do the same.</para> @@ -591,28 +571,28 @@ <para><emphasis role="bold">User interface language </emphasis></para> - <para><emphasis role="bold">-Duser.language=XX</emphasis> Normally, - i.e. when <application>OmegaT</application> is launched without any - arguments, the program first detects the language of the user's - operating system. If a user interface in this language is available, - <application>OmegaT</application> uses it. So, if the user's - operating system is Russian and <application>OmegaT</application> - has been localized in Russian, <application>OmegaT</application> is - displayed with a Russian user interface, Russian menus, etc. If the - language of the user's system is not available, - <application>OmegaT</application> defaults to English. This is the - standard behavior.</para> + <para><emphasis + role="bold"><literal>-Duser.language=<parameter>XX</parameter></literal></emphasis> + Normally, i.e. when <application>OmegaT</application> is launched + without any arguments, the program first detects the language of the + user's operating system. If a user interface in this language is + available, <application>OmegaT</application> uses it. So, if the + user's operating system is Russian and + <application>OmegaT</application> has been localized in Russian, + <application>OmegaT</application> is displayed with a Russian user + interface, Russian menus, etc. If the language of the user's system is + not available, <application>OmegaT</application> defaults to + English. This is the standard behavior.</para> - <para>The <emphasis>"-Duser.language=XX"</emphasis> argument causes - <application>OmegaT</application> to use the language specified - rather than the language of the user's operating system. "XX" in the - command stands for the two-digit code of the desired language. To - launch <application>OmegaT</application> with a French interface - (for example on a Russian operating system), the command would - therefore be:</para> + <para>The <literal>-Duser.language=<parameter>XX</parameter></literal> + argument causes <application>OmegaT</application> to use the language + specified rather than the language of the user's operating + system. <parameter>XX</parameter> in the command stands for the + two-digit code of the desired language. To launch + <application>OmegaT</application> with a French interface (for example + on a Russian operating system), the command would therefore be:</para> - <para><literal>java -Duser.language=fr -jar - <application>OmegaT</application>.jar</literal></para> + <programlisting>java -Duser.language=fr -jar OmegaT.jar</programlisting> </listitem> </itemizedlist> @@ -620,12 +600,14 @@ <listitem> <para><emphasis role="bold">User country</emphasis></para> - <para><emphasis role="bold">-Duser.country=XX</emphasis> Besides the - language, you can also specify the country, for example CN or TW in - case of the Chinese language. To display the instant start guide in - the desired language, you need to specify both the language and the - country. This is necessary even if there's only one combination - available, like pt_BR in case of Portuguese / Brazil.</para> + <para><emphasis + role="bold">-Duser.country=<parameter>XX</parameter></emphasis> + Besides the language, you can also specify the country, for example + <literal>CN</literal> or <literal>TW</literal> in case of the Chinese + language. To display the instant start guide in the desired language, + you need to specify both the language and the country. This is + necessary even if there's only one combination available, like + <literal>pt_BR</literal> in case of Brazilian Portuguese.</para> </listitem> </itemizedlist> @@ -633,15 +615,16 @@ <listitem> <para><emphasis role="bold">Memory assignment</emphasis></para> - <para><emphasis role="bold">-XmxZZM </emphasis>This command assigns - more memory to <application>OmegaT</application>. By default, 512 MB - are assigned, so there is no advantage in assigning less than this - figure. "ZZ" stands for the amount of memory assigned, in megabytes. - The command to launch <application>OmegaT</application> with - assignment of 1024 MB (1 gigabyte) of memory is therefore:</para> + <para><emphasis + role="bold"><literal>-Xmx<parameter>??</parameter>M</literal></emphasis>This + command assigns more memory to <application>OmegaT</application>. By + default, 1024 MB are assigned, so there is no advantage in assigning + less than this figure. <parameter>??</parameter> stands for the amount + of memory assigned, in megabytes. The command to launch + <application>OmegaT</application> with assignment of 2048 MB (2 GB) of + memory is therefore:</para> - <para><literal>java -Xmx1024M -jar - <application>OmegaT</application>.jar</literal></para> + <programlisting>java -Xmx2048M -jar OmegaT.jar</programlisting> </listitem> <listitem> @@ -648,25 +631,27 @@ <para><emphasis role="bold">Proxy host IP address</emphasis></para> <para><emphasis - role="bold">-Dhttp.proxyHost=nnn.nnn.nnn.nnn</emphasis> The IP - address of your proxy server, if your system uses a proxy.</para> + role="bold"><literal>-Dhttp.proxyHost=<parameter>nnn.nnn.nnn.nnn</parameter></literal></emphasis> + The IP address of your proxy server, if your system uses a + proxy.</para> </listitem> <listitem> <para><emphasis role="bold">Proxy host port number</emphasis></para> - <para><emphasis role="bold">-Dhttp.proxyPort=NNNN</emphasis> The - port number your system uses to access the proxy server.</para> + <para><emphasis + role="bold"><literal>-Dhttp.proxyPort=<parameter>NNNN</parameter></literal></emphasis> + The port number your system uses to access the proxy server.</para> </listitem> <listitem> - <para><emphasis role="bold">Google Translate V2 </emphasis></para> + <para><emphasis role="bold">Google Translate V2</emphasis></para> <para><emphasis - role="bold">-Dgoogle.api.key=A123456789B123456789C123456789D12345678 - </emphasis> If you have signed up for the Google Translate services, - enter your private Google API key here. Note that the key is 38 - characters long.</para> + role="bold"><literal>-Dgoogle.api.key=<parameter>A123456789B123456789C123456789D12345678</parameter></literal></emphasis> + If you have signed up for the Google Translate services, enter your + private Google API key here. Note that the key is 38 characters + long.</para> </listitem> <listitem> @@ -681,27 +666,23 @@ url="https://datamarket.azure.com/account">account page</ulink> under Primary account key and Customer-ID:</para> - <para><emphasis - role="bold">-Dmicrosoft.api.client_id=</emphasis><emphasis - role="bold">XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX</emphasis></para> + <programlisting>-Dmicrosoft.api.client_id=<parameter>XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX</parameter></programlisting> - <para>-<emphasis - role="bold">Dmicrosoft.api.client_secret=XXXX9xXxX9xXXxxXXX9xxX99xXXXX9xx9XXxXxXXXXX=</emphasis></para> + <programlisting>-Dmicrosoft.api.client_secret=<parameter>XXXX9xXxX9xXXxxXXX9xxX99xXXXX9xx9XXxXxXXXXX=</parameter></programlisting> </listitem> <listitem> <para><emphasis role="bold">Yandex Translate</emphasis></para> - <para>Make sure that you have a free Yandex account. You’ll need - this to be able to obtain and use Yandex Translate API key. API keys - can be requested using <ulink - url="http://api.yandex.com/key/form.xml?service=trnsl">API key - request form</ulink>, and viewed on <ulink + <para>Make sure that you have a free Yandex account. You’ll need this + to be able to obtain and use Yandex Translate API key. API keys can be + requested using <ulink + url="http://api.yandex.com/key/form.xml?service=trnsl">API key request + form</ulink>, and viewed on <ulink url="http://api.yandex.com/key/keyslist.xml">My Keys</ulink> page.</para> - <para><emphasis role="bold">-Dyandex.api.key=</emphasis><emphasis - role="bold">trnsl.1.1.XXXXXXXXXXXXXXXX.XXXXXXXXXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</emphasis></para> + <programlisting>-Dyandex.api.key=<parameter>trnsl.1.1.XXXXXXXXXXXXXXXX.XXXXXXXXXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</parameter></programlisting> </listitem> </itemizedlist> @@ -709,10 +690,7 @@ <application>OmegaT</application> with all the examples described above, the command would be:</para> - <para><literal>java -Dswing.aatext=true -Duser.language=pt - -Duser.country=BR -Xmx1024M <application>-Dhttp.proxyHost=192.168.1.1 - -Dhttp.proxyport<emphasis role="bold">=</emphasis>3128 -jar - -OmegaT</application>.jar</literal></para> + <programlisting>java -Dswing.aatext=true -Duser.language=pt -Duser.country=BR -Xmx2048M -Dhttp.proxyHost=192.168.1.1 -Dhttp.proxyport=3128 -jar -OmegaT.jar</programlisting> </section> <section id="omegat.command.arguments"> @@ -745,14 +723,14 @@ <listitem> <para>If you can't run <application>OmegaT</application> normally (no graphical environment available): copy the settings files from - some other <application>OmegaT</application> installation on - another machine to a specific folder. The location does not - matter, since you can add it to the command line at startup. The - relevant files are <literal>filters.conf</literal> and - <literal>segmentation.conf</literal> and can be found in the user - home folder (e.g. <literal>C:\Documents and - Settings\%User%\<application>OmegaT</application></literal> under - Windows, <literal>%user%/.omegat/</literal> under Linux)</para> + some other <application>OmegaT</application> installation on another + machine to a specific folder. The location does not matter, since + you can add it to the command line at startup. The relevant files + are <filename>filters.conf</filename> and + <filename>segmentation.conf</filename> and can be found in the user + home folder (e.g. <filename>C:\Documents and + Settings\<parameter>user</parameter>\OmegaT</filename> under + Windows, <filename>~/.omegat/</filename> under Linux).</para> </listitem> </itemizedlist> </section> @@ -761,30 +739,24 @@ <title>Starting in console mode</title> <para>To start <application>OmegaT</application> in console mode, some - extra parameters have to be passed to it on startup. The most - important is <literal><project-dir></literal>, and - optionally<literal> --config-dir=<config-dir>. - </literal>Example:</para> + extra parameters have to be passed to it on startup. The most important + is <literal>/path/to/project</literal>, and optionally + <literal>--config-dir=<parameter>/path/to/config-files/</parameter></literal>. Example:</para> - <para><literal>java -jar <application>OmegaT</application>.jar - /path/to/project \</literal></para> + <programlisting>java -jar OmegaT.jar <parameter>/path/to/project</parameter> \ + --config-dir=<parameter>/path/to/config-files/</parameter> \ + --config-file=<parameter>/path/to/config-file/</parameter> \ + --mode=<parameter>console-translate|console-createpseudotranslatetmx|console-align</parameter> \ + --source-pattern=<parameter>regexp</parameter></programlisting> - <para><literal> --config-dir=/path/to/config-files/ \</literal></para> + <para>Note that all parameters start with a double <literal>-</literal> + character.</para> - <para><literal> --config-file=/path/to/config-file/ \</literal></para> - - <para><literal> - --mode=console-translate|console-createpseudotranslatetmx|console-align</literal></para> - - <para><literal> --source-pattern={regexp}</literal></para> - - <para>Note that all parameters start with a double - character.</para> - <para><emphasis role="bold">Explanation:</emphasis></para> <itemizedlist> <listitem> - <para><literal><project-dir></literal> tells + <para><literal>/path/to/project</literal> tells <application>OmegaT</application> where to find the project to translate. If given, <application>OmegaT</application> starts in console mode and will translate the given project.</para> @@ -793,18 +765,18 @@ <itemizedlist> <listitem> - <para><literal>--config-dir=<config-dir></literal> tells - <application>OmegaT</application> in which folder the + <para><literal>--config-dir=<parameter>/path/to/config-files/</parameter></literal> + tells <application>OmegaT</application> in which folder the configuration files are stored. If not given, <application>OmegaT</application> reverts to default values (<application>OmegaT</application> folder under user home or, if - unavailable, the current working folder). Note double - - character</para> + unavailable, the current working folder). Note the double + <literal>-</literal> character.</para> </listitem> <listitem> - <para><literal>--config-file=<config-file></literal> tells - <application>OmegaT</application> what configuration file to + <para><literal>--config-file=<parameter>/path/to/config-file/</parameter></literal> + tells <application>OmegaT</application> what configuration file to use.</para> </listitem> </itemizedlist> @@ -811,9 +783,9 @@ <itemizedlist> <listitem> - <para><emphasis><literal>--mode</literal>=...-</emphasis> - <application>OmegaT</application> starts in console mode to - perform one of the following services automatically</para> + <para><emphasis><literal>--mode=<parameter>...</parameter></literal></emphasis> + <application>OmegaT</application> starts in console mode to perform + one of the following services automatically</para> <itemizedlist> <listitem> @@ -820,9 +792,9 @@ <para><emphasis><literal>--mode=console-translate</literal></emphasis></para> <para>In this mode, OmegaT will attempt to translate the files - in /source/ with the available translation memories. This is - useful to run OmegaT on a server with TMX files automatically - fed to a project.</para> + in <filename>/source/</filename> with the available translation + memories. This is useful to run OmegaT on a server with TMX + files automatically fed to a project.</para> </listitem> <listitem> @@ -832,8 +804,8 @@ project, based on the source files only. You specify the TMX file to be created with</para> - <para><literal>--pseudotranslatetmx=allsegments.tmx - --pseudotranslatetype=[equal|empty]</literal></para> + <para><literal>--pseudotranslatetmx=<parameter>allsegments.tmx</parameter> + --pseudotranslatetype=<parameter>equal|empty</parameter></literal></para> <para>The argument <emphasis>pseudotranslatetype</emphasis> specifies, whether the target segments are to be equal to the @@ -843,30 +815,30 @@ <listitem> <para><literal>--mode=console-align</literal></para> - <para>In this mode, OmegaT will align the Java properties - files found in the<literal> /source/ </literal>folder of the - project to the contents found at the specified location. The - resulting TMX is stored in the <filename>/omegat/</filename> - folder under the name <filename>align.tmx</filename>.</para> + <para>In this mode, OmegaT will align the Java properties files + found in the <filename>/source/</filename> folder of the project + to the contents found at the specified location. The resulting + TMX is stored in the <filename>/omegat/</filename> folder under + the name <filename>align.tmx</filename>.</para> <para>Additional parameter is required in this case, specifying the location of the target data:</para> - <para><literal>--alignDir={location of translated - files}</literal></para> + <para><literal>--alignDir=<parameter><location of translated + files></parameter></literal></para> <para><filename>alignDir</filename> must contain a translation in the target language of the project. For instance, if the - project is EN->FR, alignDir must contain a bundle ending - with _fr. The resulting tmx is stored in the - <literal>omegat</literal> folder under the name - <filename>align.tmx</filename>.</para> + project is EN-to-FR, <filename>alignDir</filename> must contain + a bundle ending with <literal>_fr</literal>. The resulting TMX + is stored in the <filename>omegat</filename> folder under the + name <filename>align.tmx</filename>.</para> </listitem> </itemizedlist> </listitem> <listitem> - <para><literal>--source-pattern={regexp} </literal></para> + <para><literal>--source-pattern=<parameter>regexp</parameter></literal></para> <para>When mode has been used, this option will specify the files to be processed automatically. If the parameter is not specified, @@ -875,11 +847,12 @@ <itemizedlist> <listitem> - <para><emphasis><literal>.*\.html</literal></emphasis></para> + <para><literal>.*\.html</literal></para> <para>All HTML files will be translated - note that the period - in the usual *.html has to be escaped (\.) as specified by the - rules for regular expressions</para> + in the usual <literal>*.html</literal> has to be escaped + (<literal>\.</literal>) as specified by the rules for regular + expressions</para> </listitem> <listitem> @@ -893,58 +866,22 @@ <listitem> <para><literal>dir-10\\test\.html</literal></para> - <para>Only the file test.html in the folder dir-10 will be - processed. Again note that the backslash is escaped as - well.</para> + <para>Only the file <filename>test.html</filename> in the folder + <filename>dir-10</filename> will be processed. Again note that + the backslash is escaped as well.</para> </listitem> </itemizedlist> </listitem> <listitem> - <para><literal>--output-tag-validation-={regexp} </literal></para> + <para><literal>--tag-validation=<parameter>abort|warn</parameter></literal> + <parameter>outputFileName</parameter></para> - <para>When mode has been used, this option will specify the files - to be processed automatically. If the parameter is not specified, - all files will be processed. Here's few typical examples to limit - your choice:</para> - - <itemizedlist> - <listitem> - <para><emphasis><literal>.*\.html</literal></emphasis></para> - - <para>All HTML files will be translated - note that the period - in the usual *.html has to be escaped (\.) as specified by the - rules for regular expressions</para> - </listitem> - - <listitem> - <para><literal>test\.html</literal></para> - - <para>Only the file test.html at the root of the source folder - will be translated. If there are other files named test.html - in other folders, they will be ignored.</para> - </listitem> - - <listitem> - <para><literal>dir-10\\test\.html</literal></para> - - <para>Only the file test.html in the folder dir-10 will be - processed. Again note that the backslash is escaped as - well.</para> - </listitem> - </itemizedlist> - </listitem> - - <listitem> - <para><literal>--tag-validation=[abort|warn]</literal><parameter> - outputFileName</parameter></para> - <para>This option allows the tag validation in a batch mode. If - <literal>abort </literal>is selected, the tag validator will stop - on the first invalid segment. If <literal>warn</literal> is - specified, the tag validator will process all segments and write - warnings about any segments with invalid tags into the file - specified.</para> + <literal>abort</literal> is selected, the tag validator will stop on + the first invalid segment. If <literal>warn</literal> is specified, + the tag validator will process all segments and write warnings about + any segments with invalid tags into the file specified.</para> </listitem> </itemizedlist> @@ -961,10 +898,9 @@ <para><literal>--disable-project-locking</literal> allows, under Windows, to open the same project with several instances of OmegaT. By default, under Windows, - <literal>omegat.project</literal> is locked, and an error message - is received when trying to open a project already opened in - another instance of OmegaT. With that option, no locking - occurs.</para> + <filename>omegat.project</filename> is locked, and an error message + is received when trying to open a project already opened in another + instance of OmegaT. With that option, no locking occurs.</para> </listitem> </itemizedlist> </section> @@ -973,28 +909,13 @@ <title>Quiet option</title> <para>An extra command line parameter specific to console mode: - <literal>--quiet.</literal> In the quiet mode, less info is logged to + <literal>--quiet</literal>. In the quiet mode, less info is logged to the screen. The messages you would usually find in the status bar are not displayed.</para> - <para>Usage: <literal>java -jar <application>OmegaT</application>.jar - /path/to/project --mode=console-translate --quiet</literal></para> + <para>Usage: <literal>java -jar OmegaT.jar /path/to/project + --mode=console-translate --quiet</literal></para> </section> - - <section id="console.mode.option.validatetags"> - <title>Tag validation option</title> - - <para>Another extra command line parameter specific to console mode: - <literal>--tag-validation=[abort|warn].</literal> When this parameter - is added, tag validation is done prior to translation/aligning. If the - value is <literal>abort</literal>, then on tag errors the errors are - printed and the program stops. If the value is <literal>warn</literal> - then the errors are printed but OmegaT continues.</para> - - <para>Usage: <literal>java -jar <application>OmegaT</application>.jar - /path/to/project --mode=console-translate - --tag-validation=abort</literal></para> - </section> </section> </section> @@ -1001,26 +922,26 @@ <section id="building.OmegaT.from.source"> <title>Building <application>OmegaT</application> From Source</title> - <para>The sources of the current version can be retrieved with a SVN - client from the repository <filename>svn.code.sf.net/p/omegat/svn/trunk - omegat-svn</filename> or directly on <ulink + <para>The sources of the current version can be retrieved with a SVN client + from the repository <ulink url="svn://svn.code.sf.net/p/omegat/svn/trunk"/> + or directly on <ulink url="https://sourceforge.net/p/omegat/svn/HEAD/tarball?path=/trunk">SourceForge</ulink>. </para> <para>Once the code is downloaded, open a command in the source folder and - type: </para> + type:</para> - <para><literal>gradlew assembleDist</literal></para> + <programlisting>gradlew assembleDist</programlisting> <para>This will create a full distribution of OmegaT in the - <filename>./build/distributions</filename> folder, where you will find a - zip containing everything needed to run + <filename>./build/distributions</filename> folder, where you will find a zip + containing everything needed to run <application>OmegaT</application>.</para> <para>You can also run directly the application with the following command:</para> - <para><literal>gradlew run</literal></para> + <programlisting>gradlew run</programlisting> <para>Detailed instructions on building are in the docs_devel <ulink url="https://sourceforge.net/p/omegat/svn/HEAD/tree/trunk/docs_devel/README.txt">readme</ulink>.</para> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <am...@us...> - 2019-05-08 14:27:44
|
Revision: 10683 http://sourceforge.net/p/omegat/svn/10683 Author: amake Date: 2019-05-08 14:27:28 +0000 (Wed, 08 May 2019) Log Message: ----------- Use actual monospace font in manual PDFs Modified Paths: -------------- trunk/doc_src/build.xml trunk/doc_src4/build.xml Modified: trunk/doc_src/build.xml =================================================================== --- trunk/doc_src/build.xml 2019-05-07 19:48:53 UTC (rev 10682) +++ trunk/doc_src/build.xml 2019-05-08 14:27:28 UTC (rev 10683) @@ -44,10 +44,17 @@ <condition property="font.family" value="IPAPGothic"> <equals arg1="${language}" arg2="ja"/> </condition> + <condition property="monospace.font.family" value="IPAGothic"> + <equals arg1="${language}" arg2="ja"/> + </condition> <condition property="font.family" value="WenQuanYi Micro Hei"> <equals arg1="${language}" arg2="zh_CN"/> </condition> + <condition property="monospace.font.family" value="WenQuanYi Micro Hei"> + <equals arg1="${language}" arg2="zh_CN"/> + </condition> <property name="font.family" value="DejaVu Sans"/> + <property name="monospace.font.family" value="DejaVu Sans Mono"/> <target name="fo" depends="include"> <java dir="." @@ -73,7 +80,7 @@ <arg value="insert.olink.pdf.frag=1" /> <arg value="body.font.family=${font.family}" /> <arg value="title.font.family=${font.family}" /> - <arg value="monospace.font.family=${font.family}" /> + <arg value="monospace.font.family=${monospace.font.family}" /> <classpath> <pathelement location="${saxon}"/> <pathelement path="${saxon}"/> Modified: trunk/doc_src4/build.xml =================================================================== --- trunk/doc_src4/build.xml 2019-05-07 19:48:53 UTC (rev 10682) +++ trunk/doc_src4/build.xml 2019-05-08 14:27:28 UTC (rev 10683) @@ -44,10 +44,17 @@ <condition property="font.family" value="IPAPGothic"> <equals arg1="${language}" arg2="ja"/> </condition> + <condition property="monospace.font.family" value="IPAGothic"> + <equals arg1="${language}" arg2="ja"/> + </condition> <condition property="font.family" value="WenQuanYi Micro Hei"> <equals arg1="${language}" arg2="zh_CN"/> </condition> + <condition property="monospace.font.family" value="WenQuanYi Micro Hei"> + <equals arg1="${language}" arg2="zh_CN"/> + </condition> <property name="font.family" value="DejaVu Sans"/> + <property name="monospace.font.family" value="DejaVu Sans Mono"/> <target name="fo" depends="include"> <java dir="." @@ -73,7 +80,7 @@ <arg value="insert.olink.pdf.frag=1" /> <arg value="body.font.family=${font.family}" /> <arg value="title.font.family=${font.family}" /> - <arg value="monospace.font.family=${font.family}" /> + <arg value="monospace.font.family=${monospace.font.family}" /> <classpath> <pathelement location="${saxon}"/> <pathelement path="${saxon}"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-07 19:49:05
|
Revision: 10682 http://sourceforge.net/p/omegat/svn/10682 Author: briac_pilpre Date: 2019-05-07 19:48:53 +0000 (Tue, 07 May 2019) Log Message: ----------- When storing the "scripts_dir" preference, don't try to convert to an absolute directory path. This way, the scripts_dir preference can stay relative to the configuration directory. Modified Paths: -------------- trunk/src/org/omegat/gui/scripting/ScriptingWindow.java Modified: trunk/src/org/omegat/gui/scripting/ScriptingWindow.java =================================================================== --- trunk/src/org/omegat/gui/scripting/ScriptingWindow.java 2019-05-07 09:12:43 UTC (rev 10681) +++ trunk/src/org/omegat/gui/scripting/ScriptingWindow.java 2019-05-07 19:48:53 UTC (rev 10682) @@ -70,7 +70,6 @@ import javax.swing.JScrollPane; import javax.swing.JSeparator; import javax.swing.JSplitPane; -import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.ListModel; import javax.swing.SwingConstants; @@ -667,25 +666,17 @@ try { dir = new File(scriptsDir).getCanonicalFile(); } catch (IOException ex) { - dir = new File(scriptsDir).getAbsoluteFile(); + dir = new File(scriptsDir); } - setScriptsDirectory(dir); - } - private void setScriptsDirectory(File scriptsDir) { - - if (!scriptsDir.isDirectory()) { + if (!dir.isDirectory()) { updateQuickScripts(); return; } - m_scriptsDirectory = scriptsDir; - Preferences.setPreference(Preferences.SCRIPTS_DIRECTORY, scriptsDir.getPath()); + m_scriptsDirectory = dir; + Preferences.setPreference(Preferences.SCRIPTS_DIRECTORY, scriptsDir); OSXIntegration.setProxyIcon(frame.getRootPane(), m_scriptsDirectory); - if (m_txtScriptsDir != null) { - m_txtScriptsDir.setText(scriptsDir.getPath()); - } - if (monitor != null) { monitor.stop(); monitor.start(m_scriptsDirectory); @@ -827,7 +818,7 @@ if (result == JFileChooser.APPROVE_OPTION) { // we should write the result into the directory text field File file = chooser.getSelectedFile(); - setScriptsDirectory(file); + setScriptsDirectory(file.getPath()); } } } @@ -1037,7 +1028,6 @@ private File m_scriptsDirectory; private ScriptItem m_currentScriptItem; - private JTextField m_txtScriptsDir; private JMenu m_setsMenu = new JMenu(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kos...@us...> - 2019-05-07 09:12:55
|
Revision: 10681 http://sourceforge.net/p/omegat/svn/10681 Author: kosivantsov Date: 2019-05-07 09:12:43 +0000 (Tue, 07 May 2019) Log Message: ----------- Fix Haiku (file not found messages) formatting. Make case consistent with other menu items, in "Mark Paragraph Delimitations" Modified Paths: -------------- trunk/src/org/omegat/Bundle.properties Modified: trunk/src/org/omegat/Bundle.properties =================================================================== --- trunk/src/org/omegat/Bundle.properties 2019-05-06 22:06:30 UTC (rev 10680) +++ trunk/src/org/omegat/Bundle.properties 2019-05-07 09:12:43 UTC (rev 10681) @@ -420,7 +420,7 @@ TF_MENU_DISPLAY_MARK_UNTRANSLATED=Mark &Untranslated Segments -TF_MENU_DISPLAY_MARK_PARAGRAPH=Mark &Paragraph delimitations +TF_MENU_DISPLAY_MARK_PARAGRAPH=Mark &Paragraph Delimitations TF_MENU_DISPLAY_FILTERS=File &Filters... @@ -609,27 +609,27 @@ # immortalize the BeOS 404 messages (some modified a bit for context) -HF_HAIKU_1=Exciting help page<p>Gossamer threads hold you back<p>404 not found +HF_HAIKU_1=Exciting help page\nGossamer threads hold you back\n404 not found -HF_HAIKU_2=Wind catches lily<p>Scatt'ring petals to the wind:<p>Your page is not found +HF_HAIKU_2=Wind catches lily\nScatt'ring petals to the wind:\nYour page is not found -HF_HAIKU_3=Bartender yells loud:<p>Your page cannot be found, boy<p>Buy another drink. +HF_HAIKU_3=Bartender yells loud:\nYour page cannot be found, boy\nBuy another drink -HF_HAIKU_4=Page slips through fingers<p>Pulse pounding hard and frantic<p>Vanishing like mist. +HF_HAIKU_4=Page slips through fingers\nPulse pounding hard and frantic\nVanishing like mist -HF_HAIKU_5=These three are certain:<p>Death, taxes, and page not found.<p>You, victim of one. +HF_HAIKU_5=These three are certain:\nDeath, taxes, and page not found\nYou, victim of one -HF_HAIKU_6=The help page you seek<p>Lies beyond our perception<p>But others await +HF_HAIKU_6=The help page you seek\nLies beyond our perception\nBut others await -HF_HAIKU_7=Emptiness of soul<p>Forever aching blackness<p>Your help page not found +HF_HAIKU_7=Emptiness of soul\nForever aching blackness\nYour help page not found -HF_HAIKU_8=Ephemeral page<p>I am the Blue Screen of Death<p>No one hears your screams. +HF_HAIKU_8=Ephemeral page\nI am the Blue Screen of Death\nNo one hears your screams -HF_HAIKU_9=Rather than beep<p>Or a rude error message<p>These words: 'Page not found' +HF_HAIKU_9=Rather than beep\nOr a rude error message\nThese words: 'Page not found' -HF_HAIKU_10=Mourning and sorrow<p>404 not with us now<p>Lost to paradise +HF_HAIKU_10=Mourning and sorrow\n404 not with us now\nLost to paradise -HF_HAIKU_11=Help you are seeking<p>From your path it is fleeing<p>Its winter has come +HF_HAIKU_11=Help you are seeking\nFrom your path it is fleeing\nIts winter has come # CommandThread CT_FUZZY_X_OF_Y=Analyzing strings - {0} of {1} completed This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-06 22:06:39
|
Revision: 10680 http://sourceforge.net/p/omegat/svn/10680 Author: briac_pilpre Date: 2019-05-06 22:06:30 +0000 (Mon, 06 May 2019) Log Message: ----------- Added a shortcut to jump to the selected search result (Ctrl+J by default). Modified Paths: -------------- trunk/src/org/omegat/gui/main/MainMenuShortcuts.mac.properties trunk/src/org/omegat/gui/main/MainMenuShortcuts.properties trunk/src/org/omegat/gui/search/EntryListPane.java Modified: trunk/src/org/omegat/gui/main/MainMenuShortcuts.mac.properties =================================================================== --- trunk/src/org/omegat/gui/main/MainMenuShortcuts.mac.properties 2019-05-06 21:53:17 UTC (rev 10679) +++ trunk/src/org/omegat/gui/main/MainMenuShortcuts.mac.properties 2019-05-06 22:06:30 UTC (rev 10680) @@ -177,3 +177,8 @@ # helpAboutMenuItem= # helpLastChangesMenuItem= # helpLogMenuItem= + +################# +# Search Window # +################# +jumpToEntryInEditor=meta J Modified: trunk/src/org/omegat/gui/main/MainMenuShortcuts.properties =================================================================== --- trunk/src/org/omegat/gui/main/MainMenuShortcuts.properties 2019-05-06 21:53:17 UTC (rev 10679) +++ trunk/src/org/omegat/gui/main/MainMenuShortcuts.properties 2019-05-06 22:06:30 UTC (rev 10680) @@ -177,3 +177,8 @@ # helpAboutMenuItem= # helpLastChangesMenuItem= # helpLogMenuItem= + +################# +# Search Window # +################# +jumpToEntryInEditor=ctrl J Modified: trunk/src/org/omegat/gui/search/EntryListPane.java =================================================================== --- trunk/src/org/omegat/gui/search/EntryListPane.java 2019-05-06 21:53:17 UTC (rev 10679) +++ trunk/src/org/omegat/gui/search/EntryListPane.java 2019-05-06 22:06:30 UTC (rev 10680) @@ -105,7 +105,7 @@ private static void bindKeyStrokesFromMainMenuShortcuts(InputMap map) { // Add KeyStrokes Ctrl+N/P (Cmd+N/P for MacOS) to the map PropertiesShortcuts.getMainMenuShortcuts().bindKeyStrokes(map, - KEY_GO_TO_NEXT_SEGMENT, KEY_GO_TO_PREVIOUS_SEGMENT); + KEY_GO_TO_NEXT_SEGMENT, KEY_GO_TO_PREVIOUS_SEGMENT, KEY_JUMP_TO_ENTRY_IN_EDITOR); } private static InputMap createDefaultInputMap(InputMap parent) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-06 21:53:23
|
Revision: 10679 http://sourceforge.net/p/omegat/svn/10679 Author: briac_pilpre Date: 2019-05-06 21:53:17 +0000 (Mon, 06 May 2019) Log Message: ----------- Added a shortcut to jump to the selected search result (Ctrl+J by default). Modified Paths: -------------- trunk/release/changes.txt Modified: trunk/release/changes.txt =================================================================== --- trunk/release/changes.txt 2019-05-06 21:04:08 UTC (rev 10678) +++ trunk/release/changes.txt 2019-05-06 21:53:17 UTC (rev 10679) @@ -1,7 +1,7 @@ ---------------------------------------------------------------------- OmegaT 4.2.1 ---------------------------------------------------------------------- - 1 Enhancement + 2 Enhancements 0 Bug fixes 0 Localisation updates ---------------------------------------------------------------------- @@ -11,6 +11,10 @@ - Search results panel supports custom color scheme https://sourceforge.net/p/omegat/feature-requests/1065/ + + - Added a shortcut to jump to the selected search result (Ctrl+J by default). + https://sourceforge.net/p/omegat/feature-requests/1416/ + ---------------------------------------------------------------------- OmegaT 4.2.0 (2019-04-23) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bri...@us...> - 2019-05-06 21:04:29
|
Revision: 10678 http://sourceforge.net/p/omegat/svn/10678 Author: briac_pilpre Date: 2019-05-06 21:04:08 +0000 (Mon, 06 May 2019) Log Message: ----------- Search results panel supports custom color scheme (RFE #1065) Modified Paths: -------------- trunk/release/changes.txt trunk/src/org/omegat/Bundle.properties trunk/src/org/omegat/gui/search/EntryListPane.java trunk/src/org/omegat/util/gui/Styles.java Modified: trunk/release/changes.txt =================================================================== --- trunk/release/changes.txt 2019-04-26 00:57:42 UTC (rev 10677) +++ trunk/release/changes.txt 2019-05-06 21:04:08 UTC (rev 10678) @@ -1,13 +1,17 @@ ---------------------------------------------------------------------- OmegaT 4.2.1 ---------------------------------------------------------------------- - 0 Enhancement + 1 Enhancement 0 Bug fixes 0 Localisation updates ---------------------------------------------------------------------- 4.2.1 vs 4.2.0 + Implemented requests: + - Search results panel supports custom color scheme + https://sourceforge.net/p/omegat/feature-requests/1065/ + ---------------------------------------------------------------------- OmegaT 4.2.0 (2019-04-23) ---------------------------------------------------------------------- Modified: trunk/src/org/omegat/Bundle.properties =================================================================== --- trunk/src/org/omegat/Bundle.properties 2019-04-26 00:57:42 UTC (rev 10677) +++ trunk/src/org/omegat/Bundle.properties 2019-05-06 21:04:08 UTC (rev 10678) @@ -2662,6 +2662,8 @@ COLOR_MATCHES_DEL_ACTIVE=Matches Deleted Active COLOR_MATCHES_DEL_INACTIVE=Matches Deleted Inactive COLOR_HYPERLINK=Hyperlinks +COLOR_SEARCH_FOUND_MARK=Search Found Mark +COLOR_SEARCH_REPLACE_MARK=Search Replaced Mark COLOR_NOTIFICATION_MIN=Notification (steady) COLOR_NOTIFICATION_MAX=Notification (flash) COLOR_ALIGNER_ACCEPTED=Aligner "Accepted" Group Modified: trunk/src/org/omegat/gui/search/EntryListPane.java =================================================================== --- trunk/src/org/omegat/gui/search/EntryListPane.java 2019-04-26 00:57:42 UTC (rev 10677) +++ trunk/src/org/omegat/gui/search/EntryListPane.java 2019-05-06 21:04:08 UTC (rev 10678) @@ -29,7 +29,6 @@ package org.omegat.gui.search; -import java.awt.Color; import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.FocusAdapter; @@ -91,8 +90,8 @@ */ @SuppressWarnings("serial") class EntryListPane extends JTextPane { - protected static final AttributeSet FOUND_MARK = Styles.createAttributeSet(Color.BLUE, null, true, null); - protected static final AttributeSet REPLACE_MARK = Styles.createAttributeSet(Color.ORANGE.darker(), null, false, null); + protected static final AttributeSet FOUND_MARK = Styles.createAttributeSet(Styles.EditorColor.COLOR_SEARCH_FOUND_MARK.getColor(), null, true, null); + protected static final AttributeSet REPLACE_MARK = Styles.createAttributeSet(Styles.EditorColor.COLOR_SEARCH_REPLACE_MARK.getColor(), null, false, null); protected static final int MARKS_PER_REQUEST = 100; protected static final String ENTRY_SEPARATOR = "---------\n"; private static final String KEY_GO_TO_NEXT_SEGMENT = "gotoNextSegmentMenuItem"; @@ -148,6 +147,10 @@ setFont(Core.getMainWindow().getApplicationFont()); StaticUIUtils.makeCaretAlwaysVisible(this); StaticUIUtils.setCaretUpdateEnabled(this, false); + + setForeground(Styles.EditorColor.COLOR_FOREGROUND.getColor()); + setCaretColor(Styles.EditorColor.COLOR_FOREGROUND.getColor()); + setBackground(Styles.EditorColor.COLOR_BACKGROUND.getColor()); addMouseListener(new MouseAdapter() { @Override @@ -622,7 +625,7 @@ SegmentHighlighter() { MutableAttributeSet attrNormal = new SimpleAttributeSet(); - StyleConstants.setBackground(attrNormal, getBackground()); + StyleConstants.setBackground(attrNormal, Styles.EditorColor.COLOR_BACKGROUND.getColor()); this.attrNormal = attrNormal; MutableAttributeSet attrActive = new SimpleAttributeSet(); @@ -629,7 +632,7 @@ // This is the same as the default value for // Styles.EditorColor.COLOR_ACTIVE_SOURCE, but we hard-code it here // because this panel does not currently support customized colors. - StyleConstants.setBackground(attrActive, Color.decode("#c0ffc0")); + StyleConstants.setBackground(attrActive, Styles.EditorColor.COLOR_ACTIVE_SOURCE.getColor()); this.attrActive = attrActive; } Modified: trunk/src/org/omegat/util/gui/Styles.java =================================================================== --- trunk/src/org/omegat/util/gui/Styles.java 2019-04-26 00:57:42 UTC (rev 10677) +++ trunk/src/org/omegat/util/gui/Styles.java 2019-05-06 21:04:08 UTC (rev 10678) @@ -82,7 +82,7 @@ COLOR_NBSP("#c8c8c8"), COLOR_WHITESPACE("#808080"), COLOR_BIDIMARKERS("#c80000"), - COLOR_PARAGRAPH_START("#aeaeae"), + COLOR_PARAGRAPH_START("#aeaeae"), COLOR_MARK_COMES_FROM_TM("#fa8072"), // Salmon red COLOR_MARK_COMES_FROM_TM_XICE("#af76df"), // Purple COLOR_MARK_COMES_FROM_TM_X100PC("#ff9408"), // Dark Orange @@ -100,6 +100,8 @@ COLOR_MATCHES_INS_ACTIVE("#0000ff"), COLOR_MATCHES_INS_INACTIVE("#808080"), // Color.gray COLOR_HYPERLINK("#0000ff"), // Blue + COLOR_SEARCH_FOUND_MARK(Color.BLUE), + COLOR_SEARCH_REPLACE_MARK("#ff9900"), // Dark orange COLOR_NOTIFICATION_MIN("#fff2d4"), // Light orange COLOR_NOTIFICATION_MAX("#ff9900"), // Dark orange COLOR_ALIGNER_ACCEPTED("#15bb45"), // Green This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <am...@us...> - 2019-04-26 00:57:48
|
Revision: 10677 http://sourceforge.net/p/omegat/svn/10677 Author: amake Date: 2019-04-26 00:57:42 +0000 (Fri, 26 Apr 2019) Log Message: ----------- Move version check bump to end of release procedure Modified Paths: -------------- trunk/docs_devel/Release.md Modified: trunk/docs_devel/Release.md =================================================================== --- trunk/docs_devel/Release.md 2019-04-26 00:57:21 UTC (rev 10676) +++ trunk/docs_devel/Release.md 2019-04-26 00:57:42 UTC (rev 10677) @@ -117,15 +117,8 @@ - [Example](https://groups.yahoo.com/neo/groups/OmegaT/conversations/messages/43871) -## 11. Push new version for version check +## 11. Cleanup -```sh -./gradlew publishVersion -``` - - -## 12. Cleanup - - Bump version in `Version.properties`, `changes.txt` - Move old versions in SourceForge Files into `OldFiles/Releases` - Leave one previous version just in case @@ -132,3 +125,13 @@ - If promoting from Latest to Standard, move the old Standard versions to Legacy - Set fixed bug tickets and implemented RFEs to `closed-fixed` - Update ticket milestones if necessary + + +## 12. Push new version for version check + +If no catastrophic problems are reported with the new version, bump the version +check master file: + +```sh +./gradlew publishVersion +``` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |