From 8bbc0cb5f4a8399ff44d07eb08d067f0ec2905ba Mon Sep 17 00:00:00 2001 From: Daniel Kratzert Date: Wed, 13 Mar 2024 12:51:06 +0100 Subject: [PATCH] Author editor and text sizes * AuthorLoops is now finally initialized on block load and not before. Options are now disabled without a CIF * The size of the fields over the table is now set more dynamically --- finalcif/appwindow.py | 19 ++++++++++++----- finalcif/gui/finalcif_gui_ui.py | 6 ------ finalcif/gui/finalcif_gui_ui.ui | 36 --------------------------------- 3 files changed, 14 insertions(+), 47 deletions(-) diff --git a/finalcif/appwindow.py b/finalcif/appwindow.py index 9118f166..090a2867 100644 --- a/finalcif/appwindow.py +++ b/finalcif/appwindow.py @@ -101,7 +101,7 @@ def __init__(self, file: Optional[Path] = None): self.properties = Properties(parent=self, settings=self.settings) self.status_bar = StatusBar(ui=self.ui) self.status_bar.show_message('FinalCif version {}'.format(VERSION)) - self.authors = AuthorLoops(ui=self.ui, cif=self.cif, app=self) + self.authors: Union[AuthorLoops, None] = None self.set_window_size_and_position() self.ui.cif_main_table.installEventFilter(self) # Sorting desynchronized header and columns: @@ -159,8 +159,7 @@ def set_initial_button_states(self) -> None: self.ui.CCDCpushButton.setDisabled(True) self.ui.ShredCifButton.setDisabled(True) self.ui.LoopsPushButton.setDisabled(True) - # Ok to be enabled: - # self.ui.OptionsPushButton.setDisabled(True) + self.ui.OptionsPushButton.setDisabled(True) self.ui.AuthorEditPushButton.setDisabled(True) def enable_buttons(self): @@ -202,6 +201,7 @@ def set_font_sizes(self) -> None: self.ui.docxTemplatesListWidget.setFont(mid_font) self.ui.PropertiesTemplatesListWidget.setFont(mid_font) self.ui.depositOutputTextBrowser.setFont(mid_font) + self.setTextEditSizes() def set_window_size_and_position(self) -> None: wsettings = self.settings.load_window_position() @@ -629,6 +629,15 @@ def resizeEvent(self, a0: QtGui.QResizeEvent) -> None: # Not necessary here, it is done in MyCifTable # threading.Thread(target=self.ui.cif_main_table.resizeRowsToContents).start() # QtCore.QTimer(self).singleShot(0, self.ui.cif_main_table.resizeRowsToContents) + self.setTextEditSizes() + + def setTextEditSizes(self): + for ui in [self.ui.Spacegroup_top_LineEdit, self.ui.CCDCNumLineEdit, self.ui.SumFormMainLineEdit]: + ui.setFixedHeight(self.ui.appendCifPushButton.height() + 6) + ui.setFixedHeight(self.ui.appendCifPushButton.height() + 6) + ui.setFixedHeight(self.ui.appendCifPushButton.height() + 6) + vScrollBar = ui.verticalScrollBar() + vScrollBar.triggerAction(QScrollBar.SliderSingleStepAdd) def moveEvent(self, a0: QtGui.QMoveEvent) -> None: """Is called when the main window moves.""" @@ -1130,8 +1139,8 @@ def make_report_tables(self) -> None: ok = t.make_templated_docx_report(output_filename=str(report_filename), picfile=picfile, template_path=Path(self.get_checked_templates_list_text())) - #t = TemplatedReport(format=ReportFormat.HTML, options=self.options, cif=self.cif) - #t.make_templated_html_report(options=self.options, picfile=picfile) + # t = TemplatedReport(format=ReportFormat.HTML, options=self.options, cif=self.cif) + # t.make_templated_html_report(options=self.options, picfile=picfile) if not ok: return None except FileNotFoundError as e: diff --git a/finalcif/gui/finalcif_gui_ui.py b/finalcif/gui/finalcif_gui_ui.py index a7dc2252..520764aa 100644 --- a/finalcif/gui/finalcif_gui_ui.py +++ b/finalcif/gui/finalcif_gui_ui.py @@ -1751,8 +1751,6 @@ def setupUi(self, FinalCifWindow): self.datanameComboBox.setObjectName("datanameComboBox") self.gridLayout_6.addWidget(self.datanameComboBox, 0, 1, 1, 1) self.CCDCNumLineEdit = QtWidgets.QTextEdit(self.CifDataItemsFrame) - self.CCDCNumLineEdit.setMinimumSize(QtCore.QSize(0, 24)) - self.CCDCNumLineEdit.setMaximumSize(QtCore.QSize(16777215, 24)) self.CCDCNumLineEdit.viewport().setProperty("cursor", QtGui.QCursor(QtCore.Qt.IBeamCursor)) self.CCDCNumLineEdit.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) self.CCDCNumLineEdit.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) @@ -1764,8 +1762,6 @@ def setupUi(self, FinalCifWindow): self.CCDCNumLineEdit.setObjectName("CCDCNumLineEdit") self.gridLayout_6.addWidget(self.CCDCNumLineEdit, 0, 8, 1, 1) self.SumFormMainLineEdit = QtWidgets.QTextEdit(self.CifDataItemsFrame) - self.SumFormMainLineEdit.setMinimumSize(QtCore.QSize(0, 24)) - self.SumFormMainLineEdit.setMaximumSize(QtCore.QSize(16777215, 24)) self.SumFormMainLineEdit.viewport().setProperty("cursor", QtGui.QCursor(QtCore.Qt.IBeamCursor)) self.SumFormMainLineEdit.setInputMethodHints(QtCore.Qt.ImhNone) self.SumFormMainLineEdit.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) @@ -1794,8 +1790,6 @@ def setupUi(self, FinalCifWindow): spacerItem42 = QtWidgets.QSpacerItem(10, 0, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum) self.gridLayout_6.addItem(spacerItem42, 0, 6, 1, 1) self.Spacegroup_top_LineEdit = QtWidgets.QTextEdit(self.CifDataItemsFrame) - self.Spacegroup_top_LineEdit.setMinimumSize(QtCore.QSize(0, 24)) - self.Spacegroup_top_LineEdit.setMaximumSize(QtCore.QSize(16777215, 24)) self.Spacegroup_top_LineEdit.viewport().setProperty("cursor", QtGui.QCursor(QtCore.Qt.IBeamCursor)) self.Spacegroup_top_LineEdit.setInputMethodHints(QtCore.Qt.ImhNone) self.Spacegroup_top_LineEdit.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) diff --git a/finalcif/gui/finalcif_gui_ui.ui b/finalcif/gui/finalcif_gui_ui.ui index 437b0875..2e3781ed 100644 --- a/finalcif/gui/finalcif_gui_ui.ui +++ b/finalcif/gui/finalcif_gui_ui.ui @@ -4105,18 +4105,6 @@ please add a publication author: - - - 0 - 24 - - - - - 16777215 - 24 - - IBeamCursor @@ -4145,18 +4133,6 @@ please add a publication author: - - - 0 - 24 - - - - - 16777215 - 24 - - IBeamCursor @@ -4248,18 +4224,6 @@ please add a publication author: - - - 0 - 24 - - - - - 16777215 - 24 - - IBeamCursor