[pull] develop from fritzing:develop

.github/ISSUE_TEMPLATE/Bug.md

@@ -5,7 +5,9 @@ labels: Bug
 ---
 ## Current Behaviour
 Text
-<please attach screenshot if possible>
+<please attach a screenshot if possible>
+<please attach a Fritzing file if possible. To attach it, change the extension of the file from fzz to zip (e.g., bug.zip instead of bug.fzz)>
+
 **Build:**
 <e.g. Version 0.9.3 (b5c895d32 2016-04-19) Cocoa [Qt 5.12.2]
 

.gitignore

@@ -61,3 +61,6 @@ ehthumbs.db
 Thumbs.db
 .bash_history
 saved_state
+*.qm
+index
+/.qtc_clangd/compile_commands.json

Fritzing.1

@@ -1,17 +1,81 @@
-.TH FRITZING 1 "October 03, 2010" "Fritzing"
+.TH FRITZING 1 "May 23, 2024" "Fritzing 1.0.3" "User Commands"
 
 .SH NAME
-fritzing \- from prototype to product
+Fritzing - electronics made easy
+
 .SH SYNOPSIS
 .B fritzing
+.RI [ options ]
+
 .SH DESCRIPTION
+Fritzing is an open-source software tool to support designers, artists, researchers,
+and hobbyists to work creatively with interactive electronics. It allows you to document
+your prototypes, share them with others, teach electronics in a classroom, and create a
+PCB layout for professional manufacturing. The fundamental idea behind Fritzing is
+"sketching in hardware," making it easy to move from prototype to product.
+
+.PP
+Fritzing is primarily funded by payments from the community. To support
+Fritzing, visit our
+.UR https://fritzing.org/download
+download page
+.UE
+, where you will also
+get the latest official release.
+
+.PP
+One of the main features of Fritzing is its user-friendly interface, which facilitates the creation of electronic circuits. Users can document circuits, convert them into PCB designs, and order professional manufacturing. Additionally, Fritzing includes a basic circuit simulator for testing simple circuits.
+
+.SH OPTIONS
+.TP
+.B -h, --help
+Display help information and exit.
+.TP
+.B -v, --version
+Output version information and exit.
+.TP
+.B --debug
+Start Fritzing with debug output enabled.
+
+.SH USAGE
+Fritzing provides a graphical interface to design and simulate electronic circuits. It has three main views:
+.TP
+.B Breadboard View
+This view is used to create a virtual breadboard layout of your circuit.
+.TP
+.B Schematic View
+This view is used to create a schematic representation of your circuit.
+.TP
+.B PCB View
+This view is used to design the printed circuit board (PCB) layout for your project.
 .PP
-Fritzing is an open-source initiative to support designers, artists, researchers
-and hobbyists to work creatively with interactive electronics. We are creating a
-software and website in the spirit of Processing and Arduino, developing a tool
-that allows users to document their prototypes, share them with others, teach
-electronics in a classroom, and to create a pcb layout for professional
-manufacturing.
-.SH AUTHOR
-This manual page was written by Enrique Hernández Bello <ehbello@gmail.com>,
-for the Debian project (and may be used by others).
+All views are synced. If you add a connection in the schematic, the PCB view will indicate it, and the other way around.
+All three views have equal priority, so you may choose the design approach that fits your work style.
+
+.SH FILES
+.TP
+.I ~/.config/Fritzing
+User-specific configuration files for Fritzing.
+.TP
+.I ~/Documents/Fritzing
+User-specific data files for Fritzing. Your projects and parts are stored here.
+
+.SH BUGS
+Report bugs to the Fritzing GitHub issues page:
+.UR https://github.com/fritzing/fritzing-app/issues
+\z https://github.com/fritzing/fritzing-app/issues
+.UE
+
+.SH SEE ALSO
+Official website:
+.UR https://fritzing.org
+\z https://fritzing.org
+.UE
+.br
+Documentation:
+.UR https://fritzing.org/learning
+\z https://fritzing.org/learning
+.UE
+
+.SH DEVELOPMENT
+Fritzing is developed by Fritzing GmbH and contributors worldwide. It was started in August 2007 by the Interaction Design Lab at the University of Applied Sciences Potsdam, Germany.

FritzingInfo.plist

@@ -3,7 +3,7 @@
 <!--
 *************************************************
 Part of the Fritzing project - https://fritzing.org
-Copyright (c) 2007-21 Fritzing
+Copyright (c) 2007-24 Fritzing
 
 Fritzing is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,9 +27,9 @@ You should have received a copy of the GNU General Public License
         <key>CFBundleExecutable</key>
         <string>Fritzing</string>
         <key>CFBundleGetInfoString</key>
-		<string>Fritzing 1.0.0</string>
+		<string>Fritzing 1.0.4</string>
         <key>CFBundleShortVersionString</key>
-		<string>1.0.1</string>
+		<string>1.0.4</string>
         <key>CFBundleVersion</key>
 		<string>104347</string>
         <key>CFBundleIconFile</key>
@@ -40,6 +40,8 @@ You should have received a copy of the GNU General Public License
         <string>APPL</string>
         <key>CFBundleSignature</key>
         <string>FRtz</string>
+        <key>LSMinimumSystemVersion</key>
+        <string>11.0</string>
         <key>CFBundleDocumentTypes</key>
         <array>
             <dict>

fritzing.rc

@@ -2,16 +2,16 @@ IDI_ICON1               ICON    DISCARDABLE     "resources/system_icons/win/frit
 
 #include <windows.h>
 
-#define VER_FILEVERSION             1,0,0,0
-#define VER_FILEVERSION_STR         "1.0.0d\0"
+#define VER_FILEVERSION             1,0,4,0
+#define VER_FILEVERSION_STR         "1.0.4b\0"
 
-#define VER_PRODUCTVERSION          1,0,0,0
-#define VER_PRODUCTVERSION_STR      "1.0.0d\0"
+#define VER_PRODUCTVERSION          1,0,4,0
+#define VER_PRODUCTVERSION_STR      "1.0.4b\0"
 
 #define VER_COMPANYNAME_STR         "Fritzing"
 #define VER_FILEDESCRIPTION_STR     "Fritzing"
 #define VER_INTERNALNAME_STR        "Fritzing"
-#define VER_LEGALCOPYRIGHT_STR      "Copyright (c) 2007-2022 Fritzing GmbH"
+#define VER_LEGALCOPYRIGHT_STR      "Copyright (c) 2007-2024 Fritzing GmbH"
 #define VER_LEGALTRADEMARKS1_STR    "All Rights Reserved"
 #define VER_LEGALTRADEMARKS2_STR    VER_LEGALTRADEMARKS1_STR
 #define VER_ORIGINALFILENAME_STR    "Fritzing.exe"

org.fritzing.Fritzing.appdata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014-2019 Fritzing Team <info_AT_fritzing.org> -->
-<!-- Copyright 2020-2023 Fritzing GmbH <info_AT_fritzing.org> -->
+<!-- Copyright 2020-2024 Fritzing GmbH <info_AT_fritzing.org> -->
 <component type="desktop">
  <id>org.fritzing.Fritzing.desktop</id>
  <metadata_license>CC-BY-SA-3.0</metadata_license>
@@ -9,6 +9,9 @@
   <content_attribute id="social-info">mild</content_attribute>
  </content_rating>
  <name>Fritzing</name>
+ <developer id="org.fritzing">
+  <name>Fritzing GmbH</name>
+</developer>
  <summary>Electronic Design Tool</summary>
  <description>
   <p>
@@ -28,7 +31,7 @@
   </p>
   <p>
     The project is made possible with the payments from our users. If you don't yet have it, please
-	consider downloading the offical, most up to date, version from our website, http://fritzing.org .
+	consider downloading the offical, most up to date, version from our website https://fritzing.org .
   </p>
  </description>
  <screenshots>
@@ -50,9 +53,9 @@
  <url type="faq">https://fritzing.org/faq/</url>
  <url type="help">https://fritzing.org/learning/</url>
  <url type="forum">https://forum.fritzing.org</url>
- <url type="translate">https://fritzing.org/support-us/language-translation/</url>
+ <url type="translate">https://weblate.fritzing.org</url>
  <releases>
-  <release version="1.0.1rc" date="2023-07-15"/>
+  <release version="1.0.4" date="2024-10-07"/>
  </releases>
  <provides>
   <binary>Fritzing</binary>

phoenix.pro

@@ -18,9 +18,10 @@
 #
 # ********************************************************************
 
-lessThan(QT_MAJOR_VERSION, 5) {
-    error(Fritzing does not build with Qt 4 or earlier. 5.15 is recommended.)
-}
+QT_LEAST=6.5.3
+QT_MOST=6.5.10
+!versionAtLeast(QT_VERSION, $${QT_LEAST}):error("Use at least Qt version $${QT_LEAST}")
+!versionAtMost(QT_VERSION, $${QT_MOST}):error("Use at most Qt version $${QT_MOST}")
 
 CONFIG += debug_and_release
 CONFIG += c++17
@@ -163,15 +164,15 @@ macx {
 }
 
 QT += concurrent core gui network printsupport serialport sql svg widgets xml
+
 equals(QT_MAJOR_VERSION, 6) {
-  QT += core5compat svgwidgets
+  QT += core5compat svgwidgets openglwidgets
 }
 
 RC_FILE = fritzing.rc
 RESOURCES += phoenixresources.qrc
 
-# Disable this if you have (and want) libgit2 dynamically
-LIBGIT_STATIC = true
+include(pri/openssl3.pri)
 include(pri/libgit2detect.pri)
 include(pri/boostdetect.pri)
 include(pri/spicedetect.pri)
@@ -201,6 +202,7 @@ include(pri/program.pri)
 include(pri/testing.pri)
 include(pri/simulation.pri)
 include(test/version.pri)
+include(pri/clipper1detect.pri)
 
 TARGET = Fritzing
 TEMPLATE = app

phoenixresources.qrc

@@ -328,6 +328,9 @@
         <file>resources/images/icons/smalToolarrow-inactive.png</file>
         <file>resources/images/icons/smalToolarrow-normal.png</file>
         <file>resources/images/icons/smalToolarrow-pressed.png</file>
+        <file>resources/images/icons/smalToolarrowSimulation-inactive.svg</file>
+        <file>resources/images/icons/smalToolarrowSimulation-normal.svg</file>
+        <file>resources/images/icons/smalToolarrowSimulation-pressed.svg</file>
         <file>resources/images/icons/spinArrowButtonUpNormal.png</file>
         <file>resources/images/icons/spinArrowButtonUpPressed.png</file>
         <file>resources/images/icons/spinArrowButtonDownNormal.png</file>
@@ -373,5 +376,11 @@
         <file>resources/images/cursor/scale.png</file>
         <file>resources/images/cursor/magic_wand.png</file>
         <file>resources/images/cursor/spot_face_cutter.png</file>
+        <file>resources/images/icons/smalToolarrow-inactive.svg</file>
+        <file>resources/images/icons/smalToolarrow-pressed.svg</file>
+        <file>resources/images/icons/smalToolarrow-normal.svg</file>
+        <file>resources/images/icons/smalToolarrowFab-inactive.svg</file>
+        <file>resources/images/icons/smalToolarrowFab-pressed.svg</file>
+        <file>resources/images/icons/smalToolarrowFab-normal.svg</file>
     </qresource>
 </RCC>

pri/boostdetect.pri

@@ -32,7 +32,7 @@ defined(boost_root, var) {
     message("Using fritzing boost detect script.")
 
     # boost_1_54_0 is buggy
-	BOOSTS = 81
+	BOOSTS = 85
     for(boost, BOOSTS) {
         exists(../../boost_1_$${boost}_0) {
             LATESTBOOST = $$boost

pri/clipper1detect.pri

@@ -0,0 +1,27 @@
+# Copyright (c) 2023 Fritzing GmbH
+
+message("Using fritzing Clipper 1 detect script.")
+
+unix {
+    message("including Clipper1 library on linux or mac")
+
+    exists($$absolute_path($$PWD/../../Clipper1)) {
+	            CLIPPER1 = $$absolute_path($$PWD/../../Clipper1/6.4.2)
+				message("found Clipper1 in $${CLIPPER1}")
+			}
+}
+
+win32 {
+    message("including Clipper1 library on windows")
+
+    exists($$absolute_path($$PWD/../../Clipper1-6.4.2)) {
+        CLIPPER1 = $$absolute_path($$PWD/../../Clipper1-6.4.2)
+                    message("found Clipper1 in $${CLIPPER1}")
+            }
+}
+
+message("including $$absolute_path($${CLIPPER1}/include)")
+INCLUDEPATH += $$absolute_path($${CLIPPER1}/include/polyclipping)
+
+LIBS += -L$$absolute_path($${CLIPPER1}/lib) -lpolyclipping
+QMAKE_RPATHDIR += $$absolute_path($${CLIPPER1}/lib)

pri/connectors.pri

@@ -1,6 +1,6 @@
 # /*******************************************************************
 # Part of the Fritzing project - http://fritzing.org
-# Copyright (c) 2007-08 Fritzing
+# Copyright (c) 2007-23 Fritzing GmbH
 # Fritzing is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -14,21 +14,25 @@
 # ********************************************************************/
 
 HEADERS += \
+	$$PWD/../src/connectors/debugconnectorsprobe.h \
 src/connectors/bus.h \
 src/connectors/busshared.h \
 src/connectors/connector.h \
 src/connectors/connectoritem.h \
 src/connectors/nonconnectoritem.h \
 src/connectors/connectorshared.h \
 src/connectors/ercdata.h \
-src/connectors/svgidlayer.h
+src/connectors/svgidlayer.h \
+src/connectors/debugconnectors.h
 
 SOURCES += \
+	$$PWD/../src/connectors/debugconnectorsprobe.cpp \
 src/connectors/bus.cpp \
 src/connectors/busshared.cpp \
 src/connectors/connector.cpp \
 src/connectors/connectoritem.cpp \
 src/connectors/nonconnectoritem.cpp \
 src/connectors/connectorshared.cpp \
 src/connectors/ercdata.cpp \
-src/connectors/svgidlayer.cpp
+src/connectors/svgidlayer.cpp \
+src/connectors/debugconnectors.cpp

pri/items.pri

@@ -50,7 +50,7 @@ HEADERS += \
     src/items/wire.h \
     src/items/FProbeR1PosPCB.h \
     src/items/FProbeRPartLabel.h \
-    src/items/FProbeSwitchPackage.h \
+	src/items/FProbeSwitchProperty.h \
 
 
 SOURCES += \
@@ -90,4 +90,4 @@ SOURCES += \
     src/items/wire.cpp \
     src/items/FProbeR1PosPCB.cpp \
     src/items/FProbeRPartLabel.cpp \
-    src/items/FProbeSwitchPackage.cpp \
+	src/items/FProbeSwitchProperty.cpp \

pri/kitchensink.pri

@@ -27,7 +27,8 @@ HEADERS += \
     src/viewgeometry.h \
     src/viewlayer.h \
     src/waitpushundostack.h \
-    src/project_properties.h
+    src/project_properties.h \
+    src/servicelistfetcher.h
 
 
 SOURCES += \
@@ -44,4 +45,5 @@ SOURCES += \
     src/viewgeometry.cpp \
     src/viewlayer.cpp \
     src/waitpushundostack.cpp \
-    src/project_properties.cpp
+    src/project_properties.cpp \
+    src/servicelistfetcher.cpp