Fix the Editor's bottom toolbar, create a new MyProgressBar class to

make it's width stable, and add 2 pixel space between the main action
widgets (progress bar, preferences, full screen)
This commit is contained in:
Hombre
2016-01-10 01:35:27 +01:00
parent d460f5eae1
commit f344a2cee2
8 changed files with 185 additions and 77 deletions

View File

@@ -41,34 +41,51 @@ ZoomPanel::ZoomPanel (ImageArea* iarea) : iarea(iarea)
zoomOut = Gtk::manage (new Gtk::Button());
zoomOut->add (*imageOut);
zoomOut->set_relief(Gtk::RELIEF_NONE);
setExpandAlignProperties(zoomOut, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
zoomIn = Gtk::manage (new Gtk::Button());
zoomIn->add (*imageIn);
zoomIn->set_relief(Gtk::RELIEF_NONE);
setExpandAlignProperties(zoomIn, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
zoomFit = Gtk::manage (new Gtk::Button());
zoomFit->add (*imageFit);
zoomFit->set_relief(Gtk::RELIEF_NONE);
setExpandAlignProperties(zoomFit, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
zoomFitCrop = Gtk::manage (new Gtk::Button());
zoomFitCrop->add (*imageFitCrop);
zoomFitCrop->set_relief(Gtk::RELIEF_NONE);
setExpandAlignProperties(zoomFitCrop, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
zoom11 = Gtk::manage (new Gtk::Button());
zoom11->add (*image11);
zoom11->set_relief(Gtk::RELIEF_NONE);
setExpandAlignProperties(zoom11, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
pack_start (*zoomOut, Gtk::PACK_SHRINK, 0);
pack_start (*zoomIn, Gtk::PACK_SHRINK, 0);
pack_start (*zoomFit, Gtk::PACK_SHRINK, 0);
pack_start (*zoomFitCrop, Gtk::PACK_SHRINK, 0);
pack_start (*zoom11, Gtk::PACK_SHRINK, 0);
attach_next_to (*zoomOut, Gtk::POS_RIGHT, 1, 1);
attach_next_to (*zoomIn, Gtk::POS_RIGHT, 1, 1);
attach_next_to (*zoomFit, Gtk::POS_RIGHT, 1, 1);
attach_next_to (*zoomFitCrop, Gtk::POS_RIGHT, 1, 1);
attach_next_to (*zoom11, Gtk::POS_RIGHT, 1, 1);
/*
attach_next_to (*zoomOut, Gtk::POS_LEFT, 1, 1);
attach_next_to (*zoomIn, *zoomOut, Gtk::POS_RIGHT, 1, 1);
attach_next_to (*zoomFit, *zoomIn, Gtk::POS_RIGHT, 1, 1);
attach_next_to (*zoomFitCrop, *zoomFit, Gtk::POS_RIGHT, 1, 1);
attach_next_to (*zoom11, *zoomFitCrop, Gtk::POS_RIGHT, 1, 1);
*/
zoomLabel = Gtk::manage (new Gtk::Label ());
pack_start (*zoomLabel, Gtk::PACK_SHRINK, 4);
setExpandAlignProperties(zoomLabel, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
attach_next_to (*zoomLabel, Gtk::POS_RIGHT, 1, 1);
//attach_next_to (*zoomLabel, *zoom11, Gtk::POS_RIGHT, 1, 1);
Gtk::Image* imageCrop = Gtk::manage (new RTImage ("new-detail-window.png"));
imageCrop->set_padding(0, 0);
newCrop = Gtk::manage (new Gtk::Button());
newCrop->add (*imageCrop);
newCrop->set_relief(Gtk::RELIEF_NONE);
pack_start (*newCrop, Gtk::PACK_SHRINK, 4);
setExpandAlignProperties(newCrop, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
attach_next_to (*newCrop, Gtk::POS_RIGHT, 1, 1);
//attach_next_to (*newCrop, *zoomLabel, Gtk::POS_RIGHT, 1, 1);
show_all_children ();