Skip to content

Commit

Permalink
Merge develop
Browse files Browse the repository at this point in the history
Silence empty polyline assertion

Replace arg(QString).arg(QString) with arg(QString, QString)
Fix more warnings

Upload to fab, happy flow passes

Fix build warning on windows

Refactor renderthing into own file

Fix quirk with disabled rotate and align submenus

addToBin now also re-enabled

Always center mouse when draging from the parts bin.

Fixes some quirks with rapid mouse movement or when leaving and re-entering the window.

Fixed fritzing#3807 without breaking fritzing#3647 by fixing svg lexer float exponent separation bug.

Added simplified unit test case for pathlexer clean of float exponents aka fritzing#3807.

Fix some Qt5.12 deprecations

Fix unused variable

weightmap was not used

refer fritzing.org with TLS in generator

Implement missing fzp drag and drop support

Fix error message

Bump up version to 0.9.7b

Fix issue: Mystery part terminal points disapeared

Fixed routing menu problem: alt-r now only has to be pressed once.

Fix issue fritzing#3839 . If file can not be loaded, allow empty (null) itemBase

Fix issue fritzing#3838. Do not add part if part is null

Fix fritzing#3833, use darker background for dropdowns in code editor

Fix about box text color for dark themes

Moved setTitle so it is also executed for the welcome view.

Fixed warning about unused variable in autoroute panelizer.

Fixed warning about unused variable in items partfactory.

Fixed warning about unused variable in items ruler.

Fixed warning about unused variable in kicad module.

Fixed warning about unused typedef in graph utils.

Changed clickable labels into push buttons to allow operation by keyboard.

Fix some english errors

NULL -> nullptr

Fix QtSplitBehavior deprecation warning

Fix QFlags warnings

Fix qt deprecation warnings

Replace hard to understand access to first item, use empty instead of count == 0

Flatten condition tree, avoid NULL

Preferences color labels now have both correct color and text after change.

Made preferences dialog fit on a laptop screen with 768 vertical resolution.

Translated using Weblate (German)

Currently translated at 99.4% (1793 of 1803 strings)

lupdate phoenix.pro

Gerber: Inherit stroke-width from parent objects

Fix parsing release date, ok button opens update in browser. Do not
search for part updates.

Seraching for part updates is a frequent source of error,
and introduces a dependency to github. Fritzing might
hang during start if github does not answer. Also their
service is quite reliable, we can not assume it for
granted (and free).
With a higher release frequency of Fritzing, there also
is less need for part updates. Note: We still use git,
and users who wish can directly work on the git repo
for parts, for example call 'git pull' to update the
parts manually.

Fixed bug that caused schematic logos to disappear in svg image exports.

Fix include for MSVC2019

Remove Snootlab from order, add Spresense
  • Loading branch information
KjellMorgenstern committed Sep 15, 2021
1 parent 3498684 commit 0e398a6
Show file tree
Hide file tree
Showing 111 changed files with 33,875 additions and 29,170 deletions.
4 changes: 2 additions & 2 deletions FritzingInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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 0.9.6</string>
<string>Fritzing 0.9.7</string>
<key>CFBundleShortVersionString</key>
<string>0.9.6</string>
<string>0.9.7</string>
<key>CFBundleVersion</key>
<string>bda4e</string>
<key>CFBundleIconFile</key>
Expand Down
8 changes: 4 additions & 4 deletions fritzing.rc
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ IDI_ICON1 ICON DISCARDABLE "resources/system_icons/win/frit

#include <windows.h>

#define VER_FILEVERSION 0,9,6,0
#define VER_FILEVERSION_STR "0.9.6\0"
#define VER_FILEVERSION 0,9,7,0
#define VER_FILEVERSION_STR "0.9.7\0"

#define VER_PRODUCTVERSION 0,9,6,0
#define VER_PRODUCTVERSION_STR "0.9.6\0"
#define VER_PRODUCTVERSION 0,9,7,0
#define VER_PRODUCTVERSION_STR "0.9.7\0"

#define VER_COMPANYNAME_STR "Fritzing"
#define VER_FILEDESCRIPTION_STR "Fritzing"
Expand Down
2 changes: 1 addition & 1 deletion org.fritzing.Fritzing.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<!-- <url type="donation">https://fritzing.org/shop/donations/</url> -->
<url type="translate">https://fritzing.org/support-us/language-translation/</url>
<releases>
<release version="0.9.6" date="2021-02-01"/>
<release version="0.9.7" date="2021-05-21"/>
</releases>
<provides>
<binary>Fritzing</binary>
Expand Down
8 changes: 4 additions & 4 deletions phoenix.pro
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ lessThan(QT_MINOR_VERSION, 9) {
CONFIG += debug_and_release
CONFIG += c++17

# TODO: Omit frame pointers for release builds
# TODO: Verify flags for clang and msvc builds
QMAKE_CXXFLAGS += -O3 -fno-omit-frame-pointer
unix {
QMAKE_CXXFLAGS += -O3 -fno-omit-frame-pointer
}

unix:!macx {
CONFIG += link_pkgconfig
Expand Down Expand Up @@ -193,7 +193,7 @@ include(pri/utils.pri)
include(pri/dock.pri)
include(pri/items.pri)
include(pri/autoroute.pri)
include(pri/dialogs.pri)
include(src/dialogs/dialogs.pri)
include(pri/connectors.pri)
include(pri/infoview.pri)
include(pri/model.pri)
Expand Down
2 changes: 0 additions & 2 deletions phoenixresources.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,6 @@
<file>resources/bins/icons/Search.png</file>
<file>resources/bins/icons/Lilypad.png</file>
<file>resources/bins/icons/Lilypad-mono.png</file>
<file>resources/bins/icons/Snootlab.png</file>
<file>resources/bins/icons/Snootlab-mono.png</file>
<file>resources/bins/icons/SparkFun.png</file>
<file>resources/bins/icons/SparkFun-mono.png</file>
<file>resources/bins/icons/Contrib.png</file>
Expand Down
1 change: 0 additions & 1 deletion pri/libgit2detect.pri
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ win32 {
}

LIBS += -L$$LIBGIT2LIB -lgit2
message($$PKGCONFIG)
}

unix {
Expand Down
2 changes: 2 additions & 0 deletions pri/sketch.pri
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# along with Fritzing. If not, see <http://www.gnu.org/licenses/>.
# ********************************************************************/
HEADERS += \
$$PWD/../src/sketch/renderthing.h \
src/sketch/fgraphicsscene.h \
src/sketch/breadboardsketchwidget.h \
src/sketch/infographicsview.h \
Expand All @@ -24,6 +25,7 @@ HEADERS += \


SOURCES += \
$$PWD/../src/sketch/renderthing.cpp \
src/sketch/fgraphicsscene.cpp \
src/sketch/breadboardsketchwidget.cpp \
src/sketch/infographicsview.cpp \
Expand Down
Binary file removed resources/bins/icons/Snootlab-mono.png
Binary file not shown.
Binary file removed resources/bins/icons/Snootlab.png
Binary file not shown.
2 changes: 1 addition & 1 deletion resources/bins/order.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<bin title="Arduino" location="more" />
<bin title="SparkFun" location="more" />
<bin title="Seeed Studio" location="more" />
<bin title="Spresense" location="more" />
<bin title="Intel" location="more" />
<bin title="Analog Devices" location="more" />
<bin title="Atlas Scientific" location="more" />
<bin title="Snootlab" location="more" />
<bin title="Parallax" location="more" />
<bin title="Picaxe" location="more" />
<bin title="Contributed Parts" location="app" />
Expand Down
2 changes: 1 addition & 1 deletion resources/parts/svg/core/schematic/schematiclogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions resources/styles/programwindow.qss
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,7 @@

/* drop-down list of the combobox */
#toolBarComboBox QAbstractItemView {
color: #000;
background-color: #ececec;
background-color: #333333;
}

#toolBarComboBox QAbstractItemView::item {
Expand Down
2 changes: 0 additions & 2 deletions src/autoroute/panelizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1414,14 +1414,12 @@ MainWindow * Panelizer::inscribeBoard(QDomElement & board, QHash<QString, QStrin

bool filled = false;
QList<ItemBase *> boards = mainWindow->pcbView()->findBoard();
bool wasOne = false;
foreach (ItemBase * boardItem, boards) {
mainWindow->pcbView()->selectAllItems(false, false);
boardItem->setSelected(true);
if (boardItem->prop("layers").compare("1") == 0) {
mainWindow->swapLayers(boardItem, 2, "", 0);
ProcessEventBlocker::processEvents();
wasOne = true;
}

LayerList groundLayers;
Expand Down
34 changes: 22 additions & 12 deletions pri/dialogs.pri → src/dialogs/dialogs.pri
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,28 @@
# along with Fritzing. If not, see <http://www.gnu.org/licenses/>.
# ********************************************************************/

INCLUDEPATH += $$PWD

HEADERS += src/dialogs/prefsdialog.h \
src/dialogs/pinlabeldialog.h \
src/dialogs/groundfillseeddialog.h \
src/dialogs/quotedialog.h \
src/dialogs/recoverydialog.h \
src/dialogs/setcolordialog.h \
src/dialogs/translatorlistmodel.h
src/dialogs/pinlabeldialog.h \
src/dialogs/groundfillseeddialog.h \
src/dialogs/quotedialog.h \
src/dialogs/recoverydialog.h \
src/dialogs/setcolordialog.h \
src/dialogs/translatorlistmodel.h \
src/dialogs/fabuploaddialog.h \
src/dialogs/fabuploadprogress.h \
src/dialogs/networkhelper.h

SOURCES += src/dialogs/prefsdialog.cpp \
src/dialogs/pinlabeldialog.cpp \
src/dialogs/groundfillseeddialog.cpp \
src/dialogs/quotedialog.cpp \
src/dialogs/recoverydialog.cpp \
src/dialogs/setcolordialog.cpp \
src/dialogs/translatorlistmodel.cpp
src/dialogs/pinlabeldialog.cpp \
src/dialogs/groundfillseeddialog.cpp \
src/dialogs/quotedialog.cpp \
src/dialogs/recoverydialog.cpp \
src/dialogs/setcolordialog.cpp \
src/dialogs/translatorlistmodel.cpp \
src/dialogs/fabuploaddialog.cpp \
src/dialogs/fabuploadprogress.cpp \
src/dialogs/networkhelper.cpp

FORMS += src/dialogs/fabuploaddialog.ui
34 changes: 34 additions & 0 deletions src/dialogs/fabuploaddialog.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#include "fabuploaddialog.h"
#include "ui_fabuploaddialog.h"

#include <QFile>

FabUploadDialog::FabUploadDialog(QNetworkAccessManager *manager,
QString filename,
QWidget *parent) :
QDialog(parent),
ui(new Ui::FabUploadDialog)
{
ui->setupUi(this);
setWindowFlags(Qt::Dialog | windowFlags());
ui->stackedWidget->setCurrentIndex(0);
ui->upload->init(manager, filename);
ui->uploadButton_2->setEnabled(false);
}


FabUploadDialog::~FabUploadDialog()
{
delete ui;
}

void FabUploadDialog::onUploadStarted()
{
ui->stackedWidget->setCurrentIndex(1);
}

void FabUploadDialog::onUploadReady()
{
ui->uploadButton_2->setEnabled(true);
ui->uploadButton_2->setText("Open in browser");
}
32 changes: 32 additions & 0 deletions src/dialogs/fabuploaddialog.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#ifndef FABUPLOADDIALOG_H
#define FABUPLOADDIALOG_H

#include <QDialog>
#include <QNetworkAccessManager>

namespace Ui {
class FabUploadDialog;
}

class FabUploadDialog : public QDialog
{
Q_OBJECT

public:
explicit FabUploadDialog(QNetworkAccessManager* manager,
QString filename,
// double area,
// double boardCount,
QWidget *parent = nullptr);
~FabUploadDialog();

private slots:
void onUploadStarted();
void onUploadReady();

private:
Ui::FabUploadDialog *ui;

};

#endif // FABUPLOADDIALOG_H
Loading

0 comments on commit 0e398a6

Please sign in to comment.