Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

feat(theme): use TriliumNext as default theme

Browse Source
This commit is contained in:
Elian Doran
2024-11-22 20:15:35 +02:00
parent 3e705ec4fd
commit 2e544a7337
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/services/options_init.ts
View File

@@ -38,10 +38,9 @@ interface DefaultOption {
* Initializes the default options for new databases only. * Initializes the default options for new databases only.
* *
* @param initialized `true` if the database has been fully initialized (i.e. a new database was created), or `false` if the database is created for sync. * @param initialized `true` if the database has been fully initialized (i.e. a new database was created), or `false` if the database is created for sync.
* @param theme the theme to set as default, based on a user's system preference.
* @param opts additional options to be initialized, for example the sync configuration. * @param opts additional options to be initialized, for example the sync configuration.
*/ */
async function initNotSyncedOptions(initialized: boolean, theme: string, opts: NotSyncedOpts = {}) { async function initNotSyncedOptions(initialized: boolean, opts: NotSyncedOpts = {}) {
optionService.createOption('openNoteContexts', JSON.stringify([ optionService.createOption('openNoteContexts', JSON.stringify([
{ {
notePath: 'root', notePath: 'root',
@@ -59,7 +58,7 @@ async function initNotSyncedOptions(initialized: boolean, theme: string, opts: N
optionService.createOption('lastSyncedPull', '0', false); optionService.createOption('lastSyncedPull', '0', false);
optionService.createOption('lastSyncedPush', '0', false); optionService.createOption('lastSyncedPush', '0', false);
optionService.createOption('theme', theme, false); optionService.createOption('theme', 'next', false);
optionService.createOption('syncServerHost', opts.syncServerHost || '', false); optionService.createOption('syncServerHost', opts.syncServerHost || '', false);
optionService.createOption('syncServerTimeout', '120000', false); optionService.createOption('syncServerTimeout', '120000', false);

16
src/services/sql_init.ts
View File

@@ -57,7 +57,6 @@ async function createInitialDatabase() {
const schema = fs.readFileSync(`${resourceDir.DB_INIT_DIR}/schema.sql`, "utf-8"); const schema = fs.readFileSync(`${resourceDir.DB_INIT_DIR}/schema.sql`, "utf-8");
const demoFile = fs.readFileSync(`${resourceDir.DB_INIT_DIR}/demo.zip`); const demoFile = fs.readFileSync(`${resourceDir.DB_INIT_DIR}/demo.zip`);
const defaultTheme = await getDefaultTheme();
let rootNote!: BNote; let rootNote!: BNote;
@@ -90,7 +89,7 @@ async function createInitialDatabase() {
}).save(); }).save();
optionsInitService.initDocumentOptions(); optionsInitService.initDocumentOptions();
optionsInitService.initNotSyncedOptions(true, defaultTheme, {}); optionsInitService.initNotSyncedOptions(true, {});
optionsInitService.initStartupOptions(); optionsInitService.initStartupOptions();
password.resetPassword(); password.resetPassword();
}); });
@@ -128,7 +127,6 @@ async function createDatabaseForSync(options: OptionRow[], syncServerHost = '',
throw new Error("DB is already initialized"); throw new Error("DB is already initialized");
} }
const defaultTheme = await getDefaultTheme();
const schema = fs.readFileSync(`${resourceDir.DB_INIT_DIR}/schema.sql`, "utf8"); const schema = fs.readFileSync(`${resourceDir.DB_INIT_DIR}/schema.sql`, "utf8");
// We have to import async since options init requires keyboard actions which require translations. // We have to import async since options init requires keyboard actions which require translations.
@@ -137,7 +135,7 @@ async function createDatabaseForSync(options: OptionRow[], syncServerHost = '',
sql.transactional(() => { sql.transactional(() => {
sql.executeScript(schema); sql.executeScript(schema);
optionsInitService.initNotSyncedOptions(false, defaultTheme, { syncServerHost, syncProxy }); optionsInitService.initNotSyncedOptions(false, { syncServerHost, syncProxy });
// document options required for sync to kick off // document options required for sync to kick off
for (const opt of options) { for (const opt of options) {
@@ -148,16 +146,6 @@ async function createDatabaseForSync(options: OptionRow[], syncServerHost = '',
log.info("Schema and not synced options generated."); log.info("Schema and not synced options generated.");
} }
async function getDefaultTheme() {
if (utils.isElectron()) {
const {nativeTheme} = await import("electron");
return nativeTheme.shouldUseDarkColors ? 'dark' : 'light';
} else {
// default based on the poll in https://github.com/zadam/trilium/issues/2516
return "dark";
}
}
function setDbAsInitialized() { function setDbAsInitialized() {
if (!isDbInitialized()) { if (!isDbInitialized()) {
optionService.setOption('initialized', 'true'); optionService.setOption('initialized', 'true');