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

Merge Richard Cohen's 'remove-unneeded-code' into stable.

Browse Source
This commit is contained in:
John Ralls 2023-05-17 21:56:11 -05:00
commit 5563d53517
11 changed files with 16 additions and 642 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,6 @@ set (gnome_utils_SOURCES
gnc-commodity-edit.c
gnc-component-manager.c
gnc-currency-edit.c
gnc-date-delta.c
gnc-date-edit.c
gnc-date-format.c
gnc-dense-cal.c
@ -149,7 +148,6 @@ set (gnome_utils_HEADERS
gnc-commodity-edit.h
gnc-component-manager.h
gnc-currency-edit.h
gnc-date-delta.h
gnc-date-edit.h
gnc-date-format.h
gnc-dense-cal.h

431
gnucash/gnome-utils/gnc-date-delta.c
View File

@ -1,431 +0,0 @@
/*
* gnc-datedelta.c -- Date delta widget
*
* Copyright (C) 2000 Free Software Foundation
* All rights reserved.
*
* Gnucash is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License
* as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* Gnucash 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
* Library 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
*
*/
/*
@NOTATION@
*/
/*
* Date delta widget
*
* Author: Dave Peticolas <peticola@cs.ucdavis.edu>
*/
#include <config.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <string.h>
#include <stdlib.h> /* atoi */
#include <ctype.h> /* isdigit */
#include <stdio.h>
#include "gnc-date.h"
#include "gnc-date-delta.h"
#include "dialog-utils.h"
#define GDD_LABEL "gdd"
enum
{
VALUE_CHANGED,
UNITS_CHANGED,
POLARITY_CHANGED,
DELTA_CHANGED,
LAST_SIGNAL
};
static guint date_delta_signals [LAST_SIGNAL] = { 0 };
static void gnc_date_delta_init (GNCDateDelta *gdd);
static void gnc_date_delta_class_init (GNCDateDeltaClass *klass);
static void gnc_date_delta_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callbabck_data);
static GtkBoxClass *parent_class;
/**
* gnc_date_delta_get_type:
*
* Returns the GType for the GNCDateDelta widget
*/
GType
gnc_date_delta_get_type (void)
{
static GType date_delta_type = 0;
if (date_delta_type == 0)
{
GTypeInfo date_delta_info =
{
sizeof (GNCDateDeltaClass),
NULL,
NULL,
(GClassInitFunc) gnc_date_delta_class_init,
NULL,
NULL,
sizeof (GNCDateDelta),
0,
(GInstanceInitFunc) gnc_date_delta_init
};
date_delta_type = g_type_register_static (gtk_box_get_type (),
"GNCDateDelta",
&date_delta_info,
0);
}
return date_delta_type;
}
static void
gnc_date_delta_class_init (GNCDateDeltaClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
date_delta_signals [VALUE_CHANGED] =
g_signal_new ("value_changed",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GNCDateDeltaClass, value_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
date_delta_signals [UNITS_CHANGED] =
g_signal_new ("units_changed",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GNCDateDeltaClass, units_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
date_delta_signals [POLARITY_CHANGED] =
g_signal_new ("polarity_changed",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GNCDateDeltaClass, polarity_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
date_delta_signals [DELTA_CHANGED] =
g_signal_new ("delta_changed",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GNCDateDeltaClass, delta_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
container_class->forall = gnc_date_delta_forall;
}
static void
gnc_date_delta_init (GNCDateDelta *gdd)
{
gtk_orientable_set_orientation (GTK_ORIENTABLE(gdd), GTK_ORIENTATION_HORIZONTAL);
// Set the name for this widget so it can be easily manipulated with css
gtk_widget_set_name (GTK_WIDGET(gdd), "gnc-id-date-delta");
gdd->value_spin = NULL;
gdd->units_combo = NULL;
gdd->polarity_combo = NULL;
gdd->units = 0;
gdd->polarity = 0;
gdd->show_polarity = FALSE;
}
static void
gnc_date_delta_forall (GtkContainer *container, gboolean include_internals,
GtkCallback callback, gpointer callback_data)
{
g_return_if_fail (container != NULL);
g_return_if_fail (GNC_IS_DATE_DELTA (container));
g_return_if_fail (callback != NULL);
/* Let GtkBox handle things only if the internal widgets need to be
* poked.
*/
if (include_internals)
if (GTK_CONTAINER_CLASS (parent_class)->forall)
(* GTK_CONTAINER_CLASS (parent_class)->forall)
(container, include_internals, callback, callback_data);
}
static void
value_changed(GtkEditable *editable, gpointer data)
{
GNCDateDelta *gdd = GNC_DATE_DELTA(data);
g_signal_emit(gdd, date_delta_signals [VALUE_CHANGED], 0);
g_signal_emit(gdd, date_delta_signals [DELTA_CHANGED], 0);
}
static void
set_units (GtkComboBox *combo, GNCDateDelta *gdd)
{
gint active;
active = gtk_combo_box_get_active(GTK_COMBO_BOX(gdd->units_combo));
if ((active < GNC_DATE_DELTA_DAYS) || (active > GNC_DATE_DELTA_YEARS))
active = GNC_DATE_DELTA_DAYS;
gdd->units = active;
g_signal_emit (gdd, date_delta_signals [UNITS_CHANGED], 0);
g_signal_emit (gdd, date_delta_signals [DELTA_CHANGED], 0);
}
static void
fill_units_combo(GNCDateDelta *gdd)
{
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->units_combo),
_("Days"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->units_combo),
_("Weeks"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->units_combo),
_("Months"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->units_combo),
_("Years"));
g_signal_connect (gdd->units_combo, "changed",
G_CALLBACK (set_units), gdd);
}
static void
set_polarity (GtkComboBox *combo, GNCDateDelta *gdd)
{
gint active;
active = gtk_combo_box_get_active(GTK_COMBO_BOX(gdd->units_combo));
if ((active < GNC_DATE_DELTA_PAST) || (active > GNC_DATE_DELTA_FUTURE))
active = GNC_DATE_DELTA_PAST;
gdd->polarity = active;
g_signal_emit (gdd, date_delta_signals [POLARITY_CHANGED], 0);
g_signal_emit (gdd, date_delta_signals [DELTA_CHANGED], 0);
}
static void
fill_polarity_combo(GNCDateDelta *gdd)
{
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->polarity_combo),
_("Ago"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->polarity_combo),
_("From Now"));
g_signal_connect (gdd->polarity_combo, "changed",
G_CALLBACK(set_polarity), gdd);
}
static void
create_children (GNCDateDelta *gdd)
{
GInitiallyUnowned *adj;
adj = G_INITIALLY_UNOWNED (gtk_adjustment_new(1.0, 1.0, 1000.0, 1.0, 5.0, 5.0));
gdd->value_spin = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1.0, 0);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(gdd->value_spin), TRUE);
gtk_box_pack_start(GTK_BOX(gdd), gdd->value_spin, FALSE, FALSE, 0);
gtk_widget_show(gdd->value_spin);
g_signal_connect(gdd->value_spin, "changed",
G_CALLBACK(value_changed), gdd);
gdd->units_combo = gtk_combo_box_text_new();
fill_units_combo(gdd);
gtk_combo_box_set_active(GTK_COMBO_BOX(gdd->units_combo), 0);
gtk_box_pack_start(GTK_BOX(gdd), gdd->units_combo, FALSE, FALSE, 0);
gtk_widget_show(gdd->units_combo);
gdd->polarity_combo = gtk_combo_box_text_new();
fill_polarity_combo(gdd);
gtk_combo_box_set_active(GTK_COMBO_BOX(gdd->polarity_combo), 0);
gtk_box_pack_start(GTK_BOX(gdd), gdd->polarity_combo, FALSE, FALSE, 0);
if (gdd->show_polarity)
gtk_widget_show(gdd->polarity_combo);
}
/**
* gnc_date_delta_new:
* @show_polarity: whether 'from now/ago' menu should be displayed.
*
* Creates a new GNCDateDelta widget which can be used to provide
* an easy to use way for entering time deltas in terms of 7 days,
* 5 weeks, 2 months, etc.
*
* Returns a GNCDateDelta widget.
*/
GtkWidget *
gnc_date_delta_new (gboolean show_polarity)
{
GNCDateDelta *gdd;
gdd = g_object_new (gnc_date_delta_get_type (), NULL);
gdd->show_polarity = show_polarity;
create_children (gdd);
return GTK_WIDGET (gdd);
}
/**
* gnc_date_delta_set_value:
* @gdd: The GNCDateDelta widget
* @value: The value to set
*
* Changes the value of the delta widget to that given.
*/
void
gnc_date_delta_set_value (GNCDateDelta *gdd, int value)
{
g_return_if_fail(gdd != NULL);
g_return_if_fail(GNC_IS_DATE_DELTA(gdd));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(gdd->value_spin), value);
}
/**
* gnc_date_delta_get_value:
* @gdd: The GNCDateDelta widget
*
* Returns the value of the delta widget.
*/
int
gnc_date_delta_get_value (GNCDateDelta *gdd)
{
g_return_val_if_fail(gdd != NULL, 0);
g_return_val_if_fail(GNC_IS_DATE_DELTA(gdd), 0);
return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(gdd->value_spin));
}
/**
* gnc_date_delta_set_units:
* @gdd: The GNCDateDelta widget
* @units: The units to set
*
* Changes the units of the delta widget to that given.
*/
void
gnc_date_delta_set_units (GNCDateDelta *gdd, GNCDateDeltaUnits units)
{
g_return_if_fail(gdd != NULL);
g_return_if_fail(GNC_IS_DATE_DELTA(gdd));
g_return_if_fail((units >= 0) && (units < GNC_DATE_DELTA_NUM_UNITS));
gdd->units = units;
gtk_combo_box_set_active(GTK_COMBO_BOX(gdd->units_combo), units);
}
/**
* gnc_date_delta_get_units:
* @gdd: The GNCDateDelta widget
*
* Returns the units of the delta widget.
*/
GNCDateDeltaUnits
gnc_date_delta_get_units (GNCDateDelta *gdd)
{
g_return_val_if_fail(gdd != NULL, GNC_DATE_DELTA_DAYS);
g_return_val_if_fail(GNC_IS_DATE_DELTA(gdd), GNC_DATE_DELTA_DAYS);
return gdd->units;
}
/**
* gnc_date_delta_set_polarity:
* @gdd: The GNCDateDelta widget
* @polarity: The polarity to set
*
* Changes the polarity of the delta widget to that given.
*/
void
gnc_date_delta_set_polarity (GNCDateDelta *gdd, GNCDateDeltaPolarity polarity)
{
g_return_if_fail(gdd != NULL);
g_return_if_fail(GNC_IS_DATE_DELTA(gdd));
g_return_if_fail((polarity >= 0) &&
(polarity < GNC_DATE_DELTA_NUM_POLARITY));
gdd->polarity = polarity;
gtk_combo_box_set_active(GTK_COMBO_BOX(gdd->polarity_combo), polarity);
}
/**
* gnc_date_delta_get_polarity:
* @gdd: The GNCDateDelta widget
*
* Returns the polarity of the delta widget.
*/
GNCDateDeltaPolarity
gnc_date_delta_get_polarity (GNCDateDelta *gdd)
{
g_return_val_if_fail(gdd != NULL, GNC_DATE_DELTA_PAST);
g_return_val_if_fail(GNC_IS_DATE_DELTA(gdd), GNC_DATE_DELTA_PAST);
return gdd->polarity;
}
/**
* gnc_date_delta_show_polarity:
* @gdd: The GNCDateDelta widget
* @show_polarity: boolean flag
*
* Show/hide the polarity menu.
*/
void
gnc_date_delta_show_polarity (GNCDateDelta *gdd, gboolean show_polarity)
{
g_return_if_fail(gdd != NULL);
g_return_if_fail(GNC_IS_DATE_DELTA(gdd));
gdd->show_polarity = show_polarity;
if (show_polarity)
gtk_widget_show(gdd->polarity_combo);
else
gtk_widget_hide(gdd->polarity_combo);
}

