Changeset 59

Timestamp:

10/08/2007 03:20:10 PM (15 months ago)

Author:

cmccurdy

Message:

* src/widgets.c:

fixed a few bugs regarding the handling of the values nl_langinfo returns
incorporated ticket #6 re: changing transaction selection behavior

Location:

trunk

Files:

• autom4te.cache/requests (modified) (8 diffs)
• src/Makefile.in (modified) (1 diff)
• src/widgets.c (modified) (8 diffs)

trunk/autom4te.cache/requests

@@ -56 +56 @@
                         'AM_PROG_INSTALL_STRIP' => 1,
                         '_m4_warn' => 1,
+                        'LF_CHECK_CC_FLAG' => 1,
                         'AM_SANITY_CHECK' => 1,
-                        'LF_CHECK_CC_FLAG' => 1,
                         'LF_SET_WARNINGS' => 1,
                         'include' => 1,
@@ -70 +70 @@
                         '_AM_SUBST_NOTMAKE' => 1,
                         'LF_CHECK_CXX_FLAG' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        'm4_pattern_allow' => 1,
                         '_AM_AUTOCONF_VERSION' => 1,
-                        'm4_pattern_allow' => 1,
+                        'AM_PROG_CC_C_O' => 1,
                         '_AM_MANGLE_OPTION' => 1,
-                        'AM_CONDITIONAL' => 1,
                         'AM_SET_LEADING_DOT' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AM_SET_DEPDIR' => 1,
                         '_AM_DEPENDENCIES' => 1,
+                        'm4_include' => 1,
+                        'LF_CHECK_F77_FLAG' => 1,
                         'AM_PROG_INSTALL_SH' => 1,
-                        'LF_CHECK_F77_FLAG' => 1,
-                        'm4_include' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AU_DEFUN' => 1,
@@ -98 +98 @@
                       ],
                       {
+                        'AM_PROG_F77_C_O' => 1,
                         '_LT_AC_TAGCONFIG' => 1,
-                        'AM_PROG_F77_C_O' => 1,
+                        'm4_pattern_forbid' => 1,
                         'AC_INIT' => 1,
-                        'm4_pattern_forbid' => 1,
                         'AC_CANONICAL_TARGET' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_SUBST' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'AC_FC_SRCEXT' => 1,
-                        'AC_CANONICAL_HOST' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
@@ -114 +114 @@
                         'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_CONFIG_LINKS' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
                         'm4_sinclude' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
@@ -132 +132 @@
                         '_AM_SUBST_NOTMAKE' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'm4_pattern_allow' => 1,
                         'sinclude' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_CANONICAL_SYSTEM' => 1,
-                        'AM_CONDITIONAL' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
@@ -209 +209 @@
                         'AM_PROG_CC_C_O' => 1,
                         '_AM_MANGLE_OPTION' => 1,
-                        'AM_CONDITIONAL' => 1,
                         'AM_SET_LEADING_DOT' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AM_SET_DEPDIR' => 1,
                         '_AM_DEPENDENCIES' => 1,
+                        'm4_include' => 1,
+                        'LF_CHECK_F77_FLAG' => 1,
                         'AM_PROG_INSTALL_SH' => 1,
-                        'LF_CHECK_F77_FLAG' => 1,
-                        'm4_include' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AU_DEFUN' => 1,
@@ -285 +285 @@
                         'AM_SET_DEPDIR' => 1,
                         '_AM_DEPENDENCIES' => 1,
-                        'm4_include' => 1,
                         'AM_PROG_INSTALL_SH' => 1,
+                        'm4_include' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AU_DEFUN' => 1,
@@ -354 +354 @@
                         'AM_SET_DEPDIR' => 1,
                         '_AM_DEPENDENCIES' => 1,
+                        'm4_include' => 1,
                         'AM_PROG_INSTALL_SH' => 1,
-                        'm4_include' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AU_DEFUN' => 1,

trunk/src/Makefile.in

@@ -163 +163 @@
 #db_test_SOURCES = db_test.c transaction.c database.c
 mokash_SOURCES = main.c \
+               bool.h \
                widgets.c \
+               widgets.h \
                account_dialog.c \
+               account_dialog.h \
                database.c \
+               database.h \
                transaction.c \
-               transaction_dialog.c
+               transaction.h \
+               transaction_dialog.c \
+               transaction_dialog.h
 
 mokash_CFLAGS = @GTK_CFLAGS@

trunk/src/widgets.c

@@ -372 +372 @@
     if ( strcmp( "Amt", gtk_tree_view_column_get_title(col) ) == 0 )
         data = fabs(data);
-    char *frac_digits = nl_langinfo(FRAC_DIGITS);
+    char *tmp = nl_langinfo(FRAC_DIGITS);
+    char *frac_digits = (char*)malloc(sizeof(char) * (strlen(tmp) + 1));
+    strcpy( frac_digits, tmp );
     if ( frac_digits[0] == CHAR_MAX )
-        frac_digits[0] = 0;
+        frac_digits[0] = 2;
     gchar frmt[20];
     g_snprintf( frmt, sizeof(frmt), "%%.%dlf", frac_digits[0] );
@@ -437 +439 @@
 void button_press_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-    if ( event->type != GDK_BUTTON_PRESS || event->button != 1 )
+    if ( ( event->type != GDK_BUTTON_PRESS && 
+        event->type != GDK_BUTTON_RELEASE ) || event->button != 1 )
         return;
 
@@ -447 +450 @@
         return;
 
+    static GtkTreePath *down_path;
+    
+    if ( event->type == GDK_BUTTON_PRESS )
+    {
+        down_path = path;
+        return;
+    }
+
+    if ( down_path == NULL )
+        return;
+
+    gchar *down_str, *up_str;
+    down_str = gtk_tree_path_to_string(down_path);
+    up_str = gtk_tree_path_to_string(path);
+    if ( g_utf8_collate( down_str, up_str ) != 0 )
+    {
+        g_free(down_str);
+        g_free(up_str);
+        gtk_tree_path_free(path);
+        gtk_tree_path_free(down_path);
+        return;
+    }
+
     if ( strcmp( gtk_tree_view_column_get_title(column), "" ) == 0 )
     {
         // handle the checkbox click
-        toggle_checkbox( gtk_tree_path_to_string(path),
-                GTK_LIST_STORE(gtk_tree_model_filter_get_model(
+        toggle_checkbox( up_str, GTK_LIST_STORE(gtk_tree_model_filter_get_model(
                         GTK_TREE_MODEL_FILTER(gtk_tree_view_get_model(
                                 GTK_TREE_VIEW(tree))))) );
@@ -474 +499 @@
         }
     }
+    g_free(down_str);
+    g_free(up_str);
+    gtk_tree_path_free(path);
+    gtk_tree_path_free(down_path);
 }
 
@@ -552 +581 @@
     g_signal_connect( G_OBJECT(tree), "button-press-event",
             G_CALLBACK(button_press_cb), NULL );
+    g_signal_connect( G_OBJECT(tree), "button-release-event",
+            G_CALLBACK(button_press_cb), NULL );
 
     GtkCellRenderer *renderer;
@@ -675 +706 @@
 {
     int i, j, radix_loc;
-    char *radix_str = nl_langinfo(RADIXCHAR);
-    char *frac_digits = nl_langinfo(FRAC_DIGITS);
+    char *tmp = nl_langinfo(RADIXCHAR);
+    char *radix_str = (char*)malloc(sizeof(char) * (strlen(tmp) + 1));
+    strcpy( radix_str, tmp );
+    tmp = nl_langinfo(FRAC_DIGITS);
+    char *frac_digits = (char*)malloc(sizeof(char) * (strlen(tmp) + 1));
+    strcpy( frac_digits, tmp );
     char radix = ( radix_str != NULL ? radix_str[0] : '.' );
     if ( frac_digits[0] == CHAR_MAX )
-        frac_digits[0] = 0;
+        frac_digits[0] = 2;
     gchar *result = g_new( gchar, new_text_length + 1 );
     gchar *cur_text = gtk_editable_get_chars( editable, 0, -1 );
@@ -730 +765 @@
     gtk_signal_emit_stop_by_name( GTK_OBJECT(editable), "insert-text" );
 
+    free(radix_str);
+    free(frac_digits);
     g_free(cur_text);
     g_free(result);
@@ -1090 +1127 @@
 void update_balance(GtkLabel *label, double balance, const char *prefix)
 {
-    char *cur_symbols = nl_langinfo(CRNCYSTR);
-    char *frac_digits = nl_langinfo(FRAC_DIGITS);
+    char *tmp = nl_langinfo(CRNCYSTR);
+    char *cur_symbols = (char*)malloc(sizeof(char) * (strlen(tmp) + 1));
+    strcpy( cur_symbols, tmp );
+    tmp = nl_langinfo(FRAC_DIGITS);
+    char *frac_digits = (char*)malloc(sizeof(char) * (strlen(tmp) + 1));
+    strcpy( frac_digits, tmp );
+
     if ( frac_digits[0] == CHAR_MAX )
-        return;
-    if ( cur_symbols == NULL || strlen(cur_symbols) < 2 )
-        return;
+        frac_digits[0] = 2;
+    if ( cur_symbols == NULL )
+    {
+        cur_symbols = (char*)malloc(sizeof(char) * 3);
+        strcpy( cur_symbols, "-$" );
+    }
+    if ( strlen(cur_symbols) < 2 )
+    {
+        free(cur_symbols);
+        cur_symbols = (char*)malloc(sizeof(char) * 3);
+        strcpy( cur_symbols, "-$" );
+    }
 
     int i = strlen(prefix);