pidgin/pidgin

Fix transparency plugin for display list/pref changes

13 months ago, Elliott Sales de Andrade
04c0398f1046
Fix transparency plugin for display list/pref changes

There is no longer a buddy list/conversation split, so remove the duplicate settings (half of which were not used any more), and rename them without the differentiating prefix. Also, now that there's only one thing, there's no need for a second "enabled" setting in the plugin that just duplicates the plugin's enabled setting itself, so I removed it.

Instead of adding and removing a slider when the setting changes, I instead opted to always add it, and bind its visibility to the setting instead.

We no longer need a `gtk-config-frame` now that Pidgin uses GPlugin's plugin settings, so remove that and correctly wire up the settings schema so that GPlugin automatically displays settings.

Finally, the scale UI and alpha setting had different ranges. If the setting was moved below the scale's minimum, it would clamp it but not resend that value back to the setting, so things would appear inconsistent. To rectify this, I changed the setting's range up to match the scale.

Testing Done:
* Enabled Transparency plugin, changed around the transparency level and confirmed the main window became transparent.
* Toggled the solid-on-focus setting and confirmed the window lost transparency when focused.
* Toggled the slider setting and confirmed it was added/removed from the window.
* When slider was enabled, changed the setting and confirmed the slider changed and vice versa.

