- added new settings in Edit -> Preferences -> General for Notebook Font size (set font size for the items in Project Tree and for text in Selected Tab) and for canvas Axis font size. The values are stored in QSettings.

- updated translations
This commit is contained in:
Marius Stanciu
2019-08-13 04:23:32 +03:00
parent d5f74ae8b4
commit 0686e77f99
18 changed files with 9470 additions and 8999 deletions

View File

@@ -3717,6 +3717,38 @@ class GeneralGUISetGroupUI(OptionsGroupUI):
)
self.selection_cb = FCCheckBox()
self.notebook_font_size_label = QtWidgets.QLabel(_('NB Font Size:'))
self.notebook_font_size_label.setToolTip(
_("This sets the font size for the elements found in the Notebook.\n"
"The notebook is the collapsible area in the left side of the GUI,\n"
"and include the Project, Selected and Tool tabs.")
)
self.notebook_font_size_spinner = FCSpinner()
self.notebook_font_size_spinner.setRange(8, 40)
self.notebook_font_size_spinner.setWrapping(True)
settings = QSettings("Open Source", "FlatCAM")
if settings.contains("notebook_font_size"):
self.notebook_font_size_spinner.set_value(settings.value('notebook_font_size', type=int))
else:
self.notebook_font_size_spinner.set_value(12)
self.axis_font_size_label = QtWidgets.QLabel(_('Axis Font Size:'))
self.axis_font_size_label.setToolTip(
_("This sets the font size for canvas axis.")
)
self.axis_font_size_spinner = FCSpinner()
self.axis_font_size_spinner.setRange(8, 40)
self.axis_font_size_spinner.setWrapping(True)
settings = QSettings("Open Source", "FlatCAM")
if settings.contains("axis_font_size"):
self.axis_font_size_spinner.set_value(settings.value('axis_font_size', type=int))
else:
self.axis_font_size_spinner.set_value(8)
# Just to add empty rows
self.spacelabel = QtWidgets.QLabel('')
@@ -3729,6 +3761,10 @@ class GeneralGUISetGroupUI(OptionsGroupUI):
self.form_box.addRow(self.clear_label, self.clear_btn)
self.form_box.addRow(self.hover_label, self.hover_cb)
self.form_box.addRow(self.selection_label, self.selection_cb)
self.form_box.addRow(QtWidgets.QLabel(''))
self.form_box.addRow(self.notebook_font_size_label, self.notebook_font_size_spinner)
self.form_box.addRow(self.axis_font_size_label, self.axis_font_size_spinner)
# Add the QFormLayout that holds the Application general defaults
# to the main layout of this TAB

View File

@@ -8,12 +8,13 @@
import numpy as np
from PyQt5.QtGui import QPalette
from PyQt5.QtCore import QSettings
import vispy.scene as scene
from vispy.scene.cameras.base_camera import BaseCamera
from vispy.color import Color
import time
white = Color("#ffffff" )
white = Color("#ffffff")
black = Color("#000000")
@@ -35,12 +36,19 @@ class VisPyCanvas(scene.SceneCanvas):
top_padding = self.grid_widget.add_widget(row=0, col=0, col_span=2)
top_padding.height_max = 0
self.yaxis = scene.AxisWidget(orientation='left', axis_color='black', text_color='black', font_size=8)
settings = QSettings("Open Source", "FlatCAM")
if settings.contains("axis_font_size"):
a_fsize = settings.value('axis_font_size', type=int)
else:
a_fsize = 8
self.yaxis = scene.AxisWidget(orientation='left', axis_color='black', text_color='black', font_size=a_fsize)
self.yaxis.width_max = 55
self.grid_widget.add_widget(self.yaxis, row=1, col=0)
self.xaxis = scene.AxisWidget(orientation='bottom', axis_color='black', text_color='black', font_size=8)
self.xaxis.height_max = 25
self.xaxis = scene.AxisWidget(orientation='bottom', axis_color='black', text_color='black', font_size=a_fsize,
anchors=['center', 'bottom'])
self.xaxis.height_max = 30
self.grid_widget.add_widget(self.xaxis, row=2, col=1)
right_padding = self.grid_widget.add_widget(row=0, col=2, row_span=2)
@@ -48,7 +56,7 @@ class VisPyCanvas(scene.SceneCanvas):
right_padding.width_max = 0
view = self.grid_widget.add_view(row=1, col=1, border_color='black', bgcolor='white')
view.camera = Camera(aspect=1, rect=(-25,-25,150,150))
view.camera = Camera(aspect=1, rect=(-25, -25, 150, 150))
# Following function was removed from 'prepare_draw()' of 'Grid' class by patch,
# it is necessary to call manually