Commit d6a2e73f authored by Antenore Gatta's avatar Antenore Gatta

Merge branch 'tips' into 'master'

Tooltips in the remmina profile editor

See merge request Remmina/Remmina!1904
parents db5707dd 5297ba42
......@@ -257,7 +257,7 @@ static gboolean remmina_plugin_exec_close(RemminaProtocolWidget *gp)
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_exec_basic_settings[] =
{
......
......@@ -689,7 +689,7 @@ static gpointer quality_list[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_nx_basic_settings[] =
{
......@@ -710,7 +710,7 @@ static const RemminaProtocolSetting remmina_plugin_nx_basic_settings[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_nx_advanced_settings[] =
{
......
......@@ -1652,7 +1652,7 @@ static gpointer gwtransp_list[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_rdp_basic_settings[] =
{
......@@ -1673,7 +1673,7 @@ static const RemminaProtocolSetting remmina_rdp_basic_settings[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_rdp_advanced_settings[] =
{
......@@ -1689,11 +1689,11 @@ static const RemminaProtocolSetting remmina_rdp_advanced_settings[] =
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "exec", N_("Startup program"), FALSE, NULL, NULL},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "execpath", N_("Startup path"), FALSE, NULL, NULL},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "loadbalanceinfo", N_("Load balance info"), FALSE, NULL, NULL},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "printername", N_("Local printer name"), FALSE, NULL, NULL},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "printerdriver", N_("Local printer driver"), FALSE, NULL, NULL},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "serialname", N_("Local serial name"), FALSE, NULL, NULL},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "serialdriver", N_("Local serial driver"), FALSE, NULL, NULL},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "serialpath", N_("Local serial path"), FALSE, NULL, NULL},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "printername", N_("Local printer name"), FALSE, NULL, N_("Name of the printer as it is defined locally, i.e. cupspdf")},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "printerdriver", N_("Local printer driver"), FALSE, NULL, N_("Full name of the printer driver, i.e. Samsung CLX-3300 Series PS")},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "serialname", N_("Local serial name"), FALSE, NULL, N_("COM1, COM2, etc")},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "serialdriver", N_("Local serial driver"), FALSE, NULL, N_("Serial")},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "serialpath", N_("Local serial path"), FALSE, NULL, N_("/dev/ttyS0, /dev/ttyS1, etc")},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "parallelname", N_("Local parallel name"), FALSE, NULL, NULL},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "parallelpath", N_("Local parallel device"), FALSE, NULL, NULL},
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "smartcardname", N_("Smartcard Name"), FALSE, NULL, NULL},
......
......@@ -419,7 +419,7 @@ static void remmina_plugin_spice_call_feature(RemminaProtocolWidget *gp, const R
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_spice_basic_settings[] =
{
......@@ -438,7 +438,7 @@ static const RemminaProtocolSetting remmina_plugin_spice_basic_settings[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_spice_advanced_settings[] =
{
......
......@@ -230,7 +230,7 @@ static gpointer term_list[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_st_basic_settings[] =
{
......@@ -246,7 +246,7 @@ static const RemminaProtocolSetting remmina_plugin_st_basic_settings[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_st_advanced_settings[] =
{
......
......@@ -77,7 +77,7 @@ static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_tool_basic_settings[] =
{
......
......@@ -1866,7 +1866,7 @@ static gpointer quality_list[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_vnc_basic_settings[] =
{
......@@ -1887,7 +1887,7 @@ static const RemminaProtocolSetting remmina_plugin_vnc_basic_settings[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_vnci_basic_settings[] =
{
......@@ -1907,7 +1907,7 @@ static const RemminaProtocolSetting remmina_plugin_vnci_basic_settings[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_vnc_advanced_settings[] =
{
......
......@@ -776,14 +776,14 @@ static gboolean remmina_plugin_www_get_snapshot(RemminaProtocolWidget *gp, Remmi
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_www_basic_settings[] =
{
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "server", N_("URL (http://address or https://address)"), FALSE, NULL, NULL },
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "username", N_("Username"), FALSE, NULL, NULL },
{ REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "password", N_("Password"), FALSE, NULL, NULL },
{ REMMINA_PROTOCOL_SETTING_TYPE_END, NULL, NULL, FALSE, NULL, NULL }
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "server", N_("URL"), FALSE, NULL, N_("http://address or https://address") },
{ REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "username", N_("Username"), FALSE, NULL, NULL },
{ REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "password", N_("Password"), FALSE, NULL, NULL },
{ REMMINA_PROTOCOL_SETTING_TYPE_END, NULL, NULL, FALSE, NULL, NULL }
};
/* Array of RemminaProtocolSetting for advanced settings.
......@@ -793,7 +793,7 @@ static const RemminaProtocolSetting remmina_plugin_www_basic_settings[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_www_advanced_settings[] =
{
......
......@@ -360,7 +360,7 @@ static gpointer colordepth_list[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_plugin_xdmcp_basic_settings[] =
{
......
......@@ -743,6 +743,8 @@ static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidge
g_dgettext(priv->plugin->domain, settings->label),
remmina_file_get_string(priv->remmina_file, setting_name));
g_hash_table_insert(priv->setting_widgets, setting_name, widget);
if (settings->opt2)
gtk_widget_set_tooltip_text (widget, (const gchar *)settings->opt2);
grid_row++;
break;
......@@ -752,6 +754,8 @@ static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidge
(const gpointer *)settings->opt1,
remmina_file_get_string(priv->remmina_file, setting_name));
g_hash_table_insert(priv->setting_widgets, setting_name, widget);
if (settings->opt2)
gtk_widget_set_tooltip_text (widget, (const gchar *)settings->opt2);
break;
case REMMINA_PROTOCOL_SETTING_TYPE_COMBO:
......@@ -760,6 +764,8 @@ static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidge
(const gchar *)settings->opt1,
remmina_file_get_string(priv->remmina_file, setting_name));
g_hash_table_insert(priv->setting_widgets, setting_name, widget);
if (settings->opt2)
gtk_widget_set_tooltip_text (widget, (const gchar *)settings->opt2);
break;
case REMMINA_PROTOCOL_SETTING_TYPE_CHECK:
......@@ -767,6 +773,8 @@ static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidge
g_dgettext(priv->plugin->domain, settings->label),
remmina_file_get_int(priv->remmina_file, setting_name, FALSE));
g_hash_table_insert(priv->setting_widgets, setting_name, widget);
if (settings->opt2)
gtk_widget_set_tooltip_text (widget, (const gchar *)settings->opt2);
break;
case REMMINA_PROTOCOL_SETTING_TYPE_FILE:
......@@ -775,6 +783,8 @@ static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidge
remmina_file_get_string(priv->remmina_file, setting_name),
GTK_FILE_CHOOSER_ACTION_OPEN);
g_hash_table_insert(priv->setting_widgets, setting_name, widget);
if (settings->opt2)
gtk_widget_set_tooltip_text (widget, (const gchar *)settings->opt2);
break;
case REMMINA_PROTOCOL_SETTING_TYPE_FOLDER:
......@@ -783,6 +793,8 @@ static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidge
remmina_file_get_string(priv->remmina_file, setting_name),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
g_hash_table_insert(priv->setting_widgets, setting_name, widget);
if (settings->opt2)
gtk_widget_set_tooltip_text (widget, (const gchar *)settings->opt2);
break;
default:
......
......@@ -341,7 +341,7 @@ static const RemminaProtocolFeature remmina_plugin_sftp_features[] =
* c) Setting description
* d) Compact disposition
* e) Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO
* f) Unused pointer
* f) Setting Tooltip
*/
static const RemminaProtocolSetting remmina_sftp_basic_settings[] =
{
......
......@@ -1045,7 +1045,7 @@ static RemminaProtocolFeature remmina_plugin_ssh_features[] =
* 3. Setting description.
* 4. Compact disposition.
* 5. Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO.
* 6. Unused pointer.
* 6. Setting Tooltip.
* .
*/
static const RemminaProtocolSetting remmina_ssh_basic_settings[] =
......@@ -1068,7 +1068,7 @@ static const RemminaProtocolSetting remmina_ssh_basic_settings[] =
* 3. Setting description.
* 4. Compact disposition.
* 5. Values for REMMINA_PROTOCOL_SETTING_TYPE_SELECT or REMMINA_PROTOCOL_SETTING_TYPE_COMBO.
* 6. Unused pointer.
* 6. Setting Tooltip.
*
*/
static const RemminaProtocolSetting remmina_ssh_advanced_settings[] =
......
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