Merge with 4e0f46f25a716ac65a4016bac6284685147b5ec9

(note: color.cc is still in the source tree and CMakeLists.txt)
This commit is contained in:
michael
2012-07-09 06:28:15 -04:00
parent 5a7efbbbbb
commit 6b842fd408
35 changed files with 270 additions and 185 deletions

View File

@@ -34,10 +34,10 @@ class SaveAsDialog : public Gtk::Dialog, public FormatChangeListener {
Gtk::FileFilter filter_jpg;
Gtk::FileFilter filter_tif;
Gtk::FileFilter filter_png;
Gtk::RadioButton* immediately;
Gtk::RadioButton* putToQueueHead;
Gtk::RadioButton* putToQueueTail;
Gtk::ResponseType response;
Gtk::RadioButton* saveMethod[3]; /* 0 -> immediately
* 1 -> putToQueueHead
* 2 -> putToQueueTail
*/
public:
SaveAsDialog (Glib::ustring initialDir);
@@ -49,9 +49,9 @@ class SaveAsDialog : public Gtk::Dialog, public FormatChangeListener {
bool getImmediately ();
bool getToHeadOfQueue ();
bool getToTailOfQueue ();
int getSaveMethodNum ();
void setInitialFileName (Glib::ustring iname);
Gtk::ResponseType getResponse () { return response; };
void okPressed ();
void cancelPressed ();