IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove widget GncCombott - Part1

Browse Source 
It has been decided that per menu item tooltips is not required so it
has been removed and replaced with GtkComboBox where required.
This commit is contained in:
Robert Fewell 2021-02-18 17:35:25 +00:00
parent 97c480cb08
commit e1525721ad
6 changed files with 53 additions and 805 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnucash/gnome-utils/CMakeLists.txt
View File

@ -54,7 +54,6 @@ set (gnome_utils_SOURCES
gnc-cell-renderer-text-flag.c
gnc-cell-renderer-text-view.c
gnc-cell-view.c
gnc-combott.c
gnc-commodity-edit.c
gnc-component-manager.c
gnc-currency-edit.c
@ -145,7 +144,6 @@ set (gnome_utils_HEADERS
gnc-cell-renderer-text-flag.h
gnc-cell-renderer-text-view.h
gnc-cell-view.h
gnc-combott.h
gnc-commodity-edit.h
gnc-component-manager.h
gnc-currency-edit.h

101
gnucash/gnome-utils/dialog-options.c
View File

@ -39,7 +39,6 @@
#include "gnc-account-sel.h"
#include "gnc-tree-view-account.h"
#include "gnc-tree-model-account.h"
#include "gnc-combott.h"
#include "gnc-commodity-edit.h"
#include "gnc-component-manager.h"
#include "gnc-general-select.h"
@ -494,7 +493,6 @@ static void
gnc_option_multichoice_cb (GtkWidget *widget, gpointer data)
{
GNCOption *option = data;
/* GtkComboBox per-item tooltip changes needed below */
gnc_option_changed_widget_cb (widget, option);
}
@ -615,9 +613,8 @@ gnc_set_default_cost_policy_widget (SCM list_symbol)
gnc_scm_symbol_to_locale_string (list_symbol))
== 0)
{
/* GtkComboBox per-item tooltip changes needed below */
gnc_combott_set_active (
GNC_COMBOTT(
gtk_combo_box_set_active (
GTK_COMBO_BOX(
book_currency_data->default_cost_policy_widget), i);
}
i++;
@ -626,8 +623,8 @@ gnc_set_default_cost_policy_widget (SCM list_symbol)
}
else
{
gnc_combott_set_active (
GNC_COMBOTT(book_currency_data->default_cost_policy_widget), -1);
gtk_combo_box_set_active (
GTK_COMBO_BOX(book_currency_data->default_cost_policy_widget), -1);
}
}
@ -928,9 +925,9 @@ gnc_option_currency_accounting_non_book_cb (GtkWidget *widget, gpointer data)
{
gnc_currency_edit_clear_display (GNC_CURRENCY_EDIT(
book_currency_data->book_currency_widget));
gnc_combott_set_active (GNC_COMBOTT(
book_currency_data->default_cost_policy_widget),
-1);
gtk_combo_box_set_active (GTK_COMBO_BOX(
book_currency_data->default_cost_policy_widget),
-1);
gnc_set_default_gain_loss_account_widget (NULL);
gtk_widget_show_all (book_currency_data->book_currency_vbox);
gtk_widget_set_sensitive (book_currency_data->book_currency_vbox, FALSE);
@ -1016,33 +1013,26 @@ gnc_option_create_date_widget (GNCOption *option)
g_return_val_if_fail (num_values >= 0, NULL);
{
/* GtkComboBox still does not support per-item tooltips, so have
created a basic one called Combott implemented in gnc-combott.
Have highlighted changes in this file with comments for when
the feature of per-item tooltips is implemented in gtk,
see https://bugs.gnucash.org/show_bug.cgi?id=303717 */
GtkListStore *store;
GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING);
GtkTreeIter iter;
char *itemstring;
char *description;
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
/* Add values to the list store, entry and tooltip */
/* Add values to the list store */
for (i = 0; i < num_values; i++)
{
itemstring = gnc_option_permissible_value_name (option, i);
description = gnc_option_permissible_value_description (option, i);
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, itemstring, 1, description, -1);
gtk_list_store_set (store, &iter, 0, itemstring, -1);
if (itemstring)
g_free (itemstring);
if (description)
g_free (description);
}
/* Create the new Combo with tooltip and add the store */
rel_widget = GTK_WIDGET(gnc_combott_new ());
g_object_set (G_OBJECT(rel_widget), "model", GTK_TREE_MODEL(store), NULL );
/* Create the new Combo and add the store */
rel_widget = GTK_WIDGET(gtk_combo_box_new_with_model (GTK_TREE_MODEL(store)));
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(rel_widget), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT(rel_widget),
renderer, "text", 0);
g_object_unref (store);
g_signal_connect (G_OBJECT(rel_widget), "changed",
@ -1121,34 +1111,29 @@ gnc_option_create_multichoice_widget (GNCOption *option)
g_return_val_if_fail (num_values >= 0, NULL);
{
/* GtkComboBox still does not support per-item tooltips, so have
created a basic one called Combott implemented in gnc-combott.
Have highlighted changes in this file with comments for when
the feature of per-item tooltips is implemented in gtk,
see https://bugs.gnucash.org/show_bug.cgi?id=303717 */
GtkListStore *store;
GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING);
GtkTreeIter iter;
char *itemstring;
char *description;
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
/* Add values to the list store, entry and tooltip */
/* Add values to the list store */
for (i = 0; i < num_values; i++)
{
itemstring = gnc_option_permissible_value_name (option, i);
description = gnc_option_permissible_value_description (option, i);
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0,
(itemstring && *itemstring) ? _(itemstring) : "", 1,
(description && *description) ? _(description) : "", -1);
(itemstring && *itemstring) ? _(itemstring) : "", -1);
if (itemstring)
g_free (itemstring);
if (description)
g_free (description);
}
/* Create the new Combo with tooltip and add the store */
widget = GTK_WIDGET(gnc_combott_new ());
g_object_set (G_OBJECT( widget ), "model", GTK_TREE_MODEL(store), NULL );
/* Create the new Combo and add the store */
widget = GTK_WIDGET(gtk_combo_box_new_with_model (GTK_TREE_MODEL(store)));
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(widget), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT(widget),
renderer, "text", 0);
g_object_unref (store);
g_signal_connect (G_OBJECT(widget), "changed",
@ -3259,8 +3244,7 @@ gnc_option_set_ui_value_multichoice (GNCOption *option, gboolean use_default,
return TRUE;
else
{
/* GtkComboBox per-item tooltip changes needed below */
gnc_combott_set_active (GNC_COMBOTT(widget), index);
gtk_combo_box_set_active (GTK_COMBO_BOX(widget), index);
return FALSE;
}
}
@ -3288,8 +3272,7 @@ gnc_option_set_ui_value_date (GNCOption *option, gboolean use_default,
index = gnc_option_permissible_value_index (option, relative);
if (g_strcmp0 (date_option_type, "relative") == 0)
{
/* GtkComboBox per-item tooltip changes needed below */
gnc_combott_set_active (GNC_COMBOTT(widget), index);
gtk_combo_box_set_active (GTK_COMBO_BOX(widget), index);
}
else if (g_strcmp0 (date_option_type, "both") == 0)
{
@ -3301,8 +3284,7 @@ gnc_option_set_ui_value_date (GNCOption *option, gboolean use_default,
GNC_RD_WID_REL_WIDGET_POS);
g_list_free (widget_list);
gnc_date_option_set_select_method (option, FALSE, TRUE);
/* GtkComboBox per-item tooltip changes needed below */
gnc_combott_set_active (GNC_COMBOTT(rel_date_widget), index);
gtk_combo_box_set_active (GTK_COMBO_BOX(rel_date_widget), index);
}
else
bad_value = TRUE;
@ -3819,10 +3801,7 @@ gnc_option_get_ui_value_commodity (GNCOption *option, GtkWidget *widget)
static SCM
gnc_option_get_ui_value_multichoice (GNCOption *option, GtkWidget *widget)
{
int index;
/* GtkComboBox per-item tooltip changes needed below */
index = gnc_combott_get_active (GNC_COMBOTT(widget));
int index = gtk_combo_box_get_active (GTK_COMBO_BOX(widget));
return (gnc_option_permissible_value (option, index));
}
@ -3835,8 +3814,7 @@ gnc_option_get_ui_value_date (GNCOption *option, GtkWidget *widget)
if (g_strcmp0 (subtype, "relative") == 0)
{
/* GtkComboBox per-item tooltip changes needed below */
index = gnc_combott_get_active (GNC_COMBOTT(widget));
index = gtk_combo_box_get_active (GTK_COMBO_BOX(widget));
type = scm_from_locale_symbol ("relative");
val = gnc_option_permissible_value (option, index);
@ -3870,8 +3848,7 @@ gnc_option_get_ui_value_date (GNCOption *option, GtkWidget *widget)
}
else
{
/* GtkComboBox per-item tooltip changes needed below */
index = gnc_combott_get_active (GNC_COMBOTT(rel_widget));
index = gtk_combo_box_get_active (GTK_COMBO_BOX(rel_widget));
val = gnc_option_permissible_value (option, index);
result = scm_cons (scm_from_locale_symbol ("relative"), val);
@ -4129,9 +4106,9 @@ gnc_option_get_ui_value_currency_accounting (GNCOption *option,
{
GList *l = NULL;
gint i = 0;
/* GtkComboBox per-item tooltip changes needed below */
policy_index =
gnc_combott_get_active (GNC_COMBOTT(
gtk_combo_box_get_active (GTK_COMBO_BOX(
book_currency_data->default_cost_policy_widget));
for (l = list_of_policies; l != NULL; l = l->next)
{

35
gnucash/gnome-utils/dialog-utils.c
View File

@ -42,7 +42,6 @@
#include "gnc-ui.h"
#include "gnc-ui-util.h"
#include "gnc-prefs.h"
#include "gnc-combott.h"
#include "gnc-main-window.h"
/* This static indicates the debugging module that this .o belongs to. */
@ -833,37 +832,31 @@ gnc_cost_policy_select_new (void)
g_return_val_if_fail(g_list_length (list_of_policies) >= 0, NULL);
if (list_of_policies)
{
GtkListStore *store;
GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING);
GtkTreeIter iter;
GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
const char *description;
const char *hintstring;
GList *l = NULL;
store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
/* Add values to the list store, entry and tooltip */
for (l = list_of_policies; l != NULL; l = l->next)
{
GNCPolicy *pcy = l->data;
description = PolicyGetDescription(pcy);
hintstring = PolicyGetHint(pcy);
description = PolicyGetDescription (pcy);
gtk_list_store_append (store, &iter);
gtk_list_store_set
(store,
&iter,
0,
(description && *description) ? _(description) : "",
1,
(hintstring && *hintstring) ? _(hintstring) : "",
gtk_list_store_set (store, &iter,
0, (description && *description) ? _(description) : "",
-1);
}
g_list_free(list_of_policies);
/* Create the new Combo with tooltip and add the store */
cost_policy_widget = GTK_WIDGET(gnc_combott_new());
g_object_set( G_OBJECT( cost_policy_widget ),
"model",
GTK_TREE_MODEL(store),
NULL );
g_object_unref(store);
g_list_free (list_of_policies);
/* Create the new Combo with the store */
cost_policy_widget = gtk_combo_box_new_with_model (GTK_TREE_MODEL(store));
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(cost_policy_widget), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT(cost_policy_widget),
renderer, "text", 0);
g_object_unref (store);
}
return cost_policy_widget;
}

653
gnucash/gnome-utils/gnc-combott.c
View File

@ -1,653 +0,0 @@
/********************************************************************\
* gnc-combott.c -- Basic simulation of ComboBox with tooltips for *
* each item. *
* Copyright (c) 2012 Robert Fewell *
* *
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*
* This widget requires external ListStore which has two columns. *
* By default, column 0 holds the text to display and column 1 the *
* per item tooltip but these can be specified if the liststore has *
* a different format. *
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*
* *
* 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, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
#include <config.h>
#include <gtk/gtk.h>
#include "gnc-combott.h"
#include <strings.h>
#include <string.h>
#include "dialog-utils.h"
enum
{
CHANGED,
LAST_SIGNAL
};
enum
{
PROP_0,
PROP_MODEL,
PROP_ACTIVE,
PROP_TEXT_COL,
PROP_TIP_COL,
};
#define GNC_COMBOTT_GET_PRIVATE(o) \
((GncCombottPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_COMBOTT))
static guint combott_signals[LAST_SIGNAL] = {0,};
typedef struct GncCombottPrivate
{
GtkTreeModel *model;
GtkWidget *button;
GtkWidget *label;
GtkWidget *menu;
GtkTreeIter active_iter;
gint active;
gint text_col;
gint tip_col;
gint max_number_char;
gint num_items;
gint x;
gint y;
gint width;
gint height;
} GncCombottPrivate;
/** Declarations *********************************************************/
static void gnc_combott_init (GncCombott *combott);
static void gnc_combott_class_init (GncCombottClass *klass);
static void gnc_combott_set_property (GObject *object,
guint param_id,
const GValue *value,
GParamSpec *pspec);
static void gnc_combott_get_property (GObject *object,
guint param_id,
GValue *value,
GParamSpec *pspec);
static void gnc_combott_finalize (GObject *object);
static void gnc_combott_changed (GncCombott *combott);
static void gnc_combott_set_model (GncCombott *combott, GtkTreeModel *model);
static void gnc_combott_refresh_menu (GncCombott *combott, GtkTreeModel *model);
static void gnc_combott_rebuild_menu (GncCombott *combott, GtkTreeModel *model);
static gboolean which_tooltip_cb (GtkWidget *widget, gint x, gint y,
gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data);
static gboolean button_press_cb (GtkWidget *widget, GdkEvent *event, gpointer *user_data );
static void button_getsize_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer *user_data);
static void menu_getsize_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer *user_data);
static void menuitem_response_cb (GtkMenuItem *item, gpointer *user_data);
/************************************************************/
/* g_object required functions */
/************************************************************/
static GObjectClass *parent_class = NULL;
G_DEFINE_TYPE_WITH_PRIVATE(GncCombott, gnc_combott, GTK_TYPE_BOX)
static void
gnc_combott_class_init (GncCombottClass *klass)
{
GObjectClass *gobject_class;
parent_class = g_type_class_peek_parent (klass);
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->set_property = gnc_combott_set_property;
gobject_class->get_property = gnc_combott_get_property;
gobject_class->finalize = gnc_combott_finalize;
klass->changed = gnc_combott_changed;
combott_signals[CHANGED] =
g_signal_new ("changed",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GncCombottClass, changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
g_object_class_install_property (
gobject_class,
PROP_MODEL,
g_param_spec_object ("model",
"Combott model",
"The model for the combo tooltip",
GTK_TYPE_TREE_MODEL,
G_PARAM_READWRITE));
g_object_class_install_property (
gobject_class,
PROP_TEXT_COL,
g_param_spec_int ("text-col",
"text column",
"Column for the text",
0,
G_MAXINT,
0,
G_PARAM_READWRITE));
g_object_class_install_property (
gobject_class,
PROP_TIP_COL,
g_param_spec_int ("tip-col",
"tip column",
"Column for the tip",
0,
G_MAXINT,
1,
G_PARAM_READWRITE));
}
static void
gnc_combott_init (GncCombott *combott)
{
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *arrow;
GtkWidget *button;
GtkWidget *sep;
GtkStyleContext *context;
GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
gtk_orientable_set_orientation (GTK_ORIENTABLE(combott), GTK_ORIENTATION_HORIZONTAL);
// Set the name for this widget so it can be easily manipulated with css
gtk_widget_set_name (GTK_WIDGET(combott), "gnc-id-combo-tooltip");
priv->active = 0;
priv->text_col = 0;
priv->tip_col = 1;
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE);
arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
gtk_widget_set_margin_start (GTK_WIDGET(arrow), 5);
gtk_box_pack_end (GTK_BOX (hbox), arrow, FALSE, FALSE, 0);
sep = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
gtk_box_pack_end (GTK_BOX (hbox), sep, FALSE, FALSE, 0);
label = gtk_label_new(NULL);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
priv->label = label;
context = gtk_widget_get_style_context (priv->label);
gtk_style_context_add_class (context, "combo");
button = gtk_button_new();
gtk_container_add(GTK_CONTAINER(button), GTK_WIDGET(hbox));
priv->button = button;
context = gtk_widget_get_style_context (priv->button);
gtk_style_context_add_class (context, "combo");
gtk_container_add(GTK_CONTAINER(combott), GTK_WIDGET(button));
g_signal_connect (button, "event",
G_CALLBACK (button_press_cb), combott);
gtk_widget_set_has_tooltip (GTK_WIDGET(combott), TRUE);
g_signal_connect(G_OBJECT(combott), "query-tooltip",
G_CALLBACK(which_tooltip_cb), combott);
g_signal_connect(G_OBJECT(combott), "size-allocate",
G_CALLBACK(button_getsize_cb), combott);
gtk_widget_show(GTK_WIDGET(priv->button));
}
static void
gnc_combott_set_property (GObject *object,
guint param_id,
const GValue *value,
GParamSpec *pspec)
{
GncCombott *combott = GNC_COMBOTT (object);
GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
switch (param_id)
{
case PROP_MODEL:
gnc_combott_set_model (combott, g_value_get_object (value));
break;
case PROP_ACTIVE:
gnc_combott_set_active (combott, g_value_get_int (value));
break;
case PROP_TEXT_COL:
priv->text_col = g_value_get_int (value);
break;
case PROP_TIP_COL:
priv->tip_col = g_value_get_int (value);
gnc_combott_refresh_menu(combott, priv->model);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
}
}
/* Note that g_value_set_object() refs the object, as does
* g_object_get(). But g_object_get() only unrefs once when it disgorges
* the object, leaving an unbalanced ref, which leaks. So instead of
* using g_value_set_object(), use g_value_take_object() which doesn't
* ref the object when used in get_property().
*/
static void
gnc_combott_get_property (GObject *object,
guint param_id,
GValue *value,
GParamSpec *pspec)
{
GncCombott *combott = GNC_COMBOTT (object);
GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
switch (param_id)
{
case PROP_MODEL:
g_value_take_object (value, priv->model);
break;
case PROP_ACTIVE:
g_value_set_int (value, gnc_combott_get_active (combott));
break;
case PROP_TEXT_COL:
g_value_set_int (value, priv->text_col);
break;
case PROP_TIP_COL:
g_value_set_int (value, priv->tip_col);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
}
}
static void
gnc_combott_finalize (GObject *object)
{
GncCombott *combott;
GncCombottPrivate *priv;
g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_COMBOTT (object));
combott = GNC_COMBOTT (object);
priv = GNC_COMBOTT_GET_PRIVATE (combott);
if (priv->model)
{
priv->model = NULL;
}
if (priv->menu)
{
priv->menu = NULL;
}
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
gnc_combott_set_model (GncCombott *combott, GtkTreeModel *model)
{
GncCombottPrivate *priv;
g_return_if_fail (GNC_IS_COMBOTT (combott));
g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
priv = GNC_COMBOTT_GET_PRIVATE (combott);
gnc_combott_rebuild_menu(combott, model);
priv->model = model;
g_object_ref (priv->model);
}
static void
gnc_combott_rebuild_menu (GncCombott *combott, GtkTreeModel *model)
{
GncCombottPrivate *priv;
GtkTreeIter iter;
GtkWidget *menu_items;
gboolean valid;
gint num = 1;
gint items = 0;
g_return_if_fail (GNC_IS_COMBOTT (combott));
g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
priv = GNC_COMBOTT_GET_PRIVATE (combott);
priv->menu = NULL;
priv->menu = gtk_menu_new();
valid = gtk_tree_model_get_iter_first (model, &iter);
while (valid)
{
GtkWidget *label;
/* Walk through the list, reading each row */
gchar *str_data;
gchar *tip_data;
gtk_tree_model_get (model, &iter,
priv->text_col, &str_data,
priv->tip_col, &tip_data,
-1);
/* Create a new menu-item with a name... */
menu_items = gtk_menu_item_new_with_label (str_data);
/* Get widget width to max number of characters in list */
if(strlen(str_data) > num)
num = strlen(str_data);
/* Add the tooltip to the child label */
label = gtk_bin_get_child(GTK_BIN(menu_items));
gtk_widget_set_tooltip_text (label, tip_data);
gnc_label_set_alignment (label, 0, 0.5);
/* ...and add it to the menu. */
gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menu_items);
g_signal_connect (menu_items, "activate",
G_CALLBACK (menuitem_response_cb),
combott);
/* Show the widget */
gtk_widget_show (menu_items);
g_free (str_data);
g_free (tip_data);
items++;
valid = gtk_tree_model_iter_next (model, &iter);
}
g_signal_connect(G_OBJECT(priv->menu), "size-allocate", G_CALLBACK(menu_getsize_cb), combott);
/* Set widget width to max number of characters in list */
priv->max_number_char = num;
gtk_label_set_width_chars(GTK_LABEL(priv->label), priv->max_number_char);
priv->num_items = items;
}
static void
gnc_combott_refresh_menu (GncCombott *combott, GtkTreeModel *model)
{
g_return_if_fail (GNC_IS_COMBOTT (combott));
g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
gnc_combott_rebuild_menu(combott, model);
}
static void
gnc_combott_changed(GncCombott *combott)
{
/*
g_print("Changed Signal\n");
*/
}
static void
button_getsize_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer *user_data)
{
GncCombott *combott = GNC_COMBOTT (user_data);
GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
priv->width = allocation->width;
priv->height = allocation->height;
priv->x = allocation->x;
priv->y = allocation->y;
}
static void
menu_getsize_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer *user_data)
{
GncCombott *combott = GNC_COMBOTT (user_data);
GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
/* Set the menu width */
gtk_widget_set_size_request (widget, priv->width - 6, allocation->height);
}
static gboolean
which_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data)
{
gchar *text = "";
GncCombott *combott = GNC_COMBOTT (user_data);
GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
if(priv->active != 0)
{
gtk_tree_model_get( priv->model, &priv->active_iter, priv->tip_col, &text, -1 );
if(g_strcmp0(text, "") && (text != NULL))
{
gtk_tooltip_set_text (tooltip, text);
g_free(text);
return TRUE;
}
else
{
g_free(text);
return FALSE;
}
}
return FALSE;
}
static gboolean
button_press_cb (GtkWidget *widget, GdkEvent *event, gpointer *user_data )
{
GncCombott *combott = GNC_COMBOTT (user_data);
GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
if(priv->model != NULL)
{
if (event->type == GDK_BUTTON_PRESS)
{
gtk_menu_popup_at_widget (GTK_MENU(priv->menu),
widget,
GDK_GRAVITY_SOUTH_WEST,
GDK_GRAVITY_NORTH_WEST,
event);
/* Tell calling code that we have handled this event; the buck
* stops here. */
return TRUE;
}
}
/* Tell calling code that we have not handled this event; pass it on. */
return FALSE;
}
static void
menuitem_response_cb (GtkMenuItem *item, gpointer *user_data )
{
const gchar *label_text;
GtkTreeIter iter, iter_now = {0, NULL, NULL, NULL};
gboolean valid;
gint active = 1;
gint active_now = 1;
GncCombott *combott = GNC_COMBOTT (user_data);
GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
label_text = gtk_menu_item_get_label (item);
/* Set the button Label */
gtk_label_set_text(GTK_LABEL(priv->label), label_text);
gnc_label_set_alignment (priv->label, 0, 0.5);
/* Get the corresponding entry in the list store */
valid = gtk_tree_model_get_iter_first (priv->model, &iter);
while (valid)
{
/* Walk through the list, reading each row */
gchar *str_data;
gchar *tip_data;
gtk_tree_model_get (priv->model, &iter,
priv->text_col, &str_data,
priv->tip_col, &tip_data,
-1);
if(!g_strcmp0(str_data, label_text))
{
active_now = active;
iter_now = iter;
}
g_free (str_data);
g_free (tip_data);
active ++;
valid = gtk_tree_model_iter_next (priv->model, &iter);
}
/* Emit Changed signal if we have selected a new entry */
if(priv->active != active_now)
{
priv->active = active_now;
priv->active_iter = iter_now;
g_signal_emit (combott, combott_signals[CHANGED], 0);
}
}
GncCombott *
gnc_combott_new (void)
{
GObject *hbox;
hbox = g_object_new (GNC_TYPE_COMBOTT, NULL);
return GNC_COMBOTT (hbox);
}
gint
gnc_combott_get_active (GncCombott *combott)
{
GncCombottPrivate *priv;
gint result;
g_return_val_if_fail (GNC_IS_COMBOTT (combott), 0);
priv = GNC_COMBOTT_GET_PRIVATE (combott);
result = priv->active - 1;
return result;
}
void
gnc_combott_set_active (GncCombott *combott, gint index)
{
GncCombottPrivate *priv;
GtkTreeIter iter;
gboolean valid = TRUE;
gint active = 1;
g_return_if_fail (GNC_IS_COMBOTT (combott));
g_return_if_fail (index >= -1);
priv = GNC_COMBOTT_GET_PRIVATE (combott);
/* Do we have a valid model */
if (priv->model != NULL)
{
/* Is index the same as current option */
if(index + 1 != priv->active)
{
/* Set button label to blank for no selection */
if(index == -1)
{
priv->active = 0;
gtk_label_set_text(GTK_LABEL(priv->label), "");
g_signal_emit (combott, combott_signals[CHANGED], 0);
}
else
{
/* Get the corresponding entry in the list store */
valid = gtk_tree_model_get_iter_first (priv->model, &iter);
while (valid)
{
/* Walk through the list, reading each row */
gchar *str_data;
gchar *tip_data;
/* Make sure you terminate calls to gtk_tree_model_get()
* with a '-1' value */
gtk_tree_model_get (priv->model, &iter,
priv->text_col, &str_data,
priv->tip_col, &tip_data,
-1);
if(index + 1 == active)
{
priv->active = index + 1;
priv->active_iter = iter;
gtk_label_set_text(GTK_LABEL(priv->label), str_data);
gnc_label_set_alignment (priv->label, 0, 0.5);
g_signal_emit (combott, combott_signals[CHANGED], 0);
}
g_free (str_data);
g_free (tip_data);
active ++;
valid = gtk_tree_model_iter_next (priv->model, &iter);
}
}
}
}
}

