diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-12-28 20:24:50 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-12-28 20:24:50 +0100 |
| commit | 09795a01ef859f072920de9df974d1b03b9ab9a4 (patch) | |
| tree | 4d05907fc37f1bd781e506f5e196f7435aeec0ab /app/bin/doption.c | |
| parent | 5b4163d8c76b03f0d31b09866aa4bd06b4d8d804 (diff) | |
New upstream version 4.2.4aupstream/4.2.4a
Diffstat (limited to 'app/bin/doption.c')
| -rw-r--r-- | app/bin/doption.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/app/bin/doption.c b/app/bin/doption.c index 9413b5e..b1533c9 100644 --- a/app/bin/doption.c +++ b/app/bin/doption.c @@ -1,5 +1,5 @@ -/* - * $Header: /home/dmarkle/xtrkcad-fork-cvs/xtrkcad/app/bin/doption.c,v 1.8 2009-10-15 04:21:15 dspagnol Exp $ +/** \file doption.c + * Option dialogs */ /* XTrkCad - Model Railroad CAD @@ -405,6 +405,9 @@ typedef struct { long fmt; } dstFmts_t; static dstFmts_t englishDstFmts[] = { + { N_("999.999999"), DISTFMT_FMT_NONE|DISTFMT_FRACT_NUM|6 }, + { N_("999.99999"), DISTFMT_FMT_NONE|DISTFMT_FRACT_NUM|5 }, + { N_("999.9999"), DISTFMT_FMT_NONE|DISTFMT_FRACT_NUM|4 }, { N_("999.999"), DISTFMT_FMT_NONE|DISTFMT_FRACT_NUM|3 }, { N_("999.99"), DISTFMT_FMT_NONE|DISTFMT_FRACT_NUM|2 }, { N_("999.9"), DISTFMT_FMT_NONE|DISTFMT_FRACT_NUM|1 }, @@ -437,10 +440,15 @@ static dstFmts_t metricDstFmts[] = { { NULL, 0 }, { NULL, 0 }, { NULL, 0 }, + { NULL, 0 }, + { NULL, 0 }, + { NULL, 0 }, { NULL, 0 } }; static dstFmts_t *dstFmts[] = { englishDstFmts, metricDstFmts }; - +/** + * Load the selection list for number formats with the appropriate list of variants. + */ static void LoadDstFmtList( void ) { @@ -466,14 +474,6 @@ static void UpdatePrefD( void ) for ( inx = 0; inx<sizeof prefPLs/sizeof prefPLs[0]; inx++ ) { if ( (prefPLs[inx].option&PDO_DIM) ) { ParamLoadControl( &prefPG, inx ); -#ifdef LATER - val = wFloatGetValue( (wFloat_p)prefPLs[inx].control ); - if ( newUnits == UNITS_METRIC ) - val *= 2.54; - else - val /= 2.54; - wFloatSetValue( (wFloat_p)prefPLs[inx].control, val ); -#endif } } LoadDstFmtList(); @@ -502,6 +502,7 @@ static void PrefOk( void * junk ) if ( resetValues ) { NoticeMessage2( 0, MSG_CONN_PARAMS_TOO_SMALL, _("Ok"), NULL ) ; } + wHide( prefW ); DoChangeNotification(changes); } |