oliverschwendener/ueli
1
1
Fork 0
mirror of https://github.com/oliverschwendener/ueli.git synced 2024-10-04 18:17:43 +03:00
Code Issues Projects Releases Wiki Activity

Reverted changes from 6089f36ebc and fixed scrolling issue

Browse Source
This commit is contained in:
Oliver Schwendener 2019-07-09 08:08:24 +02:00
parent 6089f36ebc
commit 6fcd4f0552
14 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.html
View File

@ -9,9 +9,9 @@
</head>
<body>
<div id="app">
<user-styles :appearance="config.appearanceOptions" :colortheme="config.colorThemeOptions"/>
<user-input :config="config" :translations="translations"/>
<search-results :appearance="config.appearanceOptions"/>
<user-styles :appearance="config.appearanceOptions" :colortheme="config.colorThemeOptions"></user-styles>
<user-input :config="config" :translations="translations"></user-input>
<search-results :appearance="config.appearanceOptions"></search-results>
</div>
<script src="./bundle/renderer.js"></script>
</body>

2
settings.html
View File

@ -11,7 +11,7 @@
</head>
<body>
<div id="app">
<settings :config="config" :translations="translations"/>
<settings :config="config" :translations="translations"></settings>
</div>
<script src="./bundle/renderer.js"></script>
</body>

4
src/renderer/search-results-component.ts
View File

@ -84,10 +84,10 @@ export const searchResultsComponent = Vue.extend({
const elementIsOutOfViewBottom = ((htmlElement.offsetTop - userInput.clientHeight) > (outputContainer.scrollTop + outputContainer.clientHeight - htmlElement.clientHeight));
const elementIsOutOfViewTop = htmlElement.offsetTop - userInput.clientHeight < outputContainer.scrollTop;
if (elementIsOutOfViewBottom) {
const scrollTo = htmlElement.offsetTop - userInput.clientHeight;
const scrollTo = htmlElement.offsetTop - userInput.clientHeight + 30;
outputContainer.scrollTo({ top: scrollTo, behavior: scrollBehavior });
} else if (elementIsOutOfViewTop) {
let scrollTo = htmlElement.offsetTop - outputContainer.clientHeight - 20; // I have no idea why 20
let scrollTo = htmlElement.offsetTop - outputContainer.clientHeight + 50;
if (scrollTo < 0) {
scrollTo = 0;
}

4
src/renderer/settings/application-search-settings-component.ts
View File

@ -209,8 +209,8 @@ export const applicationSearchSettingsComponent = Vue.extend({
</div>
</div>
</div>
<new-application-folder-modal :translations="translations"/>
<new-application-file-extension-modal :translations="translations"/>
<new-application-folder-modal :translations="translations"></new-application-folder-modal>
<new-application-file-extension-modal :translations="translations"></new-application-file-extension-modal>
</div>
`,
});

2
src/renderer/settings/color-picker-component.ts
View File

@ -44,7 +44,7 @@ export const colorPickerComponent = Vue.extend({
</div>
<div class="message-body">
<div class="field">
<chrome-picker :value="color" @input="updateValue"/>
<chrome-picker :value="color" @input="updateValue"></chrome-picker>
</div>
<div class="field is-grouped is-grouped-right">
<div class="control">

2
src/renderer/settings/color-theme-settings-component.ts
View File

@ -500,7 +500,7 @@ export const colorThemeSettingsComponent = Vue.extend({
</div>
<color-picker :translations="translations">
<color-picker :translations="translations"></color-picker>
</div>
</div>

4
src/renderer/settings/modals/shortcut-editing-modal-component.ts
View File

@ -217,8 +217,8 @@ export const shortcutEditingModal = Vue.extend({
<input class="input" type="text" :placeholder="getShorcutTypeDescriptionPlaceholder(shortcut.type)" v-model="shortcut.description">
</div>
</div>
<tags-editing :tags="shortcut.tags" :field-title="translations.shortcutSettingsTableTags" :translations="translations"/>
<icon-editing :icon="shortcut.icon" :translations="translations"/>
<tags-editing :tags="shortcut.tags" :field-title="translations.shortcutSettingsTableTags" :translations="translations"></tags-editing>
<icon-editing :icon="shortcut.icon" :translations="translations"></icon-editing>
<div class="field is-grouped is-grouped-right">
<div class="control">
<button class="button is-danger" @click="closeButtonClick">

5
src/renderer/settings/modals/websearch-editing-modal-component.ts
View File

@ -110,10 +110,7 @@ export const websearchEditingModal = Vue.extend({
</div>
</div>
<icon-editing
:icon="websearchEngine.icon"
:translations="translations"
/>
<icon-editing :icon="websearchEngine.icon" :translations="translations"></icon-editing>
<div class="field">
<label class="label">

4
src/renderer/settings/modals/workflow-editing-modal-component.ts
View File

@ -236,8 +236,8 @@ export const workflowEditingModal = Vue.extend({
</button>
</div>
</div>
<tags-editing :tags="workflow.tags" :field-title="translations.workflowTags" :translations="translations"/>
<icon-editing :icon="workflow.icon" :translations="translations"/>
<tags-editing :tags="workflow.tags" :field-title="translations.workflowTags" :translations="translations"></tags-editing>
<icon-editing :icon="workflow.icon" :translations="translations"></icon-editing>
<div class="field is-grouped is-grouped-right">
<div class="control">
<button class="button is-danger" @click="closeModal">

48
src/renderer/settings/settings-component.ts
View File

@ -76,7 +76,7 @@ export const settingsComponent = Vue.extend({
},
template: `
<div class="settings container is-fluid">
<settings-loading-overlay/>
<settings-loading-overlay></settings-loading-overlay>
<div class="settings__sidebar menu">
<div class="settings__sidebar-header-container">
<img class="settings__sidebar-header-image" src="./assets/ueli.svg">
@ -90,7 +90,7 @@ export const settingsComponent = Vue.extend({
v-for="generalSettingMenuItem in generalSettingMenuItems"
:item="generalSettingMenuItem"
:translations="translations"
/>
></setting-menu-item>
</ul>
<div class="menu-label">
{{ translations.pluginSettingsMenuSection }}
@ -100,7 +100,7 @@ export const settingsComponent = Vue.extend({
v-for="pluginSettingMenuItem in pluginSettingMenuItems"
:item="pluginSettingMenuItem"
:translations="translations"
/>
></setting-menu-item>
</ul>
</div>
<div class="settings__notification notification" :class="notificationClass">
@ -108,27 +108,27 @@ export const settingsComponent = Vue.extend({
{{ notification.message }}
</div>
<div class="settings__setting">
<general-settings :config="config" :translations="translations"/>
<appearance-settings :config="config" :translations="translations"/>
<color-theme-settings :config="config" :translations="translations"/>
<search-engine-settings :config="config" :translations="translations"/>
<application-search-settings :config="config" :translations="translations"/>
<shortcut-settings :config="config" :translations="translations"/>
<mdfind-settings :config="config" :translations="translations"/>
<everthing-settings :config="config" :translations="translations"/>
<translation-settings :config="config" :translations="translations"/>
<websearch-settings :config="config" :translations="translations"/>
<filebrowser-settings :config="config" :translations="translations"/>
<operating-system-commands-settings :config="config" :translations="translations"/>
<operating-system-settings-settings :config="config" :translations="translations"/>
<calculator-settings :config="config" :translations="translations"/>
<url-settings :config="config" :translations="translations"/>
<email-settings :config="config" :translations="translations"/>
<currency-converter-settings :config="config" :translations="translations"/>
<workflow-settings :config="config" :translations="translations"/>
<commandline-settings :config="config" :translations="translations"/>
<simple-folder-search-settings :config="config" :translations="translations"/>
<user-confirmation :translations="translations"/>
<general-settings :config="config" :translations="translations"></general-settings>
<appearance-settings :config="config" :translations="translations"></appearance-settings>
<color-theme-settings :config="config" :translations="translations"></color-theme-settings>
<search-engine-settings :config="config" :translations="translations"></search-engine-settings>
<application-search-settings :config="config" :translations="translations"></application-search-settings>
<shortcut-settings :config="config" :translations="translations"></shortcut-settings>
<mdfind-settings :config="config" :translations="translations"></mdfind-settings>
<everthing-settings :config="config" :translations="translations"></everthing-settings>
<translation-settings :config="config" :translations="translations"></translation-settings>
<websearch-settings :config="config" :translations="translations"></websearch-settings>
<filebrowser-settings :config="config" :translations="translations"></filebrowser-settings>
<operating-system-commands-settings :config="config" :translations="translations"></operating-system-commands-settings>
<operating-system-settings-settings :config="config" :translations="translations"></operating-system-settings-settings>
<calculator-settings :config="config" :translations="translations"></calculator-settings>
<url-settings :config="config" :translations="translations"></url-settings>
<email-settings :config="config" :translations="translations"></email-settings>
<currency-converter-settings :config="config" :translations="translations"></currency-converter-settings>
<workflow-settings :config="config" :translations="translations"></workflow-settings>
<commandline-settings :config="config" :translations="translations"></commandline-settings>
<simple-folder-search-settings :config="config" :translations="translations"></simple-folder-search-settings>
<user-confirmation :translations="translations"></user-confirmation>
</div>
</div>
`,

4
src/renderer/settings/shortcut-settings-component.ts
View File

@ -150,7 +150,7 @@ export const shortcutSettingsComponent = Vue.extend({
</div>
</td>
<td class="has-text-centered">
<icon :icon="shortcut.icon" :defaulticon="defaultShortcutIcon"/>
<icon :icon="shortcut.icon" :defaulticon="defaultShortcutIcon"></icon>
</td>
<td class="has-text-centered">
<button class="button" @click="editShortcut(index)">
@ -174,7 +174,7 @@ export const shortcutSettingsComponent = Vue.extend({
</div>
</div>
</div>
<shortcut-editing-modal :translations="translations"/>
<shortcut-editing-modal :translations="translations"></shortcut-editing-modal>
</div>
`,
});

2
src/renderer/settings/simple-folder-search-settings-component.ts
View File

@ -145,7 +145,7 @@ export const simpleFolderSearchSettingsComponent = Vue.extend({
</div>
</div>
</div>
<simple-folder-search-editing :translations="translations"/>
<simple-folder-search-editing :translations="translations"></simple-folder-search-editing>
</div>
`,
});

4
src/renderer/settings/websearch-settings-component.ts
View File

@ -129,7 +129,7 @@ export const webSearchSettingsComponent = Vue.extend({
<td>{{ websearchEngine.name }}</td>
<td class="font-mono">{{ websearchEngine.prefix }}</td>
<td>{{ websearchEngine.url }}</td>
<td class="has-text-centered"><icon :icon="websearchEngine.icon" :defaulticon="defaultWebSearchIcon"/></td>
<td class="has-text-centered"><icon :icon="websearchEngine.icon" :defaulticon="defaultWebSearchIcon"></icon></td>
<td class="has-text-centered">{{ websearchEngine.priority }}</td>
<td class="has-text-centered"><i v-if="websearchEngine.isFallback" class="fas fa-check"></i></td>
<td class="has-text-centered"><i v-if="websearchEngine.encodeSearchTerm" class="fas fa-check"></i></td>
@ -162,7 +162,7 @@ export const webSearchSettingsComponent = Vue.extend({
</div>
</div>
<websearch-editing-modal :translations="translations"/>
<websearch-editing-modal :translations="translations"></websearch-editing-modal>
</div>
`,
});

4
src/renderer/settings/workflow-settings-component.ts
View File

@ -138,7 +138,7 @@ export const workflowSettingsComponent = Vue.extend({
</div>
</td>
<td class="has-text-centered">
<icon :icon="workflow.icon" :defaulticon="defaultWorkflowIcon"/>
<icon :icon="workflow.icon" :defaulticon="defaultWorkflowIcon"></icon>
</td>
<td>
<div v-for="executionStep in workflow.executionSteps" class="tags has-addons is-marginless">
@ -172,7 +172,7 @@ export const workflowSettingsComponent = Vue.extend({
</div>
</div>
</div>
<workflow-editing-modal :translations="translations"/>
<workflow-editing-modal :translations="translations"></workflow-editing-modal>
</div>
`,
});