Skip to content

Commit 1c5d341

Browse files
prrvchrprrvchr
committed
git subrepo pull (merge) uno
subrepo: subdir: "uno" merged: "becc475" upstream: origin: "https://github.com/prrvchr/uno.git" branch: "main" commit: "becc475" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596"
1 parent 2a4f813 commit 1c5d341

File tree

10 files changed

+78
-9
lines changed

10 files changed

+78
-9
lines changed

‎uno/.gitrepo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = https://github.com/prrvchr/uno.git
88
branch = main
9-
commit = 0570cf69764b0b208554c00439f6829574ca49e6
10-
parent = 38c12d135856271babcd41d3accaac0f00921147
9+
commit = becc47537e6baec5593e9c601a041d44fbb24775
10+
parent = 2a4f8136ddcdba4a411f88933f68d5ec4078d46e
1111
method = merge
1212
cmdver = 0.4.3

‎uno/dialog/embedded/OptionsDialog.xdl‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@
2929
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:Level2" script:language="UNO"/>
3030
</dlg:radio>
3131
</dlg:radiogroup>
32-
<dlg:text dlg:style-id="0" dlg:id="Label5" dlg:tab-index="10" dlg:left="10" dlg:top="145" 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"/>
32+
<dlg:checkbox dlg:id="CheckBox1" dlg:tab-index="10" dlg:left="10" dlg:top="140" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CheckBox1.HelpText" dlg:value="&amp;OptionsDialog.CheckBox1.Label" dlg:valign="center" dlg:checked="false">
33+
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:SystemTable" script:language="UNO"/>
34+
</dlg:checkbox>
35+
<dlg:checkbox dlg:id="CheckBox2" dlg:tab-index="11" dlg:left="95" dlg:top="140" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CheckBox2.HelpText" dlg:value="&amp;OptionsDialog.CheckBox2.Label" dlg:valign="center" dlg:checked="true">
36+
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:UseBookmark" script:language="UNO"/>
37+
</dlg:checkbox>
38+
<dlg:checkbox dlg:id="CheckBox3" dlg:tab-index="12" dlg:left="180" dlg:top="140" dlg:width="75" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CheckBox3.HelpText" dlg:value="&amp;OptionsDialog.CheckBox3.Label" dlg:valign="center" dlg:checked="false">
39+
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:SQLMode" script:language="UNO"/>
40+
</dlg:checkbox>
41+
<dlg:text dlg:style-id="0" dlg:id="Label5" dlg:tab-index="13" dlg:left="10" dlg:top="165" 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"/>
3342
</dlg:bulletinboard>
3443
</dlg:window>

‎uno/dialog/embedded/OptionsDialog_en_US.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,11 @@ OptionsDialog.OptionButton4.HelpText=
1919
OptionsDialog.OptionButton4.Label=sdbcx.Connection
2020
OptionsDialog.OptionButton5.HelpText=
2121
OptionsDialog.OptionButton5.Label=sdb.Connection
22+
OptionsDialog.CheckBox1.HelpText=
23+
OptionsDialog.CheckBox1.Label=View system tables
24+
OptionsDialog.CheckBox2.HelpText=
25+
OptionsDialog.CheckBox2.Label=Use bookmarks
26+
OptionsDialog.CheckBox3.HelpText=
27+
OptionsDialog.CheckBox3.Label=Force SQL mode
2228
OptionsDialog.Label5.HelpText=
2329
OptionsDialog.Label5.Label=The changes will take effect after restarting LibreOffice...

‎uno/dialog/embedded/OptionsDialog_fr_FR.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,11 @@ OptionsDialog.OptionButton4.HelpText=
1919
OptionsDialog.OptionButton4.Label=sdbcx.Connection
2020
OptionsDialog.OptionButton5.HelpText=
2121
OptionsDialog.OptionButton5.Label=sdb.Connection
22+
OptionsDialog.CheckBox1.HelpText=
23+
OptionsDialog.CheckBox1.Label=Voir les tables syst\u00e8me
24+
OptionsDialog.CheckBox2.HelpText=
25+
OptionsDialog.CheckBox2.Label=Utiliser les signets
26+
OptionsDialog.CheckBox3.HelpText=
27+
OptionsDialog.CheckBox3.Label=Forcer le mode SQL
2228
OptionsDialog.Label5.HelpText=
2329
OptionsDialog.Label5.Label=Les modifications prendront effet apr\u00e8s le red\u00e9marrage de LibreOffice...

‎uno/lib/java/helper/UnoHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ public static SQLException getSQLException(java.sql.SQLException e, XInterface c
401401
return exception;
402402
}
403403

404-
private static SQLException getUnoSQLException(String msg)
404+
public static SQLException getUnoSQLException(String msg)
405405
{
406406
return msg != null ? new SQLException(msg) : new SQLException();
407407
}

‎uno/lib/uno/embedded/driver.py‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,16 @@ def _checkLibreOffice(self):
172172

