[issue #32] [beta] Highlight code based on paragraph style (part 4).

Take account of kompilainenn comments: - change finishing dialog from error box to info box; - make selected paragraph style persistent per document and per session.

Author: jmzambon

codehighlighter/dialogs/CodeHighlighter2.xdl

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="CodeHighlighter" dlg:left="350" dlg:top="113" dlg:width="217" dlg:height="180" dlg:page="1" dlg:closeable="true" dlg:moveable="true" dlg:title="Code Highlighter 2 - v{}">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="CodeHighlighter" dlg:left="350" dlg:top="113" dlg:width="222" dlg:height="180" dlg:page="1" dlg:closeable="true" dlg:moveable="true" dlg:title="Code Highlighter 2 - v{}">
  <dlg:styles>
  <dlg:style dlg:style-id="0" dlg:text-color="0x4c4c4c" dlg:font-height="8" dlg:font-stylename="Normal" dlg:font-family="swiss"/>
  <dlg:style dlg:style-id="1" dlg:border="none" dlg:font-weight="150" dlg:font-slant="italic"/>
@@ -17,31 +17,31 @@
  <dlg:numericfield dlg:id="nb_ratio" dlg:tab-index="6" dlg:left="87" dlg:top="42" dlg:width="47" dlg:height="15" dlg:page="2" dlg:valign="center" dlg:strict-format="true" dlg:decimal-accuracy="0" dlg:value-min="50" dlg:value-max="100" dlg:spin="true" dlg:repeat="50"/>
  <dlg:textfield dlg:id="nb_sep" dlg:tab-index="7" dlg:left="87" dlg:top="60" dlg:width="15" dlg:height="15" dlg:page="2" dlg:valign="center"/>
  <dlg:textfield dlg:id="nb_pad" dlg:tab-index="8" dlg:left="87" dlg:top="78" dlg:width="15" dlg:height="15" dlg:page="2" dlg:valign="center" dlg:maxlength="1"/>
- <dlg:textfield dlg:id="cs_rootstyle" dlg:tab-index="9" dlg:left="97" dlg:top="117" dlg:width="50" dlg:height="15" dlg:page="2" dlg:valign="center"/>
- <dlg:button dlg:id="preview" dlg:tab-index="10" dlg:left="137" dlg:top="19" dlg:width="70" dlg:height="16">
+ <dlg:textfield dlg:id="cs_rootstyle" dlg:tab-index="9" dlg:left="97" dlg:top="121" dlg:width="50" dlg:height="15" dlg:page="2" dlg:valign="center"/>
+ <dlg:button dlg:id="preview" dlg:tab-index="10" dlg:left="142" dlg:top="23" dlg:width="70" dlg:height="16">
  <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:preview" script:language="UNO"/>
  </dlg:button>
- <dlg:button dlg:id="btn_ok" dlg:tab-index="13" dlg:left="137" dlg:top="40" dlg:width="70" dlg:height="16" dlg:default="true" dlg:button-type="ok"/>
- <dlg:button dlg:id="btn_cancel" dlg:tab-index="14" dlg:left="137" dlg:top="60" dlg:width="70" dlg:height="16" dlg:button-type="cancel"/>
- <dlg:button dlg:id="topage1" dlg:tab-index="15" dlg:left="137" dlg:top="81" dlg:width="70" dlg:height="16" dlg:page="2">
+ <dlg:button dlg:id="btn_ok" dlg:tab-index="13" dlg:left="142" dlg:top="44" dlg:width="70" dlg:height="16" dlg:default="true" dlg:button-type="ok"/>
+ <dlg:button dlg:id="btn_cancel" dlg:tab-index="14" dlg:left="142" dlg:top="64" dlg:width="70" dlg:height="16" dlg:button-type="cancel"/>
+ <dlg:button dlg:id="topage1" dlg:tab-index="15" dlg:left="142" dlg:top="85" dlg:width="70" dlg:height="16" dlg:page="2">
  <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:topage1" script:language="UNO"/>
  </dlg:button>
  <dlg:text dlg:style-id="0" dlg:id="pygments_ver" dlg:tab-index="16" dlg:left="18" dlg:top="166" dlg:width="85" dlg:height="8" dlg:value="Build upon pygments {}"/>
  <dlg:img dlg:style-id="1" dlg:id="pygments_logo" dlg:tab-index="17" dlg:left="5" dlg:top="165" dlg:width="11" dlg:height="9" dlg:scale-mode="isotropic" dlg:src="vnd.sun.star.extension://javahelps.codehighlighter/images/pygments.png"/>
- <dlg:fixedline dlg:style-id="1" dlg:id="nb_line" dlg:tab-index="18" dlg:left="10" dlg:top="10" dlg:width="117" dlg:height="10" dlg:page="2"/>
+ <dlg:fixedline dlg:style-id="1" dlg:id="nb_line" dlg:tab-index="18" dlg:left="10" dlg:top="10" dlg:width="120" dlg:height="10" dlg:page="2"/>
  <dlg:text dlg:id="lbl_nb_start" dlg:tab-index="19" dlg:left="10" dlg:top="26" dlg:width="73" dlg:height="15" dlg:page="2" dlg:align="right" dlg:valign="center"/>
  <dlg:text dlg:id="lbl_nb_ratio" dlg:tab-index="20" dlg:left="10" dlg:top="42" dlg:width="73" dlg:height="15" dlg:page="2" dlg:align="right" dlg:valign="center"/>
  <dlg:text dlg:id="lbl_nb_sep" dlg:tab-index="21" dlg:left="10" dlg:top="61" dlg:width="73" dlg:height="15" dlg:page="2" dlg:align="right" dlg:valign="center"/>
  <dlg:text dlg:id="lbl_nb_pad" dlg:tab-index="22" dlg:left="10" dlg:top="78" dlg:width="73" dlg:height="15" dlg:page="2" dlg:align="right" dlg:valign="center"/>
- <dlg:fixedline dlg:style-id="1" dlg:id="cs_line" dlg:tab-index="23" dlg:left="10" dlg:top="107" dlg:width="117" dlg:height="10" dlg:page="2"/>
+ <dlg:fixedline dlg:style-id="1" dlg:id="cs_line" dlg:tab-index="23" dlg:left="10" dlg:top="107" dlg:width="120" dlg:height="10" dlg:page="2"/>
  <dlg:text dlg:id="lbl_cs_rootstyle" dlg:tab-index="24" dlg:left="10" dlg:top="121" dlg:width="83" dlg:height="15" dlg:page="2" dlg:align="right" dlg:valign="center"/>
- <dlg:button dlg:id="topage2" dlg:tab-index="25" dlg:left="137" dlg:top="81" dlg:width="70" dlg:height="16" dlg:page="1">
+ <dlg:button dlg:id="topage2" dlg:tab-index="25" dlg:left="142" dlg:top="85" dlg:width="70" dlg:height="16" dlg:page="1">
  <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:topage2" script:language="UNO"/>
  </dlg:button>
- <dlg:fixedline dlg:id="para_line" dlg:tab-index="26" dlg:left="10" dlg:top="116" dlg:width="197" dlg:height="2" dlg:page="1"/>
+ <dlg:fixedline dlg:id="para_line" dlg:tab-index="26" dlg:left="10" dlg:top="116" dlg:width="202" dlg:height="2" dlg:page="1"/>
  <dlg:text dlg:style-id="1" dlg:id="label_parastyle" dlg:tab-index="27" dlg:left="10" dlg:top="122" dlg:width="200" dlg:height="10" dlg:page="1"/>
  <dlg:menulist dlg:id="lb_parastyle" dlg:tab-index="28" dlg:left="10" dlg:top="135" dlg:width="100" dlg:height="15" dlg:page="1" dlg:spin="true" dlg:linecount="20"/>
- <dlg:button dlg:id="btn_parastyle" dlg:tab-index="29" dlg:left="137" dlg:top="135" dlg:width="70" dlg:page="1" dlg:height="16">
+ <dlg:button dlg:id="btn_parastyle" dlg:tab-index="29" dlg:left="142" dlg:top="135" dlg:width="70" dlg:page="1" dlg:height="16">
  <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:parastyle" script:language="UNO"/>
  </dlg:button>
  </dlg:bulletinboard>

codehighlighter/python/highlight.py

@@ -80,7 +80,7 @@
  from com.sun.star.awt.FontWeight import NORMAL as W_NORMAL, BOLD as W_BOLD
  from com.sun.star.awt.FontSlant import NONE as SL_NONE, ITALIC as SL_ITALIC
  from com.sun.star.awt.FontUnderline import NONE as UL_NONE, SINGLE as UL_SINGLE
- from com.sun.star.awt.MessageBoxType import ERRORBOX
+ from com.sun.star.awt.MessageBoxType import ERRORBOX, INFOBOX
  from com.sun.star.beans import PropertyValue
  from com.sun.star.container import ElementExistException
  from com.sun.star.document import XUndoAction
@@ -98,6 +98,7 @@
 CHARSTYLEID = "ch2_"
 SNIPPETTAGID = CHARSTYLEID + "options"
 INVALID_SELECTION = "Invalid"
+SELECTED_PARASTYLE = {}
 
 
 class UndoAction(unohelper.Base, XUndoAction):
@@ -201,7 +202,6 @@ def __init__(self, ctx):
  'CharacterStyles' in self.doc.StyleFamilies and
  self.doc.CurrentSelection.ImplementationName != "com.sun.star.drawing.SvxShapeCollection")
  self.parastyles = self.loadparastyles()
