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

SSH terminal color customization #432

Merged
merged 12 commits into from
Jan 7, 2015
Merged

SSH terminal color customization #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
384a860
Added a new setting to use system theme colors for the ssh/terminal w…
muflone Jan 3, 2015
6b1d126
Code cleanup
muflone Jan 3, 2015
d8c6288
Code cleanup
muflone Jan 3, 2015
d20ffd0
Merge branch 'Issues/91_old' into Issues/91
muflone Jan 4, 2015
8b8420e
Code cleanup
muflone Jan 4, 2015
4192875
Added customized foreground and background colors for SSH Terminal
muflone Jan 4, 2015
fb247c5
Updated translations
muflone Jan 4, 2015
557709f
Code cleanup
muflone Jan 4, 2015
7c9891a
Code cleanup
muflone Jan 6, 2015
4fd7c15
Added support for VTE 2.90
muflone Jan 6, 2015
dd1a5d8
Change error message for bad auth scheme in vnc plugin, fixes #433
giox069 Jan 5, 2015
98d4be9
Added a couple of translated strings for issue #433
muflone Jan 7, 2015
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
22 changes: 21 additions & 1 deletion remmina-plugins/vnc/vnc_plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,12 +1061,13 @@ N_("Your connection has been rejected.")
/* TODO: We only store the last message at this moment. */
#define MAX_ERROR_LENGTH 1000
static gchar vnc_error[MAX_ERROR_LENGTH + 1];
static gboolean vnc_encryption_disable_requested;

