Merge n.4 from branch3.0

2011-05-15 20:25:33 +02:00
parent 90421820a3
commit af90c97fdc
36 changed files with 1872 additions and 3088 deletions
--- a/rtgui/batchqueuepanel.h
+++ b/rtgui/batchqueuepanel.h
@@ -43,10 +43,6 @@ class BatchQueuePanel : public Gtk::VBox,
        SaveFormatPanel* saveFormatPanel;
        Gtk::Frame *fdir, *fformat;

-        Gtk::Image* hAlignIcon;
-        Gtk::Image* vAlignIcon;
-        Gtk::Button* chAlign;
-
        RTWindow* parent;
        BatchQueue* batchQueue;
        Gtk::HBox* bottomBox;
@@ -57,7 +53,6 @@ class BatchQueuePanel : public Gtk::VBox,
        BatchQueuePanel ();

        void setParent (RTWindow* p) { parent = p; }
-        void arrangementButtonPressed ();

        void addBatchQueueJobs (std::vector<BatchQueueEntry*> &entries , bool head=false);