From d9aa870e5d509cc7309ab82dd102a937ab58613a Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Thu, 9 Feb 2017 04:36:04 -0500 Subject: Imported Upstream version 3.1.1+dfsg1 --- Plugins/ScriptingTcl/ScriptingTcl.pro | 6 ++++-- Plugins/ScriptingTcl/ScriptingTcl_de.ts | 5 +++-- Plugins/ScriptingTcl/ScriptingTcl_es.ts | 5 +++-- Plugins/ScriptingTcl/ScriptingTcl_fr.qm | Bin 649 -> 665 bytes Plugins/ScriptingTcl/ScriptingTcl_fr.ts | 6 +++--- Plugins/ScriptingTcl/ScriptingTcl_it.ts | 5 +++-- Plugins/ScriptingTcl/ScriptingTcl_pl.ts | 5 +++-- Plugins/ScriptingTcl/ScriptingTcl_pt_BR.ts | 5 +++-- Plugins/ScriptingTcl/ScriptingTcl_ru.ts | 5 +++-- Plugins/ScriptingTcl/ScriptingTcl_sk.ts | 5 +++-- Plugins/ScriptingTcl/ScriptingTcl_zh_CN.ts | 5 +++-- Plugins/ScriptingTcl/scriptingtcl.cpp | 23 +++++++++++++++++++++++ Plugins/ScriptingTcl/scriptingtcl.h | 1 + Plugins/ScriptingTcl/scriptingtcl.json | 2 +- Plugins/ScriptingTcl/scriptingtcl.qrc | 6 ++++++ 15 files changed, 62 insertions(+), 22 deletions(-) (limited to 'Plugins/ScriptingTcl') 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 @@ - + ScriptingTcl @@ -14,7 +14,8 @@ - + + Error from Tcl's' '%1' command: %2 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 @@ - + ScriptingTcl @@ -14,7 +14,8 @@ - + + Error from Tcl's' '%1' command: %2 diff --git a/Plugins/ScriptingTcl/ScriptingTcl_fr.qm b/Plugins/ScriptingTcl/ScriptingTcl_fr.qm index 9ff0c46..f172932 100644 Binary files a/Plugins/ScriptingTcl/ScriptingTcl_fr.qm and b/Plugins/ScriptingTcl/ScriptingTcl_fr.qm 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 @@ No database available in current context, while called Tcl's '%1' command. - Aucune base de données valide dans le contexte courant, appeler la commande Tcl’s « %1 ». + Aucune base de données valide dans le contexte courant, appeler la commande Tcl’s « %1 ». Invalid '%1' command sytax. Should be: %2 - Syntaxe de commande invalide « %1 ». Devrait être: %2 + Syntaxe de commande invalide « %1 ». Devrait être : %2 Error from Tcl's' '%1' command: %2 - Erreur de la commande Tcl « %1 »: %2 + Erreur de la commande Tcl « %1 » : %2 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 @@ - + ScriptingTcl @@ -14,7 +14,8 @@ - + + Error from Tcl's' '%1' command: %2 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 @@ - + ScriptingTcl @@ -16,7 +16,8 @@ Niepoprawna składnia polecenia '%1'. Powinno być: %2 - + + Error from Tcl's' '%1' command: %2 Error from Tcl's' 'db' command: %1 Wystąpił błąd w poleceniu Tcl '%1': %2 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 @@ - + ScriptingTcl @@ -14,7 +14,8 @@ - + + Error from Tcl's' '%1' command: %2 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 @@ - + ScriptingTcl @@ -14,7 +14,8 @@ Некорректный синтаксис команды '%1'. Должно быть: %2 - + + Error from Tcl's' '%1' command: %2 Ошибка в команде Tcl '%1': %2 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 @@ - + ScriptingTcl @@ -14,7 +14,8 @@ - + + Error from Tcl's' '%1' command: %2 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 @@ - + ScriptingTcl @@ -14,7 +14,8 @@ - + + Error from Tcl's' '%1' command: %2 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(this), nullptr); + Tcl_CreateObjCommand(interp, "tcl_init", ScriptingTcl::initTclCommand, reinterpret_cast(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 @@ scriptingtcl.png + ScriptingTcl_de.qm + + ScriptingTcl_pl.qm ScriptingTcl_ru.qm ScriptingTcl_fr.qm @@ -10,3 +13,6 @@ ScriptingTcl_zh_CN.qm + + + -- cgit v1.2.3