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

Theme tweaks in light of new icons, #4469

Browse Source 
- Button and combobox sizes consistent.
- Padding around left and right edges of comboboxes.
- Fixed bug in green channel preview togglebutton icon always being
  shown as "off".
- Added CSS classes to various elements.
This commit is contained in:
Morgan Hardwood
2018-07-18 19:37:24 +02:00
parent 2a359ce04a
commit 5309307c7b
15 changed files with 93 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtgui/crop.cc
View File

@@ -128,6 +128,7 @@ Crop::Crop():
pack_start (*hb2, Gtk::PACK_SHRINK, 4);
selectCrop = Gtk::manage (new Gtk::Button (M("TP_CROP_SELECTCROP")));
selectCrop->get_style_context()->add_class("independent");
selectCrop->set_image (*Gtk::manage (new RTImage ("crop-small.png")));
pack_start (*selectCrop, Gtk::PACK_SHRINK, 2);

1
rtgui/distortion.cc
View File

@@ -29,6 +29,7 @@ Distortion::Distortion (): FoldableToolPanel(this, "distortion", M("TP_DISTORTIO
rlistener = nullptr;
autoDistor = Gtk::manage (new Gtk::Button (M("GENERAL_AUTO")));
autoDistor->set_image (*Gtk::manage (new RTImage ("distortion-auto-small.png")));
autoDistor->get_style_context()->add_class("independent");
autoDistor->set_alignment(0.5f, 0.5f);
autoDistor->set_tooltip_text (M("TP_DISTORTION_AUTO_TIP"));
idConn = autoDistor->signal_pressed().connect( sigc::mem_fun(*this, &Distortion::idPressed) );

10
rtgui/filecatalog.cc
View File

@@ -163,11 +163,14 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
fltrVbox1 = Gtk::manage (new Gtk::VBox());
fltrRankbox = Gtk::manage (new Gtk::HBox());
fltrRankbox->get_style_context()->add_class("smallbuttonbox");
fltrLabelbox = Gtk::manage (new Gtk::HBox());
fltrLabelbox->get_style_context()->add_class("smallbuttonbox");
iUnRanked = new RTImage ("star-gold-hollow-small.png");
igUnRanked = new RTImage ("star-hollow-small.png");
bUnRanked = Gtk::manage( new Gtk::ToggleButton () );
bUnRanked->get_style_context()->add_class("smallbutton");
bUnRanked->set_active (false);
bUnRanked->set_image (*igUnRanked);
bUnRanked->set_relief (Gtk::RELIEF_NONE);
@@ -182,6 +185,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
iranked[i]->show ();
igranked[i]->show ();
bRank[i] = Gtk::manage( new Gtk::ToggleButton () );
bRank[i]->get_style_context()->add_class("smallbutton");
bRank[i]->set_image (*igranked[i]);
bRank[i]->set_relief (Gtk::RELIEF_NONE);
fltrRankbox->pack_start (*bRank[i], Gtk::PACK_SHRINK);
@@ -196,6 +200,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
iUnCLabeled = new RTImage(clabelActiveIcons[0]);
igUnCLabeled = new RTImage(clabelInactiveIcons[0]);
bUnCLabeled = Gtk::manage(new Gtk::ToggleButton());
bUnCLabeled->get_style_context()->add_class("smallbutton");
bUnCLabeled->set_active(false);
bUnCLabeled->set_image(*igUnCLabeled);
bUnCLabeled->set_relief(Gtk::RELIEF_NONE);
@@ -210,6 +215,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
iCLabeled[i]->show();
igCLabeled[i]->show();
bCLabel[i] = Gtk::manage(new Gtk::ToggleButton());
bCLabel[i]->get_style_context()->add_class("smallbutton");
bCLabel[i]->set_image(*igCLabeled[i]);
bCLabel[i]->set_relief(Gtk::RELIEF_NONE);
fltrLabelbox->pack_start(*bCLabel[i], Gtk::PACK_SHRINK);
@@ -237,7 +243,9 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
fltrVbox2 = Gtk::manage (new Gtk::VBox());
fltrEditedBox = Gtk::manage (new Gtk::HBox());
fltrEditedBox->get_style_context()->add_class("smallbuttonbox");
fltrRecentlySavedBox = Gtk::manage (new Gtk::HBox());
fltrRecentlySavedBox->get_style_context()->add_class("smallbuttonbox");
// bEdited
// TODO The "g" variant was the more transparent variant of the icon, used
@@ -251,6 +259,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
for (int i = 0; i < 2; i++) {
iEdited[i]->show ();
bEdited[i] = Gtk::manage(new Gtk::ToggleButton ());
bEdited[i]->get_style_context()->add_class("smallbutton");
bEdited[i]->set_active (false);
bEdited[i]->set_image (*igEdited[i]);
bEdited[i]->set_relief (Gtk::RELIEF_NONE);
@@ -275,6 +284,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
for (int i = 0; i < 2; i++) {
iRecentlySaved[i]->show ();
bRecentlySaved[i] = Gtk::manage(new Gtk::ToggleButton ());
bRecentlySaved[i]->get_style_context()->add_class("smallbutton");
bRecentlySaved[i]->set_active (false);
bRecentlySaved[i]->set_image (*igRecentlySaved[i]);
bRecentlySaved[i]->set_relief (Gtk::RELIEF_NONE);

1
rtgui/gradient.cc
View File

@@ -13,6 +13,7 @@ Gradient::Gradient () : FoldableToolPanel(this, "gradient", M("TP_GRADIENT_LABEL
editHBox = Gtk::manage (new Gtk::HBox());
edit = Gtk::manage (new Gtk::ToggleButton());
edit->get_style_context()->add_class("independent");
edit->add (*Gtk::manage (new RTImage ("crosshair-adjust.png")));
edit->set_tooltip_text(M("EDIT_OBJECT_TOOLTIP"));
editConn = edit->signal_toggled().connect( sigc::mem_fun(*this, &Gradient::editToggled) );

1
rtgui/imagearea.cc
View File

@@ -43,6 +43,7 @@ ImageArea::ImageArea (ImageAreaPanel* p) : parent(p), fullImageWidth(0), fullIma
zoomPanel = Gtk::manage (new ZoomPanel (this));
indClippedPanel = Gtk::manage (new IndicateClippedPanel (this));
previewModePanel = Gtk::manage (new PreviewModePanel (this));
previewModePanel->get_style_context()->add_class("narrowbuttonbox");
add_events(Gdk::LEAVE_NOTIFY_MASK);

1
rtgui/lensgeom.cc
View File

@@ -31,6 +31,7 @@ LensGeometry::LensGeometry () : FoldableToolPanel(this, "lensgeom", M("TP_LENSGE
autoCrop = Gtk::manage (new Gtk::Button (M("TP_LENSGEOM_AUTOCROP")));
autoCrop->set_image (*Gtk::manage (new RTImage ("crop-auto-small.png")));
autoCrop->get_style_context()->add_class("independent");
pack_start (*autoCrop, Gtk::PACK_SHRINK, 2);
packBox = Gtk::manage (new ToolParamBlock ());

1
rtgui/popupcommon.cc
View File

@@ -47,6 +47,7 @@ PopUpCommon::PopUpCommon (Gtk::Button* thisButton, const Glib::ustring& label)
buttonGroup = Gtk::manage( new Gtk::Grid());
setExpandAlignProperties(buttonGroup, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
buttonGroup->attach(*button, 0, 0, 1, 1);
buttonGroup->get_style_context()->add_class("image-combo");
}
PopUpCommon::~PopUpCommon ()

10
rtgui/previewmodepanel.cc
View File

@@ -25,7 +25,7 @@ PreviewModePanel::PreviewModePanel (ImageArea* ia) : imageArea(ia)
{
iR = new RTImage ("square-toggle-red-on.png");
iG = new RTImage ("square-toggle-green-off.png");
iG = new RTImage ("square-toggle-green-on.png");
iB = new RTImage ("square-toggle-blue-on.png");
iL = new RTImage ("square-toggle-luminosity-on.png");
iBC0 = new RTImage ("square-toggle-theme-on.png");
@@ -43,41 +43,49 @@ PreviewModePanel::PreviewModePanel (ImageArea* ia) : imageArea(ia)
igBC3 = new RTImage ("square-toggle-gray-off.png");
backColor0 = Gtk::manage (new Gtk::ToggleButton ());
backColor0->get_style_context()->add_class("narrowbutton");
backColor0->set_relief(Gtk::RELIEF_NONE);
backColor0->set_tooltip_markup (M("MAIN_TOOLTIP_BACKCOLOR0"));
backColor0->set_image(options.bgcolor == 0 ? *iBC0 : *igBC0);
backColor1 = Gtk::manage (new Gtk::ToggleButton ());
backColor1->get_style_context()->add_class("narrowbutton");
backColor1->set_relief(Gtk::RELIEF_NONE);
backColor1->set_tooltip_markup (M("MAIN_TOOLTIP_BACKCOLOR1"));
backColor1->set_image(options.bgcolor == 1 ? *iBC1 : *igBC1);
backColor3 = Gtk::manage (new Gtk::ToggleButton ());
backColor3->get_style_context()->add_class("narrowbutton");
backColor3->set_relief(Gtk::RELIEF_NONE);
backColor3->set_tooltip_markup (M("MAIN_TOOLTIP_BACKCOLOR3"));
backColor3->set_image(options.bgcolor == 3 ? *iBC3 : *igBC3);
backColor2 = Gtk::manage (new Gtk::ToggleButton ());
backColor2->get_style_context()->add_class("narrowbutton");
backColor2->set_relief(Gtk::RELIEF_NONE);
backColor2->set_tooltip_markup (M("MAIN_TOOLTIP_BACKCOLOR2"));
backColor2->set_image(options.bgcolor == 2 ? *iBC2 : *igBC2);
previewR = Gtk::manage (new Gtk::ToggleButton ());
previewR->get_style_context()->add_class("narrowbutton");
previewR->set_relief(Gtk::RELIEF_NONE);
previewR->set_tooltip_markup (M("MAIN_TOOLTIP_PREVIEWR"));
previewR->set_image(*igR);
previewG = Gtk::manage (new Gtk::ToggleButton ());
previewG->get_style_context()->add_class("narrowbutton");
previewG->set_relief(Gtk::RELIEF_NONE);
previewG->set_tooltip_markup (M("MAIN_TOOLTIP_PREVIEWG"));
previewG->set_image(*igG);
previewB = Gtk::manage (new Gtk::ToggleButton ());
previewB->get_style_context()->add_class("narrowbutton");
previewB->set_relief(Gtk::RELIEF_NONE);
previewB->set_tooltip_markup (M("MAIN_TOOLTIP_PREVIEWB"));
previewB->set_image(*igB);
previewL = Gtk::manage (new Gtk::ToggleButton ());
previewL->get_style_context()->add_class("narrowbutton");
previewL->set_relief(Gtk::RELIEF_NONE);
previewL->set_tooltip_markup (M("MAIN_TOOLTIP_PREVIEWL"));
previewL->set_image(*igL);

1
rtgui/rotate.cc
View File

@@ -39,6 +39,7 @@ Rotate::Rotate () : FoldableToolPanel(this, "rotate", M("TP_ROTATE_LABEL"))
selectStraight = Gtk::manage (new Gtk::Button (M("TP_ROTATE_SELECTLINE")));
selectStraight->set_image (*Gtk::manage (new RTImage ("rotate-straighten-small.png")));
selectStraight->get_style_context()->add_class("independent");
pack_start (*selectStraight, Gtk::PACK_SHRINK, 2);
selectStraight->signal_pressed().connect( sigc::mem_fun(*this, &Rotate::selectStraightPressed) );

1
rtgui/whitebalance.cc
View File

@@ -255,6 +255,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB
spotbox->show ();
spotbutton = Gtk::manage (new Gtk::Button ());
spotbutton->get_style_context()->add_class("independent");
spotbutton->set_tooltip_text(M("TP_WBALANCE_SPOTWB"));
Gtk::Image* spotimg = Gtk::manage (new RTImage ("color-picker.png"));
spotimg->show ();