diff -ur galculator-1.2.3/src/callbacks.c galculator-1.2.3-psion/src/callbacks.c --- galculator-1.2.3/src/callbacks.c 2004-05-23 15:10:55.000000000 +0200 +++ galculator-1.2.3-psion/src/callbacks.c 2004-10-29 12:53:21.000000000 +0200 @@ -845,21 +845,6 @@ gtk_widget_destroy (font_dialog); } - -void -on_show_menubar1_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ - GtkWidget *menu_item; - - prefs.show_menu = gtk_check_menu_item_get_active ((GtkCheckMenuItem *) menuitem);; - set_widget_visibility (main_window_xml, "menubar", prefs.show_menu); - /* in case this cb is called by the right button mouse click menu */ - menu_item = glade_xml_get_widget (main_window_xml, "show_menubar1"); - gtk_check_menu_item_set_active ((GtkCheckMenuItem *) menu_item, prefs.show_menu); - -} - void on_prefs_custom_button_font_toggled (GtkToggleButton *togglebutton, gpointer user_data) @@ -919,12 +904,9 @@ void on_prefs_show_menu_toggled (GtkToggleButton *togglebutton, gpointer user_data) { - GtkCheckMenuItem *show_menubar_item; - - prefs.show_menu = gtk_toggle_button_get_active (togglebutton); +/* prefs.show_menu = gtk_toggle_button_get_active (togglebutton); set_widget_visibility (main_window_xml, "menubar", prefs.show_menu); - show_menubar_item = (GtkCheckMenuItem *) glade_xml_get_widget (main_window_xml, "show_menubar1"); - gtk_check_menu_item_set_active (show_menubar_item, prefs.show_menu); +*/ } void on_prefs_rem_display_toggled (GtkToggleButton *togglebutton, @@ -1481,11 +1463,6 @@ gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { - GtkWidget *menu; - - if (event->button != 3) return FALSE; - menu = ui_right_mouse_menu_create (); - gtk_menu_popup ((GtkMenu *) menu, NULL, NULL, NULL, NULL, 3, event->time); return FALSE; } diff -ur galculator-1.2.3/src/callbacks.h galculator-1.2.3-psion/src/callbacks.h --- galculator-1.2.3/src/callbacks.h 2004-03-14 20:01:26.000000000 +0100 +++ galculator-1.2.3-psion/src/callbacks.h 2004-08-24 14:44:49.000000000 +0200 @@ -243,3 +243,6 @@ void user_function_list_selection_changed_cb (GtkTreeSelection *selection, gpointer data); + +gboolean +on_main_window_key_press_event (GtkWidget *widget, GdkEventKey *k, gpointer p); diff -ur galculator-1.2.3/src/config_file.c galculator-1.2.3-psion/src/config_file.c --- galculator-1.2.3/src/config_file.c 2004-03-20 17:38:38.000000000 +0100 +++ galculator-1.2.3-psion/src/config_file.c 2004-08-31 20:43:28.000000000 +0200 @@ -79,7 +79,6 @@ {"remembered_valuey", &(prefs.rem_valuey), STRING, NULL, NULL}, {"remembered_valuez", &(prefs.rem_valuez), STRING, NULL, NULL}, {"remembered_valuet", &(prefs.rem_valuet), STRING, NULL, NULL}, -/*40.*/ {"show_menu_bar", &(prefs.show_menu), BOOLEAN, "prefs_show_menu", set_checkbutton}, {NULL, NULL, 0, NULL, NULL} }; static char *prefs_list_old_entries[3] = {"show_status_bar", "remembered_value", NULL}; diff -ur galculator-1.2.3/src/general_functions.c galculator-1.2.3-psion/src/general_functions.c --- galculator-1.2.3/src/general_functions.c 2004-04-01 08:51:52.000000000 +0200 +++ galculator-1.2.3-psion/src/general_functions.c 2004-10-29 12:56:25.000000000 +0200 @@ -308,16 +308,16 @@ void apply_preferences (s_preferences prefs) { - GtkWidget *menu_item; + GtkWidget *menu_item = NULL; char *button_font; display_update_tags (); display_set_bkg_color (prefs.bkg_color); set_widget_visibility (main_window_xml, "menubar", prefs.show_menu); - menu_item = glade_xml_get_widget (main_window_xml, "show_menubar1"); +/* menu_item = glade_xml_get_widget (main_window_xml, "show_menubar1"); gtk_check_menu_item_set_active ((GtkCheckMenuItem *) menu_item, prefs.show_menu); - +*/ if (prefs.mode == BASIC_MODE) menu_item = glade_xml_get_widget (main_window_xml, "basic_mode"); else if (prefs.mode == SCIENTIFIC_MODE) menu_item = diff -ur galculator-1.2.3/src/main.c galculator-1.2.3-psion/src/main.c --- galculator-1.2.3/src/main.c 2004-03-20 14:42:10.000000000 +0100 +++ galculator-1.2.3-psion/src/main.c 2004-10-29 12:39:18.000000000 +0200 @@ -141,7 +141,7 @@ /* at first get the main frame */ main_window = ui_main_window_create(); - gtk_window_set_title ((GtkWindow *)main_window, PACKAGE); + gtk_window_set_title ((GtkWindow *)main_window, _("Calculator")); ui_main_window_buttons_create(prefs.mode); diff -ur galculator-1.2.3/src/ui.c galculator-1.2.3-psion/src/ui.c --- galculator-1.2.3/src/ui.c 2004-05-22 19:18:37.000000000 +0200 +++ galculator-1.2.3-psion/src/ui.c 2004-10-29 12:46:48.000000000 +0200 @@ -318,18 +318,18 @@ /* now create the new one at location */ switch(location) { case DISPCTRL_BOTTOM: - box = glade_xml_get_widget (main_window_xml, "window_vbox"); + box = glade_xml_get_widget (main_window_xml, "display_hbox"); dispctrl_xml = glade_file_open (DISPCTRL_BOTTOM_GLADE_FILE, "table_dispctrl", TRUE); - ui_pack_from_xml (box, 2, dispctrl_xml, "table_dispctrl", - "button_clr", TRUE, TRUE); + ui_pack_from_xml (box, 1, dispctrl_xml, "table_dispctrl", + "button_clr", FALSE, TRUE); break; case DISPCTRL_RIGHT: box = glade_xml_get_widget (main_window_xml, "display_hbox"); dispctrl_xml = glade_file_open (DISPCTRL_RIGHT_GLADE_FILE, "table_dispctrl", TRUE); ui_pack_from_xml (box, 1, dispctrl_xml, "table_dispctrl", - "button_clr", FALSE, FALSE); + "button_clr", FALSE, TRUE); break; case DISPCTRL_RIGHTV: box = glade_xml_get_widget (main_window_xml, "display_hbox"); @@ -372,9 +372,10 @@ void ui_main_window_buttons_create (int mode) { - GtkWidget *box, *button; + GtkWidget *box = NULL, *button; struct lconv *locale_settings; s_signal_cb signal_cb; + GdkRectangle rect; if (mode == BASIC_MODE) { button_box_xml = glade_file_open (BASIC_GLADE_FILE, "button_box", TRUE); @@ -410,6 +411,8 @@ gtk_widget_set_sensitive (button, memory.len > 0); button = glade_xml_get_widget (button_box_xml, "button_Mplus"); gtk_widget_set_sensitive (button, memory.len > 0); + + gtk_widget_show_all(box); } /* set_table_child_callback. Function argument for set_all_*_buttons_property. @@ -573,6 +576,7 @@ } gtk_widget_set_sensitive (current_button, (active_buttons[counter].mask & state) == state); + gtk_widget_show (current_button); counter++; } } @@ -581,13 +585,15 @@ { /* just put one here and hide it afterwards. we need the button for working key accelerators. */ - if (prefs.mode == BASIC_MODE) +/* if (prefs.mode == BASIC_MODE) + */ ui_main_window_set_dispctrl (DISPCTRL_BOTTOM); - else if (current_status.notation == CS_RPN) +/* else if (current_status.notation == CS_RPN) ui_main_window_set_dispctrl (DISPCTRL_RIGHTV); else ui_main_window_set_dispctrl (DISPCTRL_RIGHT); set_widget_visibility (dispctrl_xml, "table_dispctrl", prefs.vis_dispctrl); + */ } /* @@ -774,20 +780,6 @@ return menu; } -GtkWidget *ui_right_mouse_menu_create () -{ - GtkWidget *menu, *menu_item; - - menu = gtk_menu_new(); - - menu_item = gtk_check_menu_item_new_with_mnemonic (_("Show _menu bar")); - gtk_check_menu_item_set_active ((GtkCheckMenuItem *) menu_item, prefs.show_menu); - gtk_menu_shell_append ((GtkMenuShell *) menu, menu_item); - gtk_widget_show (menu_item); - g_signal_connect (G_OBJECT (menu_item), "activate", (GCallback) on_show_menubar1_activate, NULL); - - return menu; -} GtkWidget *ui_pref_dialog_create () { diff -ur galculator-1.2.3/ui/main_frame.glade galculator-1.2.3-psion/ui/main_frame.glade --- galculator-1.2.3/ui/main_frame.glade 2004-05-22 18:54:44.000000000 +0200 +++ galculator-1.2.3-psion/ui/main_frame.glade 2004-08-31 21:25:25.000000000 +0200 @@ -10,6 +10,11 @@ False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST The main program window. @@ -19,6 +24,8 @@ True + True + False @@ -261,23 +268,6 @@ - - - - True - - - - - - True - Show _menu bar - True - False - - - - @@ -502,6 +492,8 @@ True True False + False + True GTK_JUSTIFY_LEFT GTK_WRAP_WORD False diff -ur galculator-1.2.3/ui/prefs.glade galculator-1.2.3-psion/ui/prefs.glade --- galculator-1.2.3/ui/prefs.glade 2004-03-14 20:44:06.000000000 +0100 +++ galculator-1.2.3-psion/ui/prefs.glade 2004-10-29 12:41:28.000000000 +0200 @@ -10,6 +10,11 @@ False True False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST True A dialog that is used to change preferences settings. @@ -41,6 +46,7 @@ gtk-close True GTK_RELIEF_NORMAL + True -7 Closes the dialog. @@ -170,6 +176,7 @@ True GTK_RELIEF_NORMAL + True @@ -210,6 +217,7 @@ True True GTK_RELIEF_NORMAL + True @@ -297,6 +305,7 @@ True True GTK_RELIEF_NORMAL + True @@ -384,6 +393,7 @@ True True GTK_RELIEF_NORMAL + True @@ -471,6 +481,7 @@ True True GTK_RELIEF_NORMAL + True @@ -560,6 +571,7 @@ True GTK_RELIEF_NORMAL + True @@ -699,6 +711,7 @@ True GTK_RELIEF_NORMAL + True @@ -740,6 +753,7 @@ True True GTK_RELIEF_NORMAL + True @@ -913,6 +927,7 @@ Angle base units True GTK_RELIEF_NORMAL + True False False True @@ -935,6 +950,7 @@ Notation True GTK_RELIEF_NORMAL + True False False True @@ -957,6 +973,7 @@ Arithmetic operation True GTK_RELIEF_NORMAL + True False False True @@ -979,6 +996,7 @@ Open brackets True GTK_RELIEF_NORMAL + True False False True @@ -1001,6 +1019,7 @@ Number base units True GTK_RELIEF_NORMAL + True False False True @@ -1136,6 +1155,7 @@ Use custom button font True GTK_RELIEF_NORMAL + True False False True @@ -1182,6 +1202,7 @@ True GTK_RELIEF_NORMAL + True @@ -1624,7 +1645,7 @@ 0 True - * + * False @@ -1645,7 +1666,7 @@ 0 True - * + * False @@ -1666,7 +1687,7 @@ 0 True - * + * False @@ -1698,6 +1719,7 @@ Add True GTK_RELIEF_NORMAL + True @@ -1714,6 +1736,7 @@ Update True GTK_RELIEF_NORMAL + True @@ -1730,6 +1753,7 @@ Delete True GTK_RELIEF_NORMAL + True @@ -1746,6 +1770,7 @@ Clear True GTK_RELIEF_NORMAL + True @@ -1999,7 +2024,7 @@ 0 True - * + * False @@ -2020,7 +2045,7 @@ 0 True - * + * False @@ -2041,7 +2066,7 @@ 0 True - * + * False @@ -2073,6 +2098,7 @@ Add True GTK_RELIEF_NORMAL + True @@ -2089,6 +2115,7 @@ Update True GTK_RELIEF_NORMAL + True @@ -2105,6 +2132,7 @@ Delete True GTK_RELIEF_NORMAL + True @@ -2121,6 +2149,7 @@ Clear True GTK_RELIEF_NORMAL + True @@ -2264,6 +2293,7 @@ signed True GTK_RELIEF_NORMAL + True False False True @@ -2416,6 +2446,7 @@ signed True GTK_RELIEF_NORMAL + True False False True @@ -2590,6 +2621,7 @@ fix length to a multiple of True GTK_RELIEF_NORMAL + True False False True @@ -2612,6 +2644,7 @@ signed True GTK_RELIEF_NORMAL + True False False True @@ -2793,6 +2826,7 @@ finite stack size (x, y, z, t) True GTK_RELIEF_NORMAL + True False False True @@ -2812,6 +2846,7 @@ infinite stack size True GTK_RELIEF_NORMAL + True False False True @@ -2916,6 +2951,7 @@ Remember display value on exit True GTK_RELIEF_NORMAL + True False False True @@ -2959,24 +2995,7 @@ 6 - - True - <b>Visibility</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - + @@ -3007,22 +3026,7 @@ - - True - True - Show menu bar - True - GTK_RELIEF_NORMAL - False - False - True - - - - 0 - False - False - +