ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-22 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add folder icon to project (#11904)

Browse Source 
* Add folder icon to project

* Fix conflicts arising due to merge
This commit is contained in:
Sakshi Sharma
2020-08-27 10:50:17 -07:00
committed by GitHub
parent 21c8609eb7
commit 75812c71df
7 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/sql-database-projects/images/dark/folder.svg
View File

@@ -1,3 +1,10 @@
<svg width="17" height="12" viewBox="0 0 17 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16.8457 3V11C16.8457 11.1406 16.8197 11.2708 16.7676 11.3906C16.7155 11.5104 16.6426 11.6172 16.5488 11.7109C16.4603 11.7995 16.3561 11.8698 16.2363 11.9219C16.1165 11.974 15.9863 12 15.8457 12H1.8457C1.70508 12 1.57487 11.974 1.45508 11.9219C1.33529 11.8698 1.22852 11.7995 1.13477 11.7109C1.04622 11.6172 0.975911 11.5104 0.923828 11.3906C0.871745 11.2708 0.845703 11.1406 0.845703 11V1C0.845703 0.859375 0.871745 0.729167 0.923828 0.609375C0.975911 0.489583 1.04622 0.385417 1.13477 0.296875C1.22852 0.203125 1.33529 0.130208 1.45508 0.078125C1.57487 0.0260417 1.70508 0 1.8457 0H7.5957C7.78841 0 7.9681 0.0364583 8.13477 0.109375C8.30143 0.177083 8.45247 0.270833 8.58789 0.390625C8.72852 0.505208 8.85352 0.638021 8.96289 0.789062C9.07747 0.934896 9.18164 1.08594 9.27539 1.24219C9.3431 1.36198 9.4082 1.46875 9.4707 1.5625C9.53841 1.65625 9.61133 1.73698 9.68945 1.80469C9.77279 1.86719 9.86393 1.91667 9.96289 1.95312C10.0671 1.98438 10.1947 2 10.3457 2H15.8457C15.9863 2 16.1165 2.02604 16.2363 2.07812C16.3561 2.13021 16.4603 2.20312 16.5488 2.29688C16.6426 2.38542 16.7155 2.48958 16.7676 2.60938C16.8197 2.72917 16.8457 2.85938 16.8457 3ZM7.5957 1H1.8457V3H7.5957C7.73633 3 7.85352 2.97656 7.94727 2.92969C8.04622 2.88281 8.13737 2.82552 8.2207 2.75781C8.30924 2.6901 8.39779 2.61719 8.48633 2.53906C8.57487 2.45573 8.67643 2.38281 8.79102 2.32031C8.71289 2.23177 8.62956 2.11458 8.54102 1.96875C8.45768 1.81771 8.36654 1.67188 8.26758 1.53125C8.16862 1.38542 8.06185 1.26042 7.94727 1.15625C7.83789 1.05208 7.7207 1 7.5957 1ZM15.8457 11V3H10.3457C10.054 3 9.81706 3.02604 9.63477 3.07812C9.45768 3.125 9.30664 3.1849 9.18164 3.25781C9.06185 3.33073 8.95768 3.41146 8.86914 3.5C8.7806 3.58854 8.68164 3.66927 8.57227 3.74219C8.4681 3.8151 8.34049 3.8776 8.18945 3.92969C8.03841 3.97656 7.84049 4 7.5957 4H1.8457V11H15.8457Z" fill="#0078D4"/>
<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0)">
<path d="M3.5625 1.5C3.73828 1.5 3.88867 1.51758 4.01367 1.55273C4.13867 1.58789 4.25195 1.63477 4.35352 1.69336C4.45508 1.75195 4.54492 1.8125 4.62305 1.875C4.70117 1.9375 4.7793 1.99805 4.85742 2.05664C4.93555 2.11523 5.02148 2.16016 5.11523 2.19141C5.20898 2.22266 5.31641 2.24219 5.4375 2.25H11.25C11.3555 2.25 11.4531 2.26953 11.543 2.30859C11.6328 2.34766 11.7109 2.40039 11.7773 2.4668C11.8437 2.5332 11.8984 2.61328 11.9414 2.70703C11.9844 2.80078 12.0039 2.89844 12 3V10.5H0V2.25C0 2.14453 0.0195313 2.04688 0.0585938 1.95703C0.0976562 1.86719 0.150391 1.78906 0.216797 1.72266C0.283203 1.65625 0.363281 1.60156 0.457031 1.55859C0.550781 1.51562 0.648437 1.49609 0.75 1.5H3.5625ZM0.75 2.25V3H3.5625C3.65625 3 3.73828 2.99219 3.80859 2.97656C3.87891 2.96094 3.94336 2.93555 4.00195 2.90039C4.06055 2.86523 4.11719 2.82617 4.17188 2.7832C4.22656 2.74023 4.28906 2.6875 4.35938 2.625C4.29297 2.56641 4.23242 2.51563 4.17773 2.47266C4.12305 2.42969 4.06445 2.39063 4.00195 2.35547C3.93945 2.32031 3.875 2.29492 3.80859 2.2793C3.74219 2.26367 3.66016 2.25391 3.5625 2.25H0.75ZM11.25 3H5.4375C5.31641 3 5.21094 3.01758 5.12109 3.05273C5.03125 3.08789 4.94531 3.13477 4.86328 3.19336C4.78125 3.25195 4.70117 3.3125 4.62305 3.375C4.54492 3.4375 4.45703 3.49805 4.35938 3.55664C4.26172 3.61523 4.14844 3.66016 4.01953 3.69141C3.89062 3.72266 3.73828 3.74219 3.5625 3.75H0.75V9.75H11.25V3Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0">
<rect width="12" height="12" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

3
extensions/sql-database-projects/images/dark/folder_blue.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="17" height="12" viewBox="0 0 17 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16.8457 3V11C16.8457 11.1406 16.8197 11.2708 16.7676 11.3906C16.7155 11.5104 16.6426 11.6172 16.5488 11.7109C16.4603 11.7995 16.3561 11.8698 16.2363 11.9219C16.1165 11.974 15.9863 12 15.8457 12H1.8457C1.70508 12 1.57487 11.974 1.45508 11.9219C1.33529 11.8698 1.22852 11.7995 1.13477 11.7109C1.04622 11.6172 0.975911 11.5104 0.923828 11.3906C0.871745 11.2708 0.845703 11.1406 0.845703 11V1C0.845703 0.859375 0.871745 0.729167 0.923828 0.609375C0.975911 0.489583 1.04622 0.385417 1.13477 0.296875C1.22852 0.203125 1.33529 0.130208 1.45508 0.078125C1.57487 0.0260417 1.70508 0 1.8457 0H7.5957C7.78841 0 7.9681 0.0364583 8.13477 0.109375C8.30143 0.177083 8.45247 0.270833 8.58789 0.390625C8.72852 0.505208 8.85352 0.638021 8.96289 0.789062C9.07747 0.934896 9.18164 1.08594 9.27539 1.24219C9.3431 1.36198 9.4082 1.46875 9.4707 1.5625C9.53841 1.65625 9.61133 1.73698 9.68945 1.80469C9.77279 1.86719 9.86393 1.91667 9.96289 1.95312C10.0671 1.98438 10.1947 2 10.3457 2H15.8457C15.9863 2 16.1165 2.02604 16.2363 2.07812C16.3561 2.13021 16.4603 2.20312 16.5488 2.29688C16.6426 2.38542 16.7155 2.48958 16.7676 2.60938C16.8197 2.72917 16.8457 2.85938 16.8457 3ZM7.5957 1H1.8457V3H7.5957C7.73633 3 7.85352 2.97656 7.94727 2.92969C8.04622 2.88281 8.13737 2.82552 8.2207 2.75781C8.30924 2.6901 8.39779 2.61719 8.48633 2.53906C8.57487 2.45573 8.67643 2.38281 8.79102 2.32031C8.71289 2.23177 8.62956 2.11458 8.54102 1.96875C8.45768 1.81771 8.36654 1.67188 8.26758 1.53125C8.16862 1.38542 8.06185 1.26042 7.94727 1.15625C7.83789 1.05208 7.7207 1 7.5957 1ZM15.8457 11V3H10.3457C10.054 3 9.81706 3.02604 9.63477 3.07812C9.45768 3.125 9.30664 3.1849 9.18164 3.25781C9.06185 3.33073 8.95768 3.41146 8.86914 3.5C8.7806 3.58854 8.68164 3.66927 8.57227 3.74219C8.4681 3.8151 8.34049 3.8776 8.18945 3.92969C8.03841 3.97656 7.84049 4 7.5957 4H1.8457V11H15.8457Z" fill="#0078D4"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

11
extensions/sql-database-projects/images/light/folder.svg
View File

@@ -1,3 +1,10 @@
<svg width="17" height="12" viewBox="0 0 17 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16.8457 3V11C16.8457 11.1406 16.8197 11.2708 16.7676 11.3906C16.7155 11.5104 16.6426 11.6172 16.5488 11.7109C16.4603 11.7995 16.3561 11.8698 16.2363 11.9219C16.1165 11.974 15.9863 12 15.8457 12H1.8457C1.70508 12 1.57487 11.974 1.45508 11.9219C1.33529 11.8698 1.22852 11.7995 1.13477 11.7109C1.04622 11.6172 0.975911 11.5104 0.923828 11.3906C0.871745 11.2708 0.845703 11.1406 0.845703 11V1C0.845703 0.859375 0.871745 0.729167 0.923828 0.609375C0.975911 0.489583 1.04622 0.385417 1.13477 0.296875C1.22852 0.203125 1.33529 0.130208 1.45508 0.078125C1.57487 0.0260417 1.70508 0 1.8457 0H7.5957C7.78841 0 7.9681 0.0364583 8.13477 0.109375C8.30143 0.177083 8.45247 0.270833 8.58789 0.390625C8.72852 0.505208 8.85352 0.638021 8.96289 0.789062C9.07747 0.934896 9.18164 1.08594 9.27539 1.24219C9.3431 1.36198 9.4082 1.46875 9.4707 1.5625C9.53841 1.65625 9.61133 1.73698 9.68945 1.80469C9.77279 1.86719 9.86393 1.91667 9.96289 1.95312C10.0671 1.98438 10.1947 2 10.3457 2H15.8457C15.9863 2 16.1165 2.02604 16.2363 2.07812C16.3561 2.13021 16.4603 2.20312 16.5488 2.29688C16.6426 2.38542 16.7155 2.48958 16.7676 2.60938C16.8197 2.72917 16.8457 2.85938 16.8457 3ZM7.5957 1H1.8457V3H7.5957C7.73633 3 7.85352 2.97656 7.94727 2.92969C8.04622 2.88281 8.13737 2.82552 8.2207 2.75781C8.30924 2.6901 8.39779 2.61719 8.48633 2.53906C8.57487 2.45573 8.67643 2.38281 8.79102 2.32031C8.71289 2.23177 8.62956 2.11458 8.54102 1.96875C8.45768 1.81771 8.36654 1.67188 8.26758 1.53125C8.16862 1.38542 8.06185 1.26042 7.94727 1.15625C7.83789 1.05208 7.7207 1 7.5957 1ZM15.8457 11V3H10.3457C10.054 3 9.81706 3.02604 9.63477 3.07812C9.45768 3.125 9.30664 3.1849 9.18164 3.25781C9.06185 3.33073 8.95768 3.41146 8.86914 3.5C8.7806 3.58854 8.68164 3.66927 8.57227 3.74219C8.4681 3.8151 8.34049 3.8776 8.18945 3.92969C8.03841 3.97656 7.84049 4 7.5957 4H1.8457V11H15.8457Z" fill="#0078D4"/>
<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0)">
<path d="M3.5625 1.5C3.73828 1.5 3.88867 1.51758 4.01367 1.55274C4.13867 1.58789 4.25195 1.63477 4.35352 1.69336C4.45508 1.75196 4.54492 1.8125 4.62305 1.875C4.70117 1.9375 4.7793 1.99805 4.85742 2.05664C4.93555 2.11524 5.02148 2.16016 5.11523 2.19141C5.20898 2.22266 5.31641 2.24219 5.4375 2.25H11.25C11.3555 2.25 11.4531 2.26953 11.543 2.3086C11.6328 2.34766 11.7109 2.40039 11.7773 2.4668C11.8438 2.53321 11.8984 2.61328 11.9414 2.70703C11.9844 2.80078 12.0039 2.89844 12 3V10.5H0V2.25C0 2.14453 0.0195312 2.04688 0.0585938 1.95703C0.0976562 1.86719 0.150391 1.78906 0.216797 1.72266C0.283203 1.65625 0.363281 1.60156 0.457031 1.5586C0.550781 1.51563 0.648438 1.4961 0.75 1.5H3.5625ZM0.75 2.25V3H3.5625C3.65625 3 3.73828 2.99219 3.80859 2.97656C3.87891 2.96094 3.94336 2.93555 4.00195 2.90039C4.06055 2.86524 4.11719 2.82617 4.17188 2.78321C4.22656 2.74024 4.28906 2.6875 4.35938 2.625C4.29297 2.56641 4.23242 2.51563 4.17773 2.47266C4.12305 2.42969 4.06445 2.39063 4.00195 2.35547C3.93945 2.32031 3.875 2.29492 3.80859 2.2793C3.74219 2.26367 3.66016 2.25391 3.5625 2.25H0.75ZM11.25 3H5.4375C5.31641 3 5.21094 3.01758 5.12109 3.05274C5.03125 3.08789 4.94531 3.13477 4.86328 3.19336C4.78125 3.25196 4.70117 3.3125 4.62305 3.375C4.54492 3.4375 4.45703 3.49805 4.35938 3.55664C4.26172 3.61524 4.14844 3.66016 4.01953 3.69141C3.89062 3.72266 3.73828 3.74219 3.5625 3.75H0.75V9.75H11.25V3Z" fill="#323130"/>
</g>
<defs>
<clipPath id="clip0">
<rect width="12" height="12" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

3
extensions/sql-database-projects/images/light/folder_blue.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="17" height="12" viewBox="0 0 17 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16.8457 3V11C16.8457 11.1406 16.8197 11.2708 16.7676 11.3906C16.7155 11.5104 16.6426 11.6172 16.5488 11.7109C16.4603 11.7995 16.3561 11.8698 16.2363 11.9219C16.1165 11.974 15.9863 12 15.8457 12H1.8457C1.70508 12 1.57487 11.974 1.45508 11.9219C1.33529 11.8698 1.22852 11.7995 1.13477 11.7109C1.04622 11.6172 0.975911 11.5104 0.923828 11.3906C0.871745 11.2708 0.845703 11.1406 0.845703 11V1C0.845703 0.859375 0.871745 0.729167 0.923828 0.609375C0.975911 0.489583 1.04622 0.385417 1.13477 0.296875C1.22852 0.203125 1.33529 0.130208 1.45508 0.078125C1.57487 0.0260417 1.70508 0 1.8457 0H7.5957C7.78841 0 7.9681 0.0364583 8.13477 0.109375C8.30143 0.177083 8.45247 0.270833 8.58789 0.390625C8.72852 0.505208 8.85352 0.638021 8.96289 0.789062C9.07747 0.934896 9.18164 1.08594 9.27539 1.24219C9.3431 1.36198 9.4082 1.46875 9.4707 1.5625C9.53841 1.65625 9.61133 1.73698 9.68945 1.80469C9.77279 1.86719 9.86393 1.91667 9.96289 1.95312C10.0671 1.98438 10.1947 2 10.3457 2H15.8457C15.9863 2 16.1165 2.02604 16.2363 2.07812C16.3561 2.13021 16.4603 2.20312 16.5488 2.29688C16.6426 2.38542 16.7155 2.48958 16.7676 2.60938C16.8197 2.72917 16.8457 2.85938 16.8457 3ZM7.5957 1H1.8457V3H7.5957C7.73633 3 7.85352 2.97656 7.94727 2.92969C8.04622 2.88281 8.13737 2.82552 8.2207 2.75781C8.30924 2.6901 8.39779 2.61719 8.48633 2.53906C8.57487 2.45573 8.67643 2.38281 8.79102 2.32031C8.71289 2.23177 8.62956 2.11458 8.54102 1.96875C8.45768 1.81771 8.36654 1.67188 8.26758 1.53125C8.16862 1.38542 8.06185 1.26042 7.94727 1.15625C7.83789 1.05208 7.7207 1 7.5957 1ZM15.8457 11V3H10.3457C10.054 3 9.81706 3.02604 9.63477 3.07812C9.45768 3.125 9.30664 3.1849 9.18164 3.25781C9.06185 3.33073 8.95768 3.41146 8.86914 3.5C8.7806 3.58854 8.68164 3.66927 8.57227 3.74219C8.4681 3.8151 8.34049 3.8776 8.18945 3.92969C8.03841 3.97656 7.84049 4 7.5957 4H1.8457V11H15.8457Z" fill="#0078D4"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

8
extensions/sql-database-projects/src/common/iconHelper.ts
View File

@@ -21,9 +21,11 @@ export class IconPathHelper {
public static referenceDatabase: IconPath;
public static refresh: IconPath;
public static folder: IconPath;
public static folder_blue: IconPath;
public static edit: IconPath;
public static folder: IconPath;
public static setExtensionContext(extensionContext: vscode.ExtensionContext) {
IconPathHelper.extensionContext = extensionContext;
@@ -36,8 +38,10 @@ export class IconPathHelper {
IconPathHelper.referenceDatabase = IconPathHelper.makeIcon('reference-database');
IconPathHelper.refresh = IconPathHelper.makeIcon('refresh');
IconPathHelper.folder = IconPathHelper.makeIcon('folder');
IconPathHelper.folder_blue = IconPathHelper.makeIcon('folder_blue');
IconPathHelper.edit = IconPathHelper.makeIcon('edit');
IconPathHelper.folder = IconPathHelper.makeIcon('folder');
}
private static makeIcon(name: string) {

2
extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts
View File

@@ -488,7 +488,7 @@ export class PublishDatabaseDialog {
private createLoadProfileButton(view: azdata.ModelView): azdata.ButtonComponent {
let loadProfileButton: azdata.ButtonComponent = view.modelBuilder.button().withProperties({
ariaLabel: constants.loadProfilePlaceholderText,
iconPath: IconPathHelper.folder,
iconPath: IconPathHelper.folder_blue,
height: '16px',
width: '15px'
}).component();

5
extensions/sql-database-projects/src/models/tree/fileFolderTreeItem.ts
View File

@@ -5,11 +5,12 @@
import * as vscode from 'vscode';
import * as path from 'path';
import * as utils from '../../common/utils';
import { BaseProjectTreeItem } from './baseTreeItem';
import { ProjectRootTreeItem } from './projectTreeItem';
import { Project } from '../project';
import { DatabaseProjectItemType } from '../../common/constants';
import * as utils from '../../common/utils';
import { IconPathHelper } from '../../common/iconHelper';
/**
* Node representing a folder in a project
@@ -30,6 +31,8 @@ export class FolderNode extends BaseProjectTreeItem {
public get treeItem(): vscode.TreeItem {
const folderItem = new vscode.TreeItem(this.uri, vscode.TreeItemCollapsibleState.Collapsed);
folderItem.contextValue = DatabaseProjectItemType.folder;
folderItem.iconPath = IconPathHelper.folder;
return folderItem;
}