Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: forgeedu-sync

on:
- push
- delete

jobs:
sync:
runs-on: ubuntu-latest
name: Git Repo Sync
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: wangchucheng/git-repo-sync@v0.1.0
with:
target-url: https://forge.apps.education.fr/canetsebastien/blocklyarduino-in-fritzing-app
target-username: canetsebastien
target-token: ${{ secrets.GITLAB_TOKEN }}
1 change: 1 addition & 0 deletions SddPMn.json

Large diffs are not rendered by default.

41 changes: 41 additions & 0 deletions mocinclude.opt
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
-IC:/Qt/6.5.3/msvc2019_64/mkspecs/win32-msvc
-IC:/00_fritzing/fritzing-app
-IC:/00_fritzing/ngspice-42/src/include
-IC:/Qt/6.5.3/msvc2019_64/include/QtZlib
-IC:/00_fritzing/libgit2/include
-IC:/00_fritzing/boost_1_85_0
-IC:/00_fritzing/ngspice-42/include
-IC:/00_fritzing/quazip-6.5.3-1.4intuisphere/include/QuaZip-Qt6-1.4
-IC:/00_fritzing/svgpp-1.3.1/include
-IC:/00_fritzing/fritzing-app/src/dialogs
-IC:/00_fritzing/fritzing-app/src/ipc
-IC:/00_fritzing/fritzing-app/src
-IC:/00_fritzing/Clipper1-6.4.2/include/polyclipping
-IC:/Qt/6.5.3/msvc2019_64/include
-IC:/Qt/6.5.3/msvc2019_64/include/QtWebEngineWidgets
-IC:/Qt/6.5.3/msvc2019_64/include/QtPrintSupport
-IC:/Qt/6.5.3/msvc2019_64/include/QtSvgWidgets
-IC:/Qt/6.5.3/msvc2019_64/include/QtOpenGLWidgets
-IC:/Qt/6.5.3/msvc2019_64/include/QtWidgets
-IC:/Qt/6.5.3/msvc2019_64/include/QtSvg
-IC:/Qt/6.5.3/msvc2019_64/include/QtWebEngineCore
-IC:/Qt/6.5.3/msvc2019_64/include/QtQuick
-IC:/Qt/6.5.3/msvc2019_64/include/QtOpenGL
-IC:/Qt/6.5.3/msvc2019_64/include/QtGui
-IC:/Qt/6.5.3/msvc2019_64/include/QtConcurrent
-IC:/Qt/6.5.3/msvc2019_64/include/QtQmlModels
-IC:/Qt/6.5.3/msvc2019_64/include/QtWebChannel
-IC:/Qt/6.5.3/msvc2019_64/include/QtQml
-IC:/Qt/6.5.3/msvc2019_64/include/QtNetwork
-IC:/Qt/6.5.3/msvc2019_64/include/QtSerialPort
-IC:/Qt/6.5.3/msvc2019_64/include/QtSql
-IC:/Qt/6.5.3/msvc2019_64/include/QtXml
-IC:/Qt/6.5.3/msvc2019_64/include/QtQmlIntegration
-IC:/Qt/6.5.3/msvc2019_64/include/QtPositioning
-IC:/Qt/6.5.3/msvc2019_64/include/QtCore
-IC:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Tools\MSVC\14.29.30133\include
-IC:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\ucrt
-IC:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\shared
-IC:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\um
-IC:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\winrt
-IC:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\cppwinrt
2 changes: 1 addition & 1 deletion phoenix.pro
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ macx {
QMAKE_BUNDLE_DATA += FILE_ICONS
}

QT += concurrent core gui network printsupport serialport sql svg widgets xml svgwidgets openglwidgets
QT += concurrent core gui network printsupport serialport sql svg widgets xml svgwidgets openglwidgets webenginewidgets

RC_FILE = fritzing.rc
RESOURCES += phoenixresources.qrc
Expand Down
3 changes: 3 additions & 0 deletions phoenixresources.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
<file>resources/images/icons/TabWidgetPcbActive_icon.png</file>
<file>resources/images/icons/TabWidgetPcbInactive_icon.png</file>
<file>resources/images/icons/TabWidgetPcbHover_icon.png</file>
<file>resources/images/icons/TabWidgetBlocksActive_icon.png</file>
<file>resources/images/icons/TabWidgetBlocksInactive_icon.png</file>
<file>resources/images/icons/TabWidgetBlocksPressed_icon.png</file>
<file>resources/images/icons/toolbarExport_gbr_icon.png</file>
<file>resources/images/icons/toolbarExport_gbx_icon.png</file>
<file>resources/images/icons/toolbarExport_jpeg_icon.png</file>
Expand Down
2 changes: 2 additions & 0 deletions pri/program.pri
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ HEADERS += \
src/program/console.h \
src/program/consolewindow.h \
src/program/consolesettings.h \
src/program/blockswindow.h \
src/program/platform.h \
src/program/platformarduino.h \
src/program/platformpicaxe.h \
Expand All @@ -41,6 +42,7 @@ SOURCES += \
src/program/console.cpp \
src/program/consolewindow.cpp \
src/program/consolesettings.cpp \
src/program/blockswindow.cpp \
src/program/platform.cpp \
src/program/platformarduino.cpp \
src/program/platformpicaxe.cpp \
Expand Down
Binary file added resources/images/icons/TabWidgetBlocksActive_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/images/icons/TabWidgetBlocksPressed_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading