Index: gc_lang/fr/oxt/DictOptions/DictOptions.py
==================================================================
--- gc_lang/fr/oxt/DictOptions/DictOptions.py
+++ gc_lang/fr/oxt/DictOptions/DictOptions.py
@@ -54,37 +54,44 @@
xFDTitle.Height = 9
xFDTitle.Weight = uno.getConstantByName("com.sun.star.awt.FontWeight.BOLD")
xFDTitle.Name = "Verdana"
xFDSubTitle = uno.createUnoStruct("com.sun.star.awt.FontDescriptor")
- xFDSubTitle.Height = 8
+ xFDSubTitle.Height = 10
xFDSubTitle.Weight = uno.getConstantByName("com.sun.star.awt.FontWeight.BOLD")
xFDSubTitle.Name = "Verdana"
# widget
nX = 10
nY1 = 10
- nY2 = nY1 + 50
- nY3 = nY2 + 70
+ nY2 = nY1 + 40
+ nY3 = nY2 + 40
+ nY4 = nY3 + 40
nWidth = self.xDialog.Width - 20
nHeight = 10
# Spell checker section
- self._addWidget("spelling_section", 'FixedLine', nX, nY1, nWidth, nHeight, Label = dUI.get("spelling_section", "#err"), FontDescriptor = xFDTitle)
- self.xGraphspell = self._addWidget('activate_main', 'CheckBox', nX, nY1+15, nWidth, nHeight, Label = dUI.get('activate_main', "#err"))
- self._addWidget('activate_main_descr', 'FixedText', nX, nY1+25, nWidth, nHeight*2, Label = dUI.get('activate_main_descr', "#err"), MultiLine = True)
+ #self._addWidget("spelling_section", 'FixedLine', nX, nY1, nWidth, nHeight, Label = dUI.get("spelling_section", "#err"), FontDescriptor = xFDTitle)
+ #self.xGraphspell = self._addWidget('activate_main', 'CheckBox', nX, nY1+15, nWidth, nHeight, Label = dUI.get('activate_main', "#err"))
+ #self._addWidget('activate_main_descr', 'FixedText', nX, nY1+25, nWidth, nHeight*2, Label = dUI.get('activate_main_descr', "#err"), MultiLine = True)
# Spell suggestion engine section
- self._addWidget("suggestion_section", 'FixedLine', nX, nY2, nWidth, nHeight, Label = dUI.get("suggestion_section", "#err"), FontDescriptor = xFDTitle)
- self.xGraphspellSugg = self._addWidget('activate_spell_sugg', 'CheckBox', nX, nY2+15, nWidth, nHeight, Label = dUI.get('activate_spell_sugg', "#err"))
- self._addWidget('activate_spell_sugg_descr', 'FixedText', nX, nY2+25, nWidth, nHeight*4, Label = dUI.get('activate_spell_sugg_descr', "#err"), MultiLine = True)
-
- # Personal dictionary section
- self._addWidget("personal_section", 'FixedLine', nX, nY3, nWidth, nHeight, Label = dUI.get("personal_section", "#err"), FontDescriptor = xFDTitle)
- self.xPersonalDic = self._addWidget('activate_personal', 'CheckBox', nX, nY3+15, nWidth, nHeight, Label = dUI.get('activate_personal', "#err"))
- self._addWidget('activate_personnal_descr', 'FixedText', nX, nY3+25, nWidth, nHeight*3, Label = dUI.get('activate_personal_descr', "#err"), MultiLine = True)
+ #self._addWidget("suggestion_section", 'FixedLine', nX, nY2, nWidth, nHeight, Label = dUI.get("suggestion_section", "#err"), FontDescriptor = xFDTitle)
+ #self.xGraphspellSugg = self._addWidget('activate_spell_sugg', 'CheckBox', nX, nY2+15, nWidth, nHeight, Label = dUI.get('activate_spell_sugg', "#err"))
+ #self._addWidget('activate_spell_sugg_descr', 'FixedText', nX, nY2+25, nWidth, nHeight*4, Label = dUI.get('activate_spell_sugg_descr', "#err"), MultiLine = True)
+
+ # Main dictionary section
+ self._addWidget("graphspell_section", 'FixedLine', nX, nY1, nWidth, nHeight, Label = dUI.get("graphspell_section", "#err"), FontDescriptor = xFDTitle)
+ self.xMainDic = self._addWidget('activate_main', 'CheckBox', nX, nY1+15, nWidth, nHeight, Label = dUI.get('activate_main', "#err"), FontDescriptor = xFDSubTitle, TextColor = 0x000088, State = True)
+ self._addWidget('activate_main_descr', 'FixedText', nX+10, nY1+25, nWidth-10, nHeight*2, Label = dUI.get('activate_main_descr', "#err"), MultiLine = True)
+ self.xExtendedDic = self._addWidget('activate_extended', 'CheckBox', nX, nY2+15, nWidth, nHeight, Label = dUI.get('activate_extended', "#err"), FontDescriptor = xFDSubTitle, TextColor = 0x000088, Enabled = False)
+ self._addWidget('activate_extended_descr', 'FixedText', nX+10, nY2+25, nWidth-10, nHeight*2, Label = dUI.get('activate_extended_descr', "#err"), MultiLine = True)
+ self.xCommunityDic = self._addWidget('activate_community', 'CheckBox', nX, nY3+15, nWidth, nHeight, Label = dUI.get('activate_community', "#err"), FontDescriptor = xFDSubTitle, TextColor = 0x000088, Enabled = False)
+ self._addWidget('activate_community_descr', 'FixedText', nX+10, nY3+25, nWidth-10, nHeight*2, Label = dUI.get('activate_community_descr', "#err"), MultiLine = True)
+ self.xPersonalDic = self._addWidget('activate_personal', 'CheckBox', nX, nY4+15, nWidth, nHeight, Label = dUI.get('activate_personal', "#err"), FontDescriptor = xFDSubTitle, TextColor = 0x000088)
+ self._addWidget('activate_personal_descr', 'FixedText', nX+10, nY4+25, nWidth-10, nHeight*2, Label = dUI.get('activate_personal_descr', "#err"), MultiLine = True)
# Button
self._addWidget('apply_button', 'Button', self.xDialog.Width-115, self.xDialog.Height-25, 50, 14, Label = dUI.get('apply_button', "#err"), FontDescriptor = xFDTitle, TextColor = 0x005500)
self._addWidget('cancel_button', 'Button', self.xDialog.Width-60, self.xDialog.Height-25, 50, 14, Label = dUI.get('cancel_button', "#err"), FontDescriptor = xFDTitle, TextColor = 0x550000)
@@ -105,13 +112,14 @@
# XActionListener
def actionPerformed (self, xActionEvent):
try:
if xActionEvent.ActionCommand == 'Apply':
xChild = self.xSettingNode.getByName("o_fr")
- xChild.setPropertyValue("use_graphspell", self.xGraphspell.State)
- xChild.setPropertyValue("use_graphspell_sugg", self.xGraphspellSugg.State)
- #xChild.setPropertyValue("extended_dic", self.xExtendedDic.State)
+ #xChild.setPropertyValue("use_graphspell", self.xGraphspell.State)
+ #xChild.setPropertyValue("use_graphspell_sugg", self.xGraphspellSugg.State)
+ #xChild.setPropertyValue("use_extended_dic", self.xExtendedDic.State)
+ #xChild.setPropertyValue("use_community_dic", self.xCommunityDic.State)
xChild.setPropertyValue("use_personal_dic", self.xPersonalDic.State)
self.xSettingNode.commitChanges()
else:
pass
self.xContainer.endExecute()
@@ -127,15 +135,16 @@
traceback.print_exc()
def _loadOptions (self):
try:
xChild = self.xSettingNode.getByName("o_fr")
- self.xGraphspell.State = xChild.getPropertyValue("use_graphspell")
- self.xGraphspellSugg.State = xChild.getPropertyValue("use_graphspell_sugg")
- #self.xExtendedDic.State = xChild.getPropertyValue("extended_dic")
+ #self.xGraphspell.State = xChild.getPropertyValue("use_graphspell")
+ #self.xGraphspellSugg.State = xChild.getPropertyValue("use_graphspell_sugg")
+ #self.xExtendedDic.State = xChild.getPropertyValue("use_extended_dic")
+ #self.xCommunityDic.State = xChild.getPropertyValue("use_community_dic")
self.xPersonalDic.State = xChild.getPropertyValue("use_personal_dic")
except:
traceback.print_exc()
#g_ImplementationHelper = unohelper.ImplementationHelper()
#g_ImplementationHelper.addImplementation(DictOptions, 'net.grammalecte.graphspell.DictOptions', ('com.sun.star.task.Job',))
Index: gc_lang/fr/oxt/DictOptions/do_strings.py
==================================================================
--- gc_lang/fr/oxt/DictOptions/do_strings.py
+++ gc_lang/fr/oxt/DictOptions/do_strings.py
@@ -3,41 +3,53 @@
return dStrings[sLang]
return dStrings["fr"]
dStrings = {
"fr": {
- "title": "Grammalecte · Options des dictionnaires",
+ "title": "Grammalecte · Options orthographiques",
"spelling_section": "Correcteur orthographique",
"activate_main": "Activer le correcteur orthographique de Grammalecte",
"activate_main_descr": "Supplante le correcteur orthographique inclus dans LibreOffice (Hunspell).",
"suggestion_section": "Moteur de suggestion orthographique",
"activate_spell_sugg": "Activer le moteur de suggestion de Grammalecte",
"activate_spell_sugg_descr": "Désactivée, cette option remplace la suggestion orthographique de Grammalecte par celle fournie par LibreOffice (Hunspell). Les mots inclus dans le dictionnaire personnalisé ne seront plus inclus aux suggestions.",
- "personal_section": "Dictionnaire personnel",
- "activate_personal": "Utiliser",
- "activate_personal_descr": "Le dictionnaire personnel est une commodité pour ajouter le vocabulaire qui vous est utile. Il ne supplante pas le dictionnaire commun ; il ne fait qu’ajouter de nouveaux mots.",
+ "graphspell_section": "Dictionnaires de Grammalecte (Graphspell)",
+ "activate_main": "Dictionnaire principal",
+ "activate_main_descr": "Environ 83 000 entrées, 500 000 flexions.\nNi éditable, ni désactivable.",
+ "activate_extended": "Dictionnaire étendu",
+ "activate_extended_descr": "Fonctionnalité à venir",
+ "activate_community": "Dictionnaire communautaire",
+ "activate_community_descr": "Fonctionnalité à venir",
+ "activate_personal": "Dictionnaire personnel",
+ "activate_personal_descr": "Le dictionnaire personnel est créé et édité via l’éditeur lexical.",
"apply_button": "Appliquer",
"cancel_button": "Annuler",
},
"en": {
- "title": "Grammalecte · Options for dictionaries",
+ "title": "Grammalecte · Spelling options",
"spelling_section": "Spell checker",
"activate_main": "Activate the spell checker from Grammalecte",
"activate_main_descr": "Overrides the spell checker included in LibreOffice (Hunspell)",
"suggestion_section": "Spell suggestion engine",
"activate_spell_sugg": "Activate the suggestion engine of Grammalecte",
"activate_spell_sugg_descr": "Disactivated, this option replace the spell suggestion engine of Grammalecte by the one of LibreOffice (Hunspell). Words included in the personal dictionary won’t be included among suggestions.",
- "personal_section": "Personal dictionary",
- "activate_personal": "Use",
- "activate_personal_descr": "The personal dictionary is a commodity to add the vocabulary you want. It doesn’t override the common dictionary ; it only adds new words.",
+ "graphspell_section": "Grammalecte Dictionaries (Graphspell)",
+ "activate_main": "Main dictionary",
+ "activate_main_descr": "About 83 000 entries, 500 000 flexions.\nNot editable, not deactivable.",
+ "activate_extended": "Extended dictionary",
+ "activate_extended_descr": "Feature to come.",
+ "activate_community": "Community dictionary",
+ "activate_community_descr": "Feature to come.",
+ "activate_personal": "Personal dictionary",
+ "activate_personal_descr": "The personal dictionary is created and edited via the lexicon editor.",
"apply_button": "Apply",
"cancel_button": "Cancel",
},
}
Index: gc_lang/fr/oxt/addons.xcu
==================================================================
--- gc_lang/fr/oxt/addons.xcu
+++ gc_lang/fr/oxt/addons.xcu
@@ -139,12 +139,12 @@
service:net.grammalecte.AppLauncher?DI
- ~Options des dictionnaires…
- Dictionaries ~options…
+ ~Options orthographiques…
+ Spelling ~options…
_self
@@ -152,10 +152,11 @@
org.dicollecte.images:Frenchflag
+
service:net.grammalecte.AppLauncher?LE