66
gnucash/gnome-utils/gnc-combott.h
View File

@ -1,66 +0,0 @@
/********************************************************************\
* gnc-combott.h -- Basic simulation of ComboBox with tooltips for *
* each item. *
* Copyright (c) 2012 Robert Fewell *
* *
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*
* This widget requires external ListStore which has two columns. *
* By default, column 0 holds the text to display and column 1 the *
* per item tooltip but these can be specified if the liststore has *
* a different format. *
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*
* *
* 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, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
#ifndef __GNC_COMBOTT_H__
#define __GNC_COMBOTT_H__
/* type macros */
#define GNC_TYPE_COMBOTT (gnc_combott_get_type ())
#define GNC_COMBOTT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_COMBOTT, GncCombott))
#define GNC_COMBOTT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_COMBOTT, GncCombottClass))
#define GNC_IS_COMBOTT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_COMBOTT))
#define GNC_IS_COMBOTT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNC_TYPE_COMBOTT))
#define GNC_COMBOTT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_COMBOTT, GncCombottClass))
#define GNC_COMBOTT_NAME "GncCombott"
/* typedefs & structures */
typedef struct _GncCombott GncCombott;
typedef struct _GncCombottClass GncCombottClass;
struct _GncCombott
{
GtkBox hbox;
};
struct _GncCombottClass
{
GtkButtonClass parent;
void (* changed) (GncCombott *combott);
};
/* Standard g_object type */
GType gnc_combott_get_type (void);
GncCombott *gnc_combott_new (void);
gint gnc_combott_get_active (GncCombott *combott);
void gnc_combott_set_active (GncCombott *combott, gint index);
#endif /* __GNC_COMBOTT_H__ */

1
po/POTFILES.in
View File

@ -154,7 +154,6 @@ gnucash/gnome-utils/gnc-cell-renderer-popup-entry.c
gnucash/gnome-utils/gnc-cell-renderer-text-flag.c
gnucash/gnome-utils/gnc-cell-renderer-text-view.c
gnucash/gnome-utils/gnc-cell-view.c
gnucash/gnome-utils/gnc-combott.c
gnucash/gnome-utils/gnc-commodity-edit.c
gnucash/gnome-utils/gnc-component-manager.c
gnucash/gnome-utils/gnc-currency-edit.c