Skip to content

Commit

Permalink
Removed file dialogs due to unwanted window hide on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverschwendener committed Oct 4, 2018
1 parent b68640d commit cfe84b7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 68 deletions.
8 changes: 4 additions & 4 deletions main.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ <h1 class="setting-section-title">App Settings</h1>
<div class="setting-group">
<div class="setting-title">Config file path</div>
<div class="setting">
<input class="setting-text-input" type="text" v-model="appConfig.userSettingsFilePath" v-on:click="showChangeUserConfigFilePathDialog" v-on:blur="updateAppConfig">
<input class="setting-text-input" type="text" v-model="appConfig.userSettingsFilePath" v-on:blur="updateAppConfig">
</div>
</div>
<div class="setting-group">
Expand Down Expand Up @@ -133,7 +133,7 @@ <h1 class="setting-section-title">User Settings</h1>
</svg>
</div>
<div class="sub-setting">
<input class="setting-text-input" v-model="configEdit.newApplicationFolder" type="text" placeholder="Add more application folders" v-on:click="showAddApplicationFolderFileDialog">
<input class="setting-text-input" v-model="configEdit.newApplicationFolder" type="text" placeholder="Add more application folders">
<svg class="setting-action-icon sub-setting-icon" v-on:click="settingsActionAddApplicationFolder(configEdit.newApplicationFolder)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 26">
<path d="M13.5,3.188C7.805,3.188,3.188,7.805,3.188,13.5S7.805,23.813,13.5,23.813S23.813,19.195,23.813,13.5 S19.195,3.188,13.5,3.188z M19,15h-4v4h-3v-4H8v-3h4V8h3v4h4V15z"></path>
</svg>
Expand Down Expand Up @@ -334,7 +334,7 @@ <h1 class="setting-section-title">User Settings</h1>
</td>
</tr>
<tr>
<td><input class="setting-text-input" type="text" v-model="configEdit.newFileSearchOption.folderPath" placeholder="Add a folder path" v-on:click="showAddFileSearchOptionFileDialog"></td>
<td><input class="setting-text-input" type="text" v-model="configEdit.newFileSearchOption.folderPath" placeholder="Add a folder path"></td>
<td class="text-center"><input type="checkbox" v-model="configEdit.newFileSearchOption.recursive"></td>
<td class="text-center">
<svg class="setting-action-icon" v-on:click="settingsActionAddFileSearchOption(configEdit.newFileSearchOption)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 26">
Expand Down Expand Up @@ -535,7 +535,7 @@ <h1 class="setting-section-title">User Settings</h1>
<div class="setting-group">
<div class="setting-title">User stylesheet</div>
<div class="setting">
<input class="setting-text-input" type="text" v-model="config.userStylesheet" placeholder="Add a file path to your custom stylesheet" v-on:click="showChangeUserStyleSheetFileDialog" v-on:blur="updateUserConfig">
<input class="setting-text-input" type="text" v-model="config.userStylesheet" placeholder="Add a file path to your custom stylesheet" v-on:blur="updateUserConfig">
</div>
</div>
<div class="setting-group" v-if="config.features.webSearch">
Expand Down
65 changes: 1 addition & 64 deletions src/ts/renderer.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { dirname } from "path";
import { homedir } from "os";
import { SearchResultItemViewModel } from "./search-result-item-view-model";
import { IpcChannels } from "./ipc-channels";
import { ipcRenderer, remote } from "electron";
import { ipcRenderer } from "electron";
import { UserConfigFileRepository } from "./user-config/user-config-file-repository";
import { UserInputHistoryManager } from "./user-input-history-manager";
import { ElectronStoreAppConfigRepository } from "./app-config/electorn-store-app-config-repository";
Expand Down Expand Up @@ -231,67 +229,6 @@ const vue = new Vue({
settingsActionUpdateIconSet: (): void => {
vue.updateUserConfig();
},
showAddApplicationFolderFileDialog: (): void => {
remote.dialog.showOpenDialog({
buttonLabel: "Open",
defaultPath: homedir(),
message: "This is a message",
properties: ["openDirectory"],
title: "This is a title",
}, (filePaths: string[]) => {
if (filePaths !== undefined && filePaths.length === 1) {
configEdit.newApplicationFolder = filePaths[0];
}
});
},
showAddFileSearchOptionFileDialog: (): void => {
remote.dialog.showOpenDialog({
buttonLabel: "Open",
defaultPath: homedir(),
message: "This is a message",
properties: ["openDirectory"],
title: "This is a title",
}, (filePaths: string[]) => {
if (filePaths !== undefined && filePaths.length === 1) {
configEdit.newFileSearchOption = {
folderPath: filePaths[0],
recursive: configEdit.newFileSearchOption.recursive,
} as FileSearchOption;
}
});
},
showChangeUserConfigFilePathDialog: (): void => {
remote.dialog.showOpenDialog({
buttonLabel: "Open",
defaultPath: dirname(appConfig.userSettingsFilePath),
filters: [{ name: "JSON files", extensions: ["json"] }],
message: "This is a message",
properties: ["openFile"],
title: "This is a title",
}, (filePaths: string[]) => {
if (filePaths !== undefined && filePaths.length === 1) {
appConfig.userSettingsFilePath = filePaths[0];
vue.appConfig = appConfig;
}
});
},
showChangeUserStyleSheetFileDialog: (): void => {
remote.dialog.showOpenDialog({
buttonLabel: "Open",
defaultPath: config.userStylesheet === undefined || config.userStylesheet.length === 0
? homedir()
: dirname(config.userStylesheet),
filters: [{ name: "CSS files", extensions: ["css"] }],
message: "This is a message",
properties: ["openFile"],
title: "This is a title",
}, (filePaths: string[]) => {
if (filePaths !== undefined && filePaths.length === 1) {
config.userStylesheet = filePaths[0];
vue.config = config;
}
});
},
updateAppConfig: (): void => {
ipcRenderer.send(IpcChannels.updateAppConfig, appConfig);
},
Expand Down

0 comments on commit cfe84b7

Please sign in to comment.