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

Cleanup: make impl function order match header, fix declaration var name

Browse Source
This commit is contained in:
George Hilliard 2018-10-26 09:26:18 -05:00
parent cb3cc6cad1
commit 9a22e89125
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
rtgui/batchqueuepanel.cc
View File

@ -324,13 +324,6 @@ void BatchQueuePanel::addBatchQueueJobs(const std::vector<BatchQueueEntry*>& ent
}
}
bool BatchQueuePanel::canStartNext ()
{
// This function is called from the background BatchQueue thread.
// It cannot call UI functions, so grab the stored state of qStartStop.
return qStartStopState;
}
void BatchQueuePanel::saveOptions ()
{
@ -339,6 +332,33 @@ void BatchQueuePanel::saveOptions ()
options.procQueueEnabled = qAutoStart->get_active();
}
bool BatchQueuePanel::handleShortcutKey (GdkEventKey* event)
{
bool ctrl = event->state & GDK_CONTROL_MASK;
if (ctrl) {
switch(event->keyval) {
case GDK_KEY_s:
if (qStartStop->get_active()) {
stopBatchProc();
} else {
startBatchProc();
}
return true;
}
}
return batchQueue->keyPressed (event);
}
bool BatchQueuePanel::canStartNext ()
{
// This function is called from the background BatchQueue thread.
// It cannot call UI functions, so grab the stored state of qStartStop.
return qStartStopState;
}
void BatchQueuePanel::pathFolderButtonPressed ()
{
@ -368,23 +388,3 @@ void BatchQueuePanel::formatChanged(const Glib::ustring& format)
{
options.saveFormatBatch = saveFormatPanel->getFormat();
}
bool BatchQueuePanel::handleShortcutKey (GdkEventKey* event)
{
bool ctrl = event->state & GDK_CONTROL_MASK;
if (ctrl) {
switch(event->keyval) {
case GDK_KEY_s:
if (qStartStop->get_active()) {
stopBatchProc();
} else {
startBatchProc();
}
return true;
}
}
return batchQueue->keyPressed (event);
}

2
rtgui/batchqueuepanel.h
View File

@ -69,7 +69,7 @@ public:
bool handleShortcutKey (GdkEventKey* event);
// batchqueuelistener interface
void queueSizeChanged(int qsize, bool queueEmptied, bool queueError, const Glib::ustring& queueErrorMessage);
void queueSizeChanged(int qsize, bool queueRunning, bool queueError, const Glib::ustring& queueErrorMessage);
bool canStartNext();
private: