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

Added ability to open images for editing from the Batch Queue tab. Patch by Leanid (prizzrak), issue 2689

Browse Source
This commit is contained in:
DrSlony
2015-02-26 19:12:09 +01:00
parent a1d638b1f5
commit 3c435f094d
34 changed files with 78 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtdata/languages/Catala
View File

@@ -108,6 +108,7 @@ FILEBROWSER_PARTIALPASTEPROFILE;Enganxa - parcialment
FILEBROWSER_PASTEPROFILE;Enganxa
FILEBROWSER_POPUPCANCELJOB;Cancel·la treball
FILEBROWSER_POPUPCOLORLABEL;Color d'etiqueta
FILEBROWSER_POPUPOPENINEDITOR;Obrir en Editor
FILEBROWSER_POPUPCOPYTO;Copia a...
FILEBROWSER_POPUPFILEOPERATIONS;Operacions amb fitxers
FILEBROWSER_POPUPMOVEEND;Mou a la fi de la cua

1
rtdata/languages/Chinese (Simplified)
View File

@@ -87,6 +87,7 @@ FILEBROWSER_PARTIALPASTEPROFILE;选择性粘贴
FILEBROWSER_PASTEPROFILE;粘贴配置
FILEBROWSER_POPUPCANCELJOB;取消任务
FILEBROWSER_POPUPCOLORLABEL;彩色标帖
FILEBROWSER_POPUPOPENINEDITOR;打开在编辑器
FILEBROWSER_POPUPCOPYTO;复制至...
FILEBROWSER_POPUPFILEOPERATIONS;文件操作
FILEBROWSER_POPUPMOVEEND;移动到队列尾部

1
rtdata/languages/Chinese (Traditional)
View File

@@ -41,6 +41,7 @@ FILEBROWSER_EMPTYTRASH;Empty Trash
FILEBROWSER_PARTIALPASTEPROFILE;Partial paste
FILEBROWSER_PASTEPROFILE;Paste profile
FILEBROWSER_POPUPCANCELJOB;Cancel job
FILEBROWSER_POPUPOPENINEDITOR;Open in Editor
FILEBROWSER_POPUPMOVEEND;Move to end of queue
FILEBROWSER_POPUPMOVEHEAD;Move to head of queue
FILEBROWSER_POPUPOPEN;Open

1
rtdata/languages/Czech
View File

@@ -153,6 +153,7 @@ FILEBROWSER_POPUPCOLORLABEL3;Štítek: Zelený
FILEBROWSER_POPUPCOLORLABEL4;Štítek: Modrý
FILEBROWSER_POPUPCOLORLABEL5;Štítek: Nachový
FILEBROWSER_POPUPCOLORLABEL;Barevný štítek
FILEBROWSER_POPUPOPENINEDITOR;Otevřít v editoru
FILEBROWSER_POPUPCOPYTO;Kopírovat do...
FILEBROWSER_POPUPFILEOPERATIONS;Souborové operace
FILEBROWSER_POPUPMOVEEND;Přesunout na konec fronty

1
rtdata/languages/Dansk
View File

@@ -38,6 +38,7 @@ FILEBROWSER_EMPTYTRASHHINT;Slet filerne i papirkurv permanent
FILEBROWSER_EMPTYTRASH;Tøm papirkurv
FILEBROWSER_PARTIALPASTEPROFILE;Indsæt delvist
FILEBROWSER_PASTEPROFILE;Indsæt profil
FILEBROWSER_POPUPOPENINEDITOR;Åbn i Editor
FILEBROWSER_POPUPCANCELJOB;Annuler opgave
FILEBROWSER_POPUPMOVEEND;Flyt til slutning af køen
FILEBROWSER_POPUPMOVEHEAD;Flyt til starten af køen

1
rtdata/languages/Deutsch
View File

@@ -129,6 +129,7 @@ FILEBROWSER_PARTIALPASTEPROFILE;Profil selektiv einfügen
FILEBROWSER_PASTEPROFILE;Profil einfügen
FILEBROWSER_POPUPCANCELJOB;Job abbrechen
FILEBROWSER_POPUPCOLORLABEL;Farbmarkierung
FILEBROWSER_POPUPOPENINEDITOR;Im Editor öffnen
FILEBROWSER_POPUPCOPYTO;Kopieren nach...
FILEBROWSER_POPUPFILEOPERATIONS;Dateioperationen
FILEBROWSER_POPUPMOVEEND;An das Ende der Warteschlange verschieben

1
rtdata/languages/English (US)
View File

@@ -122,6 +122,7 @@
!FILEBROWSER_POPUPCOLORLABEL4;Label: Blue
!FILEBROWSER_POPUPCOLORLABEL5;Label: Purple
!FILEBROWSER_POPUPCOLORLABEL;Color label
!FILEBROWSER_POPUPOPENINEDITOR;Open in Editor
!FILEBROWSER_POPUPCOPYTO;Copy to...
!FILEBROWSER_POPUPFILEOPERATIONS;File operations
!FILEBROWSER_POPUPMOVEEND;Move to end of queue

1
rtdata/languages/Espanol
View File

@@ -179,6 +179,7 @@ FILEBROWSER_POPUPCOLORLABEL3;Etiqueta: Verde
FILEBROWSER_POPUPCOLORLABEL4;Etiqueta: Azul
FILEBROWSER_POPUPCOLORLABEL5;Etiqueta: Púrpura
FILEBROWSER_POPUPCOLORLABEL;Etiquetar con un color
FILEBROWSER_POPUPOPENINEDITOR;Abrir en Editor
FILEBROWSER_POPUPCOPYTO;Copiar a...
FILEBROWSER_POPUPFILEOPERATIONS;Operaciones con archivos
FILEBROWSER_POPUPMOVEEND;Mover hacia el final de la cola

1
rtdata/languages/Euskara
View File

@@ -41,6 +41,7 @@ FILEBROWSER_PASTEPROFILE;Paste profile
FILEBROWSER_POPUPCANCELJOB;Cancel job
FILEBROWSER_POPUPMOVEEND;Move to end of queue
FILEBROWSER_POPUPMOVEHEAD;Move to head of queue
FILEBROWSER_POPUPOPENINEDITOR;Open in Editor
FILEBROWSER_POPUPOPEN;Open
FILEBROWSER_POPUPPROCESS;Put to processing queue
FILEBROWSER_POPUPREMOVE;Remove from filesystem

1
rtdata/languages/Francais
View File

@@ -119,6 +119,7 @@ FILEBROWSER_POPUPCOLORLABEL3;Label: Vert
FILEBROWSER_POPUPCOLORLABEL4;Label: Bleu
FILEBROWSER_POPUPCOLORLABEL5;Label: Pourpre
FILEBROWSER_POPUPCOLORLABEL;Label couleur
FILEBROWSER_POPUPOPENINEDITOR;Ouvrir dans l'éditeur
FILEBROWSER_POPUPCOPYTO;Copier vers...
FILEBROWSER_POPUPFILEOPERATIONS;Opérations sur les fichiers
FILEBROWSER_POPUPMOVEEND;Déplacer à la fin de la file

1
rtdata/languages/Greek
View File

@@ -41,6 +41,7 @@ FILEBROWSER_PASTEPROFILE;Paste profile
FILEBROWSER_POPUPCANCELJOB;Cancel job
FILEBROWSER_POPUPMOVEEND;Move to end of queue
FILEBROWSER_POPUPMOVEHEAD;Move to head of queue
FILEBROWSER_POPUPOPENINEDITOR;Open in Editor
FILEBROWSER_POPUPOPEN;Open
FILEBROWSER_POPUPPROCESS;Put to processing queue
FILEBROWSER_POPUPREMOVE;Remove from filesystem

1
rtdata/languages/Hebrew
View File

@@ -41,6 +41,7 @@ FILEBROWSER_PASTEPROFILE;Paste profile
FILEBROWSER_POPUPCANCELJOB;Cancel job
FILEBROWSER_POPUPMOVEEND;Move to end of queue
FILEBROWSER_POPUPMOVEHEAD;Move to head of queue
FILEBROWSER_POPUPOPENINEDITOR;Open in Editor
FILEBROWSER_POPUPOPEN;Open
FILEBROWSER_POPUPPROCESS;Put to processing queue
FILEBROWSER_POPUPREMOVE;Remove from filesystem

1
rtdata/languages/Italiano
View File

@@ -123,6 +123,7 @@ FILEBROWSER_POPUPCOLORLABEL3;Etichetta: Verde
FILEBROWSER_POPUPCOLORLABEL4;Etichetta: Blu
FILEBROWSER_POPUPCOLORLABEL5;Etichetta: Viola
FILEBROWSER_POPUPCOLORLABEL;Etichetta colorata
FILEBROWSER_POPUPOPENINEDITOR;Apri in Editor
FILEBROWSER_POPUPCOPYTO;Copia in...
FILEBROWSER_POPUPFILEOPERATIONS;Operazioni sul file
FILEBROWSER_POPUPMOVEEND;Sposta in fondo alla coda

1
rtdata/languages/Japanese
View File

@@ -146,6 +146,7 @@ FILEBROWSER_POPUPCOLORLABEL3;ラベル：　グリーン
FILEBROWSER_POPUPCOLORLABEL4;ラベル：　ブルー
FILEBROWSER_POPUPCOLORLABEL5;ラベル：　パープル
FILEBROWSER_POPUPCOLORLABEL;カラー・ラベル
FILEBROWSER_POPUPOPENINEDITOR;エディタで開く
FILEBROWSER_POPUPCOPYTO;コピーします...
FILEBROWSER_POPUPFILEOPERATIONS;ファイルの操作
FILEBROWSER_POPUPMOVEEND;キュー処理の最後に移動

1
rtdata/languages/Latvian
View File

@@ -41,6 +41,7 @@ FILEBROWSER_PASTEPROFILE;Ielīmēt profilu
FILEBROWSER_POPUPCANCELJOB;Atcelt darbu
FILEBROWSER_POPUPMOVEEND;Pārvietot uz rindas beigām
FILEBROWSER_POPUPMOVEHEAD;Pārvietot uz rindas sākumu
FILEBROWSER_POPUPOPENINEDITOR;Atvērt redaktorā
FILEBROWSER_POPUPOPEN;Atvērt
FILEBROWSER_POPUPPROCESS;Ielikt apstrādes rindā
FILEBROWSER_POPUPREMOVE;Dzēst no failu sistēmas

1
rtdata/languages/Magyar
View File

@@ -104,6 +104,7 @@ FILEBROWSER_PARTIALPASTEPROFILE;Részleges beillesztés
FILEBROWSER_PASTEPROFILE;Feldolgozási paraméterek beillesztése
FILEBROWSER_POPUPCANCELJOB;Eltávolítás a sorból
FILEBROWSER_POPUPCOLORLABEL;Színcímke
FILEBROWSER_POPUPOPENINEDITOR;Open in Szerkesztő
FILEBROWSER_POPUPCOPYTO;Másolás máshová...
FILEBROWSER_POPUPFILEOPERATIONS;Állományműveletek
FILEBROWSER_POPUPMOVEEND;Végére mozgatás

1
rtdata/languages/Nederlands
View File

@@ -130,6 +130,7 @@ FILEBROWSER_POPUPCOLORLABEL3;Label: Groen
FILEBROWSER_POPUPCOLORLABEL4;Label: Blauw
FILEBROWSER_POPUPCOLORLABEL5;Label: Paars
FILEBROWSER_POPUPCOLORLABEL;Kleur label
FILEBROWSER_POPUPOPENINEDITOR;Open in Editor
FILEBROWSER_POPUPCOPYTO;Kopieer naar...
FILEBROWSER_POPUPFILEOPERATIONS;Bestandsbewerkingen
FILEBROWSER_POPUPMOVEEND;Naar eind van verwerkingsrij

1
rtdata/languages/Norsk BM
View File

@@ -41,6 +41,7 @@ FILEBROWSER_PASTEPROFILE;Lim inn profil
FILEBROWSER_POPUPCANCELJOB;Avbryt jobben
FILEBROWSER_POPUPMOVEEND;Flytt til enden av køen
FILEBROWSER_POPUPMOVEHEAD;Flytt til begynnelsen av køen
FILEBROWSER_POPUPOPENINEDITOR;Åpne i Editor
FILEBROWSER_POPUPOPEN;Åpne
FILEBROWSER_POPUPPROCESS;Legg til i prosesseringskøen
FILEBROWSER_POPUPREMOVE;Fjern fra filsystem

1
rtdata/languages/Polish
View File

@@ -127,6 +127,7 @@ FILEBROWSER_POPUPCOLORLABEL3;Etykieta: Zielona
FILEBROWSER_POPUPCOLORLABEL4;Etykieta: Niebieska
FILEBROWSER_POPUPCOLORLABEL5;Etykieta: Purpurowa
FILEBROWSER_POPUPCOLORLABEL;Kolorowa etykieta
FILEBROWSER_POPUPOPENINEDITOR;Otwórz w edytorze
FILEBROWSER_POPUPCOPYTO;Skopiuj do...
FILEBROWSER_POPUPFILEOPERATIONS;Operacje na plikach
FILEBROWSER_POPUPMOVEEND;Przenieś na koniec kolejki

1
rtdata/languages/Polish (Latin Characters)
View File

@@ -127,6 +127,7 @@ FILEBROWSER_POPUPCOLORLABEL3;Etykieta: Zielona
FILEBROWSER_POPUPCOLORLABEL4;Etykieta: Niebieska
FILEBROWSER_POPUPCOLORLABEL5;Etykieta: Purpurowa
FILEBROWSER_POPUPCOLORLABEL;Kolorowa etykieta
FILEBROWSER_POPUPOPENINEDITOR;Otworz w edytorze
FILEBROWSER_POPUPCOPYTO;Skopiuj do...
FILEBROWSER_POPUPFILEOPERATIONS;Operacje na plikach
FILEBROWSER_POPUPMOVEEND;Przenies na koniec kolejki

1
rtdata/languages/Portugues (Brasil)
View File

@@ -41,6 +41,7 @@ FILEBROWSER_PASTEPROFILE;Colar Perfil
FILEBROWSER_POPUPCANCELJOB;Cancelar trabalho
FILEBROWSER_POPUPMOVEEND;Mover para o fim da fila
FILEBROWSER_POPUPMOVEHEAD;Mover para o início da fila
FILEBROWSER_POPUPOPENINEDITOR;Abrir em Editor de
FILEBROWSER_POPUPOPEN;Abrir
FILEBROWSER_POPUPPROCESS;Colocar na fila de processamento
FILEBROWSER_POPUPREMOVE;Remover do sistema de arquivos

1
rtdata/languages/Russian
View File

@@ -123,6 +123,7 @@ FILEBROWSER_POPUPCOLORLABEL3;Пометка: Зеленым
FILEBROWSER_POPUPCOLORLABEL4;Пометка: Синим
FILEBROWSER_POPUPCOLORLABEL5;Пометка: Фиолетовым
FILEBROWSER_POPUPCOLORLABEL;Цветовая пометка
FILEBROWSER_POPUPOPENINEDITOR;Открыть в редакторе
FILEBROWSER_POPUPCOPYTO;Скопировать в...
FILEBROWSER_POPUPFILEOPERATIONS;Действия с файлами
FILEBROWSER_POPUPMOVEEND;Переместить в конец очереди

1
rtdata/languages/Serbian (Cyrilic Characters)
View File

