Skip to content

Commit e3dc342

Browse files
committed
Modified config variables
Signed-off-by: Mike Centola <mcentola@appliedengdesign.com>
1 parent fc4321f commit e3dc342

4 files changed

Lines changed: 20 additions & 19 deletions

File tree

package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@
119119
"type": "object",
120120
"title": "G-Code",
121121
"properties": {
122-
"gcode.colorization": {
122+
"gcode.general.colorization": {
123123
"type": "boolean",
124124
"default": false,
125-
"description": "Enable G-Code specific colorization options",
125+
"markdowndescription": "Enable G-Code specific colorization options",
126126
"scope": "window"
127127
},
128-
"gcode.machineType": {
128+
"gcode.general.machineType": {
129129
"type": "string",
130130
"default": "Mill",
131131
"enum": [
@@ -137,24 +137,25 @@
137137
"Configure G-Code Extension for CNC Lathe",
138138
"Configure G-Code Extension for 3D Printers"
139139
],
140+
"markdownDescription": "Configure G-Code Extension for a Specific Machine Type",
140141
"scope": "window"
141142
},
142-
"gcode.treeAutoRefresh": {
143+
"gcode.tree.autoRefresh": {
143144
"type": "boolean",
144145
"default": true,
145-
"description": "Enable G-Code Tree Auto Refresh",
146+
"markdowndescription": "Enable G-Code Tree Auto Refresh",
146147
"scope": "window"
147148
},
148-
"gcode.statsEnable": {
149+
"gcode.stats.enable": {
149150
"type": "boolean",
150151
"default": false,
151-
"description": "Enable G-Code Statistics Panel",
152+
"markdowndescription": "Enable G-Code Statistics Panel",
152153
"scope": "window"
153154
},
154-
"gcode.statsAutoRefresh": {
155+
"gcode.stats.autoRefresh": {
155156
"type": "boolean",
156157
"default": false,
157-
"description": "Enable G-Code Stats Auto Refresh",
158+
"markdowndescription": "Enable G-Code Stats Auto Refresh",
158159
"scope": "window"
159160
}
160161
}

src/extension.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export async function activate(context: ExtensionContext) {
4545
commands.registerCommand('gcode.gcodeTree.Selection', range => gcodeTree.select(range));
4646

4747

48-
Logger.log('Tree AutoRefresh: ' + (configuration.getParam('treeAutoRefresh') ? 'Enabled' : 'Disabled') );
48+
Logger.log('Tree AutoRefresh: ' + (configuration.getParam('tree.sutoRefresh') ? 'Enabled' : 'Disabled') );
4949

5050
// G-Code Stats View
5151
Logger.log("Loading Stats View...");
@@ -60,13 +60,13 @@ export async function activate(context: ExtensionContext) {
6060
});
6161
commands.registerCommand('gcode.gcodeStats.enable', () => {
6262
Logger.log('Enabling Stats...');
63-
configuration.setParam('statsEnable', true);
63+
configuration.setParam('stats.enable', true);
6464

6565
}
6666
);
6767

68-
Logger.log('Stats: ' + (configuration.getParam('statsEnable') ? 'Enabled' : 'Disabled') );
69-
Logger.log('Stats AutoRefresh: ' + (configuration.getParam('statsAutoRefresh') ? 'Enabled' : 'Disabled') );
68+
Logger.log('Stats: ' + (configuration.getParam('stats.enable') ? 'Enabled' : 'Disabled') );
69+
Logger.log('Stats AutoRefresh: ' + (configuration.getParam('stats.sutoRefresh') ? 'Enabled' : 'Disabled') );
7070

7171

7272
/*

src/providers/gcodeStats.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export class GCodeStatsProvider implements TreeDataProvider<GCodeStatsNode> {
3636
window.onDidChangeActiveTextEditor(() => this.onActiveEditorChanged());
3737
workspace.onDidChangeTextDocument(e => this.onDocumentChanged(e));
3838

39-
this.autoRefresh = configuration.getParam('statsAutoRefresh');
39+
this.autoRefresh = configuration.getParam('stats.autoRefresh');
4040

4141
}
4242

@@ -55,7 +55,7 @@ export class GCodeStatsProvider implements TreeDataProvider<GCodeStatsNode> {
5555

5656
if (enabled) {
5757
this.editor = window.activeTextEditor;
58-
this.autoRefresh = configuration.getParam('statsAutoRefresh');
58+
this.autoRefresh = configuration.getParam('stats.autoRefresh');
5959
if (this.autoRefresh) this.refresh();
6060
}
6161
}
@@ -73,7 +73,7 @@ export class GCodeStatsProvider implements TreeDataProvider<GCodeStatsNode> {
7373

7474
if (enabled) {
7575
this.editor = window.activeTextEditor;
76-
this.autoRefresh = configuration.getParam('statsAutoRefresh');
76+
this.autoRefresh = configuration.getParam('stats.autoRefresh');
7777
if(this.autoRefresh) this.refresh();
7878
}
7979
}

src/providers/gcodeTree.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class GCodeTreeProvider implements vscode.TreeDataProvider<GCodeTreeNode>
2828

2929
this.parseTree();
3030

31-
this.autoRefresh = configuration.getParam('treeAutoRefresh');
31+
this.autoRefresh = configuration.getParam('tree.autoRefresh');
3232

3333
this.onActiveEditorChanged();
3434

@@ -50,7 +50,7 @@ export class GCodeTreeProvider implements vscode.TreeDataProvider<GCodeTreeNode>
5050

5151
if (enabled) {
5252
this.editor = vscode.window.activeTextEditor;
53-
this.autoRefresh = configuration.getParam('treeAutoRefresh');
53+
this.autoRefresh = configuration.getParam('tree.autoRefresh');
5454
StatusBar.updateStatusBar('Tree Dirty');
5555
if (this.autoRefresh) this.refresh();
5656
}
@@ -71,7 +71,7 @@ export class GCodeTreeProvider implements vscode.TreeDataProvider<GCodeTreeNode>
7171

7272
if (enabled) {
7373
this.editor = vscode.window.activeTextEditor;
74-
this.autoRefresh = configuration.getParam('treeAutoRefresh');
74+
this.autoRefresh = configuration.getParam('tree.autoRefresh');
7575
StatusBar.updateStatusBar('Tree Dirty');
7676
if (this.autoRefresh) this.refresh();
7777
}

0 commit comments

Comments
 (0)