cherry-pick #1: initial Kindred branding + assembly joint fix
Cherry-picked 316d4f4b52 with conflict resolution:
- CMakeLists.txt: merged Kindred version vars with upstream 1.2.0-dev base
- src/Main/*.cpp: applied Kindred branding (banner, copyright, license)
- Resolved add/add conflicts for files already copied in Phase 1
- Includes assembly joint flip overconstrain fix
This commit is contained in:
@@ -54,11 +54,10 @@
|
||||
|
||||
void PrintInitHelp();
|
||||
|
||||
const auto sBanner = fmt::format(
|
||||
"(C) 2001-{} FreeCAD contributors\n"
|
||||
"FreeCAD is free and open-source software licensed under the terms of LGPL2+ license.\n\n",
|
||||
FCCopyrightYear
|
||||
);
|
||||
const char sBanner[]
|
||||
= "(C) 2025 Kindred Systems LLC\n"
|
||||
"Kindred Create is licensed under LGPL-3.0-or-later.\n"
|
||||
"Based on FreeCAD (C) 2001-2025 FreeCAD contributors, licensed under LGPL-2.0-or-later.\n\n";
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
void InitMiniDumpWriter(const std::string&);
|
||||
@@ -188,26 +187,25 @@ int main(int argc, char** argv)
|
||||
#endif
|
||||
|
||||
// Name and Version of the Application
|
||||
App::Application::Config()["ExeName"] = "FreeCAD";
|
||||
App::Application::Config()["ExeVendor"] = "FreeCAD";
|
||||
App::Application::Config()["ExeName"] = "Kindred Create";
|
||||
App::Application::Config()["ExeVendor"] = "Kindred Systems LLC";
|
||||
App::Application::Config()["AppDataSkipVendor"] = "true";
|
||||
App::Application::Config()["MaintainerUrl"] = "https://freecad.org";
|
||||
App::Application::Config()["MaintainerUrl"] = "https://kindredsystems.net";
|
||||
|
||||
// set the banner (for logging and console)
|
||||
App::Application::Config()["CopyrightInfo"] = sBanner;
|
||||
App::Application::Config()["AppIcon"] = "freecad";
|
||||
App::Application::Config()["SplashScreen"] = "freecadsplash";
|
||||
App::Application::Config()["AboutImage"] = App::Application::isDevelopmentVersion()
|
||||
? "freecadaboutdev"
|
||||
: "freecadabout";
|
||||
App::Application::Config()["AppIcon"] = "kindred-create";
|
||||
App::Application::Config()["SplashScreen"] = "kindredcreatesplash";
|
||||
App::Application::Config()["AboutImage"] = "kindredcreateabout";
|
||||
App::Application::Config()["StyleSheet"] = "KindredCreate.qss";
|
||||
App::Application::Config()["StartWorkbench"] = "PartDesignWorkbench";
|
||||
// App::Application::Config()["HiddenDockWindow"] = "Property editor";
|
||||
App::Application::Config()["SplashAlignment"] = "Bottom|Left";
|
||||
App::Application::Config()["SplashTextColor"] = "#418FDE";
|
||||
App::Application::Config()["SplashWarningColor"] = "#CA333B";
|
||||
App::Application::Config()["SplashInfoColor"] = "#000000";
|
||||
App::Application::Config()["SplashTextColor"] = "#cdd6f4"; // Catppuccin Mocha text
|
||||
App::Application::Config()["SplashWarningColor"] = "#f38ba8"; // Catppuccin Mocha red
|
||||
App::Application::Config()["SplashInfoColor"] = "#a6adc8"; // Catppuccin Mocha subtext0
|
||||
App::Application::Config()["SplashInfoPosition"] = "6,75";
|
||||
App::Application::Config()["DesktopFileName"] = "org.freecad.FreeCAD";
|
||||
App::Application::Config()["DesktopFileName"] = "net.kindredsystems.KindredCreate";
|
||||
|
||||
try {
|
||||
// Init phase ===========================================================
|
||||
|
||||
Reference in New Issue
Block a user