Commit 5cc423de authored by Antenore Gatta's avatar Antenore Gatta

Removed action to hide the status bar.

This is mainly meant to remove as much as possible deprecated actions.
parent 7e937271
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.4
<!-- Generated with glade 3.22.1
Remmina - The GTK+ Remmina Remote Desktop Client
Copyright (C) Antenore Gatta & Giovanni Panozzo 2014-2018
......@@ -185,17 +185,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</object>
</child>
</object>
<object class="GtkActionGroup" id="actiongroup_view">
<property name="accel_group">accelgroup_shortcuts</property>
<child>
<object class="GtkToggleAction" id="action_view_statusbar">
<property name="label" translatable="yes">Statusbar</property>
<property name="short_label" translatable="yes">Statusbar</property>
<property name="active">True</property>
<signal name="activate" handler="remmina_main_on_action_view_statusbar" swapped="no"/>
</object>
</child>
</object>
<object class="GtkEntryCompletion" id="entrycompletion">
<property name="inline_completion">True</property>
<property name="inline_selection">True</property>
......@@ -224,6 +213,81 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<signal name="drag-data-received" handler="remmina_main_on_drag_data_received" swapped="no"/>
<signal name="show" handler="remmina_main_on_show" swapped="no"/>
<signal name="window-state-event" handler="remmina_main_on_window_state_event" swapped="no"/>
<child type="titlebar">
<object class="GtkHeaderBar" id="main_headerbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title">Remmina</property>
<property name="subtitle">Remote Desktop Client</property>
<property name="spacing">10</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkButton" id="button_new">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Create a new connection profile</property>
<property name="halign">start</property>
<property name="image">image_new</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="remmina_main_on_action_connections_new" swapped="no"/>
</object>
</child>
<child>
<object class="GtkToggleButton" id="search_toggle">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Show search bar</property>
<property name="image">find_toggle_image</property>
<property name="active">True</property>
<signal name="toggled" handler="remmina_main_on_search_toggle" swapped="no"/>
</object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkMenuButton" id="menu_header_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="popup">menu_popup_full</property>
<child>
<object class="GtkImage" id="image_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">open-menu-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="menu_header_button-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Actions</property>
</object>
</child>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="view_toggle_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Toggle view</property>
<property name="image">view_toggle_icon</property>
<signal name="toggled" handler="remmina_main_on_view_toggle" swapped="no"/>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<child>
<object class="GtkBox" id="box_main">
<property name="visible">True</property>
......@@ -436,17 +500,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuitem_view_statusbar">
<property name="use_action_appearance">True</property>
<property name="related_action">action_view_statusbar</property>
<property name="visible">True</property>
<property name="app_paintable">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="active">True</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem_edit_separator1">
<property name="visible">True</property>
......@@ -760,80 +813,5 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar" id="main_headerbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title">Remmina</property>
<property name="subtitle">Remote Desktop Client</property>
<property name="spacing">10</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkButton" id="button_new">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Create a new connection profile</property>
<property name="halign">start</property>
<property name="image">image_new</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="remmina_main_on_action_connections_new" swapped="no"/>
</object>
</child>
<child>
<object class="GtkToggleButton" id="search_toggle">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Show search bar</property>
<property name="image">find_toggle_image</property>
<property name="active">True</property>
<signal name="toggled" handler="remmina_main_on_search_toggle" swapped="no"/>
</object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkMenuButton" id="menu_header_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="popup">menu_popup_full</property>
<child>
<object class="GtkImage" id="image_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">open-menu-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="menu_header_button-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Actions</property>
</object>
</child>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="view_toggle_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Toggle view</property>
<property name="image">view_toggle_icon</property>
<signal name="toggled" handler="remmina_main_on_view_toggle" swapped="no"/>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
</interface>
......@@ -583,13 +583,13 @@ static void remmina_main_load_files()
break;
}
/* Unset old model */
/* Unset old model */
gtk_tree_view_set_model(remminamain->tree_files_list, NULL);
/* Destroy the old model and save the new one */
/* Destroy the old model and save the new one */
remminamain->priv->file_model = newmodel;
/* Create a sorted filtered model based on newmodel and apply it to the TreeView */
/* Create a sorted filtered model based on newmodel and apply it to the TreeView */
remminamain->priv->file_model_filter = gtk_tree_model_filter_new(remminamain->priv->file_model, NULL);
gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(remminamain->priv->file_model_filter),
(GtkTreeModelFilterVisibleFunc)remmina_main_filter_visible_func, NULL, NULL);
......@@ -601,12 +601,12 @@ static void remmina_main_load_files()
g_signal_connect(G_OBJECT(remminamain->priv->file_model_sort), "sort-column-changed",
G_CALLBACK(remmina_main_file_model_on_sort), NULL);
remmina_main_expand_group();
/* Select the file previously selected */
/* Select the file previously selected */
if (save_selected_filename) {
remmina_main_select_file(save_selected_filename);
g_free(save_selected_filename);
}
/* Show in the status bar the total number of connections found */
/* Show in the status bar the total number of connections found */
g_snprintf(buf, sizeof(buf), ngettext("Total %i item.", "Total %i items.", items_count), items_count);
context_id = gtk_statusbar_get_context_id(remminamain->statusbar_main, "status");
gtk_statusbar_pop(remminamain->statusbar_main, context_id);
......@@ -798,25 +798,6 @@ void remmina_main_on_action_application_quit(GtkAction *action, gpointer user_da
remmina_application_condexit(REMMINA_CONDEXIT_ONQUIT);
}
void remmina_main_on_action_view_statusbar(GtkToggleAction *action, gpointer user_data)
{
TRACE_CALL(__func__);
gboolean toggled;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
toggled = gtk_toggle_action_get_active(action);
G_GNUC_END_IGNORE_DEPRECATIONS
if (toggled) {
gtk_widget_show(GTK_WIDGET(remminamain->statusbar_main));
}else {
gtk_widget_hide(GTK_WIDGET(remminamain->statusbar_main));
}
if (remminamain->priv->initialized) {
remmina_pref.hide_statusbar = !toggled;
remmina_pref_save();
}
}
void remmina_main_on_date_column_sort_clicked()
{
if (remmina_pref.view_file_mode != REMMINA_VIEW_FILE_LIST) {
......@@ -1166,11 +1147,6 @@ static void remmina_main_init(void)
/* Load the files list */
remmina_main_load_files();
/* Load the preferences */
if (remmina_pref.hide_statusbar) {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_toggle_action_set_active(remminamain->action_view_statusbar, FALSE);
G_GNUC_END_IGNORE_DEPRECATIONS
}
if (remmina_pref.view_file_mode) {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_toggle_action_set_active(remminamain->action_view_mode_tree, TRUE);
......@@ -1283,8 +1259,6 @@ GtkWidget* remmina_main_new(void)
remminamain->action_connection_copy = GTK_ACTION(GET_OBJECT("action_connection_copy"));
remminamain->action_connection_delete = GTK_ACTION(GET_OBJECT("action_connection_delete"));
remminamain->action_connection_external_tools = GTK_ACTION(GET_OBJECT("action_connection_external_tools"));
/* Actions from the view ActionGroup */
remminamain->action_view_statusbar = GTK_TOGGLE_ACTION(GET_OBJECT("action_view_statusbar"));
/* Actions from the tools ActionGroup */
remminamain->action_tools_import = GTK_ACTION(GET_OBJECT("action_tools_import"));
remminamain->action_tools_export = GTK_ACTION(GET_OBJECT("action_tools_export"));
......
......@@ -84,7 +84,6 @@ typedef struct _RemminaMain {
GtkAction *action_connection_delete;
GtkAction *action_connection_external_tools;
/* Actions from the view ActionGroup */
GtkToggleAction *action_view_statusbar;
GtkToggleAction *action_view_quick_connect;
GtkToggleAction *action_view_mode_list;
GtkToggleAction *action_view_mode_tree;
......
......@@ -333,11 +333,6 @@ void remmina_pref_init(void)
else
remmina_pref.hide_toolbar = FALSE;
if (g_key_file_has_key(gkeyfile, "remmina_pref", "hide_statusbar", NULL))
remmina_pref.hide_statusbar = g_key_file_get_boolean(gkeyfile, "remmina_pref", "hide_statusbar", NULL);
else
remmina_pref.hide_statusbar = FALSE;
if (g_key_file_has_key(gkeyfile, "remmina_pref", "small_toolbutton", NULL))
remmina_pref.small_toolbutton = g_key_file_get_boolean(gkeyfile, "remmina_pref", "small_toolbutton", NULL);
else
......@@ -676,7 +671,6 @@ gboolean remmina_pref_save(void)
g_key_file_set_string(gkeyfile, "remmina_pref", "screenshot_name", remmina_pref.screenshot_name);
g_key_file_set_boolean(gkeyfile, "remmina_pref", "ssh_parseconfig", remmina_pref.ssh_parseconfig);
g_key_file_set_boolean(gkeyfile, "remmina_pref", "hide_toolbar", remmina_pref.hide_toolbar);
g_key_file_set_boolean(gkeyfile, "remmina_pref", "hide_statusbar", remmina_pref.hide_statusbar);
g_key_file_set_boolean(gkeyfile, "remmina_pref", "small_toolbutton", remmina_pref.small_toolbutton);
g_key_file_set_integer(gkeyfile, "remmina_pref", "view_file_mode", remmina_pref.view_file_mode);
g_key_file_set_string(gkeyfile, "remmina_pref", "resolutions", remmina_pref.resolutions);
......
......@@ -165,7 +165,6 @@ typedef struct _RemminaPref {
guint vte_shortcutkey_select_all;
/* In View menu */
gboolean hide_toolbar;
gboolean hide_statusbar;
gboolean small_toolbutton;
gint view_file_mode;
/* In tray icon */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment