Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Shortcutkey viewonly #1289

Merged
merged 6 commits into from
Sep 23, 2017
Merged

Shortcutkey viewonly #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54539df
shortcutkey_viewonly - hardcoded Host+M - working
remminafan1 Sep 16, 2017
30f68cb
shortcutkey_viewonly - hardcoded Host+M - working
remminafan1 Sep 16, 2017
4a1ce08
shortcutkey_viewonly - hardcoded Host+M - working
remminafan1 Sep 16, 2017
11806fd
Merge branch 'shortcutkey_viewonly' of git://github.com/remminafan1/R…
antenore Sep 21, 2017
85cb6d4
Added viewonly in the pref editor
antenore Sep 22, 2017
fa46fc3
Merge branch 'next' into remminafan1-shortcutkey_viewonly
antenore Sep 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions remmina/src/remmina_connection_window.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3570,6 +3570,12 @@ static gboolean remmina_connection_window_hostkey_func(RemminaProtocolWidget* gp
remmina_connection_holder_toolbar_minimize(GTK_WIDGET(gp),
cnnhld);
}
else if (keyval == remmina_pref.shortcutkey_viewonly)
{
remmina_file_set_int(cnnobj->remmina_file, "viewonly",
( remmina_file_get_int(cnnobj->remmina_file, "viewonly", 0 )
== 0 ) ? 1 : 0 );
}
else if (keyval == remmina_pref.shortcutkey_screenshot)
{
remmina_connection_holder_toolbar_screenshot(GTK_WIDGET(gp),
Expand Down
6 changes: 6 additions & 0 deletions remmina/src/remmina_pref.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,11 @@ void remmina_pref_init(void)
else
remmina_pref.shortcutkey_scale = GDK_KEY_s;

if (g_key_file_has_key(gkeyfile, "remmina_pref", "shortcutkey_viewonly", NULL))
remmina_pref.shortcutkey_viewonly = g_key_file_get_integer(gkeyfile, "remmina_pref", "shortcutkey_viewonly", NULL);
else
remmina_pref.shortcutkey_viewonly = GDK_KEY_m;

if (g_key_file_has_key(gkeyfile, "remmina_pref", "shortcutkey_grab", NULL))
remmina_pref.shortcutkey_grab = g_key_file_get_integer(gkeyfile, "remmina_pref", "shortcutkey_grab", NULL);
else
Expand Down Expand Up @@ -754,6 +759,7 @@ void remmina_pref_save(void)
g_key_file_set_integer(gkeyfile, "remmina_pref", "shortcutkey_prevtab", remmina_pref.shortcutkey_prevtab);
g_key_file_set_integer(gkeyfile, "remmina_pref", "shortcutkey_scale", remmina_pref.shortcutkey_scale);
g_key_file_set_integer(gkeyfile, "remmina_pref", "shortcutkey_grab", remmina_pref.shortcutkey_grab);
g_key_file_set_integer(gkeyfile, "remmina_pref", "shortcutkey_viewonly", remmina_pref.shortcutkey_viewonly);
g_key_file_set_integer(gkeyfile, "remmina_pref", "shortcutkey_screenshot", remmina_pref.shortcutkey_screenshot);
g_key_file_set_integer(gkeyfile, "remmina_pref", "shortcutkey_minimize", remmina_pref.shortcutkey_minimize);
g_key_file_set_integer(gkeyfile, "remmina_pref", "shortcutkey_disconnect", remmina_pref.shortcutkey_disconnect);
Expand Down
1 change: 1 addition & 0 deletions remmina/src/remmina_pref.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ typedef struct _RemminaPref
guint shortcutkey_nexttab;
guint shortcutkey_scale;
guint shortcutkey_grab;
guint shortcutkey_viewonly;
guint shortcutkey_screenshot;
guint shortcutkey_minimize;
guint shortcutkey_disconnect;
Expand Down
3 changes: 3 additions & 0 deletions remmina/src/remmina_pref_dialog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ void remmina_pref_on_dialog_destroy(GtkWidget *widget, gpointer user_data)
remmina_pref.shortcutkey_scale = remmina_key_chooser_get_keyval(gtk_button_get_label(remmina_pref_dialog->button_keyboard_scaled));
remmina_pref.shortcutkey_grab = remmina_key_chooser_get_keyval(gtk_button_get_label(remmina_pref_dialog->button_keyboard_grab_keyboard));
remmina_pref.shortcutkey_screenshot = remmina_key_chooser_get_keyval(gtk_button_get_label(remmina_pref_dialog->button_keyboard_screenshot));
remmina_pref.shortcutkey_viewonly = remmina_key_chooser_get_keyval(gtk_button_get_label(remmina_pref_dialog->button_keyboard_viewonly));
remmina_pref.shortcutkey_minimize = remmina_key_chooser_get_keyval(gtk_button_get_label(remmina_pref_dialog->button_keyboard_minimize));
remmina_pref.shortcutkey_disconnect = remmina_key_chooser_get_keyval(gtk_button_get_label(remmina_pref_dialog->button_keyboard_disconnect));
remmina_pref.shortcutkey_toolbar = remmina_key_chooser_get_keyval(gtk_button_get_label(remmina_pref_dialog->button_keyboard_toolbar));
Expand Down Expand Up @@ -369,6 +370,7 @@ static void remmina_pref_dialog_init(void)
remmina_pref_dialog_set_button_label(remmina_pref_dialog->button_keyboard_scaled, remmina_pref.shortcutkey_scale);
remmina_pref_dialog_set_button_label(remmina_pref_dialog->button_keyboard_grab_keyboard, remmina_pref.shortcutkey_grab);
remmina_pref_dialog_set_button_label(remmina_pref_dialog->button_keyboard_screenshot, remmina_pref.shortcutkey_screenshot);
remmina_pref_dialog_set_button_label(remmina_pref_dialog->button_keyboard_viewonly, remmina_pref.shortcutkey_viewonly);
remmina_pref_dialog_set_button_label(remmina_pref_dialog->button_keyboard_minimize, remmina_pref.shortcutkey_minimize);
remmina_pref_dialog_set_button_label(remmina_pref_dialog->button_keyboard_disconnect, remmina_pref.shortcutkey_disconnect);
remmina_pref_dialog_set_button_label(remmina_pref_dialog->button_keyboard_toolbar, remmina_pref.shortcutkey_toolbar);
Expand Down Expand Up @@ -507,6 +509,7 @@ GtkDialog* remmina_pref_dialog_new(gint default_tab, GtkWindow *parent)
remmina_pref_dialog->button_keyboard_scaled = GTK_BUTTON(GET_OBJECT("button_keyboard_scaled"));
remmina_pref_dialog->button_keyboard_grab_keyboard = GTK_BUTTON(GET_OBJECT("button_keyboard_grab_keyboard"));
remmina_pref_dialog->button_keyboard_screenshot = GTK_BUTTON(GET_OBJECT("button_keyboard_screenshot"));
remmina_pref_dialog->button_keyboard_viewonly = GTK_BUTTON(GET_OBJECT("button_keyboard_viewonly"));
remmina_pref_dialog->button_keyboard_minimize = GTK_BUTTON(GET_OBJECT("button_keyboard_minimize"));
remmina_pref_dialog->button_keyboard_disconnect = GTK_BUTTON(GET_OBJECT("button_keyboard_disconnect"));
remmina_pref_dialog->button_keyboard_toolbar = GTK_BUTTON(GET_OBJECT("button_keyboard_toolbar"));
Expand Down
1 change: 1 addition & 0 deletions remmina/src/remmina_pref_dialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ typedef struct _RemminaPrefDialog
GtkButton *button_keyboard_scaled;
GtkButton *button_keyboard_grab_keyboard;
GtkButton *button_keyboard_screenshot;
GtkButton *button_keyboard_viewonly;
GtkButton *button_keyboard_minimize;
GtkButton *button_keyboard_disconnect;
GtkButton *button_keyboard_toolbar;
Expand Down
29 changes: 29 additions & 0 deletions remmina/ui/remmina_preferences.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,35 @@ Author: Antenore Gatta
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_keyboard_viewonly">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">View-only mode</property>
<property name="ellipsize">start</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">10</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button_keyboard_viewonly">
<property name="label" translatable="yes">VIEW-ONLY MODE</property>
<property name="width_request">100</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="remmina_pref_dialog_on_key_chooser" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">10</property>
<property name="width">2</property>
</packing>
</child>
</object>
</child>
</object>
Expand Down