Reviewed at https://reviews.imfreedom.org/r/2394/
/*
* finch
*
* Finch is the legal property of its developers, whose names are too numerous
* to list here. Please refer to the COPYRIGHT file distributed with this
* source distribution.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include <glib/gi18n-lib.h>
#include <purple.h>
#include <gnt.h>
#include "gntnotify.h"
static void
notify_msg_window_destroy_cb(GntWidget *window, PurpleNotifyType type)
{
purple_notify_close(type, window);
}
static void *
finch_notify_common(PurpleNotifyType ntype, PurpleNotifyMessageType msgtype,
const char *title, const char *primary,
const char *secondary,
G_GNUC_UNUSED PurpleRequestCommonParameters *cpar)
{
GntWidget *window, *button;
GntTextFormatFlags pf = 0, sf = 0;
switch (msgtype)
{
case PURPLE_NOTIFY_MSG_ERROR:
sf |= GNT_TEXT_FLAG_BOLD;
/* fall through */
case PURPLE_NOTIFY_MSG_WARNING:
pf |= GNT_TEXT_FLAG_UNDERLINE;
/* fall through */
case PURPLE_NOTIFY_MSG_INFO:
pf |= GNT_TEXT_FLAG_BOLD;
break;
}
window = gnt_window_box_new(FALSE, TRUE);
gnt_box_set_title(GNT_BOX(window), title);
gnt_box_set_fill(GNT_BOX(window), FALSE);
gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_MID);
gnt_box_set_pad(GNT_BOX(window), 0);
if (primary)
gnt_box_add_widget(GNT_BOX(window),
gnt_label_new_with_format(primary, pf));
button = gnt_button_new(_("OK"));
if (secondary) {
GntWidget *msg;
if (ntype == PURPLE_NOTIFY_FORMATTED) {
int width = -1, height = -1;
char *plain = (char*)secondary;
msg = gnt_text_view_new();
gnt_text_view_set_flag(GNT_TEXT_VIEW(msg), GNT_TEXT_VIEW_TOP_ALIGN | GNT_TEXT_VIEW_NO_SCROLL);
plain = purple_markup_strip_html(secondary);
if (!gnt_util_parse_xhtml_to_textview(secondary, GNT_TEXT_VIEW(msg)))
gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(msg), plain, sf);
gnt_text_view_attach_scroll_widget(GNT_TEXT_VIEW(msg), button);
gnt_util_get_text_bound(plain, &width, &height);
gnt_widget_set_size(msg, width + 3, height + 1);
if (plain != secondary)
g_free(plain);
} else {
msg = gnt_label_new_with_format(secondary, sf);
}
gnt_box_add_widget(GNT_BOX(window), msg);
g_object_set_data(G_OBJECT(window), "info-widget", msg);
}
gnt_box_add_widget(GNT_BOX(window), button);
g_signal_connect_swapped(G_OBJECT(button), "activate",
G_CALLBACK(gnt_widget_destroy), window);
g_signal_connect(G_OBJECT(window), "destroy",
G_CALLBACK(notify_msg_window_destroy_cb), GINT_TO_POINTER(ntype));
gnt_widget_show(window);
return window;
}
/* handle is, in all/most occasions, a GntWidget * */
static void finch_close_notify(PurpleNotifyType type, void *handle)
{
GntWidget *widget = handle;
if (!widget)
return;
widget = gnt_widget_get_toplevel(widget);
if (type == PURPLE_NOTIFY_SEARCHRESULTS)
purple_notify_searchresults_free(g_object_get_data(handle, "notify-results"));
#if 1
/* This did not seem to be necessary */
g_signal_handlers_disconnect_by_func(G_OBJECT(widget),
G_CALLBACK(notify_msg_window_destroy_cb), GINT_TO_POINTER(type));
#endif
gnt_widget_destroy(widget);
}
static void *
finch_notify_message(PurpleNotifyMessageType type, const char *title,
const char *primary, const char *secondary,
PurpleRequestCommonParameters *cpar)
{
return finch_notify_common(PURPLE_NOTIFY_MESSAGE, type, title, primary,
secondary, cpar);
}
static void *finch_notify_formatted(const char *title, const char *primary,
const char *secondary, const char *text)
{
char *xhtml = NULL;
char *t = g_strdup_printf("<span>%s%s%s</span>",
secondary ? secondary : "",
secondary ? "\n" : "",
text ? text : "");
void *ret;
purple_markup_html_to_xhtml(t, &xhtml, NULL);
ret = finch_notify_common(PURPLE_NOTIFY_FORMATTED,
PURPLE_NOTIFY_MSG_INFO, title, primary, xhtml, NULL);
g_free(t);
g_free(xhtml);
return ret;
}
/** User information. **/
static GHashTable *userinfo;
static char *
userinfo_hash(PurpleAccount *account, const char *who)
{
char key[256];
g_snprintf(key, sizeof(key), "%s - %s",
purple_contact_info_get_username(PURPLE_CONTACT_INFO(account)),
purple_normalize(account, who));
return g_utf8_strup(key, -1);
}
static void
remove_userinfo(G_GNUC_UNUSED GntWidget *widget, gpointer key)
{
g_hash_table_remove(userinfo, key);
}
static char *
purple_notify_user_info_get_xhtml(PurpleNotifyUserInfo *user_info)
{
GList *l;
GString *text;
text = g_string_new("<span>");
for (l = purple_notify_user_info_get_entries(user_info)->head; l != NULL;
l = l->next) {
PurpleNotifyUserInfoEntry *user_info_entry = l->data;
PurpleNotifyUserInfoEntryType type = purple_notify_user_info_entry_get_entry_type(user_info_entry);
const char *label = purple_notify_user_info_entry_get_label(user_info_entry);
const char *value = purple_notify_user_info_entry_get_value(user_info_entry);
/* Handle the label/value pair itself */
if (type == PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER)
g_string_append(text, "<u>");
if (label)
g_string_append_printf(text, "<b>%s</b>", label);
g_string_append(text, "<span>");
if (label && value)
g_string_append(text, ": ");
if (value) {
char *strip = purple_markup_strip_html(value);
g_string_append(text, strip);
g_free(strip);
}
g_string_append(text, "</span>");
if (type == PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER)
g_string_append(text, "</u>");
else if (type == PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_BREAK)
g_string_append(text, "<HR/>");
g_string_append(text, "<BR/>");
}
g_string_append(text, "</span>");
return g_string_free(text, FALSE);
}
static void *
finch_notify_userinfo(PurpleConnection *gc, const char *who, PurpleNotifyUserInfo *user_info)
{
char *primary;
char *info;
void *ui_handle;
char *key = userinfo_hash(purple_connection_get_account(gc), who);
info = purple_notify_user_info_get_xhtml(user_info);
ui_handle = g_hash_table_lookup(userinfo, key);
if (ui_handle != NULL) {
GntTextView *msg = GNT_TEXT_VIEW(g_object_get_data(G_OBJECT(ui_handle), "info-widget"));
char *strip = purple_markup_strip_html(info);
int tvw, tvh, width, height, ntvw, ntvh;
GntWidget *window;
ui_handle = window = gnt_widget_get_toplevel(GNT_WIDGET(ui_handle));
gnt_widget_get_size(window, &width, &height);
gnt_widget_get_size(GNT_WIDGET(msg), &tvw, &tvh);
gnt_text_view_clear(msg);
if (!gnt_util_parse_xhtml_to_textview(info, msg))
gnt_text_view_append_text_with_flags(msg, strip, GNT_TEXT_FLAG_NORMAL);
gnt_text_view_scroll(msg, 0);
gnt_util_get_text_bound(strip, &ntvw, &ntvh);
ntvw += 3;
ntvh++;
gnt_screen_resize_widget(window, width + MAX(0, ntvw - tvw), height + MAX(0, ntvh - tvh));
g_free(strip);
g_free(key);
} else {
primary = g_strdup_printf(_("Info for %s"), who);
ui_handle = finch_notify_formatted(_("Buddy Information"), primary, NULL, info);
g_hash_table_insert(userinfo, key, ui_handle);
g_free(primary);
g_signal_connect(G_OBJECT(ui_handle), "destroy", G_CALLBACK(remove_userinfo), key);
}
g_free(info);
return ui_handle;
}
static void
notify_button_activated(GntWidget *widget, PurpleNotifySearchButton *b)
{
GList *list = NULL;
PurpleAccount *account = g_object_get_data(G_OBJECT(widget), "notify-account");
gpointer data = g_object_get_data(G_OBJECT(widget), "notify-data");
list = gnt_tree_get_selection_text_list(GNT_TREE(g_object_get_data(G_OBJECT(widget), "notify-tree")));
b->callback(purple_account_get_connection(account), list, data);
g_list_free_full(list, g_free);
}
static void
finch_notify_sr_new_rows(G_GNUC_UNUSED PurpleConnection *gc,
PurpleNotifySearchResults *results, gpointer data)
{
GntWindow *window = GNT_WINDOW(data);
GntTree *tree = GNT_TREE(g_object_get_data(G_OBJECT(window), "tree-widget"));
GList *o;
GntTreeRow *prev = NULL;
gnt_tree_remove_all(GNT_TREE(tree));
for (o = results->rows; o; o = o->next)
{
gnt_tree_add_row_after(GNT_TREE(tree), o->data,
gnt_tree_create_row_from_list(GNT_TREE(tree), o->data),
NULL, prev);
prev = o->data;
}
}
static void
notify_sr_destroy_cb(GntWidget *window, G_GNUC_UNUSED gpointer data)
{
purple_notify_close(PURPLE_NOTIFY_SEARCHRESULTS, window);
}
static void *
finch_notify_searchresults(PurpleConnection *gc, const char *title,
const char *primary, const char *secondary,
PurpleNotifySearchResults *results, gpointer data)
{
GntWidget *window, *tree, *box, *button;
GList *iter;
int columns, i;
window = gnt_vbox_new(FALSE);
gnt_box_set_toplevel(GNT_BOX(window), TRUE);
gnt_box_set_title(GNT_BOX(window), title);
gnt_box_set_fill(GNT_BOX(window), TRUE);
gnt_box_set_pad(GNT_BOX(window), 0);
gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_MID);
if (primary)
gnt_box_add_widget(GNT_BOX(window),
gnt_label_new_with_format(primary, GNT_TEXT_FLAG_BOLD));
if (secondary)
gnt_box_add_widget(GNT_BOX(window),
gnt_label_new_with_format(secondary, GNT_TEXT_FLAG_NORMAL));
columns = g_list_length(results->columns);
tree = gnt_tree_new_with_columns(columns);
gnt_tree_set_show_title(GNT_TREE(tree), TRUE);
gnt_box_add_widget(GNT_BOX(window), tree);
i = 0;
for (iter = results->columns; iter; iter = iter->next)
{
PurpleNotifySearchColumn *column = iter->data;
gnt_tree_set_column_title(GNT_TREE(tree), i, purple_notify_searchresult_column_get_title(column));
if (!purple_notify_searchresult_column_is_visible(column))
gnt_tree_set_column_visible(GNT_TREE(tree), i, FALSE);
i++;
}
box = gnt_hbox_new(TRUE);
for (iter = results->buttons; iter; iter = iter->next)
{
PurpleNotifySearchButton *b = iter->data;
const char *text;
switch (b->type)
{
case PURPLE_NOTIFY_BUTTON_LABELED:
text = b->label;
break;
case PURPLE_NOTIFY_BUTTON_CONTINUE:
text = _("Continue");
break;
case PURPLE_NOTIFY_BUTTON_ADD:
text = _("Add");
break;
case PURPLE_NOTIFY_BUTTON_INFO:
text = _("Info");
break;
case PURPLE_NOTIFY_BUTTON_IM:
text = _("IM");
break;
case PURPLE_NOTIFY_BUTTON_JOIN:
text = _("Join");
break;
case PURPLE_NOTIFY_BUTTON_INVITE:
text = _("Invite");
break;
default:
text = _("(none)");
}
button = gnt_button_new(text);
g_object_set_data(G_OBJECT(button), "notify-account", purple_connection_get_account(gc));
g_object_set_data(G_OBJECT(button), "notify-data", data);
g_object_set_data(G_OBJECT(button), "notify-tree", tree);
g_signal_connect(G_OBJECT(button), "activate",
G_CALLBACK(notify_button_activated), b);
gnt_box_add_widget(GNT_BOX(box), button);
}
gnt_box_add_widget(GNT_BOX(window), box);
g_signal_connect(G_OBJECT(tree), "destroy",
G_CALLBACK(notify_sr_destroy_cb), NULL);
g_object_set_data(G_OBJECT(window), "tree-widget", tree);
finch_notify_sr_new_rows(gc, results, window);
g_signal_connect(G_OBJECT(window), "destroy",
G_CALLBACK(notify_msg_window_destroy_cb), GINT_TO_POINTER(PURPLE_NOTIFY_SEARCHRESULTS));
gnt_widget_show(window);
g_object_set_data(G_OBJECT(window), "notify-results", results);
return window;
}
static void *
finch_notify_uri(const char *url)
{
return finch_notify_common(PURPLE_NOTIFY_URI, PURPLE_NOTIFY_MSG_INFO,
_("URI"), url, NULL, NULL);
}
static PurpleNotifyUiOps ops = {
.notify_message = finch_notify_message,
.notify_formatted = finch_notify_formatted,
.notify_searchresults = finch_notify_searchresults,
.notify_searchresults_new_rows = finch_notify_sr_new_rows,
.notify_userinfo = finch_notify_userinfo,
.notify_uri = finch_notify_uri,
.close_notify = finch_close_notify,
};
PurpleNotifyUiOps *
finch_notify_get_ui_ops(void)
{
return &ops;
}
void
finch_notify_init(void)
{
userinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
}
void
finch_notify_uninit(void) {
g_clear_pointer(&userinfo, g_hash_table_destroy);
}