diff --git a/rtdata/images/toleftend.png b/rtdata/images/toleftend.png new file mode 100644 index 000000000..d49225579 Binary files /dev/null and b/rtdata/images/toleftend.png differ diff --git a/rtdata/images/torightend.png b/rtdata/images/torightend.png new file mode 100644 index 000000000..0550d058c Binary files /dev/null and b/rtdata/images/torightend.png differ diff --git a/rtgui/batchqueue.cc b/rtgui/batchqueue.cc index 5d87f06e1..710ed39c9 100644 --- a/rtgui/batchqueue.cc +++ b/rtgui/batchqueue.cc @@ -33,12 +33,20 @@ BatchQueue::BatchQueue () : processing(NULL), listener(NULL) { int p = 0; pmenu = new Gtk::Menu (); - pmenu->attach (*Gtk::manage(cancel = new Gtk::MenuItem (M("FILEBROWSER_POPUPCANCELJOB"))), 0, 1, p, p+1); p++; - pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++; - pmenu->attach (*Gtk::manage(head = new Gtk::MenuItem (M("FILEBROWSER_POPUPMOVEHEAD"))), 0, 1, p, p+1); p++; - pmenu->attach (*Gtk::manage(tail = new Gtk::MenuItem (M("FILEBROWSER_POPUPMOVEEND"))), 0, 1, p, p+1); p++; - pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 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++; + + pmenu->attach (*Gtk::manage(head = new Gtk::ImageMenuItem (M("FILEBROWSER_POPUPMOVEHEAD"))), 0, 1, p, p+1); p++; + head->set_image(*Gtk::manage(new Gtk::Image (argv0+"/images/toleftend.png"))); + + pmenu->attach (*Gtk::manage(tail = new Gtk::ImageMenuItem (M("FILEBROWSER_POPUPMOVEEND"))), 0, 1, p, p+1); p++; + tail->set_image(*Gtk::manage(new Gtk::Image (argv0+"/images/torightend.png"))); + + pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++; + + pmenu->attach (*Gtk::manage(cancel = new Gtk::ImageMenuItem (M("FILEBROWSER_POPUPCANCELJOB"))), 0, 1, p, p+1); p++; + cancel->set_image(*Gtk::manage(new Gtk::Image (argv0+"/images/deltags.png"))); + pmenu->show_all (); cancel->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &BatchQueue::cancelItems), &selected)); diff --git a/rtgui/batchqueue.h b/rtgui/batchqueue.h index 35e4e8999..a26080719 100644 --- a/rtgui/batchqueue.h +++ b/rtgui/batchqueue.h @@ -45,9 +45,9 @@ class BatchQueue : public ThumbBrowserBase, Glib::ustring nameTemplate; - Gtk::MenuItem* cancel; - Gtk::MenuItem* head; - Gtk::MenuItem* tail; + Gtk::ImageMenuItem* cancel; + Gtk::ImageMenuItem* head; + Gtk::ImageMenuItem* tail; Gtk::MenuItem* selall; Gtk::Menu* pmenu; diff --git a/rtgui/batchqueuebuttonset.cc b/rtgui/batchqueuebuttonset.cc index 1e084fd02..84b35657b 100644 --- a/rtgui/batchqueuebuttonset.cc +++ b/rtgui/batchqueuebuttonset.cc @@ -32,8 +32,8 @@ BatchQueueButtonSet::BatchQueueButtonSet (BatchQueueEntry* myEntry) { if (!iconsLoaded) { cancelIcon = safe_create_from_png (argv0+"/images/deltags.png"); - headIcon = safe_create_from_png (argv0+"/images/head.png"); - tailIcon = safe_create_from_png (argv0+"/images/tail.png"); + headIcon = safe_create_from_png (argv0+"/images/toleftend.png"); + tailIcon = safe_create_from_png (argv0+"/images/torightend.png"); iconsLoaded = true; }