173173
def _getConnectionInfo(self, infos):
174174
document = storage = url = None
175-
service = getConfiguration(self._ctx, g_identifier).getByName('ConnectionService')
176-
newinfos = {'Url': g_url, 'ConnectionService': service}
175+
config = getConfiguration(self._ctx, g_identifier)
176+
service = config.getByName('ConnectionService')
177+
system = config.getByName('ShowSystemTable')
178+
bookmark = config.getByName('UseBookmark')
179+
mode = config.getByName('SQLMode')
180+
newinfos = {'Url': g_url,
181+
'ConnectionService': service,
182+
'ShowSystemTable': system,
183+
'UseBookmark': bookmark,
184+
'SQLMode': mode}
177185
if g_user:
178186
newinfos['user'] = g_user
179187
if g_driver:

‎uno/lib/uno/embedded/options/optionsmanager.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,13 @@ def setDriverService(self, driver):
9696
def setConnectionService(self, level):
9797
self._model.setConnectionService(level)
9898

99+
def setSystemTable(self, state):
100+
self._model.setSystemTable(state)
101+
102+
def setBookmark(self, state):
103+
self._model.setBookmark(state)
104+
self._view.enableSQLMode(state)
105+
106+
def setSQLMode(self, state):
107+
self._model.setSQLMode(state)
108+

‎uno/lib/uno/embedded/options/optionsmodel.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ def __init__(self, ctx, url=None):
6060
def getViewData(self):
6161
driver = self._services.get('Driver').index(self._getDriverService())
6262
connection = self._services.get('Connection').index(self._getConnectionService())
63-
return driver, connection, self._isConnectionEnabled(driver), self._getDriverVersion()
63+
enabled = self._isConnectionEnabled(driver)
64+
version = self._getDriverVersion()
65+
system = self._config.getByName('ShowSystemTable')
66+
bookmark = self._config.getByName('UseBookmark')
67+
mode = self._config.getByName('SQLMode')
68+
return driver, connection, enabled, version, system, bookmark, mode
6469

6570
def loadSetting(self):
6671
self._config = getConfiguration(self._ctx, g_identifier, True)
@@ -83,6 +88,15 @@ def setDriverService(self, driver):
8388
def setConnectionService(self, level):
8489
self._config.replaceByName('ConnectionService', self._services.get('Connection')[level])
8590

91+
def setSystemTable(self, state):
92+
self._config.replaceByName('ShowSystemTable', bool(state))
93+
94+
def setBookmark(self, state):
95+
self._config.replaceByName('UseBookmark', bool(state))
96+
97+
def setSQLMode(self, state):
98+
self._config.replaceByName('SQLMode', bool(state))
99+
86100
def saveSetting(self):
87101
config = self._config.hasPendingChanges()
88102
if config:

‎uno/lib/uno/embedded/options/optionsview.py‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,15 @@ def __init__(self, window, restart):
3636
self.setRestart(restart)
3737

3838
# OptionsView setter methods
39-
def initView(self, driver, connection, enabled, version):
39+
def initView(self, driver, connection, enabled, version, system, bookmark, mode):
4040
self._getVersion().Text = version
4141
self._getDriverService(driver).State = 1
4242
self._getConnectionService(connection).State = 1
4343
self._getConnectionService(0).Model.Enabled = enabled
44+
self._getSytemTable().State = int(system)
45+
self._getBookmark().State = int(bookmark)
46+
self.enableSQLMode(bookmark)
47+
self._getSQLMode().State = int(mode)
4448

4549
def setDriverVersion(self, version):
4650
self._getVersion().Text = version
@@ -55,13 +59,25 @@ def setConnectionLevel(self, level, enabled):
5559
def setRestart(self, enabled):
5660
self._getRestart().setVisible(enabled)
5761

62+
def enableSQLMode(self, state):
63+
self._getSQLMode().Model.Enabled = bool(state)
64+
5865
# OptionsView private control methods
5966
def _getDriverService(self, index):
6067
return self._window.getControl('OptionButton%s' % (index + 1))
6168

6269
def _getConnectionService(self, index):
6370
return self._window.getControl('OptionButton%s' % (index + 3))
6471

72+
def _getSytemTable(self):
73+
return self._window.getControl('CheckBox1')
74+
75+
def _getBookmark(self):
76+
return self._window.getControl('CheckBox2')
77+
78+
def _getSQLMode(self):
79+
return self._window.getControl('CheckBox3')
80+
6581
def _getVersion(self):
6682
return self._window.getControl('Label2')
6783

‎uno/lib/uno/jdbcdriver/configuration.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
g_extension = 'jdbcDriverOOo'
3232
g_identifier = 'io.github.prrvchr.%s' % g_extension
3333
g_service = '%s.Driver' % g_identifier
34-
g_version = '1.4.3'
34+
g_version = '1.4.4'
3535

3636
# jdbcDriverOOo resource strings files and folder
3737
g_resource = 'resource'

0 commit comments

Comments
 (0)