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

Batch rename (Kill Szeva), Issue 316

Browse Source
This commit is contained in:
Ingo
2014-02-25 20:07:52 +01:00
parent 581efe13b4
commit e7b1c2edb6
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
rtgui/renamedlg.cc
View File

@@ -36,33 +36,35 @@ RenameDialog::RenameDialog (Gtk::Window* parent)
names->attach (*newName, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2); names->attach (*newName, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
get_vbox()->pack_start (*names, Gtk::PACK_SHRINK, 4); get_vbox()->pack_start (*names, Gtk::PACK_SHRINK, 4);
Gtk::HBox* tbox = Gtk::manage (new Gtk::HBox());
useTmpl = Gtk::manage (new Gtk::CheckButton (M("FILEBROWSER_USETEMPLATE")));
templates = Gtk::manage (new MyComboBox ());
templateModel = Gtk::ListStore::create (templateColumns);
templates->set_model (templateModel);
templates->pack_start (templateColumns.tmplName);
tbox->pack_start (*useTmpl, Gtk::PACK_SHRINK, 4); // Issue 316
tbox->pack_start (*templates); // Gtk::HBox* tbox = Gtk::manage (new Gtk::HBox());
// useTmpl = Gtk::manage (new Gtk::CheckButton (M("FILEBROWSER_USETEMPLATE")));
// templates = Gtk::manage (new MyComboBox ());
// templateModel = Gtk::ListStore::create (templateColumns);
// templates->set_model (templateModel);
// templates->pack_start (templateColumns.tmplName);
// tbox->pack_start (*useTmpl, Gtk::PACK_SHRINK, 4);
// tbox->pack_start (*templates);
get_vbox()->pack_start (*tbox, Gtk::PACK_SHRINK, 4); // get_vbox()->pack_start (*tbox, Gtk::PACK_SHRINK, 4);
add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK); add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
all = add_button ("All", RESPONSE_ALL); // Issue 316
// all = add_button ("All", RESPONSE_ALL);
newName->set_activates_default (true); newName->set_activates_default (true);
set_default_response (Gtk::RESPONSE_OK); set_default_response (Gtk::RESPONSE_OK);
// Issue 316
fillTemplateList (); // fillTemplateList ();
templates->set_row_separator_func (sigc::mem_fun(*this, &RenameDialog::rowSeparatorFunc)); // templates->set_row_separator_func (sigc::mem_fun(*this, &RenameDialog::rowSeparatorFunc));
templates->signal_changed().connect(sigc::mem_fun(*this, &RenameDialog::tmplSelectionChanged)); // templates->signal_changed().connect(sigc::mem_fun(*this, &RenameDialog::tmplSelectionChanged));
useTmpl->signal_toggled().connect( sigc::mem_fun(*this, &RenameDialog::useTemplToggled) ); // useTmpl->signal_toggled().connect( sigc::mem_fun(*this, &RenameDialog::useTemplToggled) );
useTmpl->set_active (options.renameUseTemplates); // useTmpl->set_active (options.renameUseTemplates);
show_all_children (); show_all_children ();
} }
@@ -72,8 +74,9 @@ void RenameDialog::initName (const Glib::ustring& iname, const CacheImageData* c
imageData = cid; imageData = cid;
oldName->set_text (iname); oldName->set_text (iname);
newName->set_text (iname); newName->set_text (iname);
if (useTmpl->get_active () && isTemplSelected ()) // Issue 316
newName->set_text (applyTemplate (iname, cid, getActiveTemplate())); // if (useTmpl->get_active () && isTemplSelected ())
// newName->set_text (applyTemplate (iname, cid, getActiveTemplate()));
newName->select_region (0, newName->get_text().size()); newName->select_region (0, newName->get_text().size());
} }