Index: gc_core/py/oxt/Grammalecte.py ================================================================== --- gc_core/py/oxt/Grammalecte.py +++ gc_core/py/oxt/Grammalecte.py @@ -31,10 +31,12 @@ for i in gce.locales: l = gce.locales[i] self.locales.append(Locale(l[0], l[1], l[2])) self.locales = tuple(self.locales) xContext = uno.getComponentContext() + # debug + #helpers.startConsole() # init gce.load("Writer", "nInt") # GC options # opt_handler.load(xContext) dOpt = Options.load(xContext) Index: gc_lang/fr/oxt/About/About.py ================================================================== --- gc_lang/fr/oxt/About/About.py +++ gc_lang/fr/oxt/About/About.py @@ -77,16 +77,14 @@ self._addWidget('lblLicence', 'FixedText', 10, 100, nLblWidth, 10, Label = dUI.get('license', "#err"), Align = 1, FontDescriptor = xFD2) self._addWidget('lblWebsite', 'FixedHyperlink', 10, 110, nLblWidth, 10, Label = dUI.get('website', "#err"), Align = 1, \ URL="https://grammalecte.net/?from=grammalecte-lo", FontDescriptor = xFD1, TextColor = nURLcolor) # Python - self._addWidget('lblpython', 'FixedText', 10, 125, 60, 10, Align = 1, TextColor = 0x666666, FontDescriptor = xFD2, \ + self._addWidget('lblpython', 'FixedText', 10, 125, nLblWidth//2, 10, Align = 1, TextColor = 0x666666, FontDescriptor = xFD2, \ Label = dUI.get('pythonver', "#err") + "{0[0]}.{0[1]}.{0[2]}".format(sys.version_info)) - self._addWidget('console_button', 'Button', 70, 124, 40, 10, \ + self._addWidget('console_button', 'Button', nLblWidth-40, 124, 40, 10, \ Label = dUI.get('console', "#err"), FontDescriptor = xFD2, TextColor = 0x666666) - self.xAutoConsole = self._addWidget('autoconsole', 'CheckBox', 120, 125, 40, 10, \ - Label = dUI.get('autoconsole', "#err"), HelpText = dUI.get("autoconsole_descr", "#err")) # other self._addWidget('line', 'FixedLine', 10, 140, nLblWidth, 10) # sponsors @@ -98,19 +96,15 @@ Align = 1, URL="https://www.algoo.fr/?from=grammalecte-lo", FontDescriptor = xFD3, TextColor = nURLcolor) self._addWidget('imgSponsor2', 'ImageControl', 5, 245, 150, 50, ImageURL = sExtPath+"/img/Algoo_logo.png", Border = 0, ScaleMode = 1) self._addWidget('lblURL3', 'FixedHyperlink', 10, 300, nLblWidth, 10, Label = dUI.get('link', "#err"), \ Align = 1, URL="https://grammalecte.net/#thanks", FontDescriptor = xFD1, TextColor = nURLcolor) - self._loadOptions() - # container self.xContainer = self.xSvMgr.createInstanceWithContext('com.sun.star.awt.UnoControlDialog', self.ctx) self.xContainer.setModel(self.xDialog) self.xContainer.getControl('console_button').addActionListener(self) self.xContainer.getControl('console_button').setActionCommand('Console') - self.xContainer.getControl('autoconsole').addActionListener(self) - self.xContainer.getControl('autoconsole').setActionCommand('AutoConsole') self.xContainer.setVisible(False) xToolkit = self.xSvMgr.createInstanceWithContext('com.sun.star.awt.ExtToolkit', self.ctx) self.xContainer.createPeer(xToolkit, None) self.xContainer.execute() except: @@ -119,20 +113,9 @@ # XActionListener def actionPerformed (self, xActionEvent): try: if xActionEvent.ActionCommand == 'Console': helpers.startConsole() - elif xActionEvent.ActionCommand == "AutoConsole": - xChild = self.xGLOptionNode.getByName("o_fr") - xChild.setPropertyValue("start_console", self.xAutoConsole.State) - self.xGLOptionNode.commitChanges() else: self.xContainer.endExecute() except: - traceback.print_exc() - - def _loadOptions (self): - try: - xChild = self.xGLOptionNode.getByName("o_fr") - self.xAutoConsole.State = xChild.getPropertyValue("start_console") - except: traceback.print_exc() Index: gc_lang/fr/oxt/About/ab_strings.py ================================================================== --- gc_lang/fr/oxt/About/ab_strings.py +++ gc_lang/fr/oxt/About/ab_strings.py @@ -13,12 +13,10 @@ "license": "Licence : GPL 3", "website": "Site web", "pythonver": "Python v", "console": "Console", - "autoconsole": "Auto", - "autoconsole_descr": "Lance la console au démarrage de LibreOffice", "message": "Avec le soutien de", "sponsor": "La Mouette…", "sponsor2": "Algoo…", "link": "… et de nombreux contributeurs.", @@ -32,16 +30,14 @@ "license": "License: GPL 3", "website": "Web site", "pythonver": "Python v", "console": "Console", - "autoconsole": "Auto", - "autoconsole_descr": "Launch the console at the start of LibreOffice", "message": "With the support of", "sponsor": "La Mouette…", "sponsor2": "Algoo…", "link": "… and many contributors.", "close": "~OK" } } Index: gc_lang/fr/oxt/AppLauncher.py ================================================================== --- gc_lang/fr/oxt/AppLauncher.py +++ gc_lang/fr/oxt/AppLauncher.py @@ -20,15 +20,10 @@ # In this extension, French is default language. # It is assumed that those who need to use the French dictionaries understand French and may not understand English. xSettings = helpers.getConfigSetting("/org.openoffice.Setup/L10N", False) sLocale = xSettings.getByName("ooLocale") # Note: look at ooSetupSystemLocale value? self.sLang = sLocale[0:2] - # console - xSettings = helpers.getConfigSetting("/org.openoffice.Lightproof_grammalecte/Other/", False) - xChild = xSettings.getByName("o_fr") - if xChild.getPropertyValue("start_console"): - helpers.startConsole() # XJobExecutor def trigger (self, sCmd): try: if sCmd == "About":