git subrepo pull (merge) uno

subrepo:
  subdir:   "uno"
  merged:   "9f4f258f"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "9f4f258f"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

Author: prrvchr

uno/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/prrvchr/uno.git
 	branch = main
-	commit = 7b7904709d7e822fbabfa29abc3d9cf981bf724e
-	parent = 3972ffb5154e0b3ed35956da3d23b639136cff51
+	commit = 9f4f258ffaa5542f79124cfc65e1f416db376453
+	parent = 7c866d76f856b221189e69e03b4fc1687a3e9349
 	method = merge
 	cmdver = 0.4.3

uno/dialog/card/OptionsDialog.xdl

@@ -14,5 +14,6 @@
     </dlg:button>
     <dlg:text dlg:id="Label3" dlg:tab-index="5" dlg:left="10" dlg:top="120" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label3.HelpText" dlg:value="&amp;OptionsDialog.Label3.Label" dlg:valign="center"/>
     <dlg:textfield dlg:id="TextField1" dlg:tab-index="6" dlg:left="100" dlg:top="120" dlg:width="100" dlg:height="15" dlg:help-text="&amp;OptionsDialog.TextField1.HelpText" dlg:value="&amp;OptionsDialog.TextField1.Text"/>
+    <dlg:text dlg:style-id="0" dlg:id="Label4" dlg:tab-index="7" dlg:left="10" dlg:top="145" dlg:width="240" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label4.HelpText" dlg:value="&amp;OptionsDialog.Label4.Label" dlg:align="center" dlg:valign="center"/>
   </dlg:bulletinboard>
 </dlg:window>

uno/dialog/ucb/OptionsDialog.xdl

@@ -46,5 +46,6 @@
     <dlg:button dlg:id="CommandButton1" dlg:tab-index="22" dlg:disabled="true" dlg:left="100" dlg:top="180" dlg:width="100" 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:ViewData" script:language="UNO"/>
     </dlg:button>
+    <dlg:text dlg:style-id="0" dlg:id="Label8" dlg:tab-index="23" dlg:left="10" dlg:top="205" dlg:width="240" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label8.HelpText" dlg:value="&amp;OptionsDialog.Label8.Label" dlg:align="center" dlg:valign="center"/>
   </dlg:bulletinboard>
 </dlg:window>

uno/lib/uno/jdbcdriver/configuration.py

@@ -31,7 +31,7 @@
 g_extension = 'jdbcDriverOOo'
 g_identifier = 'io.github.prrvchr.%s' % g_extension
 g_service = '%s.Driver' % g_identifier
-g_version = '1.4.4'
+g_version = '1.4.5'
 
 # jdbcDriverOOo resource strings files and folder
 g_resource = 'resource'

uno/lib/uno/options/addressbook/optionsmanager.py

@@ -27,8 +27,6 @@
 ╚════════════════════════════════════════════════════════════════════════════════════╝
 """
 
-import unohelper
-
 from com.sun.star.logging.LogLevel import INFO
 from com.sun.star.logging.LogLevel import SEVERE
 
@@ -43,32 +41,34 @@
 from ..configuration import g_defaultlog
 from ..configuration import g_synclog
 
-from collections import OrderedDict
-import os
-import sys
 import traceback
 
 
-class OptionsManager(unohelper.Base):
+class OptionsManager():
     def __init__(self, ctx, window, logger):
         self._ctx = ctx
-        self._model = OptionsModel(ctx)
-        timeout, view, enabled = self._model.getViewData()
-        self._view = OptionsView(window, timeout, view, enabled)
-        self._logmanager = LogManager(self._ctx, window.Peer, 'requirements.txt', g_identifier, g_defaultlog, g_synclog)
         self._logger = logger
+        self._model = OptionsModel(ctx)
+        self._view = OptionsView(window, OptionsManager._restart, *self._model.getViewData())
+        self._logmanager = LogManager(self._ctx, window.Peer, 'requirements.txt', g_defaultlog, g_synclog)
         self._logger.logprb(INFO, 'OptionsManager', '__init__()', 201)
 
+    _restart = False
+
     def loadSetting(self):
         self._view.setTimeout(self._model.getTimeout())
         self._view.setViewName(self._model.getViewName())
+        self._view.setRestart(OptionsManager._restart)
         self._logmanager.loadSetting()
         self._logger.logprb(INFO, 'OptionsManager', 'loadSetting()', 211)
 
     def saveSetting(self):
         timeout, view = self._view.getViewData()
         option = self._model.setViewData(timeout, view)
         log = self._logmanager.saveSetting()
+        if log:
+            OptionsManager._restart = True
+            self._view.setRestart(True)
         self._logger.logprb(INFO, 'OptionsManager', 'saveSetting()', 221, option, log)
 
     def viewData(self):

uno/lib/uno/options/addressbook/optionsview.py

@@ -33,11 +33,12 @@
 
 
 class OptionsView(unohelper.Base):
-    def __init__(self, window, timeout, view, enabled):
+    def __init__(self, window, restart, timeout, view, enabled):
         self._window = window
         self._getTimeout().Value = timeout
         self._getDatasource().Model.Enabled = enabled
         self._setViewName(view, not enabled)
+        self.setRestart(restart)
 
 # OptionsView getter methods
     def getViewData(self):
@@ -50,6 +51,9 @@ def setTimeout(self, timeout):
     def setViewName(self, view):
         self._getViewName().Text = view
 
+    def setRestart(self, enabled):
+        self._getRestart().setVisible(enabled)
+
 # OptionsView private setter methods
     def _setViewName(self, view, disabled):
         self._getViewLabel().Model.Enabled = disabled
@@ -69,3 +73,7 @@ def _getViewLabel(self):
 
     def _getViewName(self):
         return self._window.getControl('TextField1')
+
+    def _getRestart(self):
+        return self._window.getControl('Label4')
+

uno/lib/uno/options/ucb/optionsmanager.py

@@ -27,8 +27,6 @@
 ╚════════════════════════════════════════════════════════════════════════════════════╝
 """
 
