Skip to content

Commit

Permalink
Merge branch 'main' of ssh://github.com/anyproto/anytype-ts into nigh…
Browse files Browse the repository at this point in the history
…tly-ci-test
  • Loading branch information
requilence committed Oct 22, 2024
2 parents 212100f + 5848c97 commit 5146e9b
Show file tree
Hide file tree
Showing 67 changed files with 495 additions and 728 deletions.
Binary file removed dist/img/help/onboarding/set-1-to-collection.mp4
Binary file not shown.
Binary file removed dist/img/help/onboarding/set-2-new-object.mp4
Binary file not shown.
Binary file removed dist/img/help/onboarding/sidebar.mp4
Binary file not shown.
16 changes: 12 additions & 4 deletions electron/js/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Api {
};

setConfig (win, config) {
ConfigManager.set(config, (err) => Util.send(win, 'config', ConfigManager.config));
ConfigManager.set(config, () => Util.send(win, 'config', ConfigManager.config));
};

setAccount (win, account) {
Expand Down Expand Up @@ -179,7 +179,7 @@ class Api {
};

setInterfaceLang (win, lang) {
ConfigManager.set({ interfaceLang: lang }, (err) => {
ConfigManager.set({ interfaceLang: lang }, () => {
WindowManager.reloadAll();
MenuManager.initMenu();
MenuManager.initTray();
Expand Down Expand Up @@ -217,8 +217,16 @@ class Api {
};

systemInfo (win) {
si.getStaticData().then(data => {
Util.send(win, 'commandGlobal', 'systemInfo', data);
const { config } = ConfigManager;

if (config.systemInfo) {
return;
};

ConfigManager.set({ systemInfo: true }, () => {
si.getStaticData().then(data => {
Util.send(win, 'commandGlobal', 'systemInfo', data);
});
});
};

Expand Down
14 changes: 13 additions & 1 deletion electron/js/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -449,14 +449,26 @@ class MenuManager {

getTrayIcon () {
let icon = '';

if (is.windows) {
icon = 'icon32x32.png';
} else
if (is.linux) {
icon = 'iconTrayWhite.png';
const env = process.env.ORIGINAL_XDG_CURRENT_DESKTOP;
const panelAlwaysDark = env.includes('GNOME') || (env == 'Unity'); // for GNOME shell env, including ubuntu -- the panel is always dark

if (panelAlwaysDark) {
icon = 'iconTrayWhite.png';
} else
if (Util.getTheme() == 'dark') {
icon = 'iconTrayWhite.png';
} else {
icon = 'iconTrayBlack.png';
};
} else {
icon = `iconTrayTemplate.png`;
};

return path.join(Util.imagePath(), icon);
};

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "anytype",
"version": "0.42.44-alpha",
"version": "0.42.46-beta",
"description": "Anytype",
"main": "electron.js",
"scripts": {
Expand Down
15 changes: 4 additions & 11 deletions src/img/icon/import/csv.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 6 additions & 12 deletions src/img/icon/import/html.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 4 additions & 11 deletions src/img/icon/import/markdown.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/img/icon/import/notion.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 4 additions & 11 deletions src/img/icon/import/protobuf.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 4 additions & 11 deletions src/img/icon/import/text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/img/icon/onboarding/qrDownload.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/img/icon/widget/remove.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/img/theme/dark/icon/widget/remove.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5146e9b

Please sign in to comment.