From fce701501fd20fb81c3a60e2278a8c44c34ce8be Mon Sep 17 00:00:00 2001 From: Olivier Keshavjee Date: Sun, 31 May 2015 22:41:32 +0200 Subject: [PATCH] Adds userID and other stuff --- README.md | 6 + TODO.t2t | 9 + src/mainWindow.py | 119 +++++++++----- src/ui/collapsibleGroupBox.py | 36 ++++ src/ui/mainWindow.py | 92 ++++++++++- src/ui/mainWindow.ui | 301 +++++++++++++++++++++++----------- src/ui/sldImportance.py | 4 +- test_project/perso.xml | 14 +- test_project/persoInfos.xml | 16 +- 9 files changed, 441 insertions(+), 156 deletions(-) create mode 100644 README.md create mode 100644 TODO.t2t create mode 100644 src/ui/collapsibleGroupBox.py diff --git a/README.md b/README.md new file mode 100644 index 00000000..e8fbaebc --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ + + +Dépendances: +- Python 2 +- PyQt +- lxml \ No newline at end of file diff --git a/TODO.t2t b/TODO.t2t new file mode 100644 index 00000000..23eed498 --- /dev/null +++ b/TODO.t2t @@ -0,0 +1,9 @@ + + + + + +Features +- Coach (entrer le nombre de mot viser, se fixer des objectifs quotidiens / hebdomadaires (en temps, ou en mots, min ou max), faire des statistiques) +- DiffĂ©rents modes: simple (que le outliner / rĂ©dacteur), snowflake strict (cache les Ă©lĂ©ments tant que le prĂ©cĂ©dent n'a pas Ă©tĂ© accompli), snowflake souple (tout est affichĂ© mais permet de naviger, avec conseils) +- BoĂ®te Ă  sable: endroit pour expĂ©rimenter, des scenes particulières ou des perso en situations spĂ©ciales. Avec suggestions de thèmes / lieux / ... \ No newline at end of file diff --git a/src/mainWindow.py b/src/mainWindow.py index 6d8fa1cd..467e10e1 100644 --- a/src/mainWindow.py +++ b/src/mainWindow.py @@ -34,10 +34,6 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.splitterRedac.setStretchFactor(1, 60) self.splitterRedac.setStretchFactor(2, 20) - - # Signals - self.tabMain.currentChanged.connect(self.updateTabMain) - # Word count self.mprWordCount = QSignalMapper(self) for t, i in [ @@ -99,14 +95,13 @@ class MainWindow(QMainWindow, Ui_MainWindow): # Persos self.mdlPersos = QStandardItemModel(0, 10) - self.mdlPersosInfos = QStandardItemModel(3, 0) - self.mdlPersosInfos.insertColumn(0, [QStandardItem(i) for i in ["Date de naissance", "Ă€ge", "Animal favori"]]) + self.mdlPersosInfos = QStandardItemModel(1, 0) + self.mdlPersosInfos.insertColumn(0, [QStandardItem(i) for i in ["ID"]]) self.mdlPersosInfos.setHorizontalHeaderLabels(["Description"]) self.lstPersos.setModel(self.mdlPersos) self.tblDebugPersos.setModel(self.mdlPersos) self.tblPersoInfos.setModel(self.mdlPersosInfos) - #self.tblPersoInfos.horizontalHeader().setStretchLastSection(True) - #self.tblPersoInfos.horizontalHeader().hide() + self.tblPersoInfos.setRowHidden(0, True) self.tblDebugPersosInfos.setModel(self.mdlPersosInfos) self.btnAddPerso.clicked.connect(self.createPerso) @@ -116,23 +111,24 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.mprPersos.setModel(self.mdlPersos) mapping = [ - self.txtPersoName, - self.txtPersoMotivation, - self.txtPersoGoal, - self.txtPersoConflict, - self.txtPersoEpiphany, - self.txtPersoSummarySentance, - self.txtPersoSummaryPara, - self.txtPersoSummaryFull, + (self.txtPersoName, 0), + (self.txtPersoMotivation, 2), + (self.txtPersoGoal, 3), + (self.txtPersoConflict, 4), + (self.txtPersoEpiphany, 5), + (self.txtPersoSummarySentance, 6), + (self.txtPersoSummaryPara, 7), + (self.txtPersoSummaryFull, 8) ] - for w in mapping: - self.mprPersos.addMapping(w, mapping.index(w)) + for w, i in mapping: + self.mprPersos.addMapping(w, i) self.mprPersos.addMapping(self.sldPersoImportance, 8, "importance") self.sldPersoImportance.importanceChanged.connect(self.mprPersos.submit) self.mprPersos.setCurrentIndex(0) self.lstPersos.selectionModel().currentChanged.connect(self.mprPersos.setCurrentModelIndex) self.lstPersos.selectionModel().currentChanged.connect(self.changeCurrentPerso) + self.tabPersos.currentChanged.connect(self.resizePersosInfos) #Debug self.mdlFlatData.setVerticalHeaderLabels(["Infos gĂ©nĂ©rales", "Summary"]) @@ -141,6 +137,66 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.loadProject("test_project") +#################################################################################################### +# PERSOS # +#################################################################################################### + + def createPerso(self): + "Creates a perso by adding a row in mdlPersos and a column in mdlPersosInfos with same ID" + p = QStandardItem("Nouveau perso") + self.mdlPersos.appendRow(p) + pid = self.getPersosID() + self.checkPersosID() # Attributes a persoID (which is logically pid) + + # Add column in persos infos + self.mdlPersosInfos.insertColumn(self.mdlPersosInfos.columnCount(), [QStandardItem(pid)]) + self.mdlPersosInfos.setHorizontalHeaderItem(self.mdlPersosInfos.columnCount()-1, QStandardItem("Valeur")) + + def getPersosID(self): + "Returns an unused perso ID (row 1)" + vals = [] + for i in range(self.mdlPersos.rowCount()): + item = self.mdlPersos.item(i, 1) + if item and item.text(): + vals.append(int(item.text())) + + k = 0 + while k in vals: k += 1 + return str(k) + + def checkPersosID(self): + "Checks whether some persos ID (row 1) are empty, if so, assign an ID" + empty = [] + for i in range(self.mdlPersos.rowCount()): + item = self.mdlPersos.item(i, 1) + if not item: + item = QStandardItem() + item.setText(self.getPersosID()) + self.mdlPersos.setItem(i, 1, item) + + def removePerso(self): + i = self.lstPersos.currentIndex() + self.mdlPersos.takeRow(i.row()) + self.mdlPersosInfos.takeColumn(i.row()+1) + + def changeCurrentPerso(self, trash=None): + for i in range(self.mdlPersosInfos.columnCount()): + self.tblPersoInfos.setColumnHidden(i, i<>0 and i<>self.lstPersos.currentIndex().row()+1) + #self.tblPersoInfos.horizontalHeader().resizeSections(QHeaderView.Stretch) + + self.resizePersosInfos() + + def resizePersosInfos(self): + self.tblPersoInfos.resizeColumnToContents(0) + w = self.tblPersoInfos.viewport().width() + w2 = self.tblPersoInfos.columnWidth(0) + current = self.lstPersos.currentIndex().row() + 1 + self.tblPersoInfos.setColumnWidth(current, w - w2) + + +#################################################################################################### +# GENERAL # +#################################################################################################### def loadProject(self, project): self.currentProject = project @@ -148,24 +204,9 @@ class MainWindow(QMainWindow, Ui_MainWindow): loadStandardItemModelXML(self.mdlPersos, "{}/perso.xml".format(project)) loadStandardItemModelXML(self.mdlPersosInfos, "{}/persoInfos.xml".format(project)) - - def createPerso(self): - p = QStandardItem("Nouveau perso") - self.mdlPersos.appendRow(p) - #self.mdlPersosInfos.appendColumn([QStandardItem()]*self.mdlPersosInfos.columnCount()) - self.mdlPersosInfos.insertColumn(self.mdlPersosInfos.columnCount()) - self.mdlPersosInfos.setHorizontalHeaderItem(self.mdlPersosInfos.columnCount()-1, QStandardItem("Valeur")) - - def removePerso(self): - i = self.lstPersos.currentIndex() - self.mdlPersos.takeRow(i.row()) - self.mdlPersosInfos.takeColumn(i.row()+1) - - def changeCurrentPerso(self): - for i in range(self.mdlPersosInfos.columnCount()): - self.tblPersoInfos.setColumnHidden(i, i<>0 and i<>self.lstPersos.currentIndex().row()+1) - #self.tblPersoInfos.horizontalHeader().resizeSections(QHeaderView.Stretch) - + # Stuff + self.checkPersosID() + def readSettings(self): # Load State and geometry settings = QSettings(qApp.organizationName(), qApp.applicationName()) @@ -187,12 +228,6 @@ class MainWindow(QMainWindow, Ui_MainWindow): # closeEvent QMainWindow.closeEvent(self, event) - def updateTabMain(self, tab): - if tab == 3: # Plot - self.txtPlotSummaryPara.setPlainText(self.txtSummaryPara.toPlainText()) - self.txtPlotSummaryPage.setPlainText(self.txtSummaryPage.toPlainText()) - self.txtPlotSummaryFull.setPlainText(self.txtSummaryFull.toPlainText()) - def clickCycle(self, i): if i == 0: # step 2 - paragraph summary self.tabMain.setCurrentIndex(1) diff --git a/src/ui/collapsibleGroupBox.py b/src/ui/collapsibleGroupBox.py new file mode 100644 index 00000000..d8ef199e --- /dev/null +++ b/src/ui/collapsibleGroupBox.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +#--!-- coding: utf8 --!-- + +from __future__ import print_function +from __future__ import unicode_literals + +from PyQt4.QtCore import * +from PyQt4.QtGui import * + +class collapsibleGroupBox(QGroupBox): + + def __init__(self, parent=None): + QGroupBox.__init__(self) + + self.toggled.connect(self.setExpanded) + self.tempWidget = QWidget() + + def setExpanded(self, val): + self.setCollapsed(not val) + + def setCollapsed(self, val): + if val: + # Save layout + self.tempWidget.setLayout(self.layout()) + # Set empty layout + l = QVBoxLayout() + #print(l.contentsMargins().left(), l.contentsMargins().bottom(), l.contentsMargins().top(), ) + l.setContentsMargins(0, 0, 0, 0) + self.setLayout(l) + self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed) + else: + # Delete layout + QWidget().setLayout(self.layout()) + # Set saved layout + self.setLayout(self.tempWidget.layout()) + self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) \ No newline at end of file diff --git a/src/ui/mainWindow.py b/src/ui/mainWindow.py index 364432f5..a3356eb8 100644 --- a/src/ui/mainWindow.py +++ b/src/ui/mainWindow.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'src/ui/mainWindow.ui' # -# Created: Sun May 31 05:33:43 2015 +# Created: Sun May 31 22:39:01 2015 # by: PyQt4 UI code generator 4.11.3 # # WARNING! All changes made in this file will be lost! @@ -762,9 +762,13 @@ class Ui_MainWindow(object): self.horizontalLayout_20.setObjectName(_fromUtf8("horizontalLayout_20")) self.splitterRedac = QtGui.QSplitter(self.tab_7) self.splitterRedac.setOrientation(QtCore.Qt.Horizontal) - self.splitterRedac.setChildrenCollapsible(False) self.splitterRedac.setObjectName(_fromUtf8("splitterRedac")) - self.treeWidget_4 = QtGui.QTreeWidget(self.splitterRedac) + self.widget = QtGui.QWidget(self.splitterRedac) + self.widget.setObjectName(_fromUtf8("widget")) + self.verticalLayout_19 = QtGui.QVBoxLayout(self.widget) + self.verticalLayout_19.setMargin(0) + self.verticalLayout_19.setObjectName(_fromUtf8("verticalLayout_19")) + self.treeWidget_4 = QtGui.QTreeWidget(self.widget) self.treeWidget_4.setObjectName(_fromUtf8("treeWidget_4")) item_0 = QtGui.QTreeWidgetItem(self.treeWidget_4) item_1 = QtGui.QTreeWidgetItem(item_0) @@ -773,6 +777,7 @@ class Ui_MainWindow(object): item_0 = QtGui.QTreeWidgetItem(self.treeWidget_4) item_1 = QtGui.QTreeWidgetItem(item_0) item_1 = QtGui.QTreeWidgetItem(item_0) + self.verticalLayout_19.addWidget(self.treeWidget_4) self.layoutWidget1 = QtGui.QWidget(self.splitterRedac) self.layoutWidget1.setObjectName(_fromUtf8("layoutWidget1")) self.verticalLayout_16 = QtGui.QVBoxLayout(self.layoutWidget1) @@ -802,7 +807,71 @@ class Ui_MainWindow(object): self.pushButton_19.setObjectName(_fromUtf8("pushButton_19")) self.horizontalLayout_19.addWidget(self.pushButton_19) self.verticalLayout_16.addLayout(self.horizontalLayout_19) - self.groupBox_3 = QtGui.QGroupBox(self.splitterRedac) + self.tabWidget_2 = QtGui.QTabWidget(self.splitterRedac) + self.tabWidget_2.setTabPosition(QtGui.QTabWidget.South) + self.tabWidget_2.setDocumentMode(True) + self.tabWidget_2.setObjectName(_fromUtf8("tabWidget_2")) + self.tab_17 = QtGui.QWidget() + self.tab_17.setObjectName(_fromUtf8("tab_17")) + self.verticalLayout_20 = QtGui.QVBoxLayout(self.tab_17) + self.verticalLayout_20.setSizeConstraint(QtGui.QLayout.SetMaximumSize) + self.verticalLayout_20.setObjectName(_fromUtf8("verticalLayout_20")) + self.groupBox_4 = collapsibleGroupBox(self.tab_17) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.groupBox_4.sizePolicy().hasHeightForWidth()) + self.groupBox_4.setSizePolicy(sizePolicy) + self.groupBox_4.setCheckable(True) + self.groupBox_4.setObjectName(_fromUtf8("groupBox_4")) + self.formLayout_5 = QtGui.QFormLayout(self.groupBox_4) + self.formLayout_5.setObjectName(_fromUtf8("formLayout_5")) + self.label_29 = QtGui.QLabel(self.groupBox_4) + self.label_29.setObjectName(_fromUtf8("label_29")) + self.formLayout_5.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_29) + self.comboBox_3 = QtGui.QComboBox(self.groupBox_4) + self.comboBox_3.setFrame(False) + self.comboBox_3.setObjectName(_fromUtf8("comboBox_3")) + self.formLayout_5.setWidget(0, QtGui.QFormLayout.FieldRole, self.comboBox_3) + self.label_30 = QtGui.QLabel(self.groupBox_4) + self.label_30.setObjectName(_fromUtf8("label_30")) + self.formLayout_5.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_30) + self.comboBox_4 = QtGui.QComboBox(self.groupBox_4) + self.comboBox_4.setFrame(False) + self.comboBox_4.setObjectName(_fromUtf8("comboBox_4")) + self.formLayout_5.setWidget(1, QtGui.QFormLayout.FieldRole, self.comboBox_4) + self.label_32 = QtGui.QLabel(self.groupBox_4) + self.label_32.setObjectName(_fromUtf8("label_32")) + self.formLayout_5.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_32) + self.checkBox = QtGui.QCheckBox(self.groupBox_4) + self.checkBox.setText(_fromUtf8("")) + self.checkBox.setObjectName(_fromUtf8("checkBox")) + self.formLayout_5.setWidget(2, QtGui.QFormLayout.FieldRole, self.checkBox) + self.verticalLayout_20.addWidget(self.groupBox_4) + self.groupBox_5 = collapsibleGroupBox(self.tab_17) + self.groupBox_5.setCheckable(True) + self.groupBox_5.setObjectName(_fromUtf8("groupBox_5")) + self.verticalLayout_22 = QtGui.QVBoxLayout(self.groupBox_5) + self.verticalLayout_22.setObjectName(_fromUtf8("verticalLayout_22")) + self.plainTextEdit_3 = QtGui.QPlainTextEdit(self.groupBox_5) + self.plainTextEdit_3.setObjectName(_fromUtf8("plainTextEdit_3")) + self.verticalLayout_22.addWidget(self.plainTextEdit_3) + self.verticalLayout_20.addWidget(self.groupBox_5) + self.groupBox_6 = collapsibleGroupBox(self.tab_17) + self.groupBox_6.setCheckable(True) + self.groupBox_6.setObjectName(_fromUtf8("groupBox_6")) + self.horizontalLayout_29 = QtGui.QHBoxLayout(self.groupBox_6) + self.horizontalLayout_29.setObjectName(_fromUtf8("horizontalLayout_29")) + self.plainTextEdit_2 = QtGui.QPlainTextEdit(self.groupBox_6) + self.plainTextEdit_2.setObjectName(_fromUtf8("plainTextEdit_2")) + self.horizontalLayout_29.addWidget(self.plainTextEdit_2) + self.verticalLayout_20.addWidget(self.groupBox_6) + self.tabWidget_2.addTab(self.tab_17, _fromUtf8("")) + self.tab_18 = QtGui.QWidget() + self.tab_18.setObjectName(_fromUtf8("tab_18")) + self.verticalLayout_21 = QtGui.QVBoxLayout(self.tab_18) + self.verticalLayout_21.setObjectName(_fromUtf8("verticalLayout_21")) + self.groupBox_3 = QtGui.QGroupBox(self.tab_18) self.groupBox_3.setObjectName(_fromUtf8("groupBox_3")) self.verticalLayout_15 = QtGui.QVBoxLayout(self.groupBox_3) self.verticalLayout_15.setObjectName(_fromUtf8("verticalLayout_15")) @@ -823,6 +892,8 @@ class Ui_MainWindow(object): self.textEdit = QtGui.QTextEdit(self.groupBox_3) self.textEdit.setObjectName(_fromUtf8("textEdit")) self.verticalLayout_15.addWidget(self.textEdit) + self.verticalLayout_21.addWidget(self.groupBox_3) + self.tabWidget_2.addTab(self.tab_18, _fromUtf8("")) self.horizontalLayout_20.addWidget(self.splitterRedac) self.tabMain.addTab(self.tab_7, _fromUtf8("")) self.tab_8 = QtGui.QWidget() @@ -912,16 +983,16 @@ class Ui_MainWindow(object): self.menubar.addAction(self.menuMode.menuAction()) self.retranslateUi(MainWindow) - self.tabMain.setCurrentIndex(2) + self.tabMain.setCurrentIndex(6) self.tabSummary.setCurrentIndex(0) self.tabPersos.setCurrentIndex(0) self.tabPlot.setCurrentIndex(0) self.comboBox_2.setCurrentIndex(1) self.stkPlotSummary.setCurrentIndex(1) + self.tabWidget_2.setCurrentIndex(0) self.tabWidget.setCurrentIndex(2) QtCore.QObject.connect(self.pushButton_16, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.plainTextEdit_7.setShown) QtCore.QObject.connect(self.pushButton_23, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupbox.setShown) - QtCore.QObject.connect(self.pushButton_19, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBox_3.setShown) QtCore.QObject.connect(self.pushButton_20, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.treeWidget_4.setShown) QtCore.QObject.connect(self.btnPlotShowSummary, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.grpPlotSummary.setShown) QtCore.QObject.connect(self.comboBox_2, QtCore.SIGNAL(_fromUtf8("currentIndexChanged(int)")), self.stkPlotSummary.setCurrentIndex) @@ -1051,6 +1122,13 @@ class Ui_MainWindow(object): self.treeWidget_4.topLevelItem(1).child(0).setText(0, _translate("MainWindow", "Scène 1", None)) self.treeWidget_4.topLevelItem(1).child(1).setText(0, _translate("MainWindow", "Scène 2", None)) self.treeWidget_4.setSortingEnabled(__sortingEnabled) + self.groupBox_4.setTitle(_translate("MainWindow", "PropriĂ©tĂ©s de la scène", None)) + self.label_29.setText(_translate("MainWindow", "Personnage", None)) + self.label_30.setText(_translate("MainWindow", "Status", None)) + self.label_32.setText(_translate("MainWindow", "Compile", None)) + self.groupBox_5.setTitle(_translate("MainWindow", "RĂ©sumĂ© de la scène", None)) + self.groupBox_6.setTitle(_translate("MainWindow", "Notes pour la scène", None)) + self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_17), _translate("MainWindow", "Scène", None)) self.groupBox_3.setTitle(_translate("MainWindow", "Aide mĂ©moire", None)) self.lineEdit_3.setPlaceholderText(_translate("MainWindow", "Filter", None)) __sortingEnabled = self.listWidget_5.isSortingEnabled() @@ -1064,6 +1142,7 @@ class Ui_MainWindow(object): item = self.listWidget_5.item(3) item.setText(_translate("MainWindow", "La revenche du capitaine - intrigue", None)) self.listWidget_5.setSortingEnabled(__sortingEnabled) + self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_18), _translate("MainWindow", "Tools", None)) self.tabMain.setTabText(self.tabMain.indexOf(self.tab_7), _translate("MainWindow", "RĂ©daction", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_9), _translate("MainWindow", "FlatData", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_10), _translate("MainWindow", "Persos", None)) @@ -1086,3 +1165,4 @@ class Ui_MainWindow(object): self.actionNouveau.setShortcut(_translate("MainWindow", "Ctrl+N", None)) from ui.sldImportance import sldImportance +from ui.collapsibleGroupBox import collapsibleGroupBox diff --git a/src/ui/mainWindow.ui b/src/ui/mainWindow.ui index 391b82fd..8ea15b07 100644 --- a/src/ui/mainWindow.ui +++ b/src/ui/mainWindow.ui @@ -18,7 +18,7 @@ - 2 + 6 true @@ -1468,50 +1468,53 @@ Qt::Horizontal - - false - - - - - Plan dĂ©taillĂ© - - - - - Chapitre 1 - + + - - Scène 1 - + + + + Plan dĂ©taillĂ© + + + + + Chapitre 1 + + + + Scène 1 + + + + + Scène 2 + + + + + Scène 3 + + + + + + Chapitre 2 + + + + Scène 1 + + + + + Scène 2 + + + + - - - Scène 2 - - - - - Scène 3 - - - - - - Chapitre 2 - - - - Scène 1 - - - - - Scène 2 - - - + @@ -1573,46 +1576,166 @@ - - - Aide mĂ©moire + + + QTabWidget::South - - - - - Filter - - - - - - - - Albert - perso + + 0 + + + true + + + + Scène + + + + QLayout::SetMaximumSize + + + + + + 0 + 0 + - - - - Jean - perso + + PropriĂ©tĂ©s de la scène - - - - Crapoquak - animal + + true - - - - La revenche du capitaine - intrigue + + + + + Personnage + + + + + + + false + + + + + + + Status + + + + + + + false + + + + + + + Compile + + + + + + + + + + + + + + + + + RĂ©sumĂ© de la scène - - - - - - - + + true + + + + + + + + + + + + Notes pour la scène + + + true + + + + + + + + + + + + + Tools + + + + + + Aide mĂ©moire + + + + + + Filter + + + + + + + + Albert - perso + + + + + Jean - perso + + + + + Crapoquak - animal + + + + + La revenche du capitaine - intrigue + + + + + + + + + + + + @@ -1801,6 +1924,12 @@
ui.sldImportance.h
1 + + collapsibleGroupBox + QGroupBox +
ui.collapsibleGroupBox.h
+ 1 + @@ -1836,22 +1965,6 @@ - - pushButton_19 - toggled(bool) - groupBox_3 - setShown(bool) - - - 714 - 770 - - - 1090 - 585 - - - pushButton_20 toggled(bool) diff --git a/src/ui/sldImportance.py b/src/ui/sldImportance.py index 1c9c9b82..4ae58c94 100644 --- a/src/ui/sldImportance.py +++ b/src/ui/sldImportance.py @@ -37,8 +37,8 @@ class sldImportance(QWidget, Ui_sldImportance): def setValue(self, v): if v <> self.lastValue: - self.sld.setValue(int(v)) - self.changed(int(v)) + self.sld.setValue(int(v) if v else 0) + self.changed(int(v) if v else 0) self.lastValue = v def setProperty(): diff --git a/test_project/perso.xml b/test_project/perso.xml index 24c05110..873cd2d7 100644 --- a/test_project/perso.xml +++ b/test_project/perso.xml @@ -20,20 +20,20 @@ - Ginette - asdasd + Albert + 0 - CCC - BBB - 0 + + + 1 - Albert - asdasdasd + Jean + 1 diff --git a/test_project/persoInfos.xml b/test_project/persoInfos.xml index db505f8a..f99fe61a 100644 --- a/test_project/persoInfos.xml +++ b/test_project/persoInfos.xml @@ -6,6 +6,7 @@