move font size update to settings class
This commit is contained in:
@@ -149,8 +149,7 @@ class InnerBigText(QWidget):
|
|||||||
def wheelEvent(self, event: QWheelEvent):
|
def wheelEvent(self, event: QWheelEvent):
|
||||||
direction = 1 if event.angleDelta().y() < 0 else -1
|
direction = 1 if event.angleDelta().y() < 0 else -1
|
||||||
if event.modifiers() == Qt.KeyboardModifier.ControlModifier:
|
if event.modifiers() == Qt.KeyboardModifier.ControlModifier:
|
||||||
font_size = min(max(4, self.model.settings.get_font_size()-direction),30)
|
self.model.settings.update_font_size(-direction)
|
||||||
self.model.settings.font_size(font_size)
|
|
||||||
self.update()
|
self.update()
|
||||||
else:
|
else:
|
||||||
# print("wheel event fired :) %s" % (direction))
|
# print("wheel event fired :) %s" % (direction))
|
||||||
|
|||||||
15
main.py
15
main.py
@@ -24,7 +24,7 @@ class MainWindow(QMainWindow):
|
|||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super(MainWindow, self).__init__(*args, **kwargs)
|
super(MainWindow, self).__init__(*args, **kwargs)
|
||||||
|
|
||||||
self.settings = Settings()
|
self.settings = Settings(lambda : self.update())
|
||||||
self.setWindowTitle(self.tr("RavenLog"))
|
self.setWindowTitle(self.tr("RavenLog"))
|
||||||
self.setGeometry(0, 0, 640, 480)
|
self.setGeometry(0, 0, 640, 480)
|
||||||
self.setDockNestingEnabled(True)
|
self.setDockNestingEnabled(True)
|
||||||
@@ -36,22 +36,13 @@ class MainWindow(QMainWindow):
|
|||||||
|
|
||||||
|
|
||||||
self.setCentralWidget(self.tabs)
|
self.setCentralWidget(self.tabs)
|
||||||
self.main_tool_bar = self.create_main_tool_bar()
|
#self.main_tool_bar = self.create_main_tool_bar()
|
||||||
self.addToolBar(self.main_tool_bar)
|
#self.addToolBar(self.main_tool_bar)
|
||||||
self.setStatusBar(QStatusBar(self))
|
self.setStatusBar(QStatusBar(self))
|
||||||
self.setMenuBar(self.create_menu_bar())
|
self.setMenuBar(self.create_menu_bar())
|
||||||
|
|
||||||
def create_main_tool_bar(self):
|
def create_main_tool_bar(self):
|
||||||
result = QToolBar("main toolbar")
|
result = QToolBar("main toolbar")
|
||||||
|
|
||||||
result.addWidget(QLabel(self.tr("Font Size:")))
|
|
||||||
font_size = QComboBox(result)
|
|
||||||
for s in range(3,30):
|
|
||||||
font_size.addItem(str(s))
|
|
||||||
font_size.setCurrentText(str(self.settings.get_font_size()))
|
|
||||||
font_size.currentTextChanged.connect(self.update_font_size)
|
|
||||||
result.addWidget(font_size)
|
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def update_font_size(self, font_size):
|
def update_font_size(self, font_size):
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ class Settings():
|
|||||||
def get_font_size(self) -> int:
|
def get_font_size(self) -> int:
|
||||||
return self._font_size
|
return self._font_size
|
||||||
|
|
||||||
|
def update_font_size(self, increment: int):
|
||||||
|
font_size = min(max(4, self._font_size + increment), 50)
|
||||||
|
self.font_size(font_size)
|
||||||
|
|
||||||
def font_size(self, font_size: int):
|
def font_size(self, font_size: int):
|
||||||
self._font_size = font_size
|
self._font_size = font_size
|
||||||
self._font = QFont("monospace", font_size)
|
self._font = QFont("monospace", font_size)
|
||||||
|
|||||||
Reference in New Issue
Block a user