- self.parastyle = None
  self.cfg_access = self.create_cfg_access()
  self.options = self.load_options()
  self.extpath, self.extver = self.getextinfos()
@@ -264,7 +264,7 @@ def callHandlerMethod(self, dialog, event, method):
  if locstylename == "":
  self.msgbox(_("Please select a paragraph style."))
  else:
- self.parastyle = self.parastyles[locstylename]
+ SELECTED_PARASTYLE[self.doc.RuntimeUID] = self.parastyles[locstylename]
  dialog.endDialog(2)
  return True
  except Exception:
@@ -483,6 +483,8 @@ def create_dialog(self):
 
  if self.parastyles:
  lb_parastyle.addItems(sorted(self.parastyles.keys(), key=str.casefold), 0)
+ if SELECTED_PARASTYLE and SELECTED_PARASTYLE.get(self.doc.RuntimeUID, None) in self.parastyles:
+ lb_parastyle.selectItem(SELECTED_PARASTYLE.get(self.doc.RuntimeUID, None), True)
  else:
  lb_parastyle.setEnable(False)
  if self.doc.supportsService('com.sun.star.text.GenericTextDocument'):
@@ -1298,7 +1300,7 @@ def browse_all_paras(container=None):
  for para in container:
  if not para.supportsService('com.sun.star.text.Paragraph'):
  continue
- if para.ParaStyleName == self.parastyle:
+ if para.ParaStyleName == SELECTED_PARASTYLE[self.doc.RuntimeUID]:
  if not cursor:
  cursor = container.createTextCursorByRange(para.Start)
  else:
@@ -1329,7 +1331,7 @@ def browse_all_paras(container=None):
  message = ngettext("{} code snippet has been formatted.",
  "{} code snippets have been formatted.",
  len(code_blocks))
- self.msgbox(message.format(len(code_blocks)))
+ self.msgbox(message.format(len(code_blocks)), boxtype=INFOBOX, title=_("Highlight all"))
 
  def update_all(self, usetags):
  '''Update all formatted code in the active document.

codehighlighter2.oxt

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-08-25 10:35+0200\n"
+"POT-Creation-Date: 2024-08-25 19:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgstr "Please select a paragraph style."
 #: codehighlighter/python/highlight.py:283
 #: codehighlighter/python/highlight.py:312
 #: codehighlighter/python/highlight.py:327
-#: codehighlighter/python/highlight.py:1076
+#: codehighlighter/python/highlight.py:1078
 msgid "Unsupported selection."
 msgstr "Unsupported selection."
 
@@ -112,14 +112,15 @@ msgstr "Height (%)"
 msgid "Start at"
 msgstr "Start at"
 
-#: codehighlighter/python/highlight.py:449
-msgid "Highlight all"
-msgstr "Highlight all"
-
 #: codehighlighter/python/highlight.py:449
 msgid "Highlight all codes formatted with paragraph style:"
 msgstr "Highlight all codes formatted with paragraph style:"
 
+#: codehighlighter/python/highlight.py:449
+#: codehighlighter/python/highlight.py:1334
+msgid "Highlight all"
+msgstr "Highlight all"
+
 #: codehighlighter/python/highlight.py:450
 msgid "Back"
 msgstr "Back"
@@ -144,19 +145,19 @@ msgstr ""
 "Highlight every code snippet in the document that is formatted with the "
 "given paragraph style."
 
-#: codehighlighter/python/highlight.py:489
+#: codehighlighter/python/highlight.py:491
 msgid " (There is currently no style in use.)"
 msgstr " (There is currently no style in use.)"
 
-#: codehighlighter/python/highlight.py:491
+#: codehighlighter/python/highlight.py:493
 msgid " (Writer only.)"
 msgstr " (Writer only.)"
 
-#: codehighlighter/python/highlight.py:526
+#: codehighlighter/python/highlight.py:528
 msgid "Unsupported language."
 msgstr "Unsupported language."
 
-#: codehighlighter/python/highlight.py:528
+#: codehighlighter/python/highlight.py:530
 msgid "Unknown style."
 msgstr "Unknown style."
 

locales/en/LC_MESSAGES/ch2.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-08-25 10:35+0200\n"
+"POT-Creation-Date: 2024-08-25 19:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgstr "Sélectionnez un style de paragraphe."
 #: codehighlighter/python/highlight.py:283
 #: codehighlighter/python/highlight.py:312
 #: codehighlighter/python/highlight.py:327
-#: codehighlighter/python/highlight.py:1076
+#: codehighlighter/python/highlight.py:1078
 msgid "Unsupported selection."
 msgstr "Sélection invalide."
 
@@ -113,14 +113,15 @@ msgstr "Taille (%)"
 msgid "Start at"
 msgstr "Démarrer à"
 
-#: codehighlighter/python/highlight.py:449
-msgid "Highlight all"
-msgstr "Tout coloriser"
-
 #: codehighlighter/python/highlight.py:449
 msgid "Highlight all codes formatted with paragraph style:"
 msgstr "Coloriser sur base d'un style de paragraphe :"
 
+#: codehighlighter/python/highlight.py:449
+#: codehighlighter/python/highlight.py:1334
+msgid "Highlight all"
+msgstr "Tout coloriser"
+
 #: codehighlighter/python/highlight.py:450
 msgid "Back"
 msgstr "Retour"
@@ -145,19 +146,19 @@ msgstr ""
 "Colorise l'ensemble des éléments de code du document formatés avec le style "
 "de paragraphe donné."
 
-#: codehighlighter/python/highlight.py:489
+#: codehighlighter/python/highlight.py:491
 msgid " (There is currently no style in use.)"
 msgstr " (Aucun style n'est actuellement utilisé.)"
 
-#: codehighlighter/python/highlight.py:491
+#: codehighlighter/python/highlight.py:493
 msgid " (Writer only.)"
 msgstr " (Writer seul.)"
 
-#: codehighlighter/python/highlight.py:526
+#: codehighlighter/python/highlight.py:528
 msgid "Unsupported language."
 msgstr "Langage non supporté."
 
-#: codehighlighter/python/highlight.py:528
+#: codehighlighter/python/highlight.py:530
 msgid "Unknown style."
 msgstr "Style inconnu."
 

locales/fr/LC_MESSAGES/ch2.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-08-25 10:35+0200\n"
+"POT-Creation-Date: 2024-08-25 19:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgstr "Selezionare uno stile paragrafo."
 #: codehighlighter/python/highlight.py:283
 #: codehighlighter/python/highlight.py:312
 #: codehighlighter/python/highlight.py:327
-#: codehighlighter/python/highlight.py:1076
+#: codehighlighter/python/highlight.py:1078
 msgid "Unsupported selection."
 msgstr "Selezione non supportata."
 
@@ -116,14 +116,15 @@ msgstr "Altezza (%)"
 msgid "Start at"
 msgstr "Comincia da"
 
-#: codehighlighter/python/highlight.py:449
-msgid "Highlight all"
-msgstr "Evidenzia tutto"
-
 #: codehighlighter/python/highlight.py:449
 msgid "Highlight all codes formatted with paragraph style:"
 msgstr "Evidenzia tutti i codici formattati con lo stile paragrafo:"
 
+#: codehighlighter/python/highlight.py:449
+#: codehighlighter/python/highlight.py:1334
+msgid "Highlight all"
+msgstr "Evidenzia tutto"
+
 #: codehighlighter/python/highlight.py:450
 msgid "Back"
 msgstr "Indietro"
@@ -148,19 +149,19 @@ msgstr ""
 "Evidenzia tutti i codici nel documento formattati con lo stile di paragrafo "
 "indicato."
 
-#: codehighlighter/python/highlight.py:489
+#: codehighlighter/python/highlight.py:491
 msgid " (There is currently no style in use.)"
 msgstr " (Attualmente non esiste uno stile in uso.)"
 
-#: codehighlighter/python/highlight.py:491
+#: codehighlighter/python/highlight.py:493
 msgid " (Writer only.)"
 msgstr " (Solo Writer.)"
 
-#: codehighlighter/python/highlight.py:526
+#: codehighlighter/python/highlight.py:528
 msgid "Unsupported language."
 msgstr "Lingua non supportata."
 
-#: codehighlighter/python/highlight.py:528
+#: codehighlighter/python/highlight.py:530
 msgid "Unknown style."
 msgstr "Stile sconosciuto."