Add '--disable-toolbar' command-line option

4 files changed, 17 insertions, 2 deletions

diff --git a/src/remmina.1 b/src/remmina.1
index c44b14619..034ef5a7e 100644
--- a/src/remmina.1
+++ b/src/remmina.1
@@ -78,6 +78,8 @@ Encrypt a password
 X display to use
 .It --disable-news\fR
 Disable news notification
+.It --disable-toolbar\fR
+Disable toolbar
 .El
 .Sh EXAMPLES
 .Lp
diff --git a/src/remmina.c b/src/remmina.c
index cba60f8d3..f44a478c3 100644
--- a/src/remmina.c
+++ b/src/remmina.c
@@ -82,6 +82,7 @@ static int gcrypt_thread_initialized = 0;
 
 gboolean kioskmode;
 gboolean disablenews;
+gboolean disabletoolbar;
 
 static GOptionEntry remmina_options[] =
 {
@@ -123,6 +124,7 @@ static GOptionEntry remmina_options[] =
 	{ "set-option",	      0,    0,			  G_OPTION_ARG_STRING_ARRAY,   NULL, N_("Set one or more profile settings, to be used with --update-profile"),		     NULL	},
 	{ "encrypt-password", 0,    0,			  G_OPTION_ARG_NONE,	       NULL, N_("Encrypt a password"),												  NULL		 },
 	{ "disable-news", 0,    0,			  G_OPTION_ARG_NONE,	       NULL, N_("Disable news notification"),												  NULL		 },
+	{ "disable-toolbar", 0,    0,			  G_OPTION_ARG_NONE,	       NULL, N_("Disable toolbar"),												  NULL		 },
 	{ NULL }
 };
 
@@ -154,14 +156,18 @@ static gint remmina_on_command_line(GApplication *app, GApplicationCommandLine *
 #if SODIUM_VERSION_INT >= 90200
 	remmina_sodium_init();
 #endif
-	remmina_pref_init();
-
 	opts = g_application_command_line_get_options_dict(cmdline);
 
 	if (g_variant_dict_lookup_value(opts, "disable-news", NULL)) {
 		disablenews = TRUE;
 	}
 
+	if (g_variant_dict_lookup_value(opts, "disable-toolbar", NULL)) {
+		disabletoolbar = TRUE;
+	}
+
+	remmina_pref_init();
+
 	if (g_variant_dict_lookup_value(opts, "quit", NULL)) {
 		remmina_exec_command(REMMINA_COMMAND_EXIT, NULL);
 		executed = TRUE;
diff --git a/src/remmina_pref.c b/src/remmina_pref.c
index 601e0f74a..ef18cfd8e 100644
--- a/src/remmina_pref.c
+++ b/src/remmina_pref.c
@@ -366,6 +366,9 @@ void remmina_pref_init(void)
 	else
 		remmina_pref.hide_connection_toolbar = FALSE;
 
+	if (disabletoolbar)
+		remmina_pref.hide_connection_toolbar = TRUE;
+
 	if (g_key_file_has_key(gkeyfile, "remmina_pref", "hide_searchbar", NULL))
 		remmina_pref.hide_searchbar = g_key_file_get_boolean(gkeyfile, "remmina_pref",
 								     "hide_searchbar", NULL);
@@ -567,6 +570,9 @@ void remmina_pref_init(void)
 	else
 		remmina_pref.fullscreen_toolbar_visibility = FLOATING_TOOLBAR_VISIBILITY_PEEKING;
 
+	if (disabletoolbar)
+		remmina_pref.fullscreen_toolbar_visibility = FLOATING_TOOLBAR_VISIBILITY_DISABLE;
+
 	if (g_key_file_has_key(gkeyfile, "remmina_pref", "auto_scroll_step", NULL))
 		remmina_pref.auto_scroll_step = g_key_file_get_integer(gkeyfile, "remmina_pref", "auto_scroll_step", NULL);
 	else
diff --git a/src/remmina_pref.h b/src/remmina_pref.h
index 112abf564..bde9fb056 100644
--- a/src/remmina_pref.h
+++ b/src/remmina_pref.h
@@ -254,6 +254,7 @@ extern const gchar *default_resolutions;
 extern gchar *remmina_pref_file;
 extern gchar *remmina_colors_file;
 extern RemminaPref remmina_pref;
+extern gboolean disabletoolbar;
 
 void remmina_pref_init(void);
 gboolean remmina_pref_is_rw(void);