Commit 710e31bb authored by Antenore Gatta's avatar Antenore Gatta

Merge branch 'mainexp' into 'master'

RemminaMain window refactoring - Removing deprecated functions.

See merge request !1794
parents d77f567d 0dda7500
......@@ -44,7 +44,6 @@ set(APPICONSCALE_ACTIONS_DATA
scalable/actions/remmina-document-send-symbolic.svg
scalable/actions/remmina-dynres-symbolic.svg
scalable/actions/remmina-fit-window-symbolic.svg
scalable/actions/remmina-folder-symbolic.svg
scalable/actions/remmina-fullscreen-symbolic.svg
scalable/actions/remmina-go-bottom-symbolic.svg
scalable/actions/remmina-keyboard-symbolic.svg
......
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M11 5c-1.629 0-2.305-1.058-4-3h-7v20h24v-17h-13z"/></svg>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
......@@ -51,6 +51,7 @@ typedef struct _RemminaMain {
GtkMenu *menu_popup_full;
GtkRadioMenuItem *menuitem_view_mode_list;
GtkRadioMenuItem *menuitem_view_mode_tree;
GtkMenuItem *menuitem_connection_quit;
/* Button new */
GtkButton *button_new;
/* Search bar objects */
......@@ -69,32 +70,10 @@ typedef struct _RemminaMain {
GtkBox *box_ustat;
/* Non widget objects */
GtkAccelGroup *accelgroup_shortcuts;
GtkActionGroup *actiongroup_connection;
/* Actions from the application ActionGroup */
GtkAction *action_application_about;
GtkAction *action_application_plugins;
GtkAction *action_application_preferences;
GtkAction *action_application_quit;
/* Actions from the connections ActionGroup */
GtkAction *action_connections_new;
/* Actions from the connection ActionGroup */
GtkAction *action_connection_connect;
GtkAction *action_connection_edit;
GtkAction *action_connection_copy;
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;
/* Actions from the tools ActionGroup */
GtkAction *action_tools_import;
GtkAction *action_tools_export;
/* Actions from the help ActionGroup */
GtkAction *action_help_homepage;
GtkAction *action_help_wiki;
GtkAction *action_help_debug;
RemminaMainPriv *priv;
} RemminaMain;
......@@ -124,6 +103,24 @@ void remmina_main_destroy(void);
void remmina_main_save_before_destroy(void);
void remmina_main_show_warning_dialog(const gchar* message);
void remmina_main_on_action_application_about(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_application_mpchange(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_application_plugins(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_application_preferences(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_application_quit(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_connection_connect(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_connection_copy(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_connection_delete(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_connection_edit(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_connection_external_tools(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_connection_new(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_help_community(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_help_debug(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_help_donations(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_help_homepage(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_help_wiki(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_tools_export(GSimpleAction *action, GVariant *param, gpointer data);
void remmina_main_on_action_tools_import(GSimpleAction *action, GVariant *param, gpointer data);
G_END_DECLS
......@@ -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