Menu
▾
▴
[Omegat-svn-changes] SF.net SVN: omegat:[3007] trunk
|
From: <did...@us...> - 2010-05-30 12:24:47
|
Revision: 3007
http://omegat.svn.sourceforge.net/omegat/?rev=3007&view=rev
Author: didierbr
Date: 2010-05-30 12:24:36 +0000 (Sun, 30 May 2010)
Log Message:
-----------
OpenXML filter: option to translate slide layouts in PowerPoint presentations
Modified Paths:
--------------
trunk/release/changes.txt
trunk/src/org/omegat/Bundle.properties
trunk/src/org/omegat/Bundle_fr.properties
trunk/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.form
trunk/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.java
trunk/src/org/omegat/filters3/xml/openxml/OpenXMLFilter.java
trunk/src/org/omegat/filters3/xml/openxml/OpenXMLOptions.java
Modified: trunk/release/changes.txt
===================================================================
--- trunk/release/changes.txt 2010-05-26 11:50:36 UTC (rev 3006)
+++ trunk/release/changes.txt 2010-05-30 12:24:36 UTC (rev 3007)
@@ -1,7 +1,7 @@
----------------------------------------------------------------------
OmegaT 2.1.6 update 1
----------------------------------------------------------------------
- 3 Enhancements
+ 4 Enhancements
2 Bugfixes
----------------------------------------------------------------------
2.1.6 update 1 vs. 2.1.6
@@ -11,6 +11,8 @@
- Sort Project Files according to locale
http://sourceforge.net/support/tracker.php?aid=3002616
+ - OpenXML filter: option to translate slide layouts in PowerPoint presentations
+
Other enhancements:
- Catalan localisation updated to 2.1.4 (UI, Readme, Instant Start, documentation)
- Hungarian localisation updated to 2.1.x (UI, Readme, Instant Start, documentation)
Modified: trunk/src/org/omegat/Bundle.properties
===================================================================
--- trunk/src/org/omegat/Bundle.properties 2010-05-26 11:50:36 UTC (rev 3006)
+++ trunk/src/org/omegat/Bundle.properties 2010-05-30 12:24:36 UTC (rev 3007)
@@ -911,6 +911,7 @@
OpenXML_POWER_POINT=Power Point
OpenXML_TRANSLATE_SLIDE_COMMENTS=&Slide Comments
OpenXML_TRANSLATE_SLIDE_MASTERS=Sli&de Masters
+OpenXML_TRANSLATE_SLIDE_LAYOUTS=Slide &Layouts
OpenXML_ERROR_IN_FILE=Error in file
Modified: trunk/src/org/omegat/Bundle_fr.properties
===================================================================
--- trunk/src/org/omegat/Bundle_fr.properties 2010-05-26 11:50:36 UTC (rev 3006)
+++ trunk/src/org/omegat/Bundle_fr.properties 2010-05-30 12:24:36 UTC (rev 3007)
@@ -856,6 +856,7 @@
OpenXML_POWER_POINT=Power Point
OpenXML_TRANSLATE_SLIDE_COMMENTS=Commentaires des &diapositives
OpenXML_TRANSLATE_SLIDE_MASTERS=Masque des diapositi&ves
+OpenXML_TRANSLATE_SLIDE_LAYOUTS=M&ise en page des diapositives
OpenXML_ERROR_IN_FILE=Erreur dans le fichier
Modified: trunk/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.form
===================================================================
--- trunk/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.form 2010-05-26 11:50:36 UTC (rev 3006)
+++ trunk/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.form 2010-05-30 12:24:36 UTC (rev 3007)
@@ -229,6 +229,13 @@
</Property>
</Properties>
</Component>
+ <Component class="javax.swing.JCheckBox" name="translateSlideLayoutsCB">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/omegat/Bundle.properties" key="OpenXML_TRANSLATE_SLIDE_LAYOUTS" replaceFormat="OStrings.getString("{key}")"/>
+ </Property>
+ </Properties>
+ </Component>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="text" type="java.lang.String" value=" "/>
Modified: trunk/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.java
===================================================================
--- trunk/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.java 2010-05-26 11:50:36 UTC (rev 3006)
+++ trunk/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.java 2010-05-30 12:24:36 UTC (rev 3007)
@@ -66,6 +66,7 @@
translateExcelCommentsCB.setSelected(options.getTranslateExcelComments());
translateSlideCommentsCB.setSelected(options.getTranslateSlideComments());
translateSlideMastersCB.setSelected(options.getTranslateSlideMasters());
+ translateSlideLayoutsCB.setSelected(options.getTranslateSlideLayouts());
// Handle escape key to close the window
KeyStroke escape = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, false);
@@ -122,6 +123,7 @@
jLabel5 = new javax.swing.JLabel();
translateSlideCommentsCB = new javax.swing.JCheckBox();
translateSlideMastersCB = new javax.swing.JCheckBox();
+ translateSlideLayoutsCB = new javax.swing.JCheckBox();
jLabel1 = new javax.swing.JLabel();
setTitle(OStrings.getString("OpenXML_FILTER_OPTIONS")); // NOI18N
@@ -161,7 +163,7 @@
org.openide.awt.Mnemonics.setLocalizedText(jLabel2, OStrings.getString("OpenDoc_TRANSLATE_ELEMENTS")); // NOI18N
jPanel1.add(jLabel2);
- jLabel3.setFont(new java.awt.Font("MS Sans Serif", 1, 11)); // NOI18N
+ jLabel3.setFont(new java.awt.Font("MS Sans Serif", 1, 11));
jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
org.openide.awt.Mnemonics.setLocalizedText(jLabel3, OStrings.getString("OpenXML_WORD")); // NOI18N
jPanel1.add(jLabel3);
@@ -219,7 +221,7 @@
});
jPanel1.add(translateFootersCB);
- jLabel4.setFont(new java.awt.Font("MS Sans Serif", 1, 11)); // NOI18N
+ jLabel4.setFont(new java.awt.Font("MS Sans Serif", 1, 11));
jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
org.openide.awt.Mnemonics.setLocalizedText(jLabel4, OStrings.getString("OpenXML_EXCEL")); // NOI18N
jPanel1.add(jLabel4);
@@ -233,7 +235,7 @@
});
jPanel1.add(translateExcelCommentsCB);
- jLabel5.setFont(new java.awt.Font("MS Sans Serif", 1, 11)); // NOI18N
+ jLabel5.setFont(new java.awt.Font("MS Sans Serif", 1, 11));
jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
org.openide.awt.Mnemonics.setLocalizedText(jLabel5, OStrings.getString("OpenXML_POWER_POINT")); // NOI18N
jPanel1.add(jLabel5);
@@ -250,6 +252,9 @@
org.openide.awt.Mnemonics.setLocalizedText(translateSlideMastersCB, OStrings.getString("OpenXML_TRANSLATE_SLIDE_MASTERS")); // NOI18N
jPanel1.add(translateSlideMastersCB);
+ org.openide.awt.Mnemonics.setLocalizedText(translateSlideLayoutsCB, OStrings.getString("OpenXML_TRANSLATE_SLIDE_LAYOUTS")); // NOI18N
+ jPanel1.add(translateSlideLayoutsCB);
+
org.openide.awt.Mnemonics.setLocalizedText(jLabel1, " ");
jLabel1.setEnabled(false);
jPanel1.add(jLabel1);
@@ -304,6 +309,7 @@
options.setTranslateExcelComments(translateExcelCommentsCB.isSelected());
options.setTranslateSlideComments(translateSlideCommentsCB.isSelected());
options.setTranslateSlideMasters(translateSlideMastersCB.isSelected());
+ options.setTranslateSlideLayouts(translateSlideLayoutsCB.isSelected());
doClose(RET_OK);
}//GEN-LAST:event_okButtonActionPerformed
@@ -345,6 +351,7 @@
private javax.swing.JCheckBox translateHeadersCB;
private javax.swing.JCheckBox translateHiddenTextCB;
private javax.swing.JCheckBox translateSlideCommentsCB;
+ private javax.swing.JCheckBox translateSlideLayoutsCB;
private javax.swing.JCheckBox translateSlideMastersCB;
// End of variables declaration//GEN-END:variables
}
Modified: trunk/src/org/omegat/filters3/xml/openxml/OpenXMLFilter.java
===================================================================
--- trunk/src/org/omegat/filters3/xml/openxml/OpenXMLFilter.java 2010-05-26 11:50:36 UTC (rev 3006)
+++ trunk/src/org/omegat/filters3/xml/openxml/OpenXMLFilter.java 2010-05-30 12:24:36 UTC (rev 3007)
@@ -4,7 +4,7 @@
glossaries, and translation leveraging into updated projects.
Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
- (C) 2007-2010 Didier Briel
+ 2007-2010 Didier Briel
Home page: http://www.omegat.org/
Support center: http://groups.yahoo.com/group/OmegaT/
@@ -74,7 +74,8 @@
// Excel
"|(sharedStrings\\.xml)|(comments\\d+\\.xml)" +
// PowerPoint
- "|(slide\\d+\\.xml)|(slideMaster\\d+\\.xml)|(notesSlide\\d+\\.xml)"
+ "|(slide\\d+\\.xml)|(slideMaster\\d+\\.xml)| (slideLayout\\d+\\.xml)" +
+ "|(notesSlide\\d+\\.xml)"
*/
DOCUMENTS = "(document\\.xml)";
@@ -97,6 +98,8 @@
DOCUMENTS += "|(slide\\d+\\.xml)";
if (options.getTranslateSlideMasters())
DOCUMENTS += "|(slideMaster\\d+\\.xml)";
+ if (options.getTranslateSlideLayouts())
+ DOCUMENTS += "|(slideLayout\\d+\\.xml)";
if (options.getTranslateSlideComments())
DOCUMENTS += "|(notesSlide\\d+\\.xml)";
TRANSLATABLE = Pattern.compile(DOCUMENTS);
@@ -109,6 +112,7 @@
}
/** Returns true if it's an Open XML file. */
+ @Override
public boolean isFileSupported(File inFile, String inEncoding, Map<String, String> config)
{
try
@@ -176,6 +180,7 @@
* which is actually a ZIP file consisting of many XML files,
* some of which should be translated.
*/
+ @Override
public void processFile(File inFile, String inEncoding, File outFile,
String outEncoding)
throws IOException, TranslationException
@@ -351,6 +356,7 @@
* Returns true to indicate that the OpenXML filter has options.
* @return True, because the OpenXML filter has options.
*/
+ @Override
public boolean hasOptions()
{
return true;
@@ -363,6 +369,7 @@
* @return Updated filter options if user confirmed the changes,
* and current options otherwise.
*/
+ @Override
public Map<String,String> changeOptions(Dialog parent, Map<String,String> currentOptions)
{
try
Modified: trunk/src/org/omegat/filters3/xml/openxml/OpenXMLOptions.java
===================================================================
--- trunk/src/org/omegat/filters3/xml/openxml/OpenXMLOptions.java 2010-05-26 11:50:36 UTC (rev 3006)
+++ trunk/src/org/omegat/filters3/xml/openxml/OpenXMLOptions.java 2010-05-30 12:24:36 UTC (rev 3007)
@@ -3,7 +3,7 @@
with fuzzy matching, translation memory, keyword search,
glossaries, and translation leveraging into updated projects.
- Copyright (C) 2007-2008 Didier Briel
+ Copyright (C) 2007-2010 Didier Briel
Home page: http://www.omegat.org/
Support center: http://groups.yahoo.com/group/OmegaT/
@@ -43,6 +43,7 @@
* <li>[+] Footer (Words)
* <li>[+] Slide comments (PowerPoint)
* <li>[] Slide Masters (PowerPoint)
+ * <li>[] Slide Layouts (PowerPoint)
* </ul>
*
* @author Didier Briel
@@ -57,6 +58,7 @@
private static final String OPTION_TRANSLATE_EXCEL_COMMENTS = "translateExcelComments";
private static final String OPTION_TRANSLATE_SLIDE_COMMENTS = "translateSlideComments";
private static final String OPTION_TRANSLATE_SLIDE_MASTERS = "translateSlideMasters";
+ private static final String OPTION_TRANSLATE_SLIDE_LAYOUTS = "translateSlideLayouts";
public OpenXMLOptions(Map<String, String> options) {
super(options);
@@ -187,4 +189,18 @@
public void setTranslateSlideMasters(boolean translateSlideMasters) {
setBoolean(OPTION_TRANSLATE_SLIDE_MASTERS, translateSlideMasters);
}
+
+ /**
+ * Returns whether Slide Layouts should be translated.
+ */
+ public boolean getTranslateSlideLayouts() {
+ return getBoolean(OPTION_TRANSLATE_SLIDE_LAYOUTS, false);
+ }
+
+ /**
+ * Sets whether Slide Layouts should be translated.
+ */
+ public void setTranslateSlideLayouts(boolean translateSlideLayouts) {
+ setBoolean(OPTION_TRANSLATE_SLIDE_LAYOUTS, translateSlideLayouts);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|