Home | History | Annotate | Download | only in patches
      1 /jds/bin/diff -uprN dia-0.96.1.old/app/dia-props.c dia-0.96.1/app/dia-props.c
      2 --- dia-0.96.1.old/app/dia-props.c	2008-12-02 17:23:16.391323000 +0000
      3 +++ dia-0.96.1/app/dia-props.c	2008-12-03 10:15:22.515100000 +0000
      4 @@ -139,14 +139,14 @@ create_diagram_properties_dialog(Diagram
      5  		   GTK_FILL, GTK_FILL, 0, 0);
      6    gtk_widget_show(label);
      7  
      8 -  adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 10.0, 0.1, 10.0, 10.0));
      9 +  adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 10.0, 0.1, 10.0, 0));
     10    width_x_entry = gtk_spin_button_new(adj, 1.0, 3);
     11    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(width_x_entry), TRUE);
     12    gtk_table_attach(GTK_TABLE(table), width_x_entry, 1,2, 2,3,
     13  		   GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
     14    gtk_widget_show(width_x_entry);
     15  
     16 -  adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 10.0, 0.1, 10.0, 10.0));
     17 +  adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 10.0, 0.1, 10.0, 0));
     18    width_y_entry = gtk_spin_button_new(adj, 1.0, 3);
     19    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(width_y_entry), TRUE);
     20    gtk_table_attach(GTK_TABLE(table), width_y_entry, 2,3, 2,3,
     21 @@ -159,14 +159,14 @@ create_diagram_properties_dialog(Diagram
     22  		   GTK_FILL, GTK_FILL, 0, 0);
     23    gtk_widget_show(label);
     24  
     25 -  adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 10.0));
     26 +  adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 0));
     27    visible_x_entry = gtk_spin_button_new(adj, 1.0, 0);
     28    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(visible_x_entry), TRUE);
     29    gtk_table_attach(GTK_TABLE(table), visible_x_entry, 1,2, 3,4,
     30  		   GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
     31    gtk_widget_show(visible_x_entry);
     32  
     33 -  adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 10.0));
     34 +  adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 0));
     35    visible_y_entry = gtk_spin_button_new(adj, 1.0, 0);
     36    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(visible_y_entry), TRUE);
     37    gtk_table_attach(GTK_TABLE(table), visible_y_entry, 2,3, 3,4,
     38 @@ -188,7 +188,7 @@ create_diagram_properties_dialog(Diagram
     39  		   GTK_FILL, GTK_FILL, 0, 0);
     40    gtk_widget_show(label);
     41  
     42 -  adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 10.0));
     43 +  adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 0));
     44    hex_size_entry = gtk_spin_button_new(adj, 1.0, 0);
     45    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(hex_size_entry), TRUE);
     46    gtk_table_attach(GTK_TABLE(table), hex_size_entry, 1,2, 5,6,
     47 /jds/bin/diff -uprN dia-0.96.1.old/app/dialogs.c dia-0.96.1/app/dialogs.c
     48 --- dia-0.96.1.old/app/dialogs.c	2008-12-02 17:23:16.393717000 +0000
     49 +++ dia-0.96.1/app/dialogs.c	2008-12-03 10:41:28.733781000 +0000
     50 @@ -66,7 +66,7 @@ GtkSpinButton *
     51  dialog_add_spinbutton(GtkWidget *dialog, char *title,
     52  		      real min, real max, real decimals) {
     53    GtkAdjustment *limits =
     54 -    GTK_ADJUSTMENT(gtk_adjustment_new(10.0, min, max, 1.0, 10.0, 100.0));
     55 +    GTK_ADJUSTMENT(gtk_adjustment_new(10.0, min, max, 1.0, 10.0, 0));
     56    GtkWidget *box = gtk_hbox_new(FALSE, 10);
     57    GtkWidget *label = gtk_label_new(title);
     58    GtkWidget *entry = gtk_spin_button_new(limits, 10.0, decimals);
     59 /jds/bin/diff -uprN dia-0.96.1.old/app/diapagelayout.c dia-0.96.1/app/diapagelayout.c
     60 --- dia-0.96.1.old/app/diapagelayout.c	2008-12-02 17:23:16.390570000 +0000
     61 +++ dia-0.96.1/app/diapagelayout.c	2008-12-03 10:36:27.634596000 +0000
     62 @@ -203,7 +203,7 @@ dia_page_layout_init(DiaPageLayout *self
     63    gtk_widget_show(wid);
     64  
     65    self->tmargin = dia_unit_spinner_new(
     66 -	GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,10)),
     67 +	GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,0)),
     68  	2, DIA_UNIT_CENTIMETER);
     69    gtk_table_attach(GTK_TABLE(table), self->tmargin, 1,2, 0,1,
     70  		   GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
     71 @@ -216,7 +216,7 @@ dia_page_layout_init(DiaPageLayout *self
     72    gtk_widget_show(wid);
     73  
     74    self->bmargin = dia_unit_spinner_new(
     75 -	GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,10)),
     76 +	GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,0)),
     77  	2, DIA_UNIT_CENTIMETER);
     78    gtk_table_attach(GTK_TABLE(table), self->bmargin, 1,2, 1,2,
     79  		   GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
     80 @@ -229,7 +229,7 @@ dia_page_layout_init(DiaPageLayout *self
     81    gtk_widget_show(wid);
     82  
     83    self->lmargin = dia_unit_spinner_new(
     84 -	GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,10)),
     85 +	GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,0)),
     86  	2, DIA_UNIT_CENTIMETER);
     87    gtk_table_attach(GTK_TABLE(table), self->lmargin, 1,2, 2,3,
     88  		   GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
     89 @@ -242,7 +242,7 @@ dia_page_layout_init(DiaPageLayout *self
     90    gtk_widget_show(wid);
     91  
     92    self->rmargin = dia_unit_spinner_new(
     93 -	GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,10)),
     94 +	GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,0)),
     95  	2, DIA_UNIT_CENTIMETER);
     96    gtk_table_attach(GTK_TABLE(table), self->rmargin, 1,2, 3,4,
     97  		   GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
     98 @@ -266,7 +266,7 @@ dia_page_layout_init(DiaPageLayout *self
     99    gtk_widget_show(self->scale);
    100  
    101    self->scaling = gtk_spin_button_new(
    102 -	GTK_ADJUSTMENT(gtk_adjustment_new(100,1,10000, 1,10,10)), 1, 1);
    103 +	GTK_ADJUSTMENT(gtk_adjustment_new(100,1,10000, 1,10,10)), 1, 0);
    104    gtk_table_attach(GTK_TABLE(table), self->scaling, 1,4, 0,1,
    105  		   GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
    106    gtk_widget_show(self->scaling);
    107 /jds/bin/diff -uprN dia-0.96.1.old/app/preferences.c dia-0.96.1/app/preferences.c
    108 --- dia-0.96.1.old/app/preferences.c	2008-12-02 17:23:16.372512000 +0000
    109 +++ dia-0.96.1/app/preferences.c	2008-12-03 10:36:44.441969000 +0000
    110 @@ -406,7 +406,7 @@ prefs_get_property_widget(DiaPrefData *d
    111    case PREF_INT:
    112      adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0,
    113  					    G_MININT, G_MAXINT,
    114 -					    1.0, 10.0, 10.0 ));
    115 +					    1.0, 10.0, 0 ));
    116      widget = gtk_spin_button_new (adj, 1.0, 0);
    117      gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(widget), TRUE);
    118      gtk_widget_set_usize(widget, 80, -1);
    119 @@ -414,7 +414,7 @@ prefs_get_property_widget(DiaPrefData *d
    120    case PREF_UINT:
    121      adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0,
    122  					    0.0, G_MAXINT,
    123 -					    1.0, 10.0, 10.0 ));
    124 +					    1.0, 10.0, 0 ));
    125      widget = gtk_spin_button_new (adj, 1.0, 0);
    126      gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(widget), TRUE);
    127      gtk_widget_set_usize(widget, 80, -1);
    128 @@ -422,7 +422,7 @@ prefs_get_property_widget(DiaPrefData *d
    129    case PREF_REAL:
    130      adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0,
    131  					    G_MINFLOAT, G_MAXFLOAT,
    132 -					    1.0, 10.0, 10.0 ));
    133 +					    1.0, 10.0, 0 ));
    134      widget = gtk_spin_button_new (adj, 1.0, 3);
    135      gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(widget), TRUE);
    136      gtk_widget_set_usize(widget, 80, -1);
    137 @@ -430,7 +430,7 @@ prefs_get_property_widget(DiaPrefData *d
    138    case PREF_UREAL:
    139      adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0,
    140  					    0.0, G_MAXFLOAT,
    141 -					    1.0, 10.0, 10.0 ));
    142 +					    1.0, 10.0, 0 ));
    143      widget = gtk_spin_button_new (adj, 1.0, 3);
    144      gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(widget), TRUE);
    145      gtk_widget_set_usize(widget, 80, -1);
    146 /jds/bin/diff -uprN dia-0.96.1.old/lib/prop_geomtypes.c dia-0.96.1/lib/prop_geomtypes.c
    147 --- dia-0.96.1.old/lib/prop_geomtypes.c	2008-12-02 17:23:12.143764000 +0000
    148 +++ dia-0.96.1/lib/prop_geomtypes.c	2008-12-03 10:39:18.033980000 +0000
    149 @@ -69,7 +69,7 @@ realprop_get_widget(RealProperty *prop, 
    150    GtkAdjustment *adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->real_data,
    151                                                           G_MINFLOAT, 
    152                                                           G_MAXFLOAT,
    153 -                                                         0.1, 1.0, 1.0));
    154 +                                                         0.1, 1.0, 0));
    155    GtkWidget *ret = gtk_spin_button_new(adj, 1.0, 2);
    156    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ret),TRUE);
    157    prophandler_connect(&prop->common,GTK_OBJECT(adj),"value_changed");
    158 @@ -87,11 +87,11 @@ realprop_reset_widget(RealProperty *prop
    159                                              numdata->min, numdata->max,
    160                                              numdata->step, 
    161                                              10.0 * numdata->step,
    162 -                                            10.0 * numdata->step));
    163 +                                            0));
    164    } else {
    165      adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->real_data,
    166                                              G_MINFLOAT, G_MAXFLOAT,
    167 -                                            0.1, 1.0, 1.0));
    168 +                                            0.1, 1.0, 0));
    169    }
    170    gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(widget), adj);
    171  }
    172 @@ -180,7 +180,7 @@ lengthprop_get_widget(LengthProperty *pr
    173    GtkAdjustment *adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->length_data,
    174                                                           G_MINFLOAT, 
    175                                                           G_MAXFLOAT,
    176 -                                                         0.1, 1.0, 1.0));
    177 +                                                         0.1, 1.0, 0));
    178    GtkWidget *ret = dia_unit_spinner_new(adj, 2, DIA_UNIT_CENTIMETER);
    179    /*  gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ret),TRUE);*/
    180    prophandler_connect(&prop->common,GTK_OBJECT(adj),"value_changed");
    181 @@ -199,11 +199,11 @@ lengthprop_reset_widget(LengthProperty *
    182                                              numdata->min, numdata->max,
    183                                              numdata->step, 
    184                                              10.0 * numdata->step,
    185 -                                            10.0 * numdata->step));
    186 +                                            0));
    187    } else {
    188      adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->length_data,
    189                                              G_MINFLOAT, G_MAXFLOAT,
    190 -                                            0.1, 1.0, 1.0));
    191 +                                            0.1, 1.0, 0));
    192    }
    193    dia_unit_spinner_set_adjustment(GTK_SPIN_BUTTON(widget), adj);
    194    */
    195 @@ -295,7 +295,7 @@ fontsizeprop_get_widget(FontsizeProperty
    196    GtkAdjustment *adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->fontsize_data,
    197                                                           G_MINFLOAT, 
    198                                                           G_MAXFLOAT,
    199 -                                                         0.1, 1.0, 1.0));
    200 +                                                         0.1, 1.0, 0));
    201    GtkWidget *ret = dia_unit_spinner_new(adj, 2, DIA_UNIT_POINT);
    202    /*  gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ret),TRUE);*/
    203    prophandler_connect(&prop->common,GTK_OBJECT(adj),"value_changed");
    204 @@ -314,11 +314,11 @@ fontsizeprop_reset_widget(FontsizeProper
    205                                              numdata->min, numdata->max,
    206                                              numdata->step, 
    207                                              10.0 * numdata->step,
    208 -                                            10.0 * numdata->step));
    209 +                                            0));
    210    } else {
    211      adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->fontsize_data,
    212                                              G_MINFLOAT, G_MAXFLOAT,
    213 -                                            0.1, 1.0, 1.0));
    214 +                                            0.1, 1.0, 0));
    215    }
    216    gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(widget), adj);
    217    */
    218 /jds/bin/diff -uprN dia-0.96.1.old/lib/prop_inttypes.c dia-0.96.1/lib/prop_inttypes.c
    219 --- dia-0.96.1.old/lib/prop_inttypes.c	2008-12-02 17:23:12.143558000 +0000
    220 +++ dia-0.96.1/lib/prop_inttypes.c	2008-12-03 10:17:24.393757000 +0000
    221 @@ -280,7 +280,7 @@ intprop_get_widget(IntProperty *prop, Pr
    222  { 
    223    GtkAdjustment *adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->int_data,
    224                                                           G_MININT, G_MAXINT,
    225 -                                                         1.0, 10.0, 10.0));
    226 +                                                         1.0, 10.0, 0));
    227    GtkWidget *ret = gtk_spin_button_new(adj, 1.0, 0);
    228    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ret),TRUE);
    229    prophandler_connect(&prop->common,GTK_OBJECT(adj),"value_changed");
    230 @@ -297,11 +297,11 @@ intprop_reset_widget(IntProperty *prop, 
    231      adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->int_data,
    232                                              numdata->min, numdata->max,
    233                                              numdata->step, 10.0 * numdata->step,
    234 -                                            10.0 * numdata->step));
    235 +                                            0));
    236    } else {
    237      adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->int_data,
    238                                              G_MININT, G_MAXINT,
    239 -                                            1.0, 10.0, 10.0));
    240 +                                            1.0, 10.0, 0));
    241    }
    242    gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(widget), adj);
    243    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(widget), TRUE);
    244 /jds/bin/diff -uprN dia-0.96.1.old/lib/widgets.c dia-0.96.1/lib/widgets.c
    245 --- dia-0.96.1.old/lib/widgets.c	2008-12-02 17:23:12.141938000 +0000
    246 +++ dia-0.96.1/lib/widgets.c	2008-12-03 10:17:07.405589000 +0000
    247 @@ -149,7 +149,7 @@ dia_size_selector_init (DiaSizeSelector 
    248    ss->ratio = 0.0;
    249    /* Here's where we set up the real thing */
    250    adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.01, 10,
    251 -					  0.1, 1.0, 1.0));
    252 +					  0.1, 1.0, 0));
    253    ss->width = GTK_SPIN_BUTTON(gtk_spin_button_new(adj, 1.0, 2));
    254    gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(ss->width), TRUE);
    255    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ss->width), TRUE);
    256 @@ -157,7 +157,7 @@ dia_size_selector_init (DiaSizeSelector 
    257    gtk_widget_show(GTK_WIDGET(ss->width));
    258  
    259    adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.01, 10,
    260 -					  0.1, 1.0, 1.0));
    261 +					  0.1, 1.0, 0));
    262    ss->height = GTK_SPIN_BUTTON(gtk_spin_button_new(adj, 1.0, 2));
    263    gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(ss->height), TRUE);
    264    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ss->height), TRUE);
    265 @@ -831,7 +831,7 @@ dia_line_style_selector_init (DiaLineSty
    266    gtk_box_pack_start_defaults(GTK_BOX(box), label);
    267    gtk_widget_show(label);
    268  
    269 -  adj = (GtkAdjustment *)gtk_adjustment_new(0.1, 0.00, 10.0, 0.1, 1.0, 1.0);
    270 +  adj = (GtkAdjustment *)gtk_adjustment_new(0.1, 0.00, 10.0, 0.1, 1.0, 0);
    271    length = gtk_spin_button_new(adj, DEFAULT_LINESTYLE_DASHLEN, 2);
    272    gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(length), TRUE);
    273    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(length), TRUE);
    274 /jds/bin/diff -uprN dia-0.96.1.old/objects/UML/class_dialog.c dia-0.96.1/objects/UML/class_dialog.c
    275 --- dia-0.96.1.old/objects/UML/class_dialog.c	2008-12-02 17:23:12.825073000 +0000
    276 +++ dia-0.96.1/objects/UML/class_dialog.c	2008-12-03 10:19:58.397673000 +0000
    277 @@ -255,7 +255,7 @@ create_font_props_row (GtkTable   *table
    278    dia_font_selector_set_font (DIAFONTSELECTOR (*fontsel), font);
    279    gtk_table_attach_defaults (GTK_TABLE (table), GTK_WIDGET(*fontsel), 1, 2, row, row+1);
    280  
    281 -  adj = gtk_adjustment_new (height, 0.1, 10.0, 0.1, 1.0, 1.0);
    282 +  adj = gtk_adjustment_new (height, 0.1, 10.0, 0.1, 1.0, 0);
    283    *heightsel = GTK_SPIN_BUTTON (gtk_spin_button_new (GTK_ADJUSTMENT(adj), 1.0, 2));
    284    gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (*heightsel), TRUE);
    285    gtk_table_attach_defaults (table, GTK_WIDGET (*heightsel), 2, 3, row, row+1);
    286 @@ -349,7 +349,7 @@ class_create_page(GtkNotebook *notebook,
    287    checkbox = gtk_check_button_new_with_label(_("Wrap Operations"));
    288    prop_dialog->op_wrap = GTK_TOGGLE_BUTTON( checkbox );
    289    gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
    290 -  adj = gtk_adjustment_new( umlclass->wrap_after_char, 0.0, 200.0, 1.0, 5.0, 1.0);
    291 +  adj = gtk_adjustment_new( umlclass->wrap_after_char, 0.0, 200.0, 1.0, 5.0, 0);
    292    prop_dialog->wrap_after_char = GTK_SPIN_BUTTON(gtk_spin_button_new( GTK_ADJUSTMENT( adj), 0.1, 0));
    293    gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( prop_dialog->wrap_after_char), TRUE);
    294    gtk_spin_button_set_snap_to_ticks( GTK_SPIN_BUTTON( prop_dialog->wrap_after_char), TRUE);
    295 @@ -364,7 +364,7 @@ class_create_page(GtkNotebook *notebook,
    296    checkbox = gtk_check_button_new_with_label(_("Comments visible"));
    297    prop_dialog->comments_vis = GTK_TOGGLE_BUTTON( checkbox );
    298    gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
    299 -  adj = gtk_adjustment_new( umlclass->comment_line_length, 17.0, 200.0, 1.0, 5.0, 1.0);
    300 +  adj = gtk_adjustment_new( umlclass->comment_line_length, 17.0, 200.0, 1.0, 5.0, 0);
    301    prop_dialog->comment_line_length = GTK_SPIN_BUTTON(gtk_spin_button_new( GTK_ADJUSTMENT( adj), 0.1, 0));
    302    gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( prop_dialog->comment_line_length), TRUE);
    303    gtk_spin_button_set_snap_to_ticks( GTK_SPIN_BUTTON( prop_dialog->comment_line_length), TRUE);
    304