Merge with 'Beep6581/dev'

This commit is contained in:
Pandagrapher
2022-11-03 17:10:48 +01:00
47 changed files with 31846 additions and 4903 deletions

View File

@@ -56,7 +56,7 @@ ProfilePanel::ProfilePanel () : storedPProfile(nullptr),
fillMode->set_active(options.filledProfile);
fillMode->add(*profileFillImage);
fillMode->signal_toggled().connect ( sigc::mem_fun(*this, &ProfilePanel::profileFillModeToggled) );
fillMode->set_tooltip_text(M("PROFILEPANEL_MODE_TIP"));
fillMode->set_tooltip_text(M("PROFILEPANEL_MODE_TOOLTIP"));
//GTK318
#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
fillMode->set_margin_right(2);