# SVN changeset patch # User ralonso # Date 2010-05-04 22:41:37.519678 # Revision 33 *** 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 32) +++ b/bk_manager/trunk/ui/MainWindow.py (revision 33) @@ -38,9 +38,9 @@ self.statusDpath = False self.statusRpath = False - + # #Deteccion de los dispositvos de grabacion - + # #var_cmd="wodim --devices | grep /dev/ | awk -F\' '{print $2}'" #Funciona en consola pero no en python ¿? var_cmd="wodim --devices | grep /dev/ | awk '{print $2}' | awk -F= '{print $2}'" var_output = commands.getstatusoutput(var_cmd) @@ -311,9 +311,8 @@ #Genera la lista de archivos .dat que contienen los archivos a grabar en cada DVD # var_n=0 #Se usa para contar el numero de archivos a grabar en el DVD -# var_n_files=0 - var_tmp=0 # - var_files_list_2=[] + var_tmp=0 #Se usa para acumulanr el tamaño de los archivos de la lista + var_files_list_2=[] #Se usa para almacenar la lista de archivos agrbar en cada DVD for i in var_files_list: #Se asignan en i los archivos de la lista var_size_i=os.path.getsize(i)/1024+1 #tamaño en KB del archivo de la lista, se suma 1 KB para evitar problemas al momento de sumar @@ -330,25 +329,16 @@ var_file.write(line+'\n') var_file.close() -# var_n_files += len(var_files_list_2) var_tmp = var_size_i #Se asigna a la variable el tamaño del archivo actual - var_files_list_2=[] - var_files_list_2.append(i) + var_files_list_2=[] #Se reinicia la lista var_n += 1 - - else: - var_files_list_2.append(i) - - #muestra info - self.txtInfo.append(str(len(var_files_list_2))+" size:"+str(var_tmp)) + var_files_list_2.append(i) var_file = open(var_Rpath_ppath+"/"+self.txtElabel.text()+"_"+str(var_n)+".dat","w") for line in var_files_list_2: var_file.write(line.split(var_Dpath)[1]+'=') var_file.write(line+'\n') var_file.close() - -# var_n_files += len(var_files_list_2) #Se deshabilita el Tab Parameters y el boton btnGbkp self.tabParameters.setEnabled(False) @@ -385,8 +375,7 @@ #os.waitpid(p.pid, 0) ####self.txtInfo.append(str(p.pid)) - #timer.time = 10 - #timer.init() + @pyqtSignature("") def on_btnRestart_clicked(self): 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 32) +++ b/bk_manager/trunk/ui/MainWindow.ui (revision 33) @@ -6,7 +6,7 @@ 0 0 - 745 + 809 766 @@ -233,10 +233,18 @@ - - - - + + + 16 + + + + + + + -sao + + @@ -269,10 +277,18 @@ - - - - + + + 16 + + + + + + + -sao + + @@ -305,10 +321,18 @@ - - - - + + + 16 + + + + + + + -sao + + @@ -341,10 +365,18 @@ - - - - + + + 16 + + + + + + + -sao + + @@ -721,7 +753,7 @@ 0 0 - 745 + 809 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 32) +++ b/bk_manager/trunk/ui/Ui_MainWindow.py (revision 33) @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file '/home/ricardoar/principal/JRO_SVN/eric4/jro_backup_manager/ui/MainWindow.ui' # -# Created: Tue May 4 16:05:06 2010 +# Created: Tue May 4 17:29:42 2010 # by: PyQt4 UI code generator 4.7.3 # # WARNING! All changes made in this file will be lost! @@ -12,7 +12,7 @@ class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(745, 766) + MainWindow.resize(809, 766) self.centralwidget = QtGui.QWidget(MainWindow) self.centralwidget.setObjectName("centralwidget") self.verticalLayout = QtGui.QVBoxLayout(self.centralwidget) @@ -422,7 +422,7 @@ self.verticalLayout.addLayout(self.horizontalLayout_2) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 745, 25)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 809, 25)) self.menubar.setObjectName("menubar") self.menuFile = QtGui.QMenu(self.menubar) self.menuFile.setObjectName("menuFile") @@ -514,12 +514,20 @@ self.lblStopDay.setText(QtGui.QApplication.translate("MainWindow", "Stop Day:", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabParameters), QtGui.QApplication.translate("MainWindow", "Parameters", None, QtGui.QApplication.UnicodeUTF8)) self.chkDevA.setText(QtGui.QApplication.translate("MainWindow", "Dev A", None, QtGui.QApplication.UnicodeUTF8)) + self.txtBspeedA.setText(QtGui.QApplication.translate("MainWindow", "16", None, QtGui.QApplication.UnicodeUTF8)) + self.txtBmodeA.setText(QtGui.QApplication.translate("MainWindow", "-sao", None, QtGui.QApplication.UnicodeUTF8)) self.btnTdevA.setText(QtGui.QApplication.translate("MainWindow", "Test DevA", None, QtGui.QApplication.UnicodeUTF8)) self.chkDevB.setText(QtGui.QApplication.translate("MainWindow", "Dev B", None, QtGui.QApplication.UnicodeUTF8)) + self.txtBspeedB.setText(QtGui.QApplication.translate("MainWindow", "16", None, QtGui.QApplication.UnicodeUTF8)) + self.txtBmodeB.setText(QtGui.QApplication.translate("MainWindow", "-sao", None, QtGui.QApplication.UnicodeUTF8)) self.btnTdevB.setText(QtGui.QApplication.translate("MainWindow", "Test DevB", None, QtGui.QApplication.UnicodeUTF8)) self.chkDevC.setText(QtGui.QApplication.translate("MainWindow", "Dev C", None, QtGui.QApplication.UnicodeUTF8)) + self.txtBspeedC.setText(QtGui.QApplication.translate("MainWindow", "16", None, QtGui.QApplication.UnicodeUTF8)) + self.txtBmodeC.setText(QtGui.QApplication.translate("MainWindow", "-sao", None, QtGui.QApplication.UnicodeUTF8)) self.btnTdevC.setText(QtGui.QApplication.translate("MainWindow", "Test DevC", None, QtGui.QApplication.UnicodeUTF8)) self.chkDevD.setText(QtGui.QApplication.translate("MainWindow", "Dev D", None, QtGui.QApplication.UnicodeUTF8)) + self.txtBspeedD.setText(QtGui.QApplication.translate("MainWindow", "16", None, QtGui.QApplication.UnicodeUTF8)) + self.txtBmodeD.setText(QtGui.QApplication.translate("MainWindow", "-sao", None, QtGui.QApplication.UnicodeUTF8)) self.btnTdevD.setText(QtGui.QApplication.translate("MainWindow", "Test DevD", None, QtGui.QApplication.UnicodeUTF8)) self.lblDevice.setText(QtGui.QApplication.translate("MainWindow", "Device", None, QtGui.QApplication.UnicodeUTF8)) self.lblBspeed.setText(QtGui.QApplication.translate("MainWindow", "Burn Speed", None, QtGui.QApplication.UnicodeUTF8))