94
gnucash/gnome-utils/gnc-date-delta.h
View File

@ -1,94 +0,0 @@
/*
* gnc-datedelta.h -- Date delta widget
*
* Copyright (C) 2000 Free Software Foundation
* All rights reserved.
*
* Author: Dave Peticolas <peticola@cs.ucdavis.edu>
*
* GnuCash is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* Gnucash 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
* Library 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
*
*/
/*
@NOTATION@
*/
#ifndef GNC_DATE_DELTA_H
#define GNC_DATE_DELTA_H
typedef enum
{
GNC_DATE_DELTA_DAYS,
GNC_DATE_DELTA_WEEKS,
GNC_DATE_DELTA_MONTHS,
GNC_DATE_DELTA_YEARS,
GNC_DATE_DELTA_NUM_UNITS
} GNCDateDeltaUnits;
typedef enum
{
GNC_DATE_DELTA_PAST,
GNC_DATE_DELTA_FUTURE,
GNC_DATE_DELTA_NUM_POLARITY
} GNCDateDeltaPolarity;
#define GNC_TYPE_DATE_DELTA (gnc_date_delta_get_type())
#define GNC_DATE_DELTA(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_DATE_DELTA , GNCDateDelta)
#define GNC_DATE_DELTA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_DATE_DELTA, GNCDateDeltaClass)
#define GNC_IS_DATE_DELTA(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GNC_TYPE_DATE_DELTA)
typedef struct
{
GtkBox hbox;
GtkWidget *value_spin;
GtkWidget *units_combo;
GtkWidget *polarity_combo;
GNCDateDeltaUnits units;
GNCDateDeltaPolarity polarity;
gboolean show_polarity;
} GNCDateDelta;
typedef struct
{
GtkBoxClass parent_class;
void (*value_changed) (GNCDateDelta *gdd);
void (*units_changed) (GNCDateDelta *gdd);
void (*polarity_changed) (GNCDateDelta *gdd);
void (*delta_changed) (GNCDateDelta *gdd);
} GNCDateDeltaClass;
GType gnc_date_delta_get_type (void);
GtkWidget *gnc_date_delta_new (gboolean show_polarity);
void gnc_date_delta_set_value (GNCDateDelta *gdd, int value);
int gnc_date_delta_get_value (GNCDateDelta *gdd);
void gnc_date_delta_set_units (GNCDateDelta *gdd, GNCDateDeltaUnits units);
GNCDateDeltaUnits gnc_date_delta_get_units (GNCDateDelta *gdd);
void gnc_date_delta_set_polarity (GNCDateDelta *gdd,
GNCDateDeltaPolarity polarity);
GNCDateDeltaPolarity gnc_date_delta_get_polarity (GNCDateDelta *gdd);
void gnc_date_delta_show_polarity (GNCDateDelta *gdd, gboolean show_polarity);
#endif

