Skip to content

Update icons of old DB panel #2006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
norascheuch merged 1 commit into from
Jan 25, 2023
+7 −211
Merged

Update icons of old DB panel #2006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions extensions/ql-vscode/media/dark/check.svg
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions extensions/ql-vscode/media/light/check.svg
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions extensions/ql-vscode/media/red-x.svg
View file
Open in desktop

This file was deleted.

47 changes: 7 additions & 40 deletions extensions/ql-vscode/src/databases-ui.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import {
window,
env,
CancellationToken,
ThemeIcon,
ThemeColor,
} from "vscode";
import { pathExists, stat, readdir, remove } from "fs-extra";

Expand Down Expand Up @@ -39,33 +41,6 @@ import { Credentials } from "./authentication";
import { QueryRunner } from "./queryRunner";
import { isCanary } from "./config";

type ThemableIconPath = { light: string; dark: string } | string;

/**
* Path to icons to display next to currently selected database.
*/
const SELECTED_DATABASE_ICON: ThemableIconPath = {
light: "media/light/check.svg",
dark: "media/dark/check.svg",
};

/**
* Path to icon to display next to an invalid database.
*/
const INVALID_DATABASE_ICON: ThemableIconPath = "media/red-x.svg";

function joinThemableIconPath(
base: string,
iconPath: ThemableIconPath,
): ThemableIconPath {
if (typeof iconPath == "object")
return {
light: join(base, iconPath.light),
dark: join(base, iconPath.dark),
};
else return join(base, iconPath);
}

enum SortOrder {
NameAsc = "NameAsc",
NameDesc = "NameDesc",
Expand All @@ -87,10 +62,7 @@ class DatabaseTreeDataProvider
);
private currentDatabaseItem: DatabaseItem | undefined;

constructor(
private databaseManager: DatabaseManager,
private readonly extensionPath: string,
) {
constructor(private databaseManager: DatabaseManager) {
super();

this.currentDatabaseItem = databaseManager.currentDatabaseItem;
Expand Down Expand Up @@ -135,16 +107,11 @@ class DatabaseTreeDataProvider
public getTreeItem(element: DatabaseItem): TreeItem {
const item = new TreeItem(element.name);
if (element === this.currentDatabaseItem) {
item.iconPath = joinThemableIconPath(
this.extensionPath,
SELECTED_DATABASE_ICON,
);
item.iconPath = new ThemeIcon("check");

item.contextValue = "currentDatabase";
} else if (element.error !== undefined) {
item.iconPath = joinThemableIconPath(
this.extensionPath,
INVALID_DATABASE_ICON,
);
item.iconPath = new ThemeIcon("error", new ThemeColor("errorForeground"));
}
item.tooltip = element.databaseUri.fsPath;
item.description = element.language;
Expand Down Expand Up @@ -229,7 +196,7 @@ export class DatabaseUI extends DisposableObject {
super();

this.treeDataProvider = this.push(
new DatabaseTreeDataProvider(databaseManager, extensionPath),
new DatabaseTreeDataProvider(databaseManager),
);
this.push(
window.createTreeView("codeQLDatabases", {
Expand Down