mirror of
https://github.com/xpipe-io/xpipe.git
synced 2024-09-30 00:56:56 +13:00
Rework file icon loading
This commit is contained in:
parent
8a60b29674
commit
f585969233
3 changed files with 10 additions and 20 deletions
|
@ -2,9 +2,6 @@ package io.xpipe.app.browser.session;
|
||||||
|
|
||||||
import io.xpipe.app.browser.file.BrowserEntry;
|
import io.xpipe.app.browser.file.BrowserEntry;
|
||||||
import io.xpipe.app.browser.fs.OpenFileSystemModel;
|
import io.xpipe.app.browser.fs.OpenFileSystemModel;
|
||||||
import io.xpipe.app.browser.icon.BrowserIconDirectoryType;
|
|
||||||
import io.xpipe.app.browser.icon.BrowserIconFileType;
|
|
||||||
import io.xpipe.app.browser.icon.FileIconManager;
|
|
||||||
import io.xpipe.app.fxcomps.util.ListBindingsHelper;
|
import io.xpipe.app.fxcomps.util.ListBindingsHelper;
|
||||||
import io.xpipe.app.storage.DataStoreEntryRef;
|
import io.xpipe.app.storage.DataStoreEntryRef;
|
||||||
import io.xpipe.app.util.BooleanScope;
|
import io.xpipe.app.util.BooleanScope;
|
||||||
|
@ -77,13 +74,6 @@ public class BrowserChooserModel extends BrowserAbstractSessionModel<OpenFileSys
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only load icons when a file system is opened
|
|
||||||
ThreadHelper.runAsync(() -> {
|
|
||||||
BrowserIconFileType.loadDefinitions();
|
|
||||||
BrowserIconDirectoryType.loadDefinitions();
|
|
||||||
FileIconManager.loadIfNecessary();
|
|
||||||
});
|
|
||||||
|
|
||||||
ThreadHelper.runFailableAsync(() -> {
|
ThreadHelper.runFailableAsync(() -> {
|
||||||
OpenFileSystemModel model;
|
OpenFileSystemModel model;
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,6 @@ import io.xpipe.app.browser.BrowserSavedState;
|
||||||
import io.xpipe.app.browser.BrowserSavedStateImpl;
|
import io.xpipe.app.browser.BrowserSavedStateImpl;
|
||||||
import io.xpipe.app.browser.BrowserTransferModel;
|
import io.xpipe.app.browser.BrowserTransferModel;
|
||||||
import io.xpipe.app.browser.fs.OpenFileSystemModel;
|
import io.xpipe.app.browser.fs.OpenFileSystemModel;
|
||||||
import io.xpipe.app.browser.icon.BrowserIconDirectoryType;
|
|
||||||
import io.xpipe.app.browser.icon.BrowserIconFileType;
|
|
||||||
import io.xpipe.app.browser.icon.FileIconManager;
|
|
||||||
import io.xpipe.app.storage.DataStorage;
|
import io.xpipe.app.storage.DataStorage;
|
||||||
import io.xpipe.app.storage.DataStoreEntryRef;
|
import io.xpipe.app.storage.DataStoreEntryRef;
|
||||||
import io.xpipe.app.util.BooleanScope;
|
import io.xpipe.app.util.BooleanScope;
|
||||||
|
@ -77,13 +74,6 @@ public class BrowserSessionModel extends BrowserAbstractSessionModel<BrowserSess
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only load icons when a file system is opened
|
|
||||||
ThreadHelper.runAsync(() -> {
|
|
||||||
BrowserIconFileType.loadDefinitions();
|
|
||||||
BrowserIconDirectoryType.loadDefinitions();
|
|
||||||
FileIconManager.loadIfNecessary();
|
|
||||||
});
|
|
||||||
|
|
||||||
ThreadHelper.runFailableAsync(() -> {
|
ThreadHelper.runFailableAsync(() -> {
|
||||||
OpenFileSystemModel model;
|
OpenFileSystemModel model;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package io.xpipe.app.core.mode;
|
package io.xpipe.app.core.mode;
|
||||||
|
|
||||||
|
import io.xpipe.app.browser.icon.BrowserIconDirectoryType;
|
||||||
|
import io.xpipe.app.browser.icon.BrowserIconFileType;
|
||||||
|
import io.xpipe.app.browser.icon.FileIconManager;
|
||||||
import io.xpipe.app.core.App;
|
import io.xpipe.app.core.App;
|
||||||
import io.xpipe.app.core.AppGreetings;
|
import io.xpipe.app.core.AppGreetings;
|
||||||
import io.xpipe.app.core.AppMainWindow;
|
import io.xpipe.app.core.AppMainWindow;
|
||||||
|
@ -8,6 +11,7 @@ import io.xpipe.app.fxcomps.util.PlatformThread;
|
||||||
import io.xpipe.app.issue.ErrorEvent;
|
import io.xpipe.app.issue.ErrorEvent;
|
||||||
import io.xpipe.app.issue.TrackEvent;
|
import io.xpipe.app.issue.TrackEvent;
|
||||||
import io.xpipe.app.update.UpdateChangelogAlert;
|
import io.xpipe.app.update.UpdateChangelogAlert;
|
||||||
|
import io.xpipe.app.util.ThreadHelper;
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
|
|
||||||
public class GuiMode extends PlatformMode {
|
public class GuiMode extends PlatformMode {
|
||||||
|
@ -47,6 +51,12 @@ public class GuiMode extends PlatformMode {
|
||||||
});
|
});
|
||||||
TrackEvent.info("Window setup complete");
|
TrackEvent.info("Window setup complete");
|
||||||
|
|
||||||
|
ThreadHelper.runAsync(() -> {
|
||||||
|
BrowserIconFileType.loadDefinitions();
|
||||||
|
BrowserIconDirectoryType.loadDefinitions();
|
||||||
|
FileIconManager.loadIfNecessary();
|
||||||
|
});
|
||||||
|
|
||||||
UpdateChangelogAlert.showIfNeeded();
|
UpdateChangelogAlert.showIfNeeded();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue