The theme and config imports now use the defined restart command. (#470)
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
import options from 'options';
|
||||
import Gio from 'gi://Gio';
|
||||
import { bash, Notify } from 'lib/utils';
|
||||
import icons from 'lib/icons';
|
||||
import { filterConfigForThemeOnly, loadJsonFile, saveConfigToFile } from 'widget/settings/shared/FileChooser';
|
||||
|
||||
const { restartCommand } = options.hyprpanel;
|
||||
export const hexColorPattern = /^#([0-9A-Fa-f]{6}|[0-9A-Fa-f]{8})$/;
|
||||
|
||||
globalThis.useTheme = (filePath: string): void => {
|
||||
@@ -39,5 +41,5 @@ globalThis.useTheme = (filePath: string): void => {
|
||||
|
||||
saveConfigToFile(tmpConfig, `${TMP}/config.json`);
|
||||
saveConfigToFile(optionsConfig, OPTIONS);
|
||||
bash('pkill ags && ags');
|
||||
bash(restartCommand.value);
|
||||
};
|
||||
|
||||
@@ -45,7 +45,9 @@ export const BarGeneral = (): Scrollable<Child, Attribute> => {
|
||||
Option({
|
||||
opt: options.hyprpanel.restartCommand,
|
||||
title: 'Restart Command',
|
||||
subtitle: 'Command to execute when a restart is initiated.',
|
||||
subtitle:
|
||||
'Command to execute when a restart is initiated. If running ags on a different bus, you\n' +
|
||||
" can target it by using the '-b busName' flag. Ex: ags -b panel -q; ags -b panel",
|
||||
type: 'string',
|
||||
}),
|
||||
Option({
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import options from 'options';
|
||||
import Gtk from 'gi://Gtk?version=3.0';
|
||||
import Gio from 'gi://Gio';
|
||||
import { bash, Notify } from 'lib/utils';
|
||||
@@ -6,6 +7,7 @@ import { Config } from 'lib/types/filechooser';
|
||||
import { hexColorPattern } from 'globals/useTheme';
|
||||
import { isHexColor } from 'globals/variables';
|
||||
|
||||
const { restartCommand } = options.hyprpanel;
|
||||
const whiteListedThemeProp = ['theme.bar.buttons.style'];
|
||||
|
||||
export const loadJsonFile = (filePath: string): Config | null => {
|
||||
@@ -247,5 +249,5 @@ export const importFiles = (themeOnly: boolean = false): void => {
|
||||
saveConfigToFile(optionsConfig, OPTIONS);
|
||||
}
|
||||
dialog.destroy();
|
||||
bash('pkill ags && ags');
|
||||
bash(restartCommand.value);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user