From 8f4ddefb4855a9606ade0fc55051932760531f1d Mon Sep 17 00:00:00 2001 From: Curtis Gedak Date: Fri, 30 Aug 2019 10:46:08 -0600 Subject: [PATCH] Fix tab key order, and default window tab for character pane and plot pane This code change sets: - Character pane default first tab of "Basic info" (was Notes) - Character pane Basic info "Name" as the default first field (was Motivation) - Plots pane default first tab of "Basic info" (was Resolution steps) Steps to edit tab order and default window tab: 1. Start Qt Designer 2. Open .ui file 3. Choose menu **Edit -> Edit Tab Order** 4. Ctrl-click on item just before the first incorrect tab order item 5. Click other items in order until remaining order is correct 6. Ensure that each selected window tab is the one desired as default 7. Save .ui file 8. Exit Qt Designer 9. Generate .py file with: make ui See https://doc.qt.io/qt-5/designer-tab-order.html This code change implements a portion of issue #244 --- manuskript/ui/mainWindow.py | 104 +++++++++++++++++++++++++++++++++-- manuskript/ui/mainWindow.ui | 107 ++++++++++++++++++++++++++++++++++-- 2 files changed, 203 insertions(+), 8 deletions(-) diff --git a/manuskript/ui/mainWindow.py b/manuskript/ui/mainWindow.py index e307d04a..76f08228 100644 --- a/manuskript/ui/mainWindow.py +++ b/manuskript/ui/mainWindow.py @@ -1339,20 +1339,116 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) self.stack.setCurrentIndex(1) - self.tabMain.setCurrentIndex(3) + self.tabMain.setCurrentIndex(0) self.tabSummary.setCurrentIndex(0) - self.tabPersos.setCurrentIndex(2) - self.tabPlot.setCurrentIndex(1) + self.tabPersos.setCurrentIndex(0) + self.tabPlot.setCurrentIndex(0) self.comboBox_2.setCurrentIndex(0) self.stkPlotSummary.setCurrentIndex(0) self.tabWorld.setCurrentIndex(0) - self.tabWidget.setCurrentIndex(2) + self.tabWidget.setCurrentIndex(0) self.comboBox_2.currentIndexChanged['int'].connect(self.stkPlotSummary.setCurrentIndex) self.btnPlanShowDetails.toggled['bool'].connect(self.frame.setVisible) self.cmbSummary.currentIndexChanged['int'].connect(self.tabSummary.setCurrentIndex) self.tabSummary.currentChanged['int'].connect(self.cmbSummary.setCurrentIndex) self.btnShowSubPlotSummary.toggled['bool'].connect(self.grpSubPlotSummary.setVisible) QtCore.QMetaObject.connectSlotsByName(MainWindow) + MainWindow.setTabOrder(self.tabMain, self.txtGeneralTitle) + MainWindow.setTabOrder(self.txtGeneralTitle, self.txtGeneralSubtitle) + MainWindow.setTabOrder(self.txtGeneralSubtitle, self.txtGeneralSerie) + MainWindow.setTabOrder(self.txtGeneralSerie, self.txtGeneralVolume) + MainWindow.setTabOrder(self.txtGeneralVolume, self.txtGeneralGenre) + MainWindow.setTabOrder(self.txtGeneralGenre, self.txtGeneralLicense) + MainWindow.setTabOrder(self.txtGeneralLicense, self.txtGeneralAuthor) + MainWindow.setTabOrder(self.txtGeneralAuthor, self.txtGeneralEmail) + MainWindow.setTabOrder(self.txtGeneralEmail, self.cmbSummary) + MainWindow.setTabOrder(self.cmbSummary, self.txtSummarySentence) + MainWindow.setTabOrder(self.txtSummarySentence, self.txtSummarySentence_2) + MainWindow.setTabOrder(self.txtSummarySentence_2, self.txtSummaryPara) + MainWindow.setTabOrder(self.txtSummaryPara, self.txtSummaryPara_2) + MainWindow.setTabOrder(self.txtSummaryPara_2, self.txtSummaryPage) + MainWindow.setTabOrder(self.txtSummaryPage, self.txtSummaryPage_2) + MainWindow.setTabOrder(self.txtSummaryPage_2, self.txtSummaryFull) + MainWindow.setTabOrder(self.txtSummaryFull, self.btnStepThree) + MainWindow.setTabOrder(self.btnStepThree, self.btnStepTwo) + MainWindow.setTabOrder(self.btnStepTwo, self.btnStepFive) + MainWindow.setTabOrder(self.btnStepFive, self.btnStepSeven) + MainWindow.setTabOrder(self.btnStepSeven, self.txtSummarySituation) + MainWindow.setTabOrder(self.txtSummarySituation, self.lstCharacters) + MainWindow.setTabOrder(self.lstCharacters, self.btnAddPerso) + MainWindow.setTabOrder(self.btnAddPerso, self.btnRmPerso) + MainWindow.setTabOrder(self.btnRmPerso, self.txtPersosFilter) + MainWindow.setTabOrder(self.txtPersosFilter, self.tabPersos) + MainWindow.setTabOrder(self.tabPersos, self.scrollAreaPersoInfos) + MainWindow.setTabOrder(self.scrollAreaPersoInfos, self.txtPersoName) + MainWindow.setTabOrder(self.txtPersoName, self.btnPersoColor) + MainWindow.setTabOrder(self.btnPersoColor, self.txtPersoMotivation) + MainWindow.setTabOrder(self.txtPersoMotivation, self.txtPersoGoal) + MainWindow.setTabOrder(self.txtPersoGoal, self.txtPersoConflict) + MainWindow.setTabOrder(self.txtPersoConflict, self.txtPersoEpiphany) + MainWindow.setTabOrder(self.txtPersoEpiphany, self.txtPersoSummarySentence) + MainWindow.setTabOrder(self.txtPersoSummarySentence, self.txtPersoSummaryPara) + MainWindow.setTabOrder(self.txtPersoSummaryPara, self.btnStepFour) + MainWindow.setTabOrder(self.btnStepFour, self.txtPersoSummaryFull) + MainWindow.setTabOrder(self.txtPersoSummaryFull, self.btnStepSix) + MainWindow.setTabOrder(self.btnStepSix, self.txtPersoNotes) + MainWindow.setTabOrder(self.txtPersoNotes, self.tblPersoInfos) + MainWindow.setTabOrder(self.tblPersoInfos, self.btnPersoAddInfo) + MainWindow.setTabOrder(self.btnPersoAddInfo, self.btnPersoRmInfo) + MainWindow.setTabOrder(self.btnPersoRmInfo, self.lineEdit) + MainWindow.setTabOrder(self.lineEdit, self.btnStepEight) + MainWindow.setTabOrder(self.btnStepEight, self.lstPlots) + MainWindow.setTabOrder(self.lstPlots, self.btnAddPlot) + MainWindow.setTabOrder(self.btnAddPlot, self.btnRmPlot) + MainWindow.setTabOrder(self.btnRmPlot, self.txtPlotFilter) + MainWindow.setTabOrder(self.txtPlotFilter, self.tabPlot) + MainWindow.setTabOrder(self.tabPlot, self.txtPlotName) + MainWindow.setTabOrder(self.txtPlotName, self.lstPlotPerso) + MainWindow.setTabOrder(self.lstPlotPerso, self.btnAddPlotPerso) + MainWindow.setTabOrder(self.btnAddPlotPerso, self.btnRmPlotPerso) + MainWindow.setTabOrder(self.btnRmPlotPerso, self.txtPlotDescription) + MainWindow.setTabOrder(self.txtPlotDescription, self.txtPlotResult) + MainWindow.setTabOrder(self.txtPlotResult, self.lstSubPlots) + MainWindow.setTabOrder(self.lstSubPlots, self.txtSubPlotSummary) + MainWindow.setTabOrder(self.txtSubPlotSummary, self.btnAddSubPlot) + MainWindow.setTabOrder(self.btnAddSubPlot, self.btnRmSubPlot) + MainWindow.setTabOrder(self.btnRmSubPlot, self.btnShowSubPlotSummary) + MainWindow.setTabOrder(self.btnShowSubPlotSummary, self.comboBox_2) + MainWindow.setTabOrder(self.comboBox_2, self.txtPlotSummaryPara) + MainWindow.setTabOrder(self.txtPlotSummaryPara, self.txtPlotSummaryPage) + MainWindow.setTabOrder(self.txtPlotSummaryPage, self.txtPlotSummaryFull) + MainWindow.setTabOrder(self.txtPlotSummaryFull, self.treeWorld) + MainWindow.setTabOrder(self.treeWorld, self.btnAddWorld) + MainWindow.setTabOrder(self.btnAddWorld, self.btnRmWorld) + MainWindow.setTabOrder(self.btnRmWorld, self.txtWorldFilter) + MainWindow.setTabOrder(self.txtWorldFilter, self.btnWorldEmptyData) + MainWindow.setTabOrder(self.btnWorldEmptyData, self.tabWorld) + MainWindow.setTabOrder(self.tabWorld, self.txtWorldName) + MainWindow.setTabOrder(self.txtWorldName, self.txtWorldDescription) + MainWindow.setTabOrder(self.txtWorldDescription, self.txtWorldPassion) + MainWindow.setTabOrder(self.txtWorldPassion, self.txtWorldConflict) + MainWindow.setTabOrder(self.txtWorldConflict, self.lstOutlinePlots) + MainWindow.setTabOrder(self.lstOutlinePlots, self.treeOutlineOutline) + MainWindow.setTabOrder(self.treeOutlineOutline, self.btnOutlineAddFolder) + MainWindow.setTabOrder(self.btnOutlineAddFolder, self.btnOutlineAddText) + MainWindow.setTabOrder(self.btnOutlineAddText, self.btnOutlineRemoveItem) + MainWindow.setTabOrder(self.btnOutlineRemoveItem, self.btnPlanShowDetails) + MainWindow.setTabOrder(self.btnPlanShowDetails, self.treeRedacOutline) + MainWindow.setTabOrder(self.treeRedacOutline, self.btnRedacAddFolder) + MainWindow.setTabOrder(self.btnRedacAddFolder, self.btnRedacAddText) + MainWindow.setTabOrder(self.btnRedacAddText, self.btnRedacRemoveItem) + MainWindow.setTabOrder(self.btnRedacRemoveItem, self.tabWidget) + MainWindow.setTabOrder(self.tabWidget, self.tblDebugFlatData) + MainWindow.setTabOrder(self.tblDebugFlatData, self.tblDebugPersos) + MainWindow.setTabOrder(self.tblDebugPersos, self.tblDebugPersosInfos) + MainWindow.setTabOrder(self.tblDebugPersosInfos, self.tblDebugPlots) + MainWindow.setTabOrder(self.tblDebugPlots, self.tblDebugPlotsPersos) + MainWindow.setTabOrder(self.tblDebugPlotsPersos, self.tblDebugSubPlots) + MainWindow.setTabOrder(self.tblDebugSubPlots, self.treeDebugWorld) + MainWindow.setTabOrder(self.treeDebugWorld, self.treeDebugOutline) + MainWindow.setTabOrder(self.treeDebugOutline, self.lstDebugLabels) + MainWindow.setTabOrder(self.lstDebugLabels, self.lstDebugStatus) + MainWindow.setTabOrder(self.lstDebugStatus, self.lstTabs) def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate diff --git a/manuskript/ui/mainWindow.ui b/manuskript/ui/mainWindow.ui index 7beaa527..3da6713a 100644 --- a/manuskript/ui/mainWindow.ui +++ b/manuskript/ui/mainWindow.ui @@ -124,7 +124,7 @@ QTabWidget::Rounded - 3 + 0 true @@ -774,7 +774,7 @@ - 2 + 0 @@ -1173,7 +1173,7 @@ - 1 + 0 true @@ -1991,7 +1991,7 @@ QTabWidget::West - 2 + 0 @@ -2899,6 +2899,105 @@ 1 + + tabMain + txtGeneralTitle + txtGeneralSubtitle + txtGeneralSerie + txtGeneralVolume + txtGeneralGenre + txtGeneralLicense + txtGeneralAuthor + txtGeneralEmail + cmbSummary + txtSummarySentence + txtSummarySentence_2 + txtSummaryPara + txtSummaryPara_2 + txtSummaryPage + txtSummaryPage_2 + txtSummaryFull + btnStepThree + btnStepTwo + btnStepFive + btnStepSeven + txtSummarySituation + lstCharacters + btnAddPerso + btnRmPerso + txtPersosFilter + tabPersos + scrollAreaPersoInfos + txtPersoName + btnPersoColor + txtPersoMotivation + txtPersoGoal + txtPersoConflict + txtPersoEpiphany + txtPersoSummarySentence + txtPersoSummaryPara + btnStepFour + txtPersoSummaryFull + btnStepSix + txtPersoNotes + tblPersoInfos + btnPersoAddInfo + btnPersoRmInfo + lineEdit + btnStepEight + lstPlots + btnAddPlot + btnRmPlot + txtPlotFilter + tabPlot + txtPlotName + lstPlotPerso + btnAddPlotPerso + btnRmPlotPerso + txtPlotDescription + txtPlotResult + lstSubPlots + txtSubPlotSummary + btnAddSubPlot + btnRmSubPlot + btnShowSubPlotSummary + comboBox_2 + txtPlotSummaryPara + txtPlotSummaryPage + txtPlotSummaryFull + treeWorld + btnAddWorld + btnRmWorld + txtWorldFilter + btnWorldEmptyData + tabWorld + txtWorldName + txtWorldDescription + txtWorldPassion + txtWorldConflict + lstOutlinePlots + treeOutlineOutline + btnOutlineAddFolder + btnOutlineAddText + btnOutlineRemoveItem + btnPlanShowDetails + treeRedacOutline + btnRedacAddFolder + btnRedacAddText + btnRedacRemoveItem + tabWidget + tblDebugFlatData + tblDebugPersos + tblDebugPersosInfos + tblDebugPlots + tblDebugPlotsPersos + tblDebugSubPlots + treeDebugWorld + treeDebugOutline + lstDebugLabels + lstDebugStatus + lstTabs +