Issue 2873: Next/Previous Image buttons should not clear active filters.

This commit is contained in:
DrSlony
2015-08-09 20:39:23 +02:00
parent 3ff086de02
commit 8de1e5d249

View File

@@ -951,7 +951,7 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event) {
beforeAfter->set_active (!beforeAfter->get_active()); beforeAfter->set_active (!beforeAfter->get_active());
return true; return true;
case GDK_plus: case GDK_plus:
case GDK_equal: case GDK_equal:
case GDK_KP_Add: case GDK_KP_Add:
iareapanel->imageArea->zoomPanel->zoomInClicked(); iareapanel->imageArea->zoomPanel->zoomInClicked();
return true; return true;
@@ -996,7 +996,7 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event) {
iareapanel->imageArea->indClippedPanel->toggleClipped(false); iareapanel->imageArea->indClippedPanel->toggleClipped(false);
return true; return true;
case GDK_F5: case GDK_F5:
openThm->openDefaultViewer((event->state & GDK_SHIFT_MASK) ? 2 : 1); openThm->openDefaultViewer((event->state & GDK_SHIFT_MASK) ? 2 : 1);
return true; return true;
case GDK_y: // synchronize filebrowser with image in Editor case GDK_y: // synchronize filebrowser with image in Editor
@@ -1287,17 +1287,17 @@ void EditorPanel::sendToGimpPressed () {
void EditorPanel::openPreviousEditorImage() { void EditorPanel::openPreviousEditorImage() {
if (!simpleEditor && fPanel && !fname.empty()) if (!simpleEditor && fPanel && !fname.empty())
fPanel->fileCatalog->openNextPreviousEditorImage(fname, true, NAV_PREVIOUS); fPanel->fileCatalog->openNextPreviousEditorImage(fname, false, NAV_PREVIOUS);
} }
void EditorPanel::openNextEditorImage() { void EditorPanel::openNextEditorImage() {
if (!simpleEditor && fPanel && !fname.empty()) if (!simpleEditor && fPanel && !fname.empty())
fPanel->fileCatalog->openNextPreviousEditorImage(fname, true, NAV_NEXT); fPanel->fileCatalog->openNextPreviousEditorImage(fname, false, NAV_NEXT);
} }
void EditorPanel::syncFileBrowser() { // synchronize filebrowser with image in Editor void EditorPanel::syncFileBrowser() { // synchronize filebrowser with image in Editor
if (!simpleEditor && fPanel && !fname.empty()) if (!simpleEditor && fPanel && !fname.empty())
fPanel->fileCatalog->selectImage(fname, true); fPanel->fileCatalog->selectImage(fname, false);
} }
bool EditorPanel::idle_sendToGimp( ProgressConnector<rtengine::IImage16*> *pc, Glib::ustring fname){ bool EditorPanel::idle_sendToGimp( ProgressConnector<rtengine::IImage16*> *pc, Glib::ustring fname){