#1471: make it possible to disable the top bar

git-svn-id: https://xpra.org/svn/Xpra/trunk@18738 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Mar 16, 2018 · d5bd2c4 · d5bd2c4
1 parent 4af39ff
commit d5bd2c4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/html5/connect.html b/src/html5/connect.html
@@ -238,7 +238,7 @@ <h4 class="panel-title">Advanced options</h4>
 				  	<input type="checkbox" id="swap_keys"> <span>Swap command and control key</span>
 				  </li>
 				  <li class="list-group-item">
-				  	<input type="checkbox" id="clock"> <span>Show server clock</span>
+				  	<input type="checkbox" id="top_bar"> <span>Show top bar</span>, <input type="checkbox" id="clock"> <span>show server clock</span>
 				  </li>
 				  <li class="list-group-item">
 				  	<input type="checkbox" id="video"> <span>Video (experimental) <input type="checkbox" id="mediasource_video"> Native decoding</span>
@@ -322,7 +322,7 @@ <h4 class="panel-title">Advanced options</h4>
 		"exit_with_children", "exit_with_client",
 		"sharing", "steal", "reconnect", "swap_keys",
 		"video", "mediasource_video",
-		"ssl", "insecure", "clock",
+		"ssl", "insecure", "top_bar", "clock",
 		"debug_main", "debug_keyboard", "debug_mouse", "debug_clipboard", "debug_draw", "debug_audio", "debug_network",
 		];
 	for (var i = 0; i < bool_props.length; i++) {
@@ -537,9 +537,9 @@ <h4 class="panel-title">Advanced options</h4>
 	var bool_props = ["clipboard", "printing", "file_transfer",
 			"exit_with_children", "exit_with_client",
 			"sharing", "steal", "reconnect", "swap_keys",
-			"video", "mediasource_video", "clock",
+			"video", "mediasource_video", "top_bar", "clock",
 			"debug_main", "debug_keyboard", "debug_mouse", "debug_clipboard", "debug_draw", "debug_audio", "debug_network"];
-	var default_on = ["steal", "clipboard", "printing", "file_transfer", "reconnect", "clock", "exit_with_children", "exit_with_client"];
+	var default_on = ["steal", "clipboard", "printing", "file_transfer", "reconnect", "top_bar", "clock", "exit_with_children", "exit_with_client"];
 	if (Utilities.isMacOS()) {
 		default_on.push("swap_keys");
 	}
@@ -549,6 +549,18 @@ <h4 class="panel-title">Advanced options</h4>
 		document.getElementById(prop).checked = getboolparam(prop, def);
 	}
 
+	var top_bar_checkbox = $("#top_bar");
+	function set_clock_visibility() {
+		if (top_bar_checkbox.is(':checked')) {
+			$("#clock").removeAttr("disabled");
+		}
+		else {
+		    $("#clock").attr("disabled", true);
+		}
+	}
+	top_bar_checkbox.change(set_clock_visibility);
+	set_clock_visibility();
+
 	$("#expandopts").click(function() {
 		$("#hiddenopts").slideToggle();
 	});

diff --git a/src/html5/index.html b/src/html5/index.html
@@ -117,6 +117,10 @@ <h3>Version 2.3</h3>
 			var cdebug = console.debug;
 			var clog = console.log;
 
+			if (!getboolparam("top_bar", true)) {
+				$("#top_bar").hide();
+			}
+
 			function show_menu(menu_id, event) {
 				var menu = $("#"+menu_id);
 				if (menu.is(':visible')) {
@@ -229,7 +233,7 @@ <h3>Version 2.3</h3>
 					progress_offset++;
 					$('#progress-bar').val(progress_value + progress_offset);
 					if (progress_offset<9) {
-						progress_timer = window.setTimeout(progress_move_offset, (5+progress_offset)*progress_offset); 
+						progress_timer = window.setTimeout(progress_move_offset, (5+progress_offset)*progress_offset);
 					}
 				}