Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,15 @@ Added a BASIC macro [GithubDownloadRequest][113] to download the latest version
To enable downloading from Github, this macro uses two HTTP requests, one to initialize a session with cookies and the other to perform the download.
This might help me find a solution to allow automatic updating of extensions in LibreOffice from Github revisions.

### What remains to be done for version 1.5.1:
### What has been done for version 1.5.2:

- Fixed the BASIC macro [GithubDownloadRequest][113].
- Fixed changelog link in the `README.md` file.
- You can again use a URL to launch the OAuth2 wizard in the extension options.
- Automatic extension updates have been fixed, see [tdf#159775][114], thanks to `Mike Kaganski`. This will be available soon in LibreOffice 25.8.x.
- Support for LibreOffice 25.2.x and 25.8.x on Windows 64-bit. See [issue#25][115].

### What remains to be done for version 1.5.2:

- Add new language for internationalization...

Expand Down Expand Up @@ -457,3 +465,5 @@ This might help me find a solution to allow automatic updating of extensions in
[111]: <https://peps.python.org/pep-0570/>
[112]: <https://github.com/prrvchr/OAuth2OOo/blob/master/uno/lib/uno/logger/logwrapper.py#L109>
[113]: <https://github.com/prrvchr/OAuth2OOo/blob/master/source/OAuth2OOo/OAuth2OOo/GithubDownloadRequest.xba>
[114]: <https://bugs.documentfoundation.org/show_bug.cgi?id=159775>
[115]: <https://github.com/prrvchr/OAuth2OOo/issues/25>
13 changes: 11 additions & 2 deletions CHANGELOG_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -332,14 +332,21 @@ Si votre architecture n'est pas encore supportée par OAuth2OOo (Mac OSX, arm...
- Il est désormais possible de créer le fichier oxt de l'extension OAuth2OOo uniquement avec Apache Ant et une copie du dépôt GitHub. La section [Comment créer l'extension][110] a été ajoutée à la documentation.
- Implémentation de [PEP 570][111] dans la [journalisation][112] pour prendre en charge les arguments multiples uniques.


### Ce qui a été fait pour la version 1.5.1:

Ajout d'une macro BASIC [GithubDownloadRequest][113] pour télécharger la dernière version de OAuth2OOo à partir des révisions sur le site Github.
Pour permettre le téléchargement sur Github, cette macro utilise deux requêtes HTTP, une pour initialiser une session avec des cookies et l'autre pour effectuer le téléchargement.
Cela pourrait m'aider à trouver une solution pour permettre la mise à jour automatique des extensions dans LibreOffice à partir des révisions Github.

### Que reste-t-il à faire pour la version 1.5.1:
### Ce qui a été fait pour la version 1.5.2:

- Correction de la macro BASIC [GithubDownloadRequest][113].
- Correction de lien vers l'historique dans le fichier `README_fr.md`.
- Vous pouvez à nouveau utiliser une URL pour lancer l'assistant OAuth2 dans les options de l'extension.
- La mise à jour automatique des extensions a été corrigée, voir [tdf#159775][114], merci à `Mike Kaganski`. Ceci sera bientôt disponible dans LibreOffice 25.8.x.
- Support de LibreOffice 25.2.x et 25.8.x sous Windows 64 bits. Voir [issue#25][115].

### Que reste-t-il à faire pour la version 1.5.2:

- Ajouter de nouvelles langue pour l'internationalisation...

Expand Down Expand Up @@ -458,3 +465,5 @@ Cela pourrait m'aider à trouver une solution pour permettre la mise à jour aut
[111]: <https://peps.python.org/pep-0570/>
[112]: <https://github.com/prrvchr/OAuth2OOo/blob/master/uno/lib/uno/logger/logwrapper.py#L109>
[113]: <https://github.com/prrvchr/OAuth2OOo/blob/master/source/OAuth2OOo/OAuth2OOo/GithubDownloadRequest.xba>
[114]: <https://bugs.documentfoundation.org/show_bug.cgi?id=159775>
[115]: <https://github.com/prrvchr/OAuth2OOo/issues/25>
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

**The use of this software subjects you to our [Terms Of Use][4] and [Data Protection Policy][5].**

# version [1.5.1][6]
# version [1.5.2][6]

## Introduction:

Expand Down Expand Up @@ -191,14 +191,14 @@ ___

## Historical:

### [All changes are logged in the version History][43]
### [All changes are logged in the version History][44]

[1]: </img/oauth2.svg#collapse>
[2]: <https://prrvchr.github.io/OAuth2OOo/>
[3]: <https://prrvchr.github.io/OAuth2OOo/README_fr>
[4]: <https://prrvchr.github.io/OAuth2OOo/source/OAuth2OOo/registration/TermsOfUse_en>
[5]: <https://prrvchr.github.io/OAuth2OOo/source/OAuth2OOo/registration/PrivacyPolicy_en>
[6]: <https://prrvchr.github.io/OAuth2OOo/CHANGELOG#what-has-been-done-for-version-151>
[6]: <https://prrvchr.github.io/OAuth2OOo/CHANGELOG#what-has-been-done-for-version-152>
[7]: <https://prrvchr.github.io>
[8]: <https://www.libreoffice.org/download/download/>
[9]: <https://www.openoffice.org/download/index.html>
Expand All @@ -221,7 +221,7 @@ ___
[26]: <https://packaging.python.org/en/latest/tutorials/installing-packages/#use-pip-for-installing>
[27]: <https://prrvchr.github.io/OAuth2OOo/img/OAuth2OOo.svg#middle>
[28]: <https://github.com/prrvchr/OAuth2OOo/releases/latest/download/OAuth2OOo.oxt>
[29]: <https://img.shields.io/github/downloads/prrvchr/OAuth2OOo/latest/total?label=v1.5.1#right>
[29]: <https://img.shields.io/github/downloads/prrvchr/OAuth2OOo/latest/total?label=v1.5.2#right>
[30]: <https://prrvchr.github.io/OAuth2OOo/img/OAuth2Wizard1.png>
[31]: <https://prrvchr.github.io/OAuth2OOo/img/OAuth2Wizard2.png>
[32]: <https://prrvchr.github.io/OAuth2OOo/img/OAuth2Wizard3.png>
Expand Down
8 changes: 4 additions & 4 deletions README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

**L'utilisation de ce logiciel vous soumet à nos [Conditions d'Utilisation][4] et à notre [Politique de Protection des Données][5].**

# version [1.5.1][6]
# version [1.5.2][6]

## Introduction:

Expand Down Expand Up @@ -191,14 +191,14 @@ ___

## Historique:

### [Toutes les changements sont consignées dans l'Historique des versions][43]
### [Toutes les changements sont consignées dans l'Historique des versions][44]

[1]: </img/oauth2.svg#collapse>
[2]: <https://prrvchr.github.io/OAuth2OOo/>
[3]: <https://prrvchr.github.io/OAuth2OOo>
[4]: <https://prrvchr.github.io/OAuth2OOo/source/OAuth2OOo/registration/TermsOfUse_fr>
[5]: <https://prrvchr.github.io/OAuth2OOo/source/OAuth2OOo/registration/PrivacyPolicy_fr>
[6]: <https://prrvchr.github.io/OAuth2OOo/CHANGELOG_fr#ce-qui-a-été-fait-pour-la-version-151>
[6]: <https://prrvchr.github.io/OAuth2OOo/CHANGELOG_fr#ce-qui-a-été-fait-pour-la-version-152>
[7]: <https://prrvchr.github.io/README_fr>
[8]: <https://fr.libreoffice.org/download/telecharger-libreoffice/>
[9]: <https://www.openoffice.org/fr/Telecharger/>
Expand All @@ -221,7 +221,7 @@ ___
[26]: <https://packaging.python.org/en/latest/tutorials/installing-packages/#use-pip-for-installing>
[27]: <https://prrvchr.github.io/OAuth2OOo/img/OAuth2OOo.svg#middle>
[28]: <https://github.com/prrvchr/OAuth2OOo/releases/latest/download/OAuth2OOo.oxt>
[29]: <https://img.shields.io/github/downloads/prrvchr/OAuth2OOo/latest/total?label=v1.5.1#right>
[29]: <https://img.shields.io/github/downloads/prrvchr/OAuth2OOo/latest/total?label=v1.5.2#right>
[30]: <https://prrvchr.github.io/OAuth2OOo/img/OAuth2Wizard1_fr.png>
[31]: <https://prrvchr.github.io/OAuth2OOo/img/OAuth2Wizard2_fr.png>
[32]: <https://prrvchr.github.io/OAuth2OOo/img/OAuth2Wizard3_fr.png>
Expand Down
2 changes: 1 addition & 1 deletion source/OAuth2OOo/OAuth2OOo/GithubDownloadRequest.xba
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="HTTPGetRequest" script:language="StarBasic">
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="GithubDownloadRequest" script:language="StarBasic">

Rem ╔════════════════════════════════════════════════════════════════════════════════════╗
Rem ║ ║
Expand Down
2 changes: 1 addition & 1 deletion source/OAuth2OOo/Options.xcu
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<value>30</value>
</prop>
<prop oor:name="HandlerTimeout">
<value>120</value>
<value>180</value>
</prop>
<prop oor:name="BaseUrl">
<value>https://prrvchr.github.io/OAuth2OOo/source/OAuth2OOo/registration/</value>
Expand Down
2 changes: 1 addition & 1 deletion source/OAuth2OOo/description.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:l="http://libreoffice.org/extensions/description/2011"
xmlns:xlink="http://www.w3.org/1999/xlink">
<version value="1.5.1"/>
<version value="1.5.2"/>
<identifier value="io.github.prrvchr.OAuth2OOo"/>
<platform value="all"/>
<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions source/OAuth2OOo/dialogs/OptionsDialog.xdl
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
<dlg:numericfield dlg:id="NumericField3" dlg:tab-index="6" dlg:left="205" dlg:top="120" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField2.HelpText" dlg:decimal-accuracy="0" dlg:value-min="0" dlg:value-max="300"/>
<dlg:fixedline dlg:style-id="0" dlg:id="FixedLine2" dlg:tab-index="7" dlg:left="6" dlg:top="143" dlg:width="244" dlg:height="15" dlg:help-text="&amp;OptionsDialog.FixedLine2.HelpText" dlg:value="&amp;OptionsDialog.FixedLine2.Label"/>
<dlg:text dlg:id="Label4" dlg:tab-index="8" dlg:left="10" dlg:top="160" dlg:width="10" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label4.HelpText" dlg:value="&amp;OptionsDialog.Label4.Label" dlg:valign="center" dlg:tabstop="false"/>
<dlg:combobox dlg:id="ComboBox1" dlg:tab-index="9" dlg:left="25" dlg:top="160" dlg:width="60" dlg:height="15" dlg:help-text="&amp;OptionsDialog.ComboBox1.HelpText" dlg:value="&amp;OptionsDialog.ComboBox1.Text" dlg:spin="true"/>
<dlg:button dlg:id="CommandButton1" dlg:tab-index="10" dlg:disabled="false" dlg:left="105" dlg:top="160" dlg:width="60" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CommandButton1.HelpText" dlg:value="&amp;OptionsDialog.CommandButton1.Label">
<dlg:menulist dlg:id="ListBox1" dlg:tab-index="9" dlg:left="25" dlg:top="160" dlg:width="90" dlg:height="15" dlg:help-text="&amp;OptionsDialog.ListBox1.HelpText" dlg:value="&amp;OptionsDialog.ListBox1.Text" dlg:spin="true"/>
<dlg:button dlg:id="CommandButton1" dlg:tab-index="10" dlg:disabled="false" dlg:left="130" dlg:top="160" dlg:width="60" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CommandButton1.HelpText" dlg:value="&amp;OptionsDialog.CommandButton1.Label">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:Connect" script:language="UNO"/>
</dlg:button>
<dlg:checkbox dlg:id="CheckBox1" dlg:tab-index="11" dlg:left="190" dlg:top="160" dlg:width="60" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CheckBox1.HelpText" dlg:value="&amp;OptionsDialog.CheckBox1.Label" dlg:valign="center" dlg:checked="false"/>
<dlg:checkbox dlg:id="CheckBox1" dlg:tab-index="11" dlg:left="205" dlg:top="160" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CheckBox1.HelpText" dlg:value="&amp;OptionsDialog.CheckBox1.Label" dlg:valign="center" dlg:checked="false"/>
<dlg:text dlg:style-id="0" dlg:id="Label5" dlg:tab-index="12" dlg:left="10" dlg:top="185" dlg:width="240" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label5.HelpText" dlg:value="&amp;OptionsDialog.Label5.Label" dlg:align="center" dlg:valign="center"/>
</dlg:bulletinboard>
</dlg:window>
8 changes: 4 additions & 4 deletions source/OAuth2OOo/dialogs/OptionsDialog_en_US.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ OptionsDialog.FixedLine2.HelpText=
OptionsDialog.FixedLine2.Label=OAuth2 configuration
OptionsDialog.Label4.HelpText=
OptionsDialog.Label4.Label=Url:
OptionsDialog.ComboBox1.HelpText=
OptionsDialog.ComboBox1.Text=
OptionsDialog.ListBox1.HelpText=
OptionsDialog.ListBox1.Text=
OptionsDialog.CommandButton1.HelpText=
OptionsDialog.CommandButton1.Label=OAuth2 Wizard
OptionsDialog.CheckBox1.HelpText=
OptionsDialog.CheckBox1.Label=Auto close
OptionsDialog.CheckBox1.HelpText=Automatically close the wizard
OptionsDialog.CheckBox1.Label=Close
OptionsDialog.Label5.HelpText=
OptionsDialog.Label5.Label=Changes will take effect after restarting LibreOffice...
8 changes: 4 additions & 4 deletions source/OAuth2OOo/dialogs/OptionsDialog_fr_FR.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ OptionsDialog.FixedLine2.HelpText=
OptionsDialog.FixedLine2.Label=Configuration OAuth2
OptionsDialog.Label4.HelpText=
OptionsDialog.Label4.Label=Url:
OptionsDialog.ComboBox1.HelpText=
OptionsDialog.ComboBox1.Text=
OptionsDialog.ListBox1.HelpText=
OptionsDialog.ListBox1.Text=
OptionsDialog.CommandButton1.HelpText=
OptionsDialog.CommandButton1.Label=Assistant OAuth2
OptionsDialog.CheckBox1.HelpText=
OptionsDialog.CheckBox1.Label=Fermeture automatique
OptionsDialog.CheckBox1.HelpText=Fermeture automatique de l'assistant
OptionsDialog.CheckBox1.Label=Fermer
OptionsDialog.Label5.HelpText=
OptionsDialog.Label5.Label=Les modifications prendront effet apr\u00e8s le red\u00e9marrage de LibreOffice...
14 changes: 7 additions & 7 deletions source/OAuth2OOo/dialogs/PageWizard3_fr_FR.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ PageWizard3.Label1.HelpText=
PageWizard3.Label1.Label=En attente d'autorisation...
PageWizard3.ProgressBar1.HelpText=
PageWizard3.Label2.HelpText=
PageWizard3.Label2.Label=L'obtention de l'autorisation à \u00e9chou\u00e9 avec l'erreur suivante:
PageWizard3.Label2.Label=L'obtention de l'autorisation à \u00e9chou\u00e9 avec l'erreur suivante:
PageWizard3.Label9.Label=L'obtention des jetons à \u00e9chou\u00e9 avec l'erreur suivante:
PageWizard3.TextField1.HelpText=
PageWizard3.TextField1.Text=
PageWizard3.TextField1.Text.100=Le d\u00e9lai d'attente a \u00e9t\u00e9 atteint et aucune r\u00e9ponse d'autorisation n'a \u00e9t\u00e9 reçue. R\u00e9essayer...
PageWizard3.TextField1.Text.100=Le d\u00e9lai d'attente a \u00e9t\u00e9 atteint et aucune r\u00e9ponse d'autorisation n'a \u00e9t\u00e9 reçue. R\u00e9essayer...
PageWizard3.TextField1.Text.101=Le serveur d'autorisation a r\u00e9pondu, mais son identification n'a pas pu \u00eatre effectu\u00e9e!!!
PageWizard3.TextField1.Text.102=Le serveur d'autorisation a r\u00e9pondu, mais son identification n'est pas valide!!!
PageWizard3.TextField1.Text.103=Le serveur d'autorisation a r\u00e9pondu, mais sans autorisation ni code d'erreur!!!
PageWizard3.TextField1.Text.200=Le serveur a r\u00e9pondu avec une erreur inconnue!!!
PageWizard3.TextField1.Text.201=Le serveur d'autorisation a r\u00e9pondu que l'autorisation a \u00e9t\u00e9 refus\u00e9e. R\u00e9essayer...
PageWizard3.TextField1.Text.202=Le serveur a r\u00e9pondu que la requ\u00eate ne dispose pas d'un paramètre obligatoire, comporte une valeur de paramètre non valide ou est sinon malformée.
PageWizard3.TextField1.Text.203=Le serveur a r\u00e9pondu que le client n'est pas autoris\u00e9 à demander un code d'autorisation en utilisant cette m\u00e9thode.
PageWizard3.TextField1.Text.204=Le serveur a r\u00e9pondu qu'il ne prend pas en charge l'obtention d'un code d'autorisation à l'aide de cette m\u00e9thode.
PageWizard3.TextField1.Text.202=Le serveur a r\u00e9pondu que la requ\u00eate ne dispose pas d'un param\u00e8tre obligatoire, comporte une valeur de param\u00e8tre non valide ou est sinon malform\u00e9e.
PageWizard3.TextField1.Text.203=Le serveur a r\u00e9pondu que le client n'est pas autoris\u00e9 à demander un code d'autorisation en utilisant cette m\u00e9thode.
PageWizard3.TextField1.Text.204=Le serveur a r\u00e9pondu qu'il ne prend pas en charge l'obtention d'un code d'autorisation à l'aide de cette m\u00e9thode.
PageWizard3.TextField1.Text.205=Le serveur a r\u00e9pondu que l'\u00e9tendue des permissions demand\u00e9e n'est pas valide, inconnue ou incorrecte.
PageWizard3.TextField1.Text.206=Le serveur a r\u00e9pondu qu'il a rencontr\u00e9 une condition inattendue qui l'a emp\u00each\u00e9 de r\u00e9pondre à la requ\u00eate.
PageWizard3.TextField1.Text.206=Le serveur a r\u00e9pondu qu'il a rencontr\u00e9 une condition inattendue qui l'a emp\u00each\u00e9 de r\u00e9pondre à la requ\u00eate.
PageWizard3.TextField1.Text.207=Le serveur a r\u00e9pondu qu'il est actuellement incapable de traiter la demande en raison d'une surcharge temporaire ou d'une maintenance du serveur.
PageWizard3.TextField1.Text.300=Impossible de se connecter à un serveur à cette URL: %s avec comme suite d'exception: %s
PageWizard3.TextField1.Text.300=Impossible de se connecter à un serveur à cette URL: %s avec comme suite d'exception: %s
PageWizard3.TextField1.Text.301=Le serveur a r\u00e9pondu dans un mauvais format (%s) avec le code de statut HTTP %s pour l'URL: %s
PageWizard3.TextField1.Text.302=\n\nContenu de la page:\n\n%s
PageWizard3.TextField1.Text.303=\n\nDescription de l'erreur:\n\n%s
2 changes: 1 addition & 1 deletion source/OAuth2OOo/dialogs/PageWizard4_fr_FR.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ PageWizard4.Label7.Label=Expire dans (seconde):
PageWizard4.Label8.HelpText=
PageWizard4.Label8.Label=inconnu
PageWizard4.Label9.HelpText=
PageWizard4.Label9.Label=L'actualisation du jeton à  \u00e9chou\u00e9 avec l'erreur suivante:
PageWizard4.Label9.Label=L'actualisation du jeton à \u00e9chou\u00e9 avec l'erreur suivante:
PageWizard4.TextField1.HelpText=
PageWizard4.TextField1.Text=
PageWizard4.CommandButton1.HelpText=
Expand Down
2 changes: 1 addition & 1 deletion source/OAuth2OOo/dialogs/ProviderDialog_fr_FR.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ProviderDialog.HelpText=
ProviderDialog.Title=Fournisseur OAuth2OOo - %s
ProviderDialog.FixedLine1.HelpText=
ProviderDialog.FixedLine1.Label=Paramètres de connexion
ProviderDialog.FixedLine1.Label=Param\u00e8tres de connexion
ProviderDialog.Label1.HelpText=
ProviderDialog.Label1.Label=Client ID:
ProviderDialog.TextField1.HelpText=
Expand Down
4 changes: 2 additions & 2 deletions source/OAuth2OOo/package.properties

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def getParent(self):
return self._dialog.getPeer()

def getUrl(self):
return self._getUrls().SelectedText
return self._getUrls().getSelectedItem()

def getAutoClose(self):
return bool(self._getAutoClose().State)
Expand All @@ -70,7 +70,7 @@ def _getHandler(self):

# OptionsView private getter control methods
def _getUrls(self):
return self._dialog.getControl('ComboBox1')
return self._dialog.getControl('ListBox1')

def _getAutoClose(self):
return self._dialog.getControl('CheckBox1')
Expand Down
4 changes: 2 additions & 2 deletions uno/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/prrvchr/uno.git
branch = main
commit = 011ecd18b6840e7db10aa0de17cbf55a920ecdfd
parent = c442a2f2c1380a32e124b953bff5c021b568f902
commit = 66e9aea6994add573be9c1556b90c87449543a11
parent = 3fbbb390e96df7f220f74fdbf09b72ee3658e742
method = merge
cmdver = 0.4.9
Binary file added uno/lib/python/_cffi_backend.cp310-win_amd64.pyd
Binary file not shown.
Binary file added uno/lib/python/_cffi_backend.cp311-win_amd64.pyd
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added uno/lib/python/lxml/builder.cp310-win_amd64.pyd
Binary file not shown.
Binary file added uno/lib/python/lxml/builder.cp311-win_amd64.pyd
Binary file not shown.
Binary file added uno/lib/python/lxml/etree.cp310-win_amd64.pyd
Binary file not shown.
Binary file added uno/lib/python/lxml/etree.cp311-win_amd64.pyd
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added uno/lib/python/lxml/objectify.cp310-win_amd64.pyd
Binary file not shown.
Binary file added uno/lib/python/lxml/objectify.cp311-win_amd64.pyd
Binary file not shown.
Binary file added uno/lib/python/lxml/sax.cp310-win_amd64.pyd
Binary file not shown.
Binary file added uno/lib/python/lxml/sax.cp311-win_amd64.pyd
Binary file not shown.
2 changes: 1 addition & 1 deletion uno/lib/uno/jdbcdriver/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
g_services = ('io.github.prrvchr.jdbcdriver.sdbc.Driver',
'io.github.prrvchr.jdbcdriver.sdbcx.Driver',
'io.github.prrvchr.jdbcdriver.sdb.Driver')
g_version = '1.5.2'
g_version = '1.5.4'
2 changes: 1 addition & 1 deletion uno/lib/uno/oauth20/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
g_service = '%s.OAuth2Service' % g_identifier
g_resource = 'resource'

g_version = '1.5.1'
g_version = '1.5.2'
g_chunk = g_chunk = 320 * 1024

g_token = 'Bearer ${AccessToken}'
Expand Down
2 changes: 1 addition & 1 deletion uno/lib/uno/options/jdbc/optionmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def loadSetting(self):
self._initView()

def setApiLevel(self, level):
self._model.setApiLevel(level)
self._view.enableCachedRowSet(self._model.setApiLevel(level))

def setCachedRowSet(self, level):
self._model.setCachedRowSet(level)
Expand Down
5 changes: 4 additions & 1 deletion uno/lib/uno/options/jdbc/optionmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@ def getViewData(self):
level = self._settings.get('ApiLevel')
crs = self._settings.get('CachedRowSet')
system = self._settings.get('ShowSystemTable')
return level, crs, system
return level, crs, system, self._isRowSetEnabled(level)

# OptionModel setter methods
def setApiLevel(self, level):
self._settings['ApiLevel'] = level
return self._isRowSetEnabled(level)

def setCachedRowSet(self, level):
self._settings['CachedRowSet'] = level
Expand All @@ -89,3 +90,5 @@ def _getSettings(self):
settings[key] = self._config.getByName(key)
return settings

def _isRowSetEnabled(self, level):
return level != 0
7 changes: 6 additions & 1 deletion uno/lib/uno/options/jdbc/optionview.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,16 @@ def __init__(self, ctx, window, handler, options, restart, offset):
def dispose(self):
self._window.dispose()

def initView(self, level, crs, system):
def initView(self, level, crs, system, enabled):
self._getApiLevel(level).State = 1
self._getCachedRowSet(crs).State = 1
self.enableCachedRowSet(enabled)
self._getSytemTable().State = int(system)

def enableCachedRowSet(self, enabled):
for crs in range(3):
self._getCachedRowSet(crs).Model.Enabled = enabled

def setRestart(self, enabled):
self._getRestart().setVisible(enabled)

Expand Down
Loading