/[pspp]/psppire/src/var_type_dialog.c
ViewVC logotype

Diff of /psppire/src/var_type_dialog.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.5 by jmd, Sun Dec 11 01:05:02 2005 UTC revision 1.6 by jmd, Sun Dec 11 10:14:39 2005 UTC
# Line 26  Line 26 
26  #include <glade/glade.h>  #include <glade/glade.h>
27    
28  #include "var_type_dialog.h"  #include "var_type_dialog.h"
29    #include "misc.h"
30    
31  #include "var.h"  #include "var.h"
32    
# Line 61  on_toggle_2(GtkToggleButton *togglebutto Line 62  on_toggle_2(GtkToggleButton *togglebutto
62          case BUTTON_DATE:          case BUTTON_DATE:
63            gtk_widget_hide(dialog->date_format_list);            gtk_widget_hide(dialog->date_format_list);
64            break;            break;
65            case BUTTON_CUSTOM:
66              gtk_widget_hide(dialog->custom_currency_hbox);
67              break;
68            case BUTTON_DOLLAR:
69              gtk_widget_hide(dialog->dollar_window);
70              break;
71            case BUTTON_STRING:
72              gtk_widget_show(dialog->label_decimals);
73              gtk_widget_show(dialog->entry_decimals);
74              break;
75          }          }
76        return ;        return ;
77      }      }
# Line 68  on_toggle_2(GtkToggleButton *togglebutto Line 79  on_toggle_2(GtkToggleButton *togglebutto
79    switch (dialog->active_button)    switch (dialog->active_button)
80      {      {
81      case BUTTON_STRING:      case BUTTON_STRING:
82        gtk_widget_hide(dialog->width_decimals);        gtk_widget_show(dialog->width_decimals);
83          gtk_widget_hide(dialog->label_decimals);
84          gtk_widget_hide(dialog->entry_decimals);
85        break;        break;
86      case BUTTON_DATE:      case BUTTON_DATE:
87        gtk_widget_hide(dialog->width_decimals);        gtk_widget_hide(dialog->width_decimals);
88        gtk_widget_show(dialog->date_format_list);        gtk_widget_show(dialog->date_format_list);
89        break;        break;
90        case BUTTON_DOLLAR:
91          gtk_widget_show(dialog->dollar_window);
92          gtk_widget_show_all(dialog->width_decimals);
93          break;
94        case BUTTON_CUSTOM:
95          gtk_widget_show(dialog->width_decimals);
96          gtk_widget_show(dialog->custom_currency_hbox);
97          break;
98      default:      default:
99        gtk_widget_show_all(dialog->width_decimals);        gtk_widget_show_all(dialog->width_decimals);
100        break;        break;
# Line 111  static struct format_opt format_option[] Line 132  static struct format_opt format_option[]
132      { "dd-mmm-yyyy HH:MM", {FMT_DATETIME, 17, 0}}      { "dd-mmm-yyyy HH:MM", {FMT_DATETIME, 17, 0}}
133    };    };
134    
135    static void
136    add_to_group(GtkWidget *w, gpointer data)
137    {
138      GtkSizeGroup *sg = data;
139      
140      gtk_size_group_add_widget(sg, w);
141    }
142    
143    
144  /* Callback for when the date_format treeview row is changed.  /* Callback for when the date_format treeview row is changed.
145     It sets the fmt_spec to reflect the selected date format */     It sets the fmt_spec to reflect the selected date format */
# Line 141  var_type_dialog_create(GladeXML *xml) Line 170  var_type_dialog_create(GladeXML *xml)
170    
171    struct var_type_dialog *dialog = g_malloc(sizeof(struct var_type_dialog));    struct var_type_dialog *dialog = g_malloc(sizeof(struct var_type_dialog));
172    
173    dialog->window = glade_xml_get_widget(xml,"var_type_dialog");    dialog->window = get_widget_assert(xml,"var_type_dialog");
174    
175    gtk_window_set_transient_for(GTK_WINDOW(dialog->window),    gtk_window_set_transient_for(GTK_WINDOW(dialog->window),
176                                 GTK_WINDOW(glade_xml_get_widget(xml, "data_editor")));                                 GTK_WINDOW(get_widget_assert(xml, "data_editor")));
177    
178    dialog->radioButton[BUTTON_NUMERIC] =    dialog->radioButton[BUTTON_NUMERIC] =
179      glade_xml_get_widget(xml,"radiobutton1");      get_widget_assert(xml,"radiobutton1");
180    dialog->radioButton[BUTTON_COMMA] =      dialog->radioButton[BUTTON_COMMA] =  
181      glade_xml_get_widget(xml,"radiobutton2");      get_widget_assert(xml,"radiobutton2");
182    dialog->radioButton[BUTTON_DOT] =        dialog->radioButton[BUTTON_DOT] =    
183      glade_xml_get_widget(xml,"radiobutton3");      get_widget_assert(xml,"radiobutton3");
184    dialog->radioButton[BUTTON_SCIENTIFIC] =    dialog->radioButton[BUTTON_SCIENTIFIC] =
185      glade_xml_get_widget(xml,"radiobutton4");      get_widget_assert(xml,"radiobutton4");
186    dialog->radioButton[BUTTON_DATE] =      dialog->radioButton[BUTTON_DATE] =  
187      glade_xml_get_widget(xml,"radiobutton5");      get_widget_assert(xml,"radiobutton5");
188    dialog->radioButton[BUTTON_DOLLAR] =    dialog->radioButton[BUTTON_DOLLAR] =
189      glade_xml_get_widget(xml,"radiobutton6");      get_widget_assert(xml,"radiobutton6");
190    dialog->radioButton[BUTTON_CUSTOM] =    dialog->radioButton[BUTTON_CUSTOM] =
191      glade_xml_get_widget(xml,"radiobutton7");      get_widget_assert(xml,"radiobutton7");
192    dialog->radioButton[BUTTON_STRING] =    dialog->radioButton[BUTTON_STRING] =
193      glade_xml_get_widget(xml,"radiobutton8");      get_widget_assert(xml,"radiobutton8");
194    
195    
196      dialog->date_format_list = get_widget_assert(xml, "scrolledwindow4");
197      dialog->width_decimals = get_widget_assert(xml, "width_decimals");
198      dialog->label_decimals = get_widget_assert(xml, "decimals_label");
199      dialog->entry_decimals = get_widget_assert(xml, "decimals_entry");
200    
   dialog->date_format_list = glade_xml_get_widget(xml, "scrolledwindow4");  
   dialog->width_decimals = glade_xml_get_widget(xml, "width_decimals");  
   dialog->label_decimals = glade_xml_get_widget(xml, "label3");  
   dialog->entry_decimals = glade_xml_get_widget(xml, "entry2");  
