diff --git a/scripts/gui/about.ui b/scripts/gui/about.ui index be6770e..e2b74a9 100644 --- a/scripts/gui/about.ui +++ b/scripts/gui/about.ui @@ -6,8 +6,8 @@ 0 0 - 498 - 369 + 626 + 393 @@ -25,7 +25,7 @@ - <html><head/><body><p align="center">An advanced bootable usb creator with option to install/uninstall multiple distros.</p><p align="center">This software is written in Python and PyQt. </p><p align="center">Copyright 2010-2017 Sundar</p><p align="center"><span style=" font-weight:600;">Author(s)</span>: Sundar, Ian Bruce, LiQiong Lee and Alin Trăistaru (alindt)</p><p align="center"><span style=" font-weight:600;">Licence</span>: GPL version 2 or later</p><p align="center"><span style=" font-weight:600;">Home page</span>: <a href="http://multibootusb.org"><span style=" text-decoration: underline; color:#0000ff;">http://multibootusb.org</span></a></p><p align="center"><span style=" font-weight:600;">Help/Email</span>: feedback.multibootusb@gmail.com</p><p align="center"><span style=" font-weight:600;">Source Code</span>: <a href="https://github.com/mbusb/multibootusb"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/mbusb/multibootusb</span></a></p><p><br/></p></body></html> + <html><head/><body><p align="center">An advanced bootable usb creator with option to install/uninstall multiple distros.</p><p align="center">This software is written in Python and PyQt. </p><p align="center">Copyright 2010-2018 Sundar</p><p align="center"><span style=" font-weight:600;">Author(s)</span>: Sundar, Ian Bruce, LiQiong Lee, Alin Trăistaru (alindt) and Shinji Suzuki</p><p align="center"><span style=" font-weight:600;">Licence</span>: GPL version 2 or later</p><p align="center"><span style=" font-weight:600;">Home page</span>: <a href="http://multibootusb.org"><span style=" text-decoration: underline; color:#0000ff;">http://multibootusb.org</span></a></p><p align="center"><span style=" font-weight:600;">Help/Email</span>: feedback.multibootusb@gmail.com</p><p align="center"><span style=" font-weight:600;">Source Code</span>: <a href="https://github.com/mbusb/multibootusb"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/mbusb/multibootusb</span></a></p><p><br/></p></body></html> diff --git a/scripts/gui/multibootusb.ui b/scripts/gui/multibootusb.ui index e20f37d..56e67f9 100644 --- a/scripts/gui/multibootusb.ui +++ b/scripts/gui/multibootusb.ui @@ -6,7 +6,7 @@ 0 0 - 747 + 865 609 @@ -299,7 +299,7 @@ false - 1 + 4 @@ -898,47 +898,155 @@ Check Filesystem - - - - - Qt::Horizontal - - - - 242 - 20 - - - - - - - + + + QFormLayout::AllNonFixedFieldsGrow + + + + Repair Filesystem + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + true + + + + 0 + 0 + + + + + 0 + 0 + + + + QFrame::Box + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Use this function to check filesystem consistency</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">and repair. Please take a backup before attempting</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">to use tis function. Users will be presented with</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">two message dialogs as repair is currently </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">performed in two steps.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Repair Filesystem + + + + - - - - Check Filesystem Integrity + + + + Check Filesystem + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + QFrame::Box + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Checking filesystem integrity from time to</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">time is recommended to make sure the integrity</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">is always maintained. Some distros don't </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">cleanly unmount a usb stick when booting off of</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">it, that will be also detected by this check.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Check Filesystem Integrity + + + + - - - - Qt::Horizontal - - - - 241 - 20 - - - - @@ -960,7 +1068,7 @@ 0 0 - 747 + 865 21 diff --git a/scripts/gui/ui_multibootusb.py b/scripts/gui/ui_multibootusb.py index 28100ea..419eeb0 100644 --- a/scripts/gui/ui_multibootusb.py +++ b/scripts/gui/ui_multibootusb.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'multibootusb.ui' +# Form implementation generated from reading ui file 'scripts/gui/multibootusb.ui' # -# Created by: PyQt5 UI code generator 5.7 +# Created by: PyQt5 UI code generator 5.6 # # WARNING! All changes made in this file will be lost! @@ -11,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(747, 609) + MainWindow.resize(865, 609) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -370,19 +370,54 @@ class Ui_MainWindow(object): self.tab_fsck = QtWidgets.QWidget() self.tab_fsck.setEnabled(True) self.tab_fsck.setObjectName("tab_fsck") - self.horizontalLayout_6 = QtWidgets.QHBoxLayout(self.tab_fsck) - self.horizontalLayout_6.setContentsMargins(0, 0, 0, 0) - self.horizontalLayout_6.setObjectName("horizontalLayout_6") - spacerItem14 = QtWidgets.QSpacerItem(242, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_6.addItem(spacerItem14) - self.run_fsck_repair = QtWidgets.QPushButton(self.tab_fsck) + self.formLayout_5 = QtWidgets.QFormLayout(self.tab_fsck) + self.formLayout_5.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow) + self.formLayout_5.setContentsMargins(0, 0, 0, 0) + self.formLayout_5.setObjectName("formLayout_5") + self.groupBox_6 = QtWidgets.QGroupBox(self.tab_fsck) + self.groupBox_6.setObjectName("groupBox_6") + self.gridLayout_5 = QtWidgets.QGridLayout(self.groupBox_6) + self.gridLayout_5.setObjectName("gridLayout_5") + spacerItem14 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_5.addItem(spacerItem14, 0, 0, 1, 1) + self.label_8 = QtWidgets.QLabel(self.groupBox_6) + self.label_8.setEnabled(True) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.label_8.sizePolicy().hasHeightForWidth()) + self.label_8.setSizePolicy(sizePolicy) + self.label_8.setMinimumSize(QtCore.QSize(0, 0)) + self.label_8.setFrameShape(QtWidgets.QFrame.Box) + self.label_8.setObjectName("label_8") + self.gridLayout_5.addWidget(self.label_8, 1, 0, 1, 1) + spacerItem15 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_5.addItem(spacerItem15, 2, 0, 1, 1) + self.run_fsck_repair = QtWidgets.QPushButton(self.groupBox_6) self.run_fsck_repair.setObjectName("run_fsck_repair") - self.horizontalLayout_6.addWidget(self.run_fsck_repair) - self.run_fsck_check = QtWidgets.QPushButton(self.tab_fsck) + self.gridLayout_5.addWidget(self.run_fsck_repair, 3, 0, 1, 1) + self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.groupBox_6) + self.groupBox = QtWidgets.QGroupBox(self.tab_fsck) + self.groupBox.setObjectName("groupBox") + self.gridLayout_10 = QtWidgets.QGridLayout(self.groupBox) + self.gridLayout_10.setObjectName("gridLayout_10") + spacerItem16 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_10.addItem(spacerItem16, 0, 0, 1, 1) + self.label_7 = QtWidgets.QLabel(self.groupBox) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.label_7.sizePolicy().hasHeightForWidth()) + self.label_7.setSizePolicy(sizePolicy) + self.label_7.setFrameShape(QtWidgets.QFrame.Box) + self.label_7.setObjectName("label_7") + self.gridLayout_10.addWidget(self.label_7, 1, 0, 1, 1) + spacerItem17 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_10.addItem(spacerItem17, 2, 0, 1, 1) + self.run_fsck_check = QtWidgets.QPushButton(self.groupBox) self.run_fsck_check.setObjectName("run_fsck_check") - self.horizontalLayout_6.addWidget(self.run_fsck_check) - spacerItem15 = QtWidgets.QSpacerItem(241, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_6.addItem(spacerItem15) + self.gridLayout_10.addWidget(self.run_fsck_check, 3, 0, 1, 1) + self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.groupBox) self.tabWidget.addTab(self.tab_fsck, "") self.verticalLayout_7.addWidget(self.tabWidget) self.progressbar = QtWidgets.QProgressBar(self.centralwidget) @@ -392,7 +427,7 @@ class Ui_MainWindow(object): self.verticalLayout_7.addWidget(self.progressbar) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 747, 21)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 865, 21)) self.menubar.setNativeMenuBar(True) self.menubar.setObjectName("menubar") self.menuFile = QtWidgets.QMenu(self.menubar) @@ -413,7 +448,7 @@ class Ui_MainWindow(object): self.menubar.addAction(self.menu_Help.menuAction()) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(1) + self.tabWidget.setCurrentIndex(4) QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): @@ -475,7 +510,31 @@ class Ui_MainWindow(object): self.combo_iso_boot_ram.setItemText(5, _translate("MainWindow", "2048")) self.label.setText(_translate("MainWindow", "MB")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_testboot), _translate("MainWindow", "Boot ISO/USB")) + self.groupBox_6.setTitle(_translate("MainWindow", "Repair Filesystem")) + self.label_8.setText(_translate("MainWindow", "\n" +"\n" +"


\n" +"

Use this function to check filesystem consistency

\n" +"

and repair. Please take a backup before attempting

\n" +"

to use tis function. Users will be presented with

\n" +"

two message dialogs as repair is currently

\n" +"

performed in two steps.

\n" +"


")) self.run_fsck_repair.setText(_translate("MainWindow", "Repair Filesystem")) + self.groupBox.setTitle(_translate("MainWindow", "Check Filesystem")) + self.label_7.setText(_translate("MainWindow", "\n" +"\n" +"


\n" +"

Checking filesystem integrity from time to

\n" +"

time is recommended to make sure the integrity

\n" +"

is always maintained. Some distros don\'t

\n" +"

cleanly unmount a usb stick when booting off of

\n" +"

it, that will be also detected by this check.

\n" +"


")) self.run_fsck_check.setText(_translate("MainWindow", "Check Filesystem Integrity")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_fsck), _translate("MainWindow", "Check Filesystem")) self.menuFile.setTitle(_translate("MainWindow", "&File")) @@ -483,13 +542,3 @@ class Ui_MainWindow(object): self.action_Quit.setText(_translate("MainWindow", "&Quit")) self.action_About.setText(_translate("MainWindow", "&About")) - -if __name__ == "__main__": - import sys - app = QtWidgets.QApplication(sys.argv) - MainWindow = QtWidgets.QMainWindow() - ui = Ui_MainWindow() - ui.setupUi(MainWindow) - MainWindow.show() - sys.exit(app.exec_()) - diff --git a/scripts/mbusb_gui.py b/scripts/mbusb_gui.py index 6e9c885..35398d0 100644 --- a/scripts/mbusb_gui.py +++ b/scripts/mbusb_gui.py @@ -835,13 +835,16 @@ Proceed with installation?'''.lstrip() % \ return False def update_target_info(self): + + usb_total_size= str(usb.bytes2human(config.usb_details.get('size_total', ""))) + usb_free_size= str(usb.bytes2human(config.usb_details.get('size_free', ""))) config.persistence_max_size = persistence.max_disk_persistence(config.usb_disk) config.usb_mount = config.usb_details.get('mount_point', "") self.ui.usb_dev.setText(config.usb_disk) self.ui.usb_vendor.setText(config.usb_details.get('vendor', "")) self.ui.usb_model.setText(config.usb_details.get('model', "")) - self.ui.usb_size.setText(str(usb.bytes2human(config.usb_details.get('size_total', "")))) + self.ui.usb_size.setText('Free :: ' + usb_free_size + ' / Total :: ' + usb_total_size) self.ui.usb_mount.setText(config.usb_details.get('mount_point', "")) self.ui.usb_type.setText(config.usb_details.get('devtype', "")) self.ui.usb_fs.setText(config.usb_details.get('file_system', ""))