Merge pull request #456 from che-incubator/banner-message

feat: Add a setting that allows to control window header text separately from a window title

.rebase/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.
 
+#### @RomanNikitenko
+https://github.com/che-incubator/che-code/pull/456
+
+- code/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
+- code/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+- code/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
+- code/src/vs/workbench/browser/workbench.contribution.ts
+---
+
 #### @benoitf @RomanNikitenko
 https://github.com/che-incubator/che-code/pull/379 \
 https://github.com/che-incubator/che-code/commit/d3cf7dc86d284bc4cdff7cc163c5642bb6744524#diff-36f85da944a1b6c01cb656687e520f7415d692e1b7d8856e2161db97a134b224

.rebase/replace/code/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts.json

@@ -0,0 +1,6 @@
+[
+	{
+		"from": "if (that._windowTitle.isCustomTitleFormat()) {",
+		"by": "const header = that._windowTitle.getHeader();\\\n\\\t\\\t\\\t\\\t\\\t\\\t\\\tif (header) {\\\n\\\t\\\t\\\t\\\t\\\t\\\t\\\t\\\tlabel = header;\\\n\\\t\\\t\\\t\\\t\\\t\\\t\\\t} else if (that._windowTitle.isCustomTitleFormat()) {"
+	}
+]

.rebase/replace/code/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts.json

@@ -0,0 +1,6 @@
+[
+	{
+		"from": "this.title.innerText = this.windowTitle.value;",
+		"by": "this.title.innerText = this.windowTitle.getHeader() \\|\\| this.windowTitle.value;"
+	}
+]

.rebase/replace/code/src/vs/workbench/browser/parts/titlebar/windowTitle.ts.json

@@ -0,0 +1,10 @@
+[
+	{
+		"from": "title = 'window.title'",
+		"by": "title = 'window.title',\\\n\\\theader = 'window.header'"
+	},
+	{
+		"from": "isCustomTitleFormat(): boolean {",
+		"by": "getHeader(): string \\| undefined{\\\n\\\t\\\tconst header = this.configurationService.inspect<string>(WindowSettingNames.header);\\\n\\\t\\\treturn header.value;\\\n\\\t}\\\n\\\n\\\tisCustomTitleFormat(): boolean {"
+	}
+]

.rebase/replace/code/src/vs/workbench/browser/workbench.contribution.ts.json

@@ -0,0 +1,10 @@
+[
+	{
+		"from": "\\/\\/ Window",
+		"by": "\\/\\/ Window\\\n\\\tconst windowHeaderDescription = 'Controls the window header';"
+	},
+	{
+		"from": "'window.title': {",
+		"by": "'window.header': {\\\n\\\t\\\t\\\t\\\t'type': 'string',\\\n\\\t\\\t\\\t\\\t'markdownDescription': windowHeaderDescription\\\n\\\t\\\t\\\t},\\\n\\\t\\\t\\\t'window.title': {"
+	}
+]

code/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts

@@ -181,7 +181,10 @@ class CommandCenterCenterViewItem extends BaseActionViewItem {
 						private _getLabel(): string {
 							const { prefix, suffix } = that._windowTitle.getTitleDecorations();
 							let label = that._windowTitle.workspaceName;
-							if (that._windowTitle.isCustomTitleFormat()) {
+							const header = that._windowTitle.getHeader();
+							if (header) {
+								label = header;
+							} else if (that._windowTitle.isCustomTitleFormat()) {
 								label = that._windowTitle.getWindowTitle();
 							} else if (that._editorGroupService.partOptions.showTabs === 'none') {
 								label = that._windowTitle.fileName ?? label;

code/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts

@@ -549,9 +549,9 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 
 		// Text Title
 		if (!this.isCommandCenterVisible) {
-			this.title.innerText = this.windowTitle.value;
+			this.title.innerText = this.windowTitle.getHeader() || this.windowTitle.value;
 			this.titleDisposables.add(this.windowTitle.onDidChange(() => {
-				this.title.innerText = this.windowTitle.value;
+				this.title.innerText = this.windowTitle.getHeader() || this.windowTitle.value;
 			}));
 		}
 

code/src/vs/workbench/browser/parts/titlebar/windowTitle.ts

@@ -32,7 +32,8 @@ import { CodeWindow } from '../../../../base/browser/window.js';
 
 const enum WindowSettingNames {
 	titleSeparator = 'window.titleSeparator',
-	title = 'window.title'
+	title = 'window.title',
+	header = 'window.header'
 }
 
 export const defaultWindowTitle = (() => {
@@ -382,6 +383,11 @@ export class WindowTitle extends Disposable {
 		});
 	}
 
+	getHeader(): string | undefined{
+		const header = this.configurationService.inspect<string>(WindowSettingNames.header);
+		return header.value;
+	}
+
 	isCustomTitleFormat(): boolean {
 		const title = this.configurationService.inspect<string>(WindowSettingNames.title);
 		const titleSeparator = this.configurationService.inspect<string>(WindowSettingNames.titleSeparator);

code/src/vs/workbench/browser/workbench.contribution.ts

@@ -637,7 +637,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 	});
 
 	// Window
-
+	const windowHeaderDescription = 'Controls the window header';
 	let windowTitleDescription = localize('windowTitle', "Controls the window title based on the current context such as the opened workspace or active editor. Variables are substituted based on the context:");
 	windowTitleDescription += '\n- ' + [
 		localize('activeEditorShort', "`${activeEditorShort}`: the file name (e.g. myFile.txt)."),
@@ -664,6 +664,10 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 	registry.registerConfiguration({
 		...windowConfigurationNodeBase,
 		'properties': {
+			'window.header': {
+				'type': 'string',
+				'markdownDescription': windowHeaderDescription
+			},
 			'window.title': {
 				'type': 'string',
 				'default': defaultWindowTitle,

rebase.sh

@@ -393,6 +393,14 @@ resolve_conflicts() {
       apply_changes "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/code/browser/workbench/workbench.html" ]]; then
       apply_changes "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/src/vs/workbench/browser/workbench.contribution.ts" ]]; then
+      apply_changes "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/src/vs/workbench/browser/parts/titlebar/windowTitle.ts" ]]; then
+      apply_changes "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts" ]]; then
+      apply_changes "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts" ]]; then
+      apply_changes "$conflictingFile"
     else
       echo "$conflictingFile file cannot be automatically rebased. Aborting"
       exit 1