201    
202      dialog->entry_width = get_widget_assert(xml,"width_entry");
203    
204    dialog->entry_width = glade_xml_get_widget(xml,"entry1");    dialog->custom_currency_hbox = get_widget_assert(xml,
205                                                       "custom_currency_hbox");
206      dialog->dollar_window = get_widget_assert(xml, "dollar_window");
207    
208    
209    dialog->ok = glade_xml_get_widget(xml,"var_type_ok");    dialog->ok = get_widget_assert(xml,"var_type_ok");
210    
211    
212      GtkSizeGroup *sizeGroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
213    
214      gtk_container_foreach(get_widget_assert(xml, "middle_box"),
215                            add_to_group, sizeGroup);
216    #if 0
217      gtk_size_group_add_widget(sizeGroup, dialog->date_format_list);
218      gtk_size_group_add_widget(sizeGroup, dialog->width_decimals);
219    #endif
220      
221    static struct tgs tgs[num_BUTTONS];    static struct tgs tgs[num_BUTTONS];
222    for (i = 0 ; i < num_BUTTONS; ++i )    for (i = 0 ; i < num_BUTTONS; ++i )
223      {      {
# Line 190  var_type_dialog_create(GladeXML *xml) Line 232  var_type_dialog_create(GladeXML *xml)
232    
233    /* Populate the date format tree view */    /* Populate the date format tree view */
234    
235    dialog->date_format_treeview = GTK_TREE_VIEW(glade_xml_get_widget(xml,    dialog->date_format_treeview = GTK_TREE_VIEW(get_widget_assert(xml,
236                                                "date_format_list_view"));                                                "date_format_list_view"));
237    
238    GtkTreeViewColumn *column;    GtkTreeViewColumn *column;
# Line 338  var_type_dialog_set_state(struct var_typ Line 380  var_type_dialog_set_state(struct var_typ
380          }          }
381                    
382          GtkTreePath *path = gtk_tree_model_get_path(model, &iter);          GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
383          gtk_tree_view_set_cursor(dialog->date_format_treeview, path, 0, 0);          if ( path )
384          gtk_tree_path_free(path);            {
385                gtk_tree_view_set_cursor(dialog->date_format_treeview, path, 0, 0);
386                gtk_tree_path_free(path);
387              }
388            else
389              g_warning("Unusual date format: %s\n", fmt_to_string(&var->write));
390    
391        }        }
392        break;        break;

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26