liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save some space in Preference / Image processing tab (see #3526)

Browse Source
This commit is contained in:
Hombre57
2017-10-17 23:25:09 +02:00
parent 659fa619d4
commit 3d4ff41550
3 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtdata/languages/Francais
View File

@@ -955,7 +955,6 @@ PREFERENCES_D50;5000K
PREFERENCES_D55;5500K PREFERENCES_D55;5500K
PREFERENCES_D60;6000K PREFERENCES_D60;6000K
PREFERENCES_D65;6500K PREFERENCES_D65;6500K
PREFERENCES_DARKFRAME;Soustraction de Trame Noire
PREFERENCES_DARKFRAMEFOUND;Trouvé PREFERENCES_DARKFRAMEFOUND;Trouvé
PREFERENCES_DARKFRAMESHOTS;image(s) PREFERENCES_DARKFRAMESHOTS;image(s)
PREFERENCES_DARKFRAMETEMPLATES;modèle(s) PREFERENCES_DARKFRAMETEMPLATES;modèle(s)
@@ -964,6 +963,7 @@ PREFERENCES_DATEFORMATHINT;<i>Vous pouvez utiliser les paramètres de chaînes f
PREFERENCES_DAUB_LABEL;Utiliser les ondelettes de Daubechies D6 au lieu de D4 PREFERENCES_DAUB_LABEL;Utiliser les ondelettes de Daubechies D6 au lieu de D4
PREFERENCES_DAUB_TOOLTIP;Les outils de Réduction de Bruit et de Niveaux d'Ondelettes utilisent une ondelette de Debauchie mère. Si vous choisissez D6 au lieu de D4 vous augmentez le nombre de coéf. orthogonaux de Daubechies et augmentez probablement la qualité des niveaux de taille moyenne. Il n'y a pas de différence de consommation mémoire ou de temps de traitement entre les deux. PREFERENCES_DAUB_TOOLTIP;Les outils de Réduction de Bruit et de Niveaux d'Ondelettes utilisent une ondelette de Debauchie mère. Si vous choisissez D6 au lieu de D4 vous augmentez le nombre de coéf. orthogonaux de Daubechies et augmentez probablement la qualité des niveaux de taille moyenne. Il n'y a pas de différence de consommation mémoire ou de temps de traitement entre les deux.
PREFERENCES_DIRDARKFRAMES;Dossier des images de Trame Noire PREFERENCES_DIRDARKFRAMES;Dossier des images de Trame Noire
PREFERENCES_DIRECTORIES;Dossiers
PREFERENCES_DIRHOME;Racine de mes documents personnels PREFERENCES_DIRHOME;Racine de mes documents personnels
PREFERENCES_DIRLAST;Dernier dossier visité PREFERENCES_DIRLAST;Dernier dossier visité
PREFERENCES_DIROTHER;Autre PREFERENCES_DIROTHER;Autre
@@ -976,8 +976,6 @@ PREFERENCES_EXTERNALEDITOR;Éditeur externe
PREFERENCES_FBROWSEROPTS;Options du navigateur de fichiers et de vignettes PREFERENCES_FBROWSEROPTS;Options du navigateur de fichiers et de vignettes
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Barre de menu de l'explorateur de fichiers uni-ligne\n(à désactiver pour les écrans de faible résolution) PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Barre de menu de l'explorateur de fichiers uni-ligne\n(à désactiver pour les écrans de faible résolution)
PREFERENCES_FILEFORMAT;Format du fichier PREFERENCES_FILEFORMAT;Format du fichier
PREFERENCES_FILMSIMULATION;Simulation de Film
PREFERENCES_FLATFIELD;Champ Uniforme
PREFERENCES_FLATFIELDFOUND;Trouvé PREFERENCES_FLATFIELDFOUND;Trouvé
PREFERENCES_FLATFIELDSDIR;Dossier des images de Champ Uniforme PREFERENCES_FLATFIELDSDIR;Dossier des images de Champ Uniforme
PREFERENCES_FLATFIELDSHOTS;image(s) PREFERENCES_FLATFIELDSHOTS;image(s)

4
rtdata/languages/default
View File

@@ -978,7 +978,6 @@ PREFERENCES_D50_OLD;5000K
PREFERENCES_D55;5500K PREFERENCES_D55;5500K
PREFERENCES_D60;6000K PREFERENCES_D60;6000K
PREFERENCES_D65;6500K PREFERENCES_D65;6500K
PREFERENCES_DARKFRAME;Dark-Frame
PREFERENCES_DARKFRAMEFOUND;Found PREFERENCES_DARKFRAMEFOUND;Found
PREFERENCES_DARKFRAMESHOTS;shots PREFERENCES_DARKFRAMESHOTS;shots
PREFERENCES_DARKFRAMETEMPLATES;templates PREFERENCES_DARKFRAMETEMPLATES;templates
@@ -987,6 +986,7 @@ PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:\n<b>%y<
PREFERENCES_DAUB_LABEL;Use Daubechies D6 wavelets instead of D4 PREFERENCES_DAUB_LABEL;Use Daubechies D6 wavelets instead of D4
PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and Wavelet Levels tools use a Debauchies mother wavelet. If you choose D6 instead of D4 you increase the number of orthogonal Daubechies coefficients and probably increase quality of small-scale levels. There is no memory or processing time difference between the two. PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and Wavelet Levels tools use a Debauchies mother wavelet. If you choose D6 instead of D4 you increase the number of orthogonal Daubechies coefficients and probably increase quality of small-scale levels. There is no memory or processing time difference between the two.
PREFERENCES_DIRDARKFRAMES;Dark-frames directory PREFERENCES_DIRDARKFRAMES;Dark-frames directory
PREFERENCES_DIRECTORIES;Directories
PREFERENCES_DIRHOME;Home directory PREFERENCES_DIRHOME;Home directory
PREFERENCES_DIRLAST;Last visited directory PREFERENCES_DIRLAST;Last visited directory
PREFERENCES_DIROTHER;Other PREFERENCES_DIROTHER;Other
@@ -999,8 +999,6 @@ PREFERENCES_EXTERNALEDITOR;External Editor
PREFERENCES_FBROWSEROPTS;File Browser / Thumbnail Options PREFERENCES_FBROWSEROPTS;File Browser / Thumbnail Options
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display) PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display)
PREFERENCES_FILEFORMAT;File format PREFERENCES_FILEFORMAT;File format
PREFERENCES_FILMSIMULATION;Film Simulation
PREFERENCES_FLATFIELD;Flat-Field
PREFERENCES_FLATFIELDFOUND;Found PREFERENCES_FLATFIELDFOUND;Found
PREFERENCES_FLATFIELDSDIR;Flat-fields directory PREFERENCES_FLATFIELDSDIR;Flat-fields directory
PREFERENCES_FLATFIELDSHOTS;shots PREFERENCES_FLATFIELDSHOTS;shots

