v0.4.1 - Improvements, MacOS fixes

Author: tomaschyly

.idea/workspace.xml

@@ -1,7 +1,7 @@
 {
 	"name": "tch-filector",
 	"productName": "FileCtor",
-	"version": "0.4.0",
+	"version": "0.4.1",
 	"author": "Tomas Chyly <chyly@tomas-chyly.com> (https://tomas-chyly.com/en/)",
 	"license": "GPL v3",
 	"description": "File inspector with interactive console.",

package.json

@@ -23,10 +23,15 @@ class Tabs extends Component {
 		this.additionalTabsSelect = undefined;
 
 		let tabs = [];
+		let selectedTab = undefined;
 
 		if (typeof (this.props.startTabs) !== 'undefined' && this.props.startTabs !== null && Array.isArray (this.props.startTabs)) {
 			for (let i = 0; i < this.props.startTabs.length; i++) {
 				tabs.push (this.AddTab (this.props.startTabs [i]));
+
+				if (typeof (this.props.startSelectedTab) !== 'undefined' && this.props.startTabs [i].id === this.props.startSelectedTab) {
+					selectedTab = this.props.startSelectedTab;
+				}
 			}
 		} else {
 			let startWith = typeof (props.startWith) !== 'undefined' ? parseInt (props.startWith) : 0;
@@ -37,7 +42,9 @@ class Tabs extends Component {
 			}
 		}
 
-		let selectedTab = tabs.length > 0 ? tabs [0].id : undefined;
+		if (typeof (selectedTab) === 'undefined') {
+			selectedTab = tabs.length > 0 ? tabs [0].id : undefined;
+		}
 
 		this.state = {
 			tabs: tabs,
@@ -74,7 +81,7 @@ class Tabs extends Component {
 		this.UpdateActiveNavigation ();
 
 		if (typeof (this.props.tabsSave) === 'function') {
-			this.props.tabsSave (this.state.tabs);
+			this.props.tabsSave (this.state.tabs, this.state.selectedTab);
 		}
 	}
 

src/component/Tabs.js

@@ -99,7 +99,6 @@ class TitleBar extends Component {
 						<button type="button" id="titlebar-home" onClick={this.Main.bind (this)}><Home /></button>
 						<button type="button" id="titlebar-minimize" onClick={this.Minimize.bind (this)}><Minimize /></button>
 						<button type="button" id="titlebar-maximize" onClick={this.Maximize.bind (this)}><MaximizeSquare /><MaximizeClone /></button>
-						<button type="button" id="titlebar-main" onClick={this.Main.bind (this)}><Home /></button>
 					</div>
 				</div>;
 				break;
@@ -109,7 +108,6 @@ class TitleBar extends Component {
 						<button type="button" id="titlebar-close" onClick={this.Close.bind (this)}><Close /></button>
 						<button type="button" id="titlebar-minimize" onClick={this.Minimize.bind (this)}><Minimize /></button>
 						<button type="button" id="titlebar-maximize" onClick={this.Maximize.bind (this)}><MaximizeSquare /><MaximizeClone /></button>
-						<button type="button" id="titlebar-main" onClick={this.Main.bind (this)}><Home /></button>
 					</div>
 					<div id="title">{this.state.title}</div>
 					<div id="titlebar-actions-other">

src/component/Titlebar.js

@@ -6,8 +6,8 @@
 #titlebar.main-visible.reset-visible #title { padding-left: 46px; }
 .darwin #title { padding: 8px 138px 8px 8px; }
 .darwin #titlebar.main-visible #title,
-.darwin #titlebar.reset-visible #title { padding-right: 92px; }
-.darwin #titlebar.main-visible.reset-visible #title { padding-right: 46px; }
+.darwin #titlebar.reset-visible #title { padding-left: 8px; padding-right: 92px; }
+.darwin #titlebar.main-visible.reset-visible #title { padding-left: 8px; padding-right: 46px; }
 #titlebar-actions,
 #titlebar-actions-other { display: flex; }
 #titlebar-actions button,

src/component/titlebar.css

@@ -28,6 +28,7 @@ class FileInspector extends Component {
 
 		this.state = {
 			startTabs: undefined,
+			startSelectedTab: undefined,
 			drives: []
 		};
 	}
@@ -47,11 +48,14 @@ class FileInspector extends Component {
 		this.startTabsListener = (event, message) => {
 			if (message.key === 'file-inspector-tabs') {
 				this.setState ({startTabs: message.value});
+			} else if (message.key === 'file-inspector-tab-selected') {
+				this.setState ({startSelectedTab: message.value});
 			}
 		};
 		ipcRenderer.on ('config-get', this.startTabsListener);
 		setTimeout (() => {
 			ipcRenderer.send ('config-get', {key: 'file-inspector-tabs'});
+			ipcRenderer.send ('config-get', {key: 'file-inspector-tab-selected'});
 		}, 1);
 
 		setTimeout (() => {
@@ -83,7 +87,7 @@ class FileInspector extends Component {
 	 * Render the component into html.
 	 */
 	render () {
-		if (typeof (this.state.startTabs) === 'undefined') {
+		if (typeof (this.state.startTabs) === 'undefined' || typeof (this.state.startSelectedTab) === 'undefined') {
 			return '';
 		}
 
@@ -103,7 +107,7 @@ class FileInspector extends Component {
 		}
 
 		return <div className="file-inspector">
-			<Tabs ref={this.tabs} startTabs={this.state.startTabs} startWith="1" tabsSave={this.TabsSave.bind (this)} tabParameters={this.TabParameters.bind (this)} onTabSelected={this.TabSelected.bind (this)} />
+			<Tabs ref={this.tabs} startTabs={this.state.startTabs} startSelectedTab={this.state.startSelectedTab} startWith="1" tabsSave={this.TabsSave.bind (this)} tabParameters={this.TabParameters.bind (this)} onTabSelected={this.TabSelected.bind (this)} />
 			<div className="container bottom">
 				<div className="row">
 					<div className="col-10">
@@ -125,8 +129,9 @@ class FileInspector extends Component {
 	/**
 	 * Save Tabs to config.
 	 */
-	TabsSave (tabs) {
+	TabsSave (tabs, selectedTab) {
 		ipcRenderer.send ('config-set', {key: 'file-inspector-tabs', value: tabs});
+		ipcRenderer.send ('config-set', {key: 'file-inspector-tab-selected', value: selectedTab});
 	}
 
 	/**