aboutsummaryrefslogtreecommitdiffstats
path: root/Plugins/ScriptingTcl
diff options
context:
space:
mode:
Diffstat (limited to 'Plugins/ScriptingTcl')
-rw-r--r--Plugins/ScriptingTcl/ScriptingTcl.pro6
-rw-r--r--Plugins/ScriptingTcl/ScriptingTcl_de.ts5
-rw-r--r--Plugins/ScriptingTcl/ScriptingTcl_es.ts5
-rw-r--r--Plugins/ScriptingTcl/ScriptingTcl_fr.qmbin649 -> 665 bytes
-rw-r--r--Plugins/ScriptingTcl/ScriptingTcl_fr.ts6
-rw-r--r--Plugins/ScriptingTcl/ScriptingTcl_it.ts5
-rw-r--r--Plugins/ScriptingTcl/ScriptingTcl_pl.ts5
-rw-r--r--Plugins/ScriptingTcl/ScriptingTcl_pt_BR.ts5
-rw-r--r--Plugins/ScriptingTcl/ScriptingTcl_ru.ts5
-rw-r--r--Plugins/ScriptingTcl/ScriptingTcl_sk.ts5
-rw-r--r--Plugins/ScriptingTcl/ScriptingTcl_zh_CN.ts5
-rw-r--r--Plugins/ScriptingTcl/scriptingtcl.cpp23
-rw-r--r--Plugins/ScriptingTcl/scriptingtcl.h1
-rw-r--r--Plugins/ScriptingTcl/scriptingtcl.json2
-rw-r--r--Plugins/ScriptingTcl/scriptingtcl.qrc6
15 files changed, 62 insertions, 22 deletions
diff --git a/Plugins/ScriptingTcl/ScriptingTcl.pro b/Plugins/ScriptingTcl/ScriptingTcl.pro
index 86fa734..44f133e 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl.pro
+++ b/Plugins/ScriptingTcl/ScriptingTcl.pro
@@ -150,10 +150,10 @@ RESOURCES += \
scriptingtcl.qrc
-TRANSLATIONS += ScriptingTcl_it.ts \
+TRANSLATIONS += ScriptingTcl_de.ts \
+ ScriptingTcl_it.ts \
ScriptingTcl_zh_CN.ts \
ScriptingTcl_sk.ts \
- ScriptingTcl_de.ts \
ScriptingTcl_ru.ts \
ScriptingTcl_pt_BR.ts \
ScriptingTcl_fr.ts \
@@ -172,3 +172,5 @@ TRANSLATIONS += ScriptingTcl_it.ts \
+
+
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_de.ts b/Plugins/ScriptingTcl/ScriptingTcl_de.ts
index adb7f21..4433954 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_de.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_de.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
<context>
<name>ScriptingTcl</name>
<message>
@@ -14,7 +14,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="scriptingtcl.cpp" line="554"/>
+ <location filename="scriptingtcl.cpp" line="445"/>
+ <location filename="scriptingtcl.cpp" line="576"/>
<source>Error from Tcl&apos;s&apos; &apos;%1&apos; command: %2</source>
<translation type="unfinished"></translation>
</message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_es.ts b/Plugins/ScriptingTcl/ScriptingTcl_es.ts
index 502c856..c1244be 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_es.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_es.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
<context>
<name>ScriptingTcl</name>
<message>
@@ -14,7 +14,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="scriptingtcl.cpp" line="554"/>
+ <location filename="scriptingtcl.cpp" line="445"/>
+ <location filename="scriptingtcl.cpp" line="576"/>
<source>Error from Tcl&apos;s&apos; &apos;%1&apos; command: %2</source>
<translation type="unfinished"></translation>
</message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_fr.qm b/Plugins/ScriptingTcl/ScriptingTcl_fr.qm
index 9ff0c46..f172932 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_fr.qm
+++ b/Plugins/ScriptingTcl/ScriptingTcl_fr.qm
Binary files differ
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_fr.ts b/Plugins/ScriptingTcl/ScriptingTcl_fr.ts
index be33fe6..339c748 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_fr.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_fr.ts
@@ -6,17 +6,17 @@
<message>
<location filename="scriptingtcl.cpp" line="411"/>
<source>No database available in current context, while called Tcl&apos;s &apos;%1&apos; command.</source>
- <translation>Aucune base de données valide dans le contexte courant, appeler la commande Tcl&rsquo;s «&nbsp;%1&nbsp;».</translation>
+ <translation>Aucune base de données valide dans le contexte courant, appeler la commande Tcl’s « %1 ».</translation>
</message>
<message>
<location filename="scriptingtcl.cpp" line="433"/>
<source>Invalid &apos;%1&apos; command sytax. Should be: %2</source>
- <translation>Syntaxe de commande invalide «&nbsp;%1&nbsp;». Devrait être: %2</translation>
+ <translation>Syntaxe de commande invalide « %1 ». Devrait être : %2</translation>
</message>
<message>
<location filename="scriptingtcl.cpp" line="554"/>
<source>Error from Tcl&apos;s&apos; &apos;%1&apos; command: %2</source>
- <translation>Erreur de la commande Tcl «&nbsp;%1&nbsp;»: %2</translation>
+ <translation>Erreur de la commande Tcl « %1 » : %2</translation>
</message>
</context>
</TS>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_it.ts b/Plugins/ScriptingTcl/ScriptingTcl_it.ts
index 9b252cc..ae772c8 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_it.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_it.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="it_IT">
+<TS version="2.1" language="it_IT">
<context>
<name>ScriptingTcl</name>
<message>
@@ -14,7 +14,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="scriptingtcl.cpp" line="554"/>
+ <location filename="scriptingtcl.cpp" line="445"/>
+ <location filename="scriptingtcl.cpp" line="576"/>
<source>Error from Tcl&apos;s&apos; &apos;%1&apos; command: %2</source>
<translation type="unfinished"></translation>
</message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_pl.ts b/Plugins/ScriptingTcl/ScriptingTcl_pl.ts
index be6a580..7766394 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_pl.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_pl.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<TS version="2.1" language="pl_PL">
<context>
<name>ScriptingTcl</name>
<message>
@@ -16,7 +16,8 @@
<translation>Niepoprawna składnia polecenia &apos;%1&apos;. Powinno być: %2</translation>
</message>
<message>
- <location filename="scriptingtcl.cpp" line="554"/>
+ <location filename="scriptingtcl.cpp" line="445"/>
+ <location filename="scriptingtcl.cpp" line="576"/>
<source>Error from Tcl&apos;s&apos; &apos;%1&apos; command: %2</source>
<oldsource>Error from Tcl&apos;s&apos; &apos;db&apos; command: %1</oldsource>
<translation>Wystąpił błąd w poleceniu Tcl &apos;%1&apos;: %2</translation>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_pt_BR.ts b/Plugins/ScriptingTcl/ScriptingTcl_pt_BR.ts
index a0ffcb8..513e55b 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_pt_BR.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_pt_BR.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="pt_BR">
+<TS version="2.1" language="pt_BR">
<context>
<name>ScriptingTcl</name>
<message>
@@ -14,7 +14,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="scriptingtcl.cpp" line="554"/>
+ <location filename="scriptingtcl.cpp" line="445"/>
+ <location filename="scriptingtcl.cpp" line="576"/>
<source>Error from Tcl&apos;s&apos; &apos;%1&apos; command: %2</source>
<translation type="unfinished"></translation>
</message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_ru.ts b/Plugins/ScriptingTcl/ScriptingTcl_ru.ts
index 4fd66de..7a2c2d9 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_ru.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_ru.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
<context>
<name>ScriptingTcl</name>
<message>
@@ -14,7 +14,8 @@
<translation>Некорректный синтаксис команды &apos;%1&apos;. Должно быть: %2</translation>
</message>
<message>
- <location filename="scriptingtcl.cpp" line="554"/>
+ <location filename="scriptingtcl.cpp" line="445"/>
+ <location filename="scriptingtcl.cpp" line="576"/>
<source>Error from Tcl&apos;s&apos; &apos;%1&apos; command: %2</source>
<translation>Ошибка в команде Tcl &apos;%1&apos;: %2</translation>
</message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_sk.ts b/Plugins/ScriptingTcl/ScriptingTcl_sk.ts
index ec050a9..6e9733e 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_sk.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_sk.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="sk_SK">
+<TS version="2.1" language="sk_SK">
<context>
<name>ScriptingTcl</name>
<message>
@@ -14,7 +14,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="scriptingtcl.cpp" line="554"/>
+ <location filename="scriptingtcl.cpp" line="445"/>
+ <location filename="scriptingtcl.cpp" line="576"/>
<source>Error from Tcl&apos;s&apos; &apos;%1&apos; command: %2</source>
<translation type="unfinished"></translation>
</message>
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_zh_CN.ts b/Plugins/ScriptingTcl/ScriptingTcl_zh_CN.ts
index 0355116..8c120c9 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl_zh_CN.ts
+++ b/Plugins/ScriptingTcl/ScriptingTcl_zh_CN.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="zh_CN">
+<TS version="2.1" language="zh_CN">
<context>
<name>ScriptingTcl</name>
<message>
@@ -14,7 +14,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="scriptingtcl.cpp" line="554"/>
+ <location filename="scriptingtcl.cpp" line="445"/>
+ <location filename="scriptingtcl.cpp" line="576"/>
<source>Error from Tcl&apos;s&apos; &apos;%1&apos; command: %2</source>
<translation type="unfinished"></translation>
</message>
diff --git a/Plugins/ScriptingTcl/scriptingtcl.cpp b/Plugins/ScriptingTcl/scriptingtcl.cpp
index 4390317..962c073 100644
--- a/Plugins/ScriptingTcl/scriptingtcl.cpp
+++ b/Plugins/ScriptingTcl/scriptingtcl.cpp
@@ -435,6 +435,28 @@ int ScriptingTcl::dbCommand(ClientData clientData, Tcl_Interp* interp, int objc,
return TCL_ERROR;
}
+int ScriptingTcl::initTclCommand(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[])
+{
+ UNUSED(clientData);
+ UNUSED(objv);
+
+ if (objc > 1)
+ {
+ Tcl_Obj* result = Tcl_NewStringObj(tr("Error from Tcl's' '%1' command: %2").arg("tcl_init", "invalid # args: tcl_init").toUtf8().constData(), -1);
+ Tcl_SetObjResult(interp, result);
+ return TCL_ERROR;
+ }
+
+ int res = Tcl_Init(interp);
+ if (res != TCL_OK)
+ {
+ ScriptObject codeObj("set tcl_library $tcl_pkgPath");
+ Tcl_EvalObjEx(interp, codeObj.getTclObj(), TCL_EVAL_GLOBAL);
+ res = Tcl_Init(interp);
+ }
+ return res;
+}
+
int ScriptingTcl::dbEval(ContextTcl* ctx, Tcl_Interp* interp, Tcl_Obj* const objv[])
{
SqlQueryPtr execResults = dbCommonEval(ctx, interp, objv);
@@ -653,4 +675,5 @@ void ScriptingTcl::ContextTcl::reset()
void ScriptingTcl::ContextTcl::init()
{
Tcl_CreateObjCommand(interp, "db", ScriptingTcl::dbCommand, reinterpret_cast<ClientData>(this), nullptr);
+ Tcl_CreateObjCommand(interp, "tcl_init", ScriptingTcl::initTclCommand, reinterpret_cast<ClientData>(this), nullptr);
}
diff --git a/Plugins/ScriptingTcl/scriptingtcl.h b/Plugins/ScriptingTcl/scriptingtcl.h
index 8fe44d5..f853f07 100644
--- a/Plugins/ScriptingTcl/scriptingtcl.h
+++ b/Plugins/ScriptingTcl/scriptingtcl.h
@@ -92,6 +92,7 @@ class SCRIPTINGTCLSHARED_EXPORT ScriptingTcl : public GenericPlugin, public DbAw
static Tcl_Obj* variantToTclObj(const QVariant& value);
static Tcl_Obj* stringToTclObj(const QString& value);
static int dbCommand(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]);
+ static int initTclCommand(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]);
static int dbEval(ContextTcl* ctx, Tcl_Interp* interp, Tcl_Obj* const objv[]);
static int dbEvalRowByRow(ContextTcl* ctx, Tcl_Interp* interp, Tcl_Obj* const objv[]);
static int dbEvalDeepResults(ContextTcl* ctx, Tcl_Interp* interp, Tcl_Obj* const objv[]);
diff --git a/Plugins/ScriptingTcl/scriptingtcl.json b/Plugins/ScriptingTcl/scriptingtcl.json
index 1496b50..161dc62 100644
--- a/Plugins/ScriptingTcl/scriptingtcl.json
+++ b/Plugins/ScriptingTcl/scriptingtcl.json
@@ -2,6 +2,6 @@
"type": "ScriptingPlugin",
"title": "Tcl scripting",
"description": "Provides Tcl scripting language support for SQLiteStudio.",
- "version": 10002,
+ "version": 10003,
"author": "SalSoft"
}
diff --git a/Plugins/ScriptingTcl/scriptingtcl.qrc b/Plugins/ScriptingTcl/scriptingtcl.qrc
index 8f29a12..a75aa12 100644
--- a/Plugins/ScriptingTcl/scriptingtcl.qrc
+++ b/Plugins/ScriptingTcl/scriptingtcl.qrc
@@ -3,6 +3,9 @@
<file>scriptingtcl.png</file>
</qresource>
<qresource prefix="/msg">
+ <file>ScriptingTcl_de.qm</file>
+
+
<file>ScriptingTcl_pl.qm</file>
<file>ScriptingTcl_ru.qm</file>
<file>ScriptingTcl_fr.qm</file>
@@ -10,3 +13,6 @@
<file>ScriptingTcl_zh_CN.qm</file>
</qresource>
</RCC>
+
+
+
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-26 19:22:03 +0000