- fixed a crash when creating a Document object due of changes in Qt6 (missing QtGui.Qt)

- in Document object fixed the issue with not setting selection color when in a dark theme (essentially got rid of using QPalette)
- in dark theme stylesheet changed the indent of the QCheckBox (and in Radio buttons too)
- updated the FClabel widget with some more properties
- updated the hack to make sure that the Editor sub-tools do not lose the stylesheet of the background
- updated the disabled project item color default value for the dark theme
This commit is contained in:
Marius Stanciu
2022-05-11 20:13:36 +03:00
committed by Marius
parent ab11367e3d
commit a973275f97
54 changed files with 204 additions and 180 deletions

View File

@@ -7219,7 +7219,7 @@ class TransformEditorTool(AppTool):
except AttributeError:
pass
AppTool.run(self)
super().run()
self.set_tool_ui()
self.app.ui.notebook.setTabText(2, _("Transformation"))

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class ExcCopyEditorTool(AppTool):
class ExcCopyEditorTool(AppToolEditor):
"""
Copy Plugin
"""
def __init__(self, app, draw_app, plugin_name):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -36,7 +36,7 @@ class ExcCopyEditorTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor CopyTool()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class ExcDrillArrayEditorTool(AppTool):
class ExcDrillArrayEditorTool(AppToolEditor):
"""
Create an array of drill holes
"""
def __init__(self, app, draw_app, plugin_name):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -31,7 +31,7 @@ class ExcDrillArrayEditorTool(AppTool):
def run(self):
self.app.defaults.report_usage("Exc Editor ArrayTool()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class ExcDrillEditorTool(AppTool):
class ExcDrillEditorTool(AppToolEditor):
"""
Simple input for buffer distance.
"""
def __init__(self, app, draw_app, plugin_name):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -36,7 +36,7 @@ class ExcDrillEditorTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor ToolPath()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class ExcResizeEditorTool(AppTool):
class ExcResizeEditorTool(AppToolEditor):
"""
Simple input for buffer distance.
"""
def __init__(self, app, draw_app, plugin_name):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -36,7 +36,7 @@ class ExcResizeEditorTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor ToolPath()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class ExcSlotArrayEditorTool(AppTool):
class ExcSlotArrayEditorTool(AppToolEditor):
"""
Create an array of drill holes
"""
def __init__(self, app, draw_app, plugin_name):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -33,7 +33,7 @@ class ExcSlotArrayEditorTool(AppTool):
def run(self):
self.app.defaults.report_usage("Exc Editor ArrayTool()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class ExcSlotEditorTool(AppTool):
class ExcSlotEditorTool(AppToolEditor):
"""
Simple input for buffer distance.
"""
def __init__(self, app, draw_app, plugin_name):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -36,7 +36,7 @@ class ExcSlotEditorTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor ToolPath()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class BufferSelectionTool(AppTool):
class BufferSelectionTool(AppToolEditor):
"""
Simple input for buffer distance.
"""
def __init__(self, app, draw_app):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -30,7 +30,7 @@ class BufferSelectionTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor ToolBuffer()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class CircleEditorTool(AppTool):
class CircleEditorTool(AppToolEditor):
"""
Simple input for buffer distance.
"""
def __init__(self, app, draw_app, plugin_name):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -30,7 +30,7 @@ class CircleEditorTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor CircleTool()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class CopyEditorTool(AppTool):
class CopyEditorTool(AppToolEditor):
"""
Simple input for buffer distance.
"""
def __init__(self, app, draw_app, plugin_name):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -36,7 +36,7 @@ class CopyEditorTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor CopyTool()")
AppTool.run(self)
AppToolEditor.run(self)
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -7,13 +7,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class PaintOptionsTool(AppTool):
class PaintOptionsTool(AppToolEditor):
"""
Inputs to specify how to paint the selected polygons.
"""
def __init__(self, app, fcdraw):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.app = app
self.fcdraw = fcdraw
@@ -26,7 +26,7 @@ class PaintOptionsTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor ToolPaint()")
AppTool.run(self)
AppToolEditor.run(self)
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class PathEditorTool(AppTool):
class PathEditorTool(AppToolEditor):
"""
Simple input for buffer distance.
"""
def __init__(self, app, draw_app, plugin_name):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -36,7 +36,7 @@ class PathEditorTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor ToolPath()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class RectangleEditorTool(AppTool):
class RectangleEditorTool(AppToolEditor):
"""
Simple input for buffer distance.
"""
def __init__(self, app, draw_app, plugin_name):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -30,7 +30,7 @@ class RectangleEditorTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor RectangleTool()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:
@@ -301,7 +301,7 @@ class RectangleEditorUI:
size_frame.setLayout(size_grid)
# Length
self.length_lbl = FCLabel('%s:' % _("Projection"))
self.length_lbl = FCLabel('%s:' % _("Length"))
self.length_entry = NumericalEvalEntry()
size_grid.addWidget(self.length_lbl, 0, 0)
size_grid.addWidget(self.length_entry, 0, 1)

View File

@@ -6,7 +6,7 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class SimplificationTool(AppTool):
class SimplificationTool(AppToolEditor):
"""
Do a shape simplification for the selected geometry.
"""
@@ -14,7 +14,7 @@ class SimplificationTool(AppTool):
update_ui = pyqtSignal(object, int)
def __init__(self, app, draw_app):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.draw_app = draw_app
self.decimals = app.decimals
@@ -33,7 +33,7 @@ class SimplificationTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor SimplificationTool()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -7,13 +7,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class TextInputTool(AppTool):
class TextInputTool(AppToolEditor):
"""
Simple input for buffer distance.
"""
def __init__(self, app, draw_app):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.app = app
self.draw_app = draw_app
@@ -33,7 +33,7 @@ class TextInputTool(AppTool):
def run(self):
self.app.defaults.report_usage("Geo Editor TextInputTool()")
AppTool.run(self)
super().run()
# if the splitter us hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -6,13 +6,13 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class TransformEditorTool(AppTool):
class TransformEditorTool(AppToolEditor):
"""
Inputs to specify how to paint the selected polygons.
"""
def __init__(self, app, draw_app):
AppTool.__init__(self, app)
AppToolEditor.__init__(self, app)
self.app = app
self.draw_app = draw_app
@@ -84,7 +84,7 @@ class TransformEditorTool(AppTool):
except AttributeError:
pass
AppTool.run(self)
super().run()
self.set_tool_ui()
self.app.ui.notebook.setTabText(2, _("Transformation"))