+
${_lang.actAbout}
-
-
-
-
${_opts.appname} ${_lang.strVersion} ${_opts.version}
-
${_lang.aboutProFeaturesAvailable}
- ${_opts.edition}
-
${_lang.checkUpdates}
+
+
+
+
+
+
${_opts.appname}
+
${_lang.strVersion} ${_opts.version}
+
+
${_opts.appname} ${_lang.strVersion} ${_opts.version}
${_updates_status}
-
${_lang.aboutChangelog}
-
${_opts.rights}
+
${_lang.aboutProFeaturesAvailable}
+ ${_opts.edition}
+
${_lang.checkUpdates}
+
+
${_opts.rights}
${_opts.site}
`+
// '
'+
@@ -152,14 +159,14 @@
}
this.view.renderpanel(this.view.paneltemplate(args));
- const $label = this.view.$panel.find('.ver-checkupdate');
- $label.on('click', (e) => {
- if ( performance.now() - last_click_time < 1000 ) return;
- last_click_time = performance.now();
+ // const $label = this.view.$panel.find('.ver-checkupdate');
+ // $label.on('click', (e) => {
+ // if ( performance.now() - last_click_time < 1000 ) return;
+ // last_click_time = performance.now();
- window.sdk.execCommand('update', $label.data('state'));
- });
- $label[this.updates===true?'show':'hide']();
+ // window.sdk.execCommand('update', $label.data('state'));
+ // });
+ // $label[this.updates===true?'show':'hide']();
if ( args.opts ) {
this.view.$panel.find('.ver-changelog')[!!args.opts.changelog?'show':'hide']();
}
@@ -172,7 +179,7 @@
if ( this.view ) {
// this.view.$panel.find('.ver-checkupdate')[this.updates?'show':'hide']();
- this.view.$panel.find('.idx-update-cnt')[this.updates?'show':'hide']();
+ this.view.$panel.find('#idx-update-cnt')[this.updates?'show':'hide']();
if ( this.updates ) {
const $btn = $('#idx-update-btnaction')
@@ -183,41 +190,41 @@
}
} else
if (/^updates:checking/.test(cmd)) {
- const $label = this.view.$panel.find('.ver-checkupdate');
- const opts = JSON.parse(param);
- if ( opts.version == 'no' ) {
- $label.text(utils.Lang.updateNoUpdates);
- } else {
- $label.text(utils.Lang.updateAvialable.replace('$1', opts.version));
- $label.data('state', 'download');
- }
- $label.show();
+ // const $label = this.view.$panel.find('.ver-checkupdate');
+ // const opts = JSON.parse(param);
+ // if ( opts.version == 'no' ) {
+ // $label.text(utils.Lang.updateNoUpdates);
+ // } else {
+ // $label.text(utils.Lang.updateAvialable.replace('$1', opts.version));
+ // $label.data('state', 'download');
+ // }
+ // $label.show();
} else
if (/updates:download/.test(cmd)) {
- const opts = JSON.parse(param);
- const $label = this.view.$panel.find('.ver-checkupdate');
+ // const opts = JSON.parse(param);
+ // const $label = this.view.$panel.find('.ver-checkupdate');
- if ( opts.progress == 'done' ) {
- $label.text(utils.Lang.updateDownloadFinished);
- $label.data('state', 'install');
- } else
- if ( opts.progress == 'aborted' ) {
- $label.text(utils.Lang.updateDownloadCanceled);
- } else {
- $label.text(utils.Lang.updateDownloadProgress.replace('$1', opts.progress));
- $label.data('state', 'abort');
- }
+ // if ( opts.progress == 'done' ) {
+ // $label.text(utils.Lang.updateDownloadFinished);
+ // $label.data('state', 'install');
+ // } else
+ // if ( opts.progress == 'aborted' ) {
+ // $label.text(utils.Lang.updateDownloadCanceled);
+ // } else {
+ // $label.text(utils.Lang.updateDownloadProgress.replace('$1', opts.progress));
+ // $label.data('state', 'abort');
+ // }
} else
if (/updates:link/.test(cmd)) {
- const $label = this.view.$panel.find('.ver-checkupdate');
- let opts = {};
- if ( param == 'lock' || param == 'unlock' )
- opts.disabled = param == 'lock';
- else opts = JSON.parse(param);
+ // const $label = this.view.$panel.find('.ver-checkupdate');
+ // let opts = {};
+ // if ( param == 'lock' || param == 'unlock' )
+ // opts.disabled = param == 'lock';
+ // else opts = JSON.parse(param);
- if ( opts.disabled != undefined ) {
- $label.attr('disabled', opts.disabled ? 'disabled' : false);
- }
+ // if ( opts.disabled != undefined ) {
+ // $label.attr('disabled', opts.disabled ? 'disabled' : false);
+ // }
} else
if (/updates:status/.test(cmd)) {
on_updates_info.call(this, JSON.parse(param))
diff --git a/common/loginpage/src/panelsettings.js b/common/loginpage/src/panelsettings.js
index 04cc3ecaa..524511a1e 100644
--- a/common/loginpage/src/panelsettings.js
+++ b/common/loginpage/src/panelsettings.js
@@ -127,7 +127,7 @@
}
uitheme.is_system_theme_dark = function () {
- return window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+ return this.get_system_theme_type() == 'dark';
}
uitheme.get_default_theme_for_type = type => type == THEME_TYPE_DARK ? THEME_ID_DEFAULT_DARK : THEME_ID_DEFAULT_LIGHT;
@@ -537,11 +537,11 @@
if ( !!opts.updates ) {
if ( opts.updates.mode !== undefined ) {
- if ( !['ask', 'disabled'].includes(opts.updates.mode) )
- opts.updates.mode = 'ask'; // for 7.3. to workaround 'silent' mode
+ // if ( !['ask', 'disabled'].includes(opts.updates.mode) )
+ // opts.updates.mode = 'ask'; // for 7.3. to workaround 'silent' mode
- // ($optsAutoupdateMode = ($('#opts-autoupdate-mode', $panel).show().find('select')))
- ($optsAutoupdateMode = ($('#opts-autoupdate', $panel).show().find('select')))
+ ($optsAutoupdateMode = ($('#opts-autoupdate-mode', $panel).show().find('select')))
+ // ($optsAutoupdateMode = ($('#opts-autoupdate', $panel).show().find('select')))
.val(opts.updates.mode)
.selectpicker().on('change', e => {
$btnApply.isdisabled() && $btnApply.disable(false);
@@ -633,9 +633,9 @@
}
function _on_lang_changed(ol,nl) {
- // $('option[value=silent]', this.view.$panel).attr('data-subtext', utils.Lang.settOptDescAUpdateSilent);
- // $('option[value=ask]', this.view.$panel).attr('data-subtext', utils.Lang.settOptDescAUpdateAsk);
- // $('option[value=disabled]', this.view.$panel).attr('data-subtext', utils.Lang.settOptDescDisabled);
+ $('option[value=silent]', this.view.$panel).attr('data-subtext', utils.Lang.settOptDescAUpdateSilent);
+ $('option[value=ask]', this.view.$panel).attr('data-subtext', utils.Lang.settOptDescAUpdateAsk);
+ $('option[value=disabled]', this.view.$panel).attr('data-subtext', utils.Lang.settOptDescDisabled);
// for ( let k of Object.keys(themes_map) ) {
// const t = themes_map[k]
@@ -652,7 +652,7 @@
this.view.render();
- const _scaling = [100, 125, 150, 175, 200, 225, 250, 300, 350, 400, 450, 500];
+ const _scaling = [100, 125, 150, 175, 200, 225, 250, 275, 300, 350, 400, 450, 500];
let _scaling_items = '';
_scaling.forEach(val => _scaling_items += ``);
$('#opts-ui-scaling .combobox', this.view.$panel).append($(_scaling_items));
diff --git a/common/loginpage/src/styles.less b/common/loginpage/src/styles.less
index 9f2ec25b3..2b38d3c4c 100644
--- a/common/loginpage/src/styles.less
+++ b/common/loginpage/src/styles.less
@@ -306,10 +306,12 @@ li.menu-item {
&.settings {
overflow-x: hidden;
+ min-width: 450px;
}
&.about {
overflow-x: scroll;
+ min-width: 450px;
}
&.templates {
@@ -898,6 +900,7 @@ li.menu-item {
font-size: 13px;
user-select: text;
color: @text-normal;
+ margin-top: 10px;
.row-copyright {
margin-bottom: 0;
@@ -1136,7 +1139,7 @@ li.menu-item {
margin-right: 20px;
}
-#id-features-available {
+#id-features-available, #idx-update-cnt {
display: none;
}
@@ -1185,7 +1188,7 @@ li.menu-item {
background-color: @background-tabbar;
border-radius: 5px;
padding: 20px 30px;
- margin: 10px 0;
+ margin: 25px 0;
max-width: 800px;
.status-field {
@@ -1223,3 +1226,28 @@ li.menu-item {
}
}
}
+
+#idx-about-cut-logo {
+ width: 52px;
+ overflow: hidden;
+ margin-right: 15px;
+ height: 45px;
+}
+
+#idx-about-appname {
+ font-weight: bold;
+ font-size: 18px;
+ margin: -8px 0 0 0;
+}
+
+#idx-about-version {
+ margin: 4px 0 -4px;
+}
+
+.about-field {
+ margin-bottom: 10px;
+}
+
+.hidden {
+ display: none;
+}
diff --git a/macos/Localization/zh-tw.xliff b/macos/Localization/zh-Hant-TW.xliff
similarity index 99%
rename from macos/Localization/zh-tw.xliff
rename to macos/Localization/zh-Hant-TW.xliff
index 287f2c3b2..9a85fb496 100644
--- a/macos/Localization/zh-tw.xliff
+++ b/macos/Localization/zh-Hant-TW.xliff
@@ -1,6 +1,6 @@
-
+
@@ -67,7 +67,7 @@
-
+
@@ -453,7 +453,7 @@ We have a special offer for you.