mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-24 13:32:50 -05:00
Compare commits
2 Commits
816819bf9f
...
03cfa55e0b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
03cfa55e0b | ||
|
|
a887e60f40 |
@@ -502,17 +502,17 @@ func (p *MangoWCParser) handleSource(line, baseDir string, keybinds *[]MangoWCKe
|
|||||||
p.dmsProcessed = true
|
p.dmsProcessed = true
|
||||||
}
|
}
|
||||||
|
|
||||||
fullPath := sourcePath
|
expanded, err := utils.ExpandPath(sourcePath)
|
||||||
if !filepath.IsAbs(sourcePath) {
|
|
||||||
fullPath = filepath.Join(baseDir, sourcePath)
|
|
||||||
}
|
|
||||||
|
|
||||||
expanded, err := utils.ExpandPath(fullPath)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
includedBinds, err := p.parseFileWithSource(expanded)
|
fullPath := expanded
|
||||||
|
if !filepath.IsAbs(expanded) {
|
||||||
|
fullPath = filepath.Join(baseDir, expanded)
|
||||||
|
}
|
||||||
|
|
||||||
|
includedBinds, err := p.parseFileWithSource(fullPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -521,33 +521,10 @@ func (p *MangoWCParser) handleSource(line, baseDir string, keybinds *[]MangoWCKe
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *MangoWCParser) parseDMSBindsDirectly(dmsBindsPath string) []MangoWCKeyBinding {
|
func (p *MangoWCParser) parseDMSBindsDirectly(dmsBindsPath string) []MangoWCKeyBinding {
|
||||||
data, err := os.ReadFile(dmsBindsPath)
|
keybinds, err := p.parseFileWithSource(dmsBindsPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
prevSource := p.currentSource
|
|
||||||
p.currentSource = dmsBindsPath
|
|
||||||
|
|
||||||
var keybinds []MangoWCKeyBinding
|
|
||||||
lines := strings.Split(string(data), "\n")
|
|
||||||
|
|
||||||
for lineNum, line := range lines {
|
|
||||||
trimmed := strings.TrimSpace(line)
|
|
||||||
if !strings.HasPrefix(trimmed, "bind") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
kb := p.getKeybindAtLineContent(line, lineNum)
|
|
||||||
if kb == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
kb.Source = dmsBindsPath
|
|
||||||
p.addBind(kb)
|
|
||||||
keybinds = append(keybinds, *kb)
|
|
||||||
}
|
|
||||||
|
|
||||||
p.currentSource = prevSource
|
|
||||||
p.dmsProcessed = true
|
p.dmsProcessed = true
|
||||||
return keybinds
|
return keybinds
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1114,6 +1114,79 @@ Item {
|
|||||||
target: "spotlight"
|
target: "spotlight"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IpcHandler {
|
||||||
|
function info(message: string): string {
|
||||||
|
if (!message)
|
||||||
|
return "ERROR: No message specified";
|
||||||
|
|
||||||
|
ToastService.showInfo(message);
|
||||||
|
return "TOAST_INFO_SUCCESS";
|
||||||
|
}
|
||||||
|
|
||||||
|
function infoWith(message: string, details: string, command: string, category: string): string {
|
||||||
|
if (!message)
|
||||||
|
return "ERROR: No message specified";
|
||||||
|
|
||||||
|
ToastService.showInfo(message, details, command, category);
|
||||||
|
return "TOAST_INFO_SUCCESS";
|
||||||
|
}
|
||||||
|
|
||||||
|
function warn(message: string): string {
|
||||||
|
if (!message)
|
||||||
|
return "ERROR: No message specified";
|
||||||
|
|
||||||
|
ToastService.showWarning(message);
|
||||||
|
return "TOAST_WARN_SUCCESS";
|
||||||
|
}
|
||||||
|
|
||||||
|
function warnWith(message: string, details: string, command: string, category: string): string {
|
||||||
|
if (!message)
|
||||||
|
return "ERROR: No message specified";
|
||||||
|
|
||||||
|
ToastService.showWarning(message, details, command, category);
|
||||||
|
return "TOAST_WARN_SUCCESS";
|
||||||
|
}
|
||||||
|
|
||||||
|
function error(message: string): string {
|
||||||
|
if (!message)
|
||||||
|
return "ERROR: No message specified";
|
||||||
|
|
||||||
|
ToastService.showError(message);
|
||||||
|
return "TOAST_ERROR_SUCCESS";
|
||||||
|
}
|
||||||
|
|
||||||
|
function errorWith(message: string, details: string, command: string, category: string): string {
|
||||||
|
if (!message)
|
||||||
|
return "ERROR: No message specified";
|
||||||
|
|
||||||
|
ToastService.showError(message, details, command, category);
|
||||||
|
return "TOAST_ERROR_SUCCESS";
|
||||||
|
}
|
||||||
|
|
||||||
|
function hide(): string {
|
||||||
|
ToastService.hideToast();
|
||||||
|
return "TOAST_HIDE_SUCCESS";
|
||||||
|
}
|
||||||
|
|
||||||
|
function dismiss(category: string): string {
|
||||||
|
if (!category)
|
||||||
|
return "ERROR: No category specified";
|
||||||
|
|
||||||
|
ToastService.dismissCategory(category);
|
||||||
|
return "TOAST_DISMISS_SUCCESS";
|
||||||
|
}
|
||||||
|
|
||||||
|
function status(): string {
|
||||||
|
if (!ToastService.toastVisible)
|
||||||
|
return "hidden";
|
||||||
|
|
||||||
|
const levels = ["info", "warn", "error"];
|
||||||
|
return `visible:${levels[ToastService.currentLevel]}:${ToastService.currentMessage}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
target: "toast"
|
||||||
|
}
|
||||||
|
|
||||||
IpcHandler {
|
IpcHandler {
|
||||||
function open(): string {
|
function open(): string {
|
||||||
FirstLaunchService.showWelcome();
|
FirstLaunchService.showWelcome();
|
||||||
|
|||||||
Reference in New Issue
Block a user