@@ -79,6 +79,7 @@ FILEBROWSER_PARTIALPASTEPROFILE;Делимично убаци
FILEBROWSER_PASTEPROFILE;Убаци профил
FILEBROWSER_POPUPCANCELJOB;Откажи задатак
FILEBROWSER_POPUPCOLORLABEL;Обојена ознака
FILEBROWSER_POPUPOPENINEDITOR;Отвори у уреднику
FILEBROWSER_POPUPCOPYTO;Умножи у...
FILEBROWSER_POPUPFILEOPERATIONS;Датотека
FILEBROWSER_POPUPMOVEEND;Премести на крај заказаних

1
rtdata/languages/Serbian (Latin Characters)
View File

@@ -79,6 +79,7 @@ FILEBROWSER_PARTIALPASTEPROFILE;Delimično ubaci
FILEBROWSER_PASTEPROFILE;Ubaci profil
FILEBROWSER_POPUPCANCELJOB;Otkaži zadatak
FILEBROWSER_POPUPCOLORLABEL;Obojena oznaka
FILEBROWSER_POPUPOPENINEDITOR;Otvori u Uredniku
FILEBROWSER_POPUPCOPYTO;Umnoži u...
FILEBROWSER_POPUPFILEOPERATIONS;Datoteka
FILEBROWSER_POPUPMOVEEND;Premesti na kraj zakazanih

1
rtdata/languages/Slovak
View File

@@ -57,6 +57,7 @@ FILEBROWSER_PASTEPROFILE;Vložiť profil
FILEBROWSER_POPUPCANCELJOB;Zrušiť úlohu
FILEBROWSER_POPUPMOVEEND;Presunúť na koniec radu
FILEBROWSER_POPUPMOVEHEAD;Presunúť na začiatok radu
FILEBROWSER_POPUPOPENINEDITOR;Otvoriť v editore
FILEBROWSER_POPUPOPEN;Otvoriť
FILEBROWSER_POPUPPROCESS;Vložiť do radu na spracovanie
FILEBROWSER_POPUPREMOVE;Odstrániť zo systému súborov

1
rtdata/languages/Suomi
View File

@@ -41,6 +41,7 @@ FILEBROWSER_PASTEPROFILE;Liitä profiili
FILEBROWSER_POPUPCANCELJOB;Peruuta työ
FILEBROWSER_POPUPMOVEEND;Siirrä jonon viimeiseksi
FILEBROWSER_POPUPMOVEHEAD;Siirrä jonon ensimmäiseksi
FILEBROWSER_POPUPOPENINEDITOR;Avaa Editor
FILEBROWSER_POPUPOPEN;Avaa
FILEBROWSER_POPUPPROCESS;Laita käsittelyjonoon
FILEBROWSER_POPUPREMOVE;Poista kokonaan

1
rtdata/languages/Swedish
View File

@@ -113,6 +113,7 @@ FILEBROWSER_PARTIALPASTEPROFILE;Klistra in partiell profil
FILEBROWSER_PASTEPROFILE;Klistra in profil
FILEBROWSER_POPUPCANCELJOB;Avbryt
FILEBROWSER_POPUPCOLORLABEL;Färgetikett
FILEBROWSER_POPUPOPENINEDITOR;Öppna i Editor
FILEBROWSER_POPUPCOPYTO;Kopiera till...
FILEBROWSER_POPUPFILEOPERATIONS;Filaktiviteter
FILEBROWSER_POPUPMOVEEND;Flytta till slutet av behandlingskön

1
rtdata/languages/Turkish
View File

@@ -41,6 +41,7 @@ FILEBROWSER_PASTEPROFILE;Paste profile
FILEBROWSER_POPUPCANCELJOB;Cancel job
FILEBROWSER_POPUPMOVEEND;Move to end of queue
FILEBROWSER_POPUPMOVEHEAD;Move to head of queue
FILEBROWSER_POPUPOPENINEDITOR;Open in Editor
FILEBROWSER_POPUPOPEN;Open
FILEBROWSER_POPUPPROCESS;Put to processing queue
FILEBROWSER_POPUPREMOVE;Remove from filesystem

