mirrors
/
keeweb
mirror of https://github.com/keeweb/keeweb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Finalize titlebar style setting

pull/571/head
Enrico Monese 2017-03-26 01:57:52 +01:00
parent b4a5b24ef2
commit 91286fd7a9
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/models/app-settings-model.js
View File

@ -19,7 +19,7 @@ const AppSettingsModel = Backbone.Model.extend({
minimizeOnClose: false,
tableView: false,
colorfulIcons: false,
titlebarStyle: 0,
titlebarStyle: 'default',
lockOnMinimize: true,
lockOnCopy: false,
helpTipCopyShown: false,

2
app/scripts/views/settings/settings-general-view.js
View File

@ -212,7 +212,7 @@ const SettingsGeneralView = Backbone.View.extend({
},
changeTitlebarStyle: function(e) {
const titlebarStyle = +e.target.value;
const titlebarStyle = e.target.value;
AppSettingsModel.instance.set('titlebarStyle', titlebarStyle);
},

6
app/templates/settings/settings-general.hbs
View File

@ -81,9 +81,9 @@
<div>
<label for="settings__general-titlebar-style">{{res 'setGenTitlebarStyle'}}:</label>
<select class="settings__general-titlebar-style settings__select input-base" id="settings__general-titlebar-style">
<option value="0" {{#ifeq titlebarStyle 0}}selected{{/ifeq}}>{{res 'setGenTitlebarStyleDefault'}}</option>
<option value="1" {{#ifeq titlebarStyle 1}}selected{{/ifeq}}>{{res 'setGenTitlebarStyleHidden'}}</option>
<option value="2" {{#ifeq titlebarStyle 2}}selected{{/ifeq}}>{{res 'setGenTitlebarStyleHiddenInset'}}</option>
<option value="default" {{#ifeq titlebarStyle 'default'}}selected{{/ifeq}}>{{res 'setGenTitlebarStyleDefault'}}</option>
<option value="hidden" {{#ifeq titlebarStyle 'hidden'}}selected{{/ifeq}}>{{res 'setGenTitlebarStyleHidden'}}</option>
<option value="hidden-inset" {{#ifeq titlebarStyle 'hidden-inset'}}selected{{/ifeq}}>{{res 'setGenTitlebarStyleHiddenInset'}}</option>
</select>
</div>

4
desktop/app.js
View File

@ -14,6 +14,7 @@ let restartPending = false;
let mainWindowPosition = {};
let updateMainWindowPositionTimeout = null;
const windowPositionFileName = path.join(app.getPath('userData'), 'window-position.json');
const appSettingsFileName = path.join(app.getPath('userData'), 'app-settings.json');
let htmlPath = process.argv.filter(arg => arg.startsWith('--htmlpath=')).map(arg => arg.replace('--htmlpath=', ''))[0];
if (!htmlPath) {
@ -109,11 +110,12 @@ function setAppOptions() {
}
function createMainWindow() {
let titlebarStyle = JSON.parse( fs.readFileSync(appSettingsFileName, 'utf8') ).titlebarStyle;
mainWindow = new electron.BrowserWindow({
show: false,
width: 1000, height: 700, minWidth: 700, minHeight: 400,
icon: path.join(__dirname, 'icon.png'),
titleBarStyle: 'hidden-inset',
titleBarStyle: titlebarStyle,
webPreferences: {
backgroundThrottling: false
}