diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index b6fd061e3..390d5092c 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -468,7 +468,8 @@ PREFERENCES_DARKFRAME;Soustraction de Trame Noire PREFERENCES_DARKFRAMEFOUND;Trouvé PREFERENCES_DARKFRAMESHOTS;image(s) PREFERENCES_DARKFRAMETEMPLATES;modèle(s) -PREFERENCES_DATEFORMAT;Format de la date +PREFERENCES_DATEFORMAT;Format +PREFERENCES_DATEFORMATFRAME;Format de la date PREFERENCES_DATEFORMATHINT;Vous pouvez utiliser les paramètres de chaînes formatés suivants:\n%y : année\n%m : mois\n%d : jour\n\nPar exemple, le format de date française est:\n%d/%m/%y PREFERENCES_DEFAULTLANG;Langue par défaut PREFERENCES_DEFAULTTHEME;Thème par défaut diff --git a/rtdata/languages/Italian b/rtdata/languages/Italian index 33b2a905f..5aaf6eb52 100644 --- a/rtdata/languages/Italian +++ b/rtdata/languages/Italian @@ -438,7 +438,8 @@ PREFERENCES_CLIPPINGIND;Indicazione di tosaggio PREFERENCES_CMETRICINTENT;Intento colorimetrico PREFERENCES_CUTOVERLAYBRUSH;Pennello copertura ritaglio PREFERENCES_DARKFRAME;Dark frame -PREFERENCES_DATEFORMAT;Formato data +PREFERENCES_DATEFORMAT;Formato +PREFERENCES_DATEFORMATFRAME;Formato data PREFERENCES_DATEFORMATHINT;Puoi usare le seguenti stringhe di formattazione:\n%y : anno\n%m : mese\n%d : giorno\n\nPer esempio, il formato italiano per la data è:\n%d/%m/%y PREFERENCES_DEFAULTLANG;Lingua predefinita PREFERENCES_DEFAULTTHEME;Aspetto ordinario diff --git a/rtdata/languages/default b/rtdata/languages/default index 54ea76470..c79efe882 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -482,7 +482,8 @@ PREFERENCES_DARKFRAME;Dark frame PREFERENCES_DARKFRAMEFOUND;Found PREFERENCES_DARKFRAMESHOTS;shots PREFERENCES_DARKFRAMETEMPLATES;templates -PREFERENCES_DATEFORMAT;Date Format +PREFERENCES_DATEFORMAT;Format +PREFERENCES_DATEFORMATFRAME;Date Format PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:\n%y : year\n%m : month\n%d : day\n\nFor example, the hungarian date format is:\n%y/%m/%d PREFERENCES_DEFAULTLANG;Default language PREFERENCES_DEFAULTTHEME;Default theme diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 5c082ac42..c14f6546b 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -418,6 +418,8 @@ Gtk::Widget* Preferences::getGeneralPanel () { //----- + Gtk::HBox* hbcd = new Gtk::HBox (); + Gtk::Frame* frl = new Gtk::Frame (M("PREFERENCES_CLIPPINGIND")); blinkClipped = new Gtk::CheckButton (M("PREFERENCES_BLINKCLIPPED")); Gtk::VBox* vbrl = new Gtk::VBox (); @@ -431,7 +433,7 @@ Gtk::Widget* Preferences::getGeneralPanel () { hlThresh->set_increments (1, 10); hlThresh->set_range (0, 255); vbhl->pack_start (*hll, Gtk::PACK_SHRINK, 8); - vbhl->pack_start (*hlThresh, Gtk::PACK_SHRINK, 8); + vbhl->pack_end (*hlThresh, Gtk::PACK_SHRINK, 8); vbrl->pack_start (*vbhl, Gtk::PACK_SHRINK, 4); @@ -443,14 +445,14 @@ Gtk::Widget* Preferences::getGeneralPanel () { shThresh->set_increments (1, 10); shThresh->set_range (0, 255); vbsh->pack_start (*shl, Gtk::PACK_SHRINK, 8); - vbsh->pack_start (*shThresh, Gtk::PACK_SHRINK, 8); + vbsh->pack_end (*shThresh, Gtk::PACK_SHRINK, 8); vbrl->pack_start (*vbsh, Gtk::PACK_SHRINK, 4); frl->add (*vbrl); - mvbsd->pack_start (*frl, Gtk::PACK_SHRINK, 4); + hbcd->pack_start (*frl, true, true, 0); //----- - Gtk::Frame* fdf = new Gtk::Frame (M("PREFERENCES_DATEFORMAT")); + Gtk::Frame* fdf = new Gtk::Frame (M("PREFERENCES_DATEFORMATFRAME")); Gtk::HBox* hb6 = new Gtk::HBox (); Gtk::VBox* dfvb = new Gtk::VBox (); @@ -464,7 +466,8 @@ Gtk::Widget* Preferences::getGeneralPanel () { fdf->add (*dfvb); dfvb->set_border_width (4); - mvbsd->pack_start (*fdf, Gtk::PACK_SHRINK, 4); + hbcd->pack_start (*fdf, true, true, 0); + mvbsd->pack_start (*hbcd, Gtk::PACK_SHRINK, 4); //----- Gtk::Frame* fdg = new Gtk::Frame (M("PREFERENCES_EXTERNALEDITOR"));