61
rtgui/preferences.cc
View File

@@ -513,51 +513,56 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
fdp->add (*vbdp); fdp->add (*vbdp);
mvbpp->pack_start (*fdp, Gtk::PACK_SHRINK, 4); mvbpp->pack_start (*fdp, Gtk::PACK_SHRINK, 4);
Gtk::Frame* fdf = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_DARKFRAME")) ); // Directories
Gtk::HBox* hb42 = Gtk::manage (new Gtk::HBox ()); Gtk::Frame* cdf = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_DIRECTORIES")) );
darkFrameDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); Gtk::Grid* dirgrid = Gtk::manage (new Gtk::Grid ());
setExpandAlignProperties(dirgrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
Gtk::Label *dfLab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_DIRDARKFRAMES") + ":")); Gtk::Label *dfLab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_DIRDARKFRAMES") + ":"));
hb42->pack_start (*dfLab, Gtk::PACK_SHRINK, 4 ); setExpandAlignProperties(dfLab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
hb42->pack_start (*darkFrameDir, Gtk::PACK_EXPAND_WIDGET, 4); darkFrameDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
setExpandAlignProperties(darkFrameDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
dfLabel = Gtk::manage (new Gtk::Label ("Found:")); dfLabel = Gtk::manage (new Gtk::Label ("Found:"));
Gtk::VBox* vbdf = Gtk::manage (new Gtk::VBox ()); setExpandAlignProperties(dfLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
vbdf->pack_start (*hb42, Gtk::PACK_SHRINK, 4);
vbdf->pack_start (*dfLabel, Gtk::PACK_SHRINK, 4 ); dirgrid->attach_next_to(*dfLab, Gtk::POS_TOP, 1, 1);
fdf->add (*vbdf ); dirgrid->attach_next_to(*darkFrameDir, *dfLab, Gtk::POS_RIGHT, 1, 1);
mvbpp->pack_start (*fdf, Gtk::PACK_SHRINK, 4); dirgrid->attach_next_to(*dfLabel, *darkFrameDir, Gtk::POS_RIGHT, 1, 1);
//dfconn = darkFrameDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::darkFrameChanged), true); //dfconn = darkFrameDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::darkFrameChanged), true);
dfconn = darkFrameDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::darkFrameChanged), true); dfconn = darkFrameDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::darkFrameChanged), true);
// FLATFIELD // FLATFIELD
Gtk::Frame* fff = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_FLATFIELD")) );
Gtk::HBox* hb43 = Gtk::manage (new Gtk::HBox ());
flatFieldDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_FLATFIELDSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
Gtk::Label *ffLab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_FLATFIELDSDIR") + ":")); Gtk::Label *ffLab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_FLATFIELDSDIR") + ":"));
hb43->pack_start (*ffLab, Gtk::PACK_SHRINK, 4 ); setExpandAlignProperties(ffLab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
hb43->pack_start (*flatFieldDir); flatFieldDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_FLATFIELDSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
setExpandAlignProperties(flatFieldDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
ffLabel = Gtk::manage (new Gtk::Label ("Found:")); ffLabel = Gtk::manage (new Gtk::Label ("Found:"));
Gtk::VBox* vbff = Gtk::manage (new Gtk::VBox ()); setExpandAlignProperties(ffLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
vbff->pack_start (*hb43, Gtk::PACK_SHRINK, 4);
vbff->pack_start (*ffLabel, Gtk::PACK_SHRINK, 4 ); dirgrid->attach_next_to(*ffLab, *dfLab, Gtk::POS_BOTTOM, 1, 1);
fff->add (*vbff ); dirgrid->attach_next_to(*flatFieldDir, *ffLab, Gtk::POS_RIGHT, 1, 1);
mvbpp->pack_start (*fff, Gtk::PACK_SHRINK, 4); dirgrid->attach_next_to(*ffLabel, *flatFieldDir, Gtk::POS_RIGHT, 1, 1);
//ffconn = flatFieldDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::flatFieldChanged), true); //ffconn = flatFieldDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::flatFieldChanged), true);
ffconn = flatFieldDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::flatFieldChanged), true); ffconn = flatFieldDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::flatFieldChanged), true);
//Cluts Dir //Cluts Dir
Gtk::Frame* clutsDirFrame = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_FILMSIMULATION")) );
Gtk::HBox* clutsDirBox = Gtk::manage (new Gtk::HBox ());
clutsDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_CLUTSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
Gtk::Label *clutsDirLabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_CLUTSDIR") + ":")); Gtk::Label *clutsDirLabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_CLUTSDIR") + ":"));
setExpandAlignProperties(clutsDirLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
clutsDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_CLUTSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
setExpandAlignProperties(clutsDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
Gtk::Label* clutsRestartNeeded = Gtk::manage ( new Gtk::Label (Glib::ustring (" (") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")") ); Gtk::Label* clutsRestartNeeded = Gtk::manage ( new Gtk::Label (Glib::ustring (" (") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")") );
clutsDirBox->pack_start (*clutsDirLabel, Gtk::PACK_SHRINK, 4 ); setExpandAlignProperties(clutsRestartNeeded, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
clutsDirBox->pack_start (*clutsDir );
clutsDirBox->pack_start (*clutsRestartNeeded, Gtk::PACK_SHRINK, 4 );
clutsDirFrame->add (*clutsDirBox );
mvbpp->pack_start (*clutsDirFrame, Gtk::PACK_SHRINK, 4 );
dirgrid->attach_next_to(*clutsDirLabel, *ffLab, Gtk::POS_BOTTOM, 1, 1);
dirgrid->attach_next_to(*clutsDir, *clutsDirLabel, Gtk::POS_RIGHT, 1, 1);
dirgrid->attach_next_to(*clutsRestartNeeded, *clutsDir, Gtk::POS_RIGHT, 1, 1);
cdf->add(*dirgrid);
mvbpp->pack_start (*cdf, Gtk::PACK_SHRINK, 4 );
// Metadata
Gtk::Frame* fmd = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_METADATA"))); Gtk::Frame* fmd = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_METADATA")));
Gtk::VBox* vbmd = Gtk::manage (new Gtk::VBox ()); Gtk::VBox* vbmd = Gtk::manage (new Gtk::VBox ());
ckbTunnelMetaData = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_TUNNELMETADATA"))); ckbTunnelMetaData = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_TUNNELMETADATA")));