# SVN changeset patch # User ralonso # Date 2010-05-18 17:31:20.764574 # Revision 56 start y stop funcionamiento ok Index: bk_manager/trunk/ui/MainWindow.py =================================================================== diff --git a/bk_manager/trunk/ui/MainWindow.py b/bk_manager/trunk/ui/MainWindow.py --- a/bk_manager/trunk/ui/MainWindow.py (revision 55) +++ b/bk_manager/trunk/ui/MainWindow.py (revision 56) @@ -321,6 +321,7 @@ """ Slot documentation goes here. """ + self.var_process.terminate() self.btnRestart.setEnabled(True) self.btnStartburn.setEnabled(True) self.btnStopburn.setEnabled(False) Index: bk_manager/trunk/ui/MainWindow.ui =================================================================== diff --git a/bk_manager/trunk/ui/MainWindow.ui b/bk_manager/trunk/ui/MainWindow.ui --- a/bk_manager/trunk/ui/MainWindow.ui (revision 55) +++ b/bk_manager/trunk/ui/MainWindow.ui (revision 56) @@ -613,37 +613,81 @@ - + + + true + + - + + + true + + - + + + true + + - + + + true + + - + + + true + + - + + + true + + - + + + true + + - + + + true + + - + + + true + + - + + + true + + - + + + true + + @@ -707,13 +751,21 @@ - + + + true + + - + + + true + + @@ -781,7 +833,7 @@ 0 0 806 - 21 + 25 Index: bk_manager/trunk/ui/Ui_MainWindow.py =================================================================== diff --git a/bk_manager/trunk/ui/Ui_MainWindow.py b/bk_manager/trunk/ui/Ui_MainWindow.py --- a/bk_manager/trunk/ui/Ui_MainWindow.py (revision 55) +++ b/bk_manager/trunk/ui/Ui_MainWindow.py (revision 56) @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/ricardoar/JRO_SVN/eric4/jro_backup_manager/ui/MainWindow.ui' # -# Created: Mon May 17 23:54:24 2010 -# by: PyQt4 UI code generator 4.7.2 +# Created: Tue May 18 12:13:57 2010 +# by: PyQt4 UI code generator 4.6 # # WARNING! All changes made in this file will be lost! @@ -233,7 +233,6 @@ self.verticalLayout_19 = QtGui.QVBoxLayout() self.verticalLayout_19.setObjectName("verticalLayout_19") self.label_2 = QtGui.QLabel(self.tabDconfig) - self.label_2.setText("") self.label_2.setObjectName("label_2") self.verticalLayout_19.addWidget(self.label_2) self.lblDevice = QtGui.QLabel(self.tabDconfig) @@ -246,7 +245,6 @@ self.lblBmode.setObjectName("lblBmode") self.verticalLayout_19.addWidget(self.lblBmode) self.label = QtGui.QLabel(self.tabDconfig) - self.label.setText("") self.label.setObjectName("label") self.verticalLayout_19.addWidget(self.label) self.gridLayout.addLayout(self.verticalLayout_19, 0, 4, 1, 1) @@ -347,36 +345,47 @@ self.gridLayout_2 = QtGui.QGridLayout(self.widget_2) self.gridLayout_2.setObjectName("gridLayout_2") self.txtSTATUSb = QtGui.QLineEdit(self.widget_2) + self.txtSTATUSb.setReadOnly(True) self.txtSTATUSb.setObjectName("txtSTATUSb") self.gridLayout_2.addWidget(self.txtSTATUSb, 3, 2, 1, 1) self.txtINFOa = QtGui.QLineEdit(self.widget_2) + self.txtINFOa.setReadOnly(True) self.txtINFOa.setObjectName("txtINFOa") self.gridLayout_2.addWidget(self.txtINFOa, 5, 1, 1, 1) self.txtSTATUSa = QtGui.QLineEdit(self.widget_2) + self.txtSTATUSa.setReadOnly(True) self.txtSTATUSa.setObjectName("txtSTATUSa") self.gridLayout_2.addWidget(self.txtSTATUSa, 3, 1, 1, 1) self.txtINFOb = QtGui.QLineEdit(self.widget_2) + self.txtINFOb.setReadOnly(True) self.txtINFOb.setObjectName("txtINFOb") self.gridLayout_2.addWidget(self.txtINFOb, 5, 2, 1, 1) self.txtSTATUSc = QtGui.QLineEdit(self.widget_2) + self.txtSTATUSc.setReadOnly(True) self.txtSTATUSc.setObjectName("txtSTATUSc") self.gridLayout_2.addWidget(self.txtSTATUSc, 3, 3, 1, 1) self.txtSTATUSd = QtGui.QLineEdit(self.widget_2) + self.txtSTATUSd.setReadOnly(True) self.txtSTATUSd.setObjectName("txtSTATUSd") self.gridLayout_2.addWidget(self.txtSTATUSd, 3, 4, 1, 1) self.txtINFOd = QtGui.QLineEdit(self.widget_2) + self.txtINFOd.setReadOnly(True) self.txtINFOd.setObjectName("txtINFOd") self.gridLayout_2.addWidget(self.txtINFOd, 5, 4, 1, 1) self.txtSETa = QtGui.QLineEdit(self.widget_2) + self.txtSETa.setReadOnly(True) self.txtSETa.setObjectName("txtSETa") self.gridLayout_2.addWidget(self.txtSETa, 6, 1, 1, 1) self.txtSETb = QtGui.QLineEdit(self.widget_2) + self.txtSETb.setReadOnly(True) self.txtSETb.setObjectName("txtSETb") self.gridLayout_2.addWidget(self.txtSETb, 6, 2, 1, 1) self.txtSETc = QtGui.QLineEdit(self.widget_2) + self.txtSETc.setReadOnly(True) self.txtSETc.setObjectName("txtSETc") self.gridLayout_2.addWidget(self.txtSETc, 6, 3, 1, 1) self.txtSETd = QtGui.QLineEdit(self.widget_2) + self.txtSETd.setReadOnly(True) self.txtSETd.setObjectName("txtSETd") self.gridLayout_2.addWidget(self.txtSETd, 6, 4, 1, 1) self.lblSTATUS = QtGui.QLabel(self.widget_2) @@ -405,10 +414,12 @@ self.lblDevD.setObjectName("lblDevD") self.gridLayout_2.addWidget(self.lblDevD, 0, 4, 1, 1) self.txtINFOc = QtGui.QLineEdit(self.widget_2) + self.txtINFOc.setReadOnly(True) self.txtINFOc.setObjectName("txtINFOc") self.gridLayout_2.addWidget(self.txtINFOc, 5, 3, 1, 1) self.verticalLayout_4.addWidget(self.widget_2) self.txtSburn = QtGui.QTextEdit(self.tabSburn) + self.txtSburn.setReadOnly(True) self.txtSburn.setObjectName("txtSburn") self.verticalLayout_4.addWidget(self.txtSburn) self.tabWidget.addTab(self.tabSburn, "") @@ -439,7 +450,7 @@ self.verticalLayout.addLayout(self.horizontalLayout_2) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 806, 21)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 806, 25)) self.menubar.setObjectName("menubar") self.menuFile = QtGui.QMenu(self.menubar) self.menuFile.setObjectName("menuFile")