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

Merge branch 'master' into 'gtk3'

Browse Source 
Most conflicts seemed to be simple enough. There were a lot of `append_text` to
`append` conversions for `Gtk::ComboBoxText`. The `PopUpCommon` class also saw
a lot of changes with non-trivial conflict resolutions.
This commit is contained in:
Adam Reichold
2016-01-06 23:56:12 +01:00
parent fd553e04e1 a727460f77
commit 8151e0f5ce
167 changed files with 13108 additions and 2410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/batchqueuepanel.cc
View File

@@ -344,8 +344,8 @@ void BatchQueuePanel::pathFolderButtonPressed ()
int result = fc.run();
if (result == Gtk::RESPONSE_OK) {
if (safe_file_test(fc.get_current_folder(), Glib::FILE_TEST_IS_DIR)) {
options.savePathFolder = fc.get_current_folder();
if (safe_file_test(fc.get_filename(), Glib::FILE_TEST_IS_DIR)) {
options.savePathFolder = fc.get_filename();
outdirFolderButton->set_label(makeFolderLabel(options.savePathFolder));
}
}
@@ -356,7 +356,7 @@ void BatchQueuePanel::pathFolderButtonPressed ()
void BatchQueuePanel::pathFolderChanged ()
{
options.savePathFolder = outdirFolder->get_current_folder();
options.savePathFolder = outdirFolder->get_filename();
}
void BatchQueuePanel::formatChanged (Glib::ustring f)