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

Preference UI for filmstrip toolbar visibility (issue 2672)

Browse Source
This commit is contained in:
michael 2015-02-17 09:38:42 -05:00
parent a8baa24415
commit 3b04d4b2c9
7 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rtdata/languages/default
View File

@ -908,6 +908,7 @@ PREFERENCES_SET;Set
PREFERENCES_SHOWBASICEXIF;Show basic Exif info PREFERENCES_SHOWBASICEXIF;Show basic Exif info
PREFERENCES_SHOWDATETIME;Show date and time PREFERENCES_SHOWDATETIME;Show date and time
PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar
PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector
PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows
PREFERENCES_SIMPLAUT;Tool mode PREFERENCES_SIMPLAUT;Tool mode

8
rtgui/filecatalog.cc
View File

@ -1606,6 +1606,14 @@ void FileCatalog::updateFBQueryTB (bool singleRow) {
hbToolBar1->unreference(); hbToolBar1->unreference();
} }
void FileCatalog::updateFBToolBarVisibility (bool showFilmStripToolBar){
if (showFilmStripToolBar)
showToolBar();
else
hideToolBar();
refreshHeight();
}
void FileCatalog::buttonBrowsePathPressed () { void FileCatalog::buttonBrowsePathPressed () {
Glib::ustring BrowsePathValue = BrowsePath->get_text(); Glib::ustring BrowsePathValue = BrowsePath->get_text();
Glib::ustring DecodedPathPrefix=""; Glib::ustring DecodedPathPrefix="";

1
rtgui/filecatalog.h
View File

@ -236,6 +236,7 @@ class FileCatalog : public Gtk::VBox,
void executeQuery (); void executeQuery ();
bool Query_key_pressed(GdkEventKey *event); bool Query_key_pressed(GdkEventKey *event);
void updateFBQueryTB (bool singleRow); void updateFBQueryTB (bool singleRow);
void updateFBToolBarVisibility (bool showFilmStripToolBar);
void tbLeftPanel_1_toggled (); void tbLeftPanel_1_toggled ();
void tbLeftPanel_1_visible (bool visible); void tbLeftPanel_1_visible (bool visible);

8
rtgui/preferences.cc
View File

@ -779,8 +779,10 @@ Gtk::Widget* Preferences::getGeneralPanel () {
Gtk::HBox* hbworkflow3 = Gtk::manage( new Gtk::HBox () ); Gtk::HBox* hbworkflow3 = Gtk::manage( new Gtk::HBox () );
ckbFileBrowserToolbarSingleRow = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_FILEBROWSERTOOLBARSINGLEROW")) ); ckbFileBrowserToolbarSingleRow = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_FILEBROWSERTOOLBARSINGLEROW")) );
ckbShowFilmStripToolBar = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SHOWFILMSTRIPTOOLBAR")) );
hbworkflow3->pack_start (*ckbFileBrowserToolbarSingleRow, Gtk::PACK_SHRINK, 4); hbworkflow3->pack_start (*ckbFileBrowserToolbarSingleRow, Gtk::PACK_SHRINK, 4);
hbworkflow3->pack_start (*ckbShowFilmStripToolBar, Gtk::PACK_SHRINK, 4);
vbworkflow->pack_start (*hbworkflow3, Gtk::PACK_SHRINK, 0); vbworkflow->pack_start (*hbworkflow3, Gtk::PACK_SHRINK, 0);
Gtk::HBox* hbworkflow4 = Gtk::manage( new Gtk::HBox () ); Gtk::HBox* hbworkflow4 = Gtk::manage( new Gtk::HBox () );
@ -1406,6 +1408,7 @@ void Preferences::storePreferences () {
moptions.histogramPosition = ckbHistogramPositionLeft->get_active() ? 1 : 2; moptions.histogramPosition = ckbHistogramPositionLeft->get_active() ? 1 : 2;
moptions.showProfileSelector = ckbShowProfileSelector->get_active(); moptions.showProfileSelector = ckbShowProfileSelector->get_active();
moptions.FileBrowserToolbarSingleRow = ckbFileBrowserToolbarSingleRow->get_active(); moptions.FileBrowserToolbarSingleRow = ckbFileBrowserToolbarSingleRow->get_active();
moptions.showFilmStripToolBar = ckbShowFilmStripToolBar->get_active();
moptions.hideTPVScrollbar = ckbHideTPVScrollbar->get_active(); moptions.hideTPVScrollbar = ckbHideTPVScrollbar->get_active();
moptions.overwriteOutputFile = chOverwriteOutputFile->get_active (); moptions.overwriteOutputFile = chOverwriteOutputFile->get_active ();
moptions.UseIconNoText = ckbUseIconNoText->get_active(); moptions.UseIconNoText = ckbUseIconNoText->get_active();
@ -1555,6 +1558,7 @@ void Preferences::fillPreferences () {
// ckbHistogramWorking->set_active(moptions.histogramWorking==1); // ckbHistogramWorking->set_active(moptions.histogramWorking==1);
ckbShowProfileSelector->set_active(moptions.showProfileSelector); ckbShowProfileSelector->set_active(moptions.showProfileSelector);
ckbFileBrowserToolbarSingleRow->set_active(moptions.FileBrowserToolbarSingleRow); ckbFileBrowserToolbarSingleRow->set_active(moptions.FileBrowserToolbarSingleRow);
ckbShowFilmStripToolBar->set_active(moptions.showFilmStripToolBar);
ckbHideTPVScrollbar->set_active(moptions.hideTPVScrollbar); ckbHideTPVScrollbar->set_active(moptions.hideTPVScrollbar);
ckbUseIconNoText->set_active(moptions.UseIconNoText); ckbUseIconNoText->set_active(moptions.UseIconNoText);
@ -1859,6 +1863,10 @@ void Preferences::workflowUpdate (){
// Update the position of the Query toolbar // Update the position of the Query toolbar
parent->updateFBQueryTB(moptions.FileBrowserToolbarSingleRow); parent->updateFBQueryTB(moptions.FileBrowserToolbarSingleRow);
} }
if(moptions.showFilmStripToolBar != options.showFilmStripToolBar) {
// Update the visibility of FB toolbar
parent->updateFBToolBarVisibility(moptions.showFilmStripToolBar);
}
if(moptions.histogramPosition != options.histogramPosition) { if(moptions.histogramPosition != options.histogramPosition) {
// Update the position of the Histogram // Update the position of the Histogram
parent->updateHistogramPosition(options.histogramPosition, moptions.histogramPosition); parent->updateHistogramPosition(options.histogramPosition, moptions.histogramPosition);

1
rtgui/preferences.h
View File

@ -161,6 +161,7 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener {
Gtk::CheckButton* ckbHistogramWorking; Gtk::CheckButton* ckbHistogramWorking;
Gtk::CheckButton* ckbShowProfileSelector; Gtk::CheckButton* ckbShowProfileSelector;
Gtk::CheckButton* ckbFileBrowserToolbarSingleRow; Gtk::CheckButton* ckbFileBrowserToolbarSingleRow;
Gtk::CheckButton* ckbShowFilmStripToolBar;
Gtk::CheckButton* ckbHideTPVScrollbar; Gtk::CheckButton* ckbHideTPVScrollbar;
Gtk::CheckButton* ckbUseIconNoText; Gtk::CheckButton* ckbUseIconNoText;

4
rtgui/rtwindow.cc
View File

@ -750,6 +750,10 @@ void RTWindow::updateFBQueryTB (bool singleRow) {
fpanel->fileCatalog->updateFBQueryTB (singleRow); fpanel->fileCatalog->updateFBQueryTB (singleRow);
} }
void RTWindow::updateFBToolBarVisibility (bool showFilmStripToolBar){
fpanel->fileCatalog->updateFBToolBarVisibility (showFilmStripToolBar);
}
void RTWindow::updateHistogramPosition (int oldPosition, int newPosition) { void RTWindow::updateHistogramPosition (int oldPosition, int newPosition) {
epanel->updateHistogramPosition (oldPosition, newPosition); epanel->updateHistogramPosition (oldPosition, newPosition);

1
rtgui/rtwindow.h
View File

@ -102,6 +102,7 @@ class RTWindow : public Gtk::Window, public rtengine::ProgressListener{
void updateHistogramPosition (int oldPosition, int newPosition); void updateHistogramPosition (int oldPosition, int newPosition);
void updateTabsUsesIcons (bool useIcons); void updateTabsUsesIcons (bool useIcons);
void updateFBQueryTB (bool singleRow); void updateFBQueryTB (bool singleRow);
void updateFBToolBarVisibility (bool showFilmStripToolBar);
bool getIsFullscreen() { return is_fullscreen; } bool getIsFullscreen() { return is_fullscreen; }
void set_title_decorated(Glib::ustring fname); void set_title_decorated(Glib::ustring fname);
void CloseOpenEditors(); void CloseOpenEditors();