Merge pull request #27 from TUD-INF-IAI-MCI/dev_0.5.1

Dev 0.5.1

CHANGELOG.md

@@ -1,14 +1,26 @@
 # Change Log
 
+## [v0.5.1] - 2020-04-16
+
+## Changed
+
+- default name of picture folder is now bilder not *B*ilder
+- version number of the extension is now shown in the start tab (see #24 )
+
+### Fixed
+
+- backslash is csv-files are masked correct (see #25)
+
+
 ## [v0.5.0] - 2020-04-01
 
-## Added
+### Added
 
 - multiline cursor selection can be used now for formats (see #21)
 - no formulas (eqn*.svg) are listed in file chooser for images (see #19)
 - the command **matuc conf init** can be executed now (see #14)
 
-## Changed
+### Changed
 
 - remove leading and trailing whitespaces from title (alternative description) (see #22)
 

package.json

@@ -2,7 +2,7 @@
     "name": "agsbsextension",
     "displayName": "AGSBS extension",
     "description": "This package is developed to make the transcription process more effective of our working group",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "publisher": "TUD-AGSBS",
     "categories": [
         "Other"
@@ -253,14 +253,14 @@
             },
             {
                 "command": "agsbs.formula",
-                "key": "alt+shift+f",
-                "mac": "alt+shift+f",
+                "key": "ctrl+alt+f",
+                "mac": "ctrl+alt+f",
                 "when": "editorLangId == markdown"
             },
             {
                 "command": "agsbs.inlineFormula",
-                "key": "ctrl+shift+f",
-                "mac": "cmd+shift+f",
+                "key": "ctrl+alt+shift+f",
+                "mac": "cmd+alt+shift+f",
                 "when": "editorLangId == markdown"
             },
             {
@@ -387,7 +387,7 @@
                 },
                 "agsbs.pictureFolderName": {
                     "type": "string",
-                    "default": "Bilder",
+                    "default": "bilder",
                     "description": "The name of the Folder in the project that will be searched for pictures."
                 },
                 "agsbs.tableFolderName": {
@@ -438,6 +438,7 @@
     "dependencies": {
         "chardet": "0.7.0",
         "iconv-lite": "0.4.24",
+        "npm": "^6.14.4",
         "os-locale": "^3.1.0",
         "papaparse": "^5.1.0",
         "path": "^0.12.7"

src/editorFunctions.ts

@@ -389,7 +389,6 @@ export default class EditorFunctions {
         var folderName: string = params.hiddenFileName.value.substr(0, params.hiddenFileName.value.lastIndexOf("/") - 1);
         var defaultGeneratedFolderName: string = await this._tableHelper.getTableFolderName();
         var savedTable: any;
-        tableData = tableData.replace("\\", "\\\\");
         if (folderName === defaultGeneratedFolderName) {
             savedTable = await this._tableHelper.writeCSVFile(tableData, fileName);
         } else {

src/helper/tableHelper.ts

@@ -464,6 +464,7 @@ export default class TableHelper {
                 await this._helper.mkDir(fileBasePath);
             }
             var fd = fs.openSync(thisPath, 'w+'); //Open in "add"-Mode
+            content = content.replace(/\\/g, "\\\\");
             fs.write(fd, content, (error) => {
                 if (error) {
                     vscode.window.showErrorMessage(this._language.get('writingCSVTableFileError'));

src/languages/de.ts

@@ -222,14 +222,14 @@ export default class En {
 		this.d['linuxNotSupportedYet'] = "Linux wird leider noch nicht unterstützt.";
 		this.d['noFileSelected'] = "Keine Datei ausgewählt.";
 		this.d['gitIsNotEnabled'] = "Git ist nicht aktiviert. Zu den Einstellungen -> Erweiterungen -> AGSBS und Git aktivieren um diese Funktion zu nutzen.";
-		this.d['sidebarWelcome'] = "Wilkommen in der AGSBS Erweiterung für Visual studio Code!";
+		this.d['sidebarWelcome'] = "Wilkommen in der AGSBS Erweiterung für Visual Studio Code!";
+		this.d['versionNumber'] = "Die Version der AGSBS Extension ist $versionNumber$!";
 		this.d['textWhatToDo'] = "Sie können mit der Bearbeitung der Dateien beginnen. <br \>" +
 								 "Hierfür können Sie  die Icons in der unteren Taskleiste verwenden";
 		this.d['sendingError'] = "Wenn Sie einen Fehler finden, melden Sie Ihn bitte an per <br \> Mail an "+
 								  "<a href=\"mailto:toAdd@mail.de\">Fehler per E-Mail melden </a>";
 		this.d['MatucIsInstalledWarning'] = "Matuc ist NICHT installiert! Manche Funktionen werden nicht verfügbar sein.";
 		this.d['osDocumentsFolderName'] = "Dokumente";//The folder name of the documents folder in the userspace
-
 		this.d['preview'] = "Vorschau";
 
 		this.d['previewNotAvailableCheckWorspaceFolder'] = "Die Vorschau ist aktuell nicht verfügbar. Bitte überprüfen Sie, ob der Ordner, in dem sich die aktuelle Datei befindet, als Workspace-Ordner geöffnet ist (auf der linken Seite des Editors).";

src/languages/en.ts

@@ -224,7 +224,10 @@ export default class En {
 		this.d['noFileSelected'] = "No File Selected.";
 		this.d['gitIsNotEnabled'] = "Git is not enabled. Go to Settings -> Extensions -> AGSBS and enable Git to use this function.";
 		this.d['sidebarWelcome'] = "Welcome to AGSBS extension for Visual Studio Code!";
-		this.d['sendingError'] = "If you find a bug or have another issue please send a mail."+
+		this.d['versionNumber'] = "The version of AGSBS extension is $versionNumber$!";
+		this.d['textWhatToDo'] = "Now you can start working. <br \>" +
+		"You can use the icon in task bar below";
+		this.d['sendingError'] = "If you find a bug or have another issue please send a mail. "+
 								 "<a href=\"mailto:toAdd@mail.de\">Send mail</a>";
 		this.d['MatucIsInstalledWarning'] = "Matuc is NOT installed! Some features might not work.";
 		this.d['osDocumentsFolderName'] = "Documents";//The folder name of the documents folder in the userspace

src/sidebar.ts

@@ -211,6 +211,8 @@ export default class Sidebar {
         var matucIsInstalled = await this._matuc.matucIsInstalled();
         var welcomeText = this._language.get("sidebarWelcome");        
         var form = "<h2>" + welcomeText + "</h2>";
+        var versionNumberText = this._language.get("versionNumber");
+        form += "<br /> " + versionNumberText.replace("$versionNumber$", vscode.extensions.getExtension('TUD-AGSBS.agsbsextension').packageJSON.version);
         form = this._addMultipleText(["textWhatToDo", "sendingError"], form);  
         if (matucIsInstalled === false) {
             form += "<br role='none'><br role='none'>" + this._language.get("MatucIsInstalledWarning");