diff --git a/main.pyproject b/main.pyproject index 2cad84e..130db1c 100644 --- a/main.pyproject +++ b/main.pyproject @@ -1,3 +1,3 @@ { - "files": ["manuskript/ui/editors/completer.py","manuskript/ui/views/outlineBasics.py","manuskript/ui/exporters/exporter.py","manuskript/tests/models/conftest.py","manuskript/ui/views/textEditView.py","manuskript/ui/revisions.py","manuskript/ui/editors/__init__.py","manuskript/tests/ui/importers/test_importers.py","manuskript/ui/views/outlineDelegates.py","manuskript/ui/exporters/manuskript/plainTextSettings_ui.ui","manuskript/enums.py","manuskript/ui/editors/textFormat_ui.py","manuskript/ui/highlighters/__init__.py","manuskript/converters/pandocConverter.py","manuskript/models/outlineModel.py","manuskript/models/characterPOVModel.py","manuskript/ui/editors/textFormat.py","manuskript/ui/editors/completer_ui.ui","manuskript/ui/settings_ui.py","manuskript/ui/views/storylineView_ui.ui","manuskript/ui/cheatSheet_ui.py","manuskript/ui/search.py","manuskript/settings.py","manuskript/importer/opmlImporter.py","manuskript/ui/views/treeView.py","manuskript/ui/exporters/exporter_ui.ui","manuskript/ui/editors/mainEditor_ui.py","manuskript/converters/markdownConverter.py","manuskript/models/persosProxyModel.py","manuskript/ui/editors/locker_ui.py","manuskript/ui/views/MDEditView.py","manuskript/ui/welcome_ui.py","manuskript/ui/views/propertiesView_ui.py","manuskript/ui/collapsibleGroupBox.py","manuskript/ui/editors/blockUserData.py","manuskript/models/references.py","manuskript/converters/__init__.py","manuskript/ui/views/corkDelegate.py","manuskript/ui/tools/__init__.py","manuskript/ui/style.py","manuskript/ui/tools/frequency_ui.py","manuskript/ui/views/cmbOutlineLabelChoser.py","manuskript/exporter/pandoc/HTML.py","manuskript/ui/views/propertiesView.py","manuskript/exporter/pandoc/outputFormats.py","manuskript/ui/views/sldImportance_ui.py","manuskript/ui/highlighters/MMDHighlighter.py","manuskript/ui/editors/textFormat_ui.ui","manuskript/tests/test_functions.py","manuskript/ui/mainWindow.ui","manuskript/ui/about_ui.py","manuskript/tests/test_settingsWindow.py","manuskript/tests/ui/exporters/__init__.py","manuskript/exporter/manuskript/__init__.py","manuskript/ui/editors/mainEditor.py","manuskript/ui/exporters/manuskript/__init__.py","manuskript/exporter/pandoc/abstractOutput.py","manuskript/tests/ui/test_welcome.py","manuskript/ui/cheatSheet_ui.ui","manuskript/importer/__init__.py","manuskript/ui/exporters/exportersManager.py","manuskript/exporter/pandoc/PDF.py","manuskript/ui/views/metadataView.py","manuskript/importer/markdownImporter.py","manuskript/ui/editors/tabSplitter_ui.py","manuskript/ui/views/cmbOutlineStatusChoser.py","manuskript/ui/editors/completer_ui.py","manuskript/tests/models/test_outlineItem.py","manuskript/ui/search_ui.py","manuskript/ui/views/cmbOutlineCharacterChoser.py","manuskript/load_save/version_1.py","manuskript/ui/search_ui.ui","manuskript/ui/views/plotTreeView.py","manuskript/ui/editors/mainEditor_ui.ui","manuskript/ui/views/PDFViewer.py","manuskript/settingsWindow.py","manuskript/loadSave.py","manuskript/ui/views/lineEditView.py","manuskript/ui/exporters/exportersManager_ui.ui","manuskript/exporter/manuskript/markdown.py","manuskript/importer/pandocImporters.py","manuskript/mainWindow.py","manuskript/ui/importers/generalSettings_ui.ui","manuskript/functions/__init__.py","manuskript/models/abstractItem.py","manuskript/ui/editors/locker.py","manuskript/ui/editors/tabSplitter_ui.ui","manuskript/ui/exporters/__init__.py","manuskript/ui/exporters/exportersManager_ui.py","manuskript/models/__init__.py","manuskript/ui/exporters/manuskript/plainTextSettings.py","manuskript/ui/editors/MDFunctions.py","manuskript/ui/views/sldImportance.py","manuskript/ui/views/basicItemView_ui.ui","manuskript/tests/models/test_references.py","manuskript/exporter/manuskript/HTML.py","manuskript/ui/views/metadataView_ui.ui","manuskript/exporter/__init__.py","manuskript/ui/views/outlineView.py","manuskript/main.py","manuskript/ui/revisions_ui.ui","manuskript/tests/ui/exporters/test_exporters.py","manuskript/ui/views/storylineView_ui.py","manuskript/tests/ui/__init__.py","manuskript/ui/about_ui.ui","manuskript/models/outlineItem.py","manuskript/__init__.py","manuskript/ui/statusLabel.py","manuskript/models/plotModel.py","manuskript/tests/__init__.py","manuskript/ui/views/dndView.py","manuskript/ui/tools/splitDialog.py","manuskript/ui/exporters/exporter_ui.py","manuskript/ui/settings_ui.ui","manuskript/ui/about.py","manuskript/ui/welcome.py","manuskript/ui/importers/importer.py","manuskript/ui/exporters/manuskript/plainTextSettings_ui.py","manuskript/importer/abstractImporter.py","manuskript/ui/views/__init__.py","manuskript/ui/highlighters/markdownEnums.py","manuskript/ui/importers/importer_ui.py","manuskript/ui/tools/frequency_ui.ui","manuskript/ui/helpLabel.py","manuskript/load_save/version_0.py","manuskript/ui/editors/editorWidget_ui.py","manuskript/ui/importers/__init__.py","manuskript/ui/editors/editorWidget.py","manuskript/ui/importers/generalSettings_ui.py","manuskript/functions/spellchecker.py","manuskript/ui/collapsibleGroupBox2.py","manuskript/ui/__init__.py","manuskript/ui/welcome_ui.ui","manuskript/ui/views/propertiesView_ui.ui","manuskript/tests/conftest.py","manuskript/ui/mainWindow.py","manuskript/ui/collapsibleDockWidgets.py","manuskript/ui/editors/tabSplitter.py","manuskript/importer/mindMapImporter.py","manuskript/ui/highlighters/markdownTokenizer.py","manuskript/ui/tools/frequencyAnalyzer.py","manuskript/converters/abstractConverter.py","manuskript/ui/editors/fullScreenEditor.py","manuskript/ui/editors/themes.py","manuskript/ui/views/webView.py","manuskript/load_save/__init__.py","manuskript/ui/views/corkView.py","manuskript/tests/ui/importers/__init__.py","manuskript/ui/editors/editorWidget_ui.ui","manuskript/ui/highlighters/markdownHighlighter.py","manuskript/version.py","manuskript/importer/folderImporter.py","manuskript/ui/views/sldImportance_ui.ui","manuskript/models/plotsProxyModel.py","manuskript/ui/views/storylineView.py","manuskript/models/characterModel.py","manuskript/ui/views/metadataView_ui.py","manuskript/ui/cheatSheet.py","manuskript/ui/views/plotDelegate.py","manuskript/exporter/manuskript/plainText.py","manuskript/ui/editors/locker_ui.ui","manuskript/ui/revisions_ui.py","manuskript/exporter/basic.py","manuskript/ui/highlighters/basicHighlighter.py","manuskript/ui/importers/generalSettings.py","manuskript/ui/views/MDEditCompleter.py","manuskript/exporter/pandoc/abstractPlainText.py","manuskript/ui/views/treeDelegates.py","manuskript/ui/views/chkOutlineCompile.py","manuskript/ui/views/basicItemView_ui.py","manuskript/models/worldModel.py","manuskript/models/abstractModel.py","manuskript/exporter/pandoc/plainText.py","manuskript/ui/views/characterTreeView.py","manuskript/tests/models/__init__.py","manuskript/exporter/pandoc/__init__.py","manuskript/ui/importers/importer_ui.ui","manuskript/ui/views/basicItemView.py","bin/manuskript"] + "files": ["manuskript/ui/editors/tabSplitter_ui.py","manuskript/ui/search_ui.py","manuskript/ui/tools/__init__.py","manuskript/converters/markdownConverter.py","manuskript/ui/views/MDEditView.py","manuskript/ui/editors/blockUserData.py","manuskript/ui/views/outlineDelegates.py","manuskript/ui/views/lineEditView.py","manuskript/models/outlineItem.py","manuskript/ui/editors/locker.py","manuskript/ui/style.py","manuskript/ui/revisions.py","manuskript/ui/exporters/exporter_ui.py","manuskript/ui/settings_ui.ui","manuskript/ui/exporters/exportersManager.py","manuskript/functions/spellchecker.py","manuskript/ui/exporters/exportersManager_ui.ui","manuskript/ui/highlighters/MMDHighlighter.py","manuskript/ui/tools/splitDialog.py","manuskript/ui/helpLabel.py","manuskript/models/abstractItem.py","manuskript/tests/models/conftest.py","manuskript/mainWindow.py","manuskript/ui/editors/fullScreenEditor.py","manuskript/ui/editors/mainEditor_ui.ui","manuskript/version.py","manuskript/ui/exporters/__init__.py","manuskript/models/outlineModel.py","manuskript/importer/abstractImporter.py","manuskript/load_save/version_0.py","manuskript/exporter/pandoc/PDF.py","manuskript/ui/views/plotTreeView.py","manuskript/models/references.py","manuskript/ui/views/treeDelegates.py","manuskript/models/persosProxyModel.py","manuskript/exporter/basic.py","manuskript/models/abstractModel.py","manuskript/ui/views/outlineView.py","manuskript/ui/views/MDEditCompleter.py","manuskript/ui/views/cmbOutlineCharacterChoser.py","manuskript/ui/importers/importer.py","manuskript/ui/editors/textFormat.py","manuskript/ui/editors/editorWidget_ui.py","manuskript/ui/views/corkView.py","manuskript/ui/importers/__init__.py","manuskript/ui/collapsibleGroupBox.py","manuskript/main.py","manuskript/ui/views/basicItemView.py","manuskript/models/plotModel.py","manuskript/ui/exporters/manuskript/plainTextSettings.py","manuskript/ui/views/basicItemView_ui.ui","manuskript/ui/views/basicItemView_ui.py","manuskript/__init__.py","manuskript/ui/highlighters/basicHighlighter.py","manuskript/load_save/version_1.py","manuskript/tests/ui/__init__.py","manuskript/importer/opmlImporter.py","manuskript/ui/views/cmbOutlineStatusChoser.py","manuskript/ui/importers/generalSettings_ui.py","manuskript/ui/__init__.py","manuskript/ui/about_ui.ui","manuskript/exporter/pandoc/abstractPlainText.py","manuskript/tests/__init__.py","manuskript/loadSave.py","manuskript/exporter/manuskript/plainText.py","manuskript/ui/cheatSheet_ui.py","manuskript/importer/markdownImporter.py","manuskript/ui/welcome_ui.py","manuskript/ui/views/webView.py","bin/manuskript","manuskript/ui/highlighters/markdownTokenizer.py","manuskript/ui/editors/mainEditor.py","manuskript/ui/welcome.py","manuskript/importer/mindMapImporter.py","manuskript/ui/views/propertiesView_ui.py","manuskript/ui/views/propertiesView_ui.ui","manuskript/functions/__init__.py","manuskript/exporter/pandoc/plainText.py","manuskript/ui/collapsibleDockWidgets.py","manuskript/ui/editors/editorWidget.py","manuskript/ui/revisions_ui.ui","manuskript/exporter/pandoc/__init__.py","manuskript/exporter/manuskript/__init__.py","manuskript/ui/highlighters/markdownHighlighter.py","manuskript/ui/mainWindow.ui","manuskript/ui/views/characterTreeView.py","manuskript/ui/views/cmbOutlineLabelChoser.py","manuskript/ui/editors/locker_ui.ui","manuskript/ui/editors/completer_ui.ui","manuskript/ui/views/metadataView_ui.ui","manuskript/ui/views/metadataView_ui.py","manuskript/ui/views/PDFViewer.py","manuskript/ui/views/textEditView.py","manuskript/ui/views/outlineBasics.py","manuskript/ui/mainWindow.py","manuskript/exporter/pandoc/HTML.py","manuskript/ui/exporters/manuskript/plainTextSettings_ui.ui","manuskript/converters/abstractConverter.py","manuskript/ui/about.py","manuskript/models/plotsProxyModel.py","manuskript/ui/exporters/exporter_ui.ui","manuskript/exporter/pandoc/abstractOutput.py","manuskript/tests/ui/importers/test_importers.py","manuskript/tests/test_settingsWindow.py","manuskript/tests/ui/exporters/__init__.py","manuskript/ui/editors/tabSplitter_ui.ui","manuskript/ui/editors/completer.py","manuskript/ui/views/__init__.py","manuskript/ui/collapsibleGroupBox2.py","manuskript/ui/exporters/exportersManager_ui.py","manuskript/ui/editors/__init__.py","manuskript/ui/tools/frequency_ui.ui","manuskript/tests/ui/test_welcome.py","manuskript/load_save/__init__.py","manuskript/models/worldModel.py","manuskript/tests/models/__init__.py","manuskript/ui/editors/themes.py","manuskript/ui/search.py","manuskript/settings.py","manuskript/importer/folderImporter.py","manuskript/ui/views/sldImportance_ui.ui","manuskript/exporter/manuskript/HTML.py","manuskript/ui/views/storylineView.py","manuskript/ui/highlighters/__init__.py","manuskript/ui/editors/textFormat_ui.py","manuskript/settingsWindow.py","manuskript/ui/views/storylineView_ui.ui","manuskript/ui/views/storylineView_ui.py","manuskript/tests/conftest.py","manuskript/converters/pandocConverter.py","manuskript/importer/__init__.py","manuskript/ui/tools/frequencyAnalyzer.py","manuskript/tests/ui/importers/__init__.py","manuskript/ui/editors/mainEditor_ui.py","manuskript/ui/settings_ui.py","manuskript/ui/exporters/manuskript/__init__.py","manuskript/exporter/pandoc/outputFormats.py","manuskript/ui/editors/editorWidget_ui.ui","manuskript/exporter/manuskript/markdown.py","manuskript/ui/tools/frequency_ui.py","manuskript/ui/exporters/manuskript/plainTextSettings_ui.py","manuskript/ui/importers/generalSettings.py","manuskript/ui/views/metadataView.py","manuskript/ui/search_ui.ui","manuskript/ui/editors/textFormat_ui.ui","manuskript/ui/views/sldImportance_ui.py","manuskript/tests/test_functions.py","manuskript/ui/views/propertiesView.py","manuskript/importer/pandocImporters.py","manuskript/ui/views/sldImportance.py","manuskript/ui/views/treeView.py","manuskript/ui/editors/tabSplitter.py","manuskript/ui/exporters/exporter.py","manuskript/models/__init__.py","manuskript/ui/revisions_ui.py","manuskript/models/characterModel.py","manuskript/tests/models/test_references.py","manuskript/models/characterPOVModel.py","manuskript/ui/views/corkDelegate.py","manuskript/ui/statusLabel.py","manuskript/ui/cheatSheet_ui.ui","manuskript/ui/welcome_ui.ui","manuskript/tests/models/test_outlineItem.py","manuskript/converters/__init__.py","manuskript/ui/views/chkOutlineCompile.py","manuskript/ui/views/plotDelegate.py","manuskript/ui/about_ui.py","manuskript/ui/importers/importer_ui.ui","manuskript/ui/importers/importer_ui.py","manuskript/enums.py","manuskript/ui/highlighters/markdownEnums.py","manuskript/tests/ui/exporters/test_exporters.py","manuskript/ui/cheatSheet.py","manuskript/ui/importers/generalSettings_ui.ui","manuskript/ui/editors/MDFunctions.py","manuskript/ui/editors/completer_ui.py","manuskript/exporter/__init__.py","manuskript/ui/editors/locker_ui.py","manuskript/ui/views/dndView.py","manuskript/ui/bulkInfoManager.py","manuskript/ui/bulkInfoManager.ui"] } diff --git a/manuskript/mainWindow.py b/manuskript/mainWindow.py index 65e2eac..1221691 100644 --- a/manuskript/mainWindow.py +++ b/manuskript/mainWindow.py @@ -185,6 +185,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.tabsData = self.saveCharacterTabs() # Used for restoring tabsData with loadCharacterTabs() methods. self.BulkManageUi = None self.bulkAffectedCharacters = [] + self.isPersoBulkModeEnabled = False def updateDockVisibility(self, restore=False): """ @@ -317,18 +318,15 @@ class MainWindow(QMainWindow, Ui_MainWindow): # Set the column headers model.setColumnCount(2) - model.setHorizontalHeaderLabels(["Name", "Value"]) + model.setHorizontalHeaderLabels([self.tr("Name"), self.tr("Value")]) # Set the width - bulkPersoInfoManagerUi.tableView.horizontalHeader().setStretchLastSection(True) - bulkPersoInfoManagerUi.tableView.horizontalHeader().setMinimumSectionSize(20) - bulkPersoInfoManagerUi.tableView.horizontalHeader().setMaximumSectionSize(500) + self.updatePersoInfoView(bulkPersoInfoManagerUi.tableView) bulkPersoInfoManagerUi.tableView.setModel(model) # Set the model of tableView - self.tabPersos.clear() - self.tabPersos.addTab(bulkPersoInfoManager, "Bulk Info Manager") + self.tabPersos.addTab(bulkPersoInfoManager, self.tr("Bulk Info Manager")) self.isPersoBulkModeEnabled = True self.refreshBulkAffectedCharacters() @@ -373,7 +371,8 @@ class MainWindow(QMainWindow, Ui_MainWindow): # Get the data from the tableview model = bulkUi.tableView.model() if model.rowCount() == 0: - QMessageBox.warning(self, "No Entries!", "Please add entries to apply to the selected characters.") + QMessageBox.warning(self, self.tr("No Entries!"), + self.tr("Please add entries to apply to the selected characters.")) return # Loop through each selected character and add the bulk info to them @@ -383,9 +382,10 @@ class MainWindow(QMainWindow, Ui_MainWindow): value = model.item(row, 1).text() self.lstCharacters._model.addCharacterInfo(ID, description, value) - QMessageBox.information(self, "Bulk Info Applied", "The bulk info has been applied to the selected characters.") + QMessageBox.information(self, self.tr("Bulk Info Applied"), + self.tr("The bulk info has been applied to the selected characters.")) - #Remove all rows from the table + # Remove all rows from the table model.removeRows(0, model.rowCount()) def addBulkInfo(self, bulkUi): # Adds an item to the list @@ -404,6 +404,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): bulkUi.tableView.model().appendRow(row) bulkUi.tableView.update() + def removeBulkInfo(self, bulkUi): # Get the selected rows selection = bulkUi.tableView.selectionModel().selectedRows() @@ -412,8 +413,6 @@ class MainWindow(QMainWindow, Ui_MainWindow): for index in reversed(selection): bulkUi.tableView.model().removeRow(index.row()) - - def saveCharacterTabs(self): tabsData = [] for i in range(self.tabPersos.count()): @@ -465,9 +464,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): for character in self.lstCharacters.currentCharacters(): self.bulkAffectedCharacters.append(character.name()) - def changeCurrentCharacter(self, character, trash=None): - if character is None: return @@ -500,13 +497,13 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.tblPersoInfos.setRootIndex(index) if self.mdlCharacter.rowCount(index): - self.updatePersoInfoView() + self.updatePersoInfoView(self.tblPersoInfos) - - def updatePersoInfoView(self): - self.tblPersoInfos.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeToContents) - self.tblPersoInfos.horizontalHeader().setSectionResizeMode(1, QHeaderView.Stretch) - self.tblPersoInfos.verticalHeader().hide() + def updatePersoInfoView(self, infoView): + infoView.horizontalHeader().setStretchLastSection(True) + infoView.horizontalHeader().setMinimumSectionSize(20) + infoView.horizontalHeader().setMaximumSectionSize(500) + infoView.verticalHeader().hide() def updateCharacterColor(self, ID): c = self.mdlCharacter.getCharacterByID(ID) @@ -1120,6 +1117,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): widget.setCurrentModelIndex(self.mdlFlatData.index(0, col)) # Characters + self.updatePersoInfoView(self.tblPersoInfos) self.lstCharacters.setCharactersModel(self.mdlCharacter) self.tblPersoInfos.setModel(self.mdlCharacter) try: diff --git a/manuskript/ui/mainWindow.py b/manuskript/ui/mainWindow.py index 661fa58..27161d1 100644 --- a/manuskript/ui/mainWindow.py +++ b/manuskript/ui/mainWindow.py @@ -313,9 +313,9 @@ class Ui_MainWindow(object): self.verticalLayout_8 = QtWidgets.QVBoxLayout(self.groupBox) self.verticalLayout_8.setObjectName("verticalLayout_8") self.lstCharacters = characterTreeView(self.groupBox) - self.lstCharacters.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) self.lstCharacters.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) self.lstCharacters.setDragEnabled(True) + self.lstCharacters.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) self.lstCharacters.setObjectName("lstCharacters") self.lstCharacters.headerItem().setText(0, "1") self.verticalLayout_8.addWidget(self.lstCharacters) diff --git a/manuskript/ui/mainWindow.ui b/manuskript/ui/mainWindow.ui index 54176f6..034bc79 100644 --- a/manuskript/ui/mainWindow.ui +++ b/manuskript/ui/mainWindow.ui @@ -670,6 +670,9 @@ true + + QAbstractItemView::ExtendedSelection + 1