From fc031ccb5ad9a6780f0f02c0a61f841629dc6cfa Mon Sep 17 00:00:00 2001
From: Thanatomanic <6567747+Thanatomanic@users.noreply.github.com>
Date: Wed, 17 Feb 2021 11:44:25 +0100
Subject: [PATCH] Remove deprecated GTK3 code, fixes #6103 (#6113)
Replaces the following deprecated Gtk classes throughout the codebase by their non-deprecated counterparts. Style, HBox, VBox, HPaned, VPaned, HScrollbar, VScrollbar, VSeparator, HSeparator, Stock, Table, VScale and HScale.
---
rtgui/adjuster.cc | 2 +-
rtgui/batchqueuepanel.cc | 18 +++---
rtgui/batchqueuepanel.h | 6 +-
rtgui/bayerpreprocess.cc | 6 +-
rtgui/bayerprocess.cc | 22 ++++----
rtgui/bayerprocess.h | 12 ++--
rtgui/blackwhite.cc | 26 ++++-----
rtgui/blackwhite.h | 16 +++---
rtgui/chmixer.cc | 4 +-
rtgui/coarsepanel.h | 2 +-
rtgui/colorappearance.cc | 41 +++++++-------
rtgui/colorappearance.h | 6 +-
rtgui/coloredbar.h | 2 +-
rtgui/colortoning.cc | 30 +++++-----
rtgui/colortoning.h | 12 ++--
rtgui/controlspotpanel.cc | 32 ++++++-----
rtgui/controlspotpanel.h | 4 +-
rtgui/crop.cc | 4 +-
rtgui/darkframe.cc | 2 +-
rtgui/darkframe.h | 2 +-
rtgui/dirbrowser.cc | 2 +-
rtgui/dirbrowser.h | 2 +-
rtgui/dirpyrdenoise.cc | 22 ++++----
rtgui/dirpyrdenoise.h | 12 ++--
rtgui/dirpyrequalizer.cc | 16 +++---
rtgui/dirpyrequalizer.h | 4 +-
rtgui/dynamicprofilepanel.cc | 11 ++--
rtgui/dynamicprofilepanel.h | 2 +-
rtgui/editorpanel.cc | 31 +++++-----
rtgui/editorpanel.h | 2 +-
rtgui/editwindow.cc | 4 +-
rtgui/exifpanel.cc | 9 +--
rtgui/exifpanel.h | 2 +-
rtgui/exportpanel.cc | 33 +++++------
rtgui/exportpanel.h | 4 +-
rtgui/favoritbrowser.cc | 3 +-
rtgui/favoritbrowser.h | 2 +-
rtgui/filecatalog.cc | 46 +++++++--------
rtgui/filecatalog.h | 24 ++++----
rtgui/filepanel.cc | 14 ++---
rtgui/filepanel.h | 8 +--
rtgui/filmnegative.cc | 2 +-
rtgui/filterpanel.cc | 31 +++++-----
rtgui/filterpanel.h | 2 +-
rtgui/flatfield.cc | 4 +-
rtgui/flatfield.h | 2 +-
rtgui/gradient.cc | 2 +-
rtgui/gradient.h | 2 +-
rtgui/guiutils.cc | 10 ++--
rtgui/guiutils.h | 14 +++--
rtgui/histogrampanel.cc | 2 +-
rtgui/history.cc | 9 +--
rtgui/history.h | 4 +-
rtgui/icmpanel.cc | 14 ++---
rtgui/icmpanel.h | 6 +-
rtgui/imageareapanel.cc | 3 +-
rtgui/imageareapanel.h | 2 +-
rtgui/indclippedpanel.h | 2 +-
rtgui/iptcpanel.cc | 9 +--
rtgui/iptcpanel.h | 2 +-
rtgui/labcurve.cc | 6 +-
rtgui/labcurve.h | 2 +-
rtgui/labgrid.h | 2 +-
rtgui/lensgeom.cc | 2 +-
rtgui/locallab.cc | 7 ++-
rtgui/locallab.h | 2 +-
rtgui/locallabtools.cc | 29 +++++++---
rtgui/locallabtools.h | 34 +++++------
rtgui/locallabtools2.cc | 60 ++++++++++++--------
rtgui/metadatapanel.cc | 3 +-
rtgui/metadatapanel.h | 2 +-
rtgui/navigator.cc | 85 +++++++++++++++-------------
rtgui/partialpastedlg.cc | 37 ++++++------
rtgui/partialpastedlg.h | 2 +-
rtgui/pdsharpening.cc | 4 +-
rtgui/perspective.cc | 20 +++----
rtgui/perspective.h | 4 +-
rtgui/placesbrowser.cc | 3 +-
rtgui/placesbrowser.h | 2 +-
rtgui/preferences.cc | 106 +++++++++++++++++++----------------
rtgui/preferences.h | 2 +-
rtgui/preprocess.cc | 2 +-
rtgui/preprocesswb.cc | 2 +-
rtgui/previewmodepanel.cc | 2 +-
rtgui/previewmodepanel.h | 2 +-
rtgui/prsharpening.cc | 20 +++----
rtgui/prsharpening.h | 12 ++--
rtgui/recentbrowser.cc | 3 +-
rtgui/recentbrowser.h | 2 +-
rtgui/renamedlg.cc | 27 +++++----
rtgui/resize.cc | 32 +++++++----
rtgui/resize.h | 2 +-
rtgui/retinex.cc | 2 +-
rtgui/rgbcurves.cc | 2 +-
rtgui/rtwindow.cc | 2 +-
rtgui/saveasdlg.cc | 8 +--
rtgui/shadowshighlights.cc | 8 +--
rtgui/sharpening.cc | 20 +++----
rtgui/sharpening.h | 12 ++--
rtgui/shcselector.cc | 2 +-
rtgui/shcselector.h | 2 +-
rtgui/thresholdadjuster.cc | 5 +-
rtgui/thresholdadjuster.h | 4 +-
rtgui/thresholdselector.cc | 2 +-
rtgui/thresholdselector.h | 2 +-
rtgui/thumbbrowserbase.cc | 3 +
rtgui/thumbbrowserbase.h | 4 +-
rtgui/tonecurve.cc | 14 ++---
rtgui/tonecurve.h | 4 +-
rtgui/toolbar.h | 2 +-
rtgui/toolpanel.cc | 4 +-
rtgui/toolpanel.h | 4 +-
rtgui/toolpanelcoord.cc | 2 +-
rtgui/toolpanelcoord.h | 2 +-
rtgui/wavelet.cc | 88 +++++++++++++++--------------
rtgui/wavelet.h | 20 +++----
rtgui/whitebalance.cc | 4 +-
rtgui/xtransprocess.cc | 8 +--
rtgui/xtransprocess.h | 4 +-
119 files changed, 737 insertions(+), 641 deletions(-)
diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc
index 6f8c0e83a..a2f96cac3 100644
--- a/rtgui/adjuster.cc
+++ b/rtgui/adjuster.cc
@@ -132,7 +132,7 @@ Adjuster::Adjuster(
// A label is provided, spreading the widgets in 2 rows
attach_next_to(*label, Gtk::POS_LEFT, 1, 1);
attach_next_to(*spin, Gtk::POS_RIGHT, 1, 1);
- // A second HBox is necessary
+ // A second Grid is necessary
grid = Gtk::manage(new Gtk::Grid());
grid->attach_next_to(*slider, Gtk::POS_LEFT, 1, 1);
diff --git a/rtgui/batchqueuepanel.cc b/rtgui/batchqueuepanel.cc
index aacf190cc..8a6dd25b4 100644
--- a/rtgui/batchqueuepanel.cc
+++ b/rtgui/batchqueuepanel.cc
@@ -42,10 +42,10 @@ static Glib::ustring makeFolderLabel(Glib::ustring path)
BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog) : parent(nullptr)
{
-
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
batchQueue = Gtk::manage( new BatchQueue(aFileCatalog) );
- Gtk::VBox* batchQueueButtonBox = Gtk::manage (new Gtk::VBox);
+ Gtk::Box* batchQueueButtonBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
batchQueueButtonBox->set_name("BatchQueueButtons");
qStartStop = Gtk::manage (new Gtk::Switch());
@@ -67,8 +67,8 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog) : parent(nullptr)
// Output directory selection
fdir = Gtk::manage (new Gtk::Frame (M("QUEUE_LOCATION_TITLE")));
fdir->set_label_align(0.025, 0.5);
- Gtk::VBox* odvb = Gtk::manage (new Gtk::VBox ());
- Gtk::HBox* hb2 = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* odvb = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* hb2 = Gtk::manage (new Gtk::Box ());
useTemplate = Gtk::manage (new Gtk::RadioButton (M("QUEUE_LOCATION_TEMPLATE") + ":"));
hb2->pack_start (*useTemplate, Gtk::PACK_SHRINK, 4);
outdirTemplate = Gtk::manage (new Gtk::Entry ());
@@ -76,7 +76,7 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog) : parent(nullptr)
odvb->pack_start (*hb2, Gtk::PACK_SHRINK, 4);
outdirTemplate->set_tooltip_markup (M("QUEUE_LOCATION_TEMPLATE_TOOLTIP"));
useTemplate->set_tooltip_markup (M("QUEUE_LOCATION_TEMPLATE_TOOLTIP"));
- Gtk::HBox* hb3 = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb3 = Gtk::manage (new Gtk::Box ());
useFolder = Gtk::manage (new Gtk::RadioButton (M("QUEUE_LOCATION_FOLDER") + ":"));
hb3->pack_start (*useFolder, Gtk::PACK_SHRINK, 4);
@@ -130,7 +130,7 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog) : parent(nullptr)
saveFormatPanel->setListener (this);
// setup button bar
- topBox = Gtk::manage (new Gtk::HBox ());
+ topBox = Gtk::manage (new Gtk::Box ());
pack_start (*topBox, Gtk::PACK_SHRINK);
topBox->set_name("BatchQueueButtonsMainContainer");
@@ -142,12 +142,12 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog) : parent(nullptr)
pack_start (*batchQueue);
// lower box with thumbnail zoom
- bottomBox = Gtk::manage (new Gtk::HBox ());
+ bottomBox = Gtk::manage (new Gtk::Box ());
pack_start (*bottomBox, Gtk::PACK_SHRINK);
// thumbnail zoom
- Gtk::HBox* zoomBox = Gtk::manage (new Gtk::HBox ());
- zoomBox->pack_start (*Gtk::manage (new Gtk::VSeparator), Gtk::PACK_SHRINK, 4);
+ Gtk::Box* zoomBox = Gtk::manage (new Gtk::Box ());
+ zoomBox->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK, 4);
Gtk::Label* zoomLabel = Gtk::manage (new Gtk::Label (Glib::ustring("") + M("FILEBROWSER_THUMBSIZE") + ":"));
zoomLabel->set_use_markup (true);
zoomBox->pack_start (*zoomLabel, Gtk::PACK_SHRINK, 4);
diff --git a/rtgui/batchqueuepanel.h b/rtgui/batchqueuepanel.h
index 7c0a367d4..db4e243e9 100644
--- a/rtgui/batchqueuepanel.h
+++ b/rtgui/batchqueuepanel.h
@@ -30,7 +30,7 @@ class RTWindow;
class FileCatalog;
class Thumbnail;
-class BatchQueuePanel : public Gtk::VBox,
+class BatchQueuePanel : public Gtk::Box,
public BatchQueueListener,
public FormatChangeListener
{
@@ -51,8 +51,8 @@ class BatchQueuePanel : public Gtk::VBox,
RTWindow* parent;
BatchQueue* batchQueue;
- Gtk::HBox* bottomBox;
- Gtk::HBox* topBox;
+ Gtk::Box* bottomBox;
+ Gtk::Box* topBox;
std::atomic queueShouldRun;
diff --git a/rtgui/bayerpreprocess.cc b/rtgui/bayerpreprocess.cc
index 2a1896d80..793496b5f 100644
--- a/rtgui/bayerpreprocess.cc
+++ b/rtgui/bayerpreprocess.cc
@@ -48,7 +48,7 @@ BayerPreProcess::BayerPreProcess() : FoldableToolPanel(this, "bayerpreprocess",
greenEqThreshold->show();
- Gtk::HBox *hb = Gtk::manage(new Gtk::HBox());
+ Gtk::Box *hb = Gtk::manage(new Gtk::Box());
hb->pack_start(*Gtk::manage(new Gtk::Label(M("TP_PREPROCESS_LINEDENOISE_DIRECTION") + ": ")), Gtk::PACK_SHRINK, 0);
lineDenoiseDirection = Gtk::manage(new MyComboBoxText());
lineDenoiseDirection->append(M("TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL"));
@@ -63,7 +63,7 @@ BayerPreProcess::BayerPreProcess() : FoldableToolPanel(this, "bayerpreprocess",
pack_start(*lineDenoise, Gtk::PACK_SHRINK, 4);
pack_start(*hb, Gtk::PACK_SHRINK, 4);
- pack_start(*Gtk::manage(new Gtk::HSeparator()));
+ pack_start(*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
pack_start(*greenEqThreshold, Gtk::PACK_SHRINK, 4);
@@ -71,7 +71,7 @@ BayerPreProcess::BayerPreProcess() : FoldableToolPanel(this, "bayerpreprocess",
pdafLinesFilter->show();
pdafLinesFilter->signal_toggled().connect(sigc::mem_fun(*this, &BayerPreProcess::pdafLinesFilterChanged), true);
- pack_start(*Gtk::manage(new Gtk::HSeparator()));
+ pack_start(*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
pack_start(*pdafLinesFilter, Gtk::PACK_SHRINK, 4);
}
diff --git a/rtgui/bayerprocess.cc b/rtgui/bayerprocess.cc
index d219dbdd1..6da15951f 100644
--- a/rtgui/bayerprocess.cc
+++ b/rtgui/bayerprocess.cc
@@ -40,7 +40,7 @@ BayerProcess::BayerProcess () :
EvDemosaicAutoContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST");
EvDemosaicPixelshiftDemosaicMethod = m->newEvent(DEMOSAIC, "HISTORY_MSG_PIXELSHIFT_DEMOSAIC");
- Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb1 = Gtk::manage (new Gtk::Box ());
hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_DMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
method = Gtk::manage (new MyComboBoxText ());
@@ -54,7 +54,7 @@ BayerProcess::BayerProcess () :
hb1->pack_end (*method, Gtk::PACK_EXPAND_WIDGET, 4);
pack_start( *hb1, Gtk::PACK_SHRINK, 4);
- dualDemosaicOptions = Gtk::manage(new Gtk::VBox());
+ dualDemosaicOptions = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
dualDemosaicContrast = Gtk::manage(new Adjuster(M("TP_RAW_DUALDEMOSAICCONTRAST"), 0, 100, 1, 20));
dualDemosaicContrast->setAdjusterListener(this);
@@ -66,7 +66,7 @@ BayerProcess::BayerProcess () :
dualDemosaicOptions->pack_start(*dualDemosaicContrast);
pack_start( *dualDemosaicOptions, Gtk::PACK_SHRINK, 4);
- borderbox = Gtk::manage(new Gtk::HBox());
+ borderbox = Gtk::manage(new Gtk::Box());
border = Gtk::manage(new Adjuster(M("TP_RAW_BORDER"), 0, 16, 1, 4));
border->setAdjusterListener (this);
@@ -76,7 +76,7 @@ BayerProcess::BayerProcess () :
borderbox->pack_start(*border);
pack_start(*borderbox, Gtk::PACK_SHRINK, 4);
- imageNumberBox = Gtk::manage (new Gtk::HBox ());
+ imageNumberBox = Gtk::manage (new Gtk::Box ());
imageNumberBox->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_IMAGENUM") + ": ")), Gtk::PACK_SHRINK, 4);
imageNumber = Gtk::manage (new MyComboBoxText ());
imageNumber->append("1");
@@ -88,7 +88,7 @@ BayerProcess::BayerProcess () :
imageNumberBox->pack_end (*imageNumber, Gtk::PACK_EXPAND_WIDGET, 4);
pack_start( *imageNumberBox, Gtk::PACK_SHRINK, 4);
- pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 0 );
+ pack_start( *Gtk::manage( new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 0 );
ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"), 0, 5, 1, 0 ));
ccSteps->setAdjusterListener (this);
@@ -97,7 +97,7 @@ BayerProcess::BayerProcess () :
ccSteps->show();
pack_start( *ccSteps, Gtk::PACK_SHRINK, 4);
- dcbOptions = Gtk::manage (new Gtk::VBox ());
+ dcbOptions = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
dcbIterations = Gtk::manage (new Adjuster (M("TP_RAW_DCBITERATIONS"), 0, 5, 1, 2));
dcbIterations->setAdjusterListener (this);
@@ -111,7 +111,7 @@ BayerProcess::BayerProcess () :
dcbOptions->pack_start(*dcbEnhance);
pack_start( *dcbOptions, Gtk::PACK_SHRINK, 4);
- lmmseOptions = Gtk::manage (new Gtk::VBox ());
+ lmmseOptions = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
lmmseIterations = Gtk::manage (new Adjuster (M("TP_RAW_LMMSEITERATIONS"), 0, 6, 1, 2));
lmmseIterations->setAdjusterListener (this);
@@ -128,7 +128,7 @@ BayerProcess::BayerProcess () :
pixelShiftFrame = Gtk::manage(new Gtk::Frame(M("TP_RAW_PIXELSHIFT")));
- Gtk::VBox *pixelShiftMainVBox = Gtk::manage (new Gtk::VBox ());
+ Gtk::Box *pixelShiftMainVBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
pixelShiftMainVBox->set_border_width(0);
pixelShiftEqualBright = Gtk::manage (new CheckBox(M("TP_RAW_PIXELSHIFTEQUALBRIGHT"), multiImage));
@@ -141,7 +141,7 @@ BayerProcess::BayerProcess () :
pixelShiftEqualBrightChannel->set_tooltip_text (M("TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP"));
pixelShiftMainVBox->pack_start(*pixelShiftEqualBrightChannel);
- Gtk::HBox* hb3 = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb3 = Gtk::manage (new Gtk::Box ());
hb3->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_PIXELSHIFTMOTIONMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
pixelShiftMotionMethod = Gtk::manage (new MyComboBoxText ());
pixelShiftMotionMethod->append(M("TP_RAW_PIXELSHIFTMM_OFF"));
@@ -152,7 +152,7 @@ BayerProcess::BayerProcess () :
hb3->pack_start(*pixelShiftMotionMethod);
pixelShiftMainVBox->pack_start(*hb3);
- pixelShiftOptions = Gtk::manage (new Gtk::VBox ());
+ pixelShiftOptions = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
pixelShiftOptions->set_border_width(0);
pixelShiftShowMotion = Gtk::manage (new CheckBox(M("TP_RAW_PIXELSHIFTSHOWMOTION"), multiImage));
@@ -166,7 +166,7 @@ BayerProcess::BayerProcess () :
pixelShiftMainVBox->pack_start(*pixelShiftShowMotionMaskOnly);
- Gtk::HBox* hb4 = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb4 = Gtk::manage (new Gtk::Box ());
hb4->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_PIXELSHIFTDMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
pixelShiftDemosaicMethod = Gtk::manage (new MyComboBoxText ());
for(const auto method_string : procparams::RAWParams::BayerSensor::getPSDemosaicMethodStrings()) {
diff --git a/rtgui/bayerprocess.h b/rtgui/bayerprocess.h
index f8348e02b..c2af5a987 100644
--- a/rtgui/bayerprocess.h
+++ b/rtgui/bayerprocess.h
@@ -37,18 +37,18 @@ class BayerProcess final :
protected:
MyComboBoxText* method;
- Gtk::HBox* borderbox;
- Gtk::HBox *imageNumberBox;
+ Gtk::Box* borderbox;
+ Gtk::Box *imageNumberBox;
Adjuster* border;
MyComboBoxText* imageNumber;
Adjuster* ccSteps;
- Gtk::VBox *dcbOptions;
+ Gtk::Box *dcbOptions;
Adjuster* dcbIterations;
CheckBox* dcbEnhance;
- Gtk::VBox *lmmseOptions;
+ Gtk::Box *lmmseOptions;
Adjuster* lmmseIterations;
Gtk::Frame *pixelShiftFrame;
- Gtk::VBox *pixelShiftOptions;
+ Gtk::Box *pixelShiftOptions;
MyComboBoxText* pixelShiftMotionMethod;
MyComboBoxText* pixelShiftDemosaicMethod;
CheckBox* pixelShiftShowMotion;
@@ -63,7 +63,7 @@ protected:
Adjuster* pixelShiftSmooth;
Adjuster* pixelShiftEperIso;
Adjuster* pixelShiftSigma;
- Gtk::VBox *dualDemosaicOptions;
+ Gtk::Box *dualDemosaicOptions;
Adjuster* dualDemosaicContrast;
int oldMethod;
bool lastAutoContrast;
diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc
index 11eab3447..e713f1450 100644
--- a/rtgui/blackwhite.cc
+++ b/rtgui/blackwhite.cc
@@ -45,7 +45,7 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
//----------- Method combobox ------------------------------
- Gtk::HBox* metHBox = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* metHBox = Gtk::manage (new Gtk::Box ());
metHBox->set_spacing (2);
Gtk::Label* metLabel = Gtk::manage (new Gtk::Label (M("TP_BWMIX_MET") + ":"));
metHBox->pack_start (*metLabel, Gtk::PACK_SHRINK);
@@ -62,7 +62,7 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
//----------- Luminance equalizer ------------------------------
- luminanceSep = Gtk::manage (new Gtk::HSeparator());
+ luminanceSep = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
pack_start (*luminanceSep);
std::vector bottomMilestones;
@@ -92,10 +92,10 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
mixerFrame->set_label_align(0.025, 0.5);
pack_start (*mixerFrame, Gtk::PACK_SHRINK, 0);
- mixerVBox = Gtk::manage (new Gtk::VBox ());
+ mixerVBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
mixerVBox->set_spacing(4);
- autoHBox = Gtk::manage (new Gtk::HBox ());
+ autoHBox = Gtk::manage (new Gtk::Box ());
autoch = Gtk::manage (new Gtk::ToggleButton (M("TP_BWMIX_AUTOCH")));
autoconn = autoch->signal_toggled().connect( sigc::mem_fun(*this, &BlackWhite::autoch_toggled) );
@@ -111,9 +111,9 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
//----------- Presets combobox ------------------------------
- mixerVBox->pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ mixerVBox->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
- settingHBox = Gtk::manage (new Gtk::HBox ());
+ settingHBox = Gtk::manage (new Gtk::Box ());
settingHBox->set_spacing (2);
settingHBox->set_tooltip_markup (M("TP_BWMIX_SETTING_TOOLTIP"));
Gtk::Label *settingLabel = Gtk::manage (new Gtk::Label (M("TP_BWMIX_SETTING") + ":"));
@@ -147,7 +147,7 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
//----------- Complementary Color checkbox ------------------------------
- enabledccSep = Gtk::manage (new Gtk::HSeparator());
+ enabledccSep = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
mixerVBox->pack_start (*enabledccSep);
enabledcc = Gtk::manage (new Gtk::CheckButton (M("TP_BWMIX_CC_ENABLED")));
@@ -161,10 +161,10 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
//----------- Color Filters ------------------------------
- filterSep = Gtk::manage (new Gtk::HSeparator());
+ filterSep = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
mixerVBox->pack_start (*filterSep);
- filterHBox = Gtk::manage (new Gtk::HBox ());
+ filterHBox = Gtk::manage (new Gtk::Box ());
filterHBox->set_spacing (2);
filterHBox->set_tooltip_markup (M("TP_BWMIX_FILTER_TOOLTIP"));
Gtk::Label *filterLabel = Gtk::manage (new Gtk::Label (M("TP_BWMIX_FILTER") + ":"));
@@ -200,7 +200,7 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
imgIcon[9] = Gtk::manage (new RTImage ("circle-empty-green-small.png"));
imgIcon[10] = Gtk::manage (new RTImage ("circle-empty-blue-small.png"));
- mixerVBox->pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ mixerVBox->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
mixerRed = Gtk::manage(new Adjuster (/*M("TP_BWMIX_RED")*/"", -100, 200, 1, 33, imgIcon[0]));
@@ -223,10 +223,10 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
mixerBlue->show();
mixerVBox->pack_start( *mixerBlue, Gtk::PACK_SHRINK, 0);
- filterSep2 = Gtk::manage (new Gtk::HSeparator());
+ filterSep2 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
mixerVBox->pack_start (*filterSep2);
- algoHBox = Gtk::manage (new Gtk::HBox ());
+ algoHBox = Gtk::manage (new Gtk::Box ());
algoHBox->set_spacing (2);
algoHBox->set_tooltip_markup (M("TP_BWMIX_ALGO_TOOLTIP"));
@@ -284,7 +284,7 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
gammaFrame->set_label_align(0.025, 0.5);
pack_start (*gammaFrame, Gtk::PACK_SHRINK, 0);
- Gtk::VBox *gammaVBox = Gtk::manage (new Gtk::VBox());
+ Gtk::Box* gammaVBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
gammaVBox->set_spacing(4);
diff --git a/rtgui/blackwhite.h b/rtgui/blackwhite.h
index 1aed86997..505d842db 100644
--- a/rtgui/blackwhite.h
+++ b/rtgui/blackwhite.h
@@ -90,7 +90,7 @@ private:
void hideGamma();
FlatCurveEditor* luminanceCurve;
- Gtk::HSeparator* luminanceSep;
+ Gtk::Separator* luminanceSep;
CurveEditorGroup* luminanceCEG;
CurveEditorGroup* beforeCurveCEG;
DiagonalCurveEditor* beforeCurve;
@@ -99,13 +99,13 @@ private:
DiagonalCurveEditor* afterCurve;
MyComboBoxText* afterCurveMode;
Gtk::ToggleButton* autoch;
- Gtk::HBox* autoHBox;
+ Gtk::Box* autoHBox;
Gtk::Button* neutral;
Gtk::Label* RGBLabels;
MyComboBoxText* algo;
sigc::connection algoconn;
Gtk::Label* alLabel;
- Gtk::HBox* algoHBox;
+ Gtk::Box* algoHBox;
Adjuster *mixerRed;
Adjuster *mixerGreen;
@@ -120,20 +120,20 @@ private:
Adjuster *mixerPurple;
MyComboBoxText* method;
sigc::connection methodconn;
- Gtk::HBox* filterHBox;
- Gtk::HSeparator* filterSep, *filterSep2;
+ Gtk::Box* filterHBox;
+ Gtk::Separator* filterSep, *filterSep2;
MyComboBoxText* filter;
sigc::connection filterconn;
- Gtk::HBox* settingHBox;
+ Gtk::Box* settingHBox;
MyComboBoxText* setting;
sigc::connection settingconn;
Gtk::Frame* mixerFrame;
- Gtk::VBox * mixerVBox;
+ Gtk::Box* mixerVBox;
Gtk::Frame* gammaFrame;
Gtk::Image *imgIcon[11];
- Gtk::HSeparator* enabledccSep;
+ Gtk::Separator* enabledccSep;
Gtk::CheckButton* enabledcc;
bool lastEnabledcc, lastAuto;
sigc::connection enaccconn, tcmodeconn, tcmodeconn2, autoconn, neutralconn;
diff --git a/rtgui/chmixer.cc b/rtgui/chmixer.cc
index 4b243f13c..619d7be3e 100644
--- a/rtgui/chmixer.cc
+++ b/rtgui/chmixer.cc
@@ -47,7 +47,7 @@ ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), f
red[1] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[1]));
red[2] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[2]));
- Gtk::HSeparator* rsep = Gtk::manage (new Gtk::HSeparator ());
+ Gtk::Separator* rsep = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
pack_start (*rlabel);
@@ -66,7 +66,7 @@ ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), f
green[1] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 100, imgIcon[4]));
green[2] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[5]));
- Gtk::HSeparator* gsep = Gtk::manage (new Gtk::HSeparator ());
+ Gtk::Separator* gsep = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
pack_start (*glabel);
diff --git a/rtgui/coarsepanel.h b/rtgui/coarsepanel.h
index b7b4f8cf7..a74c05b15 100644
--- a/rtgui/coarsepanel.h
+++ b/rtgui/coarsepanel.h
@@ -23,7 +23,7 @@
#include "toolpanel.h"
class CoarsePanel final :
- public Gtk::HBox,
+ public Gtk::Box,
public ToolPanel
{
diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc
index 968d3cc58..8b57aadb4 100644
--- a/rtgui/colorappearance.cc
+++ b/rtgui/colorappearance.cc
@@ -228,11 +228,11 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
EvCATcat = m->newEvent(LUMINANCECURVE, "HISTORY_MSG_CATCAT");
//preset button cat02/16
Gtk::Frame *genFrame;
- Gtk::VBox *genVBox;
+ Gtk::Box* genVBox;
genFrame = Gtk::manage (new Gtk::Frame (M ("TP_COLORAPP_GEN")) );
genFrame->set_label_align (0.025, 0.5);
genFrame->set_tooltip_markup (M ("TP_COLORAPP_GEN_TOOLTIP"));
- genVBox = Gtk::manage ( new Gtk::VBox());
+ genVBox = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
genVBox->set_spacing (2);
complexmethod = Gtk::manage (new MyComboBoxText ());
@@ -240,7 +240,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
complexmethod->append(M("TP_WAVELET_COMPEXPERT"));
complexmethodconn = complexmethod->signal_changed().connect(sigc::mem_fun(*this, &ColorAppearance::complexmethodChanged));
complexmethod->set_tooltip_text(M("TP_WAVELET_COMPLEX_TOOLTIP"));
- Gtk::HBox* const complexHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const complexHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const complexLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_COMPLEXLAB") + ":"));
complexHBox->pack_start(*complexLabel, Gtk::PACK_SHRINK, 4);
complexHBox->pack_start(*complexmethod);
@@ -251,7 +251,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
modelmethod->append(M("TP_COLORAPP_MOD16"));
modelmethodconn = modelmethod->signal_changed().connect(sigc::mem_fun(*this, &ColorAppearance::modelmethodChanged));
modelmethod->set_tooltip_text(M("TP_COLORAPP_MODELCAT_TOOLTIP"));
- Gtk::HBox* const modelHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const modelHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const modelLabel = Gtk::manage(new Gtk::Label(M("TP_COLORAPP_MODELCAT") + ":"));
modelHBox->pack_start(*modelLabel, Gtk::PACK_SHRINK, 4);
modelHBox->pack_start(*modelmethod);
@@ -263,7 +263,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
catmethod->append(M("TP_COLORAPP_CATSYMSPE"));
catmethodconn = catmethod->signal_changed().connect(sigc::mem_fun(*this, &ColorAppearance::catmethodChanged));
catmethod->set_tooltip_text(M("TP_COLORAPP_CATMET_TOOLTIP"));
- Gtk::HBox* const catHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const catHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const catLabel = Gtk::manage(new Gtk::Label(M("TP_COLORAPP_CATMOD") + ":"));
catHBox->pack_start(*catLabel, Gtk::PACK_SHRINK, 4);
catHBox->pack_start(*catmethod);
@@ -283,12 +283,12 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
// Process 1 frame
Gtk::Frame *p1Frame;
// Vertical box container for the content of the Process 1 frame
- Gtk::VBox *p1VBox;
+ Gtk::Box* p1VBox;
p1Frame = Gtk::manage (new Gtk::Frame (M ("TP_COLORAPP_LABEL_SCENE")) );
p1Frame->set_label_align (0.025, 0.5);
p1Frame->set_tooltip_markup (M ("TP_COLORAPP_SOURCEF_TOOLTIP"));
- p1VBox = Gtk::manage ( new Gtk::VBox());
+ p1VBox = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
p1VBox->set_spacing (2);
degree = Gtk::manage (new Adjuster (M ("TP_COLORAPP_CIECAT_DEGREE"), 0., 100., 1., 90.));
@@ -305,7 +305,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
// surrsource->set_tooltip_markup (M ("TP_COLORAPP_SURSOURCE_TOOLTIP"));
- Gtk::HBox* surrHBox1 = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* surrHBox1 = Gtk::manage (new Gtk::Box ());
surrHBox1->set_spacing (2);
surrHBox1->set_tooltip_markup (M ("TP_COLORAPP_SURSOURCE_TOOLTIP"));
Gtk::Label* surrLabel1 = Gtk::manage (new Gtk::Label (M ("TP_COLORAPP_SURROUNDSRC") + ":"));
@@ -323,8 +323,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
-// Gtk::HBox* wbmHBox = Gtk::manage (new Gtk::HBox ());
- wbmHBox = Gtk::manage (new Gtk::HBox ());
+ wbmHBox = Gtk::manage (new Gtk::Box ());
wbmHBox->set_spacing (2);
wbmHBox->set_tooltip_markup (M ("TP_COLORAPP_MODEL_TOOLTIP"));
@@ -340,8 +339,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
p1VBox->pack_start (*wbmHBox);
-// Gtk::HBox* illumHBox = Gtk::manage (new Gtk::HBox ());
- illumHBox = Gtk::manage (new Gtk::HBox ());
+ illumHBox = Gtk::manage (new Gtk::Box ());
illumHBox->set_spacing (2);
illumHBox->set_tooltip_markup (M ("TP_COLORAPP_ILLUM_TOOLTIP"));
Gtk::Label* illumLab = Gtk::manage (new Gtk::Label (M ("TP_COLORAPP_ILLUM") + ":"));
@@ -412,18 +410,17 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
/*
Gtk::Frame *p2Frame;
// Vertical box container for the content of the Process 1 frame
- Gtk::VBox *p2VBox;
+ Gtk::Box* p2VBox;
p2Frame = Gtk::manage (new Gtk::Frame (M ("TP_COLORAPP_LABEL_CAM02")) );
p2Frame->set_label_align (0.025, 0.5);
*/
- Gtk::VBox *p2VBox;
+ Gtk::Box* p2VBox;
- p2VBox = Gtk::manage ( new Gtk::VBox());
+ p2VBox = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
p2VBox->set_spacing (2);
-// Gtk::HBox* alHBox = Gtk::manage (new Gtk::HBox ());
- alHBox = Gtk::manage (new Gtk::HBox ());
+ alHBox = Gtk::manage (new Gtk::Box ());
alHBox->set_spacing (2);
alHBox->set_tooltip_markup (M ("TP_COLORAPP_ALGO_TOOLTIP"));
Gtk::Label* alLabel = Gtk::manage (new Gtk::Label (M ("TP_COLORAPP_ALGO") + ":"));
@@ -437,7 +434,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
alHBox->pack_start (*algo);
p2VBox->pack_start (*alHBox);
- p2VBox->pack_start (*Gtk::manage (new Gtk::HSeparator()), Gtk::PACK_EXPAND_WIDGET, 4);
+ p2VBox->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_EXPAND_WIDGET, 4);
jlight = Gtk::manage (new Adjuster (M ("TP_COLORAPP_LIGHT"), -100.0, 100.0, 0.1, 0.));
jlight->setAdjusterListener (this);
@@ -524,7 +521,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
sharpcieconn = sharpcie->signal_toggled().connect( sigc::mem_fun(*this, &ColorAppearance::sharpcie_toggled) );
p2VBox->pack_start (*sharpcie);
*/
- p2VBox->pack_start (*Gtk::manage (new Gtk::HSeparator()), Gtk::PACK_EXPAND_WIDGET, 4);
+ p2VBox->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_EXPAND_WIDGET, 4);
toneCurveMode = Gtk::manage (new MyComboBoxText ());
toneCurveMode->append (M ("TP_COLORAPP_TCMODE_LIGHTNESS"));
@@ -641,13 +638,13 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
// Process 3 frame
Gtk::Frame *p3Frame;
// Vertical box container for the content of the Process 3 frame
- Gtk::VBox *p3VBox;
+ Gtk::Box* p3VBox;
p3Frame = Gtk::manage (new Gtk::Frame (M ("TP_COLORAPP_LABEL_VIEWING")) ); // "Editing viewing conditions" ???
p3Frame->set_label_align (0.025, 0.5);
p3Frame->set_tooltip_markup (M ("TP_COLORAPP_VIEWINGF_TOOLTIP"));
- p3VBox = Gtk::manage ( new Gtk::VBox());
+ p3VBox = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
p3VBox->set_spacing (2);
Gtk::Image* itempL1 = Gtk::manage (new RTImage ("circle-blue-small.png"));
@@ -697,7 +694,7 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
p3VBox->pack_start (*greenout);
p3VBox->pack_start (*ybout);
- Gtk::HBox* surrHBox = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* surrHBox = Gtk::manage (new Gtk::Box ());
surrHBox->set_spacing (2);
surrHBox->set_tooltip_markup (M ("TP_COLORAPP_SURROUND_TOOLTIP"));
Gtk::Label* surrLabel = Gtk::manage (new Gtk::Label (M ("TP_COLORAPP_SURROUND") + ":"));
diff --git a/rtgui/colorappearance.h b/rtgui/colorappearance.h
index 07ca33b8e..ce1971e85 100644
--- a/rtgui/colorappearance.h
+++ b/rtgui/colorappearance.h
@@ -177,9 +177,9 @@ private:
sigc::connection gamutconn, datacieconn, tonecieconn /*,badpixconn , sharpcieconn*/;
sigc::connection tcmodeconn, tcmode2conn, tcmode3conn, neutralconn;
sigc::connection complexmethodconn, modelmethodconn, catmethodconn;
- Gtk::HBox* alHBox;
- Gtk::HBox* wbmHBox;
- Gtk::HBox* illumHBox;
+ Gtk::Box* alHBox;
+ Gtk::Box* wbmHBox;
+ Gtk::Box* illumHBox;
CurveEditorGroup* curveEditorG;
CurveEditorGroup* curveEditorG2;
CurveEditorGroup* curveEditorG3;
diff --git a/rtgui/coloredbar.h b/rtgui/coloredbar.h
index 69cfa47d1..f5156129e 100644
--- a/rtgui/coloredbar.h
+++ b/rtgui/coloredbar.h
@@ -27,7 +27,7 @@
*
* WARNING: If the color has no gradient defined or can't get colors from the provider,
* the bar will have undefined data, and the calling class will have to draw
- * the bar itself, i.e. use render_background (depending on its Gtk::Style)
+ * the bar itself, i.e. use render_background (depending on its Gtk::StyleContext)
*
*/
class ColoredBar final : private BackBuffer, public ColorCaller
diff --git a/rtgui/colortoning.cc b/rtgui/colortoning.cc
index f730e8175..d3c485baa 100644
--- a/rtgui/colortoning.cc
+++ b/rtgui/colortoning.cc
@@ -51,7 +51,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
method->set_active (0);
method->set_tooltip_text (M("TP_COLORTONING_METHOD_TOOLTIP"));
- ctbox = Gtk::manage (new Gtk::HBox ());
+ ctbox = Gtk::manage (new Gtk::Box ());
Gtk::Label* lab = Gtk::manage (new Gtk::Label (M("TP_COLORTONING_METHOD")));
ctbox->pack_start (*lab, Gtk::PACK_SHRINK, 4);
ctbox->pack_start (*method);
@@ -61,7 +61,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
//----------- Color curve ------------------------------
- colorSep = Gtk::manage (new Gtk::HSeparator());
+ colorSep = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
pack_start (*colorSep);
colorCurveEditorG = new CurveEditorGroup (options.lastColorToningCurvesDir, M("TP_COLORTONING_COLOR"));
@@ -202,18 +202,18 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
//----------- Saturation and strength ------------------------------
-// satLimiterSep = Gtk::manage (new Gtk::HSeparator());
+// satLimiterSep = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
// pack_start (*satLimiterSep, Gtk::PACK_SHRINK);
// Gtk::Frame *p1Frame;
// Vertical box container for the content of the Process 1 frame
- Gtk::VBox *p1VBox;
+ Gtk::Box* p1VBox;
p1Frame = Gtk::manage (new Gtk::Frame(M("TP_COLORTONING_SA")) );
p1Frame->set_label_align(0.025, 0.5);
- p1VBox = Gtk::manage ( new Gtk::VBox());
+ p1VBox = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
p1VBox->set_spacing(2);
autosat = Gtk::manage (new Gtk::CheckButton (M("TP_COLORTONING_AUTOSAT")));
@@ -244,10 +244,10 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
// --------------------Sliders BW Colortoning -------------------
- chanMixerBox = Gtk::manage (new Gtk::VBox());
- Gtk::VBox *chanMixerHLBox = Gtk::manage (new Gtk::VBox());
- Gtk::VBox *chanMixerMidBox = Gtk::manage (new Gtk::VBox());
- Gtk::VBox *chanMixerShadowsBox = Gtk::manage (new Gtk::VBox());
+ chanMixerBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* chanMixerHLBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* chanMixerMidBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* chanMixerShadowsBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
Gtk::Image* iblueR = Gtk::manage (new RTImage ("circle-blue-small.png"));
Gtk::Image* iyelL = Gtk::manage (new RTImage ("circle-yellow-small.png"));
@@ -312,7 +312,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
pack_start( *strength, Gtk::PACK_SHRINK, 2); //I have moved after Chanmixer
//--------------------- Reset sliders ---------------------------
- neutrHBox = Gtk::manage (new Gtk::HBox ());
+ neutrHBox = Gtk::manage (new Gtk::Box());
neutral = Gtk::manage (new Gtk::Button (M("TP_COLORTONING_NEUTRAL")));
neutral->set_tooltip_text (M("TP_COLORTONING_NEUTRAL_TIP"));
@@ -378,7 +378,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
EvLabRegionMaskBlur = m->newEvent(LUMINANCECURVE, "HISTORY_MSG_COLORTONING_LABREGION_MASKBLUR");
EvLabRegionShowMask = m->newEvent(LUMINANCECURVE, "HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK");
EvLabRegionChannel = m->newEvent(LUMINANCECURVE, "HISTORY_MSG_COLORTONING_LABREGION_CHANNEL");
- labRegionBox = Gtk::manage(new Gtk::VBox());
+ labRegionBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
labRegionList = Gtk::manage(new Gtk::ListViewText(3));
labRegionList->set_size_request(-1, 150);
@@ -388,9 +388,9 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
labRegionList->set_column_title(2, M("TP_COLORTONING_LABREGION_MASK"));
labRegionList->set_activate_on_single_click(true);
labRegionSelectionConn = labRegionList->get_selection()->signal_changed().connect(sigc::mem_fun(this, &ColorToning::onLabRegionSelectionChanged));
- Gtk::HBox *hb = Gtk::manage(new Gtk::HBox());
+ Gtk::Box *hb = Gtk::manage(new Gtk::Box());
hb->pack_start(*labRegionList, Gtk::PACK_EXPAND_WIDGET);
- Gtk::VBox *vb = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* vb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
labRegionAdd = Gtk::manage(new Gtk::Button());
labRegionAdd->add(*Gtk::manage(new RTImage("add-small.png")));
labRegionAdd->signal_clicked().connect(sigc::mem_fun(*this, &ColorToning::labRegionAddPressed));
@@ -433,7 +433,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
labRegionPower->setLogScale(4, 0.1);
labRegionBox->pack_start(*labRegionPower);
- hb = Gtk::manage(new Gtk::HBox());
+ hb = Gtk::manage(new Gtk::Box());
labRegionChannel = Gtk::manage(new MyComboBoxText());
labRegionChannel->append(M("TP_COLORTONING_LABREGION_CHANNEL_ALL"));
labRegionChannel->append(M("TP_COLORTONING_LABREGION_CHANNEL_R"));
@@ -446,7 +446,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
hb->pack_start(*labRegionChannel);
labRegionBox->pack_start(*hb);
- labRegionBox->pack_start(*Gtk::manage(new Gtk::HSeparator()));
+ labRegionBox->pack_start(*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
CurveEditorGroup *labRegionEditorG = Gtk::manage(new CurveEditorGroup(options.lastColorToningCurvesDir, M("TP_COLORTONING_LABREGION_MASK")));
labRegionEditorG->setCurveListener(this);
diff --git a/rtgui/colortoning.h b/rtgui/colortoning.h
index f1024f41c..be3a83c2d 100644
--- a/rtgui/colortoning.h
+++ b/rtgui/colortoning.h
@@ -79,8 +79,8 @@ private:
void labRegionShow(int idx, bool list_only=false);
void labRegionGet(int idx);
- //Gtk::HSeparator* satLimiterSep;
- Gtk::HSeparator* colorSep;
+ //Gtk::Separator* satLimiterSep;
+ Gtk::Separator* colorSep;
CurveEditorGroup* colorCurveEditorG;
CurveEditorGroup* opacityCurveEditorG;
CurveEditorGroup* clCurveEditorG;
@@ -89,10 +89,10 @@ private:
FlatCurveEditor* colorShape;
DiagonalCurveEditor* clshape;
DiagonalCurveEditor* cl2shape;
- Gtk::HBox* ctbox;
+ Gtk::Box* ctbox;
Gtk::Frame *p1Frame;
- Gtk::VBox* chanMixerBox;
+ Gtk::Box* chanMixerBox;
MyComboBoxText* method;
sigc::connection methodconn;
MyComboBoxText* twocolor;
@@ -116,7 +116,7 @@ private:
Gtk::Image* irg;
Gtk::Button* neutral;
- Gtk::HBox* neutrHBox;
+ Gtk::Box* neutrHBox;
int nextbw;
int nextsatth;
int nextsatpr;
@@ -147,7 +147,7 @@ private:
rtengine::ProcEvent EvLabRegionShowMask;
rtengine::ProcEvent EvLabRegionChannel;
- Gtk::VBox *labRegionBox;
+ Gtk::Box* labRegionBox;
Gtk::ListViewText *labRegionList;
Gtk::Button *labRegionAdd;
Gtk::Button *labRegionRemove;
diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc
index 99fa384ce..3fa325e0f 100644
--- a/rtgui/controlspotpanel.cc
+++ b/rtgui/controlspotpanel.cc
@@ -95,8 +95,8 @@ ControlSpotPanel::ControlSpotPanel():
expMaskMerge_(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_MASFRAME")))),
preview_(Gtk::manage(new Gtk::ToggleButton(M("TP_LOCALLAB_PREVIEW")))),
- ctboxshape(Gtk::manage(new Gtk::HBox())),
- ctboxshapemethod(Gtk::manage(new Gtk::HBox())),
+ ctboxshape(Gtk::manage(new Gtk::Box())),
+ ctboxshapemethod(Gtk::manage(new Gtk::Box())),
controlPanelListener(nullptr),
lastObject_(-1),
@@ -111,7 +111,7 @@ ControlSpotPanel::ControlSpotPanel():
const bool showtooltip = options.showtooltip;
pack_start(*hishow_);
- Gtk::HBox* const ctboxprevmethod = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxprevmethod = Gtk::manage(new Gtk::Box());
prevMethod_->append(M("TP_LOCALLAB_PREVHIDE"));
prevMethod_->append(M("TP_LOCALLAB_PREVSHOW"));
prevMethod_->set_active(0);
@@ -123,7 +123,9 @@ ControlSpotPanel::ControlSpotPanel():
pack_start(*ctboxprevmethod);
- Gtk::HBox* const hbox1_ = Gtk::manage(new Gtk::HBox(true, 4));
+ Gtk::Box* const hbox1_ = Gtk::manage(new Gtk::Box());
+ hbox1_->set_spacing(4);
+ hbox1_->set_homogeneous(true);
buttonaddconn_ = button_add_->signal_clicked().connect(
sigc::mem_fun(*this, &ControlSpotPanel::on_button_add));
buttondeleteconn_ = button_delete_->signal_clicked().connect(
@@ -136,7 +138,9 @@ ControlSpotPanel::ControlSpotPanel():
hbox1_->pack_start(*button_duplicate_);
pack_start(*hbox1_);
- Gtk::HBox* const hbox2_ = Gtk::manage(new Gtk::HBox(true, 4));
+ Gtk::Box* const hbox2_ = Gtk::manage(new Gtk::Box());
+ hbox2_->set_spacing(4);
+ hbox2_->set_homogeneous(true);
buttonrenameconn_ = button_rename_->signal_clicked().connect(
sigc::mem_fun(*this, &ControlSpotPanel::on_button_rename));
buttonvisibilityconn_ = button_visibility_->signal_button_release_event().connect(
@@ -194,11 +198,10 @@ ControlSpotPanel::ControlSpotPanel():
scrolledwindow_->set_min_content_height(150);
pack_start(*scrolledwindow_);
- Gtk::HBox* const ctboxactivmethod = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxactivmethod = Gtk::manage(new Gtk::Box());
ctboxactivmethod->pack_start(*activ_);
pack_start(*ctboxactivmethod);
-// Gtk::HBox* const ctboxshape = Gtk::manage(new Gtk::HBox());
Gtk::Label* const labelshape = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_SHAPETYPE") + ":"));
ctboxshape->pack_start(*labelshape, Gtk::PACK_SHRINK, 4);
shape_->append(M("TP_LOCALLAB_ELI"));
@@ -213,7 +216,7 @@ ControlSpotPanel::ControlSpotPanel():
shape_->set_tooltip_text(M("TP_LOCALLAB_SHAPE_TOOLTIP"));
}
- Gtk::HBox* const ctboxspotmethod = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxspotmethod = Gtk::manage(new Gtk::Box());
Gtk::Label* const labelspotmethod = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_EXCLUTYPE") + ":"));
ctboxspotmethod->pack_start(*labelspotmethod, Gtk::PACK_SHRINK, 4);
@@ -254,7 +257,6 @@ ControlSpotPanel::ControlSpotPanel():
pack_start(*excluFrame);
-// Gtk::HBox* const ctboxshapemethod = Gtk::manage(new Gtk::HBox());
Gtk::Label* const labelshapemethod = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_STYPE") + ":"));
ctboxshapemethod->pack_start(*labelshapemethod, Gtk::PACK_SHRINK, 4);
@@ -298,7 +300,7 @@ ControlSpotPanel::ControlSpotPanel():
circrad_->set_tooltip_text(M("TP_LOCALLAB_CIRCRAD_TOOLTIP"));
}
- Gtk::HBox* const ctboxqualitymethod = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxqualitymethod = Gtk::manage(new Gtk::Box());
Gtk::Label* const labelqualitymethod = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_QUAL_METHOD") + ":"));
ctboxqualitymethod->pack_start(*labelqualitymethod, Gtk::PACK_SHRINK, 4);
@@ -413,7 +415,7 @@ ControlSpotPanel::ControlSpotPanel():
specCaseBox->pack_start(*recurs_);
specCaseBox->pack_start(*ctboxshapemethod);
- Gtk::HBox* const ctboxwavmethod = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxwavmethod = Gtk::manage(new Gtk::Box());
Gtk::Label* const labelwavmethod = Gtk::manage(new Gtk::Label(M("TP_WAVELET_DAUBLOCAL") + ":"));
ctboxwavmethod->pack_start(*labelwavmethod, Gtk::PACK_SHRINK, 4);
@@ -472,10 +474,10 @@ ControlSpotPanel::ControlSpotPanel():
expMaskMerge_->add(*maskBox, false);
pack_start(*expMaskMerge_, false, false);
- Gtk::HSeparator *separatormet = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator *separatormet = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
pack_start(*separatormet, Gtk::PACK_SHRINK, 2);
- Gtk::HBox* const ctboxcomplexmethod = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxcomplexmethod = Gtk::manage(new Gtk::Box());
if (showtooltip) {
ctboxcomplexmethod->set_tooltip_markup(M("TP_LOCALLAB_COMPLEXMETHOD_TOOLTIP"));
@@ -498,7 +500,7 @@ ControlSpotPanel::ControlSpotPanel():
ctboxcomplexmethod->pack_start(*complexMethod_);
// pack_start(*ctboxcomplexmethod);
/*
- Gtk::HBox* const ctboxwavmethod = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxwavmethod = Gtk::manage(new Gtk::Box());
Gtk::Label* const labelwavmethod = Gtk::manage(new Gtk::Label(M("TP_WAVELET_DAUBLOCAL") + ":"));
ctboxwavmethod->pack_start(*labelwavmethod, Gtk::PACK_SHRINK, 4);
@@ -2782,7 +2784,7 @@ ControlSpotPanel::RenameDialog::RenameDialog(const Glib::ustring &actualname, Gt
newname_(Gtk::manage(new Gtk::Entry()))
{
// Entry widget
- Gtk::HBox* const hb = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const hb = Gtk::manage(new Gtk::Box());
hb->pack_start(*Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_REN_DIALOG_LAB"))), false, false, 4);
newname_->set_text(actualname);
hb->pack_start(*newname_);
diff --git a/rtgui/controlspotpanel.h b/rtgui/controlspotpanel.h
index f8ef41dc0..5cbf19e69 100644
--- a/rtgui/controlspotpanel.h
+++ b/rtgui/controlspotpanel.h
@@ -424,8 +424,8 @@ private:
Gtk::ToggleButton* const preview_;
sigc::connection previewConn_;
- Gtk::HBox* const ctboxshape;
- Gtk::HBox* const ctboxshapemethod;
+ Gtk::Box* const ctboxshape;
+ Gtk::Box* const ctboxshapemethod;
// Internal variables
ControlPanelListener* controlPanelListener;
diff --git a/rtgui/crop.cc b/rtgui/crop.cc
index 961f1908b..ea8906535 100644
--- a/rtgui/crop.cc
+++ b/rtgui/crop.cc
@@ -192,7 +192,7 @@ Crop::Crop():
methodgrid->attach (*resetCrop, 2, 2, 2, 1);
pack_start (*methodgrid, Gtk::PACK_EXPAND_WIDGET, 0 );
- Gtk::HSeparator* methodseparator = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator* methodseparator = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
methodseparator->get_style_context()->add_class("grid-row-separator");
pack_start (*methodseparator, Gtk::PACK_SHRINK, 0);
@@ -242,7 +242,7 @@ Crop::Crop():
ppigrid->set_column_homogeneous (true);
setExpandAlignProperties(ppigrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- Gtk::HSeparator* ppiseparator = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator* ppiseparator = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
ppiseparator->get_style_context()->add_class("grid-row-separator");
Gtk::Grid* ppisubgrid = Gtk::manage(new Gtk::Grid());
diff --git a/rtgui/darkframe.cc b/rtgui/darkframe.cc
index 74ef1384a..b6b1201a7 100644
--- a/rtgui/darkframe.cc
+++ b/rtgui/darkframe.cc
@@ -32,7 +32,7 @@ using namespace rtengine::procparams;
DarkFrame::DarkFrame () : FoldableToolPanel(this, "darkframe", M("TP_DARKFRAME_LABEL")), dfChanged(false), lastDFauto(false), dfp(nullptr), israw(true)
{
- hbdf = Gtk::manage(new Gtk::HBox());
+ hbdf = Gtk::manage(new Gtk::Box());
hbdf->set_spacing(4);
darkFrameFile = Gtk::manage(new MyFileChooserButton(M("TP_DARKFRAME_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN));
bindCurrentFolder (*darkFrameFile, options.lastDarkframeDir);
diff --git a/rtgui/darkframe.h b/rtgui/darkframe.h
index 30696e3db..58e8b4842 100644
--- a/rtgui/darkframe.h
+++ b/rtgui/darkframe.h
@@ -49,7 +49,7 @@ class DarkFrame final:
protected:
MyFileChooserButton *darkFrameFile;
- Gtk::HBox *hbdf;
+ Gtk::Box *hbdf;
Gtk::Button *btnReset;
Gtk::Label *dfLabel;
Gtk::Label *dfInfo;
diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc
index 10ef61566..2be1e3f3a 100644
--- a/rtgui/dirbrowser.cc
+++ b/rtgui/dirbrowser.cc
@@ -91,7 +91,7 @@ DirBrowser::DirBrowser () : dirTreeModel(),
, volumes(0)
#endif
{
-
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
dirtree = Gtk::manage ( new Gtk::TreeView() );
scrolledwindow4 = Gtk::manage ( new Gtk::ScrolledWindow() );
crt.property_ellipsize() = Pango::ELLIPSIZE_END;
diff --git a/rtgui/dirbrowser.h b/rtgui/dirbrowser.h
index 6ead83919..0254d6eb5 100644
--- a/rtgui/dirbrowser.h
+++ b/rtgui/dirbrowser.h
@@ -23,7 +23,7 @@
#include "guiutils.h"
-class DirBrowser : public Gtk::VBox
+class DirBrowser : public Gtk::Box
{
public:
typedef sigc::signal DirSelectionSignal;
diff --git a/rtgui/dirpyrdenoise.cc b/rtgui/dirpyrdenoise.cc
index 168993271..3bf7c21f4 100644
--- a/rtgui/dirpyrdenoise.cc
+++ b/rtgui/dirpyrdenoise.cc
@@ -48,10 +48,10 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
Gtk::Frame* lumaFrame = Gtk::manage (new Gtk::Frame (M("TP_DIRPYRDENOISE_LUMINANCE_FRAME")) );
lumaFrame->set_label_align(0.025, 0.5);
- Gtk::VBox * lumaVBox = Gtk::manage ( new Gtk::VBox());
+ Gtk::Box* lumaVBox = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
lumaVBox->set_spacing(2);
- ctboxL = Gtk::manage (new Gtk::HBox ());
+ ctboxL = Gtk::manage (new Gtk::Box ());
Gtk::Label* labmL = Gtk::manage (new Gtk::Label (M("TP_DIRPYRDENOISE_LUMINANCE_CONTROL") + ":"));
ctboxL->pack_start (*labmL, Gtk::PACK_SHRINK, 1);
@@ -83,10 +83,10 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
Gtk::Frame* chromaFrame = Gtk::manage (new Gtk::Frame (M("TP_DIRPYRDENOISE_CHROMINANCE_FRAME")) );
chromaFrame->set_label_align(0.025, 0.5);
- Gtk::VBox *chromaVBox = Gtk::manage ( new Gtk::VBox());
+ Gtk::Box* chromaVBox = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
chromaVBox->set_spacing(2);
- ctboxC = Gtk::manage (new Gtk::HBox ());
+ ctboxC = Gtk::manage (new Gtk::Box ());
Gtk::Label* labmC = Gtk::manage (new Gtk::Label (M("TP_DIRPYRDENOISE_CHROMINANCE_METHOD") + ":"));
ctboxC->pack_start (*labmC, Gtk::PACK_SHRINK, 1);
@@ -99,7 +99,7 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
Cmethodconn = Cmethod->signal_changed().connect ( sigc::mem_fun(*this, &DirPyrDenoise::CmethodChanged) );
Cmethod->set_tooltip_markup (M("TP_DIRPYRDENOISE_CHROMINANCE_METHOD_TOOLTIP"));
- ctboxC2 = Gtk::manage (new Gtk::HBox ());
+ ctboxC2 = Gtk::manage (new Gtk::Box ());
Gtk::Label* labmC2 = Gtk::manage (new Gtk::Label (M("TP_DIRPYRDENOISE_CHROMINANCE_METHOD") + ":"));
ctboxC2->pack_start (*labmC2, Gtk::PACK_SHRINK, 1);
ctboxC2->set_tooltip_markup (M("TP_DIRPYRDENOISE_CHROMINANCE_METHODADVANCED_TOOLTIP"));
@@ -121,7 +121,7 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
redchro = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_CHROMINANCE_REDGREEN"), -100, 100, 0.1, 0));
bluechro = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_CHROMINANCE_BLUEYELLOW"), -100, 100, 0.1, 0));
- Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb1 = Gtk::manage (new Gtk::Box ());
hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_DIRPYRDENOISE_MAIN_COLORSPACE") + ": ")), Gtk::PACK_SHRINK, 1);
hb1->set_tooltip_markup (M("TP_DIRPYRDENOISE_MAIN_COLORSPACE_TOOLTIP"));
@@ -166,7 +166,7 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
Gtk::Frame* medianFrame = Gtk::manage (new Gtk::Frame ());
- Gtk::VBox *medianVBox = Gtk::manage ( new Gtk::VBox());
+ Gtk::Box* medianVBox = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
medianVBox->set_spacing(2);
median = Gtk::manage (new Gtk::CheckButton (M("TP_DIRPYRDENOISE_MEDIAN_METHOD_LABEL") + ":"));
@@ -203,19 +203,19 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
medmethod->set_tooltip_text (M("TP_DIRPYRDENOISE_MEDIAN_TYPE_TOOLTIP"));
medmethodconn = medmethod->signal_changed().connect ( sigc::mem_fun(*this, &DirPyrDenoise::medmethodChanged) );
- ctboxm = Gtk::manage (new Gtk::HBox ());
+ ctboxm = Gtk::manage (new Gtk::Box ());
Gtk::Label* labmm = Gtk::manage (new Gtk::Label (M("TP_DIRPYRDENOISE_MEDIAN_METHOD") + ":"));
ctboxm->pack_start (*labmm, Gtk::PACK_SHRINK, 1);
- ctbox = Gtk::manage (new Gtk::HBox ());
+ ctbox = Gtk::manage (new Gtk::Box ());
Gtk::Label* labm = Gtk::manage (new Gtk::Label (M("TP_DIRPYRDENOISE_MEDIAN_TYPE") + ":"));
ctbox->pack_start (*labm, Gtk::PACK_SHRINK, 1);
- ctboxrgb = Gtk::manage (new Gtk::HBox ());
+ ctboxrgb = Gtk::manage (new Gtk::Box ());
Gtk::Label* labrgb = Gtk::manage (new Gtk::Label (M("TP_DIRPYRDENOISE_MEDIAN_TYPE") + ":"));
ctboxrgb->pack_start (*labrgb, Gtk::PACK_SHRINK, 1);
- Gtk::HBox* hb11 = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb11 = Gtk::manage (new Gtk::Box ());
hb11->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_DIRPYRDENOISE_MAIN_MODE") + ": ")), Gtk::PACK_SHRINK, 1);
hb11->set_tooltip_markup (M("TP_DIRPYRDENOISE_MAIN_MODE_TOOLTIP"));
diff --git a/rtgui/dirpyrdenoise.h b/rtgui/dirpyrdenoise.h
index c754e705c..71c9b1894 100644
--- a/rtgui/dirpyrdenoise.h
+++ b/rtgui/dirpyrdenoise.h
@@ -115,21 +115,21 @@ private:
sigc::connection smethodconn;
MyComboBoxText* medmethod;
sigc::connection medmethodconn;
- Gtk::HBox* ctbox;
+ Gtk::Box* ctbox;
MyComboBoxText* methodmed;
sigc::connection methodmedconn;
- Gtk::HBox* ctboxm;
+ Gtk::Box* ctboxm;
MyComboBoxText* rgbmethod;
sigc::connection rgbmethodconn;
- Gtk::HBox* ctboxrgb;
+ Gtk::Box* ctboxrgb;
double nextchroma;
double nextred;
double nextblue;
double nextnresid;
double nexthighresid;
- Gtk::HBox* ctboxL;
- Gtk::HBox* ctboxC;
- Gtk::HBox* ctboxC2;
+ Gtk::Box* ctboxL;
+ Gtk::Box* ctboxC;
+ Gtk::Box* ctboxC2;
int nexttileX;
int nexttileY;
int nextprevX;
diff --git a/rtgui/dirpyrequalizer.cc b/rtgui/dirpyrequalizer.cc
index 34aecf095..9393d7c42 100644
--- a/rtgui/dirpyrequalizer.cc
+++ b/rtgui/dirpyrequalizer.cc
@@ -53,11 +53,11 @@ DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer",
Color::hsv2rgb01(0.3240, 0.5, 0.5, r, g, b);
milestones.push_back( GradientMilestone(1. , r, g, b) ); // hsv: 0.324 rad: 2.5
- Gtk::VBox * cbVBox = Gtk::manage ( new Gtk::VBox());
+ Gtk::Box* cbVBox = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
cbVBox->set_border_width(4);
cbVBox->set_spacing(2);
- cdbox = Gtk::manage (new Gtk::HBox ());
+ cdbox = Gtk::manage (new Gtk::Box ());
labmcd = Gtk::manage (new Gtk::Label (M("TP_CBDL_METHOD") + ":"));
cdbox->pack_start (*labmcd, Gtk::PACK_SHRINK, 1);
@@ -71,7 +71,9 @@ DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer",
cbVBox->pack_start(*cdbox);
pack_start(*cbVBox);
- Gtk::HBox * buttonBox1 = Gtk::manage (new Gtk::HBox(true, 10));
+ Gtk::Box * buttonBox1 = Gtk::manage (new Gtk::Box());
+ buttonBox1->set_spacing(10);
+ buttonBox1->set_homogeneous(true);
pack_start(*buttonBox1);
Gtk::Button * lumacontrastMinusButton = Gtk::manage (new Gtk::Button(M("TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS")));
@@ -88,7 +90,7 @@ DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer",
buttonBox1->show_all_children();
- Gtk::HSeparator *separator2 = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator *separator2 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
pack_start(*separator2, Gtk::PACK_SHRINK, 2);
for(int i = 0; i < 6; i++) {
@@ -106,17 +108,17 @@ DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer",
pack_start(*multiplier[i]);
}
- Gtk::HSeparator *separator3 = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator *separator3 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
pack_start(*separator3, Gtk::PACK_SHRINK, 2);
threshold = Gtk::manage ( new Adjuster (M("TP_DIRPYREQUALIZER_THRESHOLD"), 0, 1, 0.01, 0.2) );
threshold->setAdjusterListener(this);
pack_start(*threshold);
- Gtk::HSeparator *separator4 = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator *separator4 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
pack_start(*separator4, Gtk::PACK_SHRINK, 2);
/*
- algoHBox = Gtk::manage (new Gtk::HBox ());
+ algoHBox = Gtk::manage (new Gtk::Box ());
algoHBox->set_spacing (2);
algoHBox->set_tooltip_markup (M("TP_DIRPYREQUALIZER_ALGO_TOOLTIP"));
*/
diff --git a/rtgui/dirpyrequalizer.h b/rtgui/dirpyrequalizer.h
index 84924099e..bb03e1a53 100644
--- a/rtgui/dirpyrequalizer.h
+++ b/rtgui/dirpyrequalizer.h
@@ -42,7 +42,7 @@ protected:
// MyComboBoxText* algo;
// sigc::connection algoconn;
// Gtk::Label* alLabel;
- // Gtk::HBox* algoHBox;
+ // Gtk::Box* algoHBox;
sigc::connection gamutlabConn;
sigc::connection lumaneutralPressedConn;
@@ -50,7 +50,7 @@ protected:
sigc::connection lumacontrastMinusPressedConn;
sigc::connection cbdlMethodConn;
Gtk::Label* labmcd;
- Gtk::HBox* cdbox;
+ Gtk::Box* cdbox;
MyComboBoxText* cbdlMethod;
bool lastgamutlab;
diff --git a/rtgui/dynamicprofilepanel.cc b/rtgui/dynamicprofilepanel.cc
index d7ed8ee97..865603b3a 100644
--- a/rtgui/dynamicprofilepanel.cc
+++ b/rtgui/dynamicprofilepanel.cc
@@ -35,7 +35,7 @@ DynamicProfilePanel::EditDialog::EditDialog (const Glib::ustring &title, Gtk::Wi
Gtk::Dialog (title, parent)
{
profilepath_ = Gtk::manage (new ProfileStoreComboBox());
- Gtk::HBox *hb = Gtk::manage (new Gtk::HBox());
+ Gtk::Box *hb = Gtk::manage (new Gtk::Box());
hb->pack_start (*Gtk::manage (new Gtk::Label (M ("DYNPROFILEEDITOR_PROFILE"))), false, false, 4);
hb->pack_start (*profilepath_, true, true, 2);
get_content_area()->pack_start (*hb, Gtk::PACK_SHRINK, 4);
@@ -49,7 +49,7 @@ DynamicProfilePanel::EditDialog::EditDialog (const Glib::ustring &title, Gtk::Wi
imagetype_->append(M("DYNPROFILEEDITOR_IMGTYPE_HDR"));
imagetype_->append(M("DYNPROFILEEDITOR_IMGTYPE_PS"));
imagetype_->set_active(0);
- hb = Gtk::manage (new Gtk::HBox());
+ hb = Gtk::manage (new Gtk::Box());
hb->pack_start (*Gtk::manage (new Gtk::Label (M ("EXIFFILTER_IMAGETYPE"))), false, false, 4);
hb->pack_start (*imagetype_, true, true, 2);
get_content_area()->pack_start (*hb, Gtk::PACK_SHRINK, 4);
@@ -195,7 +195,7 @@ void DynamicProfilePanel::EditDialog::set_ranges()
void DynamicProfilePanel::EditDialog::add_range (const Glib::ustring &name,
Gtk::SpinButton *&from, Gtk::SpinButton *&to)
{
- Gtk::HBox *hb = Gtk::manage (new Gtk::HBox());
+ Gtk::Box *hb = Gtk::manage (new Gtk::Box());
hb->pack_start (*Gtk::manage (new Gtk::Label (name)), false, false, 4);
from = Gtk::manage (new Gtk::SpinButton());
to = Gtk::manage (new Gtk::SpinButton());
@@ -210,7 +210,7 @@ void DynamicProfilePanel::EditDialog::add_range (const Glib::ustring &name,
void DynamicProfilePanel::EditDialog::add_optional (const Glib::ustring &name, Gtk::CheckButton *&check, Gtk::Entry *&field)
{
check = Gtk::manage (new Gtk::CheckButton (name));
- Gtk::HBox *hb = Gtk::manage (new Gtk::HBox());
+ Gtk::Box *hb = Gtk::manage (new Gtk::Box());
hb->pack_start (*check, Gtk::PACK_SHRINK, 4);
field = Gtk::manage (new Gtk::Entry());
hb->pack_start (*field, true, true, 2);
@@ -231,10 +231,13 @@ DynamicProfilePanel::DynamicProfilePanel():
button_edit_ (M ("DYNPROFILEEDITOR_EDIT")),
button_delete_ (M ("DYNPROFILEEDITOR_DELETE"))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
add (vbox_);
treeview_.set_grid_lines (Gtk::TREE_VIEW_GRID_LINES_VERTICAL);
scrolledwindow_.add (treeview_);
+ scrolledwindow_.set_vexpand();
scrolledwindow_.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
diff --git a/rtgui/dynamicprofilepanel.h b/rtgui/dynamicprofilepanel.h
index 5796c9c85..972ca1c4a 100644
--- a/rtgui/dynamicprofilepanel.h
+++ b/rtgui/dynamicprofilepanel.h
@@ -25,7 +25,7 @@
#include "../rtengine/dynamicprofile.h"
class DynamicProfilePanel :
- public Gtk::VBox
+ public Gtk::Box
{
public:
DynamicProfilePanel();
diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index beda3bba4..909b491f6 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -477,6 +477,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
histogram_observable(nullptr), histogram_scope_type(ScopeType::NONE)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
epih = new EditorPanelIdleHelper;
epih->epanel = this;
epih->destroyed = false;
@@ -540,10 +541,10 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
iBeforeLockON = new RTImage ("padlock-locked-small.png");
iBeforeLockOFF = new RTImage ("padlock-unlocked-small.png");
- Gtk::VSeparator* vsept = Gtk::manage (new Gtk::VSeparator ());
- Gtk::VSeparator* vsepz = Gtk::manage (new Gtk::VSeparator ());
- Gtk::VSeparator* vsepi = Gtk::manage (new Gtk::VSeparator ());
- Gtk::VSeparator* vseph = Gtk::manage (new Gtk::VSeparator ());
+ Gtk::Separator* vsept = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Separator* vsepz = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Separator* vsepi = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Separator* vseph = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
hidehp = Gtk::manage (new Gtk::ToggleButton ());
@@ -572,13 +573,13 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
tbTopPanel_1->set_image (*iTopPanel_1_Hide);
}
- Gtk::VSeparator* vsepcl = Gtk::manage (new Gtk::VSeparator ());
- Gtk::VSeparator* vsepz2 = Gtk::manage (new Gtk::VSeparator ());
- Gtk::VSeparator* vsepz3 = Gtk::manage (new Gtk::VSeparator ());
- Gtk::VSeparator* vsepz4 = Gtk::manage (new Gtk::VSeparator ());
+ Gtk::Separator* vsepcl = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Separator* vsepz2 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Separator* vsepz3 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Separator* vsepz4 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
- Gtk::VSeparator* vsep1 = Gtk::manage (new Gtk::VSeparator ());
- Gtk::VSeparator* vsep2 = Gtk::manage (new Gtk::VSeparator ());
+ Gtk::Separator* vsep1 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Separator* vsep2 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
// Histogram profile toggle controls
toggleHistogramProfile = Gtk::manage (new Gtk::ToggleButton ());
@@ -588,7 +589,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
toggleHistogramProfile->set_active (options.rtSettings.HistogramWorking);
toggleHistogramProfile->set_tooltip_markup ( (M ("PREFERENCES_HISTOGRAM_TOOLTIP")));
- Gtk::VSeparator* vsep3 = Gtk::manage (new Gtk::VSeparator ());
+ Gtk::Separator* vsep3 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
iareapanel = new ImageAreaPanel ();
tpc->setEditProvider (iareapanel->imageArea);
@@ -605,7 +606,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
toolBarPanel->pack_start (*vsept, Gtk::PACK_SHRINK, 2);
if (tbTopPanel_1) {
- Gtk::VSeparator* vsep = Gtk::manage (new Gtk::VSeparator ());
+ Gtk::Separator* vsep = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
toolBarPanel->pack_end (*tbTopPanel_1, Gtk::PACK_SHRINK, 1);
toolBarPanel->pack_end (*vsep, Gtk::PACK_SHRINK, 2);
}
@@ -754,7 +755,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
colorMgmtToolBar->pack_right_in (iops);
if (!simpleEditor && !options.tabbedUI) {
- Gtk::VSeparator* vsep3 = Gtk::manage (new Gtk::VSeparator ());
+ Gtk::Separator* vsep3 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
iops->attach_next_to (*vsep3, Gtk::POS_RIGHT, 1, 1);
iops->attach_next_to (*navPrev, Gtk::POS_RIGHT, 1, 1);
iops->attach_next_to (*navSync, Gtk::POS_RIGHT, 1, 1);
@@ -996,7 +997,7 @@ void EditorPanel::setAspect ()
void EditorPanel::on_realize ()
{
realized = true;
- Gtk::VBox::on_realize ();
+ Gtk::Box::on_realize ();
// This line is needed to avoid autoexpansion of the window :-/
//vboxright->set_size_request (options.toolPanelWidth, -1);
tpc->updateToolState();
@@ -2190,7 +2191,7 @@ void EditorPanel::beforeAfterToggled ()
history->blistenerLock ? tbBeforeLock->set_image (*iBeforeLockON) : tbBeforeLock->set_image (*iBeforeLockOFF);
tbBeforeLock->set_active (history->blistenerLock);
- beforeBox = Gtk::manage (new Gtk::VBox ());
+ beforeBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
beforeBox->pack_start (*beforeHeaderBox, Gtk::PACK_SHRINK, 2);
beforeBox->pack_start (*beforeIarea);
diff --git a/rtgui/editorpanel.h b/rtgui/editorpanel.h
index a277ffd3a..e89689f0f 100644
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -55,7 +55,7 @@ struct EditorPanelIdleHelper {
class RTWindow;
class EditorPanel final :
- public Gtk::VBox,
+ public Gtk::Box,
public PParamsChangeListener,
public rtengine::ProgressListener,
public ThumbnailListener,
diff --git a/rtgui/editwindow.cc b/rtgui/editwindow.cc
index 8841d3d42..3ae3e47fa 100644
--- a/rtgui/editwindow.cc
+++ b/rtgui/editwindow.cc
@@ -71,7 +71,7 @@ EditWindow::EditWindow (RTWindow* p) : resolution(RTScalable::baseDPI), parent(p
signal_key_press_event().connect(sigc::mem_fun(*this, &EditWindow::keyPressed));
- Gtk::VBox* mainBox = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* mainBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
mainBox->pack_start(*mainNB);
add(*mainBox);
@@ -215,7 +215,7 @@ void EditWindow::addEditorPanel (EditorPanel* ep, const std::string &name)
ep->setParentWindow(this);
// construct closeable tab for the image
- Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb = Gtk::manage (new Gtk::Box ());
hb->pack_start (*Gtk::manage (new RTImage ("aperture.png")));
hb->pack_start (*Gtk::manage (new Gtk::Label (Glib::path_get_basename (name))));
hb->set_tooltip_markup (name);
diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc
index 3f6bbacb5..6fc79d004 100644
--- a/rtgui/exifpanel.cc
+++ b/rtgui/exifpanel.cc
@@ -33,6 +33,7 @@ ExifPanel::ExifPanel() :
changeList(new rtengine::procparams::ExifPairs),
defChangeList(new rtengine::procparams::ExifPairs)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
recursiveOp = true;
exifTree = Gtk::manage (new Gtk::TreeView());
@@ -475,11 +476,11 @@ void ExifPanel::addPressed ()
{
Gtk::Dialog* dialog = new Gtk::Dialog (M ("EXIFPANEL_ADDTAGDLG_TITLE"), * ((Gtk::Window*)get_toplevel()), true);
- dialog->add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
- dialog->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+ dialog->add_button ("_OK", Gtk::RESPONSE_OK);
+ dialog->add_button ("_Cancel", Gtk::RESPONSE_CANCEL);
- Gtk::HBox* hb1 = new Gtk::HBox ();
- Gtk::HBox* hb2 = new Gtk::HBox ();
+ Gtk::Box* hb1 = new Gtk::Box ();
+ Gtk::Box* hb2 = new Gtk::Box ();
Gtk::Label* tlabel = new Gtk::Label (M ("EXIFPANEL_ADDTAGDLG_SELECTTAG") + ":");
MyComboBoxText* tcombo = new MyComboBoxText ();
diff --git a/rtgui/exifpanel.h b/rtgui/exifpanel.h
index d336d83f9..4c28af289 100644
--- a/rtgui/exifpanel.h
+++ b/rtgui/exifpanel.h
@@ -26,7 +26,7 @@
#include "../rtexif/rtexif.h"
class ExifPanel final :
- public Gtk::VBox,
+ public Gtk::Box,
public ToolPanel
{
diff --git a/rtgui/exportpanel.cc b/rtgui/exportpanel.cc
index b18cee496..a4ce63c1d 100644
--- a/rtgui/exportpanel.cc
+++ b/rtgui/exportpanel.cc
@@ -30,9 +30,10 @@ using namespace rtengine::procparams;
ExportPanel::ExportPanel () : listener (nullptr)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
/*enabled = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_ENABLE")) );
pack_start(*enabled, Gtk::PACK_SHRINK, 4);
- pack_start (*Gtk::manage(new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 2);*/
+ pack_start (*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 2);*/
Gtk::Label* labExportTitle = Gtk::manage ( new Gtk::Label (M ("EXPORT_FASTEXPORTOPTIONS")) );
labExportTitle->set_use_markup (true);
@@ -43,7 +44,7 @@ ExportPanel::ExportPanel () : listener (nullptr)
Gtk::RadioButton::Group pipeline_group;
use_fast_pipeline = Gtk::manage ( new Gtk::RadioButton (pipeline_group, M ("EXPORT_USE_FAST_PIPELINE")));
use_normal_pipeline = Gtk::manage ( new Gtk::RadioButton (pipeline_group, M ("EXPORT_USE_NORMAL_PIPELINE")));
- bypass_box = Gtk::manage (new Gtk::VBox());
+ bypass_box = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
bypass_ALL = Gtk::manage ( new Gtk::CheckButton (M ("EXPORT_BYPASS_ALL")));
use_fast_pipeline->set_tooltip_text (M ("EXPORT_USE_FAST_PIPELINE_TIP"));
bypass_sharpening = Gtk::manage ( new Gtk::CheckButton (M ("EXPORT_BYPASS_SHARPENING")));
@@ -64,9 +65,9 @@ ExportPanel::ExportPanel () : listener (nullptr)
Gtk::Frame *bayerFrame = Gtk::manage ( new Gtk::Frame (M ("TP_RAW_SENSOR_BAYER_LABEL")));
bayerFrame->set_label_align(0.025, 0.5);
- Gtk::VBox* bayerFrameVBox = Gtk::manage (new Gtk::VBox ());
+ Gtk::Box* bayerFrameVBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
- Gtk::HBox* hb_raw_bayer_method = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb_raw_bayer_method = Gtk::manage (new Gtk::Box ());
hb_raw_bayer_method->pack_start (*Gtk::manage (new Gtk::Label ( M ("EXPORT_RAW_DMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
raw_bayer_method = Gtk::manage (new MyComboBoxText ());
@@ -88,9 +89,9 @@ ExportPanel::ExportPanel () : listener (nullptr)
Gtk::Frame *xtransFrame = Gtk::manage ( new Gtk::Frame (M ("TP_RAW_SENSOR_XTRANS_LABEL")));
xtransFrame->set_label_align(0.025, 0.5);
- Gtk::VBox* xtransFrameVBox = Gtk::manage (new Gtk::VBox ());
+ Gtk::Box* xtransFrameVBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
- Gtk::HBox* hb_raw_xtrans_method = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb_raw_xtrans_method = Gtk::manage (new Gtk::Box ());
hb_raw_xtrans_method->pack_start (*Gtk::manage (new Gtk::Label ( M ("EXPORT_RAW_DMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
raw_xtrans_method = Gtk::manage (new MyComboBoxText ());
@@ -104,18 +105,18 @@ ExportPanel::ExportPanel () : listener (nullptr)
// ----------------------------------------------------------------
// start global packing
- Gtk::HBox* lblbox = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* lblbox = Gtk::manage (new Gtk::Box ());
lblbox->pack_start (*Gtk::manage (new Gtk::Label (M ("EXPORT_PIPELINE"))), Gtk::PACK_SHRINK, 4);
pack_start (*lblbox, Gtk::PACK_SHRINK, 4);
pack_start (*use_fast_pipeline, Gtk::PACK_SHRINK, 4);
pack_start (*use_normal_pipeline, Gtk::PACK_SHRINK, 4);
- bypass_box->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 4);
- lblbox = Gtk::manage (new Gtk::HBox ());
+ bypass_box->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 4);
+ lblbox = Gtk::manage (new Gtk::Box ());
lblbox->pack_start (*Gtk::manage (new Gtk::Label (M ("EXPORT_BYPASS"))), Gtk::PACK_SHRINK, 4);
bypass_box->pack_start (*lblbox, Gtk::PACK_SHRINK, 4);
bypass_box->pack_start (*bypass_ALL, Gtk::PACK_SHRINK, 4);
- // bypass_box->pack_start(*Gtk::manage(new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 4);
+ // bypass_box->pack_start(*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 4);
bypass_box->pack_start (*bypass_sharpening, Gtk::PACK_SHRINK, 4);
bypass_box->pack_start (*bypass_sharpenEdge, Gtk::PACK_SHRINK, 4);
bypass_box->pack_start (*bypass_sharpenMicro, Gtk::PACK_SHRINK, 4);
@@ -148,16 +149,16 @@ ExportPanel::ExportPanel () : listener (nullptr)
pack_start (*bypass_box, Gtk::PACK_SHRINK);
- pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 2);
+ pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 2);
// Resize options
- Gtk::HBox* rmbox = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* rmbox = Gtk::manage (new Gtk::Box ());
rmbox->pack_start (*Gtk::manage (new Gtk::Label (M ("TP_RESIZE_LABEL"))), Gtk::PACK_SHRINK, 4);
pack_start (*rmbox, Gtk::PACK_SHRINK, 4);
- Gtk::HBox* wbox = Gtk::manage (new Gtk::HBox ());
- Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* wbox = Gtk::manage (new Gtk::Box ());
+ Gtk::Box* hbox = Gtk::manage (new Gtk::Box ());
MaxWidth = Gtk::manage (new MySpinButton ());
MaxHeight = Gtk::manage (new MySpinButton ());
wbox->pack_start (*Gtk::manage (new Gtk::Label (M ("EXPORT_MAXWIDTH"))), Gtk::PACK_SHRINK, 4);
@@ -189,8 +190,8 @@ ExportPanel::ExportPanel () : listener (nullptr)
// add panel ending
- Gtk::VBox* vboxpe = Gtk::manage (new Gtk::VBox ());
- Gtk::HSeparator* hseptpe = Gtk::manage (new Gtk::HSeparator ());
+ Gtk::Box* vboxpe = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Separator* hseptpe = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
Gtk::Image* peImg = Gtk::manage (new RTImage ("ornament1.png"));
vboxpe->pack_start (*hseptpe, Gtk::PACK_SHRINK, 4);
vboxpe->pack_start (*peImg);
diff --git a/rtgui/exportpanel.h b/rtgui/exportpanel.h
index 7ae7e043c..18c4bda49 100644
--- a/rtgui/exportpanel.h
+++ b/rtgui/exportpanel.h
@@ -31,12 +31,12 @@ public:
virtual void exportRequested() = 0;
};
-class ExportPanel : public Gtk::VBox
+class ExportPanel : public Gtk::Box
{
protected:
- Gtk::VBox *bypass_box;
+ Gtk::Box* bypass_box;
//Gtk::CheckButton* enabled;
Gtk::RadioButton* use_fast_pipeline;
Gtk::RadioButton* use_normal_pipeline;
diff --git a/rtgui/favoritbrowser.cc b/rtgui/favoritbrowser.cc
index 06a9cf3be..0481847cb 100644
--- a/rtgui/favoritbrowser.cc
+++ b/rtgui/favoritbrowser.cc
@@ -22,6 +22,7 @@
FavoritBrowser::FavoritBrowser () : listener (NULL)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
scrollw = Gtk::manage (new Gtk::ScrolledWindow ());
scrollw->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
@@ -66,7 +67,7 @@ FavoritBrowser::FavoritBrowser () : listener (NULL)
del->set_valign(Gtk::ALIGN_START);
del->set_image (*Gtk::manage (new RTImage ("remove-small.png")));
del->get_style_context()->add_class("Right");
- Gtk::HBox* buttonBox = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* buttonBox = Gtk::manage (new Gtk::Box ());
buttonBox->pack_start (*add);
buttonBox->pack_start (*del);
diff --git a/rtgui/favoritbrowser.h b/rtgui/favoritbrowser.h
index 7a73b98af..ff57a38dc 100644
--- a/rtgui/favoritbrowser.h
+++ b/rtgui/favoritbrowser.h
@@ -24,7 +24,7 @@
#include "dirselectionlistener.h"
class FavoritBrowser :
- public Gtk::VBox,
+ public Gtk::Box,
public DirSelectionListener
{
class FavoritColumns :
diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
index 08bcc276b..dbea4ade9 100644
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -66,6 +66,8 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
toolBar(tb)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
inTabMode = false;
set_name ("FileBrowser");
@@ -78,7 +80,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
set_size_request(0, 250);
// construct trash panel with the extra "empty trash" button
- trashButtonBox = Gtk::manage( new Gtk::VBox );
+ trashButtonBox = Gtk::manage( new Gtk::Box(Gtk::ORIENTATION_VERTICAL) );
Gtk::Button* emptyT = Gtk::manage( new Gtk::Button ());
emptyT->set_tooltip_markup (M("FILEBROWSER_EMPTYTRASHHINT"));
emptyT->set_image (*Gtk::manage(new RTImage ("trash-delete.png")));
@@ -88,7 +90,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
trashButtonBox->show ();
//initialize hbToolBar1
- hbToolBar1 = Gtk::manage(new Gtk::HBox ());
+ hbToolBar1 = Gtk::manage(new Gtk::Box ());
//setup BrowsePath
iRefreshWhite = new RTImage("refresh-small.png");
@@ -97,7 +99,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
BrowsePath = Gtk::manage(new Gtk::Entry ());
BrowsePath->set_width_chars (50);
BrowsePath->set_tooltip_markup (M("FILEBROWSER_BROWSEPATHHINT"));
- Gtk::HBox* hbBrowsePath = Gtk::manage(new Gtk::HBox ());
+ Gtk::Box* hbBrowsePath = Gtk::manage(new Gtk::Box ());
buttonBrowsePath = Gtk::manage(new Gtk::Button ());
buttonBrowsePath->set_image (*iRefreshWhite);
buttonBrowsePath->set_tooltip_markup (M("FILEBROWSER_BROWSEPATHBUTTONHINT"));
@@ -118,7 +120,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
Query->set_width_chars (20); // TODO !!! add this value to options?
Query->set_max_width_chars (20);
Query->set_tooltip_markup (M("FILEBROWSER_QUERYHINT"));
- Gtk::HBox* hbQuery = Gtk::manage(new Gtk::HBox ());
+ Gtk::Box* hbQuery = Gtk::manage(new Gtk::Box ());
buttonQueryClear = Gtk::manage(new Gtk::Button ());
buttonQueryClear->set_image (*iQueryClear);
buttonQueryClear->set_tooltip_markup (M("FILEBROWSER_QUERYBUTTONHINT"));
@@ -141,7 +143,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
}
// setup button bar
- buttonBar = Gtk::manage( new Gtk::HBox () );
+ buttonBar = Gtk::manage( new Gtk::Box () );
buttonBar->set_name ("ToolBarPanelFileBrowser");
MyScrolledToolbar *stb = Gtk::manage(new MyScrolledToolbar());
stb->set_name("FileBrowserIconToolbar");
@@ -159,7 +161,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
tbLeftPanel_1->signal_toggled().connect( sigc::mem_fun(*this, &FileCatalog::tbLeftPanel_1_toggled) );
buttonBar->pack_start (*tbLeftPanel_1, Gtk::PACK_SHRINK);
- vSepiLeftPanel = new Gtk::VSeparator ();
+ vSepiLeftPanel = new Gtk::Separator(Gtk::ORIENTATION_VERTICAL);
buttonBar->pack_start (*vSepiLeftPanel, Gtk::PACK_SHRINK);
iFilterClear = new RTImage ("filter-clear.png");
@@ -172,12 +174,12 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
bFilterClear->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event), false);
bCateg[0] = bFilterClear->signal_toggled().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::categoryButtonToggled), bFilterClear, true));
buttonBar->pack_start (*bFilterClear, Gtk::PACK_SHRINK);
- buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
+ buttonBar->pack_start (*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK);
- fltrVbox1 = Gtk::manage (new Gtk::VBox());
- fltrRankbox = Gtk::manage (new Gtk::HBox());
+ fltrVbox1 = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ fltrRankbox = Gtk::manage (new Gtk::Box());
fltrRankbox->get_style_context()->add_class("smallbuttonbox");
- fltrLabelbox = Gtk::manage (new Gtk::HBox());
+ fltrLabelbox = Gtk::manage (new Gtk::Box());
fltrLabelbox->get_style_context()->add_class("smallbuttonbox");
iUnRanked = new RTImage ("star-gold-hollow-small.png");
@@ -253,12 +255,12 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
bCLabel[3]->set_tooltip_markup (M("FILEBROWSER_SHOWCOLORLABEL4HINT"));
bCLabel[4]->set_tooltip_markup (M("FILEBROWSER_SHOWCOLORLABEL5HINT"));
- buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
+ buttonBar->pack_start (*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK);
- fltrVbox2 = Gtk::manage (new Gtk::VBox());
- fltrEditedBox = Gtk::manage (new Gtk::HBox());
+ fltrVbox2 = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ fltrEditedBox = Gtk::manage (new Gtk::Box());
fltrEditedBox->get_style_context()->add_class("smallbuttonbox");
- fltrRecentlySavedBox = Gtk::manage (new Gtk::HBox());
+ fltrRecentlySavedBox = Gtk::manage (new Gtk::Box());
fltrRecentlySavedBox->get_style_context()->add_class("smallbuttonbox");
// bEdited
@@ -315,7 +317,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
fltrVbox2->pack_start (*fltrRecentlySavedBox, Gtk::PACK_SHRINK, 0);
buttonBar->pack_start (*fltrVbox2, Gtk::PACK_SHRINK);
- buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
+ buttonBar->pack_start (*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK);
// Trash
iTrashShowEmpty = new RTImage("trash-empty-show.png") ;
@@ -348,7 +350,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
buttonBar->pack_start (*bTrash, Gtk::PACK_SHRINK);
buttonBar->pack_start (*bNotTrash, Gtk::PACK_SHRINK);
buttonBar->pack_start (*bOriginal, Gtk::PACK_SHRINK);
- buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
+ buttonBar->pack_start (*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK);
fileBrowser->trash_changed().connect( sigc::mem_fun(*this, &FileCatalog::trashChanged) );
// 0 - bFilterClear
@@ -406,7 +408,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
buttonBar->pack_start (*exifInfo, Gtk::PACK_SHRINK);
// thumbnail zoom
- Gtk::HBox* zoomBox = Gtk::manage( new Gtk::HBox () );
+ Gtk::Box* zoomBox = Gtk::manage( new Gtk::Box () );
zoomInButton = Gtk::manage( new Gtk::Button () );
zoomInButton->set_image (*Gtk::manage(new RTImage ("magnifier-plus.png")));
zoomInButton->signal_pressed().connect (sigc::mem_fun(*this, &FileCatalog::zoomIn));
@@ -421,7 +423,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
zoomBox->pack_end (*zoomOutButton, Gtk::PACK_SHRINK);
buttonBar->pack_start (*zoomBox, Gtk::PACK_SHRINK);
- buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
+ buttonBar->pack_start (*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK);
//iRightArrow = new RTImage("right.png");
//iRightArrow_red = new RTImage("right_red.png");
@@ -443,12 +445,12 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
buttonBar->pack_end (*tbRightPanel_1, Gtk::PACK_SHRINK);
buttonBar->pack_end (*coarsePanel, Gtk::PACK_SHRINK);
- buttonBar->pack_end (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK, 4);
+ buttonBar->pack_end (*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK, 4);
buttonBar->pack_end (*toolBar, Gtk::PACK_SHRINK);
- buttonBar->pack_end (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK, 4);
+ buttonBar->pack_end (*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK, 4);
// add default panel
- hBox = Gtk::manage( new Gtk::HBox () );
+ hBox = Gtk::manage( new Gtk::Box () );
hBox->show ();
hBox->pack_end (*fileBrowser);
hBox->set_name ("FilmstripPanel");
@@ -525,7 +527,7 @@ void FileCatalog::exifInfoButtonToggled()
void FileCatalog::on_realize()
{
- Gtk::VBox::on_realize();
+ Gtk::Box::on_realize();
Pango::FontDescription fontd = get_pango_context()->get_font_description ();
fileBrowser->get_pango_context()->set_font_description (fontd);
// batchQueue->get_pango_context()->set_font_description (fontd);
diff --git a/rtgui/filecatalog.h b/rtgui/filecatalog.h
index 194153921..c7c4f3155 100644
--- a/rtgui/filecatalog.h
+++ b/rtgui/filecatalog.h
@@ -43,7 +43,7 @@ class ToolBar;
* - handling the thumbnail toolbar,
* - monitoring the directory (for any change)
*/
-class FileCatalog final : public Gtk::VBox,
+class FileCatalog final : public Gtk::Box,
public PreviewLoaderListener,
public FilterPanelListener,
public FileBrowserListener,
@@ -55,7 +55,7 @@ public:
private:
FilePanel* filepanel;
- Gtk::HBox* hBox;
+ Gtk::Box* hBox;
Glib::ustring selectedDirectory;
int selectedDirectoryId;
bool enabled;
@@ -69,19 +69,19 @@ private:
ImageAreaToolListener* iatlistener;
DirSelectionSlot selectDir;
- Gtk::HBox* buttonBar;
- Gtk::HBox* hbToolBar1;
+ Gtk::Box* buttonBar;
+ Gtk::Box* hbToolBar1;
MyScrolledToolbar* hbToolBar1STB;
- Gtk::HBox* fltrRankbox;
- Gtk::HBox* fltrLabelbox;
- Gtk::VBox* fltrVbox1;
+ Gtk::Box* fltrRankbox;
+ Gtk::Box* fltrLabelbox;
+ Gtk::Box* fltrVbox1;
- Gtk::HBox* fltrEditedBox;
- Gtk::HBox* fltrRecentlySavedBox;
- Gtk::VBox* fltrVbox2;
+ Gtk::Box* fltrEditedBox;
+ Gtk::Box* fltrRecentlySavedBox;
+ Gtk::Box* fltrVbox2;
- Gtk::VSeparator* vSepiLeftPanel;
+ Gtk::Separator* vSepiLeftPanel;
Gtk::ToggleButton* tbLeftPanel_1;
Gtk::ToggleButton* tbRightPanel_1;
@@ -119,7 +119,7 @@ private:
double vScrollPos[18];
int lastScrollPos;
- Gtk::VBox* trashButtonBox;
+ Gtk::Box* trashButtonBox;
Gtk::Button* zoomInButton;
Gtk::Button* zoomOutButton;
diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc
index 17a5c9c5b..a09a82597 100644
--- a/rtgui/filepanel.cc
+++ b/rtgui/filepanel.cc
@@ -34,7 +34,7 @@ FilePanel::FilePanel () : parent(nullptr), error(0)
{
// Contains everything except for the batch Tool Panel and tabs (Fast Export, Inspect, etc)
- dirpaned = Gtk::manage ( new Gtk::HPaned () );
+ dirpaned = Gtk::manage ( new Gtk::Paned () );
dirpaned->set_position (options.dirBrowserWidth);
// The directory tree
@@ -45,12 +45,12 @@ FilePanel::FilePanel () : parent(nullptr), error(0)
recentBrowser = Gtk::manage ( new RecentBrowser () );
// The whole left panel. Contains Places, Recent Folders and Folders.
- placespaned = Gtk::manage ( new Gtk::VPaned () );
+ placespaned = Gtk::manage ( new Gtk::Paned (Gtk::ORIENTATION_VERTICAL) );
placespaned->set_name ("PlacesPaned");
placespaned->set_size_request(250, 100);
placespaned->set_position (options.dirBrowserHeight);
- Gtk::VBox* obox = Gtk::manage (new Gtk::VBox ());
+ Gtk::Box* obox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
obox->get_style_context()->add_class ("plainback");
obox->pack_start (*recentBrowser, Gtk::PACK_SHRINK, 4);
obox->pack_start (*dirBrowser);
@@ -79,11 +79,11 @@ FilePanel::FilePanel () : parent(nullptr), error(0)
recentBrowser->setDirSelector (sigc::mem_fun (dirBrowser, &DirBrowser::selectDir));
fileCatalog->setFileSelectionListener (this);
- rightBox = Gtk::manage ( new Gtk::HBox () );
+ rightBox = Gtk::manage ( new Gtk::Box () );
rightBox->set_size_request(350, 100);
rightNotebook = Gtk::manage ( new Gtk::Notebook () );
rightNotebookSwitchConn = rightNotebook->signal_switch_page().connect_notify( sigc::mem_fun(*this, &FilePanel::on_NB_switch_page) );
- //Gtk::VBox* taggingBox = Gtk::manage ( new Gtk::VBox () );
+ //Gtk::Box* taggingBox = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL) );
history = Gtk::manage ( new History (false) );
@@ -130,7 +130,7 @@ FilePanel::FilePanel () : parent(nullptr), error(0)
exportLab->set_name ("LabelRightNotebook");
exportLab->set_angle (90);
- tpcPaned = Gtk::manage ( new Gtk::VPaned () );
+ tpcPaned = Gtk::manage ( new Gtk::Paned (Gtk::ORIENTATION_VERTICAL) );
tpcPaned->pack1 (*tpc->toolPanelNotebook, false, true);
tpcPaned->pack2 (*history, true, false);
@@ -177,7 +177,7 @@ FilePanel::~FilePanel ()
void FilePanel::on_realize ()
{
- Gtk::HPaned::on_realize ();
+ Gtk::Paned::on_realize ();
tpc->closeAllTools();
}
diff --git a/rtgui/filepanel.h b/rtgui/filepanel.h
index cbfe8e53e..65e1ea548 100644
--- a/rtgui/filepanel.h
+++ b/rtgui/filepanel.h
@@ -37,7 +37,7 @@ class RTWindow;
class DirBrowser;
class FilePanel final :
- public Gtk::HPaned,
+ public Gtk::Paned,
public FileSelectionListener,
public rtengine::NonCopyable
{
@@ -46,9 +46,9 @@ public:
~FilePanel () override;
Gtk::Paned* placespaned;
- Gtk::HPaned* dirpaned;
+ Gtk::Paned* dirpaned;
- Gtk::HBox* rightBox;
+ Gtk::Box* rightBox;
DirBrowser* dirBrowser;
FilterPanel* filterPanel;
@@ -90,7 +90,7 @@ private:
RecentBrowser* recentBrowser;
Inspector* inspectorPanel;
- Gtk::VPaned* tpcPaned;
+ Gtk::Paned* tpcPaned;
BatchToolPanelCoordinator* tpc;
History* history;
RTWindow* parent;
diff --git a/rtgui/filmnegative.cc b/rtgui/filmnegative.cc
index 4df9e9a09..5fc15b5ba 100644
--- a/rtgui/filmnegative.cc
+++ b/rtgui/filmnegative.cc
@@ -259,7 +259,7 @@ FilmNegative::FilmNegative() :
// pack_start(*oldMethod, Gtk::PACK_SHRINK, 0);
- Gtk::HSeparator* const sep = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const sep = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
sep->get_style_context()->add_class("grid-row-separator");
pack_start(*sep, Gtk::PACK_SHRINK, 0);
diff --git a/rtgui/filterpanel.cc b/rtgui/filterpanel.cc
index 2c4fc52d2..c407b88d7 100644
--- a/rtgui/filterpanel.cc
+++ b/rtgui/filterpanel.cc
@@ -25,14 +25,15 @@ using namespace rtengine;
FilterPanel::FilterPanel () : listener (nullptr)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
enabled = Gtk::manage (new Gtk::CheckButton (M("EXIFFILTER_METADATAFILTER")));
pack_start (*enabled, Gtk::PACK_SHRINK, 2);
- pack_start (*Gtk::manage(new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 2);
+ pack_start (*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 2);
enaFNumber = Gtk::manage (new Gtk::CheckButton (M("EXIFFILTER_APERTURE") + ":"));
- Gtk::VBox* fnvb = Gtk::manage(new Gtk::VBox ());
- Gtk::HBox* fnhb = Gtk::manage(new Gtk::HBox ());
+ Gtk::Box* fnvb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* fnhb = Gtk::manage(new Gtk::Box ());
fnvb->pack_start (*enaFNumber, Gtk::PACK_SHRINK, 0);
fnumberFrom = Gtk::manage(new Gtk::Entry ());
fnumberFrom->set_width_chars(1);
@@ -45,8 +46,8 @@ FilterPanel::FilterPanel () : listener (nullptr)
pack_start (*fnvb, Gtk::PACK_SHRINK, 4);
enaShutter = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_SHUTTER") + ":"));
- Gtk::VBox* svb = Gtk::manage(new Gtk::VBox ());
- Gtk::HBox* shb = Gtk::manage(new Gtk::HBox ());
+ Gtk::Box* svb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* shb = Gtk::manage(new Gtk::Box ());
svb->pack_start (*enaShutter, Gtk::PACK_SHRINK, 0);
shutterFrom = Gtk::manage(new Gtk::Entry ());
shutterFrom->set_width_chars(1);
@@ -59,8 +60,8 @@ FilterPanel::FilterPanel () : listener (nullptr)
pack_start (*svb, Gtk::PACK_SHRINK, 4);
enaISO = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_ISO") + ":"));
- Gtk::VBox* ivb = Gtk::manage(new Gtk::VBox ());
- Gtk::HBox* ihb = Gtk::manage(new Gtk::HBox ());
+ Gtk::Box* ivb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* ihb = Gtk::manage(new Gtk::Box ());
ivb->pack_start (*enaISO, Gtk::PACK_SHRINK, 0);
isoFrom = Gtk::manage(new Gtk::Entry ());
isoFrom->set_width_chars(1);
@@ -73,8 +74,8 @@ FilterPanel::FilterPanel () : listener (nullptr)
pack_start (*ivb, Gtk::PACK_SHRINK, 4);
enaFocalLen = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_FOCALLEN") + ":"));
- Gtk::VBox* fvb = Gtk::manage(new Gtk::VBox ());
- Gtk::HBox* fhb = Gtk::manage(new Gtk::HBox ());
+ Gtk::Box* fvb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* fhb = Gtk::manage(new Gtk::Box ());
fvb->pack_start (*enaFocalLen, Gtk::PACK_SHRINK, 0);
focalFrom = Gtk::manage(new Gtk::Entry ());
focalFrom->set_width_chars(1);
@@ -87,7 +88,7 @@ FilterPanel::FilterPanel () : listener (nullptr)
pack_start (*fvb, Gtk::PACK_SHRINK, 4);
enaExpComp = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_EXPOSURECOMPENSATION") + ":"));
- Gtk::VBox* evb = Gtk::manage(new Gtk::VBox ());
+ Gtk::Box* evb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
evb->pack_start (*enaExpComp, Gtk::PACK_SHRINK, 0);
expcomp = Gtk::manage(new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE));
expcomp->set_headers_visible (false);
@@ -99,7 +100,7 @@ FilterPanel::FilterPanel () : listener (nullptr)
pack_start (*evb, Gtk::PACK_SHRINK, 4);
enaCamera = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_CAMERA") + ":"));
- Gtk::VBox* cvb = Gtk::manage(new Gtk::VBox ());
+ Gtk::Box* cvb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
cvb->pack_start (*enaCamera, Gtk::PACK_SHRINK, 0);
camera = Gtk::manage(new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE));
camera->set_headers_visible (false);
@@ -111,7 +112,7 @@ FilterPanel::FilterPanel () : listener (nullptr)
pack_start (*cvb, Gtk::PACK_EXPAND_WIDGET, 4);
enaLens = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_LENS") + ":"));
- Gtk::VBox* lvb = Gtk::manage(new Gtk::VBox ());
+ Gtk::Box* lvb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
lvb->pack_start (*enaLens, Gtk::PACK_SHRINK, 0);
lens = Gtk::manage(new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE));
lens->set_headers_visible (false);
@@ -123,7 +124,7 @@ FilterPanel::FilterPanel () : listener (nullptr)
pack_start (*lvb, Gtk::PACK_EXPAND_WIDGET, 4);
enaFiletype = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_FILETYPE") + ":"));
- Gtk::VBox* ftvb = Gtk::manage(new Gtk::VBox ());
+ Gtk::Box* ftvb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
ftvb->pack_start (*enaFiletype, Gtk::PACK_SHRINK, 0);
filetype = Gtk::manage(new Gtk::ListViewText (1, false, Gtk::SELECTION_MULTIPLE));
filetype->set_headers_visible (false);
@@ -135,8 +136,8 @@ FilterPanel::FilterPanel () : listener (nullptr)
pack_start (*ftvb, Gtk::PACK_EXPAND_WIDGET, 4);
// add panel ending
- Gtk::VBox* vboxpe = Gtk::manage (new Gtk::VBox ());
- Gtk::HSeparator* hseptpe = Gtk::manage (new Gtk::HSeparator ());
+ Gtk::Box* vboxpe = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Separator* hseptpe = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
Gtk::Image* peImg = Gtk::manage (new RTImage("ornament1.png"));
vboxpe->pack_start(*hseptpe, Gtk::PACK_SHRINK, 4);
vboxpe->pack_start(*peImg);
diff --git a/rtgui/filterpanel.h b/rtgui/filterpanel.h
index 25a368b27..77c2d063e 100644
--- a/rtgui/filterpanel.h
+++ b/rtgui/filterpanel.h
@@ -29,7 +29,7 @@ public:
virtual void exifFilterChanged () = 0;
};
-class FilterPanel : public Gtk::VBox
+class FilterPanel : public Gtk::Box
{
protected:
diff --git a/rtgui/flatfield.cc b/rtgui/flatfield.cc
index 69d14c463..71fa0aab6 100644
--- a/rtgui/flatfield.cc
+++ b/rtgui/flatfield.cc
@@ -32,7 +32,7 @@ using namespace rtengine::procparams;
FlatField::FlatField () : FoldableToolPanel(this, "flatfield", M("TP_FLATFIELD_LABEL"))
{
- hbff = Gtk::manage(new Gtk::HBox());
+ hbff = Gtk::manage(new Gtk::Box());
flatFieldFile = Gtk::manage(new MyFileChooserButton(M("TP_FLATFIELD_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN));
bindCurrentFolder (*flatFieldFile, options.lastFlatfieldDir);
ffLabel = Gtk::manage(new Gtk::Label(M("GENERAL_FILE")));
@@ -51,7 +51,7 @@ FlatField::FlatField () : FoldableToolPanel(this, "flatfield", M("TP_FLATFIELD_L
flatFieldBlurRadius->show();
- Gtk::HBox* hbffbt = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hbffbt = Gtk::manage (new Gtk::Box ());
hbffbt->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_FLATFIELD_BLURTYPE") + ":")), Gtk::PACK_SHRINK);
flatFieldBlurType = Gtk::manage (new MyComboBoxText ());
flatFieldBlurType->append(M("TP_FLATFIELD_BT_AREA"));
diff --git a/rtgui/flatfield.h b/rtgui/flatfield.h
index 5cbc49684..0d6f167e1 100644
--- a/rtgui/flatfield.h
+++ b/rtgui/flatfield.h
@@ -55,7 +55,7 @@ protected:
Adjuster* flatFieldClipControl;
Adjuster* flatFieldBlurRadius;
MyComboBoxText* flatFieldBlurType;
- Gtk::HBox *hbff;
+ Gtk::Box *hbff;
bool ffChanged;
bool lastFFAutoSelect;
bool lastFFAutoClipCtrl;
diff --git a/rtgui/gradient.cc b/rtgui/gradient.cc
index 8229e883a..b0c6000be 100644
--- a/rtgui/gradient.cc
+++ b/rtgui/gradient.cc
@@ -15,7 +15,7 @@ using namespace rtengine::procparams;
Gradient::Gradient () : FoldableToolPanel(this, "gradient", M("TP_GRADIENT_LABEL"), false, true), EditSubscriber(ET_OBJECTS), lastObject(-1), draggedPointOldAngle(-1000.)
{
- editHBox = Gtk::manage (new Gtk::HBox());
+ editHBox = Gtk::manage (new Gtk::Box());
edit = Gtk::manage (new Gtk::ToggleButton());
edit->get_style_context()->add_class("independent");
edit->add (*Gtk::manage (new RTImage ("crosshair-adjust.png")));
diff --git a/rtgui/gradient.h b/rtgui/gradient.h
index f2be47ccc..64eabefae 100644
--- a/rtgui/gradient.h
+++ b/rtgui/gradient.h
@@ -21,7 +21,7 @@ private:
int lastObject;
protected:
- Gtk::HBox *editHBox;
+ Gtk::Box *editHBox;
Gtk::ToggleButton* edit;
Adjuster* degree;
Adjuster* feather;
diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc
index 93629d5fd..601fa422c 100644
--- a/rtgui/guiutils.cc
+++ b/rtgui/guiutils.cc
@@ -573,12 +573,13 @@ MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) :
child(nullptr), headerWidget(nullptr), statusImage(nullptr),
label(nullptr), useEnabled(useEnabled)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
set_spacing(0);
set_name("MyExpander");
set_can_focus(false);
setExpandAlignProperties(this, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
- headerHBox = Gtk::manage( new Gtk::HBox());
+ headerHBox = Gtk::manage( new Gtk::Box());
headerHBox->set_can_focus(false);
setExpandAlignProperties(headerHBox, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
@@ -628,12 +629,13 @@ MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) :
child(nullptr), headerWidget(nullptr),
label(nullptr), useEnabled(useEnabled)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
set_spacing(0);
set_name("MyExpander");
set_can_focus(false);
setExpandAlignProperties(this, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
- headerHBox = Gtk::manage( new Gtk::HBox());
+ headerHBox = Gtk::manage( new Gtk::Box());
headerHBox->set_can_focus(false);
setExpandAlignProperties(headerHBox, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
@@ -1237,7 +1239,7 @@ bool MyHScale::on_scroll_event (GdkEventScroll* event)
// event->delta_x, event->delta_y, (int)event->direction, (int)event->type, event->send_event);
// If Shift is pressed, the widget is modified
if (event->state & GDK_SHIFT_MASK) {
- Gtk::HScale::on_scroll_event(event);
+ Gtk::Scale::on_scroll_event(event);
return true;
}
@@ -1267,7 +1269,7 @@ MyFileChooserButton::MyFileChooserButton(const Glib::ustring &title, Gtk::FileCh
box_.pack_start(lbl_, true, true);
Gtk::Image *img = Gtk::manage(new Gtk::Image());
img->set_from_icon_name("folder-open", Gtk::ICON_SIZE_BUTTON);
- box_.pack_start(*Gtk::manage(new Gtk::VSeparator()), false, false, 5);
+ box_.pack_start(*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), false, false, 5);
box_.pack_start(*img, false, false);
box_.show_all_children();
add(box_);
diff --git a/rtgui/guiutils.h b/rtgui/guiutils.h
index d4c91734a..d90d45370 100644
--- a/rtgui/guiutils.h
+++ b/rtgui/guiutils.h
@@ -185,7 +185,7 @@ public:
*
* Warning: once you've instantiated this class with a text label or a widget label, you won't be able to revert to the other solution.
*/
-class MyExpander final : public Gtk::VBox
+class MyExpander final : public Gtk::Box
{
public:
typedef sigc::signal type_signal_enabled_toggled;
@@ -199,7 +199,7 @@ private:
bool enabled; /// Enabled feature (default to true)
bool inconsistent; /// True if the enabled button is inconsistent
Gtk::EventBox *titleEvBox; /// EventBox of the title, to get a connector from it
- Gtk::HBox *headerHBox;
+ Gtk::Box *headerHBox;
bool flushEvent; /// Flag to control the weird event mechanism of Gtk (please prove me wrong!)
ExpanderBox* expBox; /// Frame that includes the child and control its visibility
Gtk::EventBox *imageEvBox; /// Enable/Disable or Open/Close arrow event box
@@ -373,13 +373,15 @@ public:
};
/**
- * @brief subclass of Gtk::HScale in order to handle the scrollwheel
+ * @brief subclass of Gtk::Scale in order to handle the scrollwheel
*/
-class MyHScale final : public Gtk::HScale
+class MyHScale final : public Gtk::Scale
{
+protected:
bool on_scroll_event (GdkEventScroll* event) override;
bool on_key_press_event (GdkEventKey* event) override;
+
};
/**
@@ -391,7 +393,7 @@ private:
Glib::ustring title_;
Gtk::FileChooserAction action_;
- Gtk::HBox box_;
+ Gtk::Box box_;
Gtk::Label lbl_;
std::string filename_;
std::string current_folder_;
@@ -473,7 +475,7 @@ typedef enum RTNav {
/**
* @brief Handle the switch between text and image to be displayed in the HBox (to be used in a button/toolpanel)
*/
-class TextOrIcon final : public Gtk::HBox
+class TextOrIcon final : public Gtk::Box
{
public:
diff --git a/rtgui/histogrampanel.cc b/rtgui/histogrampanel.cc
index 83db36cb4..9123e7841 100644
--- a/rtgui/histogrampanel.cc
+++ b/rtgui/histogrampanel.cc
@@ -329,7 +329,7 @@ HistogramPanel::HistogramPanel () :
optionButtons->add(*showBAR);
optionButtons->add(*brightnessWidget);
- Gtk::VSeparator* separator = Gtk::manage(new Gtk::VSeparator());
+ Gtk::Separator* separator = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
setExpandAlignProperties(separator, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
persistentButtons->add(*scopeHistBtn);
persistentButtons->add(*scopeHistRawBtn);
diff --git a/rtgui/history.cc b/rtgui/history.cc
index 1a9cc1258..e30b3e8ce 100644
--- a/rtgui/history.cc
+++ b/rtgui/history.cc
@@ -31,6 +31,7 @@ using namespace rtengine::procparams;
History::History (bool bookmarkSupport) : historyVPaned (nullptr), blistener (nullptr), tpc (nullptr), bmnum (1)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
blistenerLock = false; // sets default that the Before preview will not be locked
/*
@@ -91,7 +92,7 @@ History::History (bool bookmarkSupport) : historyVPaned (nullptr), blistener (nu
// Bookmark List
// ~~~~~~~~~~~~~
- Gtk::HBox* ahbox = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* ahbox = Gtk::manage (new Gtk::Box ());
addBookmark = Gtk::manage (new Gtk::Button ()); // M("HISTORY_NEWSNAPSHOT")
setExpandAlignProperties (addBookmark, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
//addBookmark->get_style_context()->set_junction_sides(Gtk::JUNCTION_RIGHT);
@@ -116,14 +117,14 @@ History::History (bool bookmarkSupport) : historyVPaned (nullptr), blistener (nu
Gtk::Frame* bmFrame = Gtk::manage (new Gtk::Frame (M ("HISTORY_SNAPSHOTS")));
bmFrame->set_name ("Snapshots");
- Gtk::VBox* bmBox = Gtk::manage (new Gtk::VBox ());
+ Gtk::Box* bmBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
bmFrame->add (*bmBox);
bmBox->pack_start (*bscrollw, Gtk::PACK_EXPAND_WIDGET, 4);
bmBox->pack_end (*ahbox, Gtk::PACK_SHRINK, 4);
bmBox->set_size_request (-1, 60);
if (bookmarkSupport) {
- historyVPaned = Gtk::manage ( new Gtk::VPaned () );
+ historyVPaned = Gtk::manage ( new Gtk::Paned (Gtk::ORIENTATION_VERTICAL) );
historyVPaned->pack1 (*histFrame, true, true);
historyVPaned->pack2 (*bmFrame, false, false);
pack_start (*historyVPaned);
@@ -450,7 +451,7 @@ bool History::on_query_tooltip (int x, int y, bool keyboard_tooltip, const Glib:
Gtk::Label *left = Gtk::manage (new Gtk::Label(param+" :"));
Gtk::Label *right = Gtk::manage (new Gtk::Label(val));
right->set_justify(Gtk::JUSTIFY_LEFT);
- Gtk::HBox *hbox = Gtk::manage (new Gtk::HBox());
+ Gtk::Box *hbox = Gtk::manage (new Gtk::Box());
hbox->set_spacing(5);
hbox->pack_start(*left, Gtk::PACK_SHRINK, 0);
hbox->pack_start(*right, Gtk::PACK_SHRINK, 0);
diff --git a/rtgui/history.h b/rtgui/history.h
index faebe4765..197e5690b 100644
--- a/rtgui/history.h
+++ b/rtgui/history.h
@@ -33,7 +33,7 @@ public:
virtual void historyBeforeLineChanged(const rtengine::procparams::ProcParams& params) = 0;
};
-class History : public Gtk::VBox, public PParamsChangeListener
+class History : public Gtk::Box, public PParamsChangeListener
{
public:
@@ -72,7 +72,7 @@ public:
BookmarkColumns bookmarkColumns;
protected:
- Gtk::VPaned* historyVPaned;
+ Gtk::Paned* historyVPaned;
Gtk::TreeView* hTreeView;
Glib::RefPtr historyModel;
diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc
index 4a67d076f..e0fd7cd96 100644
--- a/rtgui/icmpanel.cc
+++ b/rtgui/icmpanel.cc
@@ -62,7 +62,7 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
Gtk::Frame *iFrame = Gtk::manage(new Gtk::Frame(M("TP_ICM_INPUTPROFILE")));
iFrame->set_label_align(0.025, 0.5);
- iVBox = Gtk::manage(new Gtk::VBox());
+ iVBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
inone = Gtk::manage(new Gtk::RadioButton(M("TP_ICM_INPUTNONE")));
inone->set_tooltip_text(M("TP_ICM_INPUTNONE_TOOLTIP"));
@@ -81,7 +81,7 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
iVBox->pack_start(*icameraICC, Gtk::PACK_SHRINK);
ifromfile = Gtk::manage(new Gtk::RadioButton(M("TP_ICM_INPUTCUSTOM") + ":"));
- Gtk::HBox* ffbox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* ffbox = Gtk::manage(new Gtk::Box());
ifromfile->set_tooltip_text(M("TP_ICM_INPUTCUSTOM_TOOLTIP"));
ffbox->pack_start(*ifromfile, Gtk::PACK_SHRINK);
ffbox->pack_start(*ipDialog);
@@ -171,7 +171,7 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
Gtk::Frame *wFrame = Gtk::manage(new Gtk::Frame(M("TP_ICM_WORKINGPROFILE")));
wFrame->set_label_align(0.025, 0.5);
- Gtk::VBox *wProfVBox = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* wProfVBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
wProfNames = Gtk::manage(new MyComboBoxText());
wProfVBox->pack_start(*wProfNames, Gtk::PACK_SHRINK);
@@ -188,7 +188,7 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
//-----------------gamma TRC working
- wTRCHBox = Gtk::manage(new Gtk::HBox());
+ wTRCHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* wtrclab = Gtk::manage(new Gtk::Label(M("TP_ICM_WORKING_TRC")));
@@ -230,7 +230,7 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
Gtk::Frame *oFrame = Gtk::manage(new Gtk::Frame(M("TP_ICM_OUTPUTPROFILE")));
oFrame->set_label_align(0.025, 0.5);
- Gtk::VBox *oProfVBox = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* oProfVBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
oProfNames = Gtk::manage(new MyComboBoxText());
oProfVBox->pack_start(*oProfNames, Gtk::PACK_SHRINK);
@@ -247,7 +247,7 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
oProfNames->set_active(0);
// Rendering intent
- Gtk::HBox *riHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box *riHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* outputIntentLbl = Gtk::manage(new Gtk::Label(M("TP_ICM_PROFILEINTENT")));
riHBox->pack_start(*outputIntentLbl, Gtk::PACK_SHRINK);
oRendIntent.reset(new PopUpButton());
@@ -964,7 +964,7 @@ void ICMPanel::saveReferencePressed()
Gtk::CheckButton applyWB(M("TP_ICM_SAVEREFERENCE_APPLYWB"));
applyWB.set_tooltip_text(M("TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP"));
- Gtk::HBox* hbox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* hbox = Gtk::manage(new Gtk::Box());
hbox->pack_end(applyWB, Gtk::PACK_SHRINK, 2);
Gtk::Box *box = dialog.get_content_area();
box->pack_end(*hbox, Gtk::PACK_SHRINK, 2);
diff --git a/rtgui/icmpanel.h b/rtgui/icmpanel.h
index cc46c5d37..81a011c59 100644
--- a/rtgui/icmpanel.h
+++ b/rtgui/icmpanel.h
@@ -50,7 +50,7 @@ protected:
Adjuster* wSlope;
Gtk::Label* labmga;
- Gtk::HBox* gabox;
+ Gtk::Box* gabox;
//bool freegamma;
@@ -80,8 +80,8 @@ private:
rtengine::ProcEvent EvICMslop;
rtengine::ProcEvent EvICMtrcinMethod;
- Gtk::VBox* iVBox;
- Gtk::HBox* wTRCHBox;
+ Gtk::Box* iVBox;
+ Gtk::Box* wTRCHBox;
Gtk::CheckButton* obpc;
Gtk::RadioButton* inone;
diff --git a/rtgui/imageareapanel.cc b/rtgui/imageareapanel.cc
index f693c3181..ee153026d 100644
--- a/rtgui/imageareapanel.cc
+++ b/rtgui/imageareapanel.cc
@@ -20,10 +20,11 @@
ImageAreaPanel::ImageAreaPanel () : before(nullptr), after(nullptr)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
imageArea = new ImageArea (this);
- Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb1 = Gtk::manage (new Gtk::Box ());
Gtk::Frame* frame = Gtk::manage (new Gtk::Frame ());
frame->add (*imageArea);
diff --git a/rtgui/imageareapanel.h b/rtgui/imageareapanel.h
index f52ca9060..8572d41d6 100644
--- a/rtgui/imageareapanel.h
+++ b/rtgui/imageareapanel.h
@@ -23,7 +23,7 @@
class ImageArea;
class ImageAreaPanel final :
- public Gtk::VBox
+ public Gtk::Box
{
protected:
diff --git a/rtgui/indclippedpanel.h b/rtgui/indclippedpanel.h
index 1017b58f1..6be0a6c40 100644
--- a/rtgui/indclippedpanel.h
+++ b/rtgui/indclippedpanel.h
@@ -24,7 +24,7 @@
class ImageArea;
class IndicateClippedPanel :
- public Gtk::HBox
+ public Gtk::Box
{
protected:
diff --git a/rtgui/iptcpanel.cc b/rtgui/iptcpanel.cc
index 25cd20560..1134b36da 100644
--- a/rtgui/iptcpanel.cc
+++ b/rtgui/iptcpanel.cc
@@ -31,6 +31,7 @@ IPTCPanel::IPTCPanel () :
embeddedData(new rtengine::procparams::IPTCPairs)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
set_spacing (4);
Gtk::Grid* iptc = Gtk::manage( new Gtk::Grid () );
@@ -90,7 +91,7 @@ IPTCPanel::IPTCPanel () :
// --------------------------
- Gtk::HSeparator* hsep1 = Gtk::manage( new Gtk::HSeparator () );
+ Gtk::Separator* hsep1 = Gtk::manage( new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL) );
setExpandAlignProperties(hsep1, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
iptc->attach (*hsep1, 0, row++, 2, 1);
@@ -134,7 +135,7 @@ IPTCPanel::IPTCPanel () :
iptc->attach (*scrolledWindowkw, 0, row++, 2, 1);
// --------------------------
- Gtk::HSeparator* hsep2 = Gtk::manage( new Gtk::HSeparator () );
+ Gtk::Separator* hsep2 = Gtk::manage( new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL) );
setExpandAlignProperties(hsep2, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
iptc->attach (*hsep2, 0, row++, 2, 1);
// --------------------------
@@ -187,7 +188,7 @@ IPTCPanel::IPTCPanel () :
iptc->attach (*scrolledWindowsc, 0, row++, 2, 1);
// --------------------------
- Gtk::HSeparator* hsep3 = Gtk::manage( new Gtk::HSeparator () );
+ Gtk::Separator* hsep3 = Gtk::manage( new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL) );
setExpandAlignProperties(hsep3, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
iptc->attach (*hsep3, 0, row++, 2, 1);
// --------------------------
@@ -247,7 +248,7 @@ IPTCPanel::IPTCPanel () :
// --------------------------
- Gtk::HSeparator* hsep4 = Gtk::manage( new Gtk::HSeparator () );
+ Gtk::Separator* hsep4 = Gtk::manage( new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL) );
setExpandAlignProperties(hsep4, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
iptc->attach (*hsep4, 0, row++, 2, 1);
diff --git a/rtgui/iptcpanel.h b/rtgui/iptcpanel.h
index 100904d1a..da52fa7d2 100644
--- a/rtgui/iptcpanel.h
+++ b/rtgui/iptcpanel.h
@@ -26,7 +26,7 @@
#include "toolpanel.h"
class IPTCPanel final :
- public Gtk::VBox,
+ public Gtk::Box,
public ToolPanel
{
diff --git a/rtgui/labcurve.cc b/rtgui/labcurve.cc
index 27a8bee52..dca1dfd45 100644
--- a/rtgui/labcurve.cc
+++ b/rtgui/labcurve.cc
@@ -57,7 +57,7 @@ LCurve::LCurve () : FoldableToolPanel(this, "labcurves", M("TP_LABCURVE_LABEL"),
chromaticity->setLogScale(2, 0, true);
//%%%%%%%%%%%%%%%%%%
- Gtk::HSeparator *hsep2 = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator* hsep2 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
hsep2->show ();
pack_start (*hsep2, Gtk::PACK_EXPAND_WIDGET, 4);
@@ -81,7 +81,7 @@ LCurve::LCurve () : FoldableToolPanel(this, "labcurves", M("TP_LABCURVE_LABEL"),
//%%%%%%%%%%%%%%%%%%%
- Gtk::HSeparator *hsep3 = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator* hsep3 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
hsep3->show ();
pack_start (*hsep3, Gtk::PACK_EXPAND_WIDGET, 4);
@@ -217,7 +217,7 @@ LCurve::LCurve () : FoldableToolPanel(this, "labcurves", M("TP_LABCURVE_LABEL"),
curveEditorG->curveListComplete();
pack_start (*curveEditorG, Gtk::PACK_SHRINK, 4);
- Gtk::HSeparator *hsepdh = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator* hsepdh = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
hsepdh->show ();
pack_start (*hsepdh, Gtk::PACK_EXPAND_WIDGET, 4);
diff --git a/rtgui/labcurve.h b/rtgui/labcurve.h
index e8488a8c6..dfb79ae7a 100644
--- a/rtgui/labcurve.h
+++ b/rtgui/labcurve.h
@@ -53,7 +53,7 @@ protected:
FlatCurveEditor* lhshape;
FlatCurveEditor* hhshape;
Gtk::Label* labmdh;
- Gtk::HBox* dhbox;
+ Gtk::Box* dhbox;
DiagonalCurveEditor* clshape;
DiagonalCurveEditor* cdshape;
diff --git a/rtgui/labgrid.h b/rtgui/labgrid.h
index 4693c897c..78179210c 100644
--- a/rtgui/labgrid.h
+++ b/rtgui/labgrid.h
@@ -96,7 +96,7 @@ public:
};
-class LabGrid: public Gtk::HBox {
+class LabGrid: public Gtk::Box {
private:
LabGridArea grid;
diff --git a/rtgui/lensgeom.cc b/rtgui/lensgeom.cc
index 762726107..8bdbf6dd4 100644
--- a/rtgui/lensgeom.cc
+++ b/rtgui/lensgeom.cc
@@ -33,7 +33,7 @@ LensGeometry::LensGeometry () : FoldableToolPanel(this, "lensgeom", M("TP_LENSGE
auto m = ProcEventMapper::getInstance();
EvTransMethod = m->newEvent(TRANSFORM, "HISTORY_MSG_TRANS_METHOD");
- Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb1 = Gtk::manage (new Gtk::Box ());
hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_DMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
method = Gtk::manage (new MyComboBoxText ());
method->append(M("TP_LENSGEOM_LOG"));
diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc
index 0ea5394bf..1b2dbf349 100644
--- a/rtgui/locallab.cc
+++ b/rtgui/locallab.cc
@@ -38,6 +38,7 @@ LocallabToolList::LocallabToolList():
// Tool list listener
listListener(nullptr)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
list->set_model(listTreeModel);
list->pack_start(toolRow.name);
listConn = list->signal_changed().connect(sigc::mem_fun(*this, &LocallabToolList::toolRowSelected));
@@ -167,6 +168,8 @@ Locallab::Locallab():
// Other widgets
resetshowButton(Gtk::manage(new Gtk::Button(M("TP_LOCALLAB_RESETSHOW"))))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
// Create panel widget to receive Locallab GUI elements
ToolVBox* const panel = Gtk::manage(new ToolVBox());
panel->set_spacing(2);
@@ -177,7 +180,7 @@ Locallab::Locallab():
panel->pack_start(*expsettings->getExpander(), false, false);
// Add separator
- Gtk::HSeparator* const separator = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separator = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
panel->pack_start(*separator, false, false);
// Add tool list widget
@@ -203,7 +206,7 @@ Locallab::Locallab():
panel->pack_start(*toolpanel, false, false);
// Add separator
- // Gtk::HSeparator* const separator2 = Gtk::manage(new Gtk::HSeparator());
+ // Gtk::Separator* const separator2 = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
// panel->pack_start(*separator2, false, false);
// Add mask reset button to panel widget
diff --git a/rtgui/locallab.h b/rtgui/locallab.h
index 511e28c03..1c3c06167 100644
--- a/rtgui/locallab.h
+++ b/rtgui/locallab.h
@@ -40,7 +40,7 @@ public:
/* ==== LocallabToolList ==== */
class LocallabToolList:
- public Gtk::VBox
+ public Gtk::Box
{
private:
// Tree model to manage ComboBox rows
diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc
index ade34c754..97ddfe924 100644
--- a/rtgui/locallabtools.cc
+++ b/rtgui/locallabtools.cc
@@ -132,7 +132,7 @@ LocallabTool::LocallabTool(Gtk::Box* content, Glib::ustring toolName, Glib::ustr
complexity(Gtk::manage(new MyComboBoxText()))
{
// Create expander title bar
- Gtk::HBox* const titleBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const titleBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const titleLabel = Gtk::manage(new Gtk::Label());
titleLabel->set_markup(Glib::ustring("") + escapeHtmlChars(UILabel) + Glib::ustring(""));
titleLabel->set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
@@ -156,7 +156,7 @@ LocallabTool::LocallabTool(Gtk::Box* content, Glib::ustring toolName, Glib::ustr
titleBox->pack_end(*complexity, Gtk::PACK_SHRINK, 2);
}
- Gtk::VSeparator* const separator = Gtk::manage(new Gtk::VSeparator());
+ Gtk::Separator* const separator = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
titleBox->pack_end(*separator, Gtk::PACK_SHRINK, 0);
if (need100Percent) {
@@ -499,6 +499,9 @@ LocallabColor::LocallabColor():
LLmaskcolshapewav(static_cast(mask2CurveEditorGwav->addCurve(CT_Flat, "L(L)", nullptr, false, false))),
csThresholdcol(Gtk::manage(new ThresholdAdjuster(M("TP_LOCALLAB_CSTHRESHOLDBLUR"), 0, 9, 0, 0, 6, 5, 0, false)))
{
+
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
float R, G, B;
std::vector six_shape;
@@ -821,7 +824,7 @@ LocallabColor::LocallabColor():
expgradcol->add(*gradcolBox, false);
pack_start(*expgradcol, false, false);
ToolParamBlock* const curvBox = Gtk::manage(new ToolParamBlock());
- Gtk::HBox* const qualcurvbox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const qualcurvbox = Gtk::manage(new Gtk::Box());
qualcurvbox->pack_start(*labqualcurv, Gtk::PACK_SHRINK, 4);
qualcurvbox->pack_start(*qualitycurveMethod);
curvBox->pack_start(*qualcurvbox);
@@ -839,7 +842,7 @@ LocallabColor::LocallabColor():
Gtk::Frame* const merge1colFrame = Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_MERGE1COLFRA")));
merge1colFrame->set_label_align(0.025, 0.5);
ToolParamBlock* const mergecolBox = Gtk::manage(new ToolParamBlock());
- Gtk::HSeparator* const separatormer = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separatormer = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
mergecolBox->pack_start(*separatormer, Gtk::PACK_SHRINK, 2);
mergecolBox->pack_start(*mergecolMethod);
mergecolBox->pack_start(*mercol);
@@ -2530,6 +2533,8 @@ LocallabExposure::LocallabExposure():
mask2expCurveEditorG(new CurveEditorGroup(options.lastlocalCurvesDir, M("TP_LOCALLAB_MASK2"))),
Lmaskexpshape(static_cast(mask2expCurveEditorG->addCurve(CT_Diagonal, "L(L)")))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
const LocallabParams::LocallabSpot defSpot;
// Parameter Exposure specific widgets
@@ -2687,7 +2692,7 @@ LocallabExposure::LocallabExposure():
pdeBox->pack_start(*linear);
pdeBox->pack_start(*balanexp);
pdeBox->pack_start(*gamm);
- Gtk::HBox* const ctboxexpmethod = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxexpmethod = Gtk::manage(new Gtk::Box());
// Gtk::Label* const labelexpmethod = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_NOISEMETH") + ":"));
ctboxexpmethod->pack_start(*labelexpmethod, Gtk::PACK_SHRINK, 4);
ctboxexpmethod->pack_start(*exnoiseMethod);
@@ -3819,6 +3824,8 @@ LocallabShadow::LocallabShadow():
fatamountSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FATAMOUNT"), 1., 100., 1., 1.))),
fatanchorSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FATANCHOR"), 1., 100., 1., 50., Gtk::manage(new RTImage("circle-black-small.png")), Gtk::manage(new RTImage("circle-white-small.png")))))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
const LocallabParams::LocallabSpot defSpot;
// Parameter Shadow highlight specific widgets
@@ -4888,6 +4895,8 @@ LocallabVibrance::LocallabVibrance():
mask2vibCurveEditorG(new CurveEditorGroup(options.lastlocalCurvesDir, M("TP_LOCALLAB_MASK2"))),
Lmaskvibshape(static_cast(mask2vibCurveEditorG->addCurve(CT_Diagonal, "L(L)")))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
float R, G, B;
const LocallabParams::LocallabSpot defSpot;
@@ -5811,12 +5820,14 @@ LocallabSoft::LocallabSoft():
// Soft light specific widgets
softMethod(Gtk::manage(new MyComboBoxText())),
- ctboxsoftmethod(Gtk::manage(new Gtk::HBox())),
+ ctboxsoftmethod(Gtk::manage(new Gtk::Box())),
showmasksoftMethod(Gtk::manage(new MyComboBoxText())),
streng(Gtk::manage(new Adjuster(M("TP_LOCALLAB_STRENG"), 1, 100, 1, 1))),
laplace(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LAPLACE"), 0., 100., 0.5, 25.))),
sensisf(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSI"), 1, 100, 1, 30)))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
// Parameter Soft light specific widgets
softMethod->append(M("TP_LOCALLAB_SOFTM"));
softMethod->append(M("TP_LOCALLAB_RETIM"));
@@ -6291,9 +6302,11 @@ LocallabBlur::LocallabBlur():
Lmaskblshape(static_cast(mask2blCurveEditorG->addCurve(CT_Diagonal, "L(L)"))),
mask2blCurveEditorGwav(new CurveEditorGroup(options.lastlocalCurvesDir, M("TP_LOCALLAB_WAVMASK"))),
LLmaskblshapewav(static_cast(mask2blCurveEditorGwav->addCurve(CT_Flat, "L(L)", nullptr, false, false))),
- quaHBox(Gtk::manage(new Gtk::HBox())),
+ quaHBox(Gtk::manage(new Gtk::Box())),
csThresholdblur(Gtk::manage(new ThresholdAdjuster(M("TP_LOCALLAB_CSTHRESHOLDBLUR"), 0, 9, 0, 0, 6, 5, 0, false)))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
const LocallabParams::LocallabSpot defSpot;
// Parameter Blur, Noise & Denoise specific widgets
@@ -6629,7 +6642,7 @@ LocallabBlur::LocallabBlur():
maskblBox->pack_start(*maskblCurveEditorG, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor
maskblBox->pack_start(*strumaskbl, Gtk::PACK_SHRINK, 0);
maskblBox->pack_start(*toolbl, Gtk::PACK_SHRINK, 0);
- Gtk::HSeparator* const separatorstrubl = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separatorstrubl = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
maskblBox->pack_start(*separatorstrubl, Gtk::PACK_SHRINK, 2);
maskblBox->pack_start(*blendmaskbl, Gtk::PACK_SHRINK, 0);
toolblFrame->set_label_align(0.025, 0.5);
diff --git a/rtgui/locallabtools.h b/rtgui/locallabtools.h
index 6319cf1af..a86626e74 100644
--- a/rtgui/locallabtools.h
+++ b/rtgui/locallabtools.h
@@ -170,7 +170,7 @@ private:
/* ==== LocallabColor ==== */
class LocallabColor:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool,
public ThresholdAdjusterListener
{
@@ -321,7 +321,7 @@ private:
/* ==== LocallabExposure ==== */
class LocallabExposure:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool
{
private:
@@ -433,7 +433,7 @@ private:
/* ==== LocallabShadow ==== */
class LocallabShadow:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool
{
private:
@@ -523,7 +523,7 @@ private:
/* ==== LocallabVibrance ==== */
class LocallabVibrance:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool,
public ThresholdAdjusterListener,
public ThresholdCurveProvider
@@ -615,13 +615,13 @@ private:
/* ==== LocallabSoft ==== */
class LocallabSoft:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool
{
private:
// Soft light specific widgets
MyComboBoxText* const softMethod;
- Gtk::HBox* const ctboxsoftmethod;
+ Gtk::Box* const ctboxsoftmethod;
MyComboBoxText* const showmasksoftMethod;
Adjuster* const streng;
Adjuster* const laplace;
@@ -661,7 +661,7 @@ private:
/* ==== LocallabBlur ==== */
class LocallabBlur:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool,
public ThresholdAdjusterListener
// public ThresholdCurveProvider
@@ -764,7 +764,7 @@ private:
DiagonalCurveEditor* const Lmaskblshape;
CurveEditorGroup* const mask2blCurveEditorGwav;
FlatCurveEditor* const LLmaskblshapewav;
- Gtk::HBox* const quaHBox;
+ Gtk::Box* const quaHBox;
ThresholdAdjuster* const csThresholdblur;
sigc::connection blMethodConn, fftwblConn, invblConn, medMethodConn, blurMethodConn, chroMethodConn, activlumConn, showmaskblMethodConn, showmaskblMethodtypConn, enablMaskConn, toolblConn;
@@ -824,7 +824,7 @@ private:
/* ==== LocallabTone ==== */
class LocallabTone:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool
{
private:
@@ -900,7 +900,7 @@ private:
/* ==== LocallabRetinex ==== */
class LocallabRetinex:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool
{
private:
@@ -1007,7 +1007,7 @@ private:
/* ==== LocallabSharp ==== */
class LocallabSharp:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool
{
private:
@@ -1052,7 +1052,7 @@ private:
/* ==== LocallabContrast ==== */
class LocallabContrast:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool,
public ThresholdAdjusterListener
@@ -1209,7 +1209,7 @@ private:
/* ==== LocallabCBDL ==== */
class LocallabCBDL:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool
{
private:
@@ -1289,7 +1289,7 @@ private:
/* ==== LocallabLog ==== */
class LocallabLog:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool
{
private:
@@ -1305,7 +1305,7 @@ private:
Adjuster* const sourceGray;
Adjuster* const sourceabs;
MyComboBoxText* const sursour;
- Gtk::HBox* const surHBox;
+ Gtk::Box* const surHBox;
Gtk::Frame* const log1Frame;
Gtk::Frame* const log2Frame;
Adjuster* const targetGray;
@@ -1322,7 +1322,7 @@ private:
DiagonalCurveEditor* const LshapeL;
Adjuster* const targabs;
MyComboBoxText* const surround;
- Gtk::HBox* const surrHBox;
+ Gtk::Box* const surrHBox;
Adjuster* const baselog;
MyExpander* const exprecovl;
@@ -1398,7 +1398,7 @@ private:
/* ==== LocallabMask ==== */
class LocallabMask:
- public Gtk::VBox,
+ public Gtk::Box,
public LocallabTool,
public ThresholdAdjusterListener
{
diff --git a/rtgui/locallabtools2.cc b/rtgui/locallabtools2.cc
index 44550e261..523b0a3af 100644
--- a/rtgui/locallabtools2.cc
+++ b/rtgui/locallabtools2.cc
@@ -152,6 +152,8 @@ LocallabTone::LocallabTone():
mask2tmCurveEditorG(new CurveEditorGroup(options.lastlocalCurvesDir, M("TP_LOCALLAB_MASK2"))),
Lmasktmshape(static_cast(mask2tmCurveEditorG->addCurve(CT_Diagonal, "L(L)")))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
const LocallabParams::LocallabSpot defSpot;
// Parameter Tone Mapping specific widgets
@@ -828,6 +830,8 @@ LocallabRetinex::LocallabRetinex():
Lmaskretishape(static_cast(mask2retiCurveEditorG->addCurve(CT_Diagonal, "L(L)"))),
inversret(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_INVERS"))))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
const LocallabParams::LocallabSpot defSpot;
// Parameter Retinex specific widgets
@@ -1968,6 +1972,8 @@ LocallabSharp::LocallabSharp():
sharFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_SHARFRAME")))),
showmasksharMethod(Gtk::manage(new MyComboBoxText()))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
// Parameter Sharpening specific widgets
sharcontrast->setAdjusterListener(this);
@@ -2316,7 +2322,7 @@ LocallabContrast::LocallabContrast():
wavshape(static_cast(LocalcurveEditorwav->addCurve(CT_Flat, "", nullptr, false, false))),
csThreshold(Gtk::manage(new ThresholdAdjuster(M("TP_LOCALLAB_CSTHRESHOLD"), 0, 9, 0, 0, 6, 6, 0, false))),
levelwav(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LEVELWAV"), 1, 9, 1, 4))),
- expresidpyr(Gtk::manage(new MyExpander(false, Gtk::manage(new Gtk::HBox())))),
+ expresidpyr(Gtk::manage(new MyExpander(false, Gtk::manage(new Gtk::Box())))),
residcont(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RESIDCONT"), -100, 100, 1, 0))),
residchro(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RESIDCHRO"), -100., 100., 1., 0.))),
residsha(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RESIDSHA"), -100., 100., 1., 0.))),
@@ -2329,7 +2335,7 @@ LocallabContrast::LocallabContrast():
claricres(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CLARICRES"), -20., 100., 0.5, 0.))),
clarisoft(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOFTRADIUSCOL"), 0.0, 100.0, 0.5, 1.))),
origlc(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_ORIGLC")))),
- expcontrastpyr(Gtk::manage(new MyExpander(false, Gtk::manage(new Gtk::HBox())))),
+ expcontrastpyr(Gtk::manage(new MyExpander(false, Gtk::manage(new Gtk::Box())))),
wavgradl(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_GRALWFRA")))),
sigmalc2(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SIGMAWAV"), 0.2, 2.5, 0.01, 1.))),
strwav(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -4.0, 4.0, 0.05, 0.))),
@@ -2358,7 +2364,7 @@ LocallabContrast::LocallabContrast():
wavshapelev(static_cast(LocalcurveEditorwavlev->addCurve(CT_Flat, "", nullptr, false, false))),
residblur(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RESIDBLUR"), 0., 100., 0.5, 0.))),
blurlc(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_BLURLC")))),
- expcontrastpyr2(Gtk::manage(new MyExpander(false, Gtk::manage(new Gtk::HBox())))),
+ expcontrastpyr2(Gtk::manage(new MyExpander(false, Gtk::manage(new Gtk::Box())))),
wavcont(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_CONTFRA")))),
sigma(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SIGMAWAV"), 0.2, 2.5, 0.01, 1.))),
offset(Gtk::manage(new Adjuster(M("TP_LOCALLAB_OFFSETWAV"), 0.33, 1.66, 0.01, 1., Gtk::manage(new RTImage("circle-black-small.png")), Gtk::manage(new RTImage("circle-white-small.png"))))),
@@ -2399,6 +2405,8 @@ LocallabContrast::LocallabContrast():
mask2lcCurveEditorG(new CurveEditorGroup(options.lastlocalCurvesDir, M("TP_LOCALLAB_MASK2"))),
Lmasklcshape(static_cast(mask2lcCurveEditorG->addCurve(CT_Diagonal, "L(L)")))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
const LocallabParams::LocallabSpot defSpot;
// Parameter Local contrast specific widgets
@@ -2431,7 +2439,7 @@ LocallabContrast::LocallabContrast():
levelwav->setAdjusterListener(this);
- Gtk::HBox* const LresTitleHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const LresTitleHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const LresLabel = Gtk::manage(new Gtk::Label());
LresLabel->set_markup(Glib::ustring("") + escapeHtmlChars(M("TP_LOCALLAB_LOC_RESIDPYR")) + Glib::ustring(""));
LresLabel->set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
@@ -2464,7 +2472,7 @@ LocallabContrast::LocallabContrast():
origlcConn = origlc->signal_toggled().connect(sigc::mem_fun(*this, &LocallabContrast::origlcChanged));
- Gtk::HBox* const LCTitleHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const LCTitleHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const LCLabel = Gtk::manage(new Gtk::Label());
LCLabel->set_markup(Glib::ustring("") + escapeHtmlChars(M("TP_LOCALLAB_LOC_CONTRASTPYR")) + Glib::ustring("") + escapeHtmlChars(M("TP_LOCALLAB_LOC_CONTRASTPYRLAB")));
LCLabel->set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
@@ -2541,7 +2549,7 @@ LocallabContrast::LocallabContrast():
blurlcConn = blurlc->signal_toggled().connect(sigc::mem_fun(*this, &LocallabContrast::blurlcChanged));
- Gtk::HBox* const LCTitleHBox2 = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const LCTitleHBox2 = Gtk::manage(new Gtk::Box());
Gtk::Label* const LCLabel2 = Gtk::manage(new Gtk::Label());
LCLabel2->set_markup(Glib::ustring("") + escapeHtmlChars(M("TP_LOCALLAB_LOC_CONTRASTPYR2")) + Glib::ustring("") + escapeHtmlChars(M("TP_LOCALLAB_LOC_CONTRASTPYR2LAB")));
LCLabel2->set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
@@ -2679,7 +2687,7 @@ LocallabContrast::LocallabContrast():
expresidpyr->add(*resiBox, false);
pack_start(*expresidpyr);
// pack_start(*sensilc);
- Gtk::HSeparator* const separatorcontr = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separatorcontr = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
pack_start(*separatorcontr);
ToolParamBlock* const clariBox = Gtk::manage(new ToolParamBlock());
clariBox->pack_start(*clarilres);
@@ -2709,20 +2717,20 @@ LocallabContrast::LocallabContrast():
edgsBox->pack_start(*waveshow);
edgsBoxshow->pack_start(*radiusw);
edgsBoxshow->pack_start(*detailw);
- Gtk::HBox* const edbox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const edbox = Gtk::manage(new Gtk::Box());
Gtk::Label* const labmedgr = Gtk::manage(new Gtk::Label(M("TP_WAVELET_MEDGREINF") + ":"));
edbox->pack_start(*labmedgr, Gtk::PACK_SHRINK, 1);
edbox->pack_start(*localedgMethod);
edgsBoxshow->pack_start(*edbox);
- Gtk::HSeparator* const separatoredg2 = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separatoredg2 = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
edgsBoxshow->pack_start(*separatoredg2);
edgsBoxshow->pack_start(*tloww);
edgsBoxshow->pack_start(*thigw);
- Gtk::HSeparator* const separatoredg = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separatoredg = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
edgsBoxshow->pack_start(*separatoredg);
edgsBoxshow->pack_start(*edgw);
edgsBoxshow->pack_start(*basew);
- Gtk::HBox* const ctboxNP = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxNP = Gtk::manage(new Gtk::Box());
Gtk::Label* const labmNP = Gtk::manage(new Gtk::Label(M("TP_WAVELET_NPTYPE") + ":"));
ctboxNP->pack_start(*labmNP, Gtk::PACK_SHRINK, 1);
ctboxNP->pack_start(*localneiMethod);
@@ -2733,13 +2741,13 @@ LocallabContrast::LocallabContrast():
Gtk::Frame* const blurlevelFrame = Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_BLURLEVELFRA")));
blurlevelFrame->set_label_align(0.025, 0.5);
blurlevelFrame->set_label_widget(*wavblur);
- Gtk::VBox* const blurlevcontBox = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* const blurlevcontBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
blurlevcontBox->set_spacing(2);
blurlevcontBox->pack_start(*levelblur);
blurlevcontBox->pack_start(*sigmabl);
blurlevcontBox->pack_start(*chromablu);
blurlevcontBox->pack_start(*LocalcurveEditorwavlev, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor
- Gtk::HSeparator* const separatorblu = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separatorblu = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
blurlevcontBox->pack_start(*separatorblu);
blurlevcontBox->pack_start(*residblur);
blurlevcontBox->pack_start(*blurlc);
@@ -2751,7 +2759,7 @@ LocallabContrast::LocallabContrast():
Gtk::Frame* const contFrame2 = Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_CONTFRA")));
contFrame2->set_label_align(0.025, 0.5);
contFrame2->set_label_widget(*wavcont);
- Gtk::VBox* const contlevBox = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* const contlevBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
contlevBox->set_spacing(2);
contlevBox->pack_start(*sigma);
contlevBox->pack_start(*offset);
@@ -2762,7 +2770,7 @@ LocallabContrast::LocallabContrast():
Gtk::Frame* const compreFrame = Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_COMPREFRA")));
compreFrame->set_label_align(0.025, 0.5);
compreFrame->set_label_widget(*wavcompre);
- Gtk::VBox* const compreBox = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* const compreBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
compreBox->set_spacing(2);
compreBox->pack_start(*LocalcurveEditorwavcompre, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor
compreBox->pack_start(*sigmadr);
@@ -2773,12 +2781,12 @@ LocallabContrast::LocallabContrast():
Gtk::Frame* const compFrame = Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_COMPFRA")));
compFrame->set_label_align(0.025, 0.5);
compFrame->set_label_widget(*wavcomp);
- Gtk::VBox* const compBox = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* const compBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
compBox->set_spacing(2);
compBox->pack_start(*sigmadc);
compBox->pack_start(*deltad);
compBox->pack_start(*LocalcurveEditorwavcomp, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor
- // Gtk::HSeparator* const separatorcomp = Gtk::manage(new Gtk::HSeparator());
+ // Gtk::Separator* const separatorcomp = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
// compBox->pack_start(*separatorcomp);
// compBox->pack_start(*fatres);
compFrame->add(*compBox);
@@ -4325,6 +4333,8 @@ LocallabCBDL::LocallabCBDL():
lumaneutralButton(Gtk::manage(new Gtk::Button(M("TP_DIRPYREQUALIZER_LUMANEUTRAL")))),
lumacontrastPlusButton(Gtk::manage(new Gtk::Button(M("TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS"))))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
const LocallabParams::LocallabSpot defSpot;
// Parameter CBDL specific widgets
@@ -4408,7 +4418,9 @@ LocallabCBDL::LocallabCBDL():
// Add CBDL specific widgets to GUI
ToolParamBlock* const levBox = Gtk::manage(new ToolParamBlock());
- Gtk::HBox* buttonBox = Gtk::manage(new Gtk::HBox(true, 10));
+ Gtk::Box* buttonBox = Gtk::manage(new Gtk::Box());
+ buttonBox->set_spacing(10);
+ buttonBox->set_homogeneous(true);
buttonBox->pack_start(*lumacontrastMinusButton);
buttonBox->pack_start(*lumaneutralButton);
buttonBox->pack_start(*lumacontrastPlusButton);
@@ -4418,7 +4430,7 @@ LocallabCBDL::LocallabCBDL():
levBox->pack_start(*adj);
}
- Gtk::HSeparator* const separator = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separator = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
levBox->pack_start(*separator, Gtk::PACK_SHRINK, 2);
levBox->pack_start(*chromacbdl);
levBox->pack_start(*threshold);
@@ -5077,7 +5089,7 @@ LocallabLog::LocallabLog():
sourceGray(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOURCE_GRAY"), 1.0, 100.0, 0.1, 10.0))),
sourceabs(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOURCE_ABS"), 0.01, 16384.0, 0.01, 2000.0))),
sursour(Gtk::manage (new MyComboBoxText ())),
- surHBox(Gtk::manage(new Gtk::HBox())),
+ surHBox(Gtk::manage(new Gtk::Box())),
log1Frame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_LOG1FRA")))),
log2Frame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_LOG2FRA")))),
targetGray(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TARGET_GRAY"), 5.0, 80.0, 0.1, 18.0))),
@@ -5094,7 +5106,7 @@ LocallabLog::LocallabLog():
LshapeL(static_cast(CurveEditorL->addCurve(CT_Diagonal, "Q(Q)"))),
targabs(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOURCE_ABS"), 0.01, 16384.0, 0.01, 16.0))),
surround(Gtk::manage (new MyComboBoxText ())),
- surrHBox(Gtk::manage(new Gtk::HBox())),
+ surrHBox(Gtk::manage(new Gtk::Box())),
baselog(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BASELOG"), 1.3, 3., 0.05, 2.))),//, Gtk::manage(new RTImage("circle-black-small.png")), Gtk::manage(new RTImage("circle-white-small.png"))))),
exprecovl(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_DENOI2_EXP")))),
maskusablel(Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_MASKUSABLE")))),
@@ -5123,6 +5135,8 @@ LocallabLog::LocallabLog():
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
// Parameter Log encoding specific widgets
autoconn = autocompute->signal_toggled().connect(sigc::mem_fun(*this, &LocallabLog::autocomputeToggled));
const LocallabParams::LocallabSpot defSpot;
@@ -5202,7 +5216,6 @@ LocallabLog::LocallabLog():
-// Gtk::HBox* surrHBox = Gtk::manage (new Gtk::HBox ());
surrHBox->set_spacing (2);
surrHBox->set_tooltip_markup (M ("TP_COLORAPP_SURROUND_TOOLTIP"));
Gtk::Label* surrLabel = Gtk::manage (new Gtk::Label (M ("TP_COLORAPP_SURROUND") + ":"));
@@ -6378,6 +6391,9 @@ LocallabMask::LocallabMask():
str_mask(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -2., 2., 0.05, 0.))),
ang_mask(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180., 180., 0.1, 0.)))
{
+
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
const LocallabParams::LocallabSpot defSpot;
// Parameter Mask common specific widgets
diff --git a/rtgui/metadatapanel.cc b/rtgui/metadatapanel.cc
index f92152763..e26444ccc 100644
--- a/rtgui/metadatapanel.cc
+++ b/rtgui/metadatapanel.cc
@@ -28,8 +28,9 @@ using namespace rtengine::procparams;
MetaDataPanel::MetaDataPanel() : EvMetaDataMode(ProcEventMapper::getInstance()->newEvent(M_VOID, "HISTORY_MSG_METADATA_MODE"))
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
- Gtk::HBox *box = Gtk::manage(new Gtk::HBox());
+ Gtk::Box *box = Gtk::manage(new Gtk::Box());
box->pack_start(*Gtk::manage(new Gtk::Label(M("TP_METADATA_MODE") + ": ")), Gtk::PACK_SHRINK, 4);
metadataMode = Gtk::manage(new MyComboBoxText());
metadataMode->append(M("TP_METADATA_TUNNEL"));
diff --git a/rtgui/metadatapanel.h b/rtgui/metadatapanel.h
index b39ffd2c1..bc74ac484 100644
--- a/rtgui/metadatapanel.h
+++ b/rtgui/metadatapanel.h
@@ -24,7 +24,7 @@
#include "exifpanel.h"
#include "iptcpanel.h"
-class MetaDataPanel: public Gtk::VBox, public ToolPanel {
+class MetaDataPanel: public Gtk::Box, public ToolPanel {
private:
rtengine::ProcEvent EvMetaDataMode;
MyComboBoxText *metadataMode;
diff --git a/rtgui/navigator.cc b/rtgui/navigator.cc
index 71e7e3d1d..bca024a16 100644
--- a/rtgui/navigator.cc
+++ b/rtgui/navigator.cc
@@ -73,7 +73,7 @@ Navigator::Navigator() :
set_label (M("MAIN_MSG_NAVIGATOR"));
set_name("Navigator");
- Gtk::VBox* mbox = Gtk::manage (new Gtk::VBox ());
+ Gtk::Box* mbox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
previewWindow = Gtk::manage (new PreviewWindow ());
mbox->pack_start (*previewWindow, Gtk::PACK_SHRINK, 2);
dimension = Gtk::manage (new Gtk::Label ());
@@ -102,6 +102,17 @@ Navigator::Navigator() :
lLAB_A->set_alignment(Gtk::ALIGN_START);
lLAB_B->set_alignment(Gtk::ALIGN_START);
lLAB_L->set_alignment(Gtk::ALIGN_START);
+
+ // expand labels
+ lR->set_hexpand();
+ lG->set_hexpand();
+ lB->set_hexpand();
+ lH->set_hexpand();
+ lS->set_hexpand();
+ lV->set_hexpand();
+ lLAB_A->set_hexpand();
+ lLAB_B->set_hexpand();
+ lLAB_L->set_hexpand();
//values
R = Gtk::manage (new Gtk::Label ());
@@ -172,70 +183,64 @@ Navigator::Navigator() :
*/
// setup the tables
- Gtk::Table* table0 = Gtk::manage (new Gtk::Table (1, 3)); //rows, cols The main table container
+ Gtk::Grid* table0 = Gtk::manage (new Gtk::Grid()); //rows, cols The main table container
// let's pack tables1,2-3 into table0
// RGB
Gtk::EventBox *evBox1 = Gtk::manage (new Gtk::EventBox());
- Gtk::HBox* hbox1 = Gtk::manage (new Gtk::HBox ()); // container
- Gtk::Table* table1 = Gtk::manage (new Gtk::Table (3, 2));
-
- table1->attach (*lR, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 4, 0);
- table1->attach (*R, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
-
- table1->attach (*lG, 0, 1, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 4, 0);
- table1->attach (*G, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
-
- table1->attach (*lB, 0, 1, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 4, 0);
- table1->attach (*B, 1, 2, 2, 3, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
+ Gtk::Box* hbox1 = Gtk::manage (new Gtk::Box ());
+ Gtk::Grid* table1 = Gtk::manage (new Gtk::Grid());
+
+ table1->attach(*lR, 0, 0);
+ table1->attach(*R, 1, 0);
+ table1->attach(*lG, 0, 1);
+ table1->attach(*G, 1, 1);
+ table1->attach(*lB, 0, 2);
+ table1->attach(*B, 1, 2);
evBox1->add (*table1);
evBox1->signal_button_release_event().connect_notify( sigc::mem_fun(*this, &Navigator::cycleUnitsRGB));
hbox1->pack_start (*evBox1, Gtk::PACK_EXPAND_WIDGET, 4);
- hbox1->pack_start (*Gtk::manage (new Gtk::VSeparator()), Gtk::PACK_SHRINK, 4);
- table0->attach (*hbox1, 0, 1, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
+ hbox1->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK, 4);
+ table0->attach(*hbox1, 0, 0);
// HSV
Gtk::EventBox *evBox2 = Gtk::manage (new Gtk::EventBox());
- Gtk::HBox* hbox2 = Gtk::manage (new Gtk::HBox ()); // container
- Gtk::Table* table2 = Gtk::manage (new Gtk::Table (3, 2));
+ Gtk::Box* hbox2 = Gtk::manage (new Gtk::Box ());
+ Gtk::Grid* table2 = Gtk::manage (new Gtk::Grid());
- table2->attach (*lH, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 4, 0);
- table2->attach (*H, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
-
- table2->attach (*lS, 0, 1, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 4, 0);
- table2->attach (*S, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
-
- table2->attach (*lV, 0, 1, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 4, 0);
- table2->attach (*V, 1, 2, 2, 3, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
+ table2->attach(*lH, 0, 0);
+ table2->attach(*H, 1, 0);
+ table2->attach(*lS, 0, 1);
+ table2->attach(*S, 1, 1);
+ table2->attach(*lV, 0, 2);
+ table2->attach(*V, 1, 2);
evBox2->add (*table2);
evBox2->signal_button_release_event().connect_notify( sigc::mem_fun(*this, &Navigator::cycleUnitsHSV));
hbox2->pack_start (*evBox2, Gtk::PACK_EXPAND_WIDGET, 4);
- hbox2->pack_start (*Gtk::manage (new Gtk::VSeparator()), Gtk::PACK_SHRINK, 4);
- table0->attach (*hbox2, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
+ hbox2->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK, 4);
+ table0->attach(*hbox2, 1, 0);
// LAB
- Gtk::HBox* hbox3 = Gtk::manage (new Gtk::HBox ()); // container
- Gtk::Table* table3 = Gtk::manage (new Gtk::Table (3, 2));
+ Gtk::Box* hbox3 = Gtk::manage (new Gtk::Box ());
+ Gtk::Grid* table3 = Gtk::manage (new Gtk::Grid());
- table3->attach (*lLAB_L, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 4, 0);
- table3->attach (*LAB_L, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
-
- table3->attach (*lLAB_A, 0, 1, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 4, 0);
- table3->attach (*LAB_A, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
-
- table3->attach (*lLAB_B, 0, 1, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 4, 0);
- table3->attach (*LAB_B, 1, 2, 2, 3, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
+ table3->attach(*lLAB_L, 0, 0);
+ table3->attach(*LAB_L, 1, 0);
+ table3->attach(*lLAB_A, 0, 1);
+ table3->attach(*LAB_A, 1, 1);
+ table3->attach(*lLAB_B, 0, 2);
+ table3->attach(*LAB_B, 1, 2);
hbox3->pack_start (*table3, Gtk::PACK_EXPAND_WIDGET, 4);
- hbox3->pack_start (*Gtk::manage (new Gtk::HBox()), Gtk::PACK_SHRINK, 2);
- table0->attach (*hbox3, 2, 3, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 0, 0);
+ hbox3->pack_start (*Gtk::manage (new Gtk::Box()), Gtk::PACK_SHRINK, 2);
+ table0->attach(*hbox3, 2, 0);
- table0->set_homogeneous(true); // all cells will be the same size as the largest cell.
+ table0->set_column_homogeneous(true); // all cells will have equal width
mbox->pack_start (*table0, Gtk::PACK_EXPAND_WIDGET, 2);
add (*mbox);
diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc
index 83a3b7cc0..c759bcd44 100644
--- a/rtgui/partialpastedlg.cc
+++ b/rtgui/partialpastedlg.cc
@@ -35,6 +35,9 @@ PartialSpotWidget::PartialSpotWidget():
// Widget listener
selListener(nullptr)
{
+
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
// Configure tree view
treeview->set_model(treemodel);
treeview->set_enable_search(false);
@@ -311,13 +314,13 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
//---
raw_preprocwb = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_PREPROCWB")));
- Gtk::VBox* vboxes[9];
- Gtk::HSeparator* hseps[9];
+ Gtk::Box* vboxes[9];
+ Gtk::Separator* hseps[9];
for (int i = 0; i < 9; i++) {
- vboxes[i] = Gtk::manage (new Gtk::VBox ());
+ vboxes[i] = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
vboxes[i]->set_name("PartialPasteGroupContainer");
- hseps[i] = Gtk::manage (new Gtk::HSeparator ());
+ hseps[i] = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
hseps[i]->set_name("PartialPasteHeaderSep");
}
@@ -402,35 +405,35 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
vboxes[8]->pack_start (*raw_dcb_iterations, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*raw_dcb_enhance, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*raw_lmmse_iterations, Gtk::PACK_SHRINK, 2);
- vboxes[8]->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 0);
+ vboxes[8]->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 0);
vboxes[8]->pack_start (*raw_linenoise, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*raw_greenthresh, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*raw_hotpix_filt, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*raw_deadpix_filt, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*raw_pdaf_lines_filter, Gtk::PACK_SHRINK, 2);
- vboxes[8]->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 0);
+ vboxes[8]->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 0);
vboxes[8]->pack_start (*raw_expos, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*raw_black, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*raw_preprocwb, Gtk::PACK_SHRINK, 2);
- vboxes[8]->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 0);
+ vboxes[8]->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 0);
vboxes[8]->pack_start (*df_file, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*df_AutoSelect, Gtk::PACK_SHRINK, 2);
- vboxes[8]->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 0);
+ vboxes[8]->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 0);
vboxes[8]->pack_start (*ff_file, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*ff_AutoSelect, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*ff_BlurType, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*ff_BlurRadius, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*ff_ClipControl, Gtk::PACK_SHRINK, 2);
- vboxes[8]->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 0);
+ vboxes[8]->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 0);
vboxes[8]->pack_start (*raw_ca_autocorrect, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*raw_caredblue, Gtk::PACK_SHRINK, 2);
vboxes[8]->pack_start (*raw_ca_avoid_colourshift, Gtk::PACK_SHRINK, 2);
- vboxes[8]->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 0);
+ vboxes[8]->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 0);
vboxes[8]->pack_start (*captureSharpening, Gtk::PACK_SHRINK, 2);
- Gtk::VBox* vbCol1 = Gtk::manage (new Gtk::VBox ());
- Gtk::VBox* vbCol2 = Gtk::manage (new Gtk::VBox ());
- Gtk::VBox* vbCol3 = Gtk::manage (new Gtk::VBox ());
+ Gtk::Box* vbCol1 = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* vbCol2 = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* vbCol3 = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
for (int i = 0; i < 3; i++) {
vbCol1->pack_start (*vboxes[i], Gtk::PACK_SHRINK, 2);
@@ -444,18 +447,18 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
vbCol3->pack_start (*vboxes[i], Gtk::PACK_SHRINK, 2);
}
- Gtk::VBox* vbtop = Gtk::manage (new Gtk::VBox ());
+ Gtk::Box* vbtop = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
vbtop->pack_start (*everything, Gtk::PACK_SHRINK, 2);
Gtk::Dialog::get_content_area()->pack_start (*vbtop, Gtk::PACK_SHRINK, 2);
- Gtk::HBox* hbmain = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hbmain = Gtk::manage (new Gtk::Box ());
hbmain->pack_start (*vbCol1);
- Gtk::VSeparator *vsep1 = Gtk::manage (new Gtk::VSeparator ());
+ Gtk::Separator *vsep1 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
setExpandAlignProperties(vsep1, false, true, Gtk::ALIGN_CENTER, Gtk::ALIGN_FILL);
hbmain->pack_start (*vsep1);
hbmain->pack_start (*vbCol2);
- Gtk::VSeparator *vsep2 = Gtk::manage (new Gtk::VSeparator ());
+ Gtk::Separator *vsep2 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
setExpandAlignProperties(vsep2, false, true, Gtk::ALIGN_CENTER, Gtk::ALIGN_FILL);
hbmain->pack_start (*vsep2);
hbmain->pack_start (*vbCol3);
diff --git a/rtgui/partialpastedlg.h b/rtgui/partialpastedlg.h
index 94bc2868c..c61408df7 100644
--- a/rtgui/partialpastedlg.h
+++ b/rtgui/partialpastedlg.h
@@ -54,7 +54,7 @@ public:
/* ==== PartialSpotWidget ==== */
class PartialSpotWidget:
- public Gtk::VBox
+ public Gtk::Box
{
private:
// Tree model to manage spot selection widget
diff --git a/rtgui/pdsharpening.cc b/rtgui/pdsharpening.cc
index 1b98fd3ac..45d5b545c 100644
--- a/rtgui/pdsharpening.cc
+++ b/rtgui/pdsharpening.cc
@@ -45,7 +45,7 @@ PdSharpening::PdSharpening() :
EvPdShrAutoContrast = m->newEvent(CAPTURESHARPEN, "HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST");
EvPdShrAutoRadius = m->newEvent(CAPTURESHARPEN, "HISTORY_MSG_PDSHARPEN_AUTO_RADIUS");
- Gtk::HBox* hb = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* hb = Gtk::manage(new Gtk::Box());
hb->show();
contrast = Gtk::manage(new Adjuster(M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 10));
contrast->setAdjusterListener(this);
@@ -57,7 +57,7 @@ PdSharpening::PdSharpening() :
pack_start(*hb);
- Gtk::VBox* rld = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* rld = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
dradius = Gtk::manage(new Adjuster(M("TP_SHARPENING_RADIUS"), 0.4, 2.0, 0.01, 0.75));
dradius->addAutoButton();
dradius->setAutoValue(true);
diff --git a/rtgui/perspective.cc b/rtgui/perspective.cc
index 55013ec4a..b3fabd31a 100644
--- a/rtgui/perspective.cc
+++ b/rtgui/perspective.cc
@@ -135,7 +135,7 @@ PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("
Gtk::Image* ipers_rotate_left = Gtk::manage(new RTImage("rotate-right-small.png"));
Gtk::Image* ipers_rotate_right = Gtk::manage(new RTImage("rotate-left-small.png"));
- Gtk::HBox* method_hbox = Gtk::manage (new Gtk::HBox());
+ Gtk::Box* method_hbox = Gtk::manage (new Gtk::Box());
Gtk::Label* method_label = Gtk::manage (new Gtk::Label (M("TP_PERSPECTIVE_METHOD") + ": "));
method = Gtk::manage (new MyComboBoxText ());
method->append (M("TP_PERSPECTIVE_METHOD_SIMPLE"));
@@ -144,7 +144,7 @@ PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("
method_hbox->pack_start(*method);
pack_start(*method_hbox);
- simple = Gtk::manage( new Gtk::VBox() );
+ simple = Gtk::manage( new Gtk::Box(Gtk::ORIENTATION_VERTICAL) );
vert = Gtk::manage (new Adjuster (M("TP_PERSPECTIVE_VERTICAL"), -100, 100, 0.1, 0, ipersVL, ipersVR));
vert->setAdjusterListener (this);
@@ -152,13 +152,13 @@ PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("
horiz = Gtk::manage (new Adjuster (M("TP_PERSPECTIVE_HORIZONTAL"), -100, 100, 0.1, 0, ipersHL, ipersHR));
horiz->setAdjusterListener (this);
- camera_based = Gtk::manage( new Gtk::VBox() );
+ camera_based = Gtk::manage( new Gtk::Box(Gtk::ORIENTATION_VERTICAL) );
Gtk::Frame* camera_frame = Gtk::manage (new Gtk::Frame
(M("TP_PERSPECTIVE_CAMERA_FRAME")));
camera_frame->set_label_align(0.025, 0.5);
- Gtk::VBox* camera_vbox = Gtk::manage (new Gtk::VBox());
+ Gtk::Box* camera_vbox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
camera_focal_length = Gtk::manage (new Adjuster (M("TP_PERSPECTIVE_CAMERA_FOCAL_LENGTH"), 0.5, 2000, 0.01, 24));
camera_focal_length->setAdjusterListener (this);
@@ -207,7 +207,7 @@ PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("
lines = std::unique_ptr(new ControlLineManager());
lines->callbacks = std::make_shared(this);
- Gtk::HBox* control_lines_box = Gtk::manage (new Gtk::HBox());
+ Gtk::Box* control_lines_box = Gtk::manage (new Gtk::Box());
Gtk::Label* control_lines_label = Gtk::manage (new Gtk::Label (M("TP_PERSPECTIVE_CONTROL_LINES") + ": "));
control_lines_label->set_tooltip_markup( M("TP_PERSPECTIVE_CONTROL_LINES_TOOLTIP") );
control_lines_box->pack_start(*control_lines_label, Gtk::PACK_SHRINK);
@@ -228,7 +228,7 @@ PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("
auto_pitch_yaw->set_image(*ipers_auto_pitch_yaw);
auto_pitch_yaw->signal_pressed().connect( sigc::bind(sigc::mem_fun(*this, &PerspCorrection::autoCorrectionPressed), auto_pitch_yaw) );
- Gtk::HBox* auto_hbox = Gtk::manage (new Gtk::HBox());
+ Gtk::Box* auto_hbox = Gtk::manage (new Gtk::Box());
Gtk::Label* auto_label = Gtk::manage (new Gtk::Label (M("GENERAL_AUTO") + ": "));
auto_hbox->pack_start(*auto_label, Gtk::PACK_SHRINK);
@@ -236,7 +236,7 @@ PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("
(M("TP_PERSPECTIVE_POST_CORRECTION_ADJUSTMENT_FRAME")));
pca_frame->set_label_align(0.025, 0.5);
- Gtk::VBox* pca_vbox = Gtk::manage (new Gtk::VBox());
+ Gtk::Box* pca_vbox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
projection_shift_horiz = Gtk::manage (new Adjuster (M("TP_PERSPECTIVE_PROJECTION_SHIFT_HORIZONTAL"), -100, 100, 0.01, 0));
projection_shift_horiz->setAdjusterListener (this);
@@ -251,7 +251,7 @@ PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("
(M("TP_PERSPECTIVE_RECOVERY_FRAME")));
recovery_frame->set_label_align(0.025, 0.5);
- Gtk::VBox* recovery_vbox = Gtk::manage (new Gtk::VBox());
+ Gtk::Box* recovery_vbox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
projection_pitch = Gtk::manage (new Adjuster (M("TP_PERSPECTIVE_PROJECTION_PITCH"), -60, 60, 0.1, 0, ipers_proj_pitch_left, ipers_proj_pitch_right));
projection_pitch->setAdjusterListener (this);
@@ -273,9 +273,9 @@ PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("
camera_vbox->pack_start (*camera_roll);
camera_vbox->pack_start (*camera_pitch);
camera_vbox->pack_start (*camera_yaw);
- camera_vbox->pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ camera_vbox->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
camera_vbox->pack_start (*control_lines_box);
- camera_vbox->pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ camera_vbox->pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
camera_vbox->pack_start (*auto_hbox);
camera_frame->add(*camera_vbox);
camera_based->pack_start(*camera_frame);
diff --git a/rtgui/perspective.h b/rtgui/perspective.h
index 6ba169b60..3c677ba6e 100644
--- a/rtgui/perspective.h
+++ b/rtgui/perspective.h
@@ -42,13 +42,13 @@ class PerspCorrection final :
protected:
bool render = true;
MyComboBoxText* method;
- Gtk::VBox* simple;
+ Gtk::Box* simple;
Adjuster* horiz;
Adjuster* vert;
Gtk::Button* auto_pitch;
Gtk::Button* auto_yaw;
Gtk::Button* auto_pitch_yaw;
- Gtk::VBox* camera_based;
+ Gtk::Box* camera_based;
Adjuster* camera_crop_factor;
Adjuster* camera_focal_length;
Adjuster* camera_pitch;
diff --git a/rtgui/placesbrowser.cc b/rtgui/placesbrowser.cc
index f1450cea2..3440080f8 100644
--- a/rtgui/placesbrowser.cc
+++ b/rtgui/placesbrowser.cc
@@ -31,7 +31,8 @@
PlacesBrowser::PlacesBrowser ()
{
-
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
scrollw = Gtk::manage (new Gtk::ScrolledWindow ());
scrollw->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
pack_start (*scrollw);
diff --git a/rtgui/placesbrowser.h b/rtgui/placesbrowser.h
index d4640fff4..64cd30e3c 100644
--- a/rtgui/placesbrowser.h
+++ b/rtgui/placesbrowser.h
@@ -23,7 +23,7 @@
#include
class PlacesBrowser :
- public Gtk::VBox
+ public Gtk::Box
{
public:
typedef sigc::slot DirSelectionSlot;
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 3177f3cd4..5ab2ecd36 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -35,7 +35,7 @@
namespace {
void placeSpinBox(Gtk::Container* where, Gtk::SpinButton* &spin, const std::string &labelText, int digits, int inc0, int inc1, int maxLength, int range0, int range1, const std::string &toolTip = "") {
- Gtk::HBox* HB = Gtk::manage ( new Gtk::HBox () );
+ Gtk::Box* HB = Gtk::manage ( new Gtk::Box () );
HB->set_spacing (4);
if (!toolTip.empty()) {
HB->set_tooltip_text (M (toolTip));
@@ -147,12 +147,12 @@ Gtk::Widget* Preferences::getBatchProcPanel()
swBatchProc = Gtk::manage(new Gtk::ScrolledWindow());
swBatchProc->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- Gtk::VBox* vbBatchProc = Gtk::manage (new Gtk::VBox ());
+ Gtk::Box* vbBatchProc = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
Gtk::ScrolledWindow* behscrollw = Gtk::manage(new Gtk::ScrolledWindow());
behscrollw->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
behscrollw->set_size_request(-1, 60);
- Gtk::VBox* vbbeh = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* vbbeh = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
vbbeh->pack_start(*behscrollw, Gtk::PACK_EXPAND_WIDGET);
Gtk::Frame* behFrame = Gtk::manage(new Gtk::Frame(M("PREFERENCES_BEHAVIOR")));
behFrame->add(*vbbeh);
@@ -452,7 +452,7 @@ Gtk::Widget* Preferences::getBatchProcPanel()
behAddAll->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::behAddAllPressed));
behSetAll->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::behSetAllPressed));
- Gtk::HBox* buttonpanel1 = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* buttonpanel1 = Gtk::manage(new Gtk::Box());
buttonpanel1->pack_end(*behSetAll, Gtk::PACK_SHRINK, 4);
buttonpanel1->pack_end(*behAddAll, Gtk::PACK_SHRINK, 4);
vbbeh->pack_start(*buttonpanel1, Gtk::PACK_SHRINK, 4);
@@ -510,10 +510,10 @@ Gtk::Widget* Preferences::getImageProcessingPanel ()
swImageProcessing = Gtk::manage(new Gtk::ScrolledWindow());
swImageProcessing->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- Gtk::VBox* vbImageProcessing = Gtk::manage (new Gtk::VBox ());
+ Gtk::Box* vbImageProcessing = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
Gtk::Frame* fpp = Gtk::manage(new Gtk::Frame(M("PREFERENCES_IMPROCPARAMS")));
- Gtk::VBox* vbpp = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* vbpp = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
Gtk::Label* drlab = Gtk::manage(new Gtk::Label(M("PREFERENCES_FORRAW") + ":", Gtk::ALIGN_START));
rprofiles = Gtk::manage(new ProfileStoreComboBox());
const ProfileStoreEntry* dynpse = ProfileStore::getInstance()->getInternalDynamicPSE();
@@ -527,12 +527,15 @@ Gtk::Widget* Preferences::getImageProcessingPanel ()
iprofiles->set_size_request(50, -1);
setExpandAlignProperties(iprofiles, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
ipconn = iprofiles->signal_changed().connect(sigc::mem_fun(*this, &Preferences::forImageComboChanged));
- Gtk::Table* defpt = Gtk::manage(new Gtk::Table(2, 2));
- defpt->attach(*drlab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
- defpt->attach(*rprofiles, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
- defpt->attach(*drimg, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 2);
- defpt->attach(*iprofiles, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
+
+ Gtk::Grid* defpt = Gtk::manage(new Gtk::Grid());
+ defpt->set_row_spacing(2);
+ defpt->attach(*drlab, 0, 0);
+ defpt->attach(*rprofiles, 1, 0);
+ defpt->attach(*drimg, 0, 1);
+ defpt->attach(*iprofiles, 1, 1);
vbpp->pack_start(*defpt, Gtk::PACK_SHRINK, 4);
+
useBundledProfiles = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_USEBUNDLEDPROFILES")));
bpconn = useBundledProfiles->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::bundledProfilesChanged));
vbpp->pack_start(*useBundledProfiles, Gtk::PACK_SHRINK, 4);
@@ -544,39 +547,42 @@ Gtk::Widget* Preferences::getImageProcessingPanel ()
Gtk::Label* cplab = Gtk::manage(new Gtk::Label(M("PREFERENCES_CUSTPROFBUILDPATH") + ":", Gtk::ALIGN_START));
txtCustProfBuilderPath = Gtk::manage(new Gtk::Entry());
txtCustProfBuilderPath->set_tooltip_markup(M("PREFERENCES_CUSTPROFBUILDHINT"));
+ txtCustProfBuilderPath->set_hexpand();
Gtk::Label* cpltypelab = Gtk::manage(new Gtk::Label(M("PREFERENCES_CUSTPROFBUILDKEYFORMAT") + ":", Gtk::ALIGN_START));
custProfBuilderLabelType = Gtk::manage(new Gtk::ComboBoxText());
custProfBuilderLabelType->append(M("PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID"));
custProfBuilderLabelType->append(M("PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME"));
custProfBuilderLabelType->append(M("PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID") + "_" + M("PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME"));
- Gtk::Table* cpbt = Gtk::manage(new Gtk::Table(2, 2));
- cpbt->attach(*cplab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
- cpbt->attach(*txtCustProfBuilderPath, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
- cpbt->attach(*cpltypelab, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 2);
- cpbt->attach(*custProfBuilderLabelType, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
+ Gtk::Grid* cpbt = Gtk::manage(new Gtk::Grid());
+ cpbt->set_row_spacing(2);
+ cpbt->attach(*cplab, 0, 0);
+ cpbt->attach(*txtCustProfBuilderPath, 1, 0);
+ cpbt->attach(*cpltypelab, 0, 1);
+ cpbt->attach(*custProfBuilderLabelType, 1, 1);
cpfrm->add(*cpbt);
vbImageProcessing->pack_start (*cpfrm, Gtk::PACK_SHRINK, 4);
Gtk::Frame* fdp = Gtk::manage(new Gtk::Frame(M("PREFERENCES_PROFILEHANDLING")));
- Gtk::Table* vbdp = Gtk::manage(new Gtk::Table(2, 2));
+ Gtk::Grid* vbdp = Gtk::manage(new Gtk::Grid());
saveParamsPreference = Gtk::manage(new Gtk::ComboBoxText());
saveParamsPreference->append(M("PREFERENCES_PROFILESAVEINPUT"));
saveParamsPreference->append(M("PREFERENCES_PROFILESAVECACHE"));
saveParamsPreference->append(M("PREFERENCES_PROFILESAVEBOTH"));
Gtk::Label *splab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PROFILESAVELOCATION") + ":", Gtk::ALIGN_START));
- vbdp->attach(*splab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
- vbdp->attach(*saveParamsPreference, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
Gtk::Label* lplab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PROFILELOADPR") + ":", Gtk::ALIGN_START));
loadParamsPreference = Gtk::manage(new Gtk::ComboBoxText());
loadParamsPreference->append(M("PREFERENCES_PROFILEPRCACHE"));
loadParamsPreference->append(M("PREFERENCES_PROFILEPRFILE"));
- vbdp->attach(*lplab, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 2);
- vbdp->attach(*loadParamsPreference, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
+ vbdp->set_row_spacing(2);
+ vbdp->attach(*splab, 0, 0);
+ vbdp->attach(*saveParamsPreference, 1, 0);
+ vbdp->attach(*lplab, 0, 1);
+ vbdp->attach(*loadParamsPreference, 1, 1);
fdp->add(*vbdp);
vbImageProcessing->pack_start (*fdp, Gtk::PACK_SHRINK, 4);
// Gtk::Frame* fdf = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_DARKFRAME")) );
-// Gtk::HBox* hb42 = Gtk::manage (new Gtk::HBox ());
+// Gtk::Box* hb42 = Gtk::manage (new Gtk::Box ());
// darkFrameDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
// Directories
Gtk::Frame* cdf = Gtk::manage(new Gtk::Frame(M("PREFERENCES_DIRECTORIES")));
@@ -654,11 +660,12 @@ Gtk::Widget* Preferences::getPerformancePanel()
swPerformance = Gtk::manage(new Gtk::ScrolledWindow());
swPerformance->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- Gtk::VBox* vbPerformance = Gtk::manage ( new Gtk::VBox () );
+ Gtk::Box* vbPerformance = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL) );
vbPerformance->set_spacing (4);
Gtk::Frame* fprevdemo = Gtk::manage(new Gtk::Frame(M("PREFERENCES_PREVDEMO")));
- Gtk::HBox* hbprevdemo = Gtk::manage(new Gtk::HBox(false, 4));
+ Gtk::Box* hbprevdemo = Gtk::manage(new Gtk::Box());
+ hbprevdemo->set_spacing(4);
Gtk::Label* lprevdemo = Gtk::manage (new Gtk::Label (M("PREFERENCES_PREVDEMO_LABEL"), Gtk::ALIGN_START));
cprevdemo = Gtk::manage(new Gtk::ComboBoxText());
cprevdemo->append(M("PREFERENCES_PREVDEMO_FAST"));
@@ -670,7 +677,8 @@ Gtk::Widget* Preferences::getPerformancePanel()
vbPerformance->pack_start (*fprevdemo, Gtk::PACK_SHRINK, 4);
Gtk::Frame* ftiffserialize = Gtk::manage(new Gtk::Frame(M("PREFERENCES_SERIALIZE_TIFF_READ")));
- Gtk::HBox* htiffserialize = Gtk::manage(new Gtk::HBox(false, 4));
+ Gtk::Box* htiffserialize = Gtk::manage(new Gtk::Box());
+ htiffserialize->set_spacing(4);
ctiffserialize = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_SERIALIZE_TIFF_READ_LABEL")));
ctiffserialize->set_tooltip_text(M("PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP"));
htiffserialize->pack_start(*ctiffserialize);
@@ -687,9 +695,9 @@ Gtk::Widget* Preferences::getPerformancePanel()
Gtk::Frame* fchunksize = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_CHUNKSIZES")) );
fchunksize->set_label_align(0.025, 0.5);
- Gtk::VBox* chunkSizeVB = Gtk::manage ( new Gtk::VBox () );
+ Gtk::Box* chunkSizeVB = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL) );
- Gtk::HBox* measureHB = Gtk::manage ( new Gtk::HBox () );
+ Gtk::Box* measureHB = Gtk::manage ( new Gtk::Box () );
measureHB->set_spacing (4);
measureCB = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_PERFORMANCE_MEASURE")) );
measureCB->set_tooltip_text (M ("PREFERENCES_PERFORMANCE_MEASURE_HINT"));
@@ -708,10 +716,10 @@ Gtk::Widget* Preferences::getPerformancePanel()
Gtk::Frame* finspect = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_INSPECT_LABEL")) );
finspect->set_label_align(0.025, 0.5);
- Gtk::VBox *inspectorvb = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* inspectorvb = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
placeSpinBox(inspectorvb, maxInspectorBuffersSB, "PREFERENCES_INSPECT_MAXBUFFERS_LABEL", 0, 1, 5, 2, 1, 12, "PREFERENCES_INSPECT_MAXBUFFERS_TOOLTIP");
- Gtk::HBox *insphb = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* insphb = Gtk::manage(new Gtk::Box());
thumbnailInspectorMode = Gtk::manage(new Gtk::ComboBoxText());
thumbnailInspectorMode->append(M("PREFERENCES_THUMBNAIL_INSPECTOR_JPEG"));
thumbnailInspectorMode->append(M("PREFERENCES_THUMBNAIL_INSPECTOR_RAW"));
@@ -724,7 +732,7 @@ Gtk::Widget* Preferences::getPerformancePanel()
Gtk::Frame* threadsFrame = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_PERFORMANCE_THREADS")) );
threadsFrame->set_label_align(0.025, 0.5);
- Gtk::VBox* threadsVBox = Gtk::manage ( new Gtk::VBox (Gtk::PACK_SHRINK, 4) );
+ Gtk::Box* threadsVBox = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL) );
#ifdef _OPENMP
int maxThreadNumber = omp_get_max_threads();
@@ -748,7 +756,7 @@ Gtk::Widget* Preferences::getColorManPanel ()
swColorMan = Gtk::manage(new Gtk::ScrolledWindow());
swColorMan->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- Gtk::VBox* vbColorMan = Gtk::manage (new Gtk::VBox ());
+ Gtk::Box* vbColorMan = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
vbColorMan->set_spacing (4);
iccDir = Gtk::manage(new MyFileChooserButton(M("PREFERENCES_ICCDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
@@ -1095,7 +1103,7 @@ Gtk::Widget* Preferences::getGeneralPanel()
pseudoHiDPI = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_APPEARANCE_PSEUDOHIDPI") + Glib::ustring (" (") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")"));
setExpandAlignProperties(pseudoHiDPI, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- Gtk::VSeparator *vSep = Gtk::manage(new Gtk::VSeparator());
+ Gtk::Separator *vSep = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
appearanceGrid->attach(*themeLbl, 0, 0, 1, 1);
@@ -1252,7 +1260,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
swFileBrowser = Gtk::manage(new Gtk::ScrolledWindow());
swFileBrowser->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- Gtk::VBox* vbFileBrowser = Gtk::manage ( new Gtk::VBox () );
+ Gtk::Box* vbFileBrowser = Gtk::manage ( new Gtk::Box(Gtk::ORIENTATION_VERTICAL) );
Gtk::Frame* fsd = Gtk::manage(new Gtk::Frame(M("PREFERENCES_STARTUPIMDIR")));
@@ -1270,11 +1278,11 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
sdhome->set_group(opts);
sdother->set_group(opts);
- Gtk::VBox* vbsd = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* vbsd = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
vbsd->pack_start(*sdcurrent, Gtk::PACK_SHRINK, 0);
vbsd->pack_start(*sdlast, Gtk::PACK_SHRINK, 0);
vbsd->pack_start(*sdhome, Gtk::PACK_SHRINK, 0);
- Gtk::HBox* otherbox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* otherbox = Gtk::manage(new Gtk::Box());
otherbox->pack_start(*sdother, Gtk::PACK_SHRINK);
otherbox->pack_start(*startupdir);
otherbox->pack_end(*sdselect, Gtk::PACK_SHRINK, 4);
@@ -1292,9 +1300,9 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
showDateTime = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_SHOWDATETIME")));
showBasicExif = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_SHOWBASICEXIF")));
showExpComp = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_SHOWEXPOSURECOMPENSATION")));
- Gtk::VBox* vbro = Gtk::manage(new Gtk::VBox());
- Gtk::HBox* hbro1 = Gtk::manage(new Gtk::HBox());
- Gtk::HBox* hbro0 = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* vbro = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* hbro1 = Gtk::manage(new Gtk::Box());
+ Gtk::Box* hbro0 = Gtk::manage(new Gtk::Box());
overlayedFileNames = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_OVERLAY_FILENAMES")));
filmStripOverlayedFileNames = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP")));
sameThumbSize = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT")));
@@ -1318,7 +1326,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
vbro->pack_start(*sameThumbSize, Gtk::PACK_SHRINK, 0);
vbro->pack_start(*ckbInternalThumbIfUntouched, Gtk::PACK_SHRINK, 0);
- Gtk::HBox* hbrecent = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* hbrecent = Gtk::manage(new Gtk::Box());
Gtk::Label* labrecent = Gtk::manage (new Gtk::Label (M("PREFERENCES_MAXRECENTFOLDERS") + ":", Gtk::ALIGN_START));
maxRecentFolders = Gtk::manage(new Gtk::SpinButton());
hbrecent->pack_start(*labrecent, Gtk::PACK_SHRINK, 4);
@@ -1358,8 +1366,8 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
Gtk::Frame* fre = Gtk::manage(new Gtk::Frame(M("PREFERENCES_PARSEDEXT")));
- Gtk::VBox* vbre = Gtk::manage(new Gtk::VBox());
- Gtk::HBox* hb0 = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* vbre = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* hb0 = Gtk::manage(new Gtk::Box());
Gtk::Label* elab = Gtk::manage (new Gtk::Label (M("PREFERENCES_PARSEDEXTADD") + ":", Gtk::ALIGN_START));
hb0->pack_start(*elab, Gtk::PACK_SHRINK, 4);
extension = Gtk::manage(new Gtk::Entry());
@@ -1403,7 +1411,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
// Cache
Gtk::Frame* frc = Gtk::manage (new Gtk::Frame(M("PREFERENCES_CACHEOPTS")));
- Gtk::VBox* vbc = Gtk::manage (new Gtk::VBox());
+ Gtk::Box* vbc = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
frc->add(*vbc);
Gtk::Grid* cacheGrid = Gtk::manage(new Gtk::Grid());
@@ -1426,7 +1434,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
// Separation is needed so that a button is not accidentally clicked when one wanted
// to click a spinbox. Ideally, the separation wouldn't require attaching a widget, but how?
- Gtk::HSeparator *cacheSeparator = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator *cacheSeparator = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
cacheSeparator->get_style_context()->add_class("grid-row-separator");
Gtk::Label* clearThumbsLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_ALLBUTPROFILES")));
@@ -1462,8 +1470,8 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
clearSafetyLbl->set_line_wrap(true);
vbc->pack_start(*clearSafetyLbl, Gtk::PACK_SHRINK, 4);
- Gtk::HBox* hb6 = Gtk::manage(new Gtk::HBox());
- Gtk::VBox* vb6 = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* hb6 = Gtk::manage(new Gtk::Box());
+ Gtk::Box* vb6 = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
vb6->pack_start(*fro);
vb6->pack_start(*frmnu);
@@ -1494,20 +1502,20 @@ Gtk::Widget* Preferences::getSoundsPanel ()
swSounds = Gtk::manage(new Gtk::ScrolledWindow());
swSounds->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- Gtk::VBox* vbSounds = Gtk::manage(new Gtk::VBox ());
+ Gtk::Box* vbSounds = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
ckbSndEnable = Gtk::manage(new Gtk::CheckButton(M("GENERAL_ENABLE")));
sndEnableConn = ckbSndEnable->signal_toggled().connect(sigc::mem_fun(*this, &Preferences::sndEnableToggled));
vbSounds->pack_start (*ckbSndEnable, Gtk::PACK_SHRINK, 4);
- Gtk::HBox* hblSndHelp = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* hblSndHelp = Gtk::manage(new Gtk::Box());
Gtk::Label* lSndHelp = Gtk::manage (new Gtk::Label (M("PREFERENCES_SND_HELP"), Gtk::ALIGN_START));
hblSndHelp->pack_start(*lSndHelp, Gtk::PACK_SHRINK, 4);
vbSounds->pack_start (*hblSndHelp, Gtk::PACK_SHRINK, 4);
// BatchQueueDone
- Gtk::HBox* pBatchQueueDone = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* pBatchQueueDone = Gtk::manage(new Gtk::Box());
Gtk::Label* lSndBatchQueueDone = Gtk::manage (new Gtk::Label (M("PREFERENCES_SND_QUEUEDONE") + Glib::ustring (":"), Gtk::ALIGN_START));
pBatchQueueDone->pack_start (*lSndBatchQueueDone, Gtk::PACK_SHRINK, 4);
@@ -1518,7 +1526,7 @@ Gtk::Widget* Preferences::getSoundsPanel ()
vbSounds->pack_start (*pBatchQueueDone, Gtk::PACK_SHRINK, 4);
// LngEditProcDone
- Gtk::HBox* pSndLngEditProcDone = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* pSndLngEditProcDone = Gtk::manage(new Gtk::Box());
Gtk::Label* lSndLngEditProcDone = Gtk::manage (new Gtk::Label (M("PREFERENCES_SND_LNGEDITPROCDONE") + Glib::ustring (":"), Gtk::ALIGN_START));
pSndLngEditProcDone->pack_start(*lSndLngEditProcDone, Gtk::PACK_SHRINK, 4);
diff --git a/rtgui/preferences.h b/rtgui/preferences.h
index 60ca00ea2..df4e3327a 100644
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -138,7 +138,7 @@ class Preferences final :
Gtk::ComboBoxText* dnliss;
Gtk::Frame* waveletFrame;
- Gtk::HBox* waveletTileSizeHBox;
+ Gtk::Box* waveletTileSizeHBox;
Gtk::Label* waveletTileSizeLabel;
Gtk::ComboBoxText* waveletTileSizeCombo;
diff --git a/rtgui/preprocess.cc b/rtgui/preprocess.cc
index f33a87a28..b9326e3ad 100644
--- a/rtgui/preprocess.cc
+++ b/rtgui/preprocess.cc
@@ -31,7 +31,7 @@ using namespace rtengine::procparams;
PreProcess::PreProcess () : FoldableToolPanel(this, "preprocess", M("TP_PREPROCESS_LABEL"), options.prevdemo != PD_Sidecar)
{
- Gtk::HBox* hotdeadPixel = Gtk::manage( new Gtk::HBox () );
+ Gtk::Box* hotdeadPixel = Gtk::manage( new Gtk::Box () );
hotdeadPixel->set_spacing(4);
hotPixel = Gtk::manage(new Gtk::CheckButton((M("TP_PREPROCESS_HOTPIXFILT"))));
deadPixel = Gtk::manage(new Gtk::CheckButton((M("TP_PREPROCESS_DEADPIXFILT"))));
diff --git a/rtgui/preprocesswb.cc b/rtgui/preprocesswb.cc
index 170371318..dddd7fdc2 100644
--- a/rtgui/preprocesswb.cc
+++ b/rtgui/preprocesswb.cc
@@ -34,7 +34,7 @@ PreprocessWB::PreprocessWB() :
evPreprocessWBMode(ProcEventMapper::getInstance()->newEvent(FIRST, "HISTORY_MSG_PREPROCWB_MODE")),
mode(Gtk::manage(new MyComboBoxText()))
{
- Gtk::HBox *hb = Gtk::manage(new Gtk::HBox());
+ Gtk::Box *hb = Gtk::manage(new Gtk::Box());
hb->pack_start(*Gtk::manage(new Gtk::Label(M("TP_PREPROCWB_MODE") + ": ")), Gtk::PACK_SHRINK, 0);
mode->append(M("TP_PREPROCWB_MODE_CAMERA"));
diff --git a/rtgui/previewmodepanel.cc b/rtgui/previewmodepanel.cc
index 37b3f6468..586923173 100644
--- a/rtgui/previewmodepanel.cc
+++ b/rtgui/previewmodepanel.cc
@@ -105,7 +105,7 @@ PreviewModePanel::PreviewModePanel (ImageArea* ia) : imageArea(ia)
pack_start (*backColor3, Gtk::PACK_SHRINK, 0);
pack_start (*backColor2, Gtk::PACK_SHRINK, 0);
- pack_start (*Gtk::manage (new Gtk::VSeparator ()), Gtk::PACK_SHRINK, 2);
+ pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK, 2);
pack_start (*previewR, Gtk::PACK_SHRINK, 0);
pack_start (*previewG, Gtk::PACK_SHRINK, 0);
diff --git a/rtgui/previewmodepanel.h b/rtgui/previewmodepanel.h
index 4121dfb92..d475fd4a4 100644
--- a/rtgui/previewmodepanel.h
+++ b/rtgui/previewmodepanel.h
@@ -22,7 +22,7 @@
class ImageArea;
class PreviewModePanel :
- public Gtk::HBox
+ public Gtk::Box
{
protected:
diff --git a/rtgui/prsharpening.cc b/rtgui/prsharpening.cc
index d065dbc07..c79fff1a1 100644
--- a/rtgui/prsharpening.cc
+++ b/rtgui/prsharpening.cc
@@ -35,7 +35,7 @@ PrSharpening::PrSharpening () : FoldableToolPanel(this, "prsharpening", M("TP_PR
//setEnabledTooltipMarkup(M("TP_PRSHARPENING_TOOLTIP"));
- Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb = Gtk::manage (new Gtk::Box ());
hb->show ();
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 15));
contrast->setAdjusterListener (this);
@@ -52,7 +52,7 @@ PrSharpening::PrSharpening () : FoldableToolPanel(this, "prsharpening", M("TP_PR
hb->pack_start(*method);
pack_start (*hb);
- rld = new Gtk::VBox ();
+ rld = new Gtk::Box(Gtk::ORIENTATION_VERTICAL);
dradius = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDRADIUS"), 0.4, 2.5, 0.01, 0.45));
damount = Gtk::manage (new Adjuster (M("TP_SHARPENING_RLD_AMOUNT"), 0.0, 100, 1, 100));
ddamping = Gtk::manage (new Adjuster (M("TP_SHARPENING_RLD_DAMPING"), 0, 100, 1, 0));
@@ -67,10 +67,10 @@ PrSharpening::PrSharpening () : FoldableToolPanel(this, "prsharpening", M("TP_PR
diter->show ();
rld->show ();
- usm = new Gtk::VBox ();
+ usm = new Gtk::Box(Gtk::ORIENTATION_VERTICAL);
usm->show ();
- Gtk::HSeparator *hsep6a = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator* hsep6a = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
amount = Gtk::manage (new Adjuster (M("TP_SHARPENING_AMOUNT"), 1, 1000, 1, 200));
radius = Gtk::manage (new Adjuster (M("TP_SHARPENING_RADIUS"), 0.3, 3, 0.01, 0.5));
threshold = Gtk::manage (new ThresholdAdjuster (M("TP_SHARPENING_THRESHOLD"), 0., 2000., 20., 80., 2000., 1200., 0, false));
@@ -88,10 +88,10 @@ PrSharpening::PrSharpening () : FoldableToolPanel(this, "prsharpening", M("TP_PR
amount->show ();
threshold->show ();
- Gtk::HSeparator *hsep6 = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator* hsep6 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
edgesonly = Gtk::manage (new Gtk::CheckButton (M("TP_SHARPENING_ONLYEDGES")));
edgesonly->set_active (false);
- edgebox = new Gtk::VBox ();
+ edgebox = new Gtk::Box(Gtk::ORIENTATION_VERTICAL);
eradius = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDRADIUS"), 0.5, 2.5, 0.1, 1.9));
etolerance = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDTOLERANCE"), 10, 10000, 100, 1800));
usm->pack_start(*hsep6, Gtk::PACK_SHRINK, 2);
@@ -99,7 +99,7 @@ PrSharpening::PrSharpening () : FoldableToolPanel(this, "prsharpening", M("TP_PR
edgebox->pack_start(*eradius);
edgebox->pack_start(*etolerance);
edgebox->show ();
- edgebin = Gtk::manage (new Gtk::VBox ());
+ edgebin = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
usm->pack_start (*edgebin);
edgebin->show ();
hsep6->show();
@@ -107,16 +107,16 @@ PrSharpening::PrSharpening () : FoldableToolPanel(this, "prsharpening", M("TP_PR
eradius->show();
etolerance->show();
- Gtk::HSeparator *hsep6b = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator* hsep6b = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
halocontrol = Gtk::manage (new Gtk::CheckButton (M("TP_SHARPENING_HALOCONTROL")));
halocontrol->set_active (false);
- hcbox = new Gtk::VBox ();
+ hcbox = new Gtk::Box(Gtk::ORIENTATION_VERTICAL);
hcamount = Gtk::manage (new Adjuster (M("TP_SHARPENING_HCAMOUNT"), 1, 100, 1, 75));
usm->pack_start(*hsep6b, Gtk::PACK_SHRINK, 2);
usm->pack_start(*halocontrol);
hcbox->pack_start(*hcamount);
hcbox->show ();
- hcbin = Gtk::manage (new Gtk::VBox ());
+ hcbin = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
usm->pack_start (*hcbin);
hcbin->show ();
hsep6b->show ();
diff --git a/rtgui/prsharpening.h b/rtgui/prsharpening.h
index 9738a5cd4..4128bc4c5 100644
--- a/rtgui/prsharpening.h
+++ b/rtgui/prsharpening.h
@@ -38,18 +38,18 @@ protected:
Adjuster* damount;
Adjuster* ddamping;
Adjuster* diter;
- Gtk::VBox* usm;
- Gtk::VBox* rld;
+ Gtk::Box* usm;
+ Gtk::Box* rld;
Adjuster* radius;
Adjuster* amount;
Adjuster* eradius;
Adjuster* etolerance;
Adjuster* hcamount;
- Gtk::VBox* edgebin;
- Gtk::VBox* hcbin;
- Gtk::VBox* edgebox;
- Gtk::VBox* hcbox;
+ Gtk::Box* edgebin;
+ Gtk::Box* hcbin;
+ Gtk::Box* edgebox;
+ Gtk::Box* hcbox;
ThresholdAdjuster* threshold;
Gtk::CheckButton* edgesonly;
bool lastEdgesOnly;
diff --git a/rtgui/recentbrowser.cc b/rtgui/recentbrowser.cc
index 90fe69216..9d3cc1f12 100644
--- a/rtgui/recentbrowser.cc
+++ b/rtgui/recentbrowser.cc
@@ -24,7 +24,8 @@ using namespace rtengine;
RecentBrowser::RecentBrowser ()
{
-
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
+
recentDirs = Gtk::manage (new MyComboBoxText ());
Gtk::Frame* frame = Gtk::manage (new Gtk::Frame (M("MAIN_FRAME_RECENT")));
diff --git a/rtgui/recentbrowser.h b/rtgui/recentbrowser.h
index bc8374087..68b3359b2 100644
--- a/rtgui/recentbrowser.h
+++ b/rtgui/recentbrowser.h
@@ -23,7 +23,7 @@
#include "guiutils.h"
class RecentBrowser :
- public Gtk::VBox
+ public Gtk::Box
{
public:
typedef sigc::slot DirSelectionSlot;
diff --git a/rtgui/renamedlg.cc b/rtgui/renamedlg.cc
index 8908d3419..f76626798 100644
--- a/rtgui/renamedlg.cc
+++ b/rtgui/renamedlg.cc
@@ -25,21 +25,26 @@ RenameDialog::RenameDialog (Gtk::Window* parent)
: Gtk::Dialog (M("FILEBROWSER_RENAMEDLGLABEL"), *parent, true), p(parent), imageData(nullptr)
{
- Gtk::Table* names = Gtk::manage (new Gtk::Table (2, 2));
+ Gtk::Grid* names = Gtk::manage (new Gtk::Grid());
Gtk::Label* onlab = Gtk::manage (new Gtk::Label (M("FILEBROWSER_CURRENT_NAME")));
+ onlab->set_halign(Gtk::ALIGN_START);
Gtk::Label* nnlab = Gtk::manage (new Gtk::Label (M("FILEBROWSER_NEW_NAME")));
- oldName = Gtk::manage (new Gtk::Label ("alma"));
- newName = Gtk::manage (new Gtk::Entry ());
-
- names->attach (*onlab, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
- names->attach (*oldName, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
- names->attach (*nnlab, 0, 1, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
- names->attach (*newName, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+ nnlab->set_halign(Gtk::ALIGN_START);
+ oldName = Gtk::manage (new Gtk::Label("alma"));
+ oldName->set_halign(Gtk::ALIGN_START);
+ newName = Gtk::manage (new Gtk::Entry());
+ newName->set_hexpand();
+ newName->set_halign(Gtk::ALIGN_FILL);
+
+ names->attach(*onlab, 0, 0);
+ names->attach(*oldName, 1, 0);
+ names->attach(*nnlab, 0, 1);
+ names->attach(*newName, 1, 1);
get_content_area()->pack_start (*names, Gtk::PACK_SHRINK, 4);
// Issue 316
-// Gtk::HBox* tbox = Gtk::manage (new Gtk::HBox());
+// Gtk::Box* tbox = Gtk::manage (new Gtk::Box());
// useTmpl = Gtk::manage (new Gtk::CheckButton (M("FILEBROWSER_USETEMPLATE")));
// templates = Gtk::manage (new MyComboBox ());
// templateModel = Gtk::ListStore::create (templateColumns);
@@ -51,8 +56,8 @@ RenameDialog::RenameDialog (Gtk::Window* parent)
// get_content_area()->pack_start (*tbox, Gtk::PACK_SHRINK, 4);
- add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
- add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+ add_button ("_OK", Gtk::RESPONSE_OK);
+ add_button ("_Cancel", Gtk::RESPONSE_CANCEL);
// Issue 316
// all = add_button ("All", RESPONSE_ALL);
diff --git a/rtgui/resize.cc b/rtgui/resize.cc
index a65875426..ff3c622aa 100644
--- a/rtgui/resize.cc
+++ b/rtgui/resize.cc
@@ -37,26 +37,33 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
cropw = 0;
croph = 0;
- Gtk::Table* combos = Gtk::manage (new Gtk::Table (2, 2));
+ Gtk::Grid* combos = Gtk::manage (new Gtk::Grid());
+ combos->set_row_spacing(4);
appliesTo = Gtk::manage (new MyComboBoxText ());
appliesTo->append (M("TP_RESIZE_CROPPEDAREA"));
appliesTo->append (M("TP_RESIZE_FULLIMAGE"));
appliesTo->set_active (0);
+ appliesTo->set_hexpand();
+ appliesTo->set_halign(Gtk::ALIGN_FILL);
Gtk::Label *label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_APPLIESTO"), Gtk::ALIGN_START));
- combos->attach (*label, 0, 1, 0, 1, Gtk::SHRINK | Gtk::FILL, Gtk::SHRINK, 2, 2);
- combos->attach (*appliesTo, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+
+ combos->attach(*label, 0, 0);
+ combos->attach(*appliesTo, 1, 0);
// See Resize::methodChanged() when adding a new method.
method = Gtk::manage (new MyComboBoxText ());
method->append (M("TP_RESIZE_LANCZOS"));
method->append (M("TP_RESIZE_NEAREST"));
method->set_active (0);
+ method->set_hexpand();
+ method->set_halign(Gtk::ALIGN_FILL);
label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_METHOD"), Gtk::ALIGN_START));
- combos->attach (*label, 0, 1, 1, 2, Gtk::SHRINK | Gtk::FILL, Gtk::SHRINK, 2, 2);
- combos->attach (*method, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+
+ combos->attach(*label, 0, 1);
+ combos->attach(*method, 1, 1);
spec = Gtk::manage (new MyComboBoxText ());
spec->append (M("TP_RESIZE_SCALE"));
@@ -64,10 +71,13 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
spec->append (M("TP_RESIZE_HEIGHT"));
spec->append (M("TP_RESIZE_FITBOX"));
spec->set_active (0);
+ spec->set_hexpand();
+ spec->set_halign(Gtk::ALIGN_FILL);
label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_SPECIFY"), Gtk::ALIGN_START));
- combos->attach (*label, 0, 1, 2, 3, Gtk::SHRINK | Gtk::FILL, Gtk::SHRINK, 2, 2);
- combos->attach (*spec, 1, 2, 2, 3, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
+
+ combos->attach(*label, 0, 2);
+ combos->attach(*spec, 1, 2);
pack_start (*combos, Gtk::PACK_SHRINK, 4);
@@ -76,11 +86,11 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
pack_start (*scale, Gtk::PACK_SHRINK, 4);
- sizeBox = Gtk::manage (new Gtk::VBox ());
+ sizeBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
- Gtk::HBox* sbox = Gtk::manage (new Gtk::HBox ());
- Gtk::HBox* wbox = Gtk::manage (new Gtk::HBox ());
- Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* sbox = Gtk::manage (new Gtk::Box ());
+ Gtk::Box* wbox = Gtk::manage (new Gtk::Box ());
+ Gtk::Box* hbox = Gtk::manage (new Gtk::Box ());
w = Gtk::manage (new MySpinButton ());
h = Gtk::manage (new MySpinButton ());
wbox->set_spacing(3);
diff --git a/rtgui/resize.h b/rtgui/resize.h
index 41b54509e..ec4907fd1 100644
--- a/rtgui/resize.h
+++ b/rtgui/resize.h
@@ -70,7 +70,7 @@ private:
rtengine::ProcEvent EvResizeAllowUpscaling;
Adjuster* scale;
- Gtk::VBox* sizeBox;
+ Gtk::Box* sizeBox;
MyComboBoxText* appliesTo;
MyComboBoxText* method;
MyComboBoxText* spec;
diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc
index 0a40ced9d..a9d7cc376 100644
--- a/rtgui/retinex.cc
+++ b/rtgui/retinex.cc
@@ -41,7 +41,7 @@ Retinex::Retinex () : FoldableToolPanel (this, "retinex", M ("TP_RETINEX_LABEL")
complexmethod->append(M("TP_WAVELET_COMPEXPERT"));
complexmethodconn = complexmethod->signal_changed().connect(sigc::mem_fun(*this, &Retinex::complexmethodChanged));
complexmethod->set_tooltip_text(M("TP_WAVELET_COMPLEX_TOOLTIP"));
- Gtk::HBox* const complexHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const complexHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const complexLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_COMPLEXLAB") + ":"));
complexHBox->pack_start(*complexLabel, Gtk::PACK_SHRINK, 4);
complexHBox->pack_start(*complexmethod);
diff --git a/rtgui/rgbcurves.cc b/rtgui/rgbcurves.cc
index d501cf449..5e7616e70 100644
--- a/rtgui/rgbcurves.cc
+++ b/rtgui/rgbcurves.cc
@@ -36,7 +36,7 @@ RGBCurves::RGBCurves () : FoldableToolPanel(this, "rgbcurves", M("TP_RGBCURVES_L
lumamode->show ();
pack_start (*lumamode);
- Gtk::HSeparator *hsep1 = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator *hsep1 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
hsep1->show ();
pack_start (*hsep1);
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index e1d8c1f84..c0042f949 100644
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -354,7 +354,7 @@ RTWindow::RTWindow ()
mainNB->set_current_page (mainNB->page_num (*fpanel));
- //Gtk::VBox* mainBox = Gtk::manage (new Gtk::VBox ());
+ //Gtk::Box* mainBox = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
//mainBox->pack_start (*mainNB);
// filling bottom box
diff --git a/rtgui/saveasdlg.cc b/rtgui/saveasdlg.cc
index ebf2f5b4a..a4062d502 100644
--- a/rtgui/saveasdlg.cc
+++ b/rtgui/saveasdlg.cc
@@ -127,22 +127,22 @@ SaveAsDialog::SaveAsDialog (const Glib::ustring &initialDir, Gtk::Window* parent
// pack everything
// ~~~~~~~~~~~~~~~
- Gtk::VBox* vbox_bottomRight = Gtk::manage(new Gtk::VBox ());
+ Gtk::Box* vbox_bottomRight = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
// There is no queue in simple mode, so no need to choose
if (!simpleEditor) {
vbox_bottomRight->pack_start (*saveMethod[0], Gtk::PACK_SHRINK, 2);
vbox_bottomRight->pack_start (*saveMethod[1], Gtk::PACK_SHRINK, 2);
vbox_bottomRight->pack_start (*saveMethod[2], Gtk::PACK_SHRINK, 2);
- vbox_bottomRight->pack_start (*Gtk::manage(new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 5);
+ vbox_bottomRight->pack_start (*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 5);
}
vbox_bottomRight->pack_start (*forceFormatOpts, Gtk::PACK_SHRINK, 4);
vbox_bottomRight->pack_start (*autoSuffix, Gtk::PACK_SHRINK, 4);
- Gtk::HBox* hbox_bottom = Gtk::manage( new Gtk::HBox() );
+ Gtk::Box* hbox_bottom = Gtk::manage( new Gtk::Box() );
hbox_bottom->pack_start (*formatOpts, Gtk::PACK_EXPAND_WIDGET, 2);
- hbox_bottom->pack_start (*Gtk::manage(new Gtk::VSeparator ()), Gtk::PACK_SHRINK, 2);
+ hbox_bottom->pack_start (*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_SHRINK, 2);
hbox_bottom->pack_start (*vbox_bottomRight, Gtk::PACK_EXPAND_WIDGET, 2);
box->pack_start (*fchooser);
diff --git a/rtgui/shadowshighlights.cc b/rtgui/shadowshighlights.cc
index 3e3c277c7..f6ab4811a 100644
--- a/rtgui/shadowshighlights.cc
+++ b/rtgui/shadowshighlights.cc
@@ -30,7 +30,7 @@ ShadowsHighlights::ShadowsHighlights () : FoldableToolPanel(this, "shadowshighli
auto m = ProcEventMapper::getInstance();
EvSHColorspace = m->newEvent(RGBCURVE, "HISTORY_MSG_SH_COLORSPACE");
- Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb = Gtk::manage (new Gtk::Box ());
hb->pack_start(*Gtk::manage(new Gtk::Label(M("TP_DIRPYRDENOISE_MAIN_COLORSPACE") + ": ")), Gtk::PACK_SHRINK);
colorspace = Gtk::manage(new MyComboBoxText());
colorspace->append(M("TP_DIRPYRDENOISE_MAIN_COLORSPACE_RGB"));
@@ -38,21 +38,21 @@ ShadowsHighlights::ShadowsHighlights () : FoldableToolPanel(this, "shadowshighli
hb->pack_start(*colorspace);
pack_start(*hb);
- pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
highlights = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_HIGHLIGHTS"), 0, 100, 1, 0));
h_tonalwidth = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_HLTONALW"), 10, 100, 1, 70));
pack_start (*highlights);
pack_start (*h_tonalwidth);
- pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
shadows = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_SHADOWS"), 0, 100, 1, 0));
s_tonalwidth = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_SHTONALW"), 10, 100, 1, 30));
pack_start (*shadows);
pack_start (*s_tonalwidth);
- pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
radius = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_RADIUS"), 1, 100, 1, 40));
pack_start (*radius);
diff --git a/rtgui/sharpening.cc b/rtgui/sharpening.cc
index e16511279..687358349 100644
--- a/rtgui/sharpening.cc
+++ b/rtgui/sharpening.cc
@@ -29,7 +29,7 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI
EvSharpenContrast = m->newEvent(SHARPENING, "HISTORY_MSG_SHARPENING_CONTRAST");
EvSharpenBlur = m->newEvent(SHARPENING, "HISTORY_MSG_SHARPENING_BLUR");
- Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb = Gtk::manage (new Gtk::Box ());
hb->show ();
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 20));
contrast->setAdjusterListener (this);
@@ -50,7 +50,7 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI
hb->pack_start(*method);
pack_start (*hb);
- rld = new Gtk::VBox ();
+ rld = new Gtk::Box(Gtk::ORIENTATION_VERTICAL);
dradius = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDRADIUS"), 0.4, 2.5, 0.01, 0.75));
damount = Gtk::manage (new Adjuster (M("TP_SHARPENING_RLD_AMOUNT"), 0.0, 100, 1, 100));
ddamping = Gtk::manage (new Adjuster (M("TP_SHARPENING_RLD_DAMPING"), 0, 100, 1, 0));
@@ -65,11 +65,11 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI
diter->show ();
rld->show ();
- usm = new Gtk::VBox ();
+ usm = new Gtk::Box(Gtk::ORIENTATION_VERTICAL);
usm->show ();
- Gtk::HSeparator *hsep6a = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator* hsep6a = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
amount = Gtk::manage (new Adjuster (M("TP_SHARPENING_AMOUNT"), 1, 1000, 1, 200));
radius = Gtk::manage (new Adjuster (M("TP_SHARPENING_RADIUS"), 0.3, 3, 0.01, 0.5));
threshold = Gtk::manage (new ThresholdAdjuster (M("TP_SHARPENING_THRESHOLD"), 0., 2000., 20., 80., 2000., 1200., 0, false));
@@ -86,10 +86,10 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI
threshold->show ();
amount->show ();
- Gtk::HSeparator *hsep6 = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator* hsep6 = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
edgesonly = Gtk::manage (new Gtk::CheckButton (M("TP_SHARPENING_ONLYEDGES")));
edgesonly->set_active (false);
- edgebox = new Gtk::VBox ();
+ edgebox = new Gtk::Box(Gtk::ORIENTATION_VERTICAL);
eradius = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDRADIUS"), 0.5, 2.5, 0.1, 1.9));
etolerance = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDTOLERANCE"), 10, 10000, 100, 1800));
usm->pack_start(*hsep6, Gtk::PACK_SHRINK, 2);
@@ -97,7 +97,7 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI
edgebox->pack_start(*eradius);
edgebox->pack_start(*etolerance);
edgebox->show ();
- edgebin = Gtk::manage (new Gtk::VBox ());
+ edgebin = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
usm->pack_start (*edgebin);
edgebin->show ();
hsep6->show();
@@ -105,16 +105,16 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI
eradius->show();
etolerance->show();
- Gtk::HSeparator *hsep6b = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator* hsep6b = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
halocontrol = Gtk::manage (new Gtk::CheckButton (M("TP_SHARPENING_HALOCONTROL")));
halocontrol->set_active (false);
- hcbox = new Gtk::VBox ();
+ hcbox = new Gtk::Box(Gtk::ORIENTATION_VERTICAL);
hcamount = Gtk::manage (new Adjuster (M("TP_SHARPENING_HCAMOUNT"), 1, 100, 1, 75));
usm->pack_start(*hsep6b, Gtk::PACK_SHRINK, 2);
usm->pack_start(*halocontrol);
hcbox->pack_start(*hcamount);
hcbox->show ();
- hcbin = Gtk::manage (new Gtk::VBox ());
+ hcbin = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
usm->pack_start (*hcbin);
hcbin->show ();
hsep6b->show ();
diff --git a/rtgui/sharpening.h b/rtgui/sharpening.h
index bd5e6f1b7..aa65b3662 100644
--- a/rtgui/sharpening.h
+++ b/rtgui/sharpening.h
@@ -39,18 +39,18 @@ protected:
Adjuster* damount;
Adjuster* ddamping;
Adjuster* diter;
- Gtk::VBox* usm;
- Gtk::VBox* rld;
+ Gtk::Box* usm;
+ Gtk::Box* rld;
Adjuster* radius;
Adjuster* amount;
Adjuster* eradius;
Adjuster* etolerance;
Adjuster* hcamount;
- Gtk::VBox* edgebin;
- Gtk::VBox* hcbin;
- Gtk::VBox* edgebox;
- Gtk::VBox* hcbox;
+ Gtk::Box* edgebin;
+ Gtk::Box* hcbin;
+ Gtk::Box* edgebox;
+ Gtk::Box* hcbox;
ThresholdAdjuster* threshold;
Gtk::CheckButton* edgesonly;
bool lastEdgesOnly;
diff --git a/rtgui/shcselector.cc b/rtgui/shcselector.cc
index e8aca4071..ad2c28aaa 100644
--- a/rtgui/shcselector.cc
+++ b/rtgui/shcselector.cc
@@ -321,7 +321,7 @@ bool SHCSelector::on_motion_notify_event (GdkEventMotion* event)
return true;
}
-void SHCSelector::styleChanged (const Glib::RefPtr& style)
+void SHCSelector::styleChanged (const Glib::RefPtr& style)
{
setDirty(true);
diff --git a/rtgui/shcselector.h b/rtgui/shcselector.h
index e03ca8e06..2422fdf56 100644
--- a/rtgui/shcselector.h
+++ b/rtgui/shcselector.h
@@ -78,7 +78,7 @@ public:
void setDefaults (double spos, double cpos, double hpos);
void setPositions (double spos, double cpos, double hpos);
void getPositions (double& spos, double& cpos, double& hpos);
- void styleChanged (const Glib::RefPtr& style);
+ void styleChanged (const Glib::RefPtr& style);
bool reset ();
void refresh();
};
diff --git a/rtgui/thresholdadjuster.cc b/rtgui/thresholdadjuster.cc
index c6ba96111..1f8b1c967 100644
--- a/rtgui/thresholdadjuster.cc
+++ b/rtgui/thresholdadjuster.cc
@@ -34,6 +34,7 @@ ThresholdAdjuster::ThresholdAdjuster (Glib::ustring label,
: tSelector(minValueBottom, maxValueBottom, defBottom, labelBottom, precisionBottom, minValueTop, maxValueTop, defTop, labelTop, precisionTop, curveProvider)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
initialDefaultVal[ThresholdSelector::TS_BOTTOMLEFT] = defBottom;
initialDefaultVal[ThresholdSelector::TS_TOPLEFT] = defTop;
initialDefaultVal[ThresholdSelector::TS_BOTTOMRIGHT] = 0.; // unused
@@ -46,6 +47,7 @@ ThresholdAdjuster::ThresholdAdjuster (Glib::ustring label, double minValue, doub
double defTop, unsigned int precision, bool startAtOne, bool editedCheckBox)
: tSelector(minValue, maxValue, defBottom, defTop, precision, startAtOne)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
initialDefaultVal[ThresholdSelector::TS_BOTTOMLEFT] = defBottom;
initialDefaultVal[ThresholdSelector::TS_TOPLEFT] = defTop;
initialDefaultVal[ThresholdSelector::TS_BOTTOMRIGHT] = maxValue;
@@ -60,6 +62,7 @@ ThresholdAdjuster::ThresholdAdjuster (Glib::ustring label, double minValue, doub
: tSelector(minValue, maxValue, defBottomLeft, defTopLeft,
defBottomRight, defTopRight, precision, startAtOne)
{
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
initialDefaultVal[ThresholdSelector::TS_BOTTOMLEFT] = defBottomLeft;
initialDefaultVal[ThresholdSelector::TS_TOPLEFT] = defTopLeft;
initialDefaultVal[ThresholdSelector::TS_BOTTOMRIGHT] = defBottomRight;
@@ -81,7 +84,7 @@ void ThresholdAdjuster::initObject (Glib::ustring label, bool editedcb)
set_name("ThresholdAdjuster");
- hbox = Gtk::manage (new Gtk::HBox ());
+ hbox = Gtk::manage (new Gtk::Box ());
this->label = Gtk::manage (new Gtk::Label (label, Gtk::ALIGN_START));
diff --git a/rtgui/thresholdadjuster.h b/rtgui/thresholdadjuster.h
index b28f68dee..8f67d5ef5 100644
--- a/rtgui/thresholdadjuster.h
+++ b/rtgui/thresholdadjuster.h
@@ -46,11 +46,11 @@ public:
};
-class ThresholdAdjuster : public Gtk::VBox
+class ThresholdAdjuster : public Gtk::Box
{
protected:
- Gtk::HBox* hbox;
+ Gtk::Box* hbox;
Gtk::Label* label;
ThresholdSelector tSelector;
//MySpinButton* spin;
diff --git a/rtgui/thresholdselector.cc b/rtgui/thresholdselector.cc
index 35d08279c..61043525c 100644
--- a/rtgui/thresholdselector.cc
+++ b/rtgui/thresholdselector.cc
@@ -714,7 +714,7 @@ void ThresholdSelector::findSecondaryMovedCursor(guint state)
}
}
-void ThresholdSelector::styleChanged (const Glib::RefPtr& style)
+void ThresholdSelector::styleChanged (const Glib::RefPtr& style)
{
queue_draw ();
diff --git a/rtgui/thresholdselector.h b/rtgui/thresholdselector.h
index 4ae86560e..bf1d7c952 100644
--- a/rtgui/thresholdselector.h
+++ b/rtgui/thresholdselector.h
@@ -215,7 +215,7 @@ public:
{
return doubleThresh;
}
- void styleChanged (const Glib::RefPtr& style);
+ void styleChanged (const Glib::RefPtr& style);
unsigned int getPrecision ()
{
return precisionTop;
diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc
index c611b252d..06c662e51 100644
--- a/rtgui/thumbbrowserbase.cc
+++ b/rtgui/thumbbrowserbase.cc
@@ -34,6 +34,9 @@ ThumbBrowserBase::ThumbBrowserBase ()
{
inW = -1;
inH = -1;
+
+ hscroll.set_orientation(Gtk::ORIENTATION_HORIZONTAL);
+ vscroll.set_orientation(Gtk::ORIENTATION_VERTICAL);
setExpandAlignProperties(&internal, true, true, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
setExpandAlignProperties(&hscroll, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
diff --git a/rtgui/thumbbrowserbase.h b/rtgui/thumbbrowserbase.h
index 69017b183..2d41cdfab 100644
--- a/rtgui/thumbbrowserbase.h
+++ b/rtgui/thumbbrowserbase.h
@@ -116,8 +116,8 @@ protected:
virtual int getThumbnailHeight () = 0;
Internal internal;
- Gtk::HScrollbar hscroll;
- Gtk::VScrollbar vscroll;
+ Gtk::Scrollbar hscroll;
+ Gtk::Scrollbar vscroll;
int inW, inH;
diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc
index dc9b17fa9..5e6f1fe31 100644
--- a/rtgui/tonecurve.cc
+++ b/rtgui/tonecurve.cc
@@ -52,11 +52,11 @@ ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LA
//----------- OOG clamping ----------------------------------
clampOOG = Gtk::manage(new Gtk::CheckButton(M("TP_EXPOSURE_CLAMPOOG")));
pack_start(*clampOOG);
- pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
clampOOG->signal_toggled().connect(sigc::mem_fun(*this, &ToneCurve::clampOOGChanged));
//----------- Auto Levels ----------------------------------
- abox = Gtk::manage (new Gtk::HBox ());
+ abox = Gtk::manage (new Gtk::Box ());
abox->set_spacing (4);
autolevels = Gtk::manage (new Gtk::ToggleButton (M("TP_EXPOSURE_AUTOLEVELS")));
@@ -88,7 +88,7 @@ ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LA
pack_start (*abox);
//-------------- Highlight Reconstruction -----------------
- pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
hrenabled = Gtk::manage (new Gtk::CheckButton (M("TP_HLREC_LABEL")));
hrenabled->set_active (false);
@@ -102,7 +102,7 @@ ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LA
method->append (M("TP_HLREC_BLEND"));
method->set_active (0);
- hlrbox = Gtk::manage (new Gtk::HBox ());
+ hlrbox = Gtk::manage (new Gtk::Box ());
Gtk::Label* lab = Gtk::manage (new Gtk::Label (M("TP_HLREC_METHOD")));
hlrbox->pack_start (*lab, Gtk::PACK_SHRINK, 4);
hlrbox->pack_start (*method);
@@ -112,7 +112,7 @@ ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LA
methconn = method->signal_changed().connect ( sigc::mem_fun(*this, &ToneCurve::methodChanged) );
//----------- Exposure Compensation ---------------------
- pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
expcomp = Gtk::manage (new Adjuster (M("TP_EXPOSURE_EXPCOMP"), -5, 12, 0.05, 0));
expcomp->setLogScale(2, 0, true);
@@ -131,7 +131,7 @@ ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LA
shcompr = Gtk::manage (new Adjuster (M("TP_EXPOSURE_COMPRSHADOWS"), 0, 100, 1, 50));
pack_start (*shcompr);
- pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
//---------Brightness / Contrast -------------------------
brightness = Gtk::manage (new Adjuster (M("TP_EXPOSURE_BRIGHTNESS"), -100, 100, 1, 0));
@@ -146,7 +146,7 @@ ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LA
saturation->setLogScale(2, 0, true);
//----------- Curve 1 ------------------------------
- pack_start (*Gtk::manage (new Gtk::HSeparator()));
+ pack_start (*Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
histmatching = Gtk::manage(new Gtk::ToggleButton(M("TP_EXPOSURE_HISTMATCHING")));
histmatching->set_tooltip_markup(M("TP_EXPOSURE_HISTMATCHING_TOOLTIP"));
diff --git a/rtgui/tonecurve.h b/rtgui/tonecurve.h
index e0482c5da..9439d422e 100644
--- a/rtgui/tonecurve.h
+++ b/rtgui/tonecurve.h
@@ -48,8 +48,8 @@ protected:
sigc::connection enaconn;
bool lasthrEnabled;
- Gtk::HBox* abox;
- Gtk::HBox* hlrbox;
+ Gtk::Box* abox;
+ Gtk::Box* hlrbox;
Gtk::ToggleButton* autolevels;
Gtk::Label* lclip;
diff --git a/rtgui/toolbar.h b/rtgui/toolbar.h
index 85a0c3345..41ae2c680 100644
--- a/rtgui/toolbar.h
+++ b/rtgui/toolbar.h
@@ -39,7 +39,7 @@ public:
virtual void editModeSwitchedOff() = 0;
};
-class ToolBar final : public Gtk::HBox
+class ToolBar final : public Gtk::Box
{
private:
std::unique_ptr handimg;
diff --git a/rtgui/toolpanel.cc b/rtgui/toolpanel.cc
index 710a19c87..cfc53639b 100644
--- a/rtgui/toolpanel.cc
+++ b/rtgui/toolpanel.cc
@@ -27,6 +27,7 @@ using namespace rtengine::procparams;
ToolVBox::ToolVBox() {
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
//GTK318
#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
set_spacing(1); // Vertical space between tools
@@ -36,6 +37,7 @@ ToolVBox::ToolVBox() {
}
ToolParamBlock::ToolParamBlock() {
+ set_orientation(Gtk::ORIENTATION_VERTICAL);
//GTK318
#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
set_spacing(2); // Vertical space between parameters in a single tool
@@ -52,7 +54,7 @@ FoldableToolPanel::FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName,
// exp->set_use_markup (true);
if (need11) {
- Gtk::HBox *titleHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box *titleHBox = Gtk::manage(new Gtk::Box());
Gtk::Label *label = Gtk::manage(new Gtk::Label());
label->set_markup(escapeHtmlChars(UILabel));
diff --git a/rtgui/toolpanel.h b/rtgui/toolpanel.h
index 12b3eebcc..f07f5f0a1 100644
--- a/rtgui/toolpanel.h
+++ b/rtgui/toolpanel.h
@@ -49,7 +49,7 @@ public:
/// @brief This class control the space around the group of tools inside a tab, as well as the space separating each tool. */
class ToolVBox :
- public Gtk::VBox
+ public Gtk::Box
{
public:
ToolVBox();
@@ -57,7 +57,7 @@ public:
/// @brief This class control the space around a tool's block of parameter. */
class ToolParamBlock :
- public Gtk::VBox
+ public Gtk::Box
{
public:
ToolParamBlock();
diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index 9ccc9f8ba..56d83e107 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -191,7 +191,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favorit
// load panel endings
for (int i = 0; i < 8; i++) {
- vbPanelEnd[i] = Gtk::manage (new Gtk::VBox ());
+ vbPanelEnd[i] = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
imgPanelEnd[i] = Gtk::manage (new RTImage ("ornament1.png"));
imgPanelEnd[i]->show();
vbPanelEnd[i]->pack_start(*imgPanelEnd[i], Gtk::PACK_SHRINK);
diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h
index b39906459..675b77de7 100644
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -193,7 +193,7 @@ protected:
TextOrIcon* toiL;
Gtk::Image* imgPanelEnd[8];
- Gtk::VBox* vbPanelEnd[8];
+ Gtk::Box* vbPanelEnd[8];
Gtk::ScrolledWindow* favoritePanelSW;
Gtk::ScrolledWindow* exposurePanelSW;
diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc
index 2057847df..448141497 100644
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -69,8 +69,8 @@ Wavelet::Wavelet() :
curveEditorbl(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_BLCURVE"))),
curveEditorRES(new CurveEditorGroup(options.lastWaveletCurvesDir)),
curveEditorGAM(new CurveEditorGroup(options.lastWaveletCurvesDir)),
- separatorNeutral(Gtk::manage(new Gtk::HSeparator())),
- separatoredge(Gtk::manage(new Gtk::HSeparator())),
+ separatorNeutral(Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL))),
+ separatoredge(Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL))),
opaCurveEditorG(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_COLORT"))),
opacityCurveEditorG(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_OPACITY"))),
CurveEditorwavnoise(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_DENOISE"))),
@@ -209,14 +209,14 @@ Wavelet::Wavelet() :
exptoning(Gtk::manage(new MyExpander(true, M("TP_WAVELET_TON")))),
expclari(Gtk::manage(new MyExpander(true, M("TP_WAVELET_CLARI")))),
expbl(Gtk::manage(new MyExpander(true, M("TP_WAVELET_BL")))),
- neutrHBox(Gtk::manage(new Gtk::HBox())),
- usharpHBox(Gtk::manage(new Gtk::HBox())),
- ctboxch(Gtk::manage(new Gtk::HBox())),
- quaHBox(Gtk::manage(new Gtk::HBox())),
- sliHBox(Gtk::manage(new Gtk::HBox())),
- denHBox(Gtk::manage(new Gtk::HBox())),
- mixHBox(Gtk::manage(new Gtk::HBox())),
- ctboxBA(Gtk::manage(new Gtk::VBox()))
+ neutrHBox(Gtk::manage(new Gtk::Box())),
+ usharpHBox(Gtk::manage(new Gtk::Box())),
+ ctboxch(Gtk::manage(new Gtk::Box())),
+ quaHBox(Gtk::manage(new Gtk::Box())),
+ sliHBox(Gtk::manage(new Gtk::Box())),
+ denHBox(Gtk::manage(new Gtk::Box())),
+ mixHBox(Gtk::manage(new Gtk::Box())),
+ ctboxBA(Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL)))
{
CurveListener::setMulti(true);
@@ -319,7 +319,7 @@ Wavelet::Wavelet() :
complexmethod->append(M("TP_WAVELET_COMPEXPERT"));
complexmethodconn = complexmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::complexmethodChanged));
complexmethod->set_tooltip_text(M("TP_WAVELET_COMPLEX_TOOLTIP"));
- Gtk::HBox* const complexHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const complexHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const complexLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_COMPLEXLAB") + ":"));
complexHBox->pack_start(*complexLabel, Gtk::PACK_SHRINK, 4);
complexHBox->pack_start(*complexmethod);
@@ -330,7 +330,7 @@ Wavelet::Wavelet() :
// Tilesmethod->append(M("TP_WAVELET_TILESLIT"));
Tilesmethodconn = Tilesmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::TilesmethodChanged));
Tilesmethod->set_tooltip_text(M("TP_WAVELET_TILES_TOOLTIP"));
- Gtk::HBox* const tilesizeHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const tilesizeHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const tilesizeLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_TILESIZE") + ":"));
tilesizeHBox->pack_start(*tilesizeLabel, Gtk::PACK_SHRINK, 4);
tilesizeHBox->pack_start(*Tilesmethod);
@@ -344,7 +344,7 @@ Wavelet::Wavelet() :
daubcoeffmethodconn = daubcoeffmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::daubcoeffmethodChanged));
daubcoeffmethod->set_tooltip_text(M("TP_WAVELET_DAUB_TOOLTIP"));
Gtk::Label* const daubcoeffLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_DAUB") + ":"));
- Gtk::HBox* const daubcoeffHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const daubcoeffHBox = Gtk::manage(new Gtk::Box());
daubcoeffHBox->pack_start(*daubcoeffLabel, Gtk::PACK_SHRINK, 4);
daubcoeffHBox->pack_start(*daubcoeffmethod);
@@ -352,7 +352,7 @@ Wavelet::Wavelet() :
Backmethod->append(M("TP_WAVELET_B1"));
Backmethod->append(M("TP_WAVELET_B2"));
Backmethodconn = Backmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::BackmethodChanged));
- Gtk::HBox* const backgroundHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const backgroundHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const backgroundLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_BACKGROUND") + ":"));
backgroundHBox->pack_start(*backgroundLabel, Gtk::PACK_SHRINK, 4);
backgroundHBox->pack_start(*Backmethod);
@@ -362,7 +362,7 @@ Wavelet::Wavelet() :
CLmethod->append(M("TP_WAVELET_LEVDIR_SUP"));
CLmethod->append(M("TP_WAVELET_LEVDIR_ALL"));
CLmethodconn = CLmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::CLmethodChanged));
- Gtk::HBox* const levdirMainHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const levdirMainHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const levdirMainLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_PROC") + ":"));
levdirMainHBox->pack_start(*levdirMainLabel, Gtk::PACK_SHRINK, 4);
levdirMainHBox->pack_start(*CLmethod); //same
@@ -387,7 +387,7 @@ Wavelet::Wavelet() :
Dirmethod->append(M("TP_WAVELET_DALL"));
Lmethodconn = Lmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::LmethodChanged));
Dirmethodconn = Dirmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::DirmethodChanged));
- Gtk::HBox* const levdirSubHBox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const levdirSubHBox = Gtk::manage(new Gtk::Box());
levdirSubHBox->pack_start(*Lmethod);
levdirSubHBox->pack_start(*Dirmethod, Gtk::PACK_EXPAND_WIDGET, 2); // same, but 2 not 4?
@@ -403,7 +403,9 @@ Wavelet::Wavelet() :
// Contrast
ToolParamBlock* const levBox = Gtk::manage(new ToolParamBlock());
- Gtk::HBox* const buttonBox = Gtk::manage(new Gtk::HBox(true, 10));
+ Gtk::Box* const buttonBox = Gtk::manage(new Gtk::Box());
+ buttonBox->set_spacing(10);
+ buttonBox->set_homogeneous(true);
levBox->pack_start(*buttonBox, Gtk::PACK_SHRINK, 2);
Gtk::Button* const contrastMinusButton = Gtk::manage(new Gtk::Button(M("TP_WAVELET_CONTRAST_MINUS")));
@@ -442,7 +444,7 @@ Wavelet::Wavelet() :
}
levBox->pack_start(*sup);
sup->setAdjusterListener(this);
- Gtk::HSeparator* const separatorcont = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separatorcont = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
levBox->pack_start(*separatorcont);
sigma->setAdjusterListener(this);
@@ -458,7 +460,7 @@ Wavelet::Wavelet() :
wavLabels->show();
levBox->pack_start(*wavLabels);
- Gtk::VBox* const contrastSHVBox = Gtk::manage(new Gtk::VBox);
+ Gtk::Box* const contrastSHVBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
contrastSHVBox->set_spacing(2);
HSmethod->append(M("TP_WAVELET_HS1"));
@@ -509,7 +511,7 @@ Wavelet::Wavelet() :
ToolParamBlock* const chBox = Gtk::manage(new ToolParamBlock());
Gtk::Label* const labmch = Gtk::manage(new Gtk::Label(M("TP_WAVELET_CHTYPE") + ":"));
-// Gtk::HBox* const ctboxch = Gtk::manage(new Gtk::HBox());
+// Gtk::Box* const ctboxch = Gtk::manage(new Gtk::Box());
ctboxch->pack_start(*labmch, Gtk::PACK_SHRINK, 1);
CHmethod->append(M("TP_WAVELET_CH1"));
@@ -519,7 +521,7 @@ Wavelet::Wavelet() :
ctboxch->pack_start(*CHmethod);
chBox->pack_start(*ctboxch);
- Gtk::HBox* const ctboxCH = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxCH = Gtk::manage(new Gtk::Box());
ctboxCH->pack_start(*labmC, Gtk::PACK_SHRINK, 1);
CHSLmethod->append(M("TP_WAVELET_CHSL"));
@@ -527,7 +529,7 @@ Wavelet::Wavelet() :
CHSLmethodconn = CHSLmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::CHSLmethodChanged));
ctboxCH->pack_start(*CHSLmethod);
- Gtk::HSeparator* const separatorChromaMethod = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separatorChromaMethod = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
chBox->pack_start(*separatorChromaMethod, Gtk::PACK_SHRINK, 2);
chroma->set_tooltip_text(M("TP_WAVELET_CHRO_TOOLTIP"));
@@ -549,7 +551,9 @@ Wavelet::Wavelet() :
chBox->pack_start(*chro);
chBox->pack_start(*sigmacol);
- Gtk::HBox* const buttonchBox = Gtk::manage(new Gtk::HBox(true, 10));
+ Gtk::Box* const buttonchBox = Gtk::manage(new Gtk::Box());
+ buttonchBox->set_spacing(10);
+ buttonchBox->set_homogeneous(true);
neutralchPressedConn = neutralchButton->signal_pressed().connect(sigc::mem_fun(*this, &Wavelet::neutralchPressed));
chBox->pack_start(*separatorNeutral, Gtk::PACK_SHRINK, 2);
buttonchBox->pack_start(*neutralchButton);
@@ -687,7 +691,7 @@ Wavelet::Wavelet() :
denmethod->append(M("TP_WAVELET_DEN12LOW"));
denmethodconn = denmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::denmethodChanged));
denmethod->set_tooltip_text(M("TP_WAVELET_DENEQUAL_TOOLTIP"));
-// Gtk::HBox* const denHBox = Gtk::manage(new Gtk::HBox());
+// Gtk::Box* const denHBox = Gtk::manage(new Gtk::Box());
Gtk::Label* const denLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_DENCONTRAST") + ":"));
denHBox->pack_start(*denLabel, Gtk::PACK_SHRINK, 4);
denHBox->pack_start(*denmethod);
@@ -817,7 +821,7 @@ Wavelet::Wavelet() :
edgBox->pack_start(*edgthresh);
Gtk::Label* const labmedgr = Gtk::manage(new Gtk::Label(M("TP_WAVELET_MEDGREINF") + ":"));
- Gtk::HBox* const edbox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const edbox = Gtk::manage(new Gtk::Box());
edbox->pack_start(*labmedgr, Gtk::PACK_SHRINK, 1);
Medgreinf->append(M("TP_WAVELET_RE1"));
@@ -828,11 +832,11 @@ Wavelet::Wavelet() :
edbox->pack_start(*Medgreinf);
edgBox->pack_start(*edbox);
- Gtk::HSeparator* const separatorlc = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separatorlc = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
edgBox->pack_start(*separatorlc, Gtk::PACK_SHRINK, 2);
Gtk::Label* const labmED = Gtk::manage(new Gtk::Label(M("TP_WAVELET_EDTYPE") + ":"));
- Gtk::HBox* const ctboxED = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxED = Gtk::manage(new Gtk::Box());
ctboxED->pack_start(*labmED, Gtk::PACK_SHRINK, 1);
EDmethod->append(M("TP_WAVELET_EDSL"));
@@ -865,10 +869,10 @@ Wavelet::Wavelet() :
medianlevConn = medianlev->signal_toggled().connect(sigc::mem_fun(*this, &Wavelet::medianlevToggled));
medianlev->set_tooltip_text(M("TP_WAVELET_MEDILEV_TOOLTIP"));
- Gtk::HSeparator* const separatored1 = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separatored1 = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
edgBox->pack_start(*separatored1, Gtk::PACK_SHRINK, 2);
- Gtk::HBox* const eddebox = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const eddebox = Gtk::manage(new Gtk::Box());
edgBox->pack_start(*eddebox);
edgBox->pack_start(*medianlev);
@@ -896,11 +900,11 @@ Wavelet::Wavelet() :
edgeampli->setAdjusterListener(this);
edgBox->pack_start(*edgeampli);
- Gtk::VBox* const ctboxES = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* const ctboxES = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
ctboxES->set_spacing(2);
- Gtk::HBox* const ctboxNP = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxNP = Gtk::manage(new Gtk::Box());
ctboxNP->pack_start(*labmNP, Gtk::PACK_SHRINK, 1);
NPmethod->append(M("TP_WAVELET_NPNONE"));
@@ -1040,10 +1044,10 @@ Wavelet::Wavelet() :
chromaFrame->add(*chromaBox);
Gtk::Label* const labmTM = Gtk::manage(new Gtk::Label(M("TP_WAVELET_TMTYPE") + ":"));
- Gtk::HBox* const ctboxTM = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxTM = Gtk::manage(new Gtk::Box());
ctboxTM->pack_start(*labmTM, Gtk::PACK_SHRINK, 1);
-// Gtk::HSeparator* const separatorR0 = Gtk::manage(new Gtk::HSeparator());
+// Gtk::Separator* const separatorR0 = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
// resBox->pack_start(*separatorR0, Gtk::PACK_SHRINK, 2);
TMmethod->append(M("TP_WAVELET_COMPCONT"));
@@ -1077,7 +1081,7 @@ Wavelet::Wavelet() :
contFrame->add(*contBox);
resBox->pack_start(*contFrame);
-// Gtk::HSeparator* const separatorR1 = Gtk::manage(new Gtk::HSeparator());
+// Gtk::Separator* const separatorR1 = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
// resBox->pack_start(*separatorR1, Gtk::PACK_SHRINK, 2);
hueskin2->set_tooltip_markup(M("TP_WAVELET_HUESKY_TOOLTIP"));
@@ -1104,11 +1108,11 @@ Wavelet::Wavelet() :
resBox->pack_start(*curveEditorRES, Gtk::PACK_SHRINK, 4);
// Toning and Color Balance
- Gtk::HSeparator* const separatorCB = Gtk::manage(new Gtk::HSeparator());
+ Gtk::Separator* const separatorCB = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
- Gtk::VBox* const chanMixerHLBox = Gtk::manage(new Gtk::VBox());
- Gtk::VBox* const chanMixerMidBox = Gtk::manage(new Gtk::VBox());
- Gtk::VBox* const chanMixerShadowsBox = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* const chanMixerHLBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* const chanMixerMidBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ Gtk::Box* const chanMixerShadowsBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
cbenab->set_active(true);
cbenabConn = cbenab->signal_toggled().connect(sigc::mem_fun(*this, &Wavelet::cbenabToggled));
@@ -1172,14 +1176,14 @@ Wavelet::Wavelet() :
resBox->pack_start(*neutrHBox);
// Final Touchup
- // Gtk::VBox* const ctboxBA = Gtk::manage(new Gtk::VBox());
+ // Gtk::Box* const ctboxBA = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
ctboxBA->set_spacing(2);
- //Gtk::HSeparator *separatorfin = Gtk::manage (new Gtk::HSeparator());
+ //Gtk::Separator *separatorfin = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
//ctboxBA->pack_start(*separatorfin, Gtk::PACK_SHRINK, 2);
Gtk::Label* const labmBA = Gtk::manage(new Gtk::Label(M("TP_WAVELET_BATYPE") + ":"));
- Gtk::HBox* const ctboxFI = Gtk::manage(new Gtk::HBox());
+ Gtk::Box* const ctboxFI = Gtk::manage(new Gtk::Box());
ctboxFI->pack_start(*labmBA, Gtk::PACK_SHRINK, 1);
BAmethod->append(M("TP_WAVELET_BANONE"));
@@ -1211,7 +1215,7 @@ Wavelet::Wavelet() :
iter->set_tooltip_text(M("TP_WAVELET_ITER_TOOLTIP"));
sigmadir->setAdjusterListener(this);
-// Gtk::HSeparator* const separatorbalend = Gtk::manage(new Gtk::HSeparator());
+// Gtk::Separator* const separatorbalend = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
opacityCurveEditorWL->setCurveListener(this);
diff --git a/rtgui/wavelet.h b/rtgui/wavelet.h
index c7e002a64..bdbf7bbc3 100644
--- a/rtgui/wavelet.h
+++ b/rtgui/wavelet.h
@@ -197,8 +197,8 @@ private:
CurveEditorGroup* const curveEditorbl;
CurveEditorGroup* const curveEditorRES;
CurveEditorGroup* const curveEditorGAM;
- Gtk::HSeparator* const separatorNeutral;
- Gtk::HSeparator* const separatoredge;
+ Gtk::Separator* const separatorNeutral;
+ Gtk::Separator* const separatoredge;
CurveEditorGroup* const opaCurveEditorG;
FlatCurveEditor* opacityShapeRG;
@@ -387,14 +387,14 @@ private:
MyExpander* const expclari;
MyExpander* const expbl;
- Gtk::HBox* const neutrHBox;
- Gtk::HBox* const usharpHBox;
- Gtk::HBox* const ctboxch;
- Gtk::HBox* const quaHBox;
- Gtk::HBox* const sliHBox;
- Gtk::HBox* const denHBox;
- Gtk::HBox* const mixHBox;
- Gtk::VBox* const ctboxBA;// = Gtk::manage(new Gtk::VBox());
+ Gtk::Box* const neutrHBox;
+ Gtk::Box* const usharpHBox;
+ Gtk::Box* const ctboxch;
+ Gtk::Box* const quaHBox;
+ Gtk::Box* const sliHBox;
+ Gtk::Box* const denHBox;
+ Gtk::Box* const mixHBox;
+ Gtk::Box* const ctboxBA;// = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
sigc::connection enableChromaConn, enableContrastConn, enableEdgeConn, enabletmConn, enableFinalConn, enableclariConn;
sigc::connection enableNoiseConn, enableResidConn, enableToningConn;
diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc
index 5d1c907df..ba8ad6157 100644
--- a/rtgui/whitebalance.cc
+++ b/rtgui/whitebalance.cc
@@ -311,7 +311,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB
spotgrid->attach (*wbsizehelper, 2, 0, 1, 1);
pack_start (*spotgrid, Gtk::PACK_SHRINK, 0 );
- Gtk::HSeparator *separator = Gtk::manage (new Gtk::HSeparator());
+ Gtk::Separator *separator = Gtk::manage (new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
separator->get_style_context()->add_class("grid-row-separator");
pack_start (*separator, Gtk::PACK_SHRINK, 0);
@@ -341,7 +341,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB
equal->show ();
tempBias->show ();
- /* Gtk::HBox* boxgreen = Gtk::manage (new Gtk::HBox ());
+ /* Gtk::Box* boxgreen = Gtk::manage (new Gtk::Box ());
boxgreen->show ();
boxgreen->pack_start(*igreenL);
diff --git a/rtgui/xtransprocess.cc b/rtgui/xtransprocess.cc
index db63c68be..89fd0f8a4 100644
--- a/rtgui/xtransprocess.cc
+++ b/rtgui/xtransprocess.cc
@@ -34,7 +34,7 @@ XTransProcess::XTransProcess () : FoldableToolPanel(this, "xtransprocess", M("TP
EvDemosaicContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_DUALDEMOSAIC_CONTRAST");
EvDemosaicAutoContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST");
- Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
+ Gtk::Box* hb1 = Gtk::manage (new Gtk::Box ());
hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_DMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
method = Gtk::manage (new MyComboBoxText ());
@@ -72,7 +72,7 @@ XTransProcess::XTransProcess () : FoldableToolPanel(this, "xtransprocess", M("TP
hb1->pack_end (*method, Gtk::PACK_EXPAND_WIDGET, 4);
pack_start( *hb1, Gtk::PACK_SHRINK, 4);
- dualDemosaicOptions = Gtk::manage (new Gtk::VBox ());
+ dualDemosaicOptions = Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
dualDemosaicContrast = Gtk::manage(new Adjuster (M("TP_RAW_DUALDEMOSAICCONTRAST"), 0, 100, 1, 20));
dualDemosaicContrast->setAdjusterListener (this);
@@ -85,7 +85,7 @@ XTransProcess::XTransProcess () : FoldableToolPanel(this, "xtransprocess", M("TP
dualDemosaicOptions->pack_start(*dualDemosaicContrast);
pack_start( *dualDemosaicOptions, Gtk::PACK_SHRINK, 4);
- borderbox = Gtk::manage(new Gtk::HBox());
+ borderbox = Gtk::manage(new Gtk::Box());
border = Gtk::manage(new Adjuster(M("TP_RAW_BORDER"), 0, 16, 1, 7));
border->setAdjusterListener (this);
@@ -95,7 +95,7 @@ XTransProcess::XTransProcess () : FoldableToolPanel(this, "xtransprocess", M("TP
borderbox->pack_start(*border);
pack_start(*borderbox, Gtk::PACK_SHRINK, 4);
- pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 0 );
+ pack_start( *Gtk::manage( new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)), Gtk::PACK_SHRINK, 0 );
ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"), 0, 5, 1, 0 ));
ccSteps->setAdjusterListener (this);
diff --git a/rtgui/xtransprocess.h b/rtgui/xtransprocess.h
index fc0dd7502..4725f4a6d 100644
--- a/rtgui/xtransprocess.h
+++ b/rtgui/xtransprocess.h
@@ -36,10 +36,10 @@ class XTransProcess final :
protected:
MyComboBoxText* method;
- Gtk::HBox* borderbox;
+ Gtk::Box* borderbox;
Adjuster* border;
Adjuster* ccSteps;
- Gtk::VBox *dualDemosaicOptions;
+ Gtk::Box* dualDemosaicOptions;
Adjuster* dualDemosaicContrast;
bool lastAutoContrast;