bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- made the layout combobox current item from Preferences -> General window to reflect the current layout

Browse Source 
- remade the POT translate file
- work in progress in translation for Romanian language 44%
- fix for showing tools by activating them from the Menu - final fix.
This commit is contained in:
Marius Stanciu
2019-03-14 01:09:06 +02:00
parent ae0706620e
commit c0d21ee4e0
94 changed files with 29742 additions and 23193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flatcamTools/ToolCalculators.py
View File

@@ -13,7 +13,7 @@ import math
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolCalculators')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -248,6 +248,9 @@ class ToolCalculator(FlatCAMTool):
self.app.ui.splitter.setSizes([0, 1])
except AttributeError:
pass
else:
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
FlatCAMTool.run(self)

5
flatcamTools/ToolCutOut.py
View File

@@ -6,7 +6,7 @@ from shapely.geometry import box
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolCutOut')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -292,6 +292,9 @@ class CutOut(FlatCAMTool):
self.app.ui.splitter.setSizes([0, 1])
except AttributeError:
pass
else:
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
FlatCAMTool.run(self)
self.set_tool_ui()

19
flatcamTools/ToolDblSided.py
View File

@@ -7,7 +7,7 @@ from PyQt5 import QtCore
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolDblSided')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -55,7 +55,7 @@ class DblSidedTool(FlatCAMTool):
"the specified axis. Does not create a new \n"
"object, but modifies it.")
)
self.mirror_gerber_button.setFixedWidth(40)
self.mirror_gerber_button.setFixedWidth(60)
# grid_lay.addRow("Bottom Layer:", self.object_combo)
grid_lay.addWidget(self.botlay_label, 0, 0)
@@ -79,7 +79,7 @@ class DblSidedTool(FlatCAMTool):
"the specified axis. Does not create a new \n"
"object, but modifies it.")
)
self.mirror_exc_button.setFixedWidth(40)
self.mirror_exc_button.setFixedWidth(60)
# grid_lay.addRow("Bottom Layer:", self.object_combo)
grid_lay.addWidget(self.excobj_label, 2, 0)
@@ -103,7 +103,7 @@ class DblSidedTool(FlatCAMTool):
"the specified axis. Does not create a new \n"
"object, but modifies it.")
)
self.mirror_geo_button.setFixedWidth(40)
self.mirror_geo_button.setFixedWidth(60)
# grid_lay.addRow("Bottom Layer:", self.object_combo)
grid_lay.addWidget(self.geoobj_label, 4, 0)
@@ -156,7 +156,7 @@ class DblSidedTool(FlatCAMTool):
"The (x, y) coordinates are captured by pressing SHIFT key\n"
"and left mouse button click on canvas or you can enter the coords manually.")
)
self.add_point_button.setFixedWidth(40)
self.add_point_button.setFixedWidth(60)
grid_lay.addWidget(self.pb_label, 10, 0)
grid_lay.addLayout(self.point_box_container, 11, 0, 1, 3)
@@ -207,7 +207,7 @@ class DblSidedTool(FlatCAMTool):
"- press SHIFT key and left mouse clicking on canvas. Then RMB click in the field and click Paste.\n"
"- by entering the coords manually in the format: (x1, y1), (x2, y2), ...")
)
self.add_drill_point_button.setFixedWidth(40)
self.add_drill_point_button.setFixedWidth(60)
grid_lay1.addWidget(self.alignment_holes, 0, 0, 1, 2)
grid_lay1.addWidget(self.add_drill_point_button, 0, 3)
@@ -239,14 +239,14 @@ class DblSidedTool(FlatCAMTool):
"specified alignment holes and their mirror\n"
"images.")
)
# self.create_alignment_hole_button.setFixedWidth(40)
# self.create_alignment_hole_button.setFixedWidth(60)
grid_lay2.addWidget(self.create_alignment_hole_button, 1,0, 1, 2)
self.reset_button = QtWidgets.QPushButton(_("Reset"))
self.reset_button.setToolTip(
_("Resets all the fields.")
)
self.reset_button.setFixedWidth(40)
self.reset_button.setFixedWidth(60)
grid_lay2.addWidget(self.reset_button, 1, 2)
self.layout.addStretch()
@@ -282,6 +282,9 @@ class DblSidedTool(FlatCAMTool):
self.app.ui.splitter.setSizes([0, 1])
except AttributeError:
pass
else:
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
FlatCAMTool.run(self)
self.set_tool_ui()

5
flatcamTools/ToolFilm.py
View File

@@ -14,7 +14,7 @@ from PyQt5 import QtGui, QtCore, QtWidgets
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolFilm')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -193,6 +193,9 @@ class Film(FlatCAMTool):
self.app.ui.splitter.setSizes([0, 1])
except AttributeError:
pass
else:
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
FlatCAMTool.run(self)

5
flatcamTools/ToolImage.py
View File

@@ -14,7 +14,7 @@ from PyQt5 import QtGui, QtWidgets
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolImage')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -160,6 +160,9 @@ class ToolImage(FlatCAMTool):
self.app.ui.splitter.setSizes([0, 1])
except AttributeError:
pass
else:
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
FlatCAMTool.run(self)
self.set_tool_ui()

2
flatcamTools/ToolMeasurement.py
View File

@@ -15,7 +15,7 @@ from math import sqrt
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolMeasurement')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext

2
flatcamTools/ToolMove.py
View File

@@ -15,7 +15,7 @@ from copy import copy
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolMove')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext

5
flatcamTools/ToolNonCopperClear.py
View File

@@ -14,7 +14,7 @@ import time
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolNonCopperClear')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -272,6 +272,9 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.app.ui.splitter.setSizes([0, 1])
except AttributeError:
pass
else:
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
FlatCAMTool.run(self)
self.set_tool_ui()

5
flatcamTools/ToolPaint.py
View File

@@ -13,7 +13,7 @@ from ObjectCollection import *
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolPaint')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -330,6 +330,9 @@ class ToolPaint(FlatCAMTool, Gerber):
self.app.ui.splitter.setSizes([0, 1])
except AttributeError:
pass
else:
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
FlatCAMTool.run(self)
self.set_tool_ui()

5
flatcamTools/ToolPanelize.py
View File

@@ -14,7 +14,7 @@ import time
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolPanelize')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -226,6 +226,9 @@ class Panelize(FlatCAMTool):
self.app.ui.splitter.setSizes([0, 1])
except AttributeError:
pass
else:
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
FlatCAMTool.run(self)
self.set_tool_ui()

5
flatcamTools/ToolProperties.py
View File

@@ -14,7 +14,7 @@ from FlatCAMObj import *
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolProperties')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -80,6 +80,9 @@ class Properties(FlatCAMTool):
self.app.ui.splitter.setSizes([0, 1])
except AttributeError:
pass
else:
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
FlatCAMTool.run(self)
self.set_tool_ui()

2
flatcamTools/ToolShell.py
View File

@@ -16,7 +16,7 @@ import html
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolShell')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext

5
flatcamTools/ToolSolderPaste.py
View File

@@ -27,7 +27,7 @@ from io import StringIO
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolSolderPaste')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -439,6 +439,9 @@ class SolderPaste(FlatCAMTool):
self.app.ui.splitter.setSizes([0, 1])
except AttributeError:
pass
else:
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
FlatCAMTool.run(self)
self.set_tool_ui()

63
flatcamTools/ToolTransform.py
View File

@@ -12,7 +12,7 @@ from FlatCAMObj import *
import gettext
import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolTransform')
fcTranslate.apply_language('strings')
import builtins
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -44,7 +44,7 @@ class ToolTransform(FlatCAMTool):
self.transform_lay.addWidget(title_label)
self.empty_label = QtWidgets.QLabel("")
self.empty_label.setFixedWidth(50)
self.empty_label.setFixedWidth(70)
self.empty_label1 = QtWidgets.QLabel("")
self.empty_label1.setFixedWidth(70)
@@ -72,10 +72,10 @@ class ToolTransform(FlatCAMTool):
"Positive numbers for CW motion.\n"
"Negative numbers for CCW motion.")
)
self.rotate_label.setFixedWidth(50)
self.rotate_label.setFixedWidth(70)
self.rotate_entry = FCEntry()
# self.rotate_entry.setFixedWidth(60)
# self.rotate_entry.setFixedWidth(70)
self.rotate_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
self.rotate_button = FCButton()
@@ -85,7 +85,7 @@ class ToolTransform(FlatCAMTool):
"The point of reference is the middle of\n"
"the bounding box for all selected objects.")
)
self.rotate_button.setFixedWidth(60)
self.rotate_button.setFixedWidth(90)
form_child.addWidget(self.rotate_entry)
form_child.addWidget(self.rotate_button)
@@ -109,10 +109,10 @@ class ToolTransform(FlatCAMTool):
_("Angle for Skew action, in degrees.\n"
"Float number between -360 and 359.")
)
self.skewx_label.setFixedWidth(50)
self.skewx_label.setFixedWidth(70)
self.skewx_entry = FCEntry()
self.skewx_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
# self.skewx_entry.setFixedWidth(60)
# self.skewx_entry.setFixedWidth(70)
self.skewx_button = FCButton()
self.skewx_button.set_value(_("Skew X"))
@@ -120,17 +120,17 @@ class ToolTransform(FlatCAMTool):
_("Skew/shear the selected object(s).\n"
"The point of reference is the middle of\n"
"the bounding box for all selected objects."))
self.skewx_button.setFixedWidth(60)
self.skewx_button.setFixedWidth(90)
self.skewy_label = QtWidgets.QLabel(_("Angle Y:"))
self.skewy_label.setToolTip(
_("Angle for Skew action, in degrees.\n"
"Float number between -360 and 359.")
)
self.skewy_label.setFixedWidth(50)
self.skewy_label.setFixedWidth(70)
self.skewy_entry = FCEntry()
self.skewy_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
# self.skewy_entry.setFixedWidth(60)
# self.skewy_entry.setFixedWidth(70)
self.skewy_button = FCButton()
self.skewy_button.set_value(_("Skew Y"))
@@ -138,7 +138,7 @@ class ToolTransform(FlatCAMTool):
_("Skew/shear the selected object(s).\n"
"The point of reference is the middle of\n"
"the bounding box for all selected objects."))
self.skewy_button.setFixedWidth(60)
self.skewy_button.setFixedWidth(90)
form1_child_1.addWidget(self.skewx_entry)
form1_child_1.addWidget(self.skewx_button)
@@ -165,10 +165,10 @@ class ToolTransform(FlatCAMTool):
self.scalex_label.setToolTip(
_("Factor for Scale action over X axis.")
)
self.scalex_label.setFixedWidth(50)
self.scalex_label.setFixedWidth(70)
self.scalex_entry = FCEntry()
self.scalex_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
# self.scalex_entry.setFixedWidth(60)
# self.scalex_entry.setFixedWidth(70)
self.scalex_button = FCButton()
self.scalex_button.set_value(_("Scale X"))
@@ -176,16 +176,16 @@ class ToolTransform(FlatCAMTool):
_("Scale the selected object(s).\n"
"The point of reference depends on \n"
"the Scale reference checkbox state."))
self.scalex_button.setFixedWidth(60)
self.scalex_button.setFixedWidth(90)
self.scaley_label = QtWidgets.QLabel(_("Factor Y:"))
self.scaley_label.setToolTip(
_("Factor for Scale action over Y axis.")
)
self.scaley_label.setFixedWidth(50)
self.scaley_label.setFixedWidth(70)
self.scaley_entry = FCEntry()
self.scaley_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
# self.scaley_entry.setFixedWidth(60)
# self.scaley_entry.setFixedWidth(70)
self.scaley_button = FCButton()
self.scaley_button.set_value(_("Scale Y"))
@@ -193,7 +193,7 @@ class ToolTransform(FlatCAMTool):
_("Scale the selected object(s).\n"
"The point of reference depends on \n"
"the Scale reference checkbox state."))
self.scaley_button.setFixedWidth(60)
self.scaley_button.setFixedWidth(90)
self.scale_link_cb = FCCheckBox()
self.scale_link_cb.set_value(True)
@@ -201,7 +201,7 @@ class ToolTransform(FlatCAMTool):
self.scale_link_cb.setToolTip(
_("Scale the selected object(s)\n"
"using the Scale Factor X for both axis."))
self.scale_link_cb.setFixedWidth(50)
self.scale_link_cb.setFixedWidth(70)
self.scale_zero_ref_cb = FCCheckBox()
self.scale_zero_ref_cb.set_value(True)
@@ -239,10 +239,10 @@ class ToolTransform(FlatCAMTool):
self.offx_label.setToolTip(
_("Value for Offset action on X axis.")
)
self.offx_label.setFixedWidth(50)
self.offx_label.setFixedWidth(70)
self.offx_entry = FCEntry()
self.offx_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
# self.offx_entry.setFixedWidth(60)
# self.offx_entry.setFixedWidth(70)
self.offx_button = FCButton()
self.offx_button.set_value(_("Offset X"))
@@ -250,16 +250,16 @@ class ToolTransform(FlatCAMTool):
_("Offset the selected object(s).\n"
"The point of reference is the middle of\n"
"the bounding box for all selected objects.\n"))
self.offx_button.setFixedWidth(60)
self.offx_button.setFixedWidth(90)
self.offy_label = QtWidgets.QLabel(_("Value Y:"))
self.offy_label.setToolTip(
_("Value for Offset action on Y axis.")
)
self.offy_label.setFixedWidth(50)
self.offy_label.setFixedWidth(70)
self.offy_entry = FCEntry()
self.offy_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
# self.offy_entry.setFixedWidth(60)
# self.offy_entry.setFixedWidth(70)
self.offy_button = FCButton()
self.offy_button.set_value(_("Offset Y"))
@@ -267,7 +267,7 @@ class ToolTransform(FlatCAMTool):
_("Offset the selected object(s).\n"
"The point of reference is the middle of\n"
"the bounding box for all selected objects.\n"))
self.offy_button.setFixedWidth(60)
self.offy_button.setFixedWidth(90)
form3_child_1.addWidget(self.offx_entry)
form3_child_1.addWidget(self.offx_button)
@@ -297,7 +297,7 @@ class ToolTransform(FlatCAMTool):
_("Flip the selected object(s) over the X axis.\n"
"Does not create a new object.\n ")
)
self.flipx_button.setFixedWidth(60)
self.flipx_button.setFixedWidth(100)
self.flipy_button = FCButton()
self.flipy_button.set_value(_("Flip on Y"))
@@ -305,7 +305,7 @@ class ToolTransform(FlatCAMTool):
_("Flip the selected object(s) over the X axis.\n"
"Does not create a new object.\n ")
)
self.flipy_button.setFixedWidth(60)
self.flipy_button.setFixedWidth(90)
self.flip_ref_cb = FCCheckBox()
self.flip_ref_cb.set_value(True)
@@ -320,7 +320,7 @@ class ToolTransform(FlatCAMTool):
"Then click Add button to insert coordinates.\n"
"Or enter the coords in format (x, y) in the\n"
"Point Entry field and click Flip on X(Y)"))
self.flip_ref_cb.setFixedWidth(50)
self.flip_ref_cb.setFixedWidth(70)
self.flip_ref_label = QtWidgets.QLabel(_("Point:"))
self.flip_ref_label.setToolTip(
@@ -328,10 +328,10 @@ class ToolTransform(FlatCAMTool):
"The 'x' in (x, y) will be used when using Flip on X and\n"
"the 'y' in (x, y) will be used when using Flip on Y and")
)
self.flip_ref_label.setFixedWidth(50)
self.flip_ref_label.setFixedWidth(70)
self.flip_ref_entry = EvalEntry2("(0, 0)")
self.flip_ref_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
# self.flip_ref_entry.setFixedWidth(60)
# self.flip_ref_entry.setFixedWidth(70)
self.flip_ref_button = FCButton()
self.flip_ref_button.set_value(_("Add"))
@@ -339,7 +339,7 @@ class ToolTransform(FlatCAMTool):
_("The point coordinates can be captured by\n"
"left click on canvas together with pressing\n"
"SHIFT key. Then click Add button to insert."))
self.flip_ref_button.setFixedWidth(60)
self.flip_ref_button.setFixedWidth(90)
form4_child_hlay.addStretch()
form4_child_hlay.addWidget(self.flipx_button)
@@ -388,6 +388,9 @@ class ToolTransform(FlatCAMTool):
self.app.ui.splitter.setSizes([0, 1])
except AttributeError:
pass
else:
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
FlatCAMTool.run(self)
self.set_tool_ui()