Rebased in new branch to cleanup commit history.
This commit is contained in:
Morgan Hardwood
2018-07-13 18:13:35 +02:00
parent 93d5b3692d
commit 522495f4eb
1457 changed files with 31416 additions and 421 deletions

View File

@@ -67,18 +67,18 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt,
}
editPointCustom = Gtk::manage (new Gtk::ToggleButton ());
initButton(*editPointCustom, Glib::ustring("gtk-edit.png"), Gtk::ALIGN_START, false, "CURVEEDITOR_EDITPOINT_HINT");
initButton(*editPointCustom, Glib::ustring("edit-point.png"), Gtk::ALIGN_START, false, "CURVEEDITOR_EDITPOINT_HINT");
editCustom = Gtk::manage (new Gtk::ToggleButton());
initButton(*editCustom, Glib::ustring("editmodehand.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
initButton(*editCustom, Glib::ustring("crosshair1-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
editCustom->hide();
copyCustom = Gtk::manage (new Gtk::Button ());
initButton(*copyCustom, Glib::ustring("edit-copy.png"), Gtk::ALIGN_END, true);
initButton(*copyCustom, Glib::ustring("copy.png"), Gtk::ALIGN_END, true);
pasteCustom = Gtk::manage (new Gtk::Button ());
initButton(*pasteCustom, Glib::ustring("edit-paste.png"), Gtk::ALIGN_END, false);
initButton(*pasteCustom, Glib::ustring("paste.png"), Gtk::ALIGN_END, false);
loadCustom = Gtk::manage (new Gtk::Button ());
initButton(*loadCustom, Glib::ustring("gtk-open.png"), Gtk::ALIGN_END, false);
initButton(*loadCustom, Glib::ustring("folder-open.png"), Gtk::ALIGN_END, false);
saveCustom = Gtk::manage (new Gtk::Button ());
initButton(*saveCustom, Glib::ustring("gtk-save-large.png"), Gtk::ALIGN_END, false);
initButton(*saveCustom, Glib::ustring("save.png"), Gtk::ALIGN_END, false);
custombbox->attach_next_to(*editPointCustom, sideStart, 1, 1);
custombbox->attach_next_to(*editCustom, sideStart, 1, 1);
@@ -144,18 +144,18 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt,
}
editPointNURBS = Gtk::manage (new Gtk::ToggleButton ());
initButton(*editPointNURBS, Glib::ustring("gtk-edit.png"), Gtk::ALIGN_START, false, "CURVEEDITOR_EDITPOINT_HINT");
initButton(*editPointNURBS, Glib::ustring("edit-point.png"), Gtk::ALIGN_START, false, "CURVEEDITOR_EDITPOINT_HINT");
editNURBS = Gtk::manage (new Gtk::ToggleButton());
initButton(*editNURBS, Glib::ustring("editmodehand.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
initButton(*editNURBS, Glib::ustring("crosshair1-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
editNURBS->hide();
copyNURBS = Gtk::manage (new Gtk::Button ());
initButton(*copyNURBS, Glib::ustring("edit-copy.png"), Gtk::ALIGN_END, true);
initButton(*copyNURBS, Glib::ustring("copy.png"), Gtk::ALIGN_END, true);
pasteNURBS = Gtk::manage (new Gtk::Button ());
initButton(*pasteNURBS, Glib::ustring("edit-paste.png"), Gtk::ALIGN_END, false);
initButton(*pasteNURBS, Glib::ustring("paste.png"), Gtk::ALIGN_END, false);
loadNURBS = Gtk::manage (new Gtk::Button ());
initButton(*loadNURBS, Glib::ustring("gtk-open.png"), Gtk::ALIGN_END, false);
initButton(*loadNURBS, Glib::ustring("folder-open.png"), Gtk::ALIGN_END, false);
saveNURBS = Gtk::manage (new Gtk::Button ());
initButton(*saveNURBS, Glib::ustring("gtk-save-large.png"), Gtk::ALIGN_END, false);
initButton(*saveNURBS, Glib::ustring("save.png"), Gtk::ALIGN_END, false);
NURBSbbox->attach_next_to(*editPointNURBS, sideStart, 1, 1);
NURBSbbox->attach_next_to(*editNURBS, sideStart, 1, 1);
@@ -224,16 +224,16 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt,
shcSelector->set_name("CurveSHCSelector"); // To handle the 4px gap between the SHCSelector and the curve through CSS
editParam = Gtk::manage (new Gtk::ToggleButton());
initButton(*editParam, Glib::ustring("editmodehand.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
initButton(*editParam, Glib::ustring("crosshair1-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
editParam->hide();
copyParam = Gtk::manage (new Gtk::Button ());
initButton(*copyParam, Glib::ustring("edit-copy.png"), Gtk::ALIGN_END, true);
initButton(*copyParam, Glib::ustring("copy.png"), Gtk::ALIGN_END, true);
pasteParam = Gtk::manage (new Gtk::Button ());
initButton(*pasteParam, Glib::ustring("edit-paste.png"), Gtk::ALIGN_END, false);
initButton(*pasteParam, Glib::ustring("paste.png"), Gtk::ALIGN_END, false);
loadParam = Gtk::manage (new Gtk::Button ());
initButton(*loadParam, Glib::ustring("gtk-open.png"), Gtk::ALIGN_END, false);
initButton(*loadParam, Glib::ustring("folder-open.png"), Gtk::ALIGN_END, false);
saveParam = Gtk::manage (new Gtk::Button ());
initButton(*saveParam, Glib::ustring("gtk-save-large.png"), Gtk::ALIGN_END, false);
initButton(*saveParam, Glib::ustring("save.png"), Gtk::ALIGN_END, false);
parambbox->attach_next_to(*editParam, sideStart, 1, 1);
parambbox->attach_next_to(*copyParam, sideEnd, 1, 1);