Gtk3 by Hombre, issue 2807

This commit is contained in:
Morgan Hardwood
2015-08-12 16:07:19 +02:00
parent 91f67f0cb6
commit 56a0805bc7
133 changed files with 3950 additions and 2626 deletions

View File

@@ -77,33 +77,53 @@ ExifPanel::ExifPanel () : idata(NULL)
pack_start (*scrolledWindow);
Gtk::HBox* buttons1 = Gtk::manage(new Gtk::HBox ());
Gtk::HBox* buttons2 = Gtk::manage(new Gtk::HBox ());
Gtk::Grid* buttons = Gtk::manage(new Gtk::Grid());
buttons->set_row_homogeneous(true);
buttons->set_column_homogeneous(true);
setExpandAlignProperties(buttons, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
Gtk::Grid* buttons1 = Gtk::manage(new Gtk::Grid());
buttons1->set_row_homogeneous(true);
buttons1->set_column_homogeneous(true);
setExpandAlignProperties(buttons1, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
Gtk::Grid* buttons2 = Gtk::manage(new Gtk::Grid());
buttons2->set_row_homogeneous(true);
buttons2->set_column_homogeneous(true);
setExpandAlignProperties(buttons2, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
remove = Gtk::manage(new Gtk::Button (M("EXIFPANEL_REMOVE")));
remove = Gtk::manage(new Gtk::Button ()); // M("EXIFPANEL_REMOVE")
remove->set_image (*Gtk::manage(new Gtk::Image (delicon)));
remove->set_tooltip_text (M("EXIFPANEL_REMOVEHINT"));
buttons1->pack_start (*remove);
remove->get_style_context()->add_class("Left");
setExpandAlignProperties(remove, true, true, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
buttons1->attach_next_to(*remove, Gtk::POS_LEFT, 1, 1);
keep = Gtk::manage(new Gtk::Button (M("EXIFPANEL_KEEP")));
keep = Gtk::manage(new Gtk::Button ()); // M("EXIFPANEL_KEEP")
keep->set_image (*Gtk::manage(new Gtk::Image (keepicon)));
keep->set_tooltip_text (M("EXIFPANEL_KEEPHINT"));
buttons1->pack_start (*keep);
keep->get_style_context()->add_class("MiddleH");
setExpandAlignProperties(keep, true, true, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
buttons1->attach_next_to(*keep, Gtk::POS_RIGHT, 1, 1);
add = Gtk::manage(new Gtk::Button (M("EXIFPANEL_ADDEDIT")));
add = Gtk::manage(new Gtk::Button ()); // M("EXIFPANEL_ADDEDIT")
add->set_image (*Gtk::manage(new Gtk::Image (editicon)));
add->set_tooltip_text (M("EXIFPANEL_ADDEDITHINT"));
buttons1->pack_start (*add);
add->get_style_context()->add_class("Right");
setExpandAlignProperties(add, true, true, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
buttons1->attach_next_to(*add, Gtk::POS_RIGHT, 1, 1);
reset = Gtk::manage(new Gtk::Button (M("EXIFPANEL_RESET")));
reset = Gtk::manage(new Gtk::Button ()); // M("EXIFPANEL_RESET")
reset->set_image (*Gtk::manage(new RTImage ("gtk-undo-ltr.png", "gtk-undo-rtl.png")));
reset->set_tooltip_text (M("EXIFPANEL_RESETHINT"));
buttons2->pack_start (*reset);
reset->get_style_context()->add_class("Left");
setExpandAlignProperties(reset, true, true, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
buttons2->attach_next_to(*reset, Gtk::POS_LEFT, 1, 1);
resetAll = Gtk::manage(new Gtk::Button (M("EXIFPANEL_RESETALL")));
resetAll = Gtk::manage(new Gtk::Button ()); // M("EXIFPANEL_RESETALL")
resetAll->set_image (*Gtk::manage(new RTImage ("gtk-undoall-ltr.png", "gtk-undoall-rtl.png")));
resetAll->set_tooltip_text (M("EXIFPANEL_RESETALLHINT"));
buttons2->pack_start (*resetAll);
resetAll->get_style_context()->add_class("Right");
setExpandAlignProperties(resetAll, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
buttons2->attach_next_to(*resetAll, Gtk::POS_RIGHT, 1, 1);
pack_end (*buttons2, Gtk::PACK_SHRINK);
pack_end (*buttons1, Gtk::PACK_SHRINK);
@@ -397,7 +417,7 @@ void ExifPanel::resetAllPressed ()
void ExifPanel::addPressed ()
{
Gtk::Dialog* dialog = new Gtk::Dialog (M("EXIFPANEL_ADDTAGDLG_TITLE"), *((Gtk::Window*)get_toplevel()), true, true);
Gtk::Dialog* dialog = new Gtk::Dialog (M("EXIFPANEL_ADDTAGDLG_TITLE"), *((Gtk::Window*)get_toplevel()), true);
dialog->add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
dialog->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@@ -407,10 +427,10 @@ void ExifPanel::addPressed ()
Gtk::Label* tlabel = new Gtk::Label (M("EXIFPANEL_ADDTAGDLG_SELECTTAG") + ":");
MyComboBoxText* tcombo = new MyComboBoxText ();
tcombo->append_text ("Artist");
tcombo->append_text ("Copyright");
tcombo->append_text ("ImageDescription");
tcombo->append_text ("Exif.UserComment");
tcombo->append ("Artist");
tcombo->append ("Copyright");
tcombo->append ("ImageDescription");
tcombo->append ("Exif.UserComment");
hb1->pack_start (*tlabel, Gtk::PACK_SHRINK, 4);
hb1->pack_start (*tcombo);
@@ -428,7 +448,7 @@ void ExifPanel::addPressed ()
tcombo->set_active_text (sel);
if (tcombo->get_active () < 0) {
tcombo->append_text (sel);
tcombo->append (sel);
tcombo->set_active_text (sel);
}
@@ -437,8 +457,8 @@ void ExifPanel::addPressed ()
ventry->set_activates_default (true);
dialog->set_default_response (Gtk::RESPONSE_OK);
dialog->get_vbox()->pack_start (*hb1, Gtk::PACK_SHRINK);
dialog->get_vbox()->pack_start (*hb2, Gtk::PACK_SHRINK, 4);
dialog->get_content_area()->pack_start (*hb1, Gtk::PACK_SHRINK);
dialog->get_content_area()->pack_start (*hb2, Gtk::PACK_SHRINK, 4);
tlabel->show ();
tcombo->show ();
vlabel->show ();