Hide manual lens correction widgets when not needed

- The comboboxes and their respective labels for manually specifying a
  camera and lens are now hidden when not in manual mode to not confuse
  the user.
- All Lens Correction Profile widgets are now aligned.
- Labels changed to not mislead users - the tool lets you select a lens
  profile, but it does not let you manually specify the individual
  correction parameters as previously implied.

Closes #4995, closes #4997
This commit is contained in:
Morgan Hardwood
2018-11-19 14:12:28 +01:00
parent 8de054d504
commit ff6d02fd71
32 changed files with 189 additions and 283 deletions

View File

@@ -29,10 +29,6 @@ class LensProfilePanel : public ToolParamBlock, public FoldableToolPanel
protected:
MyFileChooserButton *fcbLCPFile;
Gtk::CheckButton *ckbUseDist, *ckbUseVign, *ckbUseCA;
Gtk::HBox *hbLCPFile;
Gtk::Label *lLCPFileHead;
bool lcModeChanged, lcpFileChanged, useDistChanged, useVignChanged, useCAChanged;
sigc::connection conLCPFile, conUseDist, conUseVign, conUseCA;
void updateDisabled(bool enable);
@@ -40,14 +36,20 @@ protected:
bool isRaw;
const rtengine::FramesMetaData* metadata;
Gtk::CheckButton *ckbUseDist, *ckbUseVign, *ckbUseCA;
Gtk::RadioButton::Group corrGroup;
Gtk::RadioButton *corrOff;
Gtk::RadioButton *corrLensfunAuto;
Gtk::RadioButton *corrLensfunManual;
Gtk::RadioButton *corrLcpFile;
Gtk::RadioButton *corrUnchanged;
Gtk::RadioButton *corrOffRB;
Gtk::RadioButton *corrLensfunAutoRB;
Gtk::RadioButton *corrLensfunManualRB;
Gtk::RadioButton *corrLcpFileRB;
Gtk::RadioButton *corrUnchangedRB;
Gtk::Grid *modesGrid;
Gtk::Grid *distGrid;
Gtk::Label *lensfunCamerasLbl;
Gtk::Label *lensfunLensesLbl;
MyComboBox *lensfunCameras;
MyComboBox *lensfunLenses;
MyFileChooserButton *corrLcpFileChooser;
Gtk::Image *warning;
class LFDbHelper
@@ -97,6 +99,7 @@ protected:
bool setLensfunCamera(const Glib::ustring &make, const Glib::ustring &model);
bool setLensfunLens(const Glib::ustring &lens);
bool checkLensfunCanCorrect(bool automatch);
void setManualParamsVisibility(bool setVisible);
void updateLensfunWarning();
public: