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 'cleanup-some-gtk-usages' into stable.

Browse Source
This commit is contained in:
John Ralls 2023-05-25 07:27:13 -04:00
commit a036fe5915
12 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnucash/gnome-utils/gnc-cell-renderer-date.h
View File

@ -32,7 +32,7 @@
#define __GNC_CELL_RENDERER_DATE_H__
#include <glib-object.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <gnc-date.h>
#include "gnc-cell-renderer-popup.h"
#include "gnc-cell-renderer-popup-entry.h"

2
gnucash/gnome-utils/gnc-cell-renderer-popup-entry.h
View File

@ -31,7 +31,7 @@
#define __GNC_POPUP_ENTRY_H__
#include <pango/pango.h>
#include <gtk/gtkeventbox.h>
#include <gtk/gtk.h>
#define GNC_TYPE_POPUP_ENTRY (gnc_popup_entry_get_type ())
#define GNC_POPUP_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_POPUP_ENTRY, GncPopupEntry))

2
gnucash/gnome-utils/gnc-cell-renderer-popup.h
View File

@ -31,7 +31,7 @@
#define __GNC_CELL_RENDERER_POPUP_H__
#include <pango/pango.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtk.h>
#define GNC_TYPE_CELL_RENDERER_POPUP (gnc_cell_renderer_popup_get_type ())
#define GNC_CELL_RENDERER_POPUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_CELL_RENDERER_POPUP, GncCellRendererPopup))

2
gnucash/gnome-utils/gnc-cell-renderer-text-flag.h
View File

@ -26,7 +26,7 @@
#ifndef __GNC_CELL_RENDERER_TEXT_FLAG_H__
#define __GNC_CELL_RENDERER_TEXT_FLAG_H__
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtk.h>
#define GNC_TYPE_CELL_RENDERER_TEXT_FLAG (gnc_cell_renderer_text_flag_get_type ())

2
gnucash/gnome-utils/gnc-date-edit.c
View File

@ -192,7 +192,7 @@ day_selected_double_click (GtkCalendar *calendar, GNCDateEdit *gde)
}
static gint
delete_popup (GtkWidget *widget, gpointer data)
delete_popup (GtkWidget *widget, GdkEvent *event, gpointer data)
{
GNCDateEdit *gde;

2
gnucash/gnome-utils/gnc-dense-cal.h
View File

@ -103,7 +103,7 @@ struct _GncDenseCal
struct _GncDenseCalClass
{
GtkVBoxClass parent_class;
GtkBoxClass parent_class;
};
typedef struct _gdc_mark_data

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

@ -3010,7 +3010,7 @@ gnc_main_window_engine_commit_error_callback( gpointer data,
*
* @param tab_hbox The widget that should be added into the notebook
* tab for this page. Generally this is a GtkLabel, but could also
* be a GtkHBox containing an icon and a label.
* be a GtkBox containing an icon and a label.
*
* @param menu_label The widget that should be added into the
* notebook popup menu for this page. This should be a GtkLabel.

1
gnucash/gnome/dialog-order.c
View File

@ -648,7 +648,6 @@ gnc_order_new_window (GtkWindow *parent, QofBook *bookp, OrderDialogType type,
gnc_entry_ledger_set_parent (entry_ledger, ow->dialog);
vbox = GTK_WIDGET(gtk_builder_get_object (builder, "ledger_vbox"));
// gtk_box_pack_start (GTK_BOX(vbox), toolbar, FALSE, FALSE, 2);
gtk_box_pack_start (GTK_BOX(vbox), regWidget, TRUE, TRUE, 2);
/* Setup signals */

12
gnucash/gnucash-fallback.css
View File

@ -21,15 +21,15 @@
}
.gnc-class-intervention-required-dark {
background-color: shade (@intervention-required_bg_color, 0.7);
background-color: shade(@intervention-required_bg_color, 0.7);
}
.gnc-class-intervention-probably-required-dark {
background-color: shade (@intervention-probably-required_bg_color, 0.8);
background-color: shade(@intervention-probably-required_bg_color, 0.8);
}
.gnc-class-intervention-not-required-dark {
background-color: shade (@intervention-not-required_bg_color, 0.3);
background-color: shade(@intervention-not-required_bg_color, 0.3);
}
/* Negative value label colors */
@ -63,7 +63,7 @@ font-style: italic;
}
*.primary-dark {
background-color: shade (@primary_bg_color, 0.7);
background-color: shade(@primary_bg_color, 0.7);
}
*.secondary {
@ -71,7 +71,7 @@ font-style: italic;
}
*.secondary-dark {
background-color: shade (@secondary_bg_color, 0.7);
background-color: shade(@secondary_bg_color, 0.7);
}
*.markers {
@ -79,5 +79,5 @@ font-style: italic;
}
*.markers-dark {
background-color: shade (@marker_bg_color, 0.8);
background-color: shade(@marker_bg_color, 0.8);
}

12
gnucash/gnucash.css
View File

@ -43,7 +43,7 @@ gnc-id-cursor button {
}
*.gnc-class-register-primary:disabled {
background-color: mix (@register_primary_bg_color, grey, 0.2);
background-color: mix(@register_primary_bg_color, grey, 0.2);
}
*.gnc-class-register-secondary {
@ -51,7 +51,7 @@ gnc-id-cursor button {
}
*.gnc-class-register-secondary:disabled {
background-color: mix (@register_secondary_bg_color, grey, 0.2);
background-color: mix(@register_secondary_bg_color, grey, 0.2);
}
*.gnc-class-register-split {
@ -59,7 +59,7 @@ gnc-id-cursor button {
}
*.gnc-class-register-split:disabled {
background-color: mix (@register_split_bg_color, grey, 0.2);
background-color: mix(@register_split_bg_color, grey, 0.2);
}
*.gnc-class-register-cursor {
@ -67,16 +67,16 @@ gnc-id-cursor button {
}
*.gnc-class-register-cursor:disabled {
background-color: mix (@register_cursor_bg_color, grey, 0.2);
background-color: mix(@register_cursor_bg_color, grey, 0.2);
}
/* Change font color by mixing with grey */
.gnc-class-lighter-grey-mix {
color: mix (currentColor, grey, 0.8);
color: mix(currentColor, grey, 0.8);
}
.gnc-class-darker-grey-mix {
color: mix (currentColor, grey, 0.2);
color: mix(currentColor, grey, 0.2);
}
/* Highlight some text */

2
gnucash/import-export/customer-import/gnc-plugin-customer-import.c
View File

@ -28,8 +28,6 @@
#include <config.h>
//#include <glade/glade.h>
//#include <glade/glade-xml.h>
#include <glib/gi18n.h>
#include "dialog-utils.h"

8
gnucash/register/register-gnome/gnucash-date-picker.c
View File

@ -37,7 +37,7 @@ enum
LAST_SIGNAL
};
static GtkHBox *gnc_date_picker_parent_class;
static GtkBoxClass *gnc_date_picker_parent_class;
static guint gnc_date_picker_signals[LAST_SIGNAL];
@ -118,12 +118,10 @@ gnc_date_picker_key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
static void
gnc_date_picker_class_init (GNCDatePickerClass *date_picker_class)
{
GObjectClass *object_class;
gnc_date_picker_parent_class =
g_type_class_peek_parent (date_picker_class);
GTK_BOX_CLASS (g_type_class_peek_parent (date_picker_class));
object_class = G_OBJECT_CLASS (date_picker_class);
GObjectClass *object_class = G_OBJECT_CLASS (date_picker_class);
gtk_widget_class_set_css_name (GTK_WIDGET_CLASS(date_picker_class), "gnc-id-date-picker");