diff --git a/AppGUI/MainGUI.py b/AppGUI/MainGUI.py index 6b1fc3d3..3eacb91e 100644 --- a/AppGUI/MainGUI.py +++ b/AppGUI/MainGUI.py @@ -1095,8 +1095,8 @@ class MainGUI(QtWidgets.QMainWindow): self.grid_gap_y_entry.setMaximumWidth(70) self.grid_gap_y_entry.setToolTip(_("Grid Y snapping distance")) self.status_toolbar.addWidget(self.grid_gap_y_entry) - self.status_toolbar.addWidget(QtWidgets.QLabel(" ")) + self.axis_status_label = FCLabel() self.axis_status_label.setToolTip(_("Toggle the display of axis on canvas")) self.axis_status_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/axis16.png')) @@ -1107,17 +1107,27 @@ class MainGUI(QtWidgets.QMainWindow): self.pref_status_label.setToolTip(_("Preferences")) self.pref_status_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/settings18.png')) self.status_toolbar.addWidget(self.pref_status_label) + self.status_toolbar.addWidget(QtWidgets.QLabel(" ")) self.shell_status_label = FCLabel() self.shell_status_label.setToolTip(_("Command Line")) self.shell_status_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/shell20.png')) self.status_toolbar.addWidget(self.shell_status_label) + self.status_toolbar.addWidget(QtWidgets.QLabel(" ")) self.hud_label = FCLabel() self.hud_label.setToolTip(_("HUD (Heads up display)")) self.hud_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/hud16.png')) self.status_toolbar.addWidget(self.hud_label) + self.status_toolbar.addWidget(QtWidgets.QLabel(" ")) + self.wplace_label = FCLabel("A4") + self.wplace_label.setToolTip(_("Draw a delimiting rectangle on canvas.\n" + "The purpose is to illustrate the limits for our work.") + ) + self.wplace_label.setMargin(2) + self.status_toolbar.addWidget(self.wplace_label) + self.status_toolbar.addWidget(QtWidgets.QLabel(" ")) self.ois_grid = OptionalInputSection(self.grid_gap_link_cb, [self.grid_gap_y_entry], logic=False) @@ -1549,13 +1559,6 @@ class MainGUI(QtWidgets.QMainWindow): self.status_toolbar.setMaximumHeight(24) self.infobar.addWidget(self.status_toolbar) - self.wplace_label = FCLabel("A4") - self.wplace_label.setToolTip(_("Draw a delimiting rectangle on canvas.\n" - "The purpose is to illustrate the limits for our work.") - ) - self.wplace_label.setMargin(2) - self.infobar.addWidget(self.wplace_label) - self.units_label = QtWidgets.QLabel("[mm]") self.units_label.setToolTip(_("Application units")) self.units_label.setMargin(2) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98eaa8d6..98294a0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ CHANGELOG for FlatCAM beta - Tcl Command Isolate - fixed to work in the new configuration - Tcl Command Follow - fixed to work in the new configuration - Etch Compensation Tool - added a new etchant: alkaline baths +- fixed spacing in the status toolbar icons 1.06.2020 diff --git a/assets/resources/dark_resources/edit_file16.png b/assets/resources/dark_resources/edit_file16.png index 05185539..cf98fe7f 100644 Binary files a/assets/resources/dark_resources/edit_file16.png and b/assets/resources/dark_resources/edit_file16.png differ diff --git a/assets/resources/dark_resources/edit_file32.png b/assets/resources/dark_resources/edit_file32.png index 98f49fde..b29458c9 100644 Binary files a/assets/resources/dark_resources/edit_file32.png and b/assets/resources/dark_resources/edit_file32.png differ diff --git a/assets/resources/edit_file16.png b/assets/resources/edit_file16.png index b8bedd05..eef2dbe9 100644 Binary files a/assets/resources/edit_file16.png and b/assets/resources/edit_file16.png differ diff --git a/assets/resources/edit_file32.png b/assets/resources/edit_file32.png index 8d340239..1f517bb8 100644 Binary files a/assets/resources/edit_file32.png and b/assets/resources/edit_file32.png differ