-import unohelper
-
 from com.sun.star.logging.LogLevel import INFO
 from com.sun.star.logging.LogLevel import SEVERE
 
@@ -47,28 +45,30 @@
 import traceback
 
 
-class OptionsManager(unohelper.Base):
+class OptionsManager():
     def __init__(self, ctx, window, logger):
         self._ctx = ctx
-        self._model = OptionsModel(ctx)
-        exist = self._model.hasData()
-        resumable = self._model.isResumable()
-        data = self._model.getViewData()
-        self._view = OptionsView(window, exist, resumable, data)
-        self._logmanager = LogManager(ctx, window.Peer, 'requirements.txt', g_identifier, g_defaultlog, g_synclog)
         self._logger = logger
+        self._model = OptionsModel(ctx)
+        self._view = OptionsView(window, *self._model.getInitData())
+        self._view.setViewData(*self._model.getViewData(OptionsManager._restart))
+        self._logmanager = LogManager(ctx, window.Peer, 'requirements.txt', g_defaultlog, g_synclog)
         self._logger.logprb(INFO, 'OptionsManager', '__init__()', 151)
 
+    _restart = False
+
     def loadSetting(self):
-        data = self._model.getViewData()
-        self._view.setViewData(*data)
+        self._view.setViewData(*self._model.getViewData(OptionsManager._restart))
         self._logmanager.loadSetting()
         self._logger.logprb(INFO, 'OptionsManager', 'loadSetting()', 161)
 
     def saveSetting(self):
         share, name, index, timeout, download, upload = self._view.getViewData()
         option = self._model.setViewData(share, name, index, timeout, download, upload)
         log = self._logmanager.saveSetting()
+        if log:
+            OptionsManager._restart = True
+            self._view.setRestart(True)
         self._logger.logprb(INFO, 'OptionsManager', 'saveSetting()', 171, option, log)
 
     def enableShare(self, enabled):

uno/lib/uno/options/ucb/optionsmodel.py

@@ -27,8 +27,6 @@
 ╚════════════════════════════════════════════════════════════════════════════════════╝
 """
 
-import unohelper
-
 from com.sun.star.ucb.SynchronizePolicy import SERVER_IS_MASTER
 from com.sun.star.ucb.SynchronizePolicy import CLIENT_IS_MASTER
 from com.sun.star.ucb.SynchronizePolicy import NONE_IS_MASTER
@@ -47,7 +45,7 @@
 import traceback
 
 
-class OptionsModel(unohelper.Base):
+class OptionsModel():
     def __init__(self, ctx):
         self._ctx = ctx
         self._config = getConfiguration(ctx, g_identifier, True)
@@ -84,16 +82,15 @@ def _SupportShare(self):
         return self._config.getByName('SupportShare')
 
 # OptionsModel getter methods
-    def hasData(self):
-        return getSimpleFile(self._ctx).exists(self._url)
-
-    def isResumable(self):
-        return self._config.getByName('ResumableUpload')
+    def getInitData(self):
+        hasdata = getSimpleFile(self._ctx).exists(self._url)
+        resumable = self._config.getByName('ResumableUpload')
+        return hasdata, resumable
 
-    def getViewData(self):
+    def getViewData(self, restart):
         return (self._SupportShare, self._IsShared, self._ShareName,
                 self._Policy, self._Timeout,
-                self._Download, self._Upload)
+                self._Download, self._Upload, restart)
 
     def getDatasourceUrl(self):
         return self._url

uno/lib/uno/options/ucb/optionsview.py

@@ -27,15 +27,12 @@
 ╚════════════════════════════════════════════════════════════════════════════════════╝
 """
 
-import unohelper
-
 import traceback
 
 
-class OptionsView(unohelper.Base):
-    def __init__(self, window, exist, resumable, data):
+class OptionsView():
+    def __init__(self, window, exist, resumable):
         self._window = window
-        self.setViewData(*data)
         if exist:
             self._disableShare()
         self._getDatasource().Model.Enabled = exist
@@ -55,7 +52,7 @@ def getViewData(self):
     def setStep(self, step):
         self._window.Model.Step = step
 
-    def setViewData(self, support, share, name, index, timeout, download, upload):
+    def setViewData(self, support, share, name, index, timeout, download, upload, restart):
         if support:
             self._getShare().State = int(share)
             self._getShareName().Text = name
@@ -70,6 +67,7 @@ def setViewData(self, support, share, name, index, timeout, download, upload):
         self._getTimeout().Value = timeout
         self._setSetting(download, 0)
         self._setSetting(upload, 1)
+        self.setRestart(restart)
 
     def enableShare(self, enabled):
         self._getShareName().Model.Enabled = enabled
@@ -78,6 +76,9 @@ def enableTimeout(self, enabled):
         self._getTimeoutLabel().Model.Enabled = enabled
         self._getTimeout().Model.Enabled = enabled
 
+    def setRestart(self, enabled):
+        self._getRestart().setVisible(enabled)
+
 # OptionsView private getter methods
     def _getOptionIndex(self):
         for index in range(1,4):
@@ -132,3 +133,6 @@ def _getDelay(self, index):
     def _getRetry(self, index):
         return self._window.getControl('NumericField%s' % index)
 
+    def _getRestart(self):
+        return self._window.getControl('Label8')
+