Merge branch 'dev' into newlocallab

This commit is contained in:
Morgan Hardwood
2018-11-21 13:15:27 +01:00
31 changed files with 1000 additions and 289 deletions

View File

@@ -1054,10 +1054,10 @@ Gtk::Widget* Preferences::getGeneralPanel()
appearanceGrid->attach(*vSep, 2, 0, 1, 3);
appearanceGrid->attach(*mainFontLbl, 0, 1, 1, 1);
appearanceGrid->attach(*mainFontFB, 1, 1, 1, 1);
appearanceGrid->attach(*colorPickerFontLbl, 3, 1, 1, 1);
appearanceGrid->attach(*colorPickerFontFB, 4, 1, 1, 1);
appearanceGrid->attach(*cropMaskColorLbl, 0, 2, 1, 1);
appearanceGrid->attach(*cropMaskColorCB, 1, 2, 1, 1);
appearanceGrid->attach(*cropMaskColorLbl, 3, 1, 1, 1);
appearanceGrid->attach(*cropMaskColorCB, 4, 1, 1, 1);
appearanceGrid->attach(*colorPickerFontLbl, 0, 2, 1, 1);
appearanceGrid->attach(*colorPickerFontFB, 1, 2, 1, 1);
appearanceGrid->attach(*navGuideColorLbl, 3, 2, 1, 1);
appearanceGrid->attach(*navGuideColorCB, 4, 2, 1, 1);