[gcalctool] Renamed ui-display and ui-buttons to math-display and math-buttons
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcalctool] Renamed ui-display and ui-buttons to math-display and math-buttons
- Date: Mon, 5 Apr 2010 23:53:23 +0000 (UTC)
commit c6ed20bf0ec2541c911d0b8b9698c851084ba6c1
Author: Robert Ancell <robert ancell gmail com>
Date: Tue Apr 6 08:25:43 2010 +1000
Renamed ui-display and ui-buttons to math-display and math-buttons
src/Makefile.am | 8 +-
src/display.c | 30 +++---
src/{ui-buttons.c => math-buttons.c} | 80 ++++++++--------
src/{ui-buttons.h => math-buttons.h} | 20 ++--
src/{ui-display.c => math-display.c} | 174 +++++++++++++++++-----------------
src/math-display.h | 78 +++++++++++++++
src/ui-display.h | 78 ---------------
src/ui.c | 12 +--
src/ui.h | 4 +-
9 files changed, 241 insertions(+), 243 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c113957..0f11c88 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,10 @@ gcalctool_SOURCES = \
display.h \
get.c \
get.h \
+ math-buttons.c \
+ math-buttons.h \
+ math-display.c \
+ math-display.h \
mp.c \
mp.h \
mp-binary.c \
@@ -34,10 +38,6 @@ gcalctool_SOURCES = \
register.h \
ui.c \
ui.h \
- ui-buttons.c \
- ui-buttons.h \
- ui-display.c \
- ui-display.h \
ui-preferences.c \
ui-preferences.h \
unittest.c \
diff --git a/src/display.c b/src/display.c
index 3b61891..26410aa 100644
--- a/src/display.c
+++ b/src/display.c
@@ -204,7 +204,7 @@ display_set_number(GCDisplay *display, const MPNumber *x)
display_set_string(display, text, -1);
enabled = display_get_unsigned_integer(display, &bit_value);
- ui_buttons_set_bitfield(ui_get_buttons(X), enabled, bit_value);
+ math_buttons_set_bitfield(ui_get_buttons(X), enabled, bit_value);
}
@@ -252,7 +252,7 @@ display_refresh(GCDisplay *display)
cursor = display_get_cursor(display);
display_make_text(display, localized, MAX_LOCALIZED, &cursor);
- ui_display_set(ui_get_display(X), localized, cursor);
+ math_display_set(ui_get_display(X), localized, cursor);
}
@@ -287,7 +287,7 @@ display_set_cursor(GCDisplay *display, int cursor)
void
display_set_error(GCDisplay *display, const char *message)
{
- ui_display_set_status(ui_get_display(X), message);
+ math_display_set_status(ui_get_display(X), message);
}
@@ -366,9 +366,9 @@ display_pop(GCDisplay *display)
{
if (display->h.current != display->h.begin) {
display->h.current = ((display->h.current - 1) % UNDO_HISTORY_LENGTH);
- ui_display_set_status(ui_get_display(X), "");
+ math_display_set_status(ui_get_display(X), "");
} else {
- ui_display_set_status(ui_get_display(X), _("No undo history"));
+ math_display_set_status(ui_get_display(X), _("No undo history"));
}
display_refresh(display);
@@ -380,9 +380,9 @@ display_unpop(GCDisplay *display)
{
if (display->h.current != display->h.end) {
display->h.current = ((display->h.current + 1) % UNDO_HISTORY_LENGTH);
- ui_display_set_status(ui_get_display(X), "");
+ math_display_set_status(ui_get_display(X), "");
} else {
- ui_display_set_status(ui_get_display(X), _("No redo steps"));
+ math_display_set_status(ui_get_display(X), _("No redo steps"));
}
get_state(display)->cursor = -1;
display_refresh(display);
@@ -427,7 +427,7 @@ display_insert(GCDisplay *display, int cursor_start, int cursor_end, const char
}
cursor = 0;
- for (c = ui_display_get_text(ui_get_display(X)); *c; c = g_utf8_next_char(c), cursor++) {
+ for (c = math_display_get_text(ui_get_display(X)); *c; c = g_utf8_next_char(c), cursor++) {
gboolean use = TRUE;
/* Ignore selected part */
@@ -481,7 +481,7 @@ display_backspace(GCDisplay *display, int cursor_start, int cursor_end)
/* If cursor is at end of the line then delete the last character preserving accuracy */
if (cursor_start < 0) {
int len;
- len = g_utf8_strlen(ui_display_get_text(ui_get_display(X)), -1);
+ len = g_utf8_strlen(math_display_get_text(ui_get_display(X)), -1);
display_insert(display, len - 1, len, "");
} else if (cursor_start != cursor_end) {
display_insert(display, cursor_start, cursor_end, "");
@@ -912,7 +912,7 @@ do_shift(GCDisplay *display, int count)
if (!display_is_usable_number(display, &z)) {
/* Translators: This message is displayed in the status bar when a bit
shift operation is performed and the display does not contain a number */
- ui_display_set_status(ui_get_display(X), _("No sane value to bitwise shift"));
+ math_display_set_status(ui_get_display(X), _("No sane value to bitwise shift"));
}
else {
mp_shift(&z, count, display_get_answer(display));
@@ -928,7 +928,7 @@ do_factorize()
if (!display_is_usable_number(&v->display, &value)) {
/* Translators: Error displayed when trying to factorize a non-integer value */
- ui_display_set_status(ui_get_display(X), _("Need an integer to factorize"));
+ math_display_set_status(ui_get_display(X), _("Need an integer to factorize"));
return;
}
display_clear(&v->display);
@@ -954,7 +954,7 @@ do_sto(GCDisplay *display, const char *name)
MPNumber t;
if (!display_is_usable_number(display, &t))
- ui_display_set_status(ui_get_display(X), _("No sane value to store"));
+ math_display_set_status(ui_get_display(X), _("No sane value to store"));
else
register_set_value(name, &t);
}
@@ -985,7 +985,7 @@ display_do_function(GCDisplay *display, int function, gpointer arg, int cursor_s
display_set_cursor(display, cursor_start);
ans = display_get_answer(display);
- ui_display_set_status(ui_get_display(X), "");
+ math_display_set_status(ui_get_display(X), "");
switch (function) {
case FN_CLEAR:
@@ -1105,7 +1105,7 @@ display_do_function(GCDisplay *display, int function, gpointer arg, int cursor_s
break;
}
if (message)
- ui_display_set_status(ui_get_display(X), message);
+ math_display_set_status(ui_get_display(X), message);
}
break;
@@ -1119,5 +1119,5 @@ display_do_function(GCDisplay *display, int function, gpointer arg, int cursor_s
}
enabled = display_get_unsigned_integer(display, &bit_value);
- ui_buttons_set_bitfield(ui_get_buttons(X), enabled, bit_value);
+ math_buttons_set_bitfield(ui_get_buttons(X), enabled, bit_value);
}
diff --git a/src/ui-buttons.c b/src/math-buttons.c
similarity index 93%
rename from src/ui-buttons.c
rename to src/math-buttons.c
index 64e7201..968854e 100644
--- a/src/ui-buttons.c
+++ b/src/math-buttons.c
@@ -16,7 +16,7 @@
* 02111-1307, USA.
*/
-#include "ui-buttons.h"
+#include "math-buttons.h"
#include "register.h"
#include "financial.h"
#include "currency.h"
@@ -57,7 +57,7 @@ struct MathButtonsPrivate
GtkWidget *character_code_entry;
};
-G_DEFINE_TYPE (MathButtons, ui_buttons, GTK_TYPE_VBOX);
+G_DEFINE_TYPE (MathButtons, math_buttons, GTK_TYPE_VBOX);
#define UI_BASIC_FILE UI_DIR "/buttons-basic.ui"
#define UI_ADVANCED_FILE UI_DIR "/buttons-advanced.ui"
@@ -141,9 +141,9 @@ static char *finc_dialog_fields[][5] = {
MathButtons *
-ui_buttons_new(MathDisplay *display)
+math_buttons_new(MathDisplay *display)
{
- return g_object_new (ui_buttons_get_type(), "display", display, NULL);
+ return g_object_new (math_buttons_get_type(), "display", display, NULL);
}
@@ -342,11 +342,11 @@ load_mode(MathButtons *buttons, ButtonMode mode)
snprintf(name, MAXLINE, "calc_%d_button", i);
button = GET_WIDGET(builder, name);
if (button)
- gtk_button_set_label(GTK_BUTTON(button), ui_display_get_digit_text(buttons->priv->display, i));
+ gtk_button_set_label(GTK_BUTTON(button), math_display_get_digit_text(buttons->priv->display, i));
}
widget = GET_WIDGET(builder, "calc_numeric_point_button");
if (widget)
- gtk_button_set_label(GTK_BUTTON(widget), ui_display_get_numeric_point_text(buttons->priv->display));
+ gtk_button_set_label(GTK_BUTTON(widget), math_display_get_numeric_point_text(buttons->priv->display));
/* Connect super and subscript */
for (i = 0; i < 10; i++) {
@@ -358,13 +358,13 @@ load_mode(MathButtons *buttons, ButtonMode mode)
widget = GET_WIDGET(builder, "superscript_togglebutton");
if (widget) {
buttons->priv->superscript_toggles = g_list_append(buttons->priv->superscript_toggles, widget);
- if (ui_display_get_number_mode(buttons->priv->display) == SUPERSCRIPT)
+ if (math_display_get_number_mode(buttons->priv->display) == SUPERSCRIPT)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
}
widget = GET_WIDGET(builder, "subscript_togglebutton");
if (widget) {
buttons->priv->subscript_toggles = g_list_append(buttons->priv->subscript_toggles, widget);
- if (ui_display_get_number_mode(buttons->priv->display) == SUBSCRIPT)
+ if (math_display_get_number_mode(buttons->priv->display) == SUBSCRIPT)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
}
@@ -469,7 +469,7 @@ load_mode(MathButtons *buttons, ButtonMode mode)
void
-ui_buttons_set_mode(MathButtons *buttons, ButtonMode mode)
+math_buttons_set_mode(MathButtons *buttons, ButtonMode mode)
{
ButtonMode old_mode;
@@ -488,7 +488,7 @@ ui_buttons_set_mode(MathButtons *buttons, ButtonMode mode)
ButtonMode
-ui_buttons_get_mode(MathButtons *buttons)
+math_buttons_get_mode(MathButtons *buttons)
{
return buttons->priv->mode;
}
@@ -498,7 +498,7 @@ G_MODULE_EXPORT
void
base_cb(GtkWidget *widget, MathButtons *buttons)
{
- ui_display_set_base(buttons->priv->display, GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "base")));
+ math_display_set_base(buttons->priv->display, GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "base")));
}
@@ -506,7 +506,7 @@ G_MODULE_EXPORT
void
exponent_cb(GtkWidget *widget, MathButtons *buttons)
{
- ui_display_insert_exponent(buttons->priv->display);
+ math_display_insert_exponent(buttons->priv->display);
}
@@ -514,7 +514,7 @@ G_MODULE_EXPORT
void
subtract_cb(GtkWidget *widget, MathButtons *buttons)
{
- ui_display_insert_subtract(buttons->priv->display);
+ math_display_insert_subtract(buttons->priv->display);
}
@@ -522,7 +522,7 @@ G_MODULE_EXPORT
void
button_cb(GtkWidget *widget, MathButtons *buttons)
{
- ui_display_insert(buttons->priv->display, g_object_get_data(G_OBJECT(widget), "calc_text"));
+ math_display_insert(buttons->priv->display, g_object_get_data(G_OBJECT(widget), "calc_text"));
}
@@ -530,14 +530,14 @@ G_MODULE_EXPORT
void
store_menu_cb(GtkMenuItem *menu, MathButtons *buttons)
{
- ui_display_store(buttons->priv->display, g_object_get_data(G_OBJECT(menu), "register_id"));
+ math_display_store(buttons->priv->display, g_object_get_data(G_OBJECT(menu), "register_id"));
}
static void
recall_menu_cb(GtkMenuItem *menu, MathButtons *buttons)
{
- ui_display_recall(buttons->priv->display, g_object_get_data(G_OBJECT(menu), "register_id"));
+ math_display_recall(buttons->priv->display, g_object_get_data(G_OBJECT(menu), "register_id"));
}
@@ -545,7 +545,7 @@ G_MODULE_EXPORT
void
solve_cb(GtkWidget *widget, MathButtons *buttons)
{
- ui_display_solve(buttons->priv->display);
+ math_display_solve(buttons->priv->display);
}
@@ -553,14 +553,14 @@ G_MODULE_EXPORT
void
clear_cb(GtkWidget *widget, MathButtons *buttons)
{
- ui_display_clear(buttons->priv->display);
+ math_display_clear(buttons->priv->display);
}
static void
shift_cb(GtkWidget *widget, MathButtons *buttons)
{
- ui_display_shift(buttons->priv->display, GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "shiftcount")));
+ math_display_shift(buttons->priv->display, GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "shiftcount")));
}
@@ -781,7 +781,7 @@ G_MODULE_EXPORT
void
factorize_cb(GtkWidget *widget, MathButtons *buttons)
{
- ui_display_factorize (buttons->priv->display);
+ math_display_factorize (buttons->priv->display);
}
@@ -789,7 +789,7 @@ G_MODULE_EXPORT
void
digit_cb(GtkWidget *widget, MathButtons *buttons)
{
- ui_display_insert_digit(buttons->priv->display, GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "calc_digit")));
+ math_display_insert_digit(buttons->priv->display, GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "calc_digit")));
}
@@ -797,7 +797,7 @@ G_MODULE_EXPORT
void
numeric_point_cb(GtkWidget *widget, MathButtons *buttons)
{
- ui_display_insert_numeric_point(buttons->priv->display);
+ math_display_insert_numeric_point(buttons->priv->display);
}
@@ -1025,7 +1025,7 @@ character_code_dialog_response_cb(GtkWidget *dialog, gint response_id, MathButto
text = gtk_entry_get_text(GTK_ENTRY(buttons->priv->character_code_entry));
if (response_id == GTK_RESPONSE_OK)
- ui_display_insert_character(buttons->priv->display, text);
+ math_display_insert_character(buttons->priv->display, text);
gtk_widget_hide(dialog);
}
@@ -1052,7 +1052,7 @@ G_MODULE_EXPORT
gboolean
bit_toggle_cb(GtkWidget *event_box, GdkEventButton *event, MathButtons *buttons)
{
- ui_display_toggle_bit(buttons->priv->display, GPOINTER_TO_INT(g_object_get_data(G_OBJECT(event_box), "bit_index")));
+ math_display_toggle_bit(buttons->priv->display, GPOINTER_TO_INT(g_object_get_data(G_OBJECT(event_box), "bit_index")));
return TRUE;
}
@@ -1063,9 +1063,9 @@ void
set_superscript_cb(GtkWidget *widget, MathButtons *buttons)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
- ui_display_set_number_mode(buttons->priv->display, SUPERSCRIPT);
- else if (ui_display_get_number_mode(buttons->priv->display) == SUPERSCRIPT)
- ui_display_set_number_mode(buttons->priv->display, NORMAL);
+ math_display_set_number_mode(buttons->priv->display, SUPERSCRIPT);
+ else if (math_display_get_number_mode(buttons->priv->display) == SUPERSCRIPT)
+ math_display_set_number_mode(buttons->priv->display, NORMAL);
}
@@ -1074,15 +1074,15 @@ void
set_subscript_cb(GtkWidget *widget, MathButtons *buttons)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
- ui_display_set_number_mode(buttons->priv->display, SUBSCRIPT);
- else if (ui_display_get_number_mode(buttons->priv->display) == SUBSCRIPT)
- ui_display_set_number_mode(buttons->priv->display, NORMAL);
+ math_display_set_number_mode(buttons->priv->display, SUBSCRIPT);
+ else if (math_display_get_number_mode(buttons->priv->display) == SUBSCRIPT)
+ math_display_set_number_mode(buttons->priv->display, NORMAL);
}
// FIXME: Watch for display changes from MathEngine
void
-ui_buttons_set_bitfield(MathButtons *buttons, int enabled, guint64 bits)
+math_buttons_set_bitfield(MathButtons *buttons, int enabled, guint64 bits)
{
int i;
const gchar *label;
@@ -1108,7 +1108,7 @@ number_mode_changed_cb(MathDisplay *display, MathButtons *buttons)
GList *i;
NumberMode mode;
- mode = ui_display_get_number_mode(display);
+ mode = math_display_get_number_mode(display);
for (i = buttons->priv->superscript_toggles; i; i = i->next) {
GtkWidget *widget = i->data;
@@ -1122,7 +1122,7 @@ number_mode_changed_cb(MathDisplay *display, MathButtons *buttons)
static void
-ui_buttons_set_property (GObject *object,
+math_buttons_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
@@ -1144,7 +1144,7 @@ ui_buttons_set_property (GObject *object,
static void
-ui_buttons_get_property (GObject *object,
+math_buttons_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
@@ -1165,12 +1165,12 @@ ui_buttons_get_property (GObject *object,
static void
-ui_buttons_class_init (MathButtonsClass *klass)
+math_buttons_class_init (MathButtonsClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->get_property = ui_buttons_get_property;
- object_class->set_property = ui_buttons_set_property;
+ object_class->get_property = math_buttons_get_property;
+ object_class->set_property = math_buttons_set_property;
g_type_class_add_private (klass, sizeof (MathButtonsPrivate));
@@ -1179,15 +1179,15 @@ ui_buttons_class_init (MathButtonsClass *klass)
g_param_spec_object ("display",
"display",
"Display being controlled",
- ui_display_get_type(),
+ math_display_get_type(),
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
}
static void
-ui_buttons_init (MathButtons *buttons)
+math_buttons_init (MathButtons *buttons)
{
- buttons->priv = G_TYPE_INSTANCE_GET_PRIVATE (buttons, ui_buttons_get_type(), MathButtonsPrivate);
+ buttons->priv = G_TYPE_INSTANCE_GET_PRIVATE (buttons, math_buttons_get_type(), MathButtonsPrivate);
buttons->priv->colour_numbers.red = 0;
buttons->priv->colour_numbers.green = 0;
buttons->priv->colour_numbers.blue = 65535;
diff --git a/src/ui-buttons.h b/src/math-buttons.h
similarity index 69%
rename from src/ui-buttons.h
rename to src/math-buttons.h
index 89377a1..91927d3 100644
--- a/src/ui-buttons.h
+++ b/src/math-buttons.h
@@ -16,16 +16,16 @@
* 02111-1307, USA.
*/
-#ifndef UI_BUTTONS_H
-#define UI_BUTTONS_H
+#ifndef MATH_BUTTONS_H
+#define MATH_BUTTONS_H
#include <glib-object.h>
#include <gtk/gtk.h>
-#include "ui-display.h"
+#include "math-display.h"
G_BEGIN_DECLS
-#define MATH_BUTTONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ui_buttons_get_type(), MathButtons))
+#define MATH_BUTTONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), math_buttons_get_type(), MathButtons))
typedef struct MathButtonsPrivate MathButtonsPrivate;
@@ -47,14 +47,14 @@ typedef enum {
PROGRAMMING
} ButtonMode;
-GType ui_buttons_get_type();
+GType math_buttons_get_type();
-MathButtons *ui_buttons_new(MathDisplay *display);
+MathButtons *math_buttons_new(MathDisplay *display);
-void ui_buttons_set_bitfield(MathButtons *buttons, int enabled, guint64 bits);
+void math_buttons_set_bitfield(MathButtons *buttons, int enabled, guint64 bits);
-void ui_buttons_set_mode(MathButtons *buttons, ButtonMode mode);
+void math_buttons_set_mode(MathButtons *buttons, ButtonMode mode);
-ButtonMode ui_buttons_get_mode(MathButtons *buttons);
+ButtonMode math_buttons_get_mode(MathButtons *buttons);
-#endif /* UI_BUTTONS_H */
+#endif /* MATH_BUTTONS_H */
diff --git a/src/ui-display.c b/src/math-display.c
similarity index 80%
rename from src/ui-display.c
rename to src/math-display.c
index 078d810..f1484d3 100644
--- a/src/ui-display.c
+++ b/src/math-display.c
@@ -19,7 +19,7 @@
#include <string.h>
#include <gdk/gdkkeysyms.h>
-#include "ui-display.h"
+#include "math-display.h"
#include "display.h"
#include "calctool.h"
@@ -46,19 +46,19 @@ struct MathDisplayPrivate
char *last_text;
};
-G_DEFINE_TYPE (MathDisplay, ui_display, GTK_TYPE_VBOX);
+G_DEFINE_TYPE (MathDisplay, math_display, GTK_TYPE_VBOX);
#define GET_WIDGET(ui, name) GTK_WIDGET(gtk_builder_get_object(ui, name))
MathDisplay *
-ui_display_new()
+math_display_new()
{
- return g_object_new (ui_display_get_type(), NULL);
+ return g_object_new (math_display_get_type(), NULL);
}
gchar *
-ui_display_get_text(MathDisplay *display)
+math_display_get_text(MathDisplay *display)
{
GtkTextIter start, end;
gtk_text_buffer_get_bounds(display->priv->display_buffer, &start, &end);
@@ -66,20 +66,20 @@ ui_display_get_text(MathDisplay *display)
}
-const gchar *ui_display_get_digit_text(MathDisplay *display, guint digit)
+const gchar *math_display_get_digit_text(MathDisplay *display, guint digit)
{
return v->digits[digit];
}
-const gchar *ui_display_get_numeric_point_text(MathDisplay *display)
+const gchar *math_display_get_numeric_point_text(MathDisplay *display)
{
return v->radix;
}
void
-ui_display_set_number_mode(MathDisplay *display, NumberMode mode)
+math_display_set_number_mode(MathDisplay *display, NumberMode mode)
{
if (display->priv->number_mode == mode)
return;
@@ -92,7 +92,7 @@ ui_display_set_number_mode(MathDisplay *display, NumberMode mode)
NumberMode
-ui_display_get_number_mode(MathDisplay *display)
+math_display_get_number_mode(MathDisplay *display)
{
return display->priv->number_mode;
}
@@ -112,7 +112,7 @@ do_button(MathDisplay *display, int function, gpointer arg)
if (function == FN_CALCULATE ||
function == FN_CLEAR ||
(function == FN_TEXT && strstr("â?»â?°Â¹Â²Â³â?´â?µâ?¶â?·â?¸â?¹â??â??â??â??â??â??â??â??â??â??", (char *)arg) == NULL)) {
- ui_display_set_number_mode(display, NORMAL);
+ math_display_set_number_mode(display, NORMAL);
}
if (gtk_text_buffer_get_selection_bounds(display->priv->display_buffer, &start, &end)) {
@@ -144,114 +144,114 @@ do_button(MathDisplay *display, int function, gpointer arg)
void
-ui_display_store(MathDisplay *display, const char *name)
+math_display_store(MathDisplay *display, const gchar *name)
{
do_button(display, FN_STORE, (gpointer)name);
}
void
-ui_display_recall(MathDisplay *display, const char *name)
+math_display_recall(MathDisplay *display, const gchar *name)
{
do_button(display, FN_RECALL, (gpointer)name);
}
void
-ui_display_insert(MathDisplay *display, const char *text)
+math_display_insert(MathDisplay *display, const gchar *text)
{
do_button(display, FN_TEXT, (gpointer) text);
}
void
-ui_display_insert_digit(MathDisplay *display, unsigned int digit)
+math_display_insert_digit(MathDisplay *display, unsigned int digit)
{
static const char *subscript_digits[] = {"â??", "â??", "â??", "â??", "â??", "â??", "â??", "â??", "â??", "â??", NULL};
static const char *superscript_digits[] = {"�", "¹", "²", "³", "�", "�", "�", "�", "�", "�", NULL};
if (display->priv->number_mode == NORMAL || digit >= 10)
- ui_display_insert(display, v->digits[digit]);
+ math_display_insert(display, v->digits[digit]);
else if (display->priv->number_mode == SUPERSCRIPT)
- ui_display_insert(display, superscript_digits[digit]);
+ math_display_insert(display, superscript_digits[digit]);
else if (display->priv->number_mode == SUBSCRIPT)
- ui_display_insert(display, subscript_digits[digit]);
+ math_display_insert(display, subscript_digits[digit]);
}
void
-ui_display_insert_numeric_point(MathDisplay *display)
+math_display_insert_numeric_point(MathDisplay *display)
{
- ui_display_insert(display, v->radix);
+ math_display_insert(display, v->radix);
}
void
-ui_display_insert_exponent(MathDisplay *display)
+math_display_insert_exponent(MathDisplay *display)
{
- ui_display_insert(display, "Ã?10");
- ui_display_set_number_mode(display, SUPERSCRIPT);
+ math_display_insert(display, "Ã?10");
+ math_display_set_number_mode(display, SUPERSCRIPT);
}
void
-ui_display_insert_character(MathDisplay *display, const char *character)
+math_display_insert_character(MathDisplay *display, const char *character)
{
do_button(display, FN_INSERT_CHARACTER, (gpointer)character);
}
void
-ui_display_insert_subtract(MathDisplay *display)
+math_display_insert_subtract(MathDisplay *display)
{
if (display->priv->number_mode == SUPERSCRIPT && display->priv->can_super_minus) {
- ui_display_insert(display, "â?»");
+ math_display_insert(display, "â?»");
display->priv->can_super_minus = FALSE;
}
else {
- ui_display_insert(display, "â??");
- ui_display_set_number_mode(display, NORMAL);
+ math_display_insert(display, "â??");
+ math_display_set_number_mode(display, NORMAL);
}
}
void
-ui_display_solve(MathDisplay *display)
+math_display_solve(MathDisplay *display)
{
do_button(display, FN_CALCULATE, NULL);
}
void
-ui_display_factorize(MathDisplay *display)
+math_display_factorize(MathDisplay *display)
{
do_button(display, FN_FACTORIZE, NULL);
}
void
-ui_display_clear(MathDisplay *display)
+math_display_clear(MathDisplay *display)
{
do_button(display, FN_CLEAR, NULL);
}
void
-ui_display_shift(MathDisplay *display, gint count)
+math_display_shift(MathDisplay *display, gint count)
{
do_button(display, FN_SHIFT, GINT_TO_POINTER(count));
}
void
-ui_display_toggle_bit(MathDisplay *display, guint bit)
+math_display_toggle_bit(MathDisplay *display, guint bit)
{
do_button(display, FN_TOGGLE_BIT, GINT_TO_POINTER(bit));
}
void
-ui_display_set(MathDisplay *display, char *str, int cursor)
+math_display_set(MathDisplay *display, char *str, int cursor)
{
GtkTextIter iter;
GtkAdjustment *adj;
@@ -268,14 +268,14 @@ ui_display_set(MathDisplay *display, char *str, int cursor)
void
-ui_display_set_status(MathDisplay *display, const gchar *message)
+math_display_set_status(MathDisplay *display, const gchar *message)
{
gtk_text_buffer_set_text(display->priv->info_buffer, message, -1);
}
void
-ui_display_copy(MathDisplay *display)
+math_display_copy(MathDisplay *display)
{
gchar *string = NULL;
GtkTextIter start, end;
@@ -283,7 +283,7 @@ ui_display_copy(MathDisplay *display)
if (gtk_text_buffer_get_selection_bounds(display->priv->display_buffer, &start, &end) == TRUE)
string = gtk_text_buffer_get_text(display->priv->display_buffer, &start, &end, FALSE);
else
- string = ui_display_get_text(display);
+ string = math_display_get_text(display);
if (display->priv->shelf != NULL)
g_free(display->priv->shelf);
@@ -337,34 +337,34 @@ main_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, GCalctoolUI *ui)
switch(event->keyval)
{
case GDK_b:
- ui_display_set_base(display, 2);
+ math_display_set_base(display, 2);
return TRUE;
case GDK_d:
- ui_display_set_base(display, 10);
+ math_display_set_base(display, 10);
return TRUE;
case GDK_e:
- ui_display_insert_exponent(display);
+ math_display_insert_exponent(display);
return TRUE;
case GDK_f:
- ui_display_factorize(display);
+ math_display_factorize(display);
return TRUE;
case GDK_h:
- ui_display_set_base(display, 16);
+ math_display_set_base(display, 16);
return TRUE;
case GDK_i:
- ui_display_insert(display, "�¹");
+ math_display_insert(display, "�¹");
return TRUE;
case GDK_o:
- ui_display_set_base(display, 8);
+ math_display_set_base(display, 8);
return TRUE;
case GDK_p:
- ui_display_insert(display, "Ï?");
+ math_display_insert(display, "Ï?");
return TRUE;
case GDK_r:
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
return TRUE;
case GDK_u:
- ui_display_insert(display, "µ");
+ math_display_insert(display, "µ");
return TRUE;
}
}
@@ -372,34 +372,34 @@ main_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, GCalctoolUI *ui)
switch(event->keyval)
{
case GDK_0:
- ui_display_insert(display, "â?°");
+ math_display_insert(display, "â?°");
return TRUE;
case GDK_1:
- ui_display_insert(display, "¹");
+ math_display_insert(display, "¹");
return TRUE;
case GDK_2:
- ui_display_insert(display, "²");
+ math_display_insert(display, "²");
return TRUE;
case GDK_3:
- ui_display_insert(display, "³");
+ math_display_insert(display, "³");
return TRUE;
case GDK_4:
- ui_display_insert(display, "â?´");
+ math_display_insert(display, "â?´");
return TRUE;
case GDK_5:
- ui_display_insert(display, "â?µ");
+ math_display_insert(display, "â?µ");
return TRUE;
case GDK_6:
- ui_display_insert(display, "â?¶");
+ math_display_insert(display, "â?¶");
return TRUE;
case GDK_7:
- ui_display_insert(display, "â?·");
+ math_display_insert(display, "â?·");
return TRUE;
case GDK_8:
- ui_display_insert(display, "â?¸");
+ math_display_insert(display, "â?¸");
return TRUE;
case GDK_9:
- ui_display_insert(display, "â?¹");
+ math_display_insert(display, "â?¹");
return TRUE;
}
}
@@ -407,34 +407,34 @@ main_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, GCalctoolUI *ui)
switch(event->keyval)
{
case GDK_0:
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
return TRUE;
case GDK_1:
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
return TRUE;
case GDK_2:
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
return TRUE;
case GDK_3:
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
return TRUE;
case GDK_4:
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
return TRUE;
case GDK_5:
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
return TRUE;
case GDK_6:
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
return TRUE;
case GDK_7:
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
return TRUE;
case GDK_8:
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
return TRUE;
case GDK_9:
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
return TRUE;
}
}
@@ -453,7 +453,7 @@ main_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, GCalctoolUI *ui)
if ((event->keyval == GDK_Escape && state == 0) ||
(event->keyval == GDK_BackSpace && state == GDK_CONTROL_MASK) ||
(event->keyval == GDK_Delete && state == GDK_SHIFT_MASK)) {
- ui_display_clear(display);
+ math_display_clear(display);
return TRUE;
}
@@ -461,7 +461,7 @@ main_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, GCalctoolUI *ui)
if ((event->keyval == GDK_Return && state == 0) ||
(event->keyval == GDK_KP_Enter && state == 0)) {
if (gtk_widget_has_focus(display->priv->display_item)) {
- ui_display_solve(display);
+ math_display_solve(display);
return TRUE;
}
else {
@@ -471,7 +471,7 @@ main_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, GCalctoolUI *ui)
if (state == GDK_CONTROL_MASK && event->keyval == GDK_minus)
{
- ui_display_insert(display, "â?»");
+ math_display_insert(display, "â?»");
return TRUE;
}
@@ -481,24 +481,24 @@ main_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, GCalctoolUI *ui)
// FIXME: event->string deprecated
if (strcmp(event->string, "-") == 0 || strcmp(event->string, "â??") == 0) {
- ui_display_insert_subtract(display);
+ math_display_insert_subtract(display);
return TRUE;
}
for (i = 0; conversions[i]; i++) {
if (strcmp(event->string, conversions[i]) == 0) {
- ui_display_insert(display, conversion_values[i]);
+ math_display_insert(display, conversion_values[i]);
return TRUE;
}
}
if (strcmp(event->string, ".") == 0) {
- ui_display_insert(display, v->radix);
+ math_display_insert(display, v->radix);
return TRUE;
}
/* Some keyboards use this keyval for '^' (e.g. German) */
if (event->keyval == GDK_dead_circumflex) {
- ui_display_insert(display, "^");
+ math_display_insert(display, "^");
return TRUE;
}
@@ -511,7 +511,7 @@ main_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, GCalctoolUI *ui)
// FIXME: Should open right shift menu (programming mode)
return TRUE;
case '\n':
- ui_display_solve(display);
+ math_display_solve(display);
return TRUE;
}
@@ -520,7 +520,7 @@ main_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, GCalctoolUI *ui)
return FALSE;
if (event->string[0] != '\0') {
- ui_display_insert(display, event->string);
+ math_display_insert(display, event->string);
return TRUE;
}
@@ -532,7 +532,7 @@ main_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, GCalctoolUI *ui)
static void
popup_paste_cb(GtkWidget *menu, MathDisplay *display)
{
- ui_display_paste(display);
+ math_display_paste(display);
}
@@ -574,7 +574,7 @@ on_paste(GtkClipboard *clipboard, const gchar *text, MathDisplay *display)
void
-ui_display_paste(MathDisplay *display)
+math_display_paste(MathDisplay *display)
{
gtk_clipboard_request_text(gtk_clipboard_get(display->priv->clipboard_atom),
(GtkClipboardTextReceivedFunc)on_paste, display);
@@ -585,7 +585,7 @@ static gboolean
middle_click_paste_cb(GtkWidget *widget, GdkEventButton *event, MathDisplay *display)
{
if (event->button == 2)
- ui_display_paste(display);
+ math_display_paste(display);
return FALSE;
}
@@ -594,16 +594,16 @@ middle_click_paste_cb(GtkWidget *widget, GdkEventButton *event, MathDisplay *dis
static void
paste_cb(GtkWidget *widget, MathDisplay *display)
{
- ui_display_paste(display);
+ math_display_paste(display);
}
void
-ui_display_set_base(MathDisplay *display, gint base)
+math_display_set_base(MathDisplay *display, gint base)
{
/* If has a number already in a base, then solve and convert it */
if (!display_is_result(&v->display) && display_is_number_with_base(&v->display))
- ui_display_solve(display);
+ math_display_solve(display);
if (display_is_result(&v->display)) {
if (base == 2)
@@ -617,17 +617,17 @@ ui_display_set_base(MathDisplay *display, gint base)
}
else {
if (base == 2)
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
else if (base == 8)
- ui_display_insert(display, "â??");
+ math_display_insert(display, "â??");
else if (base == 16)
- ui_display_insert(display, "â??â??");
+ math_display_insert(display, "â??â??");
}
}
static void
-ui_display_class_init (MathDisplayClass *klass)
+math_display_class_init (MathDisplayClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -672,12 +672,12 @@ ui_display_class_init (MathDisplayClass *klass)
</object>
*/
static void
-ui_display_init(MathDisplay *display)
+math_display_init(MathDisplay *display)
{
GtkWidget *vbox, *info_view;
PangoFontDescription *font_desc;
- display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, ui_display_get_type(), MathDisplayPrivate);
+ display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, math_display_get_type(), MathDisplayPrivate);
display->priv->primary_atom = gdk_atom_intern("PRIMARY", FALSE);
display->priv->clipboard_atom = gdk_atom_intern("CLIPBOARD", FALSE);
diff --git a/src/math-display.h b/src/math-display.h
new file mode 100644
index 0000000..b2088cf
--- /dev/null
+++ b/src/math-display.h
@@ -0,0 +1,78 @@
+/* Copyright (c) 2008-2009 Robert Ancell
+ *
+ * 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, 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef MATH_DISPLAY_H
+#define MATH_DISPLAY_H
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define MATH_DISPLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), math_display_get_type(), MathDisplay))
+
+typedef struct MathDisplayPrivate MathDisplayPrivate;
+
+typedef struct
+{
+ GtkVBox parent_instance;
+ MathDisplayPrivate *priv;
+} MathDisplay;
+
+typedef struct
+{
+ GtkVBoxClass parent_class;
+
+ void (*number_mode_changed)(MathDisplay *display);
+} MathDisplayClass;
+
+typedef enum {
+ NORMAL,
+ SUPERSCRIPT,
+ SUBSCRIPT
+} NumberMode;
+
+GType math_display_get_type();
+MathDisplay *math_display_new();
+
+void math_display_set_base(MathDisplay *display, gint base);
+void math_display_set_number_mode(MathDisplay *display, NumberMode mode);
+void math_display_set(MathDisplay *display, gchar *, gint); // FIXME: Make obsolete by Math model
+void math_display_set_status(MathDisplay *display, const gchar *message);
+gchar *math_display_get_text(MathDisplay *display);
+
+const gchar *math_display_get_digit_text(MathDisplay *display, guint digit);
+const gchar *math_display_get_numeric_point_text(MathDisplay *display);
+
+void math_display_copy(MathDisplay *display);
+void math_display_paste(MathDisplay *display);
+void math_display_store(MathDisplay *display, const gchar *name);
+void math_display_recall(MathDisplay *display, const gchar *name);
+void math_display_insert(MathDisplay *display, const gchar *text);
+void math_display_insert_digit(MathDisplay *display, guint digit);
+void math_display_insert_numeric_point(MathDisplay *display);
+void math_display_insert_subtract(MathDisplay *display);
+void math_display_insert_exponent(MathDisplay *display);
+void math_display_insert_character(MathDisplay *display, const gchar *character);
+void math_display_solve(MathDisplay *display);
+void math_display_factorize(MathDisplay *display);
+void math_display_clear(MathDisplay *display);
+void math_display_shift(MathDisplay *display, gint count);
+void math_display_toggle_bit(MathDisplay *display, guint bit);
+
+#endif /* MATH_DISPLAY_H */
diff --git a/src/ui.c b/src/ui.c
index 5e18461..e279b72 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -20,8 +20,6 @@
#include <gtk/gtk.h>
#include "ui.h"
-#include "ui-display.h"
-#include "ui-buttons.h"
#include "ui-preferences.h"
#include "config.h"
#include "get.h"
@@ -80,7 +78,7 @@ ui_set_mode(GCalctoolUI *ui, ButtonMode mode)
/* Save mode */
set_enumerated_resource(R_MODE, mode_names, (int)mode);
- ui_buttons_set_mode(ui->priv->buttons, mode);
+ math_buttons_set_mode(ui->priv->buttons, mode);
/* Update the menu */
switch (mode) {
@@ -145,7 +143,7 @@ G_MODULE_EXPORT
void
copy_cb(GtkWidget *widget, GCalctoolUI *ui)
{
- ui_display_copy(ui->priv->display);
+ math_display_copy(ui->priv->display);
}
@@ -153,7 +151,7 @@ G_MODULE_EXPORT
void
paste_cb(GtkWidget *widget, GCalctoolUI *ui)
{
- ui_display_paste(ui->priv->display);
+ math_display_paste(ui->priv->display);
}
@@ -335,11 +333,11 @@ ui_init(GCalctoolUI *ui)
ui->priv->right_aligned = TRUE;
gtk_widget_show(scrolled_window);
- ui->priv->display = ui_display_new();
+ ui->priv->display = math_display_new();
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), GTK_WIDGET(ui->priv->display));
gtk_widget_show(GTK_WIDGET(ui->priv->display));
- ui->priv->buttons = ui_buttons_new(ui->priv->display);
+ ui->priv->buttons = math_buttons_new(ui->priv->display);
gtk_box_pack_start(GTK_BOX(GET_WIDGET(ui->priv->ui, "window_vbox")), GTK_WIDGET(ui->priv->buttons), TRUE, TRUE, 0);
gtk_widget_show(GTK_WIDGET(ui->priv->buttons));
diff --git a/src/ui.h b/src/ui.h
index 73ec74e..2bdbf15 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -21,8 +21,8 @@
#define UI_H
#include <glib-object.h>
-#include "ui-display.h"
-#include "ui-buttons.h"
+#include "math-display.h"
+#include "math-buttons.h"
G_BEGIN_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
