- System Info
+ My System Info
@@ -68,7 +65,7 @@
- Workspace Stats
+ My Workspace Stats
diff --git a/src/vs/issue/electron-browser/issueReporter.ts b/src/vs/issue/electron-browser/issueReporter.ts
index e029015d130..561b26f74dd 100644
--- a/src/vs/issue/electron-browser/issueReporter.ts
+++ b/src/vs/issue/electron-browser/issueReporter.ts
@@ -23,6 +23,7 @@ import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net';
import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
+import { Disposable } from 'vs/base/common/lifecycle';
interface IssueReporterState {
issueType?: number;
@@ -40,13 +41,14 @@ export function startup(configuration: IWindowConfiguration) {
issueReporter.render();
}
-export class IssueReporter {
+export class IssueReporter extends Disposable {
private issueService: IIssueService;
private environmentService: IEnvironmentService;
private telemetryService: ITelemetryService;
private state: IssueReporterState;
constructor(configuration: IWindowConfiguration) {
+ super();
this.state = {
issueType: 0,
includeSystemInfo: true,
@@ -95,6 +97,8 @@ export class IssueReporter {
const config: ITelemetryServiceConfig = { appender, commonProperties, piiPaths };
const telemetryService = instantiationService.createInstance(TelemetryService, config);
+ this._register(telemetryService);
+
this.telemetryService = telemetryService;
} else {
this.telemetryService = NullTelemetryService;
@@ -192,7 +196,7 @@ export class IssueReporter {
descriptionTitle.innerHTML = 'Steps to reproduce *';
show(descriptionSubtitle);
- descriptionSubtitle.innerHTML = 'Please explain how to reproduce the problem. What was expected and what actually happened?';
+ descriptionSubtitle.innerHTML = 'How did you encounter this problem? Clear steps to reproduce the problem help our investigation. What did you expect to happen and what actually happened?';
}
// 2 - Perf Issue
else if (issueType === 1) {
@@ -202,7 +206,7 @@ export class IssueReporter {
descriptionTitle.innerHTML = 'Steps to reproduce *';
show(descriptionSubtitle);
- descriptionSubtitle.innerHTML = 'When does the performance issue occur?';
+ descriptionSubtitle.innerHTML = 'When did this performance issue happen? For examples, does it occur on startup or after a specific series of actions? Any details you can provide help our investigation.';
}
// 3 - Feature Request
else {
diff --git a/src/vs/issue/electron-browser/style.css b/src/vs/issue/electron-browser/style.css
index 7efdf502a0c..a2551d9eac5 100644
--- a/src/vs/issue/electron-browser/style.css
+++ b/src/vs/issue/electron-browser/style.css
@@ -55,7 +55,7 @@ pre code {
color: #fff;
}
button:hover:enabled {
- opacity: .5;
+ opacity: .8;
cursor: pointer;
}
button.active {
@@ -66,22 +66,16 @@ button:disabled {
cursor: auto;
}
-header {
- position: relative;
- background-color: #333;
- color: #ADADAD;
- padding: 1em;
- margin-bottom: 1em;
-}
-
#issue-reporter {
max-width: 80vw;
margin-left: auto;
margin-right: auto;
+ margin-top: 2em;
}
#github-submit-btn {
float: right;
- margin-top: 14px;
+ margin-top: 10px;
+ margin-bottom: 10px;
background-color: #fff
}
@@ -126,3 +120,7 @@ input[type="checkbox"] {
width: auto;
display: inline-block;
}
+
+a {
+ color: #CCCCCC
+}
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index 8051103c93f..bb285b39fde 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -18,13 +18,15 @@ export class IssueService implements IIssueService {
constructor(
@ILaunchService private launchService: ILaunchService,
- @IEnvironmentService private environmentService: IEnvironmentService
+ @IEnvironmentService private environmentService: IEnvironmentService,
+ private machineId: string
) { }
openReporter(): TPromise {
this._issueWindow = new BrowserWindow({
width: 800,
- height: 900
+ height: 900,
+ title: 'Issue Reporter'
});
this._issueWindow.loadURL(this.getIssueReporterPath());
this._issueWindow.webContents.openDevTools();
@@ -50,7 +52,8 @@ export class IssueService implements IIssueService {
const config = {
appRoot: this.environmentService.appRoot,
nodeCachedDataDir: this.environmentService.nodeCachedDataDir,
- windowId: this._issueWindow.id
+ windowId: this._issueWindow.id,
+ machineId: this.machineId
};
return `${require.toUrl('vs/issue/electron-browser/index.html')}?config=${encodeURIComponent(JSON.stringify(config))}`;
}