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

Solving issue #3497, #3500, #3498 and #3483

Browse Source 
For issue #3483, the old behavior is restored, i.e. the minimum width of
the ProfilePanel combobox is the maximum width of its content.

Style updated for the Exif and IPTC sub-tabs
This commit is contained in:
Hombre
2016-11-09 00:09:52 +01:00
parent ea6a7748ed
commit 2fcc5b75c8
13 changed files with 235 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rtgui/filecatalog.cc
View File

@@ -673,17 +673,11 @@ void FileCatalog::_refreshProgressBar ()
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
Gtk::Notebook *nb = (Gtk::Notebook *)(filepanel->get_parent());
Gtk::Box* hbb = nullptr;
Gtk::Grid* grid = Gtk::manage (new Gtk::Grid ());
Gtk::Label *label = nullptr;
if( options.mainNBVertical ) {
hbb = Gtk::manage (new Gtk::VBox ());
} else {
hbb = Gtk::manage (new Gtk::HBox ());
}
if (!previewsToLoad ) {
hbb->pack_start (*Gtk::manage (new RTImage ("gtk-directory.png")));
grid->attach_next_to(*Gtk::manage (new RTImage ("gtk-directory.png")), options.mainNBVertical ? Gtk::POS_TOP : Gtk::POS_RIGHT, 1, 1);
int filteredCount = min(fileBrowser->getNumFiltered(), previewsLoaded);
label = Gtk::manage (new Gtk::Label (M("MAIN_FRAME_FILEBROWSER") +
@@ -691,7 +685,7 @@ void FileCatalog::_refreshProgressBar ()
+ Glib::ustring::format(previewsLoaded) +
(filteredCount != previewsLoaded ? "]" : ")")));
} else {
hbb->pack_start (*Gtk::manage (new RTImage ("gtk-find.png")));
grid->attach_next_to(*Gtk::manage (new RTImage ("gtk-find.png")), options.mainNBVertical ? Gtk::POS_TOP : Gtk::POS_RIGHT, 1, 1);
label = Gtk::manage (new Gtk::Label (M("MAIN_FRAME_FILEBROWSER") + " [" + Glib::ustring::format(std::fixed, std::setprecision(0), std::setw(3), (double)previewsLoaded / previewsToLoad * 100 ) + "%]" ));
filepanel->loadingThumbs("", (double)previewsLoaded / previewsToLoad);
}
@@ -700,13 +694,12 @@ void FileCatalog::_refreshProgressBar ()
label->set_angle(90);
}
hbb->pack_start (*label);
hbb->set_spacing (2);
hbb->set_tooltip_markup (M("MAIN_FRAME_FILEBROWSER_TOOLTIP"));
hbb->show_all ();
grid->attach_next_to(*label, options.mainNBVertical ? Gtk::POS_TOP : Gtk::POS_RIGHT, 1, 1);
grid->set_tooltip_markup (M("MAIN_FRAME_FILEBROWSER_TOOLTIP"));
grid->show_all ();
if (nb) {
nb->set_tab_label(*filepanel, *hbb);
nb->set_tab_label(*filepanel, *grid);
}
}
}