This repository has been archived by the owner on Apr 22, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: add gnome 40 support from preferences
- Loading branch information
Showing
10 changed files
with
461 additions
and
640 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| declare const imports: { | ||
| lang: any; | ||
| ui: { | ||
| main: { | ||
| notify: (arg: string) => void; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,186 +1,43 @@ | ||
| import { SyncProviderType } from '@esync/api/types'; | ||
| import { DataProviderType } from '@esync/data'; | ||
| import { getCurrentExtension, getCurrentExtensionSettings, ShellExtension } from '@esync/shell'; | ||
| import { enumListToSettingsFlags, logger, settingsFlagsToEnumList } from '@esync/utils'; | ||
| import { File, FileCreateFlags, Settings } from '@imports/gio2'; | ||
| import { get_user_config_dir } from '@imports/glib2'; | ||
| import { Box, Builder, Button, ComboBoxText, Entry, Switch } from '@imports/gtk4'; | ||
| import { logger } from '@esync/utils'; | ||
| import { registerClass } from '@imports/gobject2'; | ||
| import { BaselinePosition, Box, Notebook, Orientation } from '@imports/gtk4'; | ||
| import { ProviderPrefs } from './providerPrefs'; | ||
| import { SyncedDataPrefs } from './syncedDataPrefs'; | ||
|
|
||
| const debug = logger('prefs'); | ||
|
|
||
| class Preferences { | ||
| private extension: ShellExtension; | ||
| private settings: Settings; | ||
| private builder: Builder; | ||
| private providerCombBoxText: ComboBoxText; | ||
| private githubSettingsBox: Box; | ||
| private gitlabSettingsBox: Box; | ||
| private localSettingsBox: Box; | ||
| private githubUserTokenEntry: Entry; | ||
| private githubGistIdEntry: Entry; | ||
| private gitlabUserTokenEntry: Entry; | ||
| private gitlabSnippetIdEntry: Entry; | ||
| private backupFileLocationChooser: Button; | ||
| private syncExtensionsSwitch: Switch; | ||
| private syncKeybindingsSwitch: Switch; | ||
| private syncTweaksSwitch: Switch; | ||
| const Preferences = registerClass( | ||
| {}, | ||
| class Preferences extends Box { | ||
| _init() { | ||
| super._init({ | ||
| orientation: Orientation.VERTICAL, | ||
| spacing: 10, | ||
| baselinePosition: BaselinePosition.BOTTOM, | ||
| }); | ||
|
|
||
| widget: Box; | ||
|
|
||
| constructor() { | ||
| this.extension = getCurrentExtension(); | ||
| this.settings = getCurrentExtensionSettings(); | ||
| this.widget = new Box(); | ||
| this.builder = Builder.new_from_file(`${this.extension.path}/ui/prefs.glade`); | ||
| this.builder.set_current_object(this.widget); | ||
|
|
||
| const settingsBox = this.builder.get_object('sync-settings') as Box; | ||
|
|
||
| this.githubSettingsBox = this.builder.get_object('github-settings') as Box; | ||
| this.gitlabSettingsBox = this.builder.get_object('gitlab-settings') as Box; | ||
| this.localSettingsBox = this.builder.get_object('local-settings') as Box; | ||
|
|
||
| this.providerCombBoxText = this.builder.get_object('provider-select') as ComboBoxText; | ||
|
|
||
| this.githubUserTokenEntry = this.builder.get_object('github-user-token-entry') as Entry; | ||
| this.githubGistIdEntry = this.builder.get_object('github-gist-id-entry') as Entry; | ||
|
|
||
| this.gitlabUserTokenEntry = this.builder.get_object('gitlab-user-token-entry') as Entry; | ||
| this.gitlabSnippetIdEntry = this.builder.get_object('gitlab-snippet-id-entry') as Entry; | ||
|
|
||
| this.backupFileLocationChooser = this.builder.get_object('backup-file-location-chooser') as Button; | ||
|
|
||
| this.syncExtensionsSwitch = this.builder.get_object('sync-extensions-switch') as Switch; | ||
| this.syncKeybindingsSwitch = this.builder.get_object('sync-keybindings-switch') as Switch; | ||
| this.syncTweaksSwitch = this.builder.get_object('sync-tweaks-switch') as Switch; | ||
|
|
||
| if (null !== settingsBox) { | ||
| // this.widget.pack_start(settingsBox, true, true, 0); | ||
| } | ||
| // this.widget.?.set_title(this.extension.metadata.name); | ||
|
|
||
| this.initValues(); | ||
| this.onProviderChange(); | ||
| } | ||
|
|
||
| private initValues(): void { | ||
| const provider = this.settings.get_enum('provider'); | ||
| this.providerCombBoxText.set_active(provider); | ||
|
|
||
| const githubGistId = this.settings.get_string('github-gist-id'); | ||
| this.githubGistIdEntry.set_text(githubGistId); | ||
|
|
||
| const githubUserToken = this.settings.get_string('github-user-token'); | ||
| this.githubUserTokenEntry.set_text(githubUserToken); | ||
|
|
||
| const gitlabSnippetId = this.settings.get_string('gitlab-snippet-id'); | ||
| this.gitlabSnippetIdEntry.set_text(gitlabSnippetId); | ||
|
|
||
| const gitlabUserToken = this.settings.get_string('gitlab-user-token'); | ||
| this.gitlabUserTokenEntry.set_text(gitlabUserToken); | ||
|
|
||
| let backupFileLocation = this.settings.get_string('backup-file-location'); | ||
| if (!backupFileLocation) { | ||
| backupFileLocation = `file:https://${get_user_config_dir()}/extensions-sync.json`; | ||
| } | ||
| const backupFile = File.new_for_uri(backupFileLocation); | ||
| if (!backupFile.query_exists(null)) { | ||
| backupFile.create(FileCreateFlags.PRIVATE, null); | ||
| } | ||
| this.backupFileLocationChooser.set_name(backupFileLocation); | ||
|
|
||
| const providerFlag = this.settings.get_flags('data-providers'); | ||
| const providerTypes: Array<DataProviderType> = settingsFlagsToEnumList(providerFlag); | ||
| providerTypes.forEach((providerType) => { | ||
| switch (providerType) { | ||
| case DataProviderType.EXTENSIONS: { | ||
| this.syncExtensionsSwitch.set_active(true); | ||
| break; | ||
| } | ||
| case DataProviderType.KEYBINDINGS: { | ||
| this.syncKeybindingsSwitch.set_active(true); | ||
| break; | ||
| } | ||
| case DataProviderType.TWEAKS: { | ||
| this.syncTweaksSwitch.set_active(true); | ||
| break; | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private onProviderChange(): void { | ||
| const provider = this.providerCombBoxText.get_active(); | ||
|
|
||
| this.githubSettingsBox.set_visible(false); | ||
| this.gitlabSettingsBox.set_visible(false); | ||
| this.localSettingsBox.set_visible(false); | ||
| // this.githubSettingsBox.set_no_show_all(true); | ||
| // this.gitlabSettingsBox.set_no_show_all(true); | ||
| // this.localSettingsBox.set_no_show_all(true); | ||
| if (provider === SyncProviderType.GITHUB) { | ||
| this.githubSettingsBox.set_visible(true); | ||
| // this.githubSettingsBox.set_no_show_all(false); | ||
| } else if (provider === SyncProviderType.GITLAB) { | ||
| this.gitlabSettingsBox.set_visible(true); | ||
| // this.gitlabSettingsBox.set_no_show_all(false); | ||
| } else if (provider === SyncProviderType.LOCAL) { | ||
| this.localSettingsBox.set_visible(true); | ||
| // this.localSettingsBox.set_no_show_all(false); | ||
| this.createNotebook(); | ||
| } | ||
| } | ||
|
|
||
| private onSave(): void { | ||
| const provider = this.providerCombBoxText.get_active(); | ||
| this.settings.set_enum('provider', provider); | ||
|
|
||
| const githubGistId = this.githubGistIdEntry.get_text(); | ||
| this.settings.set_string('github-gist-id', githubGistId.trim()); | ||
|
|
||
| const githubUserToken = this.githubUserTokenEntry.get_text(); | ||
| this.settings.set_string('github-user-token', githubUserToken.trim()); | ||
| createNotebook() { | ||
| const notebook = new Notebook({ | ||
| hexpand: true, | ||
| vexpand: true, | ||
| }); | ||
|
|
||
| const gitlabSnippetId = this.gitlabSnippetIdEntry.get_text(); | ||
| this.settings.set_string('gitlab-snippet-id', gitlabSnippetId.trim()); | ||
| const providerPrefs = new ProviderPrefs(); | ||
| providerPrefs.attach(notebook); | ||
|
|
||
| const gitlabUserToken = this.gitlabUserTokenEntry.get_text(); | ||
| this.settings.set_string('gitlab-user-token', gitlabUserToken.trim()); | ||
| const syncedDataSettings = new SyncedDataPrefs(); | ||
| syncedDataSettings.attach(notebook); | ||
|
|
||
| const backupFileLocation = this.backupFileLocationChooser.get_name(); | ||
| if (backupFileLocation) { | ||
| this.settings.set_string('backup-file-location', backupFileLocation); | ||
| this.append(notebook); | ||
| } | ||
| }, | ||
| ); | ||
|
|
||
| const providerTypes: Array<DataProviderType> = []; | ||
| if (this.syncExtensionsSwitch.get_active()) { | ||
| providerTypes.push(DataProviderType.EXTENSIONS); | ||
| } | ||
| if (this.syncKeybindingsSwitch.get_active()) { | ||
| providerTypes.push(DataProviderType.KEYBINDINGS); | ||
| } | ||
| if (this.syncTweaksSwitch.get_active()) { | ||
| providerTypes.push(DataProviderType.TWEAKS); | ||
| } | ||
|
|
||
| const providerFlag = enumListToSettingsFlags(providerTypes); | ||
| this.settings.set_flags('data-providers', providerFlag); | ||
|
|
||
| this.onClose(); | ||
| } | ||
|
|
||
| private onClose(): void { | ||
| // this.widget.get_paren()?.destroy(); | ||
| } | ||
| } | ||
|
|
||
| const init = (): void => { | ||
| debug('prefs initialized'); | ||
| }; | ||
|
|
||
| const buildPrefsWidget = (): any => { | ||
| const prefs = new Preferences(); | ||
| const init = (): void => debug('prefs initialized'); | ||
|
|
||
| return prefs.widget; | ||
| }; | ||
| const buildPrefsWidget = (): any => new Preferences(); | ||
|
|
||
| export default { init, buildPrefsWidget }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| import { getCurrentExtension, getCurrentExtensionSettings, ShellExtension } from '@esync/shell'; | ||
| import { Settings } from '@imports/gio2'; | ||
| import { registerClass } from '@imports/gobject2'; | ||
| import { Box, Label, Notebook } from '@imports/gtk4'; | ||
|
|
||
| export const PrefsTab = registerClass( | ||
| {}, | ||
| class PrefsTab extends Box { | ||
| private title: string; | ||
| protected extension: ShellExtension; | ||
| protected settings: Settings; | ||
|
|
||
| _init(params) { | ||
| const { title, ...args } = params; | ||
| this.title = title; | ||
| this.extension = getCurrentExtension(); | ||
| this.settings = getCurrentExtensionSettings(); | ||
| super._init(args); | ||
| } | ||
| attach(tab: Notebook): void { | ||
| tab.append_page( | ||
| this, | ||
| new Label({ | ||
| label: this.title, | ||
| }), | ||
| ); | ||
| tab.get_page(this).tabExpand = true; | ||
| } | ||
| }, | ||
| ); |
Oops, something went wrong.