[gcalctool/gnome-2-28] Only disable trailing zeroes option in basic mode (Bug #600700)



commit 0af2da274a806a3a163f875d52578ca634f4cc37
Author: Robert Ancell <robert ancell gmail com>
Date:   Thu Nov 5 10:43:47 2009 +1100

    Only disable trailing zeroes option in basic mode (Bug #600700)

 ChangeLog |    4 ++++
 src/gtk.c |    5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 24e021e..760d1fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
 gcalctool change history.
 =========================
 
+2009-11-05 Robert Ancell <robert ancell gmail com>
+
+    * Only disable trailing zeroes option in basic mode (Bug #600700)
+
 2009-10-19 Robert Ancell <robert ancell gmail com>
 
     * README:
diff --git a/src/gtk.c b/src/gtk.c
index ce90439..1c747c7 100644
--- a/src/gtk.c
+++ b/src/gtk.c
@@ -1058,7 +1058,7 @@ ui_set_mode(ModeType mode)
     g_object_set(G_OBJECT(X.sci_panel), "visible", mode == SCIENTIFIC, NULL);
     g_object_set(G_OBJECT(X.prog_panel), "visible", mode == PROGRAMMING, NULL);
     g_object_set(G_OBJECT(X.bit_panel), "visible", mode == PROGRAMMING, NULL);
-    gtk_widget_set_sensitive(GET_WIDGET("show_trailing_zeroes_menu"), mode == SCIENTIFIC || mode == PROGRAMMING);
+    gtk_widget_set_sensitive(GET_WIDGET("show_trailing_zeroes_menu"), mode != BASIC);
     gtk_widget_set_sensitive(GET_WIDGET("show_registers_menu"), mode != BASIC);
     
     /* HACK: Some horrible hack down below to keep the buttons the same size.
@@ -1279,8 +1279,7 @@ ui_set_error_state(gboolean error)
     gtk_widget_set_sensitive(GET_WIDGET("view_financial_menu"),  !v->error); 
     gtk_widget_set_sensitive(GET_WIDGET("view_scientific_menu"), !v->error); 
     gtk_widget_set_sensitive(GET_WIDGET("show_trailing_zeroes_menu"),
-                             !v->error && (X.mode == SCIENTIFIC || 
-                                           X.mode == PROGRAMMING)); 
+                             !v->error && (X.mode != BASIC));
     gtk_widget_set_sensitive(GET_WIDGET("show_thousands_separator_menu"),
                              !v->error); 
     gtk_widget_set_sensitive(GET_WIDGET("show_registers_menu"), !v->error); 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]