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

Rearrangement of PPI control and image size display

Browse Source
This commit is contained in:
michael
2011-04-28 21:27:21 -04:00
parent 37b802fe1d
commit 20384be856
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/crop.cc
View File

@@ -103,6 +103,7 @@ Crop::Crop (): Gtk::VBox(), FoldableToolPanel(this) {
pack_start (*hb31, Gtk::PACK_SHRINK, 4); pack_start (*hb31, Gtk::PACK_SHRINK, 4);
// ppibox START
ppibox = Gtk::manage (new Gtk::VBox()); ppibox = Gtk::manage (new Gtk::VBox());
ppibox->pack_start (*Gtk::manage (new Gtk::HSeparator()), Gtk::PACK_SHRINK, 2); ppibox->pack_start (*Gtk::manage (new Gtk::HSeparator()), Gtk::PACK_SHRINK, 2);
@@ -112,17 +113,22 @@ Crop::Crop (): Gtk::VBox(), FoldableToolPanel(this) {
ppi->set_size_request (60, -1); ppi->set_size_request (60, -1);
hb4->pack_start (*ppi); hb4->pack_start (*ppi);
ppibox->pack_start (*hb4, Gtk::PACK_SHRINK, 2); sizebox = Gtk::manage (new Gtk::HBox());
sizecm = Gtk::manage (new Gtk::Label (M("GENERAL_NA") + " cm x " + M("GENERAL_NA") + " cm")); sizecm = Gtk::manage (new Gtk::Label (M("GENERAL_NA") + " cm x " + M("GENERAL_NA") + " cm"));
sizein = Gtk::manage (new Gtk::Label (M("GENERAL_NA") + " in x " + M("GENERAL_NA") + " in")); sizein = Gtk::manage (new Gtk::Label (M("GENERAL_NA") + " in x " + M("GENERAL_NA") + " in"));
ppibox->pack_start (*sizecm, Gtk::PACK_SHRINK, 1); sizebox->pack_start (*sizecm, Gtk::PACK_SHRINK, 4);
ppibox->pack_start (*sizein, Gtk::PACK_SHRINK, 1); sizebox->pack_start (*Gtk::manage (new Gtk::VSeparator()), Gtk::PACK_SHRINK, 6);
sizebox->pack_start (*sizein, Gtk::PACK_SHRINK, 4);
sizebox->pack_start (*Gtk::manage (new Gtk::VSeparator()), Gtk::PACK_SHRINK, 6);
sizebox->pack_start (*hb4, Gtk::PACK_SHRINK, 2);
ppibox->pack_start (*sizebox, Gtk::PACK_SHRINK, 1);
pack_start (*ppibox, Gtk::PACK_SHRINK, 0); pack_start (*ppibox, Gtk::PACK_SHRINK, 0);
ppi->set_value (300); ppi->set_value (300);
// ppibox END
ratio->append_text ("3:2"); ratio->append_text ("3:2");
ratio->append_text ("4:3"); ratio->append_text ("4:3");

1
rtgui/crop.h
View File

@@ -49,6 +49,7 @@ class Crop : public Gtk::VBox, public CropGUIListener, public FoldableToolPanel,
Gtk::Label* sizecm; Gtk::Label* sizecm;
Gtk::Label* sizein; Gtk::Label* sizein;
Gtk::VBox* ppibox; Gtk::VBox* ppibox;
Gtk::HBox* sizebox;
int maxw, maxh; int maxw, maxh;
int nx, ny, nw, nh; int nx, ny, nw, nh;
int lastRotationDeg; int lastRotationDeg;