diff options
| -rw-r--r-- | index.php | 29 | ||||
| -rw-r--r-- | js/App.js | 25 |
2 files changed, 43 insertions, 11 deletions
@@ -239,10 +239,26 @@ <span><i class="material-icons">menu</i></span> <div dojoType="dijit.Menu" style="display: none"> <script type='dojo/method' event='onOpen' args='evt,a,b,c'> - const ws = this.getChildren().find((m) => m.id == 'qmcToggleWidescreen'); + const widescreen = this.getChildren().find((m) => m.id == 'qmcToggleWidescreen'); + const expanded = this.getChildren().find((m) => m.id == 'qmcToggleExpanded'); + const combined = this.getChildren().find((m) => m.id == 'qmcToggleCombined'); + + if (combined) + combined.attr('label', + App.isCombinedMode() ? __('Switch to three panel view') : __('Switch to combined view')); + + if (widescreen) + widescreen + .attr('hidden', !!App.isCombinedMode()) + .attr('label', + App.isWideScreenMode() ? __('Disable widescreen mode') : __('Enable widescreen mode')); + + if (expanded) + expanded + .attr('hidden', !App.isCombinedMode()) + .attr('label', + App.isExpandedMode() ? __('Expand selected article only') : __('Expand all articles')); - if (ws) - ws.attr('hidden', !!App.isCombinedMode()); </script> <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?= __('Preferences...') ?></div> @@ -254,10 +270,13 @@ <div dojoType="dijit.MenuItem" disabled="1"><?= __('All feeds:') ?></div> <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcCatchupAll')"><?= __('Mark as read') ?></div> <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcShowOnlyUnread')"><?= __('(Un)hide read feeds') ?></div> - <div dojoType="dijit.MenuItem" disabled="1"><?= __('Other actions:') ?></div> + <div dojoType="dijit.MenuItem" disabled="1"><?= __('UI layout:') ?></div> + <div dojoType="dijit.MenuItem" id="qmcToggleCombined" onclick="App.onActionSelected('qmcToggleCombined')"><?= __('Toggle combined mode') ?></div> <div dojoType="dijit.MenuItem" id="qmcToggleWidescreen" onclick="App.onActionSelected('qmcToggleWidescreen')"> <?= __('Toggle widescreen mode') ?></div> - <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcToggleCombined')"><?= __('Toggle combined mode') ?></div> + <div dojoType="dijit.MenuItem" id="qmcToggleExpanded" onclick="App.onActionSelected('qmcToggleExpanded')"> + <?= __('Toggle expand all articles') ?></div> + <div dojoType="dijit.MenuItem" disabled="1"><?= __('Other actions:') ?></div> <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?= __('Keyboard shortcuts help') ?></div> <?php @@ -299,6 +299,21 @@ const App = { Headlines.renderAgain(); }) }, + isExpandedMode: function() { + return !!this.getInitParam("cdm_expanded"); + }, + setExpandedMode: function(expand) { + if (App.isCombinedMode()) { + const value = expand ? "true" : "false"; + + xhr.post("backend.php", {op: "rpc", method: "setpref", key: "CDM_EXPANDED", value: value}, () => { + this.setInitParam("cdm_expanded", !this.getInitParam("cdm_expanded")); + Headlines.renderAgain(); + }); + } else { + alert(__("This function is only available in combined mode.")); + } + }, getActionByHotkeySequence: function(sequence) { const hotkeys_map = this.getInitParam("hotkeys"); @@ -1236,12 +1251,7 @@ const App = { App.setCombinedMode(!App.isCombinedMode()); }; this.hotkey_actions["toggle_cdm_expanded"] = () => { - const value = this.getInitParam("cdm_expanded") ? "false" : "true"; - - xhr.post("backend.php", {op: "rpc", method: "setpref", key: "CDM_EXPANDED", value: value}, () => { - this.setInitParam("cdm_expanded", !this.getInitParam("cdm_expanded")); - Headlines.renderAgain(); - }); + App.setExpandedMode(!App.isExpandedMode()); }; this.hotkey_actions["article_span_grid"] = () => { Article.cdmToggleGridSpan(Article.getActive()); @@ -1307,6 +1317,9 @@ const App = { case "qmcToggleCombined": App.setCombinedMode(!App.isCombinedMode()); break; + case "qmcToggleExpanded": + App.setExpandedMode(!App.isExpandedMode()); + break; case "qmcHKhelp": this.hotkeyHelp() break; |