26
gnucash/gnome-utils/gnc-main-window.cpp
View File

@ -276,22 +276,6 @@ GNC_DEFINE_TYPE_WITH_CODE(GncMainWindow, gnc_main_window, GTK_TYPE_APPLICATION_W
* code. */
static guint main_window_signals[LAST_SIGNAL] = { 0 };
static void
toggle_change_state (GSimpleAction *simple,
GVariant *state,
gpointer user_data)
{
g_simple_action_set_state (simple, state);
}
static void
radio_change_state (GSimpleAction *simple,
GVariant *state,
gpointer user_data)
{
g_simple_action_set_state (simple, state);
}
/** An array of all of the actions provided by the main window code.
* This includes some placeholder actions for the menus that are
* visible in the menu bar but have no action associated with
@ -317,10 +301,10 @@ static GActionEntry gnc_menu_actions [] =
{ "ViewSortByAction", nullptr, nullptr, nullptr, nullptr },
{ "ViewFilterByAction", nullptr, nullptr, nullptr, nullptr },
{ "ViewRefreshAction", gnc_main_window_cmd_view_refresh, nullptr, nullptr, nullptr },
{ "ViewToolbarAction", gnc_main_window_cmd_view_toolbar, nullptr, "true", toggle_change_state },
{ "ViewSummaryAction", gnc_main_window_cmd_view_summary, nullptr, "true", toggle_change_state },
{ "ViewStatusbarAction", gnc_main_window_cmd_view_statusbar, nullptr, "true", toggle_change_state },
{ "ViewTabPositionAction", gnc_main_window_cmd_view_tab_position, "i", "@i 0", radio_change_state },
{ "ViewToolbarAction", gnc_main_window_cmd_view_toolbar, nullptr, "true", nullptr },
{ "ViewSummaryAction", gnc_main_window_cmd_view_summary, nullptr, "true", nullptr },
{ "ViewStatusbarAction", gnc_main_window_cmd_view_statusbar, nullptr, "true", nullptr },
{ "ViewTabPositionAction", gnc_main_window_cmd_view_tab_position, "i", "@i 0", nullptr },
{ "ScheduledAction", nullptr, nullptr, nullptr, nullptr },
@ -329,7 +313,7 @@ static GActionEntry gnc_menu_actions [] =
{ "WindowNewAction", gnc_main_window_cmd_window_new, nullptr, nullptr, nullptr },
{ "WindowMovePageAction", gnc_main_window_cmd_window_move_page, nullptr, nullptr, nullptr },
#ifndef MAC_INTEGRATION
{ "WindowAction", gnc_main_window_cmd_window_raise, "i", "@i 0", radio_change_state },
{ "WindowAction", gnc_main_window_cmd_window_raise, "i", "@i 0", nullptr },
#endif
{ "HelpTutorialAction", gnc_main_window_cmd_help_tutorial, nullptr, nullptr, nullptr },
{ "HelpContentsAction", gnc_main_window_cmd_help_contents, nullptr, nullptr, nullptr },

11
gnucash/gnome/gnc-plugin-page-invoice.c
View File

@ -96,15 +96,6 @@ static void gnc_plugin_page_invoice_cmd_edit_tax (GSimpleAction *simple, GVarian
static void gnc_plugin_page_redraw_help_cb (GnucashRegister *gsr, GncPluginPageInvoice *invoice_page);
static void gnc_plugin_page_invoice_refresh_cb (GHashTable *changes, gpointer user_data);
static void
radio_change_state (GSimpleAction *simple,
GVariant *state,
gpointer user_data)
{
g_simple_action_set_state (simple, state);
}
/************************************************************
* Actions *
************************************************************/
@ -135,7 +126,7 @@ static GActionEntry gnc_plugin_page_invoice_actions [] =
{ "BusinessLinkOpenAction", gnc_plugin_page_invoice_cmd_link_open, NULL, NULL, NULL },
{ "ToolsProcessPaymentAction", gnc_plugin_page_invoice_cmd_pay_invoice, NULL, NULL, NULL },
{ "ReportsCompanyReportAction", gnc_plugin_page_invoice_cmd_company_report, NULL, NULL, NULL },
{ "SortOrderRadioAction", gnc_plugin_page_invoice_cmd_sort_changed, "i", "@i 0", radio_change_state },
{ "SortOrderRadioAction", gnc_plugin_page_invoice_cmd_sort_changed, "i", "@i 0", NULL },
};
static guint gnc_plugin_page_invoice_n_actions = G_N_ELEMENTS(gnc_plugin_page_invoice_actions);

22
gnucash/gnome/gnc-plugin-page-register.c
View File

@ -243,22 +243,6 @@ static void gnc_plugin_page_register_event_handler (QofInstance* entity,
static GncInvoice* invoice_from_split (Split* split);
static GList* invoices_from_transaction (Transaction* trans);
static void
toggle_change_state (GSimpleAction *simple,
GVariant *state,
gpointer user_data)
{
g_simple_action_set_state (simple, state);
}
static void
radio_change_state (GSimpleAction *simple,
GVariant *state,
gpointer user_data)
{
g_simple_action_set_state (simple, state);
}
/************************************************************/
/* Actions */
/************************************************************/
@ -341,9 +325,9 @@ static GActionEntry gnc_plugin_page_register_actions [] =
{ "ReportsAccountReportAction", gnc_plugin_page_register_cmd_account_report, NULL, NULL, NULL },
{ "ReportsAcctTransReportAction", gnc_plugin_page_register_cmd_transaction_report, NULL, NULL, NULL },
{ "ViewStyleDoubleLineAction", gnc_plugin_page_register_cmd_style_double_line, NULL, "false", toggle_change_state },
{ "SplitTransactionAction", gnc_plugin_page_register_cmd_expand_transaction, NULL, "false", toggle_change_state },
{ "ViewStyleRadioAction", gnc_plugin_page_register_cmd_style_changed, "i", "@i 0", radio_change_state },
{ "ViewStyleDoubleLineAction", gnc_plugin_page_register_cmd_style_double_line, NULL, "false", NULL },
{ "SplitTransactionAction", gnc_plugin_page_register_cmd_expand_transaction, NULL, "false", NULL },
{ "ViewStyleRadioAction", gnc_plugin_page_register_cmd_style_changed, "i", "@i 0", NULL },
};
static guint gnc_plugin_page_register_n_actions = G_N_ELEMENTS(gnc_plugin_page_register_actions);

53
gnucash/gnome/gnc-split-reg.c
View File

@ -124,7 +124,6 @@ static void gsr_default_doclink_from_sheet_handler ( GNCSplitReg *w );
static void gsr_emit_simple_signal ( GNCSplitReg *gsr, const char *sigName );
static void gsr_emit_help_changed ( GnucashRegister *reg, gpointer user_data );
static void gsr_emit_show_popup_menu ( GnucashRegister *reg, gpointer user_data );
static void gsr_emit_include_date_signal ( GNCSplitReg *gsr, time64 date );
void gnc_split_reg_cut_cb(GtkWidget *w, gpointer data);
void gnc_split_reg_copy_cb(GtkWidget *w, gpointer data);
@ -269,13 +268,12 @@ gnc_split_reg_class_init( GNCSplitRegClass *klass )
{ REVERSE_TXN_SIGNAL, "reverse_txn", G_STRUCT_OFFSET( GNCSplitRegClass, reverse_txn_cb ) },
{ HELP_CHANGED_SIGNAL, "help-changed", G_STRUCT_OFFSET( GNCSplitRegClass, help_changed_cb ) },
{ SHOW_POPUP_MENU_SIGNAL, "show-popup-menu", G_STRUCT_OFFSET( GNCSplitRegClass, show_popup_menu_cb ) },
{ INCLUDE_DATE_SIGNAL, "include-date", G_STRUCT_OFFSET( GNCSplitRegClass, include_date_cb ) },
{ LAST_SIGNAL, NULL, 0 }
};
object_class = (GObjectClass*) klass;
for ( i = 0; signals[i].s != INCLUDE_DATE_SIGNAL; i++ )
for ( i = 0; signals[i].s != LAST_SIGNAL; i++ )
{
gnc_split_reg_signals[ signals[i].s ] =
g_signal_new( signals[i].signal_name,
@ -286,18 +284,6 @@ gnc_split_reg_class_init( GNCSplitRegClass *klass )
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0 );
}
/* Setup the non-default-marshalled signals; 'i' is still valid, here. */
/* "include-date" */
gnc_split_reg_signals[ INCLUDE_DATE_SIGNAL ] =
g_signal_new( "include-date",
G_TYPE_FROM_CLASS(object_class),
G_SIGNAL_RUN_LAST,
signals[i++].defaultOffset,
NULL, NULL,
g_cclosure_marshal_VOID__INT, /* time64 == int */
G_TYPE_NONE, 1, G_TYPE_INT );
g_assert( i == LAST_SIGNAL );
/* Setup the default handlers. */
klass->enter_ent_cb = gsr_default_enter_handler;
@ -321,7 +307,6 @@ gnc_split_reg_class_init( GNCSplitRegClass *klass )
klass->help_changed_cb = NULL;
klass->show_popup_menu_cb = NULL;
klass->include_date_cb = NULL;
object_class->dispose = gnc_split_reg_dispose;
}
@ -1736,18 +1721,11 @@ gnc_split_reg_clear_filter_for_split (GNCSplitReg *gsr, Split *split)
void
gnc_split_reg_jump_to_split(GNCSplitReg *gsr, Split *split)
{
Transaction *trans;
VirtualCellLocation vcell_loc;
SplitRegister *reg;
if (!gsr) return;
trans = xaccSplitGetParent(split);
gsr_emit_include_date_signal( gsr, xaccTransGetDate(trans) );
reg = gnc_ledger_display_get_split_register( gsr->ledger );
SplitRegister *reg = gnc_ledger_display_get_split_register( gsr->ledger );
VirtualCellLocation vcell_loc;
if (gnc_split_register_get_split_virt_loc(reg, split, &vcell_loc))
gnucash_register_goto_virt_cell( gsr->reg, vcell_loc );
@ -1760,17 +1738,11 @@ gnc_split_reg_jump_to_split(GNCSplitReg *gsr, Split *split)
void
gnc_split_reg_jump_to_split_amount(GNCSplitReg *gsr, Split *split)
{
VirtualLocation virt_loc;
SplitRegister *reg;
Transaction *trans;
if (!gsr) return;
trans = xaccSplitGetParent(split);
gsr_emit_include_date_signal( gsr, xaccTransGetDate(trans) );
reg = gnc_ledger_display_get_split_register (gsr->ledger);
SplitRegister *reg = gnc_ledger_display_get_split_register (gsr->ledger);
VirtualLocation virt_loc;
if (gnc_split_register_get_split_amount_virt_loc (reg, split, &virt_loc))
gnucash_register_goto_virt_loc (gsr->reg, virt_loc);
@ -2165,13 +2137,9 @@ gnc_split_reg_set_sort_reversed(GNCSplitReg *gsr, gboolean rev, gboolean refresh
static gboolean
gnc_split_reg_record (GNCSplitReg *gsr)
{
SplitRegister *reg;
Transaction *trans;
ENTER("gsr=%p", gsr);
reg = gnc_ledger_display_get_split_register (gsr->ledger);
trans = gnc_split_register_get_current_trans (reg);
SplitRegister *reg = gnc_ledger_display_get_split_register (gsr->ledger);
if (!gnc_split_register_save (reg, TRUE))
{
@ -2179,8 +2147,6 @@ gnc_split_reg_record (GNCSplitReg *gsr)
return FALSE;
}
gsr_emit_include_date_signal( gsr, xaccTransGetDate(trans) );
/* Explicit redraw shouldn't be needed,
* since gui_refresh events should handle this. */
/* gnc_split_register_redraw (reg); */
@ -2591,13 +2557,6 @@ gsr_emit_show_popup_menu( GnucashRegister *reg, gpointer user_data )
gsr_emit_simple_signal( (GNCSplitReg*)user_data, "show-popup-menu" );
}
static
void
gsr_emit_include_date_signal( GNCSplitReg *gsr, time64 date )
{
g_signal_emit_by_name( gsr, "include-date", date, NULL );
}
static
void
gsr_emit_simple_signal( GNCSplitReg *gsr, const char *sigName )

1
gnucash/gnome/gnc-split-reg.h
View File

@ -123,7 +123,6 @@ struct _GNCSplitRegClass
void (*reverse_txn_cb) ( GNCSplitReg *w, gpointer user_data );
void (*help_changed_cb) ( GNCSplitReg *w, gpointer user_data );
void (*show_popup_menu_cb) ( GNCSplitReg *w, gpointer user_data );
void (*include_date_cb) ( GNCSplitReg *w, time64 date, gpointer user_data );
};
/* Something somewhere sets these to silly values and causes problems */
#undef DELETE

10
gnucash/import-export/aqb/gnc-plugin-aqbanking.c
View File

@ -82,14 +82,6 @@ static void gnc_plugin_ab_cmd_aqb_import (GSimpleAction *simple, GVariant *param
#define MENU_TOGGLE_ACTION_AB_VIEW_LOGWINDOW "ABViewLogwindowAction"
static void
change_state_logwindow (GSimpleAction *simple,
GVariant *state,
gpointer user_data)
{
g_simple_action_set_state (simple, state);
}
static GActionEntry gnc_plugin_actions [] =
{
{ "OnlineActionsAction", NULL, NULL, NULL, NULL },
@ -101,7 +93,7 @@ static GActionEntry gnc_plugin_actions [] =
{ "ABIssueIntTransAction", gnc_plugin_ab_cmd_issue_inttransaction, NULL, NULL, NULL },
{ "ABIssueSepaDirectDebitAction", gnc_plugin_ab_cmd_issue_sepa_direct_debit, NULL, NULL, NULL },
{ "AQBankingImportAction", gnc_plugin_ab_cmd_aqb_import, NULL, NULL, NULL },
{ MENU_TOGGLE_ACTION_AB_VIEW_LOGWINDOW, gnc_plugin_ab_cmd_view_logwindow, NULL, "true", change_state_logwindow },
{ MENU_TOGGLE_ACTION_AB_VIEW_LOGWINDOW, gnc_plugin_ab_cmd_view_logwindow, NULL, "true", NULL },
};
/** The number of actions provided by this plugin. */
static guint gnc_plugin_n_actions = G_N_ELEMENTS(gnc_plugin_actions);

7
gnucash/register/register-gnome/gnucash-cursor.h
View File

@ -36,13 +36,6 @@
#define GNUCASH_CURSOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNUCASH_TYPE_CURSOR, GnucashCursorClass))
#define GNUCASH_IS_CURSOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNUCASH_TYPE_CURSOR))
#define GNUCASH_TYPE_ITEM_CURSOR (gnucash_item_cursor_get_type ())
#define GNUCASH_ITEM_CURSOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNUCASH_TYPE_ITEM_CURSOR, GnucashItemCursor))
#define GNUCASH_ITEM_CURSOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNUCASH_TYPE_ITEM_CURSOR, GnucashItemCursorClass))
#define GNUCASH_IS_ITEM_CURSOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNUCASH_TYPE_ITEM_CURSOR))
GType gnucash_item_cursor_get_type (void);
GType gnucash_cursor_get_type (void);

1
po/POTFILES.in
View File

@ -158,7 +158,6 @@ gnucash/gnome-utils/gnc-cell-view.c
gnucash/gnome-utils/gnc-commodity-edit.c
gnucash/gnome-utils/gnc-component-manager.c
gnucash/gnome-utils/gnc-currency-edit.c
gnucash/gnome-utils/gnc-date-delta.c
gnucash/gnome-utils/gnc-date-edit.c
gnucash/gnome-utils/gnc-date-format.c
gnucash/gnome-utils/gnc-dense-cal.c