Revert "Desktop: Resolve #3695: Show notebook and note title in the t…

…itle bar (#4390)"

This reverts commit c79c9c4.

Reason: Still need to discuss how it should be implemented. Ref:

https://discourse.joplinapp.org/t/testing-v1-8-2-title-bar-path-format-minor/16937/10

.eslintignore

@@ -616,12 +616,6 @@ packages/app-desktop/gui/ToolbarButton/styles/index.js.map
 packages/app-desktop/gui/dialogs.d.ts
 packages/app-desktop/gui/dialogs.js
 packages/app-desktop/gui/dialogs.js.map
-packages/app-desktop/gui/getWindowTitle.d.ts
-packages/app-desktop/gui/getWindowTitle.js
-packages/app-desktop/gui/getWindowTitle.js.map
-packages/app-desktop/gui/getWindowTitle.test.d.ts
-packages/app-desktop/gui/getWindowTitle.test.js
-packages/app-desktop/gui/getWindowTitle.test.js.map
 packages/app-desktop/gui/hooks/useEffectDebugger.d.ts
 packages/app-desktop/gui/hooks/useEffectDebugger.js
 packages/app-desktop/gui/hooks/useEffectDebugger.js.map

.gitignore

@@ -603,12 +603,6 @@ packages/app-desktop/gui/ToolbarButton/styles/index.js.map
 packages/app-desktop/gui/dialogs.d.ts
 packages/app-desktop/gui/dialogs.js
 packages/app-desktop/gui/dialogs.js.map
-packages/app-desktop/gui/getWindowTitle.d.ts
-packages/app-desktop/gui/getWindowTitle.js
-packages/app-desktop/gui/getWindowTitle.js.map
-packages/app-desktop/gui/getWindowTitle.test.d.ts
-packages/app-desktop/gui/getWindowTitle.test.js
-packages/app-desktop/gui/getWindowTitle.test.js.map
 packages/app-desktop/gui/hooks/useEffectDebugger.d.ts
 packages/app-desktop/gui/hooks/useEffectDebugger.js
 packages/app-desktop/gui/hooks/useEffectDebugger.js.map

packages/app-desktop/gui/Navigator.jsx

@@ -1,19 +1,22 @@
 const React = require('react');
 const Component = React.Component;
+const Setting = require('@joplin/lib/models/Setting').default;
 const { connect } = require('react-redux');
 const bridge = require('electron').remote.require('./bridge').default;
-const getWindowTitle = require('./getWindowTitle').default;
-
 
 class NavigatorComponent extends Component {
-	constructor(props) {
-		super(props);
-	}
 	UNSAFE_componentWillReceiveProps(newProps) {
 		if (newProps.route) {
-			this.updateWindowTitle(getWindowTitle(newProps.notes, newProps.selectedNoteIds, newProps.selectedFolderId, newProps.folders, newProps.screens, newProps.route));
+			const screenInfo = this.props.screens[newProps.route.routeName];
+			const devMarker = Setting.value('env') === 'dev' ? ' (DEV)' : '';
+			const windowTitle = [`Joplin${devMarker}`];
+			if (screenInfo.title) {
+				windowTitle.push(screenInfo.title());
+			}
+			this.updateWindowTitle(windowTitle.join(' - '));
 		}
 	}
+
 	updateWindowTitle(title) {
 		try {
 			if (bridge().window()) bridge().window().setTitle(title);
@@ -46,10 +49,6 @@ class NavigatorComponent extends Component {
 const Navigator = connect(state => {
 	return {
 		route: state.route,
-		selectedNoteIds: state.selectedNoteIds,
-		selectedFolderId: state.selectedFolderId,
-		folders: state.folders,
-		notes: state.notes,
 	};
 })(NavigatorComponent);