Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle
This commit is contained in:
DrSlony
@@ -23,128 +23,145 @@
|
||||
using namespace rtengine::procparams;
|
||||
|
||||
|
||||
ToolVBox::ToolVBox() {
|
||||
updateStyle();
|
||||
ToolVBox::ToolVBox()
|
||||
{
|
||||
updateStyle();
|
||||
}
|
||||
|
||||
void ToolVBox::updateStyle() {
|
||||
if (options.slimUI) {
|
||||
set_spacing(1); // Vertical space between tools
|
||||
set_border_width(1); // Space separating the tab's frame and the tools
|
||||
}
|
||||
else {
|
||||
set_spacing(2); // Vertical space between tools
|
||||
set_border_width(1); // Space separating the tab's frame and the tools 3
|
||||
}
|
||||
void ToolVBox::updateStyle()
|
||||
{
|
||||
if (options.slimUI) {
|
||||
set_spacing(1); // Vertical space between tools
|
||||
set_border_width(1); // Space separating the tab's frame and the tools
|
||||
} else {
|
||||
set_spacing(2); // Vertical space between tools
|
||||
set_border_width(1); // Space separating the tab's frame and the tools 3
|
||||
}
|
||||
}
|
||||
|
||||
void ToolVBox::on_style_changed (const Glib::RefPtr<Gtk::Style>& style) {
|
||||
updateStyle();
|
||||
void ToolVBox::on_style_changed (const Glib::RefPtr<Gtk::Style>& style)
|
||||
{
|
||||
updateStyle();
|
||||
}
|
||||
|
||||
ToolParamBlock::ToolParamBlock() {
|
||||
updateStyle();
|
||||
ToolParamBlock::ToolParamBlock()
|
||||
{
|
||||
updateStyle();
|
||||
}
|
||||
|
||||
void ToolParamBlock::updateStyle() {
|
||||
if (options.slimUI) {
|
||||
set_spacing(2); // Vertical space between parameters in a single tool
|
||||
set_border_width(6); // Space separating the parameters of a tool and its surrounding frame 6
|
||||
}
|
||||
else {
|
||||
set_spacing(4); // Vertical space between parameters in a single tool
|
||||
set_border_width(8); // Space separating the parameters of a tool and its surrounding frame 8
|
||||
}
|
||||
void ToolParamBlock::updateStyle()
|
||||
{
|
||||
if (options.slimUI) {
|
||||
set_spacing(2); // Vertical space between parameters in a single tool
|
||||
set_border_width(6); // Space separating the parameters of a tool and its surrounding frame 6
|
||||
} else {
|
||||
set_spacing(4); // Vertical space between parameters in a single tool
|
||||
set_border_width(8); // Space separating the parameters of a tool and its surrounding frame 8
|
||||
}
|
||||
}
|
||||
|
||||
void ToolParamBlock::on_style_changed (const Glib::RefPtr<Gtk::Style>& style) {
|
||||
updateStyle();
|
||||
void ToolParamBlock::on_style_changed (const Glib::RefPtr<Gtk::Style>& style)
|
||||
{
|
||||
updateStyle();
|
||||
}
|
||||
|
||||
FoldableToolPanel::FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName, Glib::ustring UILabel, bool need11, bool useEnabled) : ToolPanel(toolName, need11), parentContainer(NULL), exp(NULL), lastEnabled(true)
|
||||
{
|
||||
if (!content)
|
||||
return;
|
||||
if (!content) {
|
||||
return;
|
||||
}
|
||||
|
||||
// exp->set_border_width (5);
|
||||
// exp->set_use_markup (true);
|
||||
if (need11) {
|
||||
Gtk::HBox *titleHBox = Gtk::manage(new Gtk::HBox());
|
||||
// exp->set_border_width (5);
|
||||
// exp->set_use_markup (true);
|
||||
if (need11) {
|
||||
Gtk::HBox *titleHBox = Gtk::manage(new Gtk::HBox());
|
||||
|
||||
Gtk::Label *label = Gtk::manage(new Gtk::Label());
|
||||
label->set_markup(Glib::ustring("<b>") + escapeHtmlChars(UILabel) + Glib::ustring("</b>"));
|
||||
label->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
|
||||
titleHBox->pack_start(*label, Gtk::PACK_EXPAND_WIDGET, 0);
|
||||
Gtk::Label *label = Gtk::manage(new Gtk::Label());
|
||||
label->set_markup(Glib::ustring("<b>") + escapeHtmlChars(UILabel) + Glib::ustring("</b>"));
|
||||
label->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
|
||||
titleHBox->pack_start(*label, Gtk::PACK_EXPAND_WIDGET, 0);
|
||||
|
||||
RTImage *image = Gtk::manage (new RTImage("zoom-100-identifier.png"));
|
||||
image->set_tooltip_text(M("TP_GENERAL_11SCALE_TOOLTIP"));
|
||||
titleHBox->pack_end(*image, Gtk::PACK_SHRINK, 0);
|
||||
RTImage *image = Gtk::manage (new RTImage("zoom-100-identifier.png"));
|
||||
image->set_tooltip_text(M("TP_GENERAL_11SCALE_TOOLTIP"));
|
||||
titleHBox->pack_end(*image, Gtk::PACK_SHRINK, 0);
|
||||
|
||||
exp = Gtk::manage (new MyExpander (useEnabled, titleHBox));
|
||||
}
|
||||
else {
|
||||
exp = Gtk::manage (new MyExpander (useEnabled, UILabel));
|
||||
}
|
||||
exp->signal_button_release_event().connect_notify( sigc::mem_fun(this, &FoldableToolPanel::foldThemAll) );
|
||||
enaConn = signal_enabled_toggled().connect( sigc::mem_fun(*this, &FoldableToolPanel::enabled_toggled) );
|
||||
exp = Gtk::manage (new MyExpander (useEnabled, titleHBox));
|
||||
} else {
|
||||
exp = Gtk::manage (new MyExpander (useEnabled, UILabel));
|
||||
}
|
||||
|
||||
exp->add (*content);
|
||||
exp->show ();
|
||||
exp->signal_button_release_event().connect_notify( sigc::mem_fun(this, &FoldableToolPanel::foldThemAll) );
|
||||
enaConn = signal_enabled_toggled().connect( sigc::mem_fun(*this, &FoldableToolPanel::enabled_toggled) );
|
||||
|
||||
exp->add (*content);
|
||||
exp->show ();
|
||||
}
|
||||
|
||||
void FoldableToolPanel::foldThemAll (GdkEventButton* event) {
|
||||
if (event->button == 3) {
|
||||
if (listener)
|
||||
(static_cast<ToolPanelCoordinator*>(listener))->foldAllButOne( parentContainer, this);
|
||||
else
|
||||
(static_cast<ToolPanelCoordinator*>(tmp))->foldAllButOne( parentContainer, this);
|
||||
}
|
||||
void FoldableToolPanel::foldThemAll (GdkEventButton* event)
|
||||
{
|
||||
if (event->button == 3) {
|
||||
if (listener) {
|
||||
(static_cast<ToolPanelCoordinator*>(listener))->foldAllButOne( parentContainer, this);
|
||||
} else {
|
||||
(static_cast<ToolPanelCoordinator*>(tmp))->foldAllButOne( parentContainer, this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void FoldableToolPanel::enabled_toggled() {
|
||||
if (multiImage) {
|
||||
if (exp->get_inconsistent()) {
|
||||
exp->set_inconsistent (false);
|
||||
enaConn.block (true);
|
||||
exp->setEnabled (false);
|
||||
enaConn.block (false);
|
||||
}
|
||||
else if (lastEnabled)
|
||||
exp->set_inconsistent (true);
|
||||
void FoldableToolPanel::enabled_toggled()
|
||||
{
|
||||
if (multiImage) {
|
||||
if (exp->get_inconsistent()) {
|
||||
exp->set_inconsistent (false);
|
||||
enaConn.block (true);
|
||||
exp->setEnabled (false);
|
||||
enaConn.block (false);
|
||||
} else if (lastEnabled) {
|
||||
exp->set_inconsistent (true);
|
||||
}
|
||||
|
||||
lastEnabled = exp->getEnabled();
|
||||
}
|
||||
enabledChanged();
|
||||
lastEnabled = exp->getEnabled();
|
||||
}
|
||||
|
||||
enabledChanged();
|
||||
}
|
||||
|
||||
bool FoldableToolPanel::get_inconsistent() {
|
||||
return exp->get_inconsistent();
|
||||
bool FoldableToolPanel::get_inconsistent()
|
||||
{
|
||||
return exp->get_inconsistent();
|
||||
}
|
||||
|
||||
void FoldableToolPanel::set_inconsistent(bool isInconsistent) {
|
||||
exp->set_inconsistent(isInconsistent);
|
||||
void FoldableToolPanel::set_inconsistent(bool isInconsistent)
|
||||
{
|
||||
exp->set_inconsistent(isInconsistent);
|
||||
}
|
||||
|
||||
bool FoldableToolPanel::getEnabled() {
|
||||
return exp->getEnabled();
|
||||
bool FoldableToolPanel::getEnabled()
|
||||
{
|
||||
return exp->getEnabled();
|
||||
}
|
||||
|
||||
// do not emit the enabled_toggled event
|
||||
void FoldableToolPanel::setEnabled(bool isEnabled) {
|
||||
enaConn.block (true);
|
||||
exp->setEnabled(isEnabled);
|
||||
lastEnabled = isEnabled;
|
||||
enaConn.block (false);
|
||||
void FoldableToolPanel::setEnabled(bool isEnabled)
|
||||
{
|
||||
enaConn.block (true);
|
||||
exp->setEnabled(isEnabled);
|
||||
lastEnabled = isEnabled;
|
||||
enaConn.block (false);
|
||||
}
|
||||
|
||||
void FoldableToolPanel::setEnabledTooltipMarkup(Glib::ustring tooltipMarkup) {
|
||||
if (exp)
|
||||
exp->set_tooltip_markup(tooltipMarkup);
|
||||
void FoldableToolPanel::setEnabledTooltipMarkup(Glib::ustring tooltipMarkup)
|
||||
{
|
||||
if (exp) {
|
||||
exp->set_tooltip_markup(tooltipMarkup);
|
||||
}
|
||||
}
|
||||
|
||||
void FoldableToolPanel::setEnabledTooltipText(Glib::ustring tooltipText) {
|
||||
if (exp)
|
||||
exp->set_tooltip_text(tooltipText);
|
||||
void FoldableToolPanel::setEnabledTooltipText(Glib::ustring tooltipText)
|
||||
{
|
||||
if (exp) {
|
||||
exp->set_tooltip_text(tooltipText);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user