Skip to content

Commit cc31a49

Browse files
committed
Merge branch 'dev'
2 parents fc343e7 + 79b4981 commit cc31a49

26 files changed

Lines changed: 241 additions & 81 deletions

File tree

.vscode/launch.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"type": "node",
9+
"request": "launch",
10+
"name": "Build & Run Release",
11+
"skipFiles": [
12+
"<node_internals>/**"
13+
],
14+
"program": "echo",
15+
"preLaunchTask": "Build & Run Release"
16+
},
17+
{
18+
"type": "node",
19+
"request": "launch",
20+
"name": "Build & Run Dev",
21+
"skipFiles": [
22+
"<node_internals>/**"
23+
],
24+
"program": "echo",
25+
"preLaunchTask": "Build & Run Dev"
26+
},
27+
{
28+
"type": "node",
29+
"request": "launch",
30+
"name": "Run Release",
31+
"skipFiles": [
32+
"<node_internals>/**"
33+
],
34+
"program": "echo",
35+
"preLaunchTask": "Run Release"
36+
},
37+
{
38+
"type": "node",
39+
"request": "launch",
40+
"name": "Run Dev",
41+
"skipFiles": [
42+
"<node_internals>/**"
43+
],
44+
"program": "echo",
45+
"preLaunchTask": "Run Dev"
46+
},
47+
]
48+
}

.vscode/tasks.json

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "Run builder",
8+
"type": "shell",
9+
"command": "npm run builder"
10+
},
11+
{
12+
"label": "Run Dev",
13+
"type": "shell",
14+
"command": "npm run dev"
15+
},
16+
{
17+
"label": "Run Release",
18+
"type": "shell",
19+
"command": "npm run start"
20+
},
21+
{
22+
"label": "Run Release",
23+
"type": "shell",
24+
"command": "npm run start"
25+
},
26+
{
27+
"label": "Build",
28+
"type": "shell",
29+
"command": "npm run build"
30+
},
31+
{
32+
"label": "Build & Run Release",
33+
"type": "shell",
34+
"command": "npm run build && npm run start"
35+
},
36+
{
37+
"label": "Build & Run Dev",
38+
"type": "shell",
39+
"command": "npm run build && npm run dev"
40+
},
41+
{
42+
"label": "Replace installed version",
43+
"type": "shell",
44+
"command": "cp -rf ./build/linux-unpacked/* /opt/figma-linux/"
45+
},
46+
{
47+
"label": "Copy settings",
48+
"type": "shell",
49+
"command": "rm -rf ~/.config/Electron && cp -rf ~/.config/figma-linux ~/.config/Electron"
50+
}
51+
]
52+
}

@types/Common/index.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ interface SettingsInterface {
158158
enableColorSpaceSrgb: boolean;
159159
visibleNewProjectBtn: boolean;
160160
useZenity: boolean;
161+
disableThemes: boolean;
161162
panelHeight: number;
162163
saveLastOpenedTabs: boolean;
163164
exportDir: string;

@types/index.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ declare namespace Electron {
6565
channel: "enableColorSpaceSrgbWasChanged",
6666
listener: (event: IpcMainInvokeEvent, enabled: boolean) => void,
6767
): this;
68+
on(channel: "disableThemesChanged", listener: (event: IpcMainInvokeEvent, enabled: boolean) => void): this;
6869
on(channel: "updateFigmaUiScale", listener: (event: IpcMainInvokeEvent, scale: number) => void): this;
6970
on(channel: "updatePanelScale", listener: (event: IpcMainInvokeEvent, scale: number) => void): this;
7071
on(channel: "startAppAuth", listener: (event: IpcMainInvokeEvent, auth: { grantPath: string }) => void): this;
@@ -123,6 +124,7 @@ declare namespace Electron {
123124
listener: (event: IpcMainInvokeEvent, data: WebApi.CreateMultipleExtension) => Promise<void> | any,
124125
): void;
125126
handle(channel: "isDevToolsOpened", listener: (event: IpcMainInvokeEvent) => Promise<void> | any): void;
127+
handle(channel: "themesIsDisabled", listener: (event: IpcMainInvokeEvent) => Promise<void> | boolean): void;
126128
handle(
127129
channel: "writeFiles",
128130
listener: (event: IpcMainInvokeEvent, data: WebApi.WriteFiles) => Promise<void> | void,
@@ -185,6 +187,7 @@ declare namespace Electron {
185187
send(channel: "closeThemeCreatorView"): this;
186188
send(channel: "themeCreatorExportTheme", theme: Themes.Theme): this;
187189
send(channel: "enableColorSpaceSrgbWasChanged", enabled: boolean): this;
190+
send(channel: "disableThemesChanged", enabled: boolean): this;
188191
send(channel: "updateFigmaUiScale", scale: number): this;
189192
send(channel: "updatePanelScale", scale: number): this;
190193
send(channel: "log-debug", ...args: any[]): this;
@@ -211,6 +214,7 @@ declare namespace Electron {
211214
invoke(channel: "getLocalFileExtensionManifest", id: number): Promise<number[]>;
212215
invoke(channel: "getLocalFileExtensionSource", id: number): Promise<Extensions.ExtensionSource>;
213216
invoke(channel: "createMultipleNewLocalFileExtensions", data: WebApi.CreateMultipleExtension): Promise<any>;
217+
invoke(channel: "themesIsDisabled"): Promise<boolean>;
214218
invoke(channel: "isDevToolsOpened"): Promise<boolean>;
215219
invoke(channel: "writeFiles", data: WebApi.WriteFiles): Promise<void>;
216220
invoke(channel: "get-fonts"): Promise<FontsMap>;

lib/icons/128x128.png

-6.88 KB
Loading

lib/icons/192x192.png

-11 KB
Loading

lib/icons/24x24.png

-4.33 KB
Loading

lib/icons/256x256.png

-19.8 KB
Loading

lib/icons/36x36.png

-5.16 KB
Loading

lib/icons/384x384.png

-46.2 KB
Loading

0 commit comments

Comments
 (0)