F5 Ultimate Edition ;-) see issue #372

This commit is contained in:
Oliver Duis
2010-12-04 06:47:09 +01:00
parent 0fd8ffba3f
commit 1660fca85d
5 changed files with 572 additions and 527 deletions

View File

@@ -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;
}
}

View File

@@ -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;
}

View File

@@ -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 ();

File diff suppressed because it is too large Load Diff

View File

@@ -128,7 +128,7 @@ class Thumbnail {
void updateCache ();
void saveThumbnail ();
bool openBatchResultDefaultViewer();
bool openDefaultViewer(int destination);
};