static void remmina_plugin_vnc_rfb_output(const char *format, ...)
{
va_list args;
va_start(args, format);
gchar *f, *p;
gchar *f, *p, *ff;

/* eliminate the last \n */
f = g_strdup (format);
Expand All @@ -1077,6 +1078,20 @@ static void remmina_plugin_vnc_rfb_output(const char *format, ...)
p = va_arg (args, gchar*);
g_snprintf (vnc_error, MAX_ERROR_LENGTH, _(f), _(p));
}
else if (g_strcmp0(f, "Unknown authentication scheme from VNC server: %s") == 0)
{
p = va_arg (args, gchar*);
if (vnc_encryption_disable_requested) {
ff = g_strconcat(_("Unknown authentication scheme from VNC server: %s"),
". ",
_("Please retry after enabling encryption on this profile."),
NULL);
g_snprintf (vnc_error, MAX_ERROR_LENGTH, ff, p);
g_free(ff);
}
else
g_snprintf (vnc_error, MAX_ERROR_LENGTH, _(f), p);
}
else
{
g_vsnprintf (vnc_error, MAX_ERROR_LENGTH, _(f), args);
Expand Down Expand Up @@ -1324,8 +1339,13 @@ static gboolean remmina_plugin_vnc_main(RemminaProtocolWidget *gp)

if (remmina_plugin_service->file_get_int(remminafile, "disableencryption", FALSE))
{
vnc_encryption_disable_requested = TRUE;
SetClientAuthSchemes (cl, remmina_plugin_vnc_no_encrypt_auth_types, -1);
}
else
{
vnc_encryption_disable_requested = FALSE;
}

if (rfbInitClient(cl, NULL, NULL))
break;
Expand Down
1 change: 0 additions & 1 deletion remmina/po/POTFILES.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,3 @@ remmina-plugins/telepathy/telepathy_plugin.c
remmina-plugins/telepathy/telepathy_channel_handler.c
remmina-plugins/telepathy/telepathy_handler.c
remmina-plugins-gnome/src/gkeyring_plugin.c
CMakeFiles/2.8.12.2/CompilerIdC/CMakeCCompilerId.c
108 changes: 62 additions & 46 deletions remmina/po/ar.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: remmina\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-12-29 22:34+0100\n"
"POT-Creation-Date: 2015-01-04 23:18+0100\n"
"PO-Revision-Date: 2012-11-24 05:44+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Arabic <[email protected]>\n"
Expand Down Expand Up @@ -229,17 +229,17 @@ msgid "Resize the window to fit in remote resolution"
msgstr ""

#: remmina/src/remmina_connection_window.c:1260
#: remmina/src/remmina_pref_dialog.c:611
#: remmina/src/remmina_pref_dialog.c:608
msgid "Toggle fullscreen mode"
msgstr ""

#: remmina/src/remmina_connection_window.c:1298
#: remmina/src/remmina_pref_dialog.c:643
#: remmina/src/remmina_pref_dialog.c:630
msgid "Switch tab pages"
msgstr ""

#: remmina/src/remmina_connection_window.c:1311
#: remmina/src/remmina_pref_dialog.c:672
#: remmina/src/remmina_pref_dialog.c:654
msgid "Toggle scaled mode"
msgstr ""

Expand All @@ -257,12 +257,12 @@ msgid "Tools"
msgstr ""

#: remmina/src/remmina_connection_window.c:1373
#: remmina/src/remmina_pref_dialog.c:704
#: remmina/src/remmina_pref_dialog.c:676
msgid "Minimize window"
msgstr ""

#: remmina/src/remmina_connection_window.c:1380
#: remmina/src/remmina_pref_dialog.c:720
#: remmina/src/remmina_pref_dialog.c:687
msgid "Disconnect"
msgstr ""

Expand Down Expand Up @@ -746,151 +746,167 @@ msgstr ""
msgid "Do not use tabs"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:147
#: remmina/src/remmina_pref_dialog.c:152
msgid "Please enter format 'widthxheight'."
msgstr ""

#: remmina/src/remmina_pref_dialog.c:157
#: remmina/src/remmina_pref_dialog.c:162
msgid "Recent lists cleared."
msgstr ""

#: remmina/src/remmina_pref_dialog.c:330
#: remmina/src/remmina_pref_dialog.c:352
msgid "Remmina Preferences"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:332
#: remmina/src/remmina_pref_dialog.c:354
msgid "_Close"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:346
#: remmina/src/remmina_pref_dialog.c:368
msgid "Options"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:365
#: remmina/src/remmina_pref_dialog.c:379
msgid "Remember last view mode for each connection"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:371
#: remmina/src/remmina_pref_dialog.c:385
msgid "Save settings when starting the connection"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:377
#: remmina/src/remmina_pref_dialog.c:391
msgid "Invisible toolbar in fullscreen mode"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:390
#: remmina/src/remmina_pref_dialog.c:404
msgid "Always show tabs"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:396
#: remmina/src/remmina_pref_dialog.c:410
msgid "Hide toolbar in tabbed interface"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:402
#: remmina/src/remmina_pref_dialog.c:416
msgid "Double-click action"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:412
#: remmina/src/remmina_pref_dialog.c:426
msgid "Default view mode"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:422
#: remmina/src/remmina_pref_dialog.c:436
msgid "Tab interface"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:432
#: remmina/src/remmina_pref_dialog.c:446
msgid "Scale quality"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:442
#: remmina/src/remmina_pref_dialog.c:456
msgid "SSH tunnel local port"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:455
#: remmina/src/remmina_pref_dialog.c:469
msgid "Auto scroll step size"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:468
#: remmina/src/remmina_pref_dialog.c:482
msgid "Maximum recent items"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:489
#: remmina/src/remmina_pref_dialog.c:503
msgid "Clear"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:495
#: remmina/src/remmina_pref_dialog.c:509
msgid "Resolutions"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:518
#: remmina/src/remmina_pref_dialog.c:531
msgid "Applet"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:537
#: remmina/src/remmina_pref_dialog.c:542
msgid "Show new connection on top of the menu"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:543
#: remmina/src/remmina_pref_dialog.c:549
msgid "Hide total count in group menu"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:549
#: remmina/src/remmina_pref_dialog.c:556
msgid "Disable tray icon"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:555
#: remmina/src/remmina_pref_dialog.c:563
msgid "Start Remmina in tray icon at user logon"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:563
#: remmina/src/remmina_pref_dialog.c:572
msgid "Minimize windows to tray"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:576 remmina/src/remmina_pref_dialog.c:857
#: remmina/src/remmina_pref_dialog.c:586 remmina/src/remmina_pref_dialog.c:818
msgid "Keyboard"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:595 remmina/src/remmina_pref_dialog.c:881
#: remmina/src/remmina_pref_dialog.c:597 remmina/src/remmina_pref_dialog.c:835
msgid "Host key"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:627
#: remmina/src/remmina_pref_dialog.c:619
msgid "Auto-fit window"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:688
#: remmina/src/remmina_pref_dialog.c:665
msgid "Grab keyboard"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:736
#: remmina/src/remmina_pref_dialog.c:698
msgid "Show / hide toolbar"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:753
#: remmina/src/remmina_pref_dialog.c:710
msgid "Terminal"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:772
#: remmina/src/remmina_pref_dialog.c:721
msgid "Font"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:782
#: remmina/src/remmina_pref_dialog.c:726
msgid "Use system default font"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:821
#: remmina/src/remmina_pref_dialog.c:754
msgid "Allow bold text"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:833
#: remmina/src/remmina_pref_dialog.c:761
msgid "Colors"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:766
msgid "Use system theme colors"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:775 remmina/src/remmina_pref_dialog.c:783
msgid "Foreground color"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:788 remmina/src/remmina_pref_dialog.c:796
msgid "Background color"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:804
msgid "Scrollback lines"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:875 remmina/src/remmina_ssh_plugin.c:341
#: remmina/src/remmina_pref_dialog.c:829 remmina/src/remmina_ssh_plugin.c:368
msgid "Copy"
msgstr ""

#: remmina/src/remmina_pref_dialog.c:905 remmina/src/remmina_ssh_plugin.c:342
#: remmina/src/remmina_pref_dialog.c:847 remmina/src/remmina_ssh_plugin.c:369
msgid "Paste"
msgstr ""

Expand Down Expand Up @@ -982,15 +998,15 @@ msgstr ""
msgid "Failed to initialize sftp session: %s"
msgstr ""

#: remmina/src/remmina_ssh_plugin.c:341
#: remmina/src/remmina_ssh_plugin.c:368
msgid "_Copy"
msgstr ""

#: remmina/src/remmina_ssh_plugin.c:342
#: remmina/src/remmina_ssh_plugin.c:369
msgid "_Paste"
msgstr ""

#: remmina/src/remmina_ssh_plugin.c:350
#: remmina/src/remmina_ssh_plugin.c:377
msgid "SSH - Secure Shell"
msgstr ""

Expand Down
Loading