1
rtdata/languages/default
View File

@@ -122,6 +122,7 @@ FILEBROWSER_POPUPCOLORLABEL3;Label: Green
FILEBROWSER_POPUPCOLORLABEL4;Label: Blue
FILEBROWSER_POPUPCOLORLABEL5;Label: Purple
FILEBROWSER_POPUPCOLORLABEL;Color label
FILEBROWSER_POPUPOPENINEDITOR;Open in Editor
FILEBROWSER_POPUPCOPYTO;Copy to...
FILEBROWSER_POPUPFILEOPERATIONS;File operations
FILEBROWSER_POPUPMOVEEND;Move to end of queue

37
rtgui/batchqueue.cc
View File

@@ -25,6 +25,7 @@
#include <sstream>
#include <string>
#include "thumbnail.h"
#include "batchqueue.h"
#include "multilangmgr.h"
#include "filecatalog.h"
@@ -36,12 +37,14 @@
using namespace std;
using namespace rtengine;
BatchQueue::BatchQueue () : processing(NULL), sequence(0), listener(NULL) {
BatchQueue::BatchQueue (FileCatalog* aFileCatalog) : processing(NULL), fileCatalog(aFileCatalog), sequence(0), listener(NULL) {
location = THLOC_BATCHQUEUE;
int p = 0;
pmenu = new Gtk::Menu ();
pmenu->attach (*Gtk::manage(open = new Gtk::MenuItem (M("FILEBROWSER_POPUPOPENINEDITOR"))), 0, 1, p, p+1); p++;
pmenu->attach (*Gtk::manage(selall = new Gtk::MenuItem (M("FILEBROWSER_POPUPSELECTALL"))), 0, 1, p, p+1); p++;
pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++;
@@ -61,11 +64,13 @@ BatchQueue::BatchQueue () : processing(NULL), sequence(0), listener(NULL) {
// Accelerators
pmaccelgroup = Gtk::AccelGroup::create ();
pmenu->set_accel_group (pmaccelgroup);
open->add_accelerator ("activate", pmenu->get_accel_group(), GDK_e, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
selall->add_accelerator ("activate", pmenu->get_accel_group(), GDK_a, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
head->add_accelerator ("activate", pmenu->get_accel_group(), GDK_Home, (Gdk::ModifierType)0, Gtk::ACCEL_VISIBLE);
tail->add_accelerator ("activate", pmenu->get_accel_group(), GDK_End, (Gdk::ModifierType)0, Gtk::ACCEL_VISIBLE);
cancel->add_accelerator ("activate", pmenu->get_accel_group(), GDK_Delete, (Gdk::ModifierType)0, Gtk::ACCEL_VISIBLE);
open->signal_activate().connect(sigc::mem_fun(*this, &BatchQueue::openLastSelectedItemInEditor));
cancel->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &BatchQueue::cancelItems), &selected));
head->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &BatchQueue::headItems), &selected));
tail->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &BatchQueue::tailItems), &selected));
@@ -126,6 +131,10 @@ void BatchQueue::rightClicked (ThumbBrowserEntryBase* entry) {
pmenu->popup (3, this->eventTime);
}
void BatchQueue::doubleClicked(ThumbBrowserEntryBase* entry) {
openItemInEditor(entry);
}
bool BatchQueue::keyPressed (GdkEventKey* event) {
bool ctrl = event->state & GDK_CONTROL_MASK;
@@ -133,6 +142,10 @@ bool BatchQueue::keyPressed (GdkEventKey* event) {
selectAll ();
return true;
}
else if ((event->keyval==GDK_E || event->keyval== GDK_e) && ctrl) {
openLastSelectedItemInEditor();
return true;
}
else if (event->keyval==GDK_Home) {
headItems (&selected);
return true;
@@ -538,6 +551,28 @@ void BatchQueue::selectAll () {
queue_draw ();
}
void BatchQueue::openLastSelectedItemInEditor() {
{
// TODO: Check for Linux
#if PROTECT_VECTORS
MYREADERLOCK(l, entryRW);
#endif
if (selected.size() > 0) {
openItemInEditor(selected.back());
}
}
}
void BatchQueue::openItemInEditor(ThumbBrowserEntryBase* item) {
if (item) {
std::vector< ::Thumbnail*> requestedItem;
requestedItem.push_back(item->thumbnail);
fileCatalog->openRequested(requestedItem);
}
}
void BatchQueue::startProcessing () {
if (!processing) {

7
rtgui/batchqueue.h
View File

@@ -45,6 +45,7 @@ class BatchQueue : public ThumbBrowserBase,
int getThumbnailHeight ();
BatchQueueEntry* processing; // holds the currently processed image
FileCatalog* fileCatalog;
int sequence; // holds the current sequence index
Glib::ustring nameTemplate;
@@ -53,6 +54,7 @@ class BatchQueue : public ThumbBrowserBase,
Gtk::ImageMenuItem* head;
Gtk::ImageMenuItem* tail;
Gtk::MenuItem* selall;
Gtk::MenuItem* open;
Gtk::Menu* pmenu;
Glib::RefPtr<Gtk::AccelGroup> pmaccelgroup;
@@ -65,7 +67,7 @@ class BatchQueue : public ThumbBrowserBase,
void notifyListener (bool queueEmptied);
public:
BatchQueue ();
BatchQueue (FileCatalog* aFileCatalog);
~BatchQueue ();
void addEntries (std::vector<BatchQueueEntry*> &entries, bool head=false, bool save=true);
@@ -73,6 +75,8 @@ class BatchQueue : public ThumbBrowserBase,
void headItems (std::vector<ThumbBrowserEntryBase*>* items);
void tailItems (std::vector<ThumbBrowserEntryBase*>* items);
void selectAll ();
void openItemInEditor(ThumbBrowserEntryBase* item);
void openLastSelectedItemInEditor();
void startProcessing ();
@@ -89,6 +93,7 @@ class BatchQueue : public ThumbBrowserBase,
void error (Glib::ustring msg);
void setProgress (double p);
void rightClicked (ThumbBrowserEntryBase* entry);
void doubleClicked (ThumbBrowserEntryBase* entry);
bool keyPressed (GdkEventKey* event);
void buttonPressed (LWButton* button, int actionCode, void* actionData);
void redrawNeeded (LWButton* button);

4
rtgui/batchqueuepanel.cc
View File

@@ -49,9 +49,9 @@ static Glib::ustring makeFolderLabel(Glib::ustring path)
return path;
}
BatchQueuePanel::BatchQueuePanel () {
BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog) {
batchQueue = Gtk::manage( new BatchQueue() );
batchQueue = Gtk::manage( new BatchQueue(aFileCatalog) );
// construct batch queue panel with the extra "start" and "stop" button
Gtk::VBox* batchQueueButtonBox = Gtk::manage (new Gtk::VBox);

4
rtgui/batchqueuepanel.h
View File

@@ -25,6 +25,8 @@
#include "guiutils.h"
class RTWindow;
class FileCatalog;
class Thumbnail;
class BatchQueuePanel : public Gtk::VBox,
public BatchQueueListener,
public FormatChangeListener {
@@ -52,7 +54,7 @@ class BatchQueuePanel : public Gtk::VBox,
public:
BatchQueuePanel ();
BatchQueuePanel (FileCatalog* aFileCatalog);
void setParent (RTWindow* p) { parent = p; }

2
rtgui/rtwindow.cc
View File

@@ -181,7 +181,7 @@ RTWindow::RTWindow ()
mainNB->append_page (*fpanel, *hbf);
}
bpanel = Gtk::manage ( new BatchQueuePanel () );
bpanel = Gtk::manage ( new BatchQueuePanel (fpanel->fileCatalog) );
bpanel->setParent (this);
// decorate tab, the label is unimportant since its updated in batchqueuepanel anyway