From 50b957e6b5ff215230aacc50143c1613f88a96f6 Mon Sep 17 00:00:00 2001 From: Pluto Date: Mon, 7 Apr 2025 01:41:33 +0530 Subject: [PATCH 01/32] feat: add preferences to toggle the working set visibility --- src/nls/root/strings.js | 3 +++ src/project/SidebarView.js | 36 +++++++++++++++++++++++++++--------- src/styles/brackets.less | 5 +++++ 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 7b996f7da4..2c572819d3 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -1278,6 +1278,9 @@ define({ // Emmet "DESCRIPTION_EMMET": "true to enable Emmet, else false.", + // Hide/Show working set (that is displayed in the sidebar) + "DESCRIPTION_HIDE_WORKING_SET": "true to hide the working set, false to display it.", + // Tabbar "DESCRIPTION_TABBAR": "Set the tab bar settings.", "DESCRIPTION_SHOW_TABBAR": "true to show the tab bar, else false.", diff --git a/src/project/SidebarView.js b/src/project/SidebarView.js index fb609cfbe6..4622f49c4f 100644 --- a/src/project/SidebarView.js +++ b/src/project/SidebarView.js @@ -38,15 +38,16 @@ define(function (require, exports, module) { - var AppInit = require("utils/AppInit"), - ProjectManager = require("project/ProjectManager"), - WorkingSetView = require("project/WorkingSetView"), - MainViewManager = require("view/MainViewManager"), - CommandManager = require("command/CommandManager"), - Commands = require("command/Commands"), - Strings = require("strings"), - Resizer = require("utils/Resizer"), - _ = require("thirdparty/lodash"); + var AppInit = require("utils/AppInit"), + ProjectManager = require("project/ProjectManager"), + PreferencesManager = require("preferences/PreferencesManager"), + WorkingSetView = require("project/WorkingSetView"), + MainViewManager = require("view/MainViewManager"), + CommandManager = require("command/CommandManager"), + Commands = require("command/Commands"), + Strings = require("strings"), + Resizer = require("utils/Resizer"), + _ = require("thirdparty/lodash"); // These vars are initialized by the htmlReady handler // below since they refer to DOM elements @@ -244,6 +245,23 @@ define(function (require, exports, module) { // Tooltips $splitViewMenu.attr("title", Strings.GEAR_MENU_TOOLTIP); + + // Define the preference to decide whether to hide the working set or not + PreferencesManager.definePreference("hideWorkingSet", "boolean", false, { + description: Strings.DESCRIPTION_HIDE_WORKING_SET + }) + .on("change", function () { + // 'working-set-list-container' is the id of the main working set element which we need to hide/show + const $workingSet = $(document.getElementById("working-set-list-container")); + const getPref = PreferencesManager.get("hideWorkingSet"); + + if(getPref) { + // refer to brackets.less file for styles + $workingSet.addClass("working-set-hidden"); + } else { + $workingSet.removeClass("working-set-hidden"); + } + }); }); ProjectManager.on("projectOpen", _updateProjectTitle); diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 6b4b43a611..86b69b1203 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -1167,12 +1167,17 @@ a, img { #working-set-list-container { background: @bc-sidebar-bg; + display: block; > div:last-child ul { padding-bottom: 21px; // Adds working set bottom padding to the last UL. } } +#working-set-list-container.working-set-hidden { + display: none !important; +} + .working-set-header { position: relative; height: 19px; From 680678e9e8b689c730667af03cbedf1febd76116 Mon Sep 17 00:00:00 2001 From: abose Date: Wed, 9 Apr 2025 16:15:10 +0000 Subject: [PATCH 02/32] ci: bump patch version to 4.1.1 --- package.json | 6 +++--- src-node/package.json | 4 ++-- src/config.json | 4 ++-- src/index.html | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 69496f4468..c121240959 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "phoenix", - "version": "4.1.0-0", - "apiVersion": "4.1.0", + "version": "4.1.1-0", + "apiVersion": "4.1.1", "homepage": "https://core.ai", "issues": { "url": "https://github.com/phcode-dev/phoenix/issues" @@ -117,4 +117,4 @@ "tinycolor2": "^1.4.2", "underscore": "^1.13.4" } -} +} \ No newline at end of file diff --git a/src-node/package.json b/src-node/package.json index e2abbf30f3..8bb880a30e 100644 --- a/src-node/package.json +++ b/src-node/package.json @@ -1,8 +1,8 @@ { "name": "@phcode/node-core", "description": "Phoenix Node Core", - "version": "4.1.0-0", - "apiVersion": "4.1.0", + "version": "4.1.1-0", + "apiVersion": "4.1.1", "keywords": [], "author": "arun@core.ai", "homepage": "https://github.com/phcode-dev/phoenix", diff --git a/src/config.json b/src/config.json index 9b39d0d024..a3c6c88410 100644 --- a/src/config.json +++ b/src/config.json @@ -38,8 +38,8 @@ "bugsnagEnv": "development" }, "name": "Phoenix Code", - "version": "4.1.0-0", - "apiVersion": "4.1.0", + "version": "4.1.1-0", + "apiVersion": "4.1.1", "homepage": "https://core.ai", "issues": { "url": "https://github.com/phcode-dev/phoenix/issues" diff --git a/src/index.html b/src/index.html index c13f595ff0..d147cf1df0 100644 --- a/src/index.html +++ b/src/index.html @@ -68,7 +68,7 @@ - + - \ No newline at end of file From 456314613b6149b1df5ea7d0803f10024c7ee1a1 Mon Sep 17 00:00:00 2001 From: abose Date: Fri, 11 Apr 2025 16:28:51 +0530 Subject: [PATCH 09/32] fix: github actions windows desktop tests fails after rust update, locked rust to 1.85.1 --- .github/workflows/desktop-linux-prod-test-pull.yml | 2 ++ .github/workflows/desktop-linux-test-pull.yml | 2 ++ .github/workflows/desktop-mac-m1-test-pull.yml | 2 ++ .github/workflows/desktop-mac-test-pull.yml | 2 ++ .github/workflows/desktop-windows-test-pull.yml | 2 ++ src/extensions/default/Git/src/ErrorHandler.js | 3 ++- 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/desktop-linux-prod-test-pull.yml b/.github/workflows/desktop-linux-prod-test-pull.yml index b18755b96c..57e41d7e3f 100644 --- a/.github/workflows/desktop-linux-prod-test-pull.yml +++ b/.github/workflows/desktop-linux-prod-test-pull.yml @@ -20,6 +20,8 @@ jobs: node-version: 20 - name: install Rust stable uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.85.1 - name: install dependencies (ubuntu only) run: | diff --git a/.github/workflows/desktop-linux-test-pull.yml b/.github/workflows/desktop-linux-test-pull.yml index 4e7efdb888..ac734955cf 100644 --- a/.github/workflows/desktop-linux-test-pull.yml +++ b/.github/workflows/desktop-linux-test-pull.yml @@ -19,6 +19,8 @@ jobs: node-version: 20 - name: install Rust stable uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.85.1 - name: install dependencies (ubuntu only) run: | diff --git a/.github/workflows/desktop-mac-m1-test-pull.yml b/.github/workflows/desktop-mac-m1-test-pull.yml index 5ae0ea9f87..15993c36d8 100644 --- a/.github/workflows/desktop-mac-m1-test-pull.yml +++ b/.github/workflows/desktop-mac-m1-test-pull.yml @@ -19,6 +19,8 @@ jobs: node-version: 20 - name: install Rust stable uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.85.1 - name: build phoenix dist-test run: | diff --git a/.github/workflows/desktop-mac-test-pull.yml b/.github/workflows/desktop-mac-test-pull.yml index ae9a92c5c7..a4b3fc8bc1 100644 --- a/.github/workflows/desktop-mac-test-pull.yml +++ b/.github/workflows/desktop-mac-test-pull.yml @@ -19,6 +19,8 @@ jobs: node-version: 20 - name: install Rust stable uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.85.1 - name: build phoenix dist-test run: | diff --git a/.github/workflows/desktop-windows-test-pull.yml b/.github/workflows/desktop-windows-test-pull.yml index aa02987ecd..504c101f08 100644 --- a/.github/workflows/desktop-windows-test-pull.yml +++ b/.github/workflows/desktop-windows-test-pull.yml @@ -19,6 +19,8 @@ jobs: node-version: 20 - name: install Rust stable uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.85.1 - name: build phoenix dist-test run: | diff --git a/src/extensions/default/Git/src/ErrorHandler.js b/src/extensions/default/Git/src/ErrorHandler.js index 9378171b17..c275cafc9b 100644 --- a/src/extensions/default/Git/src/ErrorHandler.js +++ b/src/extensions/default/Git/src/ErrorHandler.js @@ -46,7 +46,6 @@ define(function (require, exports) { exports.showError = function (err, title, options = {}) { const dontStripError = options.dontStripError; const errorMetric = options.errorMetric; - Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'dialogErr', errorMetric || "Show"); if (err.__shown) { return err; } exports.logError(err); @@ -71,6 +70,7 @@ define(function (require, exports) { errorBody = window.debugMode ? `${errorBody}\n${errorStack}` : errorBody; if(options.useNotification){ + Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'notifyErr', errorMetric || "Show"); NotificationUI.createToastFromTemplate(title, ``, { toastStyle: NotificationUI.NOTIFICATION_STYLES_CSS_CLASS.ERROR, @@ -78,6 +78,7 @@ define(function (require, exports) { instantOpen: true }); } else { + Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'dialogErr', errorMetric || "Show"); const compiledTemplate = Mustache.render(errorDialogTemplate, { title: title, body: errorBody, From 42f9708f7bd0fcf56df3f0a40edc6f701be3936e Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 15 May 2025 00:59:07 +0530 Subject: [PATCH 10/32] fix: always reserve space for dirty icon to prevent tabs shift --- package-lock.json | 4 ++-- src-node/package-lock.json | 4 ++-- src/styles/Extn-TabBar.less | 17 +++++++++++------ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index b9a6b8e218..778cf7d205 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "phoenix", - "version": "4.1.0-0", + "version": "4.1.1-0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "phoenix", - "version": "4.1.0-0", + "version": "4.1.1-0", "dependencies": { "@bugsnag/js": "^7.18.0", "@floating-ui/dom": "^0.5.4", diff --git a/src-node/package-lock.json b/src-node/package-lock.json index 6177376876..6183efc95f 100644 --- a/src-node/package-lock.json +++ b/src-node/package-lock.json @@ -1,12 +1,12 @@ { "name": "@phcode/node-core", - "version": "4.1.0-0", + "version": "4.1.1-0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@phcode/node-core", - "version": "4.1.0-0", + "version": "4.1.1-0", "license": "GNU-AGPL3.0", "dependencies": { "@phcode/fs": "^3.0.1", diff --git a/src/styles/Extn-TabBar.less b/src/styles/Extn-TabBar.less index fb4288f541..5400a58ef0 100644 --- a/src/styles/Extn-TabBar.less +++ b/src/styles/Extn-TabBar.less @@ -80,7 +80,7 @@ .tab { display: inline-flex; align-items: center; - padding: 0 0.5rem 0 0.85rem; + padding: 0 0.5rem 0 0.6rem; height: 100%; background-color: #f1f1f1; border-right: 1px solid rgba(0, 0, 0, 0.05); @@ -108,6 +108,7 @@ display: flex; align-items: center; margin-bottom: -2px; + margin-left: 0.7rem; } .tab-name { @@ -191,21 +192,25 @@ background-color: #666; } -.tab.dirty::before { +.tab::before { content: "•"; - color: #888; + color: transparent; font-size: 1.6rem; position: absolute; - left: 0.75rem; + left: 0.4rem; top: 0.25rem; } +.tab.dirty::before { + color: #888; +} + .dark .tab.dirty::before { color: #8D8D8E; } .tab.dirty .tab-icon { - margin-left: 0.8rem; + margin-left: 0.7rem; } .tab-close { @@ -408,4 +413,4 @@ .dropdown-tab-item.placeholder-item .tab-name-container, .tab-name-container.placeholder-name { font-style: italic; -} \ No newline at end of file +} From 47b7b658c2f9ac81572eeb7b65222e42bef3d32a Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 15 May 2025 01:31:01 +0530 Subject: [PATCH 11/32] feat: add rename and delete option in tab --- .../TabBar/more-options.js | 46 +++++++++++++++++++ src/nls/root/strings.js | 2 + 2 files changed, 48 insertions(+) diff --git a/src/extensionsIntegrated/TabBar/more-options.js b/src/extensionsIntegrated/TabBar/more-options.js index f734741f44..1156d3d4f2 100644 --- a/src/extensionsIntegrated/TabBar/more-options.js +++ b/src/extensionsIntegrated/TabBar/more-options.js @@ -40,6 +40,9 @@ define(function (require, exports, module) { Strings.CLOSE_ALL_TABS, Strings.CLOSE_UNMODIFIED_TABS, "---", + Strings.RENAME_TAB_FILE, + Strings.DELETE_TAB_FILE, + "---", Strings.REOPEN_CLOSED_FILE ]; @@ -219,6 +222,43 @@ define(function (require, exports, module) { } + /** + * "RENAME FILE" + * This function handles the renaming of the file that was right-clicked + * + * @param {String} filePath - path of the file to rename + */ + function handleFileRename(filePath) { + if (filePath) { + // First ensure the sidebar is visible so users can see the rename action + CommandManager.execute(Commands.SHOW_SIDEBAR); + + // Get the file object using FileSystem + const fileObj = FileSystem.getFileForPath(filePath); + + // Execute the rename command with the file object + CommandManager.execute(Commands.FILE_RENAME, {file: fileObj}); + } + } + + + /** + * "DELETE FILE" + * This function handles the deletion of the file that was right-clicked + * + * @param {String} filePath - path of the file to delete + */ + function handleFileDelete(filePath) { + if (filePath) { + // Get the file object using FileSystem + const fileObj = FileSystem.getFileForPath(filePath); + + // Execute the delete command with the file object + CommandManager.execute(Commands.FILE_DELETE, {file: fileObj}); + } + } + + /** * This function is called when a tab is right-clicked * This will show the more options context menu @@ -279,6 +319,12 @@ define(function (require, exports, module) { case Strings.CLOSE_UNMODIFIED_TABS: handleCloseUnmodifiedTabs(paneId); break; + case Strings.RENAME_TAB_FILE: + handleFileRename(filePath); + break; + case Strings.DELETE_TAB_FILE: + handleFileDelete(filePath); + break; case Strings.REOPEN_CLOSED_FILE: reopenClosedFile(); break; diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 2c572819d3..66eee920ed 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -433,6 +433,8 @@ define({ "CLOSE_ALL_TABS": "Close All Tabs", "CLOSE_UNMODIFIED_TABS": "Close Unmodified Tabs", "REOPEN_CLOSED_FILE": "Reopen Closed File", + "RENAME_TAB_FILE": "Rename File", + "DELETE_TAB_FILE": "Delete File", // CodeInspection: errors/warnings "ERRORS_NO_FILE": "No File Open", From 074043dcb458d92fd1c5d4f6d9aacede611cce88 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 15 May 2025 01:47:08 +0530 Subject: [PATCH 12/32] fix: scrollbar appearing in tab context menu --- src/extensionsIntegrated/TabBar/more-options.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/extensionsIntegrated/TabBar/more-options.js b/src/extensionsIntegrated/TabBar/more-options.js index 1156d3d4f2..0184969d10 100644 --- a/src/extensionsIntegrated/TabBar/more-options.js +++ b/src/extensionsIntegrated/TabBar/more-options.js @@ -282,8 +282,13 @@ define(function (require, exports, module) { zIndex: 1000 }); + // Add a custom class to override the max-height, not sure why a scroll bar was coming but this did the trick + dropdown.dropdownExtraClasses = "tabbar-context-menu"; + dropdown.showDropdown(); + $(".tabbar-context-menu").css("max-height", "200px"); + // handle the option selection dropdown.on("select", function (e, item) { _handleSelection(item, filePath, paneId); From 203ab9c1ca3f581d75e2f39cbe4e649459ce39df Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 15 May 2025 01:48:39 +0530 Subject: [PATCH 13/32] fix: remove unused code --- src/extensionsIntegrated/TabBar/more-options.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/extensionsIntegrated/TabBar/more-options.js b/src/extensionsIntegrated/TabBar/more-options.js index 0184969d10..a9bd4547b0 100644 --- a/src/extensionsIntegrated/TabBar/more-options.js +++ b/src/extensionsIntegrated/TabBar/more-options.js @@ -68,18 +68,6 @@ define(function (require, exports, module) { } - /** - * "CLOSE ACTIVE TAB" - * this closes the currently active tab - * doesn't matter if the context menu is opened from this tab or some other tab - */ - function handleCloseActiveTab() { - // This simply executes the FILE_CLOSE command without parameters - // which will close the currently active file - CommandManager.execute(Commands.FILE_CLOSE); - } - - /** * "CLOSE ALL TABS" * This will close all tabs in the specified pane From 18552c1a39748191face7d620afcfa352398fe48 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 15 May 2025 02:14:56 +0530 Subject: [PATCH 14/32] feat: add show in file tree option in the tab context menu --- .../TabBar/more-options.js | 68 +++++++++---------- src/nls/root/strings.js | 1 + 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/extensionsIntegrated/TabBar/more-options.js b/src/extensionsIntegrated/TabBar/more-options.js index a9bd4547b0..f69cd847d6 100644 --- a/src/extensionsIntegrated/TabBar/more-options.js +++ b/src/extensionsIntegrated/TabBar/more-options.js @@ -42,11 +42,11 @@ define(function (require, exports, module) { "---", Strings.RENAME_TAB_FILE, Strings.DELETE_TAB_FILE, + Strings.SHOW_IN_FILE_TREE, "---", Strings.REOPEN_CLOSED_FILE ]; - /** * "CLOSE TAB" * this function handles the closing of the tab that was right-clicked @@ -60,14 +60,10 @@ define(function (require, exports, module) { const fileObj = FileSystem.getFileForPath(filePath); // Execute close command with file object and pane ID - CommandManager.execute( - Commands.FILE_CLOSE, - { file: fileObj, paneId: paneId } - ); + CommandManager.execute(Commands.FILE_CLOSE, { file: fileObj, paneId: paneId }); } } - /** * "CLOSE ALL TABS" * This will close all tabs in the specified pane @@ -88,14 +84,10 @@ define(function (require, exports, module) { // close each file in the pane, start from the rightmost [to avoid index shifts] for (let i = workingSet.length - 1; i >= 0; i--) { const fileObj = FileSystem.getFileForPath(workingSet[i].path); - CommandManager.execute( - Commands.FILE_CLOSE, - { file: fileObj, paneId: paneId } - ); + CommandManager.execute(Commands.FILE_CLOSE, { file: fileObj, paneId: paneId }); } } - /** * "CLOSE UNMODIFIED TABS" * This will close all tabs that are not modified in the specified pane @@ -114,19 +106,15 @@ define(function (require, exports, module) { } // get all those entries that are not dirty - const unmodifiedEntries = workingSet.filter(entry => !entry.isDirty); + const unmodifiedEntries = workingSet.filter((entry) => !entry.isDirty); // close each unmodified file in the pane for (let i = unmodifiedEntries.length - 1; i >= 0; i--) { const fileObj = FileSystem.getFileForPath(unmodifiedEntries[i].path); - CommandManager.execute( - Commands.FILE_CLOSE, - { file: fileObj, paneId: paneId } - ); + CommandManager.execute(Commands.FILE_CLOSE, { file: fileObj, paneId: paneId }); } } - /** * "CLOSE TABS TO THE LEFT" * This function is responsible for closing all tabs to the left of the right-clicked tab @@ -146,24 +134,21 @@ define(function (require, exports, module) { } // find the index of the current file in the working set - const currentIndex = workingSet.findIndex(entry => entry.path === filePath); + const currentIndex = workingSet.findIndex((entry) => entry.path === filePath); - if (currentIndex > 0) { // we only proceed if there are tabs to the left + if (currentIndex > 0) { + // we only proceed if there are tabs to the left // get all files to the left of the current file const filesToClose = workingSet.slice(0, currentIndex); // Close each file, starting from the rightmost [to avoid index shifts] for (let i = filesToClose.length - 1; i >= 0; i--) { const fileObj = FileSystem.getFileForPath(filesToClose[i].path); - CommandManager.execute( - Commands.FILE_CLOSE, - { file: fileObj, paneId: paneId } - ); + CommandManager.execute(Commands.FILE_CLOSE, { file: fileObj, paneId: paneId }); } } } - /** * "CLOSE TABS TO THE RIGHT" * This function is responsible for closing all tabs to the right of the right-clicked tab @@ -183,7 +168,7 @@ define(function (require, exports, module) { } // get the index of the current file in the working set - const currentIndex = workingSet.findIndex(entry => entry.path === filePath); + const currentIndex = workingSet.findIndex((entry) => entry.path === filePath); // only proceed if there are tabs to the right if (currentIndex !== -1 && currentIndex < workingSet.length - 1) { // get all files to the right of the current file @@ -191,15 +176,11 @@ define(function (require, exports, module) { for (let i = filesToClose.length - 1; i >= 0; i--) { const fileObj = FileSystem.getFileForPath(filesToClose[i].path); - CommandManager.execute( - Commands.FILE_CLOSE, - { file: fileObj, paneId: paneId } - ); + CommandManager.execute(Commands.FILE_CLOSE, { file: fileObj, paneId: paneId }); } } } - /** * "REOPEN CLOSED FILE" * This just calls the reopen closed file command. everthing else is handled there @@ -209,7 +190,6 @@ define(function (require, exports, module) { CommandManager.execute(Commands.FILE_REOPEN_CLOSED); } - /** * "RENAME FILE" * This function handles the renaming of the file that was right-clicked @@ -225,11 +205,10 @@ define(function (require, exports, module) { const fileObj = FileSystem.getFileForPath(filePath); // Execute the rename command with the file object - CommandManager.execute(Commands.FILE_RENAME, {file: fileObj}); + CommandManager.execute(Commands.FILE_RENAME, { file: fileObj }); } } - /** * "DELETE FILE" * This function handles the deletion of the file that was right-clicked @@ -242,10 +221,28 @@ define(function (require, exports, module) { const fileObj = FileSystem.getFileForPath(filePath); // Execute the delete command with the file object - CommandManager.execute(Commands.FILE_DELETE, {file: fileObj}); + CommandManager.execute(Commands.FILE_DELETE, { file: fileObj }); } } + /** + * "SHOW IN FILE TREE" + * This function handles showing the file in the file tree + * + * @param {String} filePath - path of the file to show in file tree + */ + function handleShowInFileTree(filePath) { + if (filePath) { + // First ensure the sidebar is visible so users can see the file in the tree + CommandManager.execute(Commands.SHOW_SIDEBAR); + + // Get the file object using FileSystem + const fileObj = FileSystem.getFileForPath(filePath); + + // Execute the show in tree command with the file object + CommandManager.execute(Commands.NAVIGATE_SHOW_IN_FILE_TREE, { file: fileObj }); + } + } /** * This function is called when a tab is right-clicked @@ -318,6 +315,9 @@ define(function (require, exports, module) { case Strings.DELETE_TAB_FILE: handleFileDelete(filePath); break; + case Strings.SHOW_IN_FILE_TREE: + handleShowInFileTree(filePath); + break; case Strings.REOPEN_CLOSED_FILE: reopenClosedFile(); break; diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 66eee920ed..418eecb478 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -435,6 +435,7 @@ define({ "REOPEN_CLOSED_FILE": "Reopen Closed File", "RENAME_TAB_FILE": "Rename File", "DELETE_TAB_FILE": "Delete File", + "SHOW_IN_FILE_TREE": "Show in File Tree", // CodeInspection: errors/warnings "ERRORS_NO_FILE": "No File Open", From 577e3adc1b593063a7c126317183555048dbc9aa Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 15 May 2025 14:46:22 +0530 Subject: [PATCH 15/32] fix: scroll bar appearing in commit dropdown --- src/extensionsIntegrated/TabBar/more-options.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensionsIntegrated/TabBar/more-options.js b/src/extensionsIntegrated/TabBar/more-options.js index f69cd847d6..8523b30b28 100644 --- a/src/extensionsIntegrated/TabBar/more-options.js +++ b/src/extensionsIntegrated/TabBar/more-options.js @@ -272,7 +272,7 @@ define(function (require, exports, module) { dropdown.showDropdown(); - $(".tabbar-context-menu").css("max-height", "200px"); + $(".tabbar-context-menu").css("max-height", "300px"); // handle the option selection dropdown.on("select", function (e, item) { From 31b601d25ab361482aea0ecc9aff621dbb8bcd3c Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 17 May 2025 14:51:36 +0530 Subject: [PATCH 16/32] fix: drag-drop bugs that was preventing smooth scroll --- src/extensionsIntegrated/TabBar/drag-drop.js | 247 ++++++++++++++----- src/styles/Extn-TabBar.less | 22 +- 2 files changed, 204 insertions(+), 65 deletions(-) diff --git a/src/extensionsIntegrated/TabBar/drag-drop.js b/src/extensionsIntegrated/TabBar/drag-drop.js index 7ece013fe9..ef0d912653 100644 --- a/src/extensionsIntegrated/TabBar/drag-drop.js +++ b/src/extensionsIntegrated/TabBar/drag-drop.js @@ -18,7 +18,6 @@ * */ - /* This file houses the functionality for dragging and dropping tabs */ /* eslint-disable no-invalid-this */ define(function (require, exports, module) { @@ -40,7 +39,6 @@ define(function (require, exports, module) { let scrollInterval = null; let dragSourcePane = null; - /** * Initialize drag and drop functionality for tab bars * This is called from `main.js` @@ -59,14 +57,13 @@ define(function (require, exports, module) { // Create drag indicator element if it doesn't exist if (!dragIndicator) { dragIndicator = $('
'); - $('body').append(dragIndicator); + $("body").append(dragIndicator); } // add initialization for empty panes initEmptyPaneDropTargets(); } - /** * Setup drag and drop for a specific tab bar * Makes tabs draggable and adds all the necessary event listeners @@ -93,7 +90,6 @@ define(function (require, exports, module) { $tabs.on("dragend", handleDragEnd); } - /** * Setup container-level drag events * This enables dropping tabs in empty spaces and auto-scrolling @@ -103,6 +99,54 @@ define(function (require, exports, module) { */ function setupContainerDrag(containerSelector) { const $container = $(containerSelector); + let lastKnownMousePosition = { x: 0 }; + const boundaryTolerance = 50; // px tolerance outside the container that still allows dropping + + // create a larger drop zone around the container + // this is done to make sure that even if the tab is not exactly over the tab bar, we still allow drag-drop + const createOuterDropZone = () => { + if (draggedTab && !$("#tab-drag-extended-zone").length) { + // an invisible larger zone around the container that can still receive drops + const containerRect = $container[0].getBoundingClientRect(); + const $outerZone = $('
').css({ + position: "fixed", + top: containerRect.top - boundaryTolerance, + left: containerRect.left - boundaryTolerance, + width: containerRect.width + boundaryTolerance * 2, + height: containerRect.height + boundaryTolerance * 2, + zIndex: 9999, + pointerEvents: "all" + }); + + $("body").append($outerZone); + + $outerZone.on("dragover", function (e) { + e.preventDefault(); + e.stopPropagation(); + lastKnownMousePosition.x = e.originalEvent.clientX; + + autoScrollContainer($container[0], lastKnownMousePosition.x); + + updateDragIndicatorFromOuterZone($container, lastKnownMousePosition.x); + + return false; + }); + + $outerZone.on("drop", function (e) { + e.preventDefault(); + e.stopPropagation(); + + // to handle drop the same way as if it happened in the container + handleOuterZoneDrop($container, lastKnownMousePosition.x); + + return false; + }); + } + }; + + const removeOuterDropZone = () => { + $("#tab-drag-extended-zone").remove(); + }; // When dragging over the container but not directly over a tab element $container.on("dragover", function (e) { @@ -110,6 +154,8 @@ define(function (require, exports, module) { e.preventDefault(); } + lastKnownMousePosition.x = e.originalEvent.clientX; + // Clear any existing scroll interval if (scrollInterval) { clearInterval(scrollInterval); @@ -120,30 +166,35 @@ define(function (require, exports, module) { // Set up interval for continuous scrolling while dragging near the edge scrollInterval = setInterval(() => { - if (draggedTab) { // Only continue scrolling if still dragging - autoScrollContainer(this, e.originalEvent.clientX); + if (draggedTab) { + // Only continue scrolling if still dragging + autoScrollContainer(this, lastKnownMousePosition.x); } else { clearInterval(scrollInterval); scrollInterval = null; } }, 16); // this is almost about 60fps - // if the target is not a tab, update the drag indicator using the container bounds - if ($(e.target).closest('.tab').length === 0) { + if ($(e.target).closest(".tab").length === 0) { const containerRect = this.getBoundingClientRect(); const mouseX = e.originalEvent.clientX; // determine if dropping on left or right half of container - const onLeftSide = mouseX < (containerRect.left + containerRect.width / 2); + const onLeftSide = mouseX < containerRect.left + containerRect.width / 2; - const $tabs = $container.find('.tab'); + const $tabs = $container.find(".tab"); if ($tabs.length) { // choose the first tab for left drop, last tab for right drop const targetTab = onLeftSide ? $tabs.first()[0] : $tabs.last()[0]; updateDragIndicator(targetTab, onLeftSide); } } + + // Create the extended drop zone if we're actively dragging + if (draggedTab) { + createOuterDropZone(); + } }); // handle drop on the container (empty space) @@ -153,14 +204,15 @@ define(function (require, exports, module) { } // hide the drag indicator updateDragIndicator(null); + removeOuterDropZone(); // get container dimensions to determine drop position const containerRect = this.getBoundingClientRect(); const mouseX = e.originalEvent.clientX; // determine if dropping on left or right half of container - const onLeftSide = mouseX < (containerRect.left + containerRect.width / 2); + const onLeftSide = mouseX < containerRect.left + containerRect.width / 2; - const $tabs = $container.find('.tab'); + const $tabs = $container.find(".tab"); if ($tabs.length) { // If dropping on left half, target the first tab; otherwise, target the last tab const targetTab = onLeftSide ? $tabs.first()[0] : $tabs.last()[0]; @@ -184,8 +236,86 @@ define(function (require, exports, module) { } } }); - } + /** + * Updates the drag indicator when mouse is in the extended zone (outside actual tab bar) + * @param {jQuery} $container - The tab bar container + * @param {number} mouseX - Current mouse X position + */ + function updateDragIndicatorFromOuterZone($container, mouseX) { + const containerRect = $container[0].getBoundingClientRect(); + const $tabs = $container.find(".tab"); + + if ($tabs.length) { + // Determine if dropping on left half or right half + let onLeftSide = true; + let targetTab; + + // If beyond the right edge, use the last tab + if (mouseX > containerRect.right) { + targetTab = $tabs.last()[0]; + onLeftSide = false; + } + // If beyond the left edge, use the first tab + else if (mouseX < containerRect.left) { + targetTab = $tabs.first()[0]; + onLeftSide = true; + } + // If within bounds, find the closest tab + else { + onLeftSide = mouseX < containerRect.left + containerRect.width / 2; + targetTab = onLeftSide ? $tabs.first()[0] : $tabs.last()[0]; + } + + updateDragIndicator(targetTab, onLeftSide); + } + } + + /** + * Handles drops that occur in the extended drop zone + * @param {jQuery} $container - The tab bar container + * @param {number} mouseX - Current mouse X position + */ + function handleOuterZoneDrop($container, mouseX) { + const containerRect = $container[0].getBoundingClientRect(); + const $tabs = $container.find(".tab"); + + if ($tabs.length && draggedTab) { + // Determine drop position similar to updateDragIndicatorFromOuterZone + let onLeftSide = true; + let targetTab; + + if (mouseX > containerRect.right) { + targetTab = $tabs.last()[0]; + onLeftSide = false; + } else if (mouseX < containerRect.left) { + targetTab = $tabs.first()[0]; + onLeftSide = true; + } else { + onLeftSide = mouseX < containerRect.left + containerRect.width / 2; + targetTab = onLeftSide ? $tabs.first()[0] : $tabs.last()[0]; + } + + // Process the drop + const isSecondPane = $container.attr("id") === "phoenix-tab-bar-2"; + const targetPaneId = isSecondPane ? "second-pane" : "first-pane"; + const draggedPath = $(draggedTab).attr("data-path"); + const targetPath = $(targetTab).attr("data-path"); + + if (dragSourcePane !== targetPaneId) { + // cross-pane drop + moveTabBetweenPanes(dragSourcePane, targetPaneId, draggedPath, targetPath, onLeftSide); + } else { + // same pane drop + moveWorkingSetItem(targetPaneId, draggedPath, targetPath, onLeftSide); + } + } + + // Clean up + updateDragIndicator(null); + removeOuterDropZone(); + } + } /** * enhanced auto-scroll function for container when the mouse is near its left or right edge @@ -196,35 +326,38 @@ define(function (require, exports, module) { */ function autoScrollContainer(container, mouseX) { const rect = container.getBoundingClientRect(); - const edgeThreshold = 50; // teh threshold distance from the edge + const edgeThreshold = 100; // Increased threshold for edge detection (was 50) + const outerThreshold = 50; // Distance outside the container that still triggers scrolling - // Calculate distance from edges - const distanceFromLeft = mouseX - rect.left; - const distanceFromRight = rect.right - mouseX; + // Calculate distance from edges, allowing for mouse to be slightly outside bounds + const distanceFromLeft = mouseX - (rect.left - outerThreshold); + const distanceFromRight = rect.right + outerThreshold - mouseX; // Determine scroll speed based on distance from edge (closer = faster scroll) let scrollSpeed = 0; - if (distanceFromLeft < edgeThreshold) { - // exponential scroll speed: faster as you get closer to the edge - scrollSpeed = -Math.pow(1 - (distanceFromLeft / edgeThreshold), 2) * 15; - } else if (distanceFromRight < edgeThreshold) { - scrollSpeed = Math.pow(1 - (distanceFromRight / edgeThreshold), 2) * 15; + // Only activate scrolling when within the threshold (including the outer buffer) + if (distanceFromLeft < edgeThreshold + outerThreshold && mouseX < rect.right) { + // Non-linear scroll speed: faster as you get closer to the edge + scrollSpeed = -Math.pow(1 - distanceFromLeft / (edgeThreshold + outerThreshold), 2) * 25; + } else if (distanceFromRight < edgeThreshold + outerThreshold && mouseX > rect.left) { + scrollSpeed = Math.pow(1 - distanceFromRight / (edgeThreshold + outerThreshold), 2) * 25; } - // apply scrolling if needed + // Apply scrolling if needed if (scrollSpeed !== 0) { container.scrollLeft += scrollSpeed; // If we're already at the edge, don't keep trying to scroll - if ((scrollSpeed < 0 && container.scrollLeft <= 0) || - (scrollSpeed > 0 && container.scrollLeft >= container.scrollWidth - container.clientWidth)) { + if ( + (scrollSpeed < 0 && container.scrollLeft <= 0) || + (scrollSpeed > 0 && container.scrollLeft >= container.scrollWidth - container.clientWidth) + ) { return; } } } - /** * Handle the start of a drag operation * Stores the tab being dragged and adds visual styling @@ -237,14 +370,14 @@ define(function (require, exports, module) { // set data transfer (required for Firefox) // Firefox requires data to be set for the drag operation to work - e.originalEvent.dataTransfer.effectAllowed = 'move'; - e.originalEvent.dataTransfer.setData('text/html', this.innerHTML); + e.originalEvent.dataTransfer.effectAllowed = "move"; + e.originalEvent.dataTransfer.setData("text/html", this.innerHTML); // Store which pane this tab came from dragSourcePane = $(this).closest("#phoenix-tab-bar-2").length > 0 ? "second-pane" : "first-pane"; // Add dragging class for styling - $(this).addClass('dragging'); + $(this).addClass("dragging"); // Use a timeout to let the dragging class apply before taking measurements // This ensures visual updates are applied before we calculate positions @@ -253,7 +386,6 @@ define(function (require, exports, module) { }, 0); } - /** * Handle the dragover event to enable drop * Updates the visual indicator showing where the tab will be dropped @@ -264,13 +396,13 @@ define(function (require, exports, module) { if (e.preventDefault) { e.preventDefault(); // Allows us to drop } - e.originalEvent.dataTransfer.dropEffect = 'move'; + e.originalEvent.dataTransfer.dropEffect = "move"; // Update the drag indicator position // We need to determine if it should be on the left or right side of the target tab const targetRect = this.getBoundingClientRect(); const mouseX = e.originalEvent.clientX; - const midPoint = targetRect.left + (targetRect.width / 2); + const midPoint = targetRect.left + targetRect.width / 2; const onLeftSide = mouseX < midPoint; updateDragIndicator(this, onLeftSide); @@ -278,7 +410,6 @@ define(function (require, exports, module) { return false; } - /** * Handle entering a potential drop target * Applies styling to indicate the current drop target @@ -287,10 +418,9 @@ define(function (require, exports, module) { */ function handleDragEnter(e) { dragOverTab = this; - $(this).addClass('drag-target'); + $(this).addClass("drag-target"); } - /** * Handle leaving a potential drop target * Removes styling when no longer hovering over a drop target @@ -302,14 +432,13 @@ define(function (require, exports, module) { // Only remove the class if we're truly leaving this tab // This prevents flickering when moving over child elements if (!$(this).is(relatedTarget) && !$(this).has(relatedTarget).length) { - $(this).removeClass('drag-target'); + $(this).removeClass("drag-target"); if (dragOverTab === this) { dragOverTab = null; } } } - /** * Handle dropping a tab onto a target * Moves the file in the working set to the new position @@ -333,7 +462,7 @@ define(function (require, exports, module) { // Determine if we're dropping to the left or right of the target const targetRect = this.getBoundingClientRect(); const mouseX = e.originalEvent.clientX; - const midPoint = targetRect.left + (targetRect.width / 2); + const midPoint = targetRect.left + targetRect.width / 2; const onLeftSide = mouseX < midPoint; // Check if dragging between different panes @@ -348,7 +477,6 @@ define(function (require, exports, module) { return false; } - /** * Handle the end of a drag operation * Cleans up classes and resets state variables @@ -356,7 +484,7 @@ define(function (require, exports, module) { * @param {Event} e - The event object */ function handleDragEnd(e) { - $(".tab").removeClass('dragging drag-target'); + $(".tab").removeClass("dragging drag-target"); updateDragIndicator(null); draggedTab = null; dragOverTab = null; @@ -367,12 +495,15 @@ define(function (require, exports, module) { clearInterval(scrollInterval); scrollInterval = null; } - } + // Remove the extended drop zone if it exists + $("#tab-drag-extended-zone").remove(); + } /** * Update the drag indicator position and visibility * The indicator shows where the tab will be dropped + * Ensures the indicator stays within the bounds of the tab bar * * @param {HTMLElement} targetTab - The tab being dragged over, or null to hide * @param {Boolean} onLeftSide - Whether the indicator should be on the left or right side @@ -382,20 +513,30 @@ define(function (require, exports, module) { dragIndicator.hide(); return; } + // Get the target tab's position and size const targetRect = targetTab.getBoundingClientRect(); + + // Find the containing tab bar to ensure the indicator stays within bounds + const $tabBar = $(targetTab).closest("#phoenix-tab-bar, #phoenix-tab-bar-2"); + const tabBarRect = $tabBar[0] ? $tabBar[0].getBoundingClientRect() : null; + if (onLeftSide) { // Position indicator at the left edge of the target tab + // Ensure it doesn't go beyond the tab bar's left edge + const leftPos = tabBarRect ? Math.max(targetRect.left, tabBarRect.left) : targetRect.left; dragIndicator.css({ top: targetRect.top, - left: targetRect.left, + left: leftPos, height: targetRect.height }); } else { // Position indicator at the right edge of the target tab + // Ensure it doesn't go beyond the tab bar's right edge + const rightPos = tabBarRect ? Math.min(targetRect.right, tabBarRect.right) : targetRect.right; dragIndicator.css({ top: targetRect.top, - left: targetRect.right, + left: rightPos, height: targetRect.height }); } @@ -478,10 +619,7 @@ define(function (require, exports, module) { // Only continue if we found the dragged file if (draggedIndex !== -1 && draggedFile) { // Remove the file from source pane - CommandManager.execute( - Commands.FILE_CLOSE, - { file: draggedFile, paneId: sourcePaneId } - ); + CommandManager.execute(Commands.FILE_CLOSE, { file: draggedFile, paneId: sourcePaneId }); // Calculate where to add it in the target pane let targetInsertIndex; @@ -521,7 +659,6 @@ define(function (require, exports, module) { setupEmptyPaneDropTarget($secondPaneHolder, "second-pane"); } - /** * sets up the whole pane as a drop target when it has no tabs * @@ -546,7 +683,7 @@ define(function (require, exports, module) { $(this).addClass("empty-pane-drop-target"); // set the drop effect - e.originalEvent.dataTransfer.dropEffect = 'move'; + e.originalEvent.dataTransfer.dropEffect = "move"; } }); @@ -571,8 +708,8 @@ define(function (require, exports, module) { const draggedPath = $(draggedTab).attr("data-path"); // Determine source pane - const sourcePaneId = $(draggedTab) - .closest("#phoenix-tab-bar-2").length > 0 ? "second-pane" : "first-pane"; + const sourcePaneId = + $(draggedTab).closest("#phoenix-tab-bar-2").length > 0 ? "second-pane" : "first-pane"; // we don't want to do anything if dropping in the same pane if (sourcePaneId !== paneId) { @@ -589,10 +726,7 @@ define(function (require, exports, module) { if (draggedFile) { // close in the source pane - CommandManager.execute( - Commands.FILE_CLOSE, - { file: draggedFile, paneId: sourcePaneId } - ); + CommandManager.execute(Commands.FILE_CLOSE, { file: draggedFile, paneId: sourcePaneId }); // and open in the target pane MainViewManager.addToWorkingSet(paneId, draggedFile); @@ -609,7 +743,6 @@ define(function (require, exports, module) { }); } - module.exports = { init }; diff --git a/src/styles/Extn-TabBar.less b/src/styles/Extn-TabBar.less index 5400a58ef0..b458305207 100644 --- a/src/styles/Extn-TabBar.less +++ b/src/styles/Extn-TabBar.less @@ -307,30 +307,30 @@ .tab-drag-indicator { position: fixed; width: 2px; - background-color: #0078D7; + background-color: rgba(0, 120, 215, 0.7); pointer-events: none; z-index: 10001; - box-shadow: 0 0 3px rgba(0, 120, 215, 0.5); + box-shadow: 0 0 3px rgba(0, 120, 215, 0.4); display: none; - animation: pulse 1.5s infinite; + animation: pulse 2s infinite; } .dark .tab-drag-indicator { - background-color: #75BEFF; - box-shadow: 0 0 3px rgba(117, 190, 255, 0.5); + background-color: rgba(117, 190, 255, 0.7); + box-shadow: 0 0 3px rgba(117, 190, 255, 0.4); } @keyframes pulse { 0% { - opacity: 0.7; + opacity: 0.5; } 50% { - opacity: 1; + opacity: 0.7; } 100% { - opacity: 0.7; + opacity: 0.5; } } @@ -414,3 +414,9 @@ .tab-name-container.placeholder-name { font-style: italic; } + +/* this is for invisible extended drag zone for tabs */ +#tab-drag-extended-zone { + background-color: transparent; + pointer-events: all; +} From cebaa9bc022f69e3aa587ff8d1b5baf89f4e6f30 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 17 May 2025 19:03:55 +0530 Subject: [PATCH 17/32] fix: show active tab at all cases by replacing the last tab from the preference. numberOfTabs --- src/extensionsIntegrated/TabBar/main.js | 173 +++++++++++++----------- 1 file changed, 95 insertions(+), 78 deletions(-) diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js index eaec425696..a59c4f7733 100644 --- a/src/extensionsIntegrated/TabBar/main.js +++ b/src/extensionsIntegrated/TabBar/main.js @@ -42,8 +42,6 @@ define(function (require, exports, module) { const TabBarHTML = require("text!./html/tabbar-pane.html"); const TabBarHTML2 = require("text!./html/tabbar-second-pane.html"); - - /** * This holds the tab bar element * For tab bar structure, refer to `./html/tabbar-pane.html` and `./html/tabbar-second-pane.html` @@ -54,7 +52,6 @@ define(function (require, exports, module) { let $tabBar = null; let $tabBar2 = null; - /** * This function is responsible to take all the files from the working set and gets the working sets ready * This is placed here instead of helper.js because it modifies the working sets @@ -68,7 +65,6 @@ define(function (require, exports, module) { // to make sure atleast one pane is open if (paneList && paneList.length > 0) { - // this gives the working set of the first pane const currFirstPaneWorkingSet = MainViewManager.getWorkingSet(paneList[0]); @@ -108,8 +104,6 @@ define(function (require, exports, module) { } } - - /** * Responsible for creating the tab element * Note: this creates a tab (for a single file) not the tab bar @@ -128,11 +122,11 @@ define(function (require, exports, module) { const activePathInPane = activeFileInPane ? activeFileInPane.fullPath : null; // Check if this file is active in its pane - const isActive = (entry.path === activePathInPane); + const isActive = entry.path === activePathInPane; // Current active pane (used to determine whether to add the blue underline) const currentActivePane = MainViewManager.getActivePaneId(); - const isPaneActive = (paneId === currentActivePane); + const isPaneActive = paneId === currentActivePane; const isDirty = Helper._isFileModified(FileSystem.getFileForPath(entry.path)); const isPlaceholder = entry.isPlaceholder === true; @@ -140,9 +134,9 @@ define(function (require, exports, module) { // create tab with all the appropriate classes const $tab = $( `
@@ -153,13 +147,13 @@ define(function (require, exports, module) { // Add the file icon const $icon = Helper._getFileIcon(entry); - $tab.find('.tab-icon').append($icon); + $tab.find(".tab-icon").append($icon); // Check if we have a directory part in the displayName - const $tabName = $tab.find('.tab-name'); + const $tabName = $tab.find(".tab-name"); if (entry.displayName && entry.displayName !== entry.name) { // Split the displayName into directory and filename parts - const parts = entry.displayName.split('/'); + const parts = entry.displayName.split("/"); const dirName = parts[0]; const fileName = parts[1]; @@ -174,39 +168,38 @@ define(function (require, exports, module) { if (isActive && !isPaneActive) { // if it's active but in a non-active pane, we add a special class // to style differently in CSS to indicate that it's active but not in the active pane - $tab.addClass('active-in-inactive-pane'); + $tab.addClass("active-in-inactive-pane"); } // if this is a placeholder tab in inactive pane, we need to use the brown styling // instead of the blue one for active tabs if (isPlaceholder && isActive && !isPaneActive) { - $tab.removeClass('active'); - $tab.addClass('active-in-inactive-pane'); + $tab.removeClass("active"); + $tab.addClass("active-in-inactive-pane"); } return $tab; } - /** * Creates the tab bar and adds it to the DOM */ function createTabBar() { - if (!Preference.tabBarEnabled || Preference.numberOfTabs === 0) { + if (!Preference.tabBarEnabled || Preference.tabBarNumberOfTabs === 0) { + cleanupTabBar(); return; } // clean up any existing tab bars first and start fresh cleanupTabBar(); - const $paneHeader = $('.pane-header'); + const $paneHeader = $(".pane-header"); if ($paneHeader.length === 1) { $tabBar = $(TabBarHTML); // since we need to add the tab bar before the editor which has .not-editor class $(".pane-header").after($tabBar); WorkspaceManager.recomputeLayout(true); updateTabs(); - } else if ($paneHeader.length === 2) { $tabBar = $(TabBarHTML); $tabBar2 = $(TabBarHTML2); @@ -220,7 +213,6 @@ define(function (require, exports, module) { } } - /** * This function updates the tabs in the tab bar * It is called when the working set changes. So instead of creating a new tab bar, we just update the existing one @@ -229,6 +221,12 @@ define(function (require, exports, module) { // Get all files from the working set. refer to `global.js` getAllFilesFromWorkingSet(); + // just to make sure that the number of tabs is not set to 0 + if (Preference.tabBarNumberOfTabs === 0) { + cleanupTabBar(); + return; + } + // Check for active files not in working set in any pane const activePane = MainViewManager.getActivePaneId(); const firstPaneFile = MainViewManager.getCurrentlyViewedFile("first-pane"); @@ -239,8 +237,7 @@ define(function (require, exports, module) { let secondPanePlaceholder = null; // Check if active file in first pane is not in the working set - if (firstPaneFile && - !Global.firstPaneWorkingSet.some(entry => entry.path === firstPaneFile.fullPath)) { + if (firstPaneFile && !Global.firstPaneWorkingSet.some((entry) => entry.path === firstPaneFile.fullPath)) { firstPanePlaceholder = { path: firstPaneFile.fullPath, name: firstPaneFile.name, @@ -250,8 +247,7 @@ define(function (require, exports, module) { } // Check if active file in second pane is not in the working set - if (secondPaneFile && - !Global.secondPaneWorkingSet.some(entry => entry.path === secondPaneFile.fullPath)) { + if (secondPaneFile && !Global.secondPaneWorkingSet.some((entry) => entry.path === secondPaneFile.fullPath)) { secondPanePlaceholder = { path: secondPaneFile.fullPath, name: secondPaneFile.name, @@ -263,9 +259,7 @@ define(function (require, exports, module) { // check for duplicate file names between placeholder tabs and working set entries if (firstPanePlaceholder) { // if any working set file has the same name as the placeholder - const hasDuplicate = Global.firstPaneWorkingSet.some(entry => - entry.name === firstPanePlaceholder.name - ); + const hasDuplicate = Global.firstPaneWorkingSet.some((entry) => entry.name === firstPanePlaceholder.name); if (hasDuplicate) { // extract directory name from path @@ -280,9 +274,7 @@ define(function (require, exports, module) { } if (secondPanePlaceholder) { - const hasDuplicate = Global.secondPaneWorkingSet.some(entry => - entry.name === secondPanePlaceholder.name - ); + const hasDuplicate = Global.secondPaneWorkingSet.some((entry) => entry.name === secondPanePlaceholder.name); if (hasDuplicate) { const path = secondPanePlaceholder.path; @@ -295,22 +287,25 @@ define(function (require, exports, module) { } // Create tab bar if there's a placeholder or a file in the working set - if ((Global.firstPaneWorkingSet.length > 0 || firstPanePlaceholder) && - (!$('#phoenix-tab-bar').length || $('#phoenix-tab-bar').is(':hidden'))) { + if ( + (Global.firstPaneWorkingSet.length > 0 || firstPanePlaceholder) && + (!$("#phoenix-tab-bar").length || $("#phoenix-tab-bar").is(":hidden")) + ) { createTabBar(); } - if ((Global.secondPaneWorkingSet.length > 0 || secondPanePlaceholder) && - (!$('#phoenix-tab-bar-2').length || $('#phoenix-tab-bar-2').is(':hidden'))) { + if ( + (Global.secondPaneWorkingSet.length > 0 || secondPanePlaceholder) && + (!$("#phoenix-tab-bar-2").length || $("#phoenix-tab-bar-2").is(":hidden")) + ) { createTabBar(); } - const $firstTabBar = $('#phoenix-tab-bar'); + const $firstTabBar = $("#phoenix-tab-bar"); // Update first pane's tabs if ($firstTabBar.length) { $firstTabBar.empty(); if (Global.firstPaneWorkingSet.length > 0 || firstPanePlaceholder) { - // get the count of tabs that we want to display in the tab bar (from preference settings) // from preference settings or working set whichever smaller let tabsCountP1 = Math.min(Global.firstPaneWorkingSet.length, Preference.tabBarNumberOfTabs); @@ -321,7 +316,28 @@ define(function (require, exports, module) { tabsCountP1 = Global.firstPaneWorkingSet.length; } - let displayedEntries = Global.firstPaneWorkingSet.slice(0, tabsCountP1); + let displayedEntries = []; + + // check if active file is in the working set but would be excluded by tab count + if (firstPaneFile && Preference.tabBarNumberOfTabs > 0) { + const activeFileIndex = Global.firstPaneWorkingSet.findIndex( + (entry) => entry.path === firstPaneFile.fullPath + ); + + if (activeFileIndex >= 0 && activeFileIndex >= Preference.tabBarNumberOfTabs) { + // active file is in working set but would be excluded by tab count + // Show active file and one less from the top N files + displayedEntries = [ + ...Global.firstPaneWorkingSet.slice(0, Preference.tabBarNumberOfTabs - 1), + Global.firstPaneWorkingSet[activeFileIndex] + ]; + } else { + // Active file is either not in working set or already included in top N files + displayedEntries = Global.firstPaneWorkingSet.slice(0, tabsCountP1); + } + } else { + displayedEntries = Global.firstPaneWorkingSet.slice(0, tabsCountP1); + } // Add working set tabs displayedEntries.forEach(function (entry) { @@ -335,18 +351,34 @@ define(function (require, exports, module) { } } - const $secondTabBar = $('#phoenix-tab-bar-2'); + const $secondTabBar = $("#phoenix-tab-bar-2"); // Update second pane's tabs if ($secondTabBar.length) { $secondTabBar.empty(); if (Global.secondPaneWorkingSet.length > 0 || secondPanePlaceholder) { - let tabsCountP2 = Math.min(Global.secondPaneWorkingSet.length, Preference.tabBarNumberOfTabs); if (Preference.tabBarNumberOfTabs < 0) { tabsCountP2 = Global.secondPaneWorkingSet.length; } - let displayedEntries2 = Global.secondPaneWorkingSet.slice(0, tabsCountP2); + let displayedEntries2 = []; + + if (secondPaneFile && Preference.tabBarNumberOfTabs > 0) { + const activeFileIndex = Global.secondPaneWorkingSet.findIndex( + (entry) => entry.path === secondPaneFile.fullPath + ); + + if (activeFileIndex >= 0 && activeFileIndex >= Preference.tabBarNumberOfTabs) { + displayedEntries2 = [ + ...Global.secondPaneWorkingSet.slice(0, Preference.tabBarNumberOfTabs - 1), + Global.secondPaneWorkingSet[activeFileIndex] + ]; + } else { + displayedEntries2 = Global.secondPaneWorkingSet.slice(0, tabsCountP2); + } + } else { + displayedEntries2 = Global.secondPaneWorkingSet.slice(0, tabsCountP2); + } // Add working set tabs displayedEntries2.forEach(function (entry) { @@ -361,12 +393,12 @@ define(function (require, exports, module) { } // if no files are present in a pane and no placeholder, we want to hide the tab bar for that pane - if (Global.firstPaneWorkingSet.length === 0 && !firstPanePlaceholder && ($('#phoenix-tab-bar'))) { - Helper._hideTabBar($('#phoenix-tab-bar'), $('#overflow-button')); + if (Global.firstPaneWorkingSet.length === 0 && !firstPanePlaceholder && $("#phoenix-tab-bar")) { + Helper._hideTabBar($("#phoenix-tab-bar"), $("#overflow-button")); } - if (Global.secondPaneWorkingSet.length === 0 && !secondPanePlaceholder && ($('#phoenix-tab-bar-2'))) { - Helper._hideTabBar($('#phoenix-tab-bar-2'), $('#overflow-button-2')); + if (Global.secondPaneWorkingSet.length === 0 && !secondPanePlaceholder && $("#phoenix-tab-bar-2")) { + Helper._hideTabBar($("#phoenix-tab-bar-2"), $("#overflow-button-2")); } // Now that tabs are updated, scroll to the active tab if necessary. @@ -394,10 +426,9 @@ define(function (require, exports, module) { } // handle drag and drop - DragDrop.init($('#phoenix-tab-bar'), $('#phoenix-tab-bar-2')); + DragDrop.init($("#phoenix-tab-bar"), $("#phoenix-tab-bar-2")); } - /** * Removes existing tab bar and cleans up */ @@ -415,16 +446,14 @@ define(function (require, exports, module) { WorkspaceManager.recomputeLayout(true); } - /** * handle click events on the tabs to open the file */ function handleTabClick() { - // delegate event handling for both tab bars $(document).on("click", ".phoenix-tab-bar .tab", function (event) { // check if the clicked element is the close button - if ($(event.target).hasClass('fa-times') || $(event.target).closest('.tab-close').length) { + if ($(event.target).hasClass("fa-times") || $(event.target).closest(".tab-close").length) { // Get the file path from the data-path attribute of the parent tab const filePath = $(this).attr("data-path"); @@ -436,10 +465,7 @@ define(function (require, exports, module) { // get the file object const fileObj = FileSystem.getFileForPath(filePath); // close the file - CommandManager.execute( - Commands.FILE_CLOSE, - { file: fileObj, paneId: paneId } - ); + CommandManager.execute(Commands.FILE_CLOSE, { file: fileObj, paneId: paneId }); // Prevent default behavior event.preventDefault(); @@ -450,7 +476,7 @@ define(function (require, exports, module) { // delegate event handling for both tab bars $(document).on("mousedown", ".phoenix-tab-bar .tab", function (event) { - if ($(event.target).hasClass('fa-times') || $(event.target).closest('.tab-close').length) { + if ($(event.target).hasClass("fa-times") || $(event.target).closest(".tab-close").length) { return; } // Get the file path from the data-path attribute @@ -461,11 +487,11 @@ define(function (require, exports, module) { const isSecondPane = $(this).closest("#phoenix-tab-bar-2").length > 0; const paneId = isSecondPane ? "second-pane" : "first-pane"; const currentActivePane = MainViewManager.getActivePaneId(); - const isPaneActive = (paneId === currentActivePane); + const isPaneActive = paneId === currentActivePane; const currentFile = MainViewManager.getCurrentlyViewedFile(currentActivePane); // Check if this is a placeholder tab - if ($(this).hasClass('placeholder')) { + if ($(this).hasClass("placeholder")) { // Add the file to the working set when placeholder tab is clicked const fileObj = FileSystem.getFileForPath(filePath); MainViewManager.addToWorkingSet(paneId, fileObj); @@ -497,7 +523,6 @@ define(function (require, exports, module) { }); } - // debounce is used to prevent rapid consecutive calls to updateTabs, // which was causing integration tests to fail in Firefox. Without it, // the event fires too frequently when switching editors, leading to unexpected behavior @@ -545,8 +570,7 @@ define(function (require, exports, module) { // Update UI if ($tabBar) { const $tab = $tabBar.find(`.tab[data-path="${filePath}"]`); - $tab.toggleClass('dirty', doc.isDirty); - + $tab.toggleClass("dirty", doc.isDirty); // Update the working set data // First pane @@ -558,11 +582,10 @@ define(function (require, exports, module) { } } - // Also update the $tab2 if it exists if ($tabBar2) { const $tab2 = $tabBar2.find(`.tab[data-path="${filePath}"]`); - $tab2.toggleClass('dirty', doc.isDirty); + $tab2.toggleClass("dirty", doc.isDirty); // Second pane for (let i = 0; i < Global.secondPaneWorkingSet.length; i++) { @@ -575,7 +598,6 @@ define(function (require, exports, module) { }); } - /** * This is called when the tab bar preference is changed either, * from the preferences file or the menu bar @@ -601,17 +623,13 @@ define(function (require, exports, module) { * for toggling the tab bar from the menu bar */ function _registerCommands() { - CommandManager.register( - Strings.CMD_TOGGLE_TABBAR, - Commands.TOGGLE_TABBAR, - () => { - const currentPref = PreferencesManager.get(Preference.PREFERENCES_TAB_BAR); - PreferencesManager.set(Preference.PREFERENCES_TAB_BAR, { - ...currentPref, - showTabBar: !currentPref.showTabBar - }); - } - ); + CommandManager.register(Strings.CMD_TOGGLE_TABBAR, Commands.TOGGLE_TABBAR, () => { + const currentPref = PreferencesManager.get(Preference.PREFERENCES_TAB_BAR); + PreferencesManager.set(Preference.PREFERENCES_TAB_BAR, { + ...currentPref, + showTabBar: !currentPref.showTabBar + }); + }); } /** @@ -620,7 +638,6 @@ define(function (require, exports, module) { * when its scrolled down, the tab bar will scroll to the right */ function setupTabBarScrolling() { - // common handler for both the tab bars function handleMouseWheel(e) { // get the tab bar element that is being scrolled @@ -640,7 +657,7 @@ define(function (require, exports, module) { } // attach the wheel event handler to both tab bars - $(document).on('wheel', '#phoenix-tab-bar, #phoenix-tab-bar-2', handleMouseWheel); + $(document).on("wheel", "#phoenix-tab-bar, #phoenix-tab-bar-2", handleMouseWheel); } AppInit.appReady(function () { @@ -662,7 +679,7 @@ define(function (require, exports, module) { handleTabClick(); Overflow.init(); - DragDrop.init($('#phoenix-tab-bar'), $('#phoenix-tab-bar-2')); + DragDrop.init($("#phoenix-tab-bar"), $("#phoenix-tab-bar-2")); // setup the mouse wheel scrolling setupTabBarScrolling(); From 29e404b85cd1e93c81d575d96893b63d92b33a80 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 18 May 2025 00:04:12 +0530 Subject: [PATCH 18/32] fix: show display path in tabs instead of tauri path --- src/extensionsIntegrated/TabBar/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js index a59c4f7733..20bd8a4149 100644 --- a/src/extensionsIntegrated/TabBar/main.js +++ b/src/extensionsIntegrated/TabBar/main.js @@ -138,7 +138,7 @@ define(function (require, exports, module) { ${isDirty ? "dirty" : ""} ${isPlaceholder ? "placeholder" : ""}" data-path="${entry.path}" - title="${entry.path}"> + title="${Phoenix.app.getDisplayPath(entry.path)}">
From 8426afe6e8b392fa21f01cdfe170b270f21c473d Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 18 May 2025 15:19:29 +0530 Subject: [PATCH 19/32] feat: show git change markers on tabs --- src/extensions/default/Git/main.js | 7 +- .../default/Git/src/TabBarIntegration.js | 88 +++++++++++++++++++ src/extensionsIntegrated/TabBar/main.js | 33 ++++++- src/styles/Extn-TabBar.less | 34 ++++++- 4 files changed, 155 insertions(+), 7 deletions(-) create mode 100644 src/extensions/default/Git/src/TabBarIntegration.js diff --git a/src/extensions/default/Git/main.js b/src/extensions/default/Git/main.js index e1921ca047..aaf38e8458 100644 --- a/src/extensions/default/Git/main.js +++ b/src/extensions/default/Git/main.js @@ -27,7 +27,8 @@ define(function (require, exports, module) { "src/History", "src/NoRepo", "src/ProjectTreeMarks", - "src/Remotes" + "src/Remotes", + "src/TabBarIntegration" ]; require(modules); @@ -48,10 +49,12 @@ define(function (require, exports, module) { // export API's for other extensions if (typeof window === "object") { + const TabBarIntegration = require("src/TabBarIntegration"); window.phoenixGitEvents = { EventEmitter: EventEmitter, Events: Events, - Git + Git, + TabBarIntegration }; } }); diff --git a/src/extensions/default/Git/src/TabBarIntegration.js b/src/extensions/default/Git/src/TabBarIntegration.js new file mode 100644 index 0000000000..e904922542 --- /dev/null +++ b/src/extensions/default/Git/src/TabBarIntegration.js @@ -0,0 +1,88 @@ +define(function (require) { + const EventEmitter = require("src/EventEmitter"); + const Events = require("src/Events"); + const Git = require("src/git/Git"); + const Preferences = require("src/Preferences"); + + // the cache of file statuses by path + let fileStatusCache = {}; + + /** + * this function is responsible to get the Git status for a file path + * + * @param {string} fullPath - the file path + * @returns {Array|null} - Array of status strings or null if no status + */ + function getFileStatus(fullPath) { + return fileStatusCache[fullPath] || null; + } + + /** + * whether the file is modified or not + * + * @param {string} fullPath - the file path + * @returns {boolean} - True if the file is modified otherwise false + */ + function isModified(fullPath) { + const status = getFileStatus(fullPath); + if (!status) { + return false; + } + return ( + status.some( + (statusType) => + statusType === Git.FILE_STATUS.MODIFIED || + statusType === Git.FILE_STATUS.RENAMED || + statusType === Git.FILE_STATUS.COPIED + ) && !status.includes(Git.FILE_STATUS.STAGED) + ); + } + + /** + * whether the file is untracked or not + * + * @param {string} fullPath - the file path + * @returns {boolean} - True if the file is untracked otherwise false + */ + function isUntracked(fullPath) { + const status = getFileStatus(fullPath); + if (!status) { + return false; + } + + return status.includes(Git.FILE_STATUS.UNTRACKED); + } + + + // Update file status cache when Git status results are received + EventEmitter.on(Events.GIT_STATUS_RESULTS, function (files) { + // reset the cache + fileStatusCache = {}; + + const gitRoot = Preferences.get("currentGitRoot"); + if (!gitRoot) { + return; + } + + // we need to update cache with new status results + files.forEach(function (entry) { + const fullPath = gitRoot + entry.file; + fileStatusCache[fullPath] = entry.status; + }); + + // notify that file statuses have been updated + EventEmitter.emit("GIT_FILE_STATUS_CHANGED", fileStatusCache); + }); + + // clear cache when Git is disabled + EventEmitter.on(Events.GIT_DISABLED, function () { + fileStatusCache = {}; + EventEmitter.emit("GIT_FILE_STATUS_CHANGED", fileStatusCache); + }); + + return { + getFileStatus: getFileStatus, + isModified: isModified, + isUntracked: isUntracked + }; +}); diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js index 20bd8a4149..1eac0140fb 100644 --- a/src/extensionsIntegrated/TabBar/main.js +++ b/src/extensionsIntegrated/TabBar/main.js @@ -131,16 +131,39 @@ define(function (require, exports, module) { const isDirty = Helper._isFileModified(FileSystem.getFileForPath(entry.path)); const isPlaceholder = entry.isPlaceholder === true; + let gitStatus = ""; // this will be shown in the tooltip when a tab is hovered + let gitStatusClass = ""; // for styling + let gitStatusLetter = ""; // shown in the tab, either U or M + + if (window.phoenixGitEvents && window.phoenixGitEvents.TabBarIntegration) { + const TabBarIntegration = window.phoenixGitEvents.TabBarIntegration; + + // find the Git status + // if untracked we add the git-new class and U char + // if modified we add the git-modified class and M char + if (TabBarIntegration.isUntracked(entry.path)) { + gitStatus = "Untracked"; + gitStatusClass = "git-new"; + gitStatusLetter = "U"; + } else if (TabBarIntegration.isModified(entry.path)) { + gitStatus = "Modified"; + gitStatusClass = "git-modified"; + gitStatusLetter = "M"; + } + } + // create tab with all the appropriate classes const $tab = $( `
+ title="${Phoenix.app.getDisplayPath(entry.path)}${gitStatus ? " (" + gitStatus + ")" : ""}">
+ ${gitStatusLetter ? `
${gitStatusLetter}
` : ""}
` ); @@ -541,6 +564,12 @@ define(function (require, exports, module) { // For editor changes, update only the tabs. MainViewManager.on(MainViewManager.EVENT_CURRENT_FILE_CHANGE, debounceUpdateTabs); + // to listen for the Git status changes + // make sure that the git extension is available + if (window.phoenixGitEvents && window.phoenixGitEvents.EventEmitter) { + window.phoenixGitEvents.EventEmitter.on("GIT_FILE_STATUS_CHANGED", debounceUpdateTabs); + } + // For working set changes, update only the tabs. const events = [ "workingSetAdd", diff --git a/src/styles/Extn-TabBar.less b/src/styles/Extn-TabBar.less index b458305207..1d0f850cfc 100644 --- a/src/styles/Extn-TabBar.less +++ b/src/styles/Extn-TabBar.less @@ -137,6 +137,8 @@ font-size: 0.7rem; opacity: 0.7; font-weight: normal; + position: relative; + top: 0.1rem; } .tab.active { @@ -195,10 +197,10 @@ .tab::before { content: "•"; color: transparent; - font-size: 1.6rem; + font-size: 1.5rem; position: absolute; left: 0.4rem; - top: 0.25rem; + top: 0.33rem; } .tab.dirty::before { @@ -215,7 +217,7 @@ .tab-close { font-size: 0.75rem; - padding: 0.08rem 0.4rem; + padding: 0.1rem 0.4rem; margin-left: 0.25rem; color: #666; transition: all 0.2s ease; @@ -420,3 +422,29 @@ background-color: transparent; pointer-events: all; } + +/* ------ for the git status markers -------------- */ +.tab-git-status { + font-size: 0.9rem; + font-weight: bold; + display: flex; + align-items: center; + justify-content: center; + margin-left: 0.33rem; +} + +.git-modified .tab-git-status { + color: #E3B551; +} + +.dark .git-modified .tab-git-status { + color: #E3B551; +} + +.git-new .tab-git-status { + color: #91CC41; +} + +.dark .git-new .tab-git-status { + color: #91CC41; +} From 88dc4c8f51d96cd774032719533570b827ea65b3 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 18 May 2025 20:50:06 +0530 Subject: [PATCH 20/32] refactor: git markers styles in tabs --- src/extensionsIntegrated/TabBar/main.js | 1 - src/styles/Extn-TabBar.less | 25 ++++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js index 1eac0140fb..228c42ddc1 100644 --- a/src/extensionsIntegrated/TabBar/main.js +++ b/src/extensionsIntegrated/TabBar/main.js @@ -163,7 +163,6 @@ define(function (require, exports, module) { title="${Phoenix.app.getDisplayPath(entry.path)}${gitStatus ? " (" + gitStatus + ")" : ""}">
- ${gitStatusLetter ? `
${gitStatusLetter}
` : ""}
` ); diff --git a/src/styles/Extn-TabBar.less b/src/styles/Extn-TabBar.less index 1d0f850cfc..e75cfc61ab 100644 --- a/src/styles/Extn-TabBar.less +++ b/src/styles/Extn-TabBar.less @@ -424,27 +424,26 @@ } /* ------ for the git status markers -------------- */ -.tab-git-status { - font-size: 0.9rem; - font-weight: bold; - display: flex; - align-items: center; - justify-content: center; - margin-left: 0.33rem; -} - -.git-modified .tab-git-status { +.tab.git-modified > .tab-icon:before { + content: "|"; color: #E3B551; + position: absolute; + margin-left: -4px; + margin-bottom: 5px; } -.dark .git-modified .tab-git-status { +.dark .tab.git-modified > .tab-icon:before { color: #E3B551; } -.git-new .tab-git-status { +.tab.git-new > .tab-icon:before { + content: "|"; color: #91CC41; + position: absolute; + margin-left: -4px; + margin-bottom: 5px; } -.dark .git-new .tab-git-status { +.dark .tab.git-new > .tab-icon:before { color: #91CC41; } From af979da90e9ad1a5ef36e6a52917b9ee17e842d5 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 18 May 2025 21:13:36 +0530 Subject: [PATCH 21/32] fix: git markers disappearing from tabs when files are staged --- .../default/Git/src/TabBarIntegration.js | 18 ++++++++++-------- src/extensionsIntegrated/TabBar/main.js | 3 --- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/extensions/default/Git/src/TabBarIntegration.js b/src/extensions/default/Git/src/TabBarIntegration.js index e904922542..24453f3166 100644 --- a/src/extensions/default/Git/src/TabBarIntegration.js +++ b/src/extensions/default/Git/src/TabBarIntegration.js @@ -28,13 +28,11 @@ define(function (require) { if (!status) { return false; } - return ( - status.some( - (statusType) => - statusType === Git.FILE_STATUS.MODIFIED || - statusType === Git.FILE_STATUS.RENAMED || - statusType === Git.FILE_STATUS.COPIED - ) && !status.includes(Git.FILE_STATUS.STAGED) + return status.some( + (statusType) => + statusType === Git.FILE_STATUS.MODIFIED || + statusType === Git.FILE_STATUS.RENAMED || + statusType === Git.FILE_STATUS.COPIED ); } @@ -50,7 +48,11 @@ define(function (require) { return false; } - return status.includes(Git.FILE_STATUS.UNTRACKED); + // return true if it's untracked or if it's newly added (which means it was untracked before staging) + return ( + status.includes(Git.FILE_STATUS.UNTRACKED) || + (status.includes(Git.FILE_STATUS.ADDED) && status.includes(Git.FILE_STATUS.STAGED)) + ); } diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js index 228c42ddc1..9c43888f3f 100644 --- a/src/extensionsIntegrated/TabBar/main.js +++ b/src/extensionsIntegrated/TabBar/main.js @@ -133,7 +133,6 @@ define(function (require, exports, module) { let gitStatus = ""; // this will be shown in the tooltip when a tab is hovered let gitStatusClass = ""; // for styling - let gitStatusLetter = ""; // shown in the tab, either U or M if (window.phoenixGitEvents && window.phoenixGitEvents.TabBarIntegration) { const TabBarIntegration = window.phoenixGitEvents.TabBarIntegration; @@ -144,11 +143,9 @@ define(function (require, exports, module) { if (TabBarIntegration.isUntracked(entry.path)) { gitStatus = "Untracked"; gitStatusClass = "git-new"; - gitStatusLetter = "U"; } else if (TabBarIntegration.isModified(entry.path)) { gitStatus = "Modified"; gitStatusClass = "git-modified"; - gitStatusLetter = "M"; } } From 289dadaed9892a7d0e7f35e3a128fb11c0c0c284 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 18 May 2025 21:37:15 +0530 Subject: [PATCH 22/32] fix: git change markers color not properly visible in light theme --- src/styles/Extn-TabBar.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/Extn-TabBar.less b/src/styles/Extn-TabBar.less index e75cfc61ab..6f17f686d4 100644 --- a/src/styles/Extn-TabBar.less +++ b/src/styles/Extn-TabBar.less @@ -426,7 +426,7 @@ /* ------ for the git status markers -------------- */ .tab.git-modified > .tab-icon:before { content: "|"; - color: #E3B551; + color: #f1ae1c; position: absolute; margin-left: -4px; margin-bottom: 5px; @@ -438,7 +438,7 @@ .tab.git-new > .tab-icon:before { content: "|"; - color: #91CC41; + color: #69a01f; position: absolute; margin-left: -4px; margin-bottom: 5px; From b166b7172a8df2e378f1f3e6b5d18d89b553edeb Mon Sep 17 00:00:00 2001 From: abose Date: Wed, 21 May 2025 11:22:36 +0530 Subject: [PATCH 23/32] refactor: file tab strings for delete, rename, show in file tree --- src/extensionsIntegrated/TabBar/more-options.js | 12 ++++++------ src/nls/root/strings.js | 3 --- src/styles/brackets_core_ui_variables.less | 5 ++++- src/styles/brackets_patterns_override.less | 12 ++++++++++++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/extensionsIntegrated/TabBar/more-options.js b/src/extensionsIntegrated/TabBar/more-options.js index 8523b30b28..a1b5a37d80 100644 --- a/src/extensionsIntegrated/TabBar/more-options.js +++ b/src/extensionsIntegrated/TabBar/more-options.js @@ -40,9 +40,9 @@ define(function (require, exports, module) { Strings.CLOSE_ALL_TABS, Strings.CLOSE_UNMODIFIED_TABS, "---", - Strings.RENAME_TAB_FILE, - Strings.DELETE_TAB_FILE, - Strings.SHOW_IN_FILE_TREE, + Strings.CMD_FILE_RENAME, + Strings.CMD_FILE_DELETE, + Strings.CMD_SHOW_IN_TREE, "---", Strings.REOPEN_CLOSED_FILE ]; @@ -309,13 +309,13 @@ define(function (require, exports, module) { case Strings.CLOSE_UNMODIFIED_TABS: handleCloseUnmodifiedTabs(paneId); break; - case Strings.RENAME_TAB_FILE: + case Strings.CMD_FILE_RENAME: handleFileRename(filePath); break; - case Strings.DELETE_TAB_FILE: + case Strings.CMD_FILE_DELETE: handleFileDelete(filePath); break; - case Strings.SHOW_IN_FILE_TREE: + case Strings.CMD_SHOW_IN_TREE: handleShowInFileTree(filePath); break; case Strings.REOPEN_CLOSED_FILE: diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 418eecb478..2c572819d3 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -433,9 +433,6 @@ define({ "CLOSE_ALL_TABS": "Close All Tabs", "CLOSE_UNMODIFIED_TABS": "Close Unmodified Tabs", "REOPEN_CLOSED_FILE": "Reopen Closed File", - "RENAME_TAB_FILE": "Rename File", - "DELETE_TAB_FILE": "Delete File", - "SHOW_IN_FILE_TREE": "Show in File Tree", // CodeInspection: errors/warnings "ERRORS_NO_FILE": "No File Open", diff --git a/src/styles/brackets_core_ui_variables.less b/src/styles/brackets_core_ui_variables.less index 49dee4f002..71fc73aa40 100644 --- a/src/styles/brackets_core_ui_variables.less +++ b/src/styles/brackets_core_ui_variables.less @@ -205,6 +205,9 @@ @dark-bc-warning-text-low: #333333; @notification-text: #333333; +// success +@dark-bc-success-bg: #1e3a1e; + // Text @dark-bc-text: #ccc; @dark-bc-text-alt: #fff; @@ -275,4 +278,4 @@ // CSS Codehint icon @css-codehint-icon: #2ea56c; -@dark-css-codehint-icon: #146a41; \ No newline at end of file +@dark-css-codehint-icon: #146a41; diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 66aff91962..4e5db00b9f 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -2286,6 +2286,18 @@ dt, } } +.alert.alert-success { + text-shadow: none; + background-color: @successBackground; + border: none; + + .dark & { + background: @dark-bc-success-bg; + border-radius: 2px; + color: @dark-bc-text; + } +} + .alert h4 { // Specified for the h4 to prevent conflicts of changing @headingsColor color: @bc-warning-bg; From 6520fd7964a3b64fd33c1e8f2ca66d6ae772b205 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 16 May 2025 13:32:49 +0530 Subject: [PATCH 24/32] feat: replace phoenix code support button with user profile button --- src/extensionsIntegrated/Phoenix/main.js | 8 ++++---- src/nls/root/strings.js | 1 + src/styles/brackets.less | 4 ++++ src/styles/images/circle-user-solid.svg | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 src/styles/images/circle-user-solid.svg diff --git a/src/extensionsIntegrated/Phoenix/main.js b/src/extensionsIntegrated/Phoenix/main.js index 94f0015324..ff6ad241d6 100644 --- a/src/extensionsIntegrated/Phoenix/main.js +++ b/src/extensionsIntegrated/Phoenix/main.js @@ -38,17 +38,17 @@ define(function (require, exports, module) { let $icon; function _addToolbarIcon() { - const helpButtonID = "help-button"; + const helpButtonID = "user-profile-button"; $icon = $("") .attr({ id: helpButtonID, href: "#", - class: "help", - title: Strings.CMD_SUPPORT + class: "user", + title: Strings.CMD_USER_PROFILE }) .appendTo($("#main-toolbar .bottom-buttons")); $icon.on('click', ()=>{ - Phoenix.app.openURLInDefaultBrowser(brackets.config.support_url); + console.log("User profile button was clicked"); }); } function _showUnSupportedBrowserDialogue() { diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 2c572819d3..7f464c05de 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -626,6 +626,7 @@ define({ "CMD_AUTO_UPDATE": "Auto Update", "CMD_HOW_TO_USE_BRACKETS": "How to Use {APP_NAME}", "CMD_SUPPORT": "{APP_NAME} Support", + "CMD_USER_PROFILE": "User Profile", "CMD_DOCS": "Help, Getting Started", "CMD_SUGGEST": "Suggest a Feature", "CMD_REPORT_ISSUE": "Report Issue", diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 86b69b1203..376ddd673b 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -672,6 +672,10 @@ a, img { background-image: url("images/discuss-icon.svg"); } +.user { + background-image: url("images/circle-user-solid.svg"); +} + #editor-holder { position: relative; diff --git a/src/styles/images/circle-user-solid.svg b/src/styles/images/circle-user-solid.svg new file mode 100644 index 0000000000..836691525d --- /dev/null +++ b/src/styles/images/circle-user-solid.svg @@ -0,0 +1 @@ + From d775dc6cd6e21e9bfb56bb3bcf1bb047ab67cca6 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 16 May 2025 18:01:03 +0530 Subject: [PATCH 25/32] feat: user profile implementation --- .../Phoenix/html/login-dialog.html | 17 ++ .../Phoenix/html/profile-panel.html | 39 ++++ src/extensionsIntegrated/Phoenix/main.js | 5 +- .../Phoenix/profile-menu.js | 190 ++++++++++++++++++ src/styles/brackets.less | 1 + src/styles/user-profile.less | 29 +++ 6 files changed, 279 insertions(+), 2 deletions(-) create mode 100644 src/extensionsIntegrated/Phoenix/html/login-dialog.html create mode 100644 src/extensionsIntegrated/Phoenix/html/profile-panel.html create mode 100644 src/extensionsIntegrated/Phoenix/profile-menu.js create mode 100644 src/styles/user-profile.less diff --git a/src/extensionsIntegrated/Phoenix/html/login-dialog.html b/src/extensionsIntegrated/Phoenix/html/login-dialog.html new file mode 100644 index 0000000000..a06d7dfdce --- /dev/null +++ b/src/extensionsIntegrated/Phoenix/html/login-dialog.html @@ -0,0 +1,17 @@ +
+
+

Welcome to Phoenix Code

+
+
+ +
+ +
+
+
diff --git a/src/extensionsIntegrated/Phoenix/html/profile-panel.html b/src/extensionsIntegrated/Phoenix/html/profile-panel.html new file mode 100644 index 0000000000..9eb2cda00d --- /dev/null +++ b/src/extensionsIntegrated/Phoenix/html/profile-panel.html @@ -0,0 +1,39 @@ +
+
+
+
+ CA +
+
+
Charly A.
+
Paid Plan
+
+
+
+
+
+
+ AI quota used + 7,000 / 10,000 tokens +
+
+
+
+
+ + + + + + +
+
diff --git a/src/extensionsIntegrated/Phoenix/main.js b/src/extensionsIntegrated/Phoenix/main.js index ff6ad241d6..5bb8dcacbc 100644 --- a/src/extensionsIntegrated/Phoenix/main.js +++ b/src/extensionsIntegrated/Phoenix/main.js @@ -32,7 +32,8 @@ define(function (require, exports, module) { Strings = require("strings"), Dialogs = require("widgets/Dialogs"), NotificationUI = require("widgets/NotificationUI"), - DefaultDialogs = require("widgets/DefaultDialogs"); + DefaultDialogs = require("widgets/DefaultDialogs"), + ProfileMenu = require("./profile-menu"); const PERSIST_STORAGE_DIALOG_DELAY_SECS = 60000; let $icon; @@ -48,7 +49,7 @@ define(function (require, exports, module) { }) .appendTo($("#main-toolbar .bottom-buttons")); $icon.on('click', ()=>{ - console.log("User profile button was clicked"); + ProfileMenu.init(); }); } function _showUnSupportedBrowserDialogue() { diff --git a/src/extensionsIntegrated/Phoenix/profile-menu.js b/src/extensionsIntegrated/Phoenix/profile-menu.js new file mode 100644 index 0000000000..5b8a83d62b --- /dev/null +++ b/src/extensionsIntegrated/Phoenix/profile-menu.js @@ -0,0 +1,190 @@ +define(function (require, exports, module) { + const loginTemplate = require("text!./html/login-dialog.html"); + const profileTemplate = require("text!./html/profile-panel.html"); + + // for the popup DOM element + let $popup = null; + + // this is to track whether the popup is visible or not + let isPopupVisible = false; + + // if user is logged in we show the profile menu, otherwise we show the login menu + const isLoggedIn = false; + + function _handleSignInBtnClick() { + console.log("User clicked sign in button"); + } + + function _handleSignOutBtnClick() { + console.log("User clicked sign out"); + } + + function _handleContactSupportBtnClick() { + Phoenix.app.openURLInDefaultBrowser(brackets.config.support_url); + } + + function _handleAccountDetailsBtnClick() { + console.log("User clicked account details"); + } + + /** + * Close the popup if it's open + * this is called at various instances like when the user click on the profile icon even if the popup is open + * or when user clicks somewhere else on the document + */ + function closePopup() { + if ($popup) { + $popup.remove(); + $popup = null; + isPopupVisible = false; + + // remove global click handler + $(document).off("click.profilePopup"); + } + } + + /** + * handle clicks outside the popup to close it + */ + function handleDocumentClick(e) { + // If popup exists and click is outside the popup + if ($popup && $popup.length && !$popup[0].contains(e.target)) { + // If the click is not on the user-profile-button (which would toggle the popup) + if (e.target.id !== "user-profile-button" && !$(e.target).closest("#user-profile-button").length) { + closePopup(); + } + } + } + + /** + * this function is to position the popup near the profile button + */ + function positionPopup() { + const $profileButton = $("#user-profile-button"); + + if ($profileButton.length && $popup) { + const buttonPos = $profileButton.offset(); + const popupWidth = $popup.outerWidth(); + const windowWidth = $(window).width(); + + // pos above the profile button + let top = buttonPos.top - $popup.outerHeight() - 10; + + // If popup would go off the right edge of the window, align right edge of popup with right edge of button + let left = Math.min( + buttonPos.left - popupWidth + $profileButton.outerWidth(), + windowWidth - popupWidth - 10 + ); + + // never go off left edge + left = Math.max(10, left); + + $popup.css({ + top: top + "px", + left: left + "px" + }); + } + } + + /** + * Shows the sign-in popup when the user is not logged in + */ + function showLoginPopup() { + // If popup is already visible, just close it + if (isPopupVisible) { + closePopup(); + return; + } + + // create the popup element + closePopup(); // close any existing popup first + $popup = $(loginTemplate); + $("body").append($popup); + isPopupVisible = true; + + // Position the popup + positionPopup(); + + // event handlers for buttons + $popup.find("#phoenix-signin-btn").on("click", function () { + _handleSignInBtnClick(); + closePopup(); + }); + + $popup.find("#phoenix-support-btn").on("click", function () { + _handleContactSupportBtnClick(); + closePopup(); + }); + + // Set up global click handler to close popup when clicking outside + // Delay attaching to avoid immediate closing + setTimeout(function () { + $(document).on("click.profilePopup", handleDocumentClick); + }, 0); + } + + /** + * Shows the user profile popup when the user is logged in + */ + function showProfilePopup() { + // If popup is already visible, just close it + if (isPopupVisible) { + closePopup(); + return; + } + + closePopup(); + $popup = $(profileTemplate); + $("body").append($popup); + isPopupVisible = true; + positionPopup(); + + $popup.find("#phoenix-account-btn").on("click", function () { + _handleAccountDetailsBtnClick(); + closePopup(); + }); + + $popup.find("#phoenix-support-btn").on("click", function () { + _handleContactSupportBtnClick(); + closePopup(); + }); + + $popup.find("#phoenix-signout-btn").on("click", function () { + _handleSignOutBtnClick(); + closePopup(); + }); + + // Set up global click handler to close popup when clicking outside + // Delay attaching to avoid immediate closing + setTimeout(function () { + $(document).on("click.profilePopup", handleDocumentClick); + }, 0); + } + + /** + * Toggle the profile popup based on the user's login status + * this function is called inside the src/extensionsIntegrated/Phoenix/main.js when user clicks on the profile icon + */ + function init() { + // check if the popup is already visible or not. if visible close it + if (isPopupVisible) { + closePopup(); + return; + } + + if (isLoggedIn) { + showProfilePopup(); + } else { + showLoginPopup(); + } + + // handle window resize to reposition popup + $(window).on("resize.profilePopup", function () { + if (isPopupVisible) { + positionPopup(); + } + }); + } + + exports.init = init; +}); diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 376ddd673b..9f76a98065 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -44,6 +44,7 @@ @import "Extn-TabBar.less"; @import "Extn-DisplayShortcuts.less"; @import "Extn-CSSColorPreview.less"; +@import "user-profile.less"; /* Overall layout */ diff --git a/src/styles/user-profile.less b/src/styles/user-profile.less new file mode 100644 index 0000000000..b6ce9f2f46 --- /dev/null +++ b/src/styles/user-profile.less @@ -0,0 +1,29 @@ +.profile-popup { + background-color: #2c2c2c; + color: #ffffff; + border-radius: 6px; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); + width: 300px; + overflow: hidden; + position: absolute; + z-index: 9999; + + .popup-header { + padding: 15px; + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + } + + .popup-body { + padding: 15px; + } + + .popup-title { + margin: 0; + font-size: 18px; + font-weight: normal; + } +} + +.dark .profile-popup { + background-color: #1d1f21; +} From 691f168a46835c27e3987bfb21342bddf6fdbd12 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 16 May 2025 19:02:12 +0530 Subject: [PATCH 26/32] fix: remove hard-coded values for easier integration --- .../Phoenix/html/login-dialog.html | 6 +- .../Phoenix/html/profile-panel.html | 18 +++--- .../Phoenix/profile-menu.js | 57 ++++++++++++++++--- 3 files changed, 60 insertions(+), 21 deletions(-) diff --git a/src/extensionsIntegrated/Phoenix/html/login-dialog.html b/src/extensionsIntegrated/Phoenix/html/login-dialog.html index a06d7dfdce..3bbb928a6c 100644 --- a/src/extensionsIntegrated/Phoenix/html/login-dialog.html +++ b/src/extensionsIntegrated/Phoenix/html/login-dialog.html @@ -1,16 +1,16 @@
-

Welcome to Phoenix Code

+

{{welcomeTitle}}

diff --git a/src/extensionsIntegrated/Phoenix/html/profile-panel.html b/src/extensionsIntegrated/Phoenix/html/profile-panel.html index 9eb2cda00d..d4eaf8a093 100644 --- a/src/extensionsIntegrated/Phoenix/html/profile-panel.html +++ b/src/extensionsIntegrated/Phoenix/html/profile-panel.html @@ -2,38 +2,38 @@
- CA + {{initials}}
-
Charly A.
-
Paid Plan
+
{{userName}}
+
{{planName}}
- AI quota used - 7,000 / 10,000 tokens + {{quotaLabel}} + {{quotaUsed}} / {{quotaTotal}} {{quotaUnit}}
-
+
diff --git a/src/extensionsIntegrated/Phoenix/profile-menu.js b/src/extensionsIntegrated/Phoenix/profile-menu.js index 5b8a83d62b..3df2c9848a 100644 --- a/src/extensionsIntegrated/Phoenix/profile-menu.js +++ b/src/extensionsIntegrated/Phoenix/profile-menu.js @@ -1,4 +1,7 @@ define(function (require, exports, module) { + const Mustache = require("thirdparty/mustache/mustache"); + + // HTML templates const loginTemplate = require("text!./html/login-dialog.html"); const profileTemplate = require("text!./html/profile-panel.html"); @@ -9,7 +12,27 @@ define(function (require, exports, module) { let isPopupVisible = false; // if user is logged in we show the profile menu, otherwise we show the login menu - const isLoggedIn = false; + const isLoggedIn = true; + + const defaultLoginData = { + welcomeTitle: "Welcome to Phoenix Code", + signInBtnText: "Sign in to your account", + supportBtnText: "Contact support" + }; + + const defaultProfileData = { + initials: "CA", + userName: "Charly A.", + planName: "Paid Plan", + quotaLabel: "AI quota used", + quotaUsed: "7,000", + quotaTotal: "10,000", + quotaUnit: "tokens", + quotaPercent: 70, + accountBtnText: "Account details", + supportBtnText: "Contact support", + signOutBtnText: "Sign out" + }; function _handleSignInBtnClick() { console.log("User clicked sign in button"); @@ -88,21 +111,28 @@ define(function (require, exports, module) { /** * Shows the sign-in popup when the user is not logged in + * @param {Object} loginData - Data to populate the template (optional) */ - function showLoginPopup() { + function showLoginPopup(loginData) { // If popup is already visible, just close it if (isPopupVisible) { closePopup(); return; } + // Merge provided data with defaults + const templateData = $.extend({}, defaultLoginData, loginData || {}); + // create the popup element closePopup(); // close any existing popup first - $popup = $(loginTemplate); + + // Render template with data + const renderedTemplate = Mustache.render(loginTemplate, templateData); + $popup = $(renderedTemplate); + $("body").append($popup); isPopupVisible = true; - // Position the popup positionPopup(); // event handlers for buttons @@ -125,16 +155,24 @@ define(function (require, exports, module) { /** * Shows the user profile popup when the user is logged in + * @param {Object} profileData - Data to populate the template (optional) */ - function showProfilePopup() { + function showProfilePopup(profileData) { // If popup is already visible, just close it if (isPopupVisible) { closePopup(); return; } + // Merge provided data with defaults + const templateData = $.extend({}, defaultProfileData, profileData || {}); + closePopup(); - $popup = $(profileTemplate); + + // Render template with data + const renderedTemplate = Mustache.render(profileTemplate, templateData); + $popup = $(renderedTemplate); + $("body").append($popup); isPopupVisible = true; positionPopup(); @@ -164,8 +202,9 @@ define(function (require, exports, module) { /** * Toggle the profile popup based on the user's login status * this function is called inside the src/extensionsIntegrated/Phoenix/main.js when user clicks on the profile icon + * @param {Object} data - Data to populate the templates (optional) */ - function init() { + function init(data) { // check if the popup is already visible or not. if visible close it if (isPopupVisible) { closePopup(); @@ -173,9 +212,9 @@ define(function (require, exports, module) { } if (isLoggedIn) { - showProfilePopup(); + showProfilePopup(data); } else { - showLoginPopup(); + showLoginPopup(data); } // handle window resize to reposition popup From ca3c7f1338165e149fef625be65d2eb47ffa7ba4 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 16 May 2025 19:13:21 +0530 Subject: [PATCH 27/32] refactor: improve styles to align the UI with rest of Phoenix --- .../Phoenix/html/login-dialog.html | 10 +- .../Phoenix/html/profile-panel.html | 30 +-- .../Phoenix/profile-menu.js | 2 +- src/styles/user-profile.less | 239 +++++++++++++++++- 4 files changed, 249 insertions(+), 32 deletions(-) diff --git a/src/extensionsIntegrated/Phoenix/html/login-dialog.html b/src/extensionsIntegrated/Phoenix/html/login-dialog.html index 3bbb928a6c..dbe692d262 100644 --- a/src/extensionsIntegrated/Phoenix/html/login-dialog.html +++ b/src/extensionsIntegrated/Phoenix/html/login-dialog.html @@ -3,13 +3,13 @@

{{welcomeTitle}}

- -
-
diff --git a/src/extensionsIntegrated/Phoenix/html/profile-panel.html b/src/extensionsIntegrated/Phoenix/html/profile-panel.html index d4eaf8a093..52dc6fcb59 100644 --- a/src/extensionsIntegrated/Phoenix/html/profile-panel.html +++ b/src/extensionsIntegrated/Phoenix/html/profile-panel.html @@ -1,38 +1,38 @@
-
-
+
-
-
+
+
{{quotaLabel}} {{quotaUsed}} / {{quotaTotal}} {{quotaUnit}}
-
-
+
+
- - -
diff --git a/src/extensionsIntegrated/Phoenix/profile-menu.js b/src/extensionsIntegrated/Phoenix/profile-menu.js index 3df2c9848a..87414c3ee7 100644 --- a/src/extensionsIntegrated/Phoenix/profile-menu.js +++ b/src/extensionsIntegrated/Phoenix/profile-menu.js @@ -12,7 +12,7 @@ define(function (require, exports, module) { let isPopupVisible = false; // if user is logged in we show the profile menu, otherwise we show the login menu - const isLoggedIn = true; + const isLoggedIn = false; const defaultLoginData = { welcomeTitle: "Welcome to Phoenix Code", diff --git a/src/styles/user-profile.less b/src/styles/user-profile.less index b6ce9f2f46..da74633e48 100644 --- a/src/styles/user-profile.less +++ b/src/styles/user-profile.less @@ -1,29 +1,246 @@ +@import "brackets_variables.less"; + .profile-popup { - background-color: #2c2c2c; - color: #ffffff; - border-radius: 6px; - box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); + background-color: @bc-menu-bg; + color: @bc-menu-text; + border-radius: @bc-border-radius; + box-shadow: 0 3px 9px @bc-shadow; width: 300px; overflow: hidden; position: absolute; - z-index: 9999; + z-index: @z-index-brackets-context-menu-base; + animation: dropdown 90ms cubic-bezier(0, .97, .2, .99); + transform-origin: 0 0; .popup-header { - padding: 15px; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); + padding: 12px 15px; + border-bottom: 1px solid @bc-menu-separator; } .popup-body { - padding: 15px; + padding: 12px 15px; } .popup-title { margin: 0; - font-size: 18px; - font-weight: normal; + font-size: 16px; + font-weight: @font-weight-semibold; + color: @bc-menu-text; + } + + .user-profile-header { + display: flex; + align-items: center; + } + + .user-avatar { + width: 40px; + height: 40px; + border-radius: 50%; + background-color: @bc-primary-btn-bg; + color: @bc-text-alt; + display: flex; + align-items: center; + justify-content: center; + margin-right: 15px; + font-weight: @font-weight-semibold; + font-size: 16px; + } + + .user-info { + display: flex; + flex-direction: column; + } + + .user-name { + font-weight: @font-weight-semibold; + color: @bc-menu-text; + } + + .user-plan { + color: #3c3; + font-size: 16px; + } + + .quota-section { + margin-bottom: 20px; + } + + .quota-header { + display: flex; + justify-content: space-between; + margin-bottom: 5px; + font-size: 13px; + } + + .progress-bar { + width: 100%; + height: 8px; + background-color: @bc-input-bg; + border-radius: 4px; + overflow: hidden; + + .progress-fill { + height: 100%; + background-color: @bc-primary-btn-bg; + border-radius: 4px; + } + } + + .support-link { + margin-top: 20px; + text-align: center; + } + + .menu-button { + width: 100%; + text-align: left; + padding: 8px 12px; + + i { + margin-right: 8px; + width: 20px; + text-align: center; + } + + &.signout { + color: #f55; + } + } + + .btn { + margin: 5px 0; + transition: background-color 0.2s ease; + + &.btn-primary { + background-color: @bc-primary-btn-bg; + border: 1px solid @bc-primary-btn-border; + box-shadow: inset 0 1px 0 @bc-highlight; + color: @bc-text-alt; + width: 100%; + padding: 10px 0; + + i { + margin-right: 5px; + } + + &:hover { + background-color: lighten(@bc-primary-btn-bg, 10%); + } + + &:active { + background-color: @bc-primary-btn-bg-down; + box-shadow: inset 0 1px 0 @bc-shadow-small; + } + } + + &.btn-default { + background-color: @bc-btn-bg; + border: 1px solid @bc-btn-border; + box-shadow: inset 0 1px 0 @bc-highlight; + + &:hover { + background-color: lighten(@bc-btn-bg, 10%); + } + + &:active { + background-color: @bc-btn-bg-down; + box-shadow: inset 0 1px 0 @bc-shadow-small; + } + } + + &.btn-link { + background: none; + border: none; + box-shadow: none; + color: @bc-text-thin-quiet; + + i { + margin-right: 5px; + } + + &:hover { + color: @bc-text; + text-decoration: none; + } + } } } .dark .profile-popup { - background-color: #1d1f21; + background-color: @dark-bc-menu-bg; + color: @dark-bc-menu-text; + box-shadow: 0 3px 9px @dark-bc-shadow; + + .popup-header { + border-bottom: 1px solid @dark-bc-menu-separator; + } + + .popup-title { + color: @dark-bc-menu-text; + } + + .user-avatar { + background-color: @dark-bc-primary-btn-bg; + color: @dark-bc-text-alt; + } + + .user-name { + color: @dark-bc-menu-text; + } + + .progress-bar { + background-color: @dark-bc-input-bg; + + .progress-fill { + background-color: @dark-bc-primary-btn-bg; + } + } + + .btn { + &.btn-primary { + background-color: @dark-bc-primary-btn-bg; + border: 1px solid @dark-bc-primary-btn-border; + box-shadow: inset 0 1px 0 @dark-bc-highlight; + color: @dark-bc-text-alt; + + &:hover { + background-color: lighten(@dark-bc-primary-btn-bg, 10%); + } + + &:active { + background-color: @dark-bc-primary-btn-bg-down; + box-shadow: inset 0 1px 0 @dark-bc-shadow-small; + } + } + + &.btn-default { + background-color: @dark-bc-btn-bg; + border: 1px solid @dark-bc-btn-border; + box-shadow: inset 0 1px 0 @dark-bc-highlight; + color: @dark-bc-text; + + &:hover { + background-color: lighten(@dark-bc-btn-bg, 10%); + } + + &:active { + background-color: @dark-bc-btn-bg-down; + box-shadow: inset 0 1px 0 @dark-bc-shadow-small; + } + } + + &.btn-link { + color: @dark-bc-text-thin-quiet; + + &:hover { + color: @dark-bc-text; + } + } + } +} + +@keyframes dropdown { + 0% { opacity: 0.5; transform: translate3d(0, 0, 0) scale(0.5); } + 100% { opacity: 1; transform: translate3d(0, 0, 0) scale(1); } } From 5bf5e25b17bc53ea3ee93139bb77828c3811dc9d Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 16 May 2025 23:18:44 +0530 Subject: [PATCH 28/32] fix: changed styles file name to follow convention --- src/styles/{user-profile.less => Extn-UserProfile.less} | 0 src/styles/brackets.less | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/styles/{user-profile.less => Extn-UserProfile.less} (100%) diff --git a/src/styles/user-profile.less b/src/styles/Extn-UserProfile.less similarity index 100% rename from src/styles/user-profile.less rename to src/styles/Extn-UserProfile.less diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 9f76a98065..7688d87ec0 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -44,7 +44,7 @@ @import "Extn-TabBar.less"; @import "Extn-DisplayShortcuts.less"; @import "Extn-CSSColorPreview.less"; -@import "user-profile.less"; +@import "Extn-UserProfile.less"; /* Overall layout */ From aba1297d837cfd3f5c700608a1b4170b6395fda7 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 17 May 2025 00:38:34 +0530 Subject: [PATCH 29/32] fix: use popup manager api's and improve readability --- .../Phoenix/profile-menu.js | 60 ++++++++----------- src/styles/Extn-UserProfile.less | 4 +- src/styles/brackets.less | 4 -- 3 files changed, 28 insertions(+), 40 deletions(-) diff --git a/src/extensionsIntegrated/Phoenix/profile-menu.js b/src/extensionsIntegrated/Phoenix/profile-menu.js index 87414c3ee7..4b4e6e927b 100644 --- a/src/extensionsIntegrated/Phoenix/profile-menu.js +++ b/src/extensionsIntegrated/Phoenix/profile-menu.js @@ -1,5 +1,6 @@ define(function (require, exports, module) { const Mustache = require("thirdparty/mustache/mustache"); + const PopUpManager = require("widgets/PopUpManager"); // HTML templates const loginTemplate = require("text!./html/login-dialog.html"); @@ -57,25 +58,9 @@ define(function (require, exports, module) { */ function closePopup() { if ($popup) { - $popup.remove(); + PopUpManager.removePopUp($popup); $popup = null; isPopupVisible = false; - - // remove global click handler - $(document).off("click.profilePopup"); - } - } - - /** - * handle clicks outside the popup to close it - */ - function handleDocumentClick(e) { - // If popup exists and click is outside the popup - if ($popup && $popup.length && !$popup[0].contains(e.target)) { - // If the click is not on the user-profile-button (which would toggle the popup) - if (e.target.id !== "user-profile-button" && !$(e.target).closest("#user-profile-button").length) { - closePopup(); - } } } @@ -135,6 +120,12 @@ define(function (require, exports, module) { positionPopup(); + PopUpManager.addPopUp($popup, function() { + $popup.remove(); + $popup = null; + isPopupVisible = false; + }, true, { closeCurrentPopups: true }); + // event handlers for buttons $popup.find("#phoenix-signin-btn").on("click", function () { _handleSignInBtnClick(); @@ -146,11 +137,12 @@ define(function (require, exports, module) { closePopup(); }); - // Set up global click handler to close popup when clicking outside - // Delay attaching to avoid immediate closing - setTimeout(function () { - $(document).on("click.profilePopup", handleDocumentClick); - }, 0); + // handle window resize to reposition popup + $(window).on("resize.profilePopup", function () { + if (isPopupVisible) { + positionPopup(); + } + }); } /** @@ -177,6 +169,12 @@ define(function (require, exports, module) { isPopupVisible = true; positionPopup(); + PopUpManager.addPopUp($popup, function() { + $popup.remove(); + $popup = null; + isPopupVisible = false; + }, true, { closeCurrentPopups: true }); + $popup.find("#phoenix-account-btn").on("click", function () { _handleAccountDetailsBtnClick(); closePopup(); @@ -192,11 +190,12 @@ define(function (require, exports, module) { closePopup(); }); - // Set up global click handler to close popup when clicking outside - // Delay attaching to avoid immediate closing - setTimeout(function () { - $(document).on("click.profilePopup", handleDocumentClick); - }, 0); + // handle window resize to reposition popup + $(window).on("resize.profilePopup", function () { + if (isPopupVisible) { + positionPopup(); + } + }); } /** @@ -216,13 +215,6 @@ define(function (require, exports, module) { } else { showLoginPopup(data); } - - // handle window resize to reposition popup - $(window).on("resize.profilePopup", function () { - if (isPopupVisible) { - positionPopup(); - } - }); } exports.init = init; diff --git a/src/styles/Extn-UserProfile.less b/src/styles/Extn-UserProfile.less index da74633e48..5ab1ac49e9 100644 --- a/src/styles/Extn-UserProfile.less +++ b/src/styles/Extn-UserProfile.less @@ -9,7 +9,7 @@ overflow: hidden; position: absolute; z-index: @z-index-brackets-context-menu-base; - animation: dropdown 90ms cubic-bezier(0, .97, .2, .99); + animation: user-profile-dropdown-animation 90ms cubic-bezier(0, .97, .2, .99); transform-origin: 0 0; .popup-header { @@ -240,7 +240,7 @@ } } -@keyframes dropdown { +@keyframes user-profile-dropdown-animation { 0% { opacity: 0.5; transform: translate3d(0, 0, 0) scale(0.5); } 100% { opacity: 1; transform: translate3d(0, 0, 0) scale(1); } } diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 7688d87ec0..b7a211f244 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -669,10 +669,6 @@ a, img { background-image: url("images/share-fill.svg"); } -.help { - background-image: url("images/discuss-icon.svg"); -} - .user { background-image: url("images/circle-user-solid.svg"); } From 72a34b26ca57983c50a81c686c15554c003dbd94 Mon Sep 17 00:00:00 2001 From: abose Date: Wed, 21 May 2025 06:16:30 +0000 Subject: [PATCH 30/32] ci: update Translations --- src/nls/ar/lastTranslated.json | 1 + src/nls/ar/strings.js | 3 ++- src/nls/bg/lastTranslated.json | 1 + src/nls/bg/strings.js | 3 ++- src/nls/cs/lastTranslated.json | 1 + src/nls/cs/strings.js | 3 ++- src/nls/da/lastTranslated.json | 1 + src/nls/da/strings.js | 3 ++- src/nls/de/lastTranslated.json | 1 + src/nls/de/strings.js | 3 ++- src/nls/el/lastTranslated.json | 1 + src/nls/el/strings.js | 3 ++- src/nls/en-gb/lastTranslated.json | 1 + src/nls/en-gb/strings.js | 3 ++- src/nls/es/lastTranslated.json | 1 + src/nls/es/strings.js | 3 ++- src/nls/fa-ir/lastTranslated.json | 1 + src/nls/fa-ir/strings.js | 3 ++- src/nls/fi/lastTranslated.json | 1 + src/nls/fi/strings.js | 3 ++- src/nls/fr/lastTranslated.json | 1 + src/nls/fr/strings.js | 3 ++- src/nls/gl/lastTranslated.json | 1 + src/nls/gl/strings.js | 3 ++- src/nls/hi/lastTranslated.json | 1 + src/nls/hi/strings.js | 3 ++- src/nls/hr/lastTranslated.json | 1 + src/nls/hr/strings.js | 3 ++- src/nls/hu/lastTranslated.json | 1 + src/nls/hu/strings.js | 3 ++- src/nls/id/lastTranslated.json | 1 + src/nls/id/strings.js | 3 ++- src/nls/it/lastTranslated.json | 1 + src/nls/it/strings.js | 3 ++- src/nls/ja/lastTranslated.json | 1 + src/nls/ja/strings.js | 3 ++- src/nls/ko/lastTranslated.json | 1 + src/nls/ko/strings.js | 3 ++- src/nls/lv/lastTranslated.json | 1 + src/nls/lv/strings.js | 3 ++- src/nls/ml/lastTranslated.json | 1 + src/nls/ml/strings.js | 3 ++- src/nls/nb/lastTranslated.json | 1 + src/nls/nb/strings.js | 3 ++- src/nls/nl/lastTranslated.json | 1 + src/nls/nl/strings.js | 3 ++- src/nls/pl/lastTranslated.json | 1 + src/nls/pl/strings.js | 3 ++- src/nls/pt-br/lastTranslated.json | 1 + src/nls/pt-br/strings.js | 3 ++- src/nls/pt-pt/lastTranslated.json | 1 + src/nls/pt-pt/strings.js | 3 ++- src/nls/ro/lastTranslated.json | 1 + src/nls/ro/strings.js | 3 ++- src/nls/ru/lastTranslated.json | 1 + src/nls/ru/strings.js | 3 ++- src/nls/sk/lastTranslated.json | 1 + src/nls/sk/strings.js | 3 ++- src/nls/sr/lastTranslated.json | 1 + src/nls/sr/strings.js | 3 ++- src/nls/sv/lastTranslated.json | 1 + src/nls/sv/strings.js | 3 ++- src/nls/tr/lastTranslated.json | 1 + src/nls/tr/strings.js | 3 ++- src/nls/uk/lastTranslated.json | 1 + src/nls/uk/strings.js | 3 ++- src/nls/ur/lastTranslated.json | 1 + src/nls/ur/strings.js | 3 ++- src/nls/zh-cn/lastTranslated.json | 1 + src/nls/zh-cn/strings.js | 3 ++- src/nls/zh-tw/lastTranslated.json | 1 + src/nls/zh-tw/strings.js | 3 ++- 72 files changed, 108 insertions(+), 36 deletions(-) diff --git a/src/nls/ar/lastTranslated.json b/src/nls/ar/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/ar/lastTranslated.json +++ b/src/nls/ar/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/ar/strings.js b/src/nls/ar/strings.js index 1834998704..d5206cfb29 100644 --- a/src/nls/ar/strings.js +++ b/src/nls/ar/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "إخفاء الشريط الجانبي", "CMD_SHOW_SIDEBAR": "إظهار الشريط الجانبي", "CMD_TOGGLE_SIDEBAR": "تبديل الشريط الجانبي", + "CMD_TOGGLE_TABBAR": "شريط تبويب الملف", "CMD_TOGGLE_PANELS": "تبديل الألواح", "CMD_TOGGLE_PURE_CODE": "بدون تشتيت", "CMD_TOGGLE_FULLSCREEN": "ملء الشاشة", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "استكشف ميزات Git في Phoenix Code", "GIT_TOAST_MESSAGE": "انقر على رمز لوحة Git لإدارة مستودعك. يمكنك بسهولة تنفيذ الالتزام والدفع والسحب وعرض سجل مشروعك - كل ذلك في مكان واحد.
تعرّف على المزيد حول لوحة Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "صوت للميزات التي ترغب برؤيتها تالياً!", - "CMD_TOGGLE_TABBAR": "شريط تبويب الملف" + "CMD_USER_PROFILE": "ملف تعريف المستخدم" }); \ No newline at end of file diff --git a/src/nls/bg/lastTranslated.json b/src/nls/bg/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/bg/lastTranslated.json +++ b/src/nls/bg/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/bg/strings.js b/src/nls/bg/strings.js index 8a45d61d4f..ea30838cb2 100644 --- a/src/nls/bg/strings.js +++ b/src/nls/bg/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Скриване на страничната лента", "CMD_SHOW_SIDEBAR": "Показване на страничната лента", "CMD_TOGGLE_SIDEBAR": "Превключване на страничната лента", + "CMD_TOGGLE_TABBAR": "Лента с раздели на файловете", "CMD_TOGGLE_PANELS": "Превключване на панелите", "CMD_TOGGLE_PURE_CODE": "Без разсейвания", "CMD_TOGGLE_FULLSCREEN": "Цял екран", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Разгледайте Git функциите в Phoenix Code", "GIT_TOAST_MESSAGE": "Щракнете върху иконата на Git панела, за да управлявате хранилището си. Лесно създавайте commit, push, pull и преглеждайте историята на проекта си – всичко на едно място.
Научете повече за Git панела →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Гласувайте за функциите, които искате да видите следващи!", - "CMD_TOGGLE_TABBAR": "Лента с раздели на файловете" + "CMD_USER_PROFILE": "Потребителски профил" }); \ No newline at end of file diff --git a/src/nls/cs/lastTranslated.json b/src/nls/cs/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/cs/lastTranslated.json +++ b/src/nls/cs/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/cs/strings.js b/src/nls/cs/strings.js index 3fd1cfd064..fe538be750 100644 --- a/src/nls/cs/strings.js +++ b/src/nls/cs/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Skrýt boční menu", "CMD_SHOW_SIDEBAR": "Zobrazit boční menu", "CMD_TOGGLE_SIDEBAR": "Zobrazit/skrýt boční menu", + "CMD_TOGGLE_TABBAR": "Panel karet souborů", "CMD_TOGGLE_PANELS": "Zobrazit/skrýt panely", "CMD_TOGGLE_PURE_CODE": "Žádné rozptylování", "CMD_TOGGLE_FULLSCREEN": "Celá obrazovka", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Prozkoumejte funkce Gitu v Phoenix Code", "GIT_TOAST_MESSAGE": "Klikněte na ikonu panelu Git pro správu vašeho repozitáře. Snadno commitujte, pushujte, pullujte a prohlížejte si historii projektu – vše na jednom místě.
Zjistěte více o panelu Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Hlasujte pro funkce, které chcete vidět v další verzi!", - "CMD_TOGGLE_TABBAR": "Panel karet souborů" + "CMD_USER_PROFILE": "Uživatelský profil" }); \ No newline at end of file diff --git a/src/nls/da/lastTranslated.json b/src/nls/da/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/da/lastTranslated.json +++ b/src/nls/da/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/da/strings.js b/src/nls/da/strings.js index e068785cef..d21a9af04b 100644 --- a/src/nls/da/strings.js +++ b/src/nls/da/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Skjul sidepanel", "CMD_SHOW_SIDEBAR": "Vis sidepanel", "CMD_TOGGLE_SIDEBAR": "Skift sidepanel", + "CMD_TOGGLE_TABBAR": "Fillister", "CMD_TOGGLE_PANELS": "Skift paneler", "CMD_TOGGLE_PURE_CODE": "Ingen distraktioner", "CMD_TOGGLE_FULLSCREEN": "Fuld skærm", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Udforsk Git-funktioner i Phoenix Code", "GIT_TOAST_MESSAGE": "Klik på Git-panelikonet for at administrere dit repository. Commit, push, pull og se din projekthistorik nemt – alt sammen på ét sted.
Læs mere om Git-panelet →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Stem på de funktioner, du gerne vil se!", - "CMD_TOGGLE_TABBAR": "Fillister" + "CMD_USER_PROFILE": "Brugerprofil" }); \ No newline at end of file diff --git a/src/nls/de/lastTranslated.json b/src/nls/de/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/de/lastTranslated.json +++ b/src/nls/de/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 5605a7fced..e6d3fa19db 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Seitenleiste verbergen", "CMD_SHOW_SIDEBAR": "Seitenleiste zeigen", "CMD_TOGGLE_SIDEBAR": "Seitenleiste anzeigen/verbergen", + "CMD_TOGGLE_TABBAR": "Dateileisten-Registerkarte", "CMD_TOGGLE_PANELS": "Panels anzeigen/verbergen", "CMD_TOGGLE_PURE_CODE": "Ablenkungsfreier Modus", "CMD_TOGGLE_FULLSCREEN": "Vollbild", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Git-Funktionen in Phoenix Code entdecken", "GIT_TOAST_MESSAGE": "Klicken Sie auf das Git-Panel-Symbol, um Ihr Repository zu verwalten. Committen, Pushen, Pullen und die Anzeige Ihres Projektverlaufs – alles an einem Ort.
Mehr über das Git-Panel erfahren →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Stimmen Sie für die Funktionen ab, die Sie als Nächstes sehen möchten!", - "CMD_TOGGLE_TABBAR": "Dateileisten-Registerkarte" + "CMD_USER_PROFILE": "Benutzerprofil" }); \ No newline at end of file diff --git a/src/nls/el/lastTranslated.json b/src/nls/el/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/el/lastTranslated.json +++ b/src/nls/el/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/el/strings.js b/src/nls/el/strings.js index 740ca82fe7..5e0e4d9687 100644 --- a/src/nls/el/strings.js +++ b/src/nls/el/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Απόκρυψη Πλευρικής Εργαλειοθήκης", "CMD_SHOW_SIDEBAR": "Προβολή Πλευρικής Εργαλειοθήκης", "CMD_TOGGLE_SIDEBAR": "Εναλλαγή Πλευρικής Γραμμής", + "CMD_TOGGLE_TABBAR": "Γραμμή καρτελών αρχείων", "CMD_TOGGLE_PANELS": "Εναλλαγή Πλαισίων", "CMD_TOGGLE_PURE_CODE": "Χωρίς Περισπασμούς", "CMD_TOGGLE_FULLSCREEN": "Πλήρης Οθόνη", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Εξερευνήστε τις Λειτουργίες Git στο Phoenix Code", "GIT_TOAST_MESSAGE": "Κάντε κλικ στο εικονίδιο του πίνακα Git για να διαχειριστείτε το αποθετήριό σας. Κάντε εύκολα commit, push, pull και δείτε το ιστορικό του έργου σας—όλα σε ένα μέρος.
Μάθετε περισσότερα για τον πίνακα Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Ψηφίστε για τις λειτουργίες που θέλετε να δείτε στη συνέχεια!", - "CMD_TOGGLE_TABBAR": "Γραμμή καρτελών αρχείων" + "CMD_USER_PROFILE": "Προφίλ Χρήστη" }); \ No newline at end of file diff --git a/src/nls/en-gb/lastTranslated.json b/src/nls/en-gb/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/en-gb/lastTranslated.json +++ b/src/nls/en-gb/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/en-gb/strings.js b/src/nls/en-gb/strings.js index 7890db970f..4a1a7ceb60 100644 --- a/src/nls/en-gb/strings.js +++ b/src/nls/en-gb/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Hide Sidebar", "CMD_SHOW_SIDEBAR": "Show sidebar", "CMD_TOGGLE_SIDEBAR": "Toggle sidebar", + "CMD_TOGGLE_TABBAR": "File Tab Bar", "CMD_TOGGLE_PANELS": "Toggle panels", "CMD_TOGGLE_PURE_CODE": "No distractions", "CMD_TOGGLE_FULLSCREEN": "Fullscreen", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Explore Git Features in Phoenix Code", "GIT_TOAST_MESSAGE": "Click the Git panel icon to manage your repository. Easily commit, push, pull, and view your project history—all in one place.
Learn more about the Git panel →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you'd like to see next!", - "CMD_TOGGLE_TABBAR": "File Tab Bar" + "CMD_USER_PROFILE": "User Profile" }); \ No newline at end of file diff --git a/src/nls/es/lastTranslated.json b/src/nls/es/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/es/lastTranslated.json +++ b/src/nls/es/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/es/strings.js b/src/nls/es/strings.js index 287ac0cb38..e36bf9a12d 100644 --- a/src/nls/es/strings.js +++ b/src/nls/es/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Ocultar menú lateral", "CMD_SHOW_SIDEBAR": "Mostrar menú lateral", "CMD_TOGGLE_SIDEBAR": "Alternar barra lateral", + "CMD_TOGGLE_TABBAR": "Barra de pestañas de archivos", "CMD_TOGGLE_PANELS": "Alternar paneles", "CMD_TOGGLE_PURE_CODE": "Sin distracciones", "CMD_TOGGLE_FULLSCREEN": "Pantalla completa", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Explora las funciones de Git en Phoenix Code", "GIT_TOAST_MESSAGE": "Haga clic en el icono del panel de Git para administrar su repositorio. Confirme, envíe (push), extraiga (pull) y vea el historial de su proyecto fácilmente, todo en un solo lugar.
Obtenga más información sobre el panel de Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "¡Vota por las funciones que quieres ver próximamente!", - "CMD_TOGGLE_TABBAR": "Barra de pestañas de archivos" + "CMD_USER_PROFILE": "Perfil de usuario" }); \ No newline at end of file diff --git a/src/nls/fa-ir/lastTranslated.json b/src/nls/fa-ir/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/fa-ir/lastTranslated.json +++ b/src/nls/fa-ir/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index 4ff0b11a1f..a5078136fc 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "پنهان کردن نوار کناری", "CMD_SHOW_SIDEBAR": "نمایش نوار کناری", "CMD_TOGGLE_SIDEBAR": "تغییر وضعیت نوار کناری", + "CMD_TOGGLE_TABBAR": "نوار برگه‌های فایل", "CMD_TOGGLE_PANELS": "تغییر وضعیت پنل‌ها", "CMD_TOGGLE_PURE_CODE": "بدون حواس‌پرتی", "CMD_TOGGLE_FULLSCREEN": "تمام صفحه", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "کاوش ویژگی‌های گیت در Phoenix Code", "GIT_TOAST_MESSAGE": "برای مدیریت مخزن خود روی آیکون پنل گیت کلیک کنید. به راحتی کامیت، پوش، پول و مشاهده تاریخچه پروژه خود را - همه در یک مکان - انجام دهید.
درباره پنل گیت بیشتر بدانید →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "برای قابلیت‌هایی که می‌خواهید در آینده ببینید، رأی دهید!", - "CMD_TOGGLE_TABBAR": "نوار برگه‌های فایل" + "CMD_USER_PROFILE": "پروفایل کاربر" }); \ No newline at end of file diff --git a/src/nls/fi/lastTranslated.json b/src/nls/fi/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/fi/lastTranslated.json +++ b/src/nls/fi/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/fi/strings.js b/src/nls/fi/strings.js index ed03e22b6c..3e269d95ea 100644 --- a/src/nls/fi/strings.js +++ b/src/nls/fi/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Piilota sivupalkki", "CMD_SHOW_SIDEBAR": "Näytä sivupalkki", "CMD_TOGGLE_SIDEBAR": "Näytä tai piilota sivupalkki", + "CMD_TOGGLE_TABBAR": "Tiedostovälilehtirivi", "CMD_TOGGLE_PANELS": "Näytä tai piilota paneelit", "CMD_TOGGLE_PURE_CODE": "Ei häiriötekijöitä", "CMD_TOGGLE_FULLSCREEN": "Koko näyttö", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Tutustu Git-ominaisuuksiin Phoenix Codessa", "GIT_TOAST_MESSAGE": "Napsauta Git-paneelin kuvaketta hallitaksesi arkistoasi (repository). Tee commit, push ja pull helposti ja tarkastele projektihistoriaasi – kaikki yhdessä paikassa.
Lue lisää Git-paneelista →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Äänestä ominaisuuksia, jotka haluat nähdä seuraavaksi!", - "CMD_TOGGLE_TABBAR": "Tiedostovälilehtirivi" + "CMD_USER_PROFILE": "Käyttäjäprofiili" }); \ No newline at end of file diff --git a/src/nls/fr/lastTranslated.json b/src/nls/fr/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/fr/lastTranslated.json +++ b/src/nls/fr/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js index 1d83b1e8a4..da7dde2b59 100644 --- a/src/nls/fr/strings.js +++ b/src/nls/fr/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Masquer la barre latérale", "CMD_SHOW_SIDEBAR": "Afficher la barre latérale", "CMD_TOGGLE_SIDEBAR": "Afficher/Masquer la barre latérale", + "CMD_TOGGLE_TABBAR": "Barre d'onglets des fichiers", "CMD_TOGGLE_PANELS": "Afficher/Masquer les panneaux", "CMD_TOGGLE_PURE_CODE": "Pas de distraction", "CMD_TOGGLE_FULLSCREEN": "Plein écran", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Explorer les fonctionnalités Git dans Phoenix Code", "GIT_TOAST_MESSAGE": "Cliquez sur l'icône du panneau Git pour gérer votre dépôt. Validez, envoyez (push), récupérez (pull) et consultez l'historique de votre projet facilement, le tout au même endroit.
En savoir plus sur le panneau Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Votez pour les fonctionnalités que vous souhaitez voir apparaître !", - "CMD_TOGGLE_TABBAR": "Barre d'onglets des fichiers" + "CMD_USER_PROFILE": "Profil utilisateur" }); \ No newline at end of file diff --git a/src/nls/gl/lastTranslated.json b/src/nls/gl/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/gl/lastTranslated.json +++ b/src/nls/gl/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/gl/strings.js b/src/nls/gl/strings.js index 2fd5a034da..b1cc2c3c6e 100644 --- a/src/nls/gl/strings.js +++ b/src/nls/gl/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Ocultar menú lateral", "CMD_SHOW_SIDEBAR": "Amosar menú lateral", "CMD_TOGGLE_SIDEBAR": "Alternar barra lateral", + "CMD_TOGGLE_TABBAR": "Barra de pestanas de ficheiros", "CMD_TOGGLE_PANELS": "Alternar paneis", "CMD_TOGGLE_PURE_CODE": "Sen distraccións", "CMD_TOGGLE_FULLSCREEN": "Pantalla completa", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Explora as funcionalidades de Git en Phoenix Code", "GIT_TOAST_MESSAGE": "Fai clic na icona do panel de Git para xestionar o teu repositorio. Fai commits, envía (push), obtén (pull) e visualiza o historial do teu proxecto facilmente, todo nun mesmo lugar.
Aprende máis sobre o panel de Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vota polas funcionalidades que queres ver a continuación!", - "CMD_TOGGLE_TABBAR": "Barra de pestanas de ficheiros" + "CMD_USER_PROFILE": "Perfil de usuario" }); \ No newline at end of file diff --git a/src/nls/hi/lastTranslated.json b/src/nls/hi/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/hi/lastTranslated.json +++ b/src/nls/hi/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/hi/strings.js b/src/nls/hi/strings.js index 9804e8ceeb..0fa7f4c2b9 100644 --- a/src/nls/hi/strings.js +++ b/src/nls/hi/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "साइडबार छिपाएँ", "CMD_SHOW_SIDEBAR": "साइडबार दिखाएँ", "CMD_TOGGLE_SIDEBAR": "साइडबार टॉगल करें", + "CMD_TOGGLE_TABBAR": "फ़ाइल टैब बार", "CMD_TOGGLE_PANELS": "पैनल टॉगल करें", "CMD_TOGGLE_PURE_CODE": "कोई विकर्षण नहीं", "CMD_TOGGLE_FULLSCREEN": "फ़ुलस्क्रीन", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "फ़ीनिक्स कोड में Git सुविधाओं का अन्वेषण करें", "GIT_TOAST_MESSAGE": "अपने रिपॉजिटरी को प्रबंधित करने के लिए Git पैनल आइकन पर क्लिक करें। आसानी से कमिट करें, पुश करें, पुल करें और अपने प्रोजेक्ट का इतिहास देखें—सब एक ही स्थान पर।
Git पैनल के बारे में अधिक जानें →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "उन विशेषताओं के लिए वोट करें जिन्हें आप आगे देखना चाहते हैं!", - "CMD_TOGGLE_TABBAR": "फ़ाइल टैब बार" + "CMD_USER_PROFILE": "उपयोगकर्ता प्रोफ़ाइल" }); \ No newline at end of file diff --git a/src/nls/hr/lastTranslated.json b/src/nls/hr/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/hr/lastTranslated.json +++ b/src/nls/hr/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/hr/strings.js b/src/nls/hr/strings.js index ec012effc2..57043091ae 100644 --- a/src/nls/hr/strings.js +++ b/src/nls/hr/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Sakrij bočnu traku", "CMD_SHOW_SIDEBAR": "Prikaži bočnu traku", "CMD_TOGGLE_SIDEBAR": "Toggle bočnu traku", + "CMD_TOGGLE_TABBAR": "Traka kartica datoteka", "CMD_TOGGLE_PANELS": "Toggle panele", "CMD_TOGGLE_PURE_CODE": "Bez odvraćanja pažnje", "CMD_TOGGLE_FULLSCREEN": "Preko cijelog zaslona", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Istražite Git značajke u Phoenix Codeu", "GIT_TOAST_MESSAGE": "Kliknite ikonu Git panela za upravljanje svojim repozitorijem. Jednostavno potvrdite (commit), pošaljite (push), preuzmite (pull) i pregledajte povijest svog projekta - sve na jednom mjestu.
Saznajte više o Git panelu →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Glasajte za značajke koje želite vidjeti sljedeće!", - "CMD_TOGGLE_TABBAR": "Traka kartica datoteka" + "CMD_USER_PROFILE": "Korisnički profil" }); \ No newline at end of file diff --git a/src/nls/hu/lastTranslated.json b/src/nls/hu/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/hu/lastTranslated.json +++ b/src/nls/hu/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/hu/strings.js b/src/nls/hu/strings.js index 26cfbd0e7c..0238d0e66b 100644 --- a/src/nls/hu/strings.js +++ b/src/nls/hu/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Oldalsáv Elrejtése", "CMD_SHOW_SIDEBAR": "Oldalsáv Mutatása", "CMD_TOGGLE_SIDEBAR": "Oldalsáv ki/bekapcsolása", + "CMD_TOGGLE_TABBAR": "Fájlfül sáv", "CMD_TOGGLE_PANELS": "Panelek ki/bekapcsolása", "CMD_TOGGLE_PURE_CODE": "Figyelemelterelések nélkül", "CMD_TOGGLE_FULLSCREEN": "Teljes képernyő", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Fedezd fel a Git funkciókat a Phoenix Code-ban", "GIT_TOAST_MESSAGE": "Kattintson a Git panel ikonra a verziókövető rendszer kezeléséhez. Könnyedén végezhet commit, push és pull műveleteket, valamint megtekintheti a projekt előzményeit – mindezt egy helyen.
Tudj meg többet a Git panelről →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Szavazzon azokra a funkciókra, amelyeket a jövőben látni szeretne!", - "CMD_TOGGLE_TABBAR": "Fájlfül sáv" + "CMD_USER_PROFILE": "Felhasználói profil" }); \ No newline at end of file diff --git a/src/nls/id/lastTranslated.json b/src/nls/id/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/id/lastTranslated.json +++ b/src/nls/id/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/id/strings.js b/src/nls/id/strings.js index 54661bedf7..f8e87b754e 100644 --- a/src/nls/id/strings.js +++ b/src/nls/id/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Sembunyikan Sidebar", "CMD_SHOW_SIDEBAR": "Tampilkan Sidebar", "CMD_TOGGLE_SIDEBAR": "Buka/Tutup Bilah Samping", + "CMD_TOGGLE_TABBAR": "Bilah Tab Berkas", "CMD_TOGGLE_PANELS": "Buka/Tutup Panel", "CMD_TOGGLE_PURE_CODE": "Tanpa Distraksi", "CMD_TOGGLE_FULLSCREEN": "Layar Penuh", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Jelajahi Fitur Git di Phoenix Code", "GIT_TOAST_MESSAGE": "Klik ikon panel Git untuk mengelola repositori Anda. Lakukan commit, push, pull, dan lihat riwayat proyek Anda dengan mudah—semua di satu tempat.
Pelajari lebih lanjut tentang panel Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Pilih fitur yang ingin Anda lihat selanjutnya!", - "CMD_TOGGLE_TABBAR": "Bilah Tab Berkas" + "CMD_USER_PROFILE": "Profil Pengguna" }); \ No newline at end of file diff --git a/src/nls/it/lastTranslated.json b/src/nls/it/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/it/lastTranslated.json +++ b/src/nls/it/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/it/strings.js b/src/nls/it/strings.js index 8fa249858e..e805bdbb1a 100644 --- a/src/nls/it/strings.js +++ b/src/nls/it/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Nascondi barra laterale", "CMD_SHOW_SIDEBAR": "Mostra barra laterale", "CMD_TOGGLE_SIDEBAR": "Apri/Chiudi la barra laterale", + "CMD_TOGGLE_TABBAR": "Barra delle schede dei file", "CMD_TOGGLE_PANELS": "Apri/Chiudi i pannelli", "CMD_TOGGLE_PURE_CODE": "Nessuna distrazione", "CMD_TOGGLE_FULLSCREEN": "Schermo intero", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Esplora le funzionalità Git in Phoenix Code", "GIT_TOAST_MESSAGE": "Fai clic sull'icona del pannello Git per gestire il tuo repository. Esegui commit, push, pull e visualizza la cronologia del tuo progetto, tutto in un unico posto.
Scopri di più sul pannello Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vota per le funzionalità che desideri vedere in futuro!", - "CMD_TOGGLE_TABBAR": "Barra delle schede dei file" + "CMD_USER_PROFILE": "Profilo utente" }); \ No newline at end of file diff --git a/src/nls/ja/lastTranslated.json b/src/nls/ja/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/ja/lastTranslated.json +++ b/src/nls/ja/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/ja/strings.js b/src/nls/ja/strings.js index 6cce07b2f8..1c687bea63 100644 --- a/src/nls/ja/strings.js +++ b/src/nls/ja/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "サイドバーを隠す", "CMD_SHOW_SIDEBAR": "サイドバーを表示する", "CMD_TOGGLE_SIDEBAR": "サイドバーの切り替え", + "CMD_TOGGLE_TABBAR": "ファイルタブバー", "CMD_TOGGLE_PANELS": "パネルの表示切り替え", "CMD_TOGGLE_PURE_CODE": "簡易表示", "CMD_TOGGLE_FULLSCREEN": "全画面表示", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Phoenix CodeのGit機能を試す", "GIT_TOAST_MESSAGE": "Gitパネルアイコンをクリックしてリポジトリを管理します。コミット、プッシュ、プル、プロジェクト履歴の表示をすべて1か所で行えます。
Gitパネルの詳細はこちら →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "次に実装してほしい機能に投票してください！", - "CMD_TOGGLE_TABBAR": "ファイルタブバー" + "CMD_USER_PROFILE": "ユーザープロフィール" }); \ No newline at end of file diff --git a/src/nls/ko/lastTranslated.json b/src/nls/ko/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/ko/lastTranslated.json +++ b/src/nls/ko/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/ko/strings.js b/src/nls/ko/strings.js index 1e0d4b8223..b5c8ed7b6e 100644 --- a/src/nls/ko/strings.js +++ b/src/nls/ko/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "사이드 바 숨기기", "CMD_SHOW_SIDEBAR": "사이드 바 표시", "CMD_TOGGLE_SIDEBAR": "사이드바 표시 전환", + "CMD_TOGGLE_TABBAR": "파일 탭 표시줄", "CMD_TOGGLE_PANELS": "패널 표시 전환", "CMD_TOGGLE_PURE_CODE": "코드만 보기", "CMD_TOGGLE_FULLSCREEN": "전체 화면", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Phoenix Code의 Git 기능 살펴보기", "GIT_TOAST_MESSAGE": "Git 패널 아이콘을 클릭하여 저장소를 관리하세요. 커밋, 푸시, 풀, 프로젝트 기록 보기를 한 곳에서 간편하게 수행할 수 있습니다.
Git 패널에 대해 자세히 알아보기 →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "다음에 보고 싶은 기능에 투표하세요!", - "CMD_TOGGLE_TABBAR": "파일 탭 표시줄" + "CMD_USER_PROFILE": "사용자 프로필" }); \ No newline at end of file diff --git a/src/nls/lv/lastTranslated.json b/src/nls/lv/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/lv/lastTranslated.json +++ b/src/nls/lv/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/lv/strings.js b/src/nls/lv/strings.js index ef2afb43b0..c69a5ddb66 100644 --- a/src/nls/lv/strings.js +++ b/src/nls/lv/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Slēpt sānjoslu", "CMD_SHOW_SIDEBAR": "Rādīt sānjoslu", "CMD_TOGGLE_SIDEBAR": "Rādīt/slēpt sānjoslu", + "CMD_TOGGLE_TABBAR": "Failu cilņu josla", "CMD_TOGGLE_PANELS": "Rādīt/slēpt paneļus", "CMD_TOGGLE_PURE_CODE": "Rādīt/slēpt palīgjoslas", "CMD_TOGGLE_FULLSCREEN": "Pilnekrāna režīms", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Izpētiet Git funkcijas Phoenix Code", "GIT_TOAST_MESSAGE": "Noklikšķiniet uz Git paneļa ikonas, lai pārvaldītu savu repozitoriju. Ērti veiciet commit, push, pull un skatiet sava projekta vēsturi — viss vienā vietā.
Uzziniet vairāk par Git paneli →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Nobalsot par funkcijām, kuras vēlaties redzēt nākamreiz!", - "CMD_TOGGLE_TABBAR": "Failu cilņu josla" + "CMD_USER_PROFILE": "Lietotāja profils" }); \ No newline at end of file diff --git a/src/nls/ml/lastTranslated.json b/src/nls/ml/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/ml/lastTranslated.json +++ b/src/nls/ml/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/ml/strings.js b/src/nls/ml/strings.js index a58da630fa..ded5ead858 100644 --- a/src/nls/ml/strings.js +++ b/src/nls/ml/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "സൈഡ്‌ബാർ മറയ്ക്കുക", "CMD_SHOW_SIDEBAR": "സൈഡ്‌ബാർ കാണിക്കുക", "CMD_TOGGLE_SIDEBAR": "സൈഡ്‌ബാർ ടോഗിൾ ചെയ്യുക", + "CMD_TOGGLE_TABBAR": "ഫയൽ ടാബ് ബാർ", "CMD_TOGGLE_PANELS": "പാനലുകൾ ടോഗിൾ ചെയ്യുക", "CMD_TOGGLE_PURE_CODE": "ശ്രദ്ധാശൈഥില്യങ്ങൾ ഒഴിവാക്കുക", "CMD_TOGGLE_FULLSCREEN": "പൂർണ്ണ സ്‌ക്രീൻ", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "ഫീനിക്സ് കോഡിലെ ഗിറ്റ് സവിശേഷതകൾ പര്യവേക്ഷണം ചെയ്യുക", "GIT_TOAST_MESSAGE": "നിങ്ങളുടെ റെപ്പോസിറ്ററി കൈകാര്യം ചെയ്യാൻ ഗിറ്റ് പാനൽ ഐക്കണിൽ ക്ലിക്ക് ചെയ്യുക. എളുപ്പത്തിൽ കമ്മിറ്റ് ചെയ്യുക, പുഷ് ചെയ്യുക, പുൾ ചെയ്യുക, നിങ്ങളുടെ പ്രോജക്റ്റ് ചരിത്രം കാണുക—എല്ലാം ഒരിടത്ത്.
ഗിറ്റ് പാനലിനെക്കുറിച്ച് കൂടുതലറിയുക →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "നിങ്ങൾക്ക് അടുത്തതായി കാണാൻ ആഗ്രഹിക്കുന്ന സവിശേഷതകൾക്ക് വോട്ട് ചെയ്യുക!", - "CMD_TOGGLE_TABBAR": "ഫയൽ ടാബ് ബാർ" + "CMD_USER_PROFILE": "ഉപയോക്തൃ പ്രൊഫൈൽ" }); \ No newline at end of file diff --git a/src/nls/nb/lastTranslated.json b/src/nls/nb/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/nb/lastTranslated.json +++ b/src/nls/nb/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/nb/strings.js b/src/nls/nb/strings.js index 351783fe88..a96ec587fd 100644 --- a/src/nls/nb/strings.js +++ b/src/nls/nb/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Gjem sidestolpe", "CMD_SHOW_SIDEBAR": "Vis sidestolpe", "CMD_TOGGLE_SIDEBAR": "Bytt sidepanel", + "CMD_TOGGLE_TABBAR": "Filfanelinje", "CMD_TOGGLE_PANELS": "Bytt paneler", "CMD_TOGGLE_PURE_CODE": "Ingen distraksjoner", "CMD_TOGGLE_FULLSCREEN": "Fullskjerm", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Utforsk Git-funksjoner i Phoenix Code", "GIT_TOAST_MESSAGE": "Klikk på Git-panelikonet for å administrere repositoriet ditt. Utfør commit, push, pull og se prosjektloggen din – alt på ett sted.
Lær mer om Git-panelet →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Stem på funksjonene du ønsker å se neste!", - "CMD_TOGGLE_TABBAR": "Filfanelinje" + "CMD_USER_PROFILE": "Brukerprofil" }); \ No newline at end of file diff --git a/src/nls/nl/lastTranslated.json b/src/nls/nl/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/nl/lastTranslated.json +++ b/src/nls/nl/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/nl/strings.js b/src/nls/nl/strings.js index 24b4abeb93..16f30a0be2 100644 --- a/src/nls/nl/strings.js +++ b/src/nls/nl/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Verberg zijbalk", "CMD_SHOW_SIDEBAR": "Toon zijbalk", "CMD_TOGGLE_SIDEBAR": "Zijbalk wisselen", + "CMD_TOGGLE_TABBAR": "Tabbalk Bestand", "CMD_TOGGLE_PANELS": "Panelen wisselen", "CMD_TOGGLE_PURE_CODE": "Geen afleidingen", "CMD_TOGGLE_FULLSCREEN": "Volledig scherm", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Ontdek Git-functies in Phoenix Code", "GIT_TOAST_MESSAGE": "Klik op het Git-paneelpictogram om uw repository te beheren. Commit, push, pull en bekijk uw projectgeschiedenis eenvoudig - alles op één plek.
Meer informatie over het Git-paneel →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Stem op de functies die u graag wilt zien!", - "CMD_TOGGLE_TABBAR": "Tabbalk Bestand" + "CMD_USER_PROFILE": "Gebruikersprofiel" }); \ No newline at end of file diff --git a/src/nls/pl/lastTranslated.json b/src/nls/pl/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/pl/lastTranslated.json +++ b/src/nls/pl/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/pl/strings.js b/src/nls/pl/strings.js index b92a53351e..38cdb78ec3 100644 --- a/src/nls/pl/strings.js +++ b/src/nls/pl/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Ukryj pasek boczny", "CMD_SHOW_SIDEBAR": "Pokaż pasek boczny", "CMD_TOGGLE_SIDEBAR": "Przełącz pasek boczny", + "CMD_TOGGLE_TABBAR": "Pasek kart plików", "CMD_TOGGLE_PANELS": "Przełącz panele", "CMD_TOGGLE_PURE_CODE": "Tryb bez przeszkadzania", "CMD_TOGGLE_FULLSCREEN": "Pełny ekran", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Poznaj funkcje Gita w Phoenix Code", "GIT_TOAST_MESSAGE": "Kliknij ikonę panelu Git, aby zarządzać swoim repozytorium. Łatwo zatwierdzaj, przesyłaj, pobieraj i przeglądaj historię swojego projektu — wszystko w jednym miejscu.
Dowiedz się więcej o panelu Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Zagłosuj na funkcje, które chcesz zobaczyć w przyszłości!", - "CMD_TOGGLE_TABBAR": "Pasek kart plików" + "CMD_USER_PROFILE": "Profil użytkownika" }); \ No newline at end of file diff --git a/src/nls/pt-br/lastTranslated.json b/src/nls/pt-br/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/pt-br/lastTranslated.json +++ b/src/nls/pt-br/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/pt-br/strings.js b/src/nls/pt-br/strings.js index 5d58b6deb6..3a3312ae9b 100644 --- a/src/nls/pt-br/strings.js +++ b/src/nls/pt-br/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Esconder barra lateral", "CMD_SHOW_SIDEBAR": "Mostrar barra lateral", "CMD_TOGGLE_SIDEBAR": "Alternar Barra Lateral", + "CMD_TOGGLE_TABBAR": "Barra de Abas de Arquivos", "CMD_TOGGLE_PANELS": "Alternar Painéis", "CMD_TOGGLE_PURE_CODE": "Sem Distração", "CMD_TOGGLE_FULLSCREEN": "Tela Cheia", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Explore os Recursos do Git no Phoenix Code", "GIT_TOAST_MESSAGE": "Clique no ícone do painel Git para gerenciar seu repositório. Faça commits, pushes, pulls e visualize o histórico do seu projeto com facilidade — tudo em um só lugar.
Saiba mais sobre o painel Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote nos recursos que você quer ver em seguida!", - "CMD_TOGGLE_TABBAR": "Barra de Abas de Arquivos" + "CMD_USER_PROFILE": "Perfil do Usuário" }); \ No newline at end of file diff --git a/src/nls/pt-pt/lastTranslated.json b/src/nls/pt-pt/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/pt-pt/lastTranslated.json +++ b/src/nls/pt-pt/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/pt-pt/strings.js b/src/nls/pt-pt/strings.js index 60043529fe..73985be62e 100644 --- a/src/nls/pt-pt/strings.js +++ b/src/nls/pt-pt/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Esconder barra lateral", "CMD_SHOW_SIDEBAR": "Mostrar barra lateral", "CMD_TOGGLE_SIDEBAR": "Alternar Barra Lateral", + "CMD_TOGGLE_TABBAR": "Barra de Separadores de Ficheiros", "CMD_TOGGLE_PANELS": "Alternar Painéis", "CMD_TOGGLE_PURE_CODE": "Sem Distrações", "CMD_TOGGLE_FULLSCREEN": "Ecrã Inteiro", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Explore as funcionalidades do Git no Phoenix Code", "GIT_TOAST_MESSAGE": "Clique no ícone do painel Git para gerir o seu repositório. Efetue commits, pushes, pulls e veja o histórico do seu projeto com facilidade — tudo num só lugar.
Saiba mais sobre o painel Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote nas funcionalidades que quer ver a seguir!", - "CMD_TOGGLE_TABBAR": "Barra de Separadores de Ficheiros" + "CMD_USER_PROFILE": "Perfil do Utilizador" }); \ No newline at end of file diff --git a/src/nls/ro/lastTranslated.json b/src/nls/ro/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/ro/lastTranslated.json +++ b/src/nls/ro/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/ro/strings.js b/src/nls/ro/strings.js index cbd739d858..ec11f81b0c 100644 --- a/src/nls/ro/strings.js +++ b/src/nls/ro/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Ascunde bara laterală", "CMD_SHOW_SIDEBAR": "Arată bara laterală", "CMD_TOGGLE_SIDEBAR": "Comută bara laterală", + "CMD_TOGGLE_TABBAR": "Bară Tab-uri Fișiere", "CMD_TOGGLE_PANELS": "Comută panourile", "CMD_TOGGLE_PURE_CODE": "Fără distragere", "CMD_TOGGLE_FULLSCREEN": "Ecran complet", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Explorați funcțiile Git în Phoenix Code", "GIT_TOAST_MESSAGE": "Faceți clic pe pictograma panoului Git pentru a vă gestiona depozitul. Efectuați ușor commit, push, pull și vizualizați istoricul proiectului dvs. - totul într-un singur loc.
Aflați mai multe despre panoul Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Votează pentru funcționalitățile pe care dorești să le vezi în continuare!", - "CMD_TOGGLE_TABBAR": "Bară Tab-uri Fișiere" + "CMD_USER_PROFILE": "Profil utilizator" }); \ No newline at end of file diff --git a/src/nls/ru/lastTranslated.json b/src/nls/ru/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/ru/lastTranslated.json +++ b/src/nls/ru/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/ru/strings.js b/src/nls/ru/strings.js index 326c56f6eb..9212b29d5e 100644 --- a/src/nls/ru/strings.js +++ b/src/nls/ru/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Скрыть боковую панель", "CMD_SHOW_SIDEBAR": "Показать боковую панель", "CMD_TOGGLE_SIDEBAR": "Переключить боковую панель", + "CMD_TOGGLE_TABBAR": "Панель вкладок файлов", "CMD_TOGGLE_PANELS": "Переключить панели", "CMD_TOGGLE_PURE_CODE": "Без отвлечений", "CMD_TOGGLE_FULLSCREEN": "Полноэкранный режим", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Возможности Git в Phoenix Code", "GIT_TOAST_MESSAGE": "Нажмите на значок панели Git для управления вашим репозиторием. Легко выполняйте коммиты, отправляйте (push), получайте (pull) изменения и просматривайте историю вашего проекта — все в одном месте.
Узнать больше о панели Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Проголосуйте за функции, которые вы хотите увидеть в будущем!", - "CMD_TOGGLE_TABBAR": "Панель вкладок файлов" + "CMD_USER_PROFILE": "Профиль пользователя" }); \ No newline at end of file diff --git a/src/nls/sk/lastTranslated.json b/src/nls/sk/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/sk/lastTranslated.json +++ b/src/nls/sk/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/sk/strings.js b/src/nls/sk/strings.js index c48f017107..57d94c6fee 100644 --- a/src/nls/sk/strings.js +++ b/src/nls/sk/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Skryť bočný panel", "CMD_SHOW_SIDEBAR": "Zobraziť bočný panel", "CMD_TOGGLE_SIDEBAR": "Prepnúť bočný panel", + "CMD_TOGGLE_TABBAR": "Panel so záložkami súborov", "CMD_TOGGLE_PANELS": "Prepnúť panely", "CMD_TOGGLE_PURE_CODE": "Bez rušenia", "CMD_TOGGLE_FULLSCREEN": "Celá obrazovka", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Preskúmajte funkcie Gitu v Phoenix Code", "GIT_TOAST_MESSAGE": "Kliknite na ikonu panela Git pre správu vášho repozitára. Jednoducho commitujte, pushujte, pullujte a prezerajte si históriu vášho projektu – všetko na jednom mieste.
Zistite viac o paneli Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Hlasujte za funkcie, ktoré chcete vidieť v ďalšej verzii!", - "CMD_TOGGLE_TABBAR": "Panel so záložkami súborov" + "CMD_USER_PROFILE": "Profil používateľa" }); \ No newline at end of file diff --git a/src/nls/sr/lastTranslated.json b/src/nls/sr/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/sr/lastTranslated.json +++ b/src/nls/sr/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/sr/strings.js b/src/nls/sr/strings.js index 1b7edb0d82..49eb676c86 100644 --- a/src/nls/sr/strings.js +++ b/src/nls/sr/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Сакриј споредну траку", "CMD_SHOW_SIDEBAR": "Прикажи споредну траку", "CMD_TOGGLE_SIDEBAR": "Укључи/искључи бочну траку", + "CMD_TOGGLE_TABBAR": "Трака са картицама датотека", "CMD_TOGGLE_PANELS": "Укључи/искључи панеле", "CMD_TOGGLE_PURE_CODE": "Без ометања", "CMD_TOGGLE_FULLSCREEN": "Цео екран", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Истражите Гит функције у Phoenix Code-у", "GIT_TOAST_MESSAGE": "Кликните на икону Гит панела да бисте управљали својим спремиштем. Лако направите commit, push, pull и погледајте историју свог пројекта — све на једном месту.
Сазнајте више о Гит панелу →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Гласајте за функције које желите да видите у будућности!", - "CMD_TOGGLE_TABBAR": "Трака са картицама датотека" + "CMD_USER_PROFILE": "Кориснички профил" }); \ No newline at end of file diff --git a/src/nls/sv/lastTranslated.json b/src/nls/sv/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/sv/lastTranslated.json +++ b/src/nls/sv/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/sv/strings.js b/src/nls/sv/strings.js index 0d3259a400..9136d3621a 100644 --- a/src/nls/sv/strings.js +++ b/src/nls/sv/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Dölj sidomeny", "CMD_SHOW_SIDEBAR": "Visa sidomeny", "CMD_TOGGLE_SIDEBAR": "Växla på/av sidomeny", + "CMD_TOGGLE_TABBAR": "Flikfält för filer", "CMD_TOGGLE_PANELS": "Växla på/av paneler", "CMD_TOGGLE_PURE_CODE": "Inga distraktioner", "CMD_TOGGLE_FULLSCREEN": "Helskärm", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Utforska Git-funktioner i Phoenix Code", "GIT_TOAST_MESSAGE": "Klicka på Git-panelens ikon för att hantera din repository. Committa, pusha, pulla och se din projekthistorik enkelt – allt på ett ställe.
Läs mer om Git-panelen →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Rösta på funktionerna du vill se härnäst!", - "CMD_TOGGLE_TABBAR": "Flikfält för filer" + "CMD_USER_PROFILE": "Användarprofil" }); \ No newline at end of file diff --git a/src/nls/tr/lastTranslated.json b/src/nls/tr/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/tr/lastTranslated.json +++ b/src/nls/tr/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/tr/strings.js b/src/nls/tr/strings.js index 16940419ec..c95dcd317c 100644 --- a/src/nls/tr/strings.js +++ b/src/nls/tr/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Kenar Çubuğunu Gizle", "CMD_SHOW_SIDEBAR": "Kenar Çubuğunu Göster", "CMD_TOGGLE_SIDEBAR": "Kenar Çubuğunu Aç/Kapat", + "CMD_TOGGLE_TABBAR": "Dosya Sekme Çubuğu", "CMD_TOGGLE_PANELS": "Panelleri Aç/Kapat", "CMD_TOGGLE_PURE_CODE": "Dikkat Dağıtıcı Olmadan", "CMD_TOGGLE_FULLSCREEN": "Tam Ekran", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Phoenix Code'da Git Özelliklerini Keşfedin", "GIT_TOAST_MESSAGE": "Deponuzu yönetmek için Git paneli simgesine tıklayın. Proje geçmişinizi kolayca işleyin, gönderin, çekin ve görüntüleyin—hepsi tek bir yerde.
Git paneli hakkında daha fazla bilgi edinin →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Gelecekte görmek istediğiniz özellikler için oy verin!", - "CMD_TOGGLE_TABBAR": "Dosya Sekme Çubuğu" + "CMD_USER_PROFILE": "Kullanıcı Profili" }); \ No newline at end of file diff --git a/src/nls/uk/lastTranslated.json b/src/nls/uk/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/uk/lastTranslated.json +++ b/src/nls/uk/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/uk/strings.js b/src/nls/uk/strings.js index 1dbf078527..fb3b869480 100644 --- a/src/nls/uk/strings.js +++ b/src/nls/uk/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "Приховати бокову панель", "CMD_SHOW_SIDEBAR": "Показати бокову панель", "CMD_TOGGLE_SIDEBAR": "Перемкнути бічну панель", + "CMD_TOGGLE_TABBAR": "Панель вкладок файлів", "CMD_TOGGLE_PANELS": "Перемкнути панелі", "CMD_TOGGLE_PURE_CODE": "Без відволікань", "CMD_TOGGLE_FULLSCREEN": "Повноекранний режим", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "Ознайомтеся з функціями Git у Phoenix Code", "GIT_TOAST_MESSAGE": "Натисніть піктограму панелі Git, щоб керувати вашим репозиторієм. Легко виконуйте коміти, пуші, пули та переглядайте історію вашого проєкту — все в одному місці.
Дізнайтеся більше про панель Git →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Проголосуйте за функції, які ви хочете бачити наступними!", - "CMD_TOGGLE_TABBAR": "Панель вкладок файлів" + "CMD_USER_PROFILE": "Профіль користувача" }); \ No newline at end of file diff --git a/src/nls/ur/lastTranslated.json b/src/nls/ur/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/ur/lastTranslated.json +++ b/src/nls/ur/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/ur/strings.js b/src/nls/ur/strings.js index 41bbe1cfb7..eea4c46990 100644 --- a/src/nls/ur/strings.js +++ b/src/nls/ur/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "سائڈبار چھپائیں", "CMD_SHOW_SIDEBAR": "سائڈبار دکھائیں", "CMD_TOGGLE_SIDEBAR": "سائڈبار ٹوگل کریں", + "CMD_TOGGLE_TABBAR": "فائل ٹیب بار", "CMD_TOGGLE_PANELS": "پینلز ٹوگل کریں", "CMD_TOGGLE_PURE_CODE": "کوئی خلفشار نہیں", "CMD_TOGGLE_FULLSCREEN": "فل سکرین", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "فینکس کوڈ میں گٹ فیچرز دریافت کریں", "GIT_TOAST_MESSAGE": "اپنی ذخیرہ گاہ (repository) کو منظم کرنے کے لیے گٹ پینل آئیکن پر کلک کریں۔ آسانی سے کامٹ، پش، پل کریں، اور اپنے پروجیکٹ کی تاریخ دیکھیں—سب ایک ہی جگہ پر۔
گٹ پینل کے بارے میں مزید جانیں →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "اپنی پسندیدہ خصوصیات کے لیے ووٹ دیں!", - "CMD_TOGGLE_TABBAR": "فائل ٹیب بار" + "CMD_USER_PROFILE": "صارف کا پروفائل" }); \ No newline at end of file diff --git a/src/nls/zh-cn/lastTranslated.json b/src/nls/zh-cn/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/zh-cn/lastTranslated.json +++ b/src/nls/zh-cn/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 8e1553c6ba..6601a011ed 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "隐藏边栏", "CMD_SHOW_SIDEBAR": "显示边栏", "CMD_TOGGLE_SIDEBAR": "显示/隐藏边栏", + "CMD_TOGGLE_TABBAR": "文件标签栏", "CMD_TOGGLE_PANELS": "显示/隐藏面板", "CMD_TOGGLE_PURE_CODE": "无干扰模式", "CMD_TOGGLE_FULLSCREEN": "全屏", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "探索 Phoenix Code 中的 Git 功能", "GIT_TOAST_MESSAGE": "点击 Git 面板图标即可管理您的代码仓库。轻松提交、推送、拉取和查看项目历史记录，一切尽在一处。
了解更多关于 Git 面板的信息 →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "为您希望看到的下一个功能投票！", - "CMD_TOGGLE_TABBAR": "文件标签栏" + "CMD_USER_PROFILE": "用户资料" }); \ No newline at end of file diff --git a/src/nls/zh-tw/lastTranslated.json b/src/nls/zh-tw/lastTranslated.json index d035018fc1..2b41f1cafa 100644 --- a/src/nls/zh-tw/lastTranslated.json +++ b/src/nls/zh-tw/lastTranslated.json @@ -310,6 +310,7 @@ "CMD_UNDO": "Undo", "CMD_UNINDENT": "Unindent", "CMD_UNLOAD_CURRENT_EXTENSION": "Unload Project As Extension", + "CMD_USER_PROFILE": "User Profile", "CMD_VIEW_TOGGLE_INSPECTION": "Lint Files on Save", "CMD_VIEW_TOGGLE_PROBLEMS": "Problems", "CMD_WORKINGSET_SORT_BY_ADDED": "Sort by Added", diff --git a/src/nls/zh-tw/strings.js b/src/nls/zh-tw/strings.js index f4694110c8..3b8a77b793 100644 --- a/src/nls/zh-tw/strings.js +++ b/src/nls/zh-tw/strings.js @@ -448,6 +448,7 @@ define({ "CMD_HIDE_SIDEBAR": "隱藏側欄", "CMD_SHOW_SIDEBAR": "顯示側欄", "CMD_TOGGLE_SIDEBAR": "切換側邊欄", + "CMD_TOGGLE_TABBAR": "檔案標籤列", "CMD_TOGGLE_PANELS": "切換面板", "CMD_TOGGLE_PURE_CODE": "專注模式", "CMD_TOGGLE_FULLSCREEN": "全螢幕", @@ -1362,5 +1363,5 @@ define({ "GIT_TOAST_TITLE": "在 Phoenix Code 中探索 Git 功能", "GIT_TOAST_MESSAGE": "按一下 Git 面板圖示即可管理您的儲存庫。輕鬆提交、推送、提取和檢視您的專案歷史記錄，一切盡在掌握之中。
深入瞭解 Git 面板 →", "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "投票選出您希望看到的下個功能！", - "CMD_TOGGLE_TABBAR": "檔案標籤列" + "CMD_USER_PROFILE": "使用者設定檔" }); \ No newline at end of file From f2ad88c557e4f8bc49283315b78781fcdf3e32e6 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 22 May 2025 04:07:03 +0530 Subject: [PATCH 31/32] feat: toggle tab bar and working set from sidebar --- src/command/Commands.js | 6 ++++++ src/command/DefaultMenus.js | 5 ++++- src/nls/root/strings.js | 3 +++ src/project/SidebarView.js | 42 ++++++++++++++++++++++++++++++++++++- 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/src/command/Commands.js b/src/command/Commands.js index 2314c47e32..d94c550fd2 100644 --- a/src/command/Commands.js +++ b/src/command/Commands.js @@ -451,6 +451,12 @@ define(function (require, exports, module) { /** Toggles automatic working set sorting */ exports.CMD_WORKING_SORT_TOGGLE_AUTO = "cmd.sortWorkingSetToggleAuto"; // WorkingSetSort.js _handleToggleAutoSort() + /** Toggles working set visibility */ + exports.CMD_TOGGLE_SHOW_WORKING_SET = "cmd.toggleShowWorkingSet"; // SidebarView.js _handleToggleWorkingSet() + + /** Toggles file tabs visibility */ + exports.CMD_TOGGLE_SHOW_FILE_TABS = "cmd.toggleShowFileTabs"; // SidebarView.js _handleToggleFileTabs() + /** Opens keyboard navigation UI overlay */ exports.CMD_KEYBOARD_NAV_UI_OVERLAY = "cmd.keyboardNavUI"; // WorkingSetSort.js _handleToggleAutoSort() diff --git a/src/command/DefaultMenus.js b/src/command/DefaultMenus.js index b488abbe9b..9f94eb825c 100644 --- a/src/command/DefaultMenus.js +++ b/src/command/DefaultMenus.js @@ -345,6 +345,9 @@ define(function (require, exports, module) { splitview_menu.addMenuDivider(); splitview_menu.addMenuItem(Commands.CMD_WORKING_SORT_TOGGLE_AUTO); splitview_menu.addMenuItem(Commands.FILE_SHOW_FOLDERS_FIRST); + splitview_menu.addMenuDivider(); + splitview_menu.addMenuItem(Commands.CMD_TOGGLE_SHOW_WORKING_SET); + splitview_menu.addMenuItem(Commands.CMD_TOGGLE_SHOW_FILE_TABS); var project_cmenu = Menus.registerContextMenu(Menus.ContextMenuIds.PROJECT_MENU); project_cmenu.addMenuItem(Commands.FILE_NEW); @@ -474,4 +477,4 @@ define(function (require, exports, module) { Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_CONTEXT_MENU).on("beforeContextMenuOpen", _setMenuItemsVisible); Menus.getContextMenu(Menus.ContextMenuIds.PROJECT_MENU).on("beforeContextMenuOpen", _setMenuItemsVisible); }); -}); \ No newline at end of file +}); diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 7f464c05de..c648420c78 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -328,6 +328,9 @@ define({ "SPLITVIEW_MENU_TOOLTIP": "Split the editor vertically or horizontally", "GEAR_MENU_TOOLTIP": "Configure Working Set", + "CMD_TOGGLE_SHOW_WORKING_SET": "Show Working Set", + "CMD_TOGGLE_SHOW_FILE_TABS": "Show File Tab Bar", + "SPLITVIEW_INFO_TITLE": "Already Open", "SPLITVIEW_MULTIPANE_WARNING": "The file is already open in another pane. {APP_NAME} will soon support opening the same file in more than one pane. Until then, the file will be shown in the pane it's already open in.

(You'll only see this message once.)", diff --git a/src/project/SidebarView.js b/src/project/SidebarView.js index 4622f49c4f..adc102edf5 100644 --- a/src/project/SidebarView.js +++ b/src/project/SidebarView.js @@ -59,7 +59,9 @@ define(function (require, exports, module) { var _cmdSplitNone, _cmdSplitVertical, - _cmdSplitHorizontal; + _cmdSplitHorizontal, + _cmdToggleWorkingSet, + _cmdToggleFileTabs; /** * @private @@ -179,6 +181,31 @@ define(function (require, exports, module) { MainViewManager.setLayoutScheme(2, 1); } + /** + * Handle Toggle Working Set Command + * @private + */ + function _handleToggleWorkingSet() { + const isCurrentlyHidden = PreferencesManager.get("hideWorkingSet"); + const willBeShown = isCurrentlyHidden; + PreferencesManager.set("hideWorkingSet", !willBeShown); + CommandManager.get(Commands.CMD_TOGGLE_SHOW_WORKING_SET).setChecked(willBeShown); + } + + /** + * Handle Toggle File Tabs Command + * @private + */ + function _handleToggleFileTabs() { + const prefs = PreferencesManager.get("tabBar.options"); + const willBeShown = !prefs.showTabBar; + PreferencesManager.set("tabBar.options", { + showTabBar: willBeShown, + numberOfTabs: prefs.numberOfTabs + }); + CommandManager.get(Commands.CMD_TOGGLE_SHOW_FILE_TABS).setChecked(willBeShown); + } + // Initialize items dependent on HTML DOM AppInit.htmlReady(function () { $sidebar = $("#sidebar"); @@ -246,6 +273,17 @@ define(function (require, exports, module) { // Tooltips $splitViewMenu.attr("title", Strings.GEAR_MENU_TOOLTIP); + _cmdToggleWorkingSet.setChecked(!PreferencesManager.get("hideWorkingSet")); + _cmdToggleFileTabs.setChecked(PreferencesManager.get("tabBar.options").showTabBar); + + // to listen for tab bar preference changes from the preferences file + // because if user toggles the state of tab bar visibility either from the view menu or the preferences file + // we need to update the checked state here too + PreferencesManager.on("change", "tabBar.options", function () { + const prefs = PreferencesManager.get("tabBar.options"); + _cmdToggleFileTabs.setChecked(prefs.showTabBar); + }); + // Define the preference to decide whether to hide the working set or not PreferencesManager.definePreference("hideWorkingSet", "boolean", false, { description: Strings.DESCRIPTION_HIDE_WORKING_SET @@ -273,6 +311,8 @@ define(function (require, exports, module) { _cmdSplitNone = CommandManager.register(Strings.CMD_SPLITVIEW_NONE, Commands.CMD_SPLITVIEW_NONE, _handleSplitViewNone); _cmdSplitVertical = CommandManager.register(Strings.CMD_SPLITVIEW_VERTICAL, Commands.CMD_SPLITVIEW_VERTICAL, _handleSplitViewVertical); _cmdSplitHorizontal = CommandManager.register(Strings.CMD_SPLITVIEW_HORIZONTAL, Commands.CMD_SPLITVIEW_HORIZONTAL, _handleSplitViewHorizontal); + _cmdToggleWorkingSet = CommandManager.register(Strings.CMD_TOGGLE_SHOW_WORKING_SET, Commands.CMD_TOGGLE_SHOW_WORKING_SET, _handleToggleWorkingSet); + _cmdToggleFileTabs = CommandManager.register(Strings.CMD_TOGGLE_SHOW_FILE_TABS, Commands.CMD_TOGGLE_SHOW_FILE_TABS, _handleToggleFileTabs); CommandManager.register(Strings.CMD_TOGGLE_SIDEBAR, Commands.VIEW_HIDE_SIDEBAR, toggle); CommandManager.register(Strings.CMD_SHOW_SIDEBAR, Commands.SHOW_SIDEBAR, show); From 8b2014e279f891aadd332adf9adf18eb73f3cfaf Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 22 May 2025 04:14:30 +0530 Subject: [PATCH 32/32] refactor: update tab bar string to make it consistent with view menu string --- docs/API-Reference/command/Commands.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/API-Reference/command/Commands.md b/docs/API-Reference/command/Commands.md index 6e7a0950a7..783376af39 100644 --- a/docs/API-Reference/command/Commands.md +++ b/docs/API-Reference/command/Commands.md @@ -824,6 +824,18 @@ Sorts working set by file type ## CMD\_WORKING\_SORT\_TOGGLE\_AUTO Toggles automatic working set sorting +**Kind**: global variable + + +## CMD\_TOGGLE\_SHOW\_WORKING\_SET +Toggles working set visibility + +**Kind**: global variable + + +## CMD\_TOGGLE\_SHOW\_FILE\_TABS +Toggles file tabs visibility + **Kind**: global variable