F5 Ultimate Edition ;-) see issue #372
This commit is contained in:
@@ -644,6 +644,7 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event) {
|
||||
bool shift = event->state & GDK_SHIFT_MASK;
|
||||
|
||||
if (!ctrl) {
|
||||
// Normal
|
||||
switch(event->keyval) {
|
||||
case GDK_h:
|
||||
case GDK_H:
|
||||
@@ -674,11 +675,12 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event) {
|
||||
return true;
|
||||
|
||||
case GDK_F5:
|
||||
openThm->openBatchResultDefaultViewer();
|
||||
openThm->openDefaultViewer(event->state & GDK_SHIFT_MASK ? 2 : 1);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// With control
|
||||
switch (event->keyval) {
|
||||
case GDK_s:
|
||||
saveAsPressed();
|
||||
@@ -695,6 +697,10 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event) {
|
||||
case GDK_Z:
|
||||
history->redo ();
|
||||
return true;
|
||||
case GDK_F5:
|
||||
openThm->openDefaultViewer(3);
|
||||
return true;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -392,9 +392,9 @@ void FileBrowser::partPasteProfile () {
|
||||
partialPasteDlg.hide ();
|
||||
}
|
||||
|
||||
void FileBrowser::openBatchResultDefaultViewer () {
|
||||
void FileBrowser::openDefaultViewer (int destination) {
|
||||
if (selected.size()==1)
|
||||
((FileBrowserEntry*)selected[0])->thumbnail->openBatchResultDefaultViewer();
|
||||
((FileBrowserEntry*)selected[0])->thumbnail->openDefaultViewer(destination);
|
||||
}
|
||||
|
||||
bool FileBrowser::keyPressed (GdkEventKey* event) {
|
||||
@@ -428,7 +428,13 @@ bool FileBrowser::keyPressed (GdkEventKey* event) {
|
||||
return true;
|
||||
}
|
||||
else if (event->keyval==GDK_F5) {
|
||||
openBatchResultDefaultViewer ();
|
||||
int dest = 1;
|
||||
if (event->state & GDK_SHIFT_MASK)
|
||||
dest = 2;
|
||||
else if (event->state & GDK_CONTROL_MASK)
|
||||
dest = 3;
|
||||
|
||||
openDefaultViewer (dest);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@@ -113,7 +113,7 @@ class FileBrowser : public ThumbBrowserBase, public LWButtonListener {
|
||||
void pasteProfile ();
|
||||
void partPasteProfile ();
|
||||
|
||||
void openBatchResultDefaultViewer ();
|
||||
void openDefaultViewer (int destination);
|
||||
|
||||
void redrawNeeded (ThumbBrowserEntryBase* entry);
|
||||
void thumbRearrangementNeeded ();
|
||||
|
1075
rtgui/thumbnail.cc
1075
rtgui/thumbnail.cc
File diff suppressed because it is too large
Load Diff
@@ -128,7 +128,7 @@ class Thumbnail {
|
||||
void updateCache ();
|
||||
void saveThumbnail ();
|
||||
|
||||
bool openBatchResultDefaultViewer();
|
||||
bool openDefaultViewer(int destination);
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user