diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 86f4bc69..ad33b7c9 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -2939,7 +2939,7 @@ class App(QtCore.QObject): self.paste_tool.install(icon=QtGui.QIcon('share/solderpastebis32.png')) self.calculator_tool = ToolCalculator(self) - self.calculator_tool.install(icon=QtGui.QIcon('share/calculator24.png'), separator=True) + self.calculator_tool.install(icon=QtGui.QIcon('share/calculator16.png'), separator=True) self.sub_tool = ToolSub(self) self.sub_tool.install(icon=QtGui.QIcon('share/sub32.png'), pos=self.ui.menutool, separator=True) @@ -4394,6 +4394,16 @@ class App(QtCore.QObject): ) license_label.setOpenExternalLinks(True) + attributions_label = QtWidgets.QLabel( + _( + 'Some of the icons used are from the following sources:
' + '
Icons made by Freepik from www.flaticon.com

' + 'Icons by Icons8' + ) + ) + # layouts layout1 = QtWidgets.QVBoxLayout() layout1_1 = QtWidgets.QHBoxLayout() @@ -4437,6 +4447,12 @@ class App(QtCore.QObject): self.license_tab_layout.setContentsMargins(2, 2, 2, 2) tab_widget.addTab(self.license_tab, _("License")) + self.attributions_tab = QtWidgets.QWidget() + self.attributions_tab.setObjectName("attributions_about") + self.attributions_tab_layout = QtWidgets.QVBoxLayout(self.attributions_tab) + self.attributions_tab_layout.setContentsMargins(2, 2, 2, 2) + tab_widget.addTab(self.attributions_tab, _("Attributions")) + self.splash_tab_layout.addWidget(logo, stretch=0) self.splash_tab_layout.addWidget(title, stretch=1) @@ -4545,6 +4561,9 @@ class App(QtCore.QObject): self.license_tab_layout.addWidget(license_label) self.license_tab_layout.addStretch() + self.attributions_tab_layout.addWidget(attributions_label) + self.attributions_tab_layout.addStretch() + layout3.addStretch() layout3.addWidget(closebtn) diff --git a/README.md b/README.md index 9a0bc849..62f42f5e 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ CAD program, and create G-Code for Isolation routing. - optimized the Transformation Tool both in GUI and in functionality and replaced the entries with QSpinBox - fixed an issue with the tool table context menu in Paint Tool - made some changes in the GUI in Paint Tool, NCC Tool and SolderPaste Tool +- changed some of the icons; added attributions for icons source in the About FlatCAM window 4.10.2019 diff --git a/share/calculator16.png b/share/calculator16.png new file mode 100644 index 00000000..94a7e458 Binary files /dev/null and b/share/calculator16.png differ diff --git a/share/calculator24.png b/share/calculator24.png index 26849d94..da97a8df 100644 Binary files a/share/calculator24.png and b/share/calculator24.png differ diff --git a/share/distance16.png b/share/distance16.png index 4e0d2ab1..bce12031 100644 Binary files a/share/distance16.png and b/share/distance16.png differ diff --git a/share/distance32.png b/share/distance32.png index 39cc3ca6..567e638c 100644 Binary files a/share/distance32.png and b/share/distance32.png differ diff --git a/share/jump_to16.png b/share/jump_to16.png index e45407d5..24bddf37 100644 Binary files a/share/jump_to16.png and b/share/jump_to16.png differ diff --git a/share/jump_to32.png b/share/jump_to32.png new file mode 100644 index 00000000..5912ae2b Binary files /dev/null and b/share/jump_to32.png differ diff --git a/share/move16.png b/share/move16.png index 5c349fee..7c15a01f 100644 Binary files a/share/move16.png and b/share/move16.png differ diff --git a/share/move32_bis.png b/share/move32_bis.png index c6056fe6..82907cb2 100644 Binary files a/share/move32_bis.png and b/share/move32_bis.png differ diff --git a/share/origin16.png b/share/origin16.png index 51e5f39b..385623f9 100644 Binary files a/share/origin16.png and b/share/origin16.png differ diff --git a/share/origin32.png b/share/origin32.png index 54bb977f..c50d7028 100644 Binary files a/share/origin32.png and b/share/origin32.png differ diff --git a/share/scale32.png b/share/scale32.png index e6ded178..981e3d77 100644 Binary files a/share/scale32.png and b/share/scale32.png differ diff --git a/share/trash32.png b/share/trash32.png index 88a41686..885bd991 100644 Binary files a/share/trash32.png and b/share/trash32.png differ