- added a parent to some of the FCInputDialog widgets used in the app such that those pop-up windows will b displayed in the center of the app main window as opposed to the center of the screen
- finished the Google-translation of not translated strings in Russian language
This commit is contained in:
parent
0ef7924726
commit
094060f6e1
|
@ -18,6 +18,8 @@ CHANGELOG for FlatCAM beta
|
||||||
- fixed issue in Excellon Editor when using the menu links to Move or Copy Drills/Slots
|
- fixed issue in Excellon Editor when using the menu links to Move or Copy Drills/Slots
|
||||||
- updated the strings
|
- updated the strings
|
||||||
- updated the Turkish translation strings (by Mehmet Kaya)
|
- updated the Turkish translation strings (by Mehmet Kaya)
|
||||||
|
- added a parent to some of the FCInputDialog widgets used in the app such that those pop-up windows will b displayed in the center of the app main window as opposed to the center of the screen
|
||||||
|
- finished the Google-translation of not translated strings in Russian language
|
||||||
|
|
||||||
30.10.2020
|
30.10.2020
|
||||||
|
|
||||||
|
|
|
@ -1448,7 +1448,8 @@ class TransformEditorTool(AppTool):
|
||||||
val_box = FCInputDialog(title=_("Rotate ..."),
|
val_box = FCInputDialog(title=_("Rotate ..."),
|
||||||
text='%s:' % _('Enter an Angle Value (degrees)'),
|
text='%s:' % _('Enter an Angle Value (degrees)'),
|
||||||
min=-359.9999, max=360.0000, decimals=self.decimals,
|
min=-359.9999, max=360.0000, decimals=self.decimals,
|
||||||
init_val=float(self.app.defaults['tools_transform_rotate']))
|
init_val=float(self.app.defaults['tools_transform_rotate']),
|
||||||
|
parent=self.app.ui)
|
||||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/rotate.png'))
|
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/rotate.png'))
|
||||||
|
|
||||||
val, ok = val_box.get_value()
|
val, ok = val_box.get_value()
|
||||||
|
@ -1465,7 +1466,8 @@ class TransformEditorTool(AppTool):
|
||||||
val_box = FCInputDialog(title=_("Offset on X axis ..."),
|
val_box = FCInputDialog(title=_("Offset on X axis ..."),
|
||||||
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
|
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
|
||||||
min=-9999.9999, max=10000.0000, decimals=self.decimals,
|
min=-9999.9999, max=10000.0000, decimals=self.decimals,
|
||||||
init_val=float(self.app.defaults['tools_transform_offset_x']))
|
init_val=float(self.app.defaults['tools_transform_offset_x']),
|
||||||
|
parent=self.app.ui)
|
||||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/offsetx32.png'))
|
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/offsetx32.png'))
|
||||||
|
|
||||||
val, ok = val_box.get_value()
|
val, ok = val_box.get_value()
|
||||||
|
@ -1482,7 +1484,8 @@ class TransformEditorTool(AppTool):
|
||||||
val_box = FCInputDialog(title=_("Offset on Y axis ..."),
|
val_box = FCInputDialog(title=_("Offset on Y axis ..."),
|
||||||
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
|
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
|
||||||
min=-9999.9999, max=10000.0000, decimals=self.decimals,
|
min=-9999.9999, max=10000.0000, decimals=self.decimals,
|
||||||
init_val=float(self.app.defaults['tools_transform_offset_y']))
|
init_val=float(self.app.defaults['tools_transform_offset_y']),
|
||||||
|
parent=self.app.ui)
|
||||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/offsety32.png'))
|
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/offsety32.png'))
|
||||||
|
|
||||||
val, ok = val_box.get_value()
|
val, ok = val_box.get_value()
|
||||||
|
@ -1497,7 +1500,8 @@ class TransformEditorTool(AppTool):
|
||||||
val_box = FCInputDialog(title=_("Skew on X axis ..."),
|
val_box = FCInputDialog(title=_("Skew on X axis ..."),
|
||||||
text='%s:' % _('Enter an Angle Value (degrees)'),
|
text='%s:' % _('Enter an Angle Value (degrees)'),
|
||||||
min=-359.9999, max=360.0000, decimals=self.decimals,
|
min=-359.9999, max=360.0000, decimals=self.decimals,
|
||||||
init_val=float(self.app.defaults['tools_transform_skew_x']))
|
init_val=float(self.app.defaults['tools_transform_skew_x']),
|
||||||
|
parent=self.app.ui)
|
||||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/skewX.png'))
|
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/skewX.png'))
|
||||||
|
|
||||||
val, ok = val_box.get_value()
|
val, ok = val_box.get_value()
|
||||||
|
@ -1512,7 +1516,8 @@ class TransformEditorTool(AppTool):
|
||||||
val_box = FCInputDialog(title=_("Skew on Y axis ..."),
|
val_box = FCInputDialog(title=_("Skew on Y axis ..."),
|
||||||
text='%s:' % _('Enter an Angle Value (degrees)'),
|
text='%s:' % _('Enter an Angle Value (degrees)'),
|
||||||
min=-359.9999, max=360.0000, decimals=self.decimals,
|
min=-359.9999, max=360.0000, decimals=self.decimals,
|
||||||
init_val=float(self.app.defaults['tools_transform_skew_y']))
|
init_val=float(self.app.defaults['tools_transform_skew_y']),
|
||||||
|
parent=self.app.ui)
|
||||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/skewY.png'))
|
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/skewY.png'))
|
||||||
|
|
||||||
val, ok = val_box.get_value()
|
val, ok = val_box.get_value()
|
||||||
|
|
|
@ -6181,7 +6181,8 @@ class TransformEditorTool(AppTool):
|
||||||
val_box = FCInputDialog(title=_("Rotate ..."),
|
val_box = FCInputDialog(title=_("Rotate ..."),
|
||||||
text='%s:' % _('Enter an Angle Value (degrees)'),
|
text='%s:' % _('Enter an Angle Value (degrees)'),
|
||||||
min=-359.9999, max=360.0000, decimals=self.decimals,
|
min=-359.9999, max=360.0000, decimals=self.decimals,
|
||||||
init_val=float(self.app.defaults['tools_transform_rotate']))
|
init_val=float(self.app.defaults['tools_transform_rotate']),
|
||||||
|
parent=self.app.ui)
|
||||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/rotate.png'))
|
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/rotate.png'))
|
||||||
|
|
||||||
val, ok = val_box.get_value()
|
val, ok = val_box.get_value()
|
||||||
|
@ -6198,7 +6199,8 @@ class TransformEditorTool(AppTool):
|
||||||
val_box = FCInputDialog(title=_("Offset on X axis ..."),
|
val_box = FCInputDialog(title=_("Offset on X axis ..."),
|
||||||
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
|
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
|
||||||
min=-9999.9999, max=10000.0000, decimals=self.decimals,
|
min=-9999.9999, max=10000.0000, decimals=self.decimals,
|
||||||
init_val=float(self.app.defaults['tools_transform_offset_x']))
|
init_val=float(self.app.defaults['tools_transform_offset_x']),
|
||||||
|
parent=self.app.ui)
|
||||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/offsetx32.png'))
|
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/offsetx32.png'))
|
||||||
|
|
||||||
val, ok = val_box.get_value()
|
val, ok = val_box.get_value()
|
||||||
|
@ -6215,7 +6217,8 @@ class TransformEditorTool(AppTool):
|
||||||
val_box = FCInputDialog(title=_("Offset on Y axis ..."),
|
val_box = FCInputDialog(title=_("Offset on Y axis ..."),
|
||||||
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
|
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
|
||||||
min=-9999.9999, max=10000.0000, decimals=self.decimals,
|
min=-9999.9999, max=10000.0000, decimals=self.decimals,
|
||||||
init_val=float(self.app.defaults['tools_transform_offset_y']))
|
init_val=float(self.app.defaults['tools_transform_offset_y']),
|
||||||
|
parent=self.app.ui)
|
||||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/offsety32.png'))
|
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/offsety32.png'))
|
||||||
|
|
||||||
val, ok = val_box.get_value()
|
val, ok = val_box.get_value()
|
||||||
|
@ -6230,7 +6233,8 @@ class TransformEditorTool(AppTool):
|
||||||
val_box = FCInputDialog(title=_("Skew on X axis ..."),
|
val_box = FCInputDialog(title=_("Skew on X axis ..."),
|
||||||
text='%s:' % _('Enter an Angle Value (degrees)'),
|
text='%s:' % _('Enter an Angle Value (degrees)'),
|
||||||
min=-359.9999, max=360.0000, decimals=self.decimals,
|
min=-359.9999, max=360.0000, decimals=self.decimals,
|
||||||
init_val=float(self.app.defaults['tools_transform_skew_x']))
|
init_val=float(self.app.defaults['tools_transform_skew_x']),
|
||||||
|
parent=self.app.ui)
|
||||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/skewX.png'))
|
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/skewX.png'))
|
||||||
|
|
||||||
val, ok = val_box.get_value()
|
val, ok = val_box.get_value()
|
||||||
|
@ -6245,7 +6249,8 @@ class TransformEditorTool(AppTool):
|
||||||
val_box = FCInputDialog(title=_("Skew on Y axis ..."),
|
val_box = FCInputDialog(title=_("Skew on Y axis ..."),
|
||||||
text='%s:' % _('Enter an Angle Value (degrees)'),
|
text='%s:' % _('Enter an Angle Value (degrees)'),
|
||||||
min=-359.9999, max=360.0000, decimals=self.decimals,
|
min=-359.9999, max=360.0000, decimals=self.decimals,
|
||||||
init_val=float(self.app.defaults['tools_transform_skew_y']))
|
init_val=float(self.app.defaults['tools_transform_skew_y']),
|
||||||
|
parent=self.app.ui)
|
||||||
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/skewY.png'))
|
val_box.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/skewY.png'))
|
||||||
|
|
||||||
val, ok = val_box.get_value()
|
val, ok = val_box.get_value()
|
||||||
|
|
|
@ -789,7 +789,8 @@ class ToolIsolation(AppTool, Gerber):
|
||||||
text='%s:' % _('Enter a Tool Diameter'),
|
text='%s:' % _('Enter a Tool Diameter'),
|
||||||
min=0.0001, max=9999.9999, decimals=self.decimals,
|
min=0.0001, max=9999.9999, decimals=self.decimals,
|
||||||
button_icon=btn_icon,
|
button_icon=btn_icon,
|
||||||
callback=self.on_find_optimal_tooldia)
|
callback=self.on_find_optimal_tooldia,
|
||||||
|
parent=self.app.ui)
|
||||||
tool_add_popup.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/letter_t_32.png'))
|
tool_add_popup.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/letter_t_32.png'))
|
||||||
|
|
||||||
def find_optimal(val):
|
def find_optimal(val):
|
||||||
|
|
|
@ -460,7 +460,8 @@ class NonCopperClear(AppTool, Gerber):
|
||||||
text='%s:' % _('Enter a Tool Diameter'),
|
text='%s:' % _('Enter a Tool Diameter'),
|
||||||
min=0.0001, max=9999.9999, decimals=self.decimals,
|
min=0.0001, max=9999.9999, decimals=self.decimals,
|
||||||
button_icon=btn_icon,
|
button_icon=btn_icon,
|
||||||
callback=self.on_find_optimal_tooldia)
|
callback=self.on_find_optimal_tooldia,
|
||||||
|
parent=self.app.ui)
|
||||||
tool_add_popup.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/letter_t_32.png'))
|
tool_add_popup.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/letter_t_32.png'))
|
||||||
|
|
||||||
def find_optimal(valor):
|
def find_optimal(valor):
|
||||||
|
|
|
@ -383,7 +383,8 @@ class ToolPaint(AppTool, Gerber):
|
||||||
def on_add_tool_by_key(self):
|
def on_add_tool_by_key(self):
|
||||||
tool_add_popup = FCInputDialog(title='%s...' % _("New Tool"),
|
tool_add_popup = FCInputDialog(title='%s...' % _("New Tool"),
|
||||||
text='%s:' % _('Enter a Tool Diameter'),
|
text='%s:' % _('Enter a Tool Diameter'),
|
||||||
min=0.0000, max=99.9999, decimals=4)
|
min=0.0000, max=99.9999, decimals=4,
|
||||||
|
parent=self.app.ui)
|
||||||
tool_add_popup.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/letter_t_32.png'))
|
tool_add_popup.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/letter_t_32.png'))
|
||||||
|
|
||||||
val, ok = tool_add_popup.get_value()
|
val, ok = tool_add_popup.get_value()
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
|
|
||||||
from appTool import AppTool
|
from appTool import AppTool
|
||||||
from appCommon.Common import LoudDict
|
from appCommon.Common import LoudDict
|
||||||
from appGUI.GUIElements import FCComboBox, FCEntry, FCTable, \
|
from appGUI.GUIElements import FCComboBox, FCEntry, FCTable, FCDoubleSpinner, FCSpinner, FCFileSaveDialog, \
|
||||||
FCInputDialog, FCDoubleSpinner, FCSpinner, FCFileSaveDialog, FCInputSpinner
|
FCInputSpinner
|
||||||
from app_Main import log
|
from app_Main import log
|
||||||
from camlib import distance
|
from camlib import distance
|
||||||
from appEditors.AppTextEditor import AppTextEditor
|
from appEditors.AppTextEditor import AppTextEditor
|
||||||
|
|
15
app_Main.py
15
app_Main.py
|
@ -6119,7 +6119,8 @@ class App(QtCore.QObject):
|
||||||
if silent is False:
|
if silent is False:
|
||||||
rotatebox = FCInputDialog(title=_("Transform"), text=_("Enter the Angle value:"),
|
rotatebox = FCInputDialog(title=_("Transform"), text=_("Enter the Angle value:"),
|
||||||
min=-360, max=360, decimals=4,
|
min=-360, max=360, decimals=4,
|
||||||
init_val=float(self.defaults['tools_transform_rotate']))
|
init_val=float(self.defaults['tools_transform_rotate']),
|
||||||
|
parent=self.ui)
|
||||||
num, ok = rotatebox.get_value()
|
num, ok = rotatebox.get_value()
|
||||||
else:
|
else:
|
||||||
num = preset
|
num = preset
|
||||||
|
@ -6170,7 +6171,8 @@ class App(QtCore.QObject):
|
||||||
else:
|
else:
|
||||||
skewxbox = FCInputDialog(title=_("Transform"), text=_("Enter the Angle value:"),
|
skewxbox = FCInputDialog(title=_("Transform"), text=_("Enter the Angle value:"),
|
||||||
min=-360, max=360, decimals=4,
|
min=-360, max=360, decimals=4,
|
||||||
init_val=float(self.defaults['tools_transform_skew_x']))
|
init_val=float(self.defaults['tools_transform_skew_x']),
|
||||||
|
parent=self.ui)
|
||||||
num, ok = skewxbox.get_value()
|
num, ok = skewxbox.get_value()
|
||||||
if ok:
|
if ok:
|
||||||
# first get a bounding box to fit all
|
# first get a bounding box to fit all
|
||||||
|
@ -6207,7 +6209,8 @@ class App(QtCore.QObject):
|
||||||
else:
|
else:
|
||||||
skewybox = FCInputDialog(title=_("Transform"), text=_("Enter the Angle value:"),
|
skewybox = FCInputDialog(title=_("Transform"), text=_("Enter the Angle value:"),
|
||||||
min=-360, max=360, decimals=4,
|
min=-360, max=360, decimals=4,
|
||||||
init_val=float(self.defaults['tools_transform_skew_y']))
|
init_val=float(self.defaults['tools_transform_skew_y']),
|
||||||
|
parent=self.ui)
|
||||||
num, ok = skewybox.get_value()
|
num, ok = skewybox.get_value()
|
||||||
if ok:
|
if ok:
|
||||||
# first get a bounding box to fit all
|
# first get a bounding box to fit all
|
||||||
|
@ -6308,7 +6311,8 @@ class App(QtCore.QObject):
|
||||||
|
|
||||||
grid_add_popup = FCInputDialog(title=_("New Grid ..."),
|
grid_add_popup = FCInputDialog(title=_("New Grid ..."),
|
||||||
text=_('Enter a Grid Value:'),
|
text=_('Enter a Grid Value:'),
|
||||||
min=0.0000, max=99.9999, decimals=4)
|
min=0.0000, max=99.9999, decimals=4,
|
||||||
|
parent=self.ui)
|
||||||
grid_add_popup.setWindowIcon(QtGui.QIcon(self.resource_location + '/plus32.png'))
|
grid_add_popup.setWindowIcon(QtGui.QIcon(self.resource_location + '/plus32.png'))
|
||||||
|
|
||||||
val, ok = grid_add_popup.get_value()
|
val, ok = grid_add_popup.get_value()
|
||||||
|
@ -6332,7 +6336,8 @@ class App(QtCore.QObject):
|
||||||
|
|
||||||
grid_del_popup = FCInputDialog(title="Delete Grid ...",
|
grid_del_popup = FCInputDialog(title="Delete Grid ...",
|
||||||
text='Enter a Grid Value:',
|
text='Enter a Grid Value:',
|
||||||
min=0.0000, max=99.9999, decimals=4)
|
min=0.0000, max=99.9999, decimals=4,
|
||||||
|
parent=self.ui)
|
||||||
grid_del_popup.setWindowIcon(QtGui.QIcon(self.resource_location + '/delete32.png'))
|
grid_del_popup.setWindowIcon(QtGui.QIcon(self.resource_location + '/delete32.png'))
|
||||||
|
|
||||||
val, ok = grid_del_popup.get_value()
|
val, ok = grid_del_popup.get_value()
|
||||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue