Skip to content

Commit

Permalink
name status bar items
Browse files Browse the repository at this point in the history
  • Loading branch information
alanhamlett committed Dec 28, 2023
1 parent 8d101cb commit e0a7f36
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 10 deletions.
11 changes: 8 additions & 3 deletions src/wakatime.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import * as vscode from 'vscode';
// import * as azdata from 'azdata';
import * as child_process from 'child_process';
import * as fs from 'fs';
import * as path from 'path';
import * as vscode from 'vscode';

import { Dependencies } from './dependencies';
import { COMMAND_DASHBOARD, LogLevel } from './constants';
import { Options, Setting } from './options';

import { Dependencies } from './dependencies';
import { Desktop } from './desktop';
import { Logger } from './logger';
import { Utils } from './utils';
import { Desktop } from './desktop';

interface FileSelection {
selection: vscode.Position;
Expand Down Expand Up @@ -124,18 +125,22 @@ export class WakaTime {
vscode.StatusBarAlignment.Left,
3,
);
this.statusBar.name = 'WakaTime';
this.statusBar.command = COMMAND_DASHBOARD;

this.statusBarTeamYou = vscode.window.createStatusBarItem(
'com.wakatime.teamyou',
vscode.StatusBarAlignment.Left,
2,
);
this.statusBarTeamYou.name = 'WakaTime Top dev';

this.statusBarTeamOther = vscode.window.createStatusBarItem(
'com.wakatime.teamother',
vscode.StatusBarAlignment.Left,
1,
);
this.statusBarTeamOther.name = 'WakaTime Team Total';

this.options.getSetting('settings', 'status_bar_team', false, (statusBarTeam: Setting) => {
this.showStatusBarTeam = statusBarTeam.value !== 'false';
Expand Down
33 changes: 26 additions & 7 deletions src/web/wakatime.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import * as vscode from 'vscode';

import { COMMAND_DASHBOARD, LogLevel } from '../constants';

import { Logger } from './logger';
import { Utils } from '../utils';
import { Memento } from 'vscode';
import { Utils } from '../utils';

interface FileSelection {
selection: vscode.Position;
Expand Down Expand Up @@ -76,11 +77,27 @@ export class WakaTime {
public initializeDependencies(): void {
this.logger.debug(`Initializing WakaTime v${this.extension.version}`);

this.statusBar = vscode.window.createStatusBarItem("com.wakatime.statusbar", vscode.StatusBarAlignment.Left, 3);
this.statusBar = vscode.window.createStatusBarItem(
'com.wakatime.statusbar',
vscode.StatusBarAlignment.Left,
3,
);
this.statusBar.name = 'WakaTime';
this.statusBar.command = COMMAND_DASHBOARD;

this.statusBarTeamYou = vscode.window.createStatusBarItem("com.wakatime.teamyou", vscode.StatusBarAlignment.Left, 2);
this.statusBarTeamOther = vscode.window.createStatusBarItem("com.wakatime.teamother", vscode.StatusBarAlignment.Left, 1);
this.statusBarTeamYou = vscode.window.createStatusBarItem(
'com.wakatime.teamyou',
vscode.StatusBarAlignment.Left,
2,
);
this.statusBarTeamYou.name = 'WakaTime Top dev';

this.statusBarTeamOther = vscode.window.createStatusBarItem(
'com.wakatime.teamother',
vscode.StatusBarAlignment.Left,
1,
);
this.statusBarTeamOther.name = 'WakaTime Team Total';

const showStatusBar = this.config.get('wakatime.status_bar_enabled');
this.showStatusBar = showStatusBar !== 'false';
Expand Down Expand Up @@ -480,7 +497,8 @@ export class WakaTime {
}
this.logger.error(error_msg);
let now: number = Date.now();
if (this.lastApiKeyPrompted < now - 86400000) { // only prompt once per day
if (this.lastApiKeyPrompted < now - 86400000) {
// only prompt once per day
this.promptForApiKey(false);
this.lastApiKeyPrompted = now;
}
Expand Down Expand Up @@ -751,7 +769,7 @@ export class WakaTime {
return agent;
}

private getOperatingSystem(): string|null {
private getOperatingSystem(): string | null {
if ((navigator as any).userAgentData && (navigator as any).userAgentData.platform) {
const platform = (navigator as any).userAgentData.platform as string;
if (platform.toLowerCase().indexOf('mac') != -1) return 'Mac';
Expand All @@ -763,7 +781,8 @@ export class WakaTime {
}
if (navigator.platform) {
const platform = navigator.platform;
if (navigator.userAgent && navigator.userAgent.toLowerCase().indexOf('android') != -1) return 'Android';
if (navigator.userAgent && navigator.userAgent.toLowerCase().indexOf('android') != -1)
return 'Android';
if (platform.toLowerCase().indexOf('mac') != -1) return 'Mac';
if (platform.toLowerCase().indexOf('win') != -1) return 'Windows';
if (platform.toLowerCase().indexOf('linux') != -1) return 'Linux';
Expand Down

0 comments on commit e0a7f36

Please sign in to comment.