diff --git a/CHANGELOG.md b/CHANGELOG.md old mode 100644 new mode 100755 diff --git a/INSTALL.md b/INSTALL.md old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/conanfile.py b/conanfile.py old mode 100644 new mode 100755 diff --git a/copyright b/copyright old mode 100644 new mode 100755 diff --git a/debian/changelog b/debian/changelog old mode 100644 new mode 100755 diff --git a/debian/compat b/debian/compat old mode 100644 new mode 100755 diff --git a/debian/control b/debian/control old mode 100644 new mode 100755 diff --git a/debian/copyright b/debian/copyright old mode 100644 new mode 100755 diff --git a/debian/source/format b/debian/source/format old mode 100644 new mode 100755 diff --git a/deepin-boot-maker.pro b/deepin-boot-maker.pro old mode 100644 new mode 100755 diff --git a/docs/deepin-boot-maker.png b/docs/deepin-boot-maker.png old mode 100644 new mode 100755 diff --git a/src/app/app.pro b/src/app/app.pro old mode 100644 new mode 100755 index e29a5168..f1c3f8ff --- a/src/app/app.pro +++ b/src/app/app.pro @@ -6,7 +6,8 @@ TARGET = deepin-boot-maker QT += core gui widgets concurrent network svg -CONFIG += c++11 +CONFIG += c++11 link_pkgconfig +PKGCONFIG += dtkwidget RESOURCES += \ ../translate.qrc \ diff --git a/src/app/bmwindow.cpp b/src/app/bmwindow.cpp old mode 100644 new mode 100755 index 7719ef18..24b82340 --- a/src/app/bmwindow.cpp +++ b/src/app/bmwindow.cpp @@ -124,7 +124,7 @@ BMWindow::BMWindow(QWidget *parent) auto title = titlebar(); auto flags = windowFlags() & ~Qt::WindowMaximizeButtonHint; setWindowFlags(flags); - title->setMenuVisible(false); +// title->setMenuVisible(false); // TODO: read it from parent #ifdef Q_OS_MAC titlebar()->setWindowFlags(flags); @@ -191,6 +191,7 @@ BMWindow::BMWindow(QWidget *parent) slideWidget(d->isoWidget, d->usbWidget); setProperty("bmISOFilePath", d->isoWidget->isoFilePath()); wsib->setCurrentPage(1); + qDebug() << "iso path:" << d->isoWidget->isoFilePath(); }); connect(d->usbWidget, &UsbSelectView::deviceSelected, this, [ = ](const QString & partition, bool format) { @@ -217,7 +218,6 @@ BMWindow::BMWindow(QWidget *parent) slideWidget(d->progressWidget, d->resultWidget); wsib->setCurrentPage(2); }); - connect(d->progressWidget, &ProgressView::finish, this, [ = ](quint32 error, const QString & title, const QString & description) { qDebug() << error << title << description; diff --git a/src/app/linux/bmwindow.h b/src/app/linux/bmwindow.h old mode 100644 new mode 100755 diff --git a/src/app/main.cpp b/src/app/main.cpp old mode 100644 new mode 100755 diff --git a/src/app/other/bmwindow.h b/src/app/other/bmwindow.h old mode 100644 new mode 100755 diff --git a/src/app/platform/linux/deepin-boot-maker.desktop b/src/app/platform/linux/deepin-boot-maker.desktop old mode 100644 new mode 100755 diff --git a/src/app/platform/mac/Contents/Resources/mbr.bin b/src/app/platform/mac/Contents/Resources/mbr.bin old mode 100644 new mode 100755 diff --git a/src/app/platform/mac/deepin-boot-maker.icns b/src/app/platform/mac/deepin-boot-maker.icns old mode 100644 new mode 100755 diff --git a/src/app/platform/windows/deepin-boot-maker.ico b/src/app/platform/windows/deepin-boot-maker.ico old mode 100644 new mode 100755 diff --git a/src/app/platform/windows/deepin-boot-maker.manifest b/src/app/platform/windows/deepin-boot-maker.manifest old mode 100644 new mode 100755 diff --git a/src/app/platform/windows/deepin-boot-maker.rc b/src/app/platform/windows/deepin-boot-maker.rc old mode 100644 new mode 100755 diff --git a/src/app/vendor.pri b/src/app/vendor.pri old mode 100644 new mode 100755 diff --git a/src/app/view/deviceinfoitem.cpp b/src/app/view/deviceinfoitem.cpp old mode 100644 new mode 100755 index f85ff5c5..1d604aaf --- a/src/app/view/deviceinfoitem.cpp +++ b/src/app/view/deviceinfoitem.cpp @@ -36,7 +36,7 @@ DeviceInfoItem::DeviceInfoItem(const QString &name, const QString &device, s_removeDevice = WidgetUtil::getDpiPixmap(":/theme/light/image/drive.svg", this); s_selectDevice = WidgetUtil::getDpiPixmap(":/theme/light/image/drive-select.svg", this); - this->setStyleSheet(WidgetUtil::getQss(":/theme/light/DeviceInfoItem.theme")); +// this->setStyleSheet(WidgetUtil::getQss(":/theme/light/DeviceInfoItem.theme")); auto mainLayout = new QHBoxLayout(this); mainLayout->setContentsMargins(12, 0, 12, 0); @@ -49,20 +49,40 @@ DeviceInfoItem::DeviceInfoItem(const QString &name, const QString &device, auto m_deviceLabel = new QLabel; m_deviceLabel->setObjectName("DeviceInfoLabel"); m_deviceLabel->setText(name); + QFont qf = m_deviceLabel->font(); + qf.setPointSize(14); + m_deviceLabel->setFont(qf); + QPalette pa; + pa.setColor(QPalette::Text, QColor("#000000")); + m_deviceLabel->setPalette(pa); auto m_deviceDevName = new QLabel; m_deviceDevName->setObjectName("DeviceInfoDevName"); m_deviceDevName->setText(QString("(%1)").arg(device)); + qf = m_deviceDevName->font(); + qf.setPointSize(10); + m_deviceDevName->setFont(qf); + m_deviceDevName->setAlignment(Qt::AlignCenter); + pa.setColor(QPalette::Text, QColor("#797979")); + m_deviceDevName->setPalette(pa); auto m_deviceCapacity = new QLabel; m_deviceCapacity->setObjectName("DeviceInfoCapacity"); m_deviceCapacity->setText(cap); + qf = m_deviceCapacity->font(); + qf.setPointSize(10); + m_deviceCapacity->setFont(qf); + m_deviceCapacity->setAlignment(Qt::AlignCenter); + pa.setColor(QPalette::Text, QColor("#797979")); + m_deviceCapacity->setPalette(pa); auto m_deviceCapacityBar = new QProgressBar; m_deviceCapacityBar->setObjectName("DeviceInfoCapacityBar"); m_deviceCapacityBar->setTextVisible(false); m_deviceCapacityBar->setFixedSize(60, 6); m_deviceCapacityBar->setValue(percent); + m_deviceCapacityBar->setStyleSheet(".QProgressBar{background - color: rgba(0, 0, 0, 0.05);border: solid 1px rgba(0, 0, 0, 0.03);border - radius: 3px;}" + ".QProgressBar::chunk{background - color:#2ca7f8;border - radius: 3px;}"); mainLayout->addWidget(m_deviceIcon, 0, Qt::AlignCenter); mainLayout->addSpacing(14); diff --git a/src/app/view/deviceinfoitem.h b/src/app/view/deviceinfoitem.h old mode 100644 new mode 100755 diff --git a/src/app/view/devicelistwidget.cpp b/src/app/view/devicelistwidget.cpp old mode 100644 new mode 100755 diff --git a/src/app/view/devicelistwidget.h b/src/app/view/devicelistwidget.h old mode 100644 new mode 100755 diff --git a/src/app/view/dropframe.cpp b/src/app/view/dropframe.cpp old mode 100644 new mode 100755 diff --git a/src/app/view/dropframe.h b/src/app/view/dropframe.h old mode 100644 new mode 100755 diff --git a/src/app/view/isoselectview.cpp b/src/app/view/isoselectview.cpp old mode 100644 new mode 100755 index f5162c73..4c13830e --- a/src/app/view/isoselectview.cpp +++ b/src/app/view/isoselectview.cpp @@ -31,11 +31,13 @@ #include "suggestbutton.h" #include "widgetutil.h" #include "dropframe.h" +#include "bminterface.h" #include DWIDGET_USE_NAMESPACE const QString s_linkTemplate = "%2"; +const QString s_stateTemplate = "%1"; ISOSelectView::ISOSelectView(QWidget *parent) : QFrame(parent) { @@ -45,7 +47,10 @@ ISOSelectView::ISOSelectView(QWidget *parent) : QFrame(parent) QLabel *m_title = new QLabel(tr("Select an ISO image file")); m_title->setFixedHeight(38); - m_title->setStyleSheet("font-size: 26px;"); + QFont qf = m_title->font(); + qf.setPointSize(26); + m_title->setFont(qf); +// m_title->setStyleSheet("font-size: 26px;"); QLabel *isoIcon = new QLabel(this); isoIcon->setObjectName("ISOIcon"); @@ -61,17 +66,33 @@ ISOSelectView::ISOSelectView(QWidget *parent) : QFrame(parent) DropFrame *isoPanel = new DropFrame; isoPanel->setObjectName("IosPanel"); isoPanel->setFixedSize(412, 322); + QPalette pa; +// pa.setColor(QPalette::Background, QColor(255, 255, 255, 13)); +// isoPanel->setPalette(pa); QVBoxLayout *isoPanelLayout = new QVBoxLayout(isoPanel); isoPanelLayout->setMargin(0); m_fileLabel = new QLabel(tr("Drag an ISO image file and drop it here")); m_fileLabel->setObjectName("IsoFileName"); + qf = m_fileLabel->font(); + qf.setPointSize(12); + m_fileLabel->setFont(qf); + pa.setColor(QPalette::Text, QColor("#303030")); + m_fileLabel->setPalette(pa); // m_fileLabel->setFixedHeight(18); + m_stateLabel = new QLabel(); + m_stateLabel->hide(); + m_hits = new QLabel(tr("OR")); m_hits->setObjectName("IsoHits"); m_hits->setFixedHeight(18); + qf = m_hits->font(); + qf.setPointSize(10); + m_hits->setFont(qf); + pa.setColor(QPalette::Text, QColor("#848484")); + m_hits->setPalette(pa); QLabel *spliter = new QLabel; spliter->setObjectName("IsoSpliter"); @@ -84,12 +105,19 @@ ISOSelectView::ISOSelectView(QWidget *parent) : QFrame(parent) QString selectText = tr("Select an ISO image file"); QString linkText = QString(s_linkTemplate).arg(selectText).arg(selectText); m_fileSelect->setText(linkText); + qf = m_fileSelect->font(); + qf.setPointSize(12); + m_fileSelect->setFont(qf); + pa.setColor(QPalette::Text, QColor("#0066ec")); + m_fileSelect->setPalette(pa); isoPanelLayout->addSpacing(62); isoPanelLayout->addWidget(isoIcon, 0, Qt::AlignCenter); isoPanelLayout->addSpacing(5); isoPanelLayout->addWidget(m_fileLabel, 0, Qt::AlignCenter); isoPanelLayout->addSpacing(4); + isoPanelLayout->addWidget(m_stateLabel, 0, Qt::AlignCenter); + isoPanelLayout->addSpacing(4); isoPanelLayout->addWidget(m_hits, 0, Qt::AlignCenter); isoPanelLayout->addSpacing(7); isoPanelLayout->addWidget(spliter, 0, Qt::AlignCenter); @@ -108,7 +136,10 @@ ISOSelectView::ISOSelectView(QWidget *parent) : QFrame(parent) mainLayout->addStretch(); mainLayout->addWidget(m_nextSetp, 0, Qt::AlignCenter); - this->setStyleSheet(WidgetUtil::getQss(":/theme/light/ISOSelectView.theme")); +// this->setStyleSheet(WidgetUtil::getQss(":/theme/light/ISOSelectView.theme")); + this->setStyleSheet("#IosPanel{background-color: rgba(255, 255, 255, 5%);}" + "#IosPanel[active=true] {border-image: url(:/theme/light/image/dash.svg);}" + "#IsoSpliter{background-image: url(:/theme/light/image/dash_line.svg);}"); #ifdef Q_OS_WIN m_fileLabel->hide(); @@ -155,15 +186,27 @@ ISOSelectView::ISOSelectView(QWidget *parent) : QFrame(parent) void ISOSelectView::onFileSelected(const QString &file) { + bool checkok = BMInterface::instance()->checkfile(file); QFileInfo info(file); m_fileLabel->setText(info.fileName()); m_fileLabel->show(); m_hits->setText(""); QString selectText = tr("Reselect an ISO image file"); + QString stateText = ""; + if (!checkok) + stateText = tr("Illegal ISO file"); QString linkText = QString(s_linkTemplate).arg(selectText).arg(selectText); m_fileSelect->setText(linkText); m_nextSetp->setDisabled(false); + m_stateLabel->hide(); + if ("" != stateText) { + QString stateTemplateText = QString(s_stateTemplate).arg(stateText); + m_stateLabel->setText(stateTemplateText); + m_stateLabel->show(); + m_nextSetp->setDisabled(true); + } m_isoFilePath = file; + qDebug() << "onFileSelected file:" << file; } void ISOSelectView::onFileVerfiyFinished(bool ok) diff --git a/src/app/view/isoselectview.h b/src/app/view/isoselectview.h old mode 100644 new mode 100755 index 9d27e205..6d999629 --- a/src/app/view/isoselectview.h +++ b/src/app/view/isoselectview.h @@ -50,6 +50,7 @@ public slots: private: QLabel *m_hits = nullptr; QLabel *m_fileLabel = nullptr; + QLabel *m_stateLabel = nullptr; QLabel *m_fileSelect = nullptr; SuggestButton *m_nextSetp = nullptr; QString m_isoFilePath; diff --git a/src/app/view/progressview.cpp b/src/app/view/progressview.cpp old mode 100644 new mode 100755 index f11c1bc6..72ca81a7 --- a/src/app/view/progressview.cpp +++ b/src/app/view/progressview.cpp @@ -43,13 +43,24 @@ ProgressView::ProgressView(QWidget *parent) : QWidget(parent) QLabel *m_title = new QLabel(tr("Making")); m_title->setFixedHeight(38); - m_title->setStyleSheet("font-size: 26px;"); + QFont ft = m_title->font(); + ft.setPointSize(26); + m_title->setFont(ft); +// m_title->setStyleSheet("font-size: 26px;"); auto waterProgress = new Dtk::Widget::DWaterProgress; waterProgress->setFixedSize(100, 100); QLabel *m_hitsTitle = new QLabel(tr("Making the disk, please wait...")); m_hitsTitle->setObjectName("ProgressHitsTitle"); + QFont qf; + qf = m_hitsTitle->font(); + qf.setPointSize(14); + m_hitsTitle->setFont(qf); + QPalette pa; + pa.setColor(QPalette::Text, QColor("#000000")); + m_hitsTitle->setPalette(pa); + m_hitsTitle->setAlignment(Qt::AlignCenter); QLabel *m_hits = new QLabel(tr("Do not remove the disk or shut down the computer during the process")); m_hits->setObjectName("ProgressHits"); @@ -74,7 +85,8 @@ ProgressView::ProgressView(QWidget *parent) : QWidget(parent) waterProgress->setValue(0); waterProgress->start(); - this->setStyleSheet(WidgetUtil::getQss(":/theme/light/ProgressView.theme")); +// this->setStyleSheet(WidgetUtil::getQss(":/theme/light/ProgressView.theme")); + this->setStyleSheet("#ProgressHits{line-height: 1.67;}"); // connect(start, &SuggestButton::clicked, this, &ProgressView::testCancel); start->hide(); diff --git a/src/app/view/progressview.h b/src/app/view/progressview.h old mode 100644 new mode 100755 diff --git a/src/app/view/resource/resource.qrc b/src/app/view/resource/resource.qrc old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/DeviceInfoItem.theme b/src/app/view/resource/theme/light/DeviceInfoItem.theme old mode 100644 new mode 100755 index d21649e5..f62e881f --- a/src/app/view/resource/theme/light/DeviceInfoItem.theme +++ b/src/app/view/resource/theme/light/DeviceInfoItem.theme @@ -2,7 +2,7 @@ font-size: 14px; font-weight: normal; font-style: normal; - color: #000000; + color: #ff0000; } #DeviceInfoDevName{ diff --git a/src/app/view/resource/theme/light/DeviceListWidget.theme b/src/app/view/resource/theme/light/DeviceListWidget.theme old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/ISOSelectView.theme b/src/app/view/resource/theme/light/ISOSelectView.theme old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/ProgressView.theme b/src/app/view/resource/theme/light/ProgressView.theme old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/ResultView.theme b/src/app/view/resource/theme/light/ResultView.theme old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/SuggestButton.theme b/src/app/view/resource/theme/light/SuggestButton.theme old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/UsbSelectView.theme b/src/app/view/resource/theme/light/UsbSelectView.theme old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/button_normal.svg b/src/app/view/resource/theme/light/image/button_normal.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/dash.svg b/src/app/view/resource/theme/light/image/dash.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/dash_line.svg b/src/app/view/resource/theme/light/image/dash_line.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/deepin-boot-maker.svg b/src/app/view/resource/theme/light/image/deepin-boot-maker.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/drive-select.svg b/src/app/view/resource/theme/light/image/drive-select.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/drive.svg b/src/app/view/resource/theme/light/image/drive.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/fail.svg b/src/app/view/resource/theme/light/image/fail.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/glow.svg b/src/app/view/resource/theme/light/image/glow.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/media-optical-96px.svg b/src/app/view/resource/theme/light/image/media-optical-96px.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/success.svg b/src/app/view/resource/theme/light/image/success.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/suggest_button_disabled.svg b/src/app/view/resource/theme/light/image/suggest_button_disabled.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/suggest_button_hover.svg b/src/app/view/resource/theme/light/image/suggest_button_hover.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/suggest_button_normal.svg b/src/app/view/resource/theme/light/image/suggest_button_normal.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resource/theme/light/image/suggest_button_press.svg b/src/app/view/resource/theme/light/image/suggest_button_press.svg old mode 100644 new mode 100755 diff --git a/src/app/view/resultview.cpp b/src/app/view/resultview.cpp old mode 100644 new mode 100755 index 04004c65..e87d2b0f --- a/src/app/view/resultview.cpp +++ b/src/app/view/resultview.cpp @@ -51,7 +51,10 @@ ResultView::ResultView(QWidget *parent) : QWidget(parent) m_title = new QLabel(tr("Successful")); m_title->setFixedHeight(38); - m_title->setStyleSheet("font-size: 26px;"); + QFont ft = m_title->font(); + ft.setPointSize(26); + m_title->setFont(ft); +// m_title->setStyleSheet("font-size: 26px;"); m_resultIcon = new QLabel(); m_resultIcon->setObjectName("ResultIcon"); @@ -61,6 +64,15 @@ ResultView::ResultView(QWidget *parent) : QWidget(parent) m_hitsTitle->setObjectName("ResulteHitsTitle"); m_hitsTitle->setFixedWidth(340); + QFont qf; + qf = m_hitsTitle->font(); + qf.setPointSize(14); + m_hitsTitle->setFont(qf); + QPalette pa; + pa.setColor(QPalette::Text, QColor("#000000")); + m_hitsTitle->setPalette(pa); + m_hitsTitle->setAlignment(Qt::AlignCenter); + // QString hitsFormat = "%1"; // QString tagBegin = ""; // QString tagEnd = ""; @@ -73,6 +85,12 @@ ResultView::ResultView(QWidget *parent) : QWidget(parent) // connect(m_logHits, &QLabel::linkActivated, this, &ResultView::onLogLinkActivated); // m_logHits->setOpenExternalLinks(false); m_logHits->hide(); + qf = m_logHits->font(); + qf.setPointSize(12); + m_logHits->setFont(qf); + pa.setColor(QPalette::Text, QColor("#424242")); + m_logHits->setPalette(pa); + m_logHits->setAlignment(Qt::AlignCenter); m_rebootLater = new SuggestButton(); m_rebootLater->setObjectName("RebootLater"); @@ -98,7 +116,7 @@ ResultView::ResultView(QWidget *parent) : QWidget(parent) // m_rebootNow->hide(); // mainLayout->addWidget(m_rebootNow, 0, Qt::AlignCenter); - this->setStyleSheet(WidgetUtil::getQss(":/theme/light/ResultView.theme")); +// this->setStyleSheet(WidgetUtil::getQss(":/theme/light/ResultView.theme")); connect(m_rebootNow, &SuggestButton::clicked, this, [ = ]() { diff --git a/src/app/view/resultview.h b/src/app/view/resultview.h old mode 100644 new mode 100755 diff --git a/src/app/view/suggestbutton.cpp b/src/app/view/suggestbutton.cpp old mode 100644 new mode 100755 index 019ae89f..f302bcca --- a/src/app/view/suggestbutton.cpp +++ b/src/app/view/suggestbutton.cpp @@ -23,7 +23,8 @@ #include "widgetutil.h" -SuggestButton::SuggestButton(QWidget *parent) : DBaseButton(parent) +SuggestButton::SuggestButton(DWidget *parent) : + DPushButton(parent) { this->setStyleSheet(WidgetUtil::getQss(":/theme/light/SuggestButton.theme")); this->setFixedSize(QPixmap(":/theme/light/image/suggest_button_hover.svg").size()); diff --git a/src/app/view/suggestbutton.h b/src/app/view/suggestbutton.h old mode 100644 new mode 100755 index a8984e90..adcd9f1d --- a/src/app/view/suggestbutton.h +++ b/src/app/view/suggestbutton.h @@ -21,12 +21,18 @@ #pragma once -#include +//#include +#include +#include +#include -class SuggestButton : public DTK_WIDGET_NAMESPACE::DBaseButton +DWIDGET_USE_NAMESPACE +DGUI_USE_NAMESPACE + +class SuggestButton : public DPushButton { Q_OBJECT public: - explicit SuggestButton(QWidget *parent = 0); + explicit SuggestButton(DWidget *parent = 0); }; diff --git a/src/app/view/usbselectview.cpp b/src/app/view/usbselectview.cpp old mode 100644 new mode 100755 index 7c7ff4a0..9f523691 --- a/src/app/view/usbselectview.cpp +++ b/src/app/view/usbselectview.cpp @@ -78,7 +78,10 @@ UsbSelectView::UsbSelectView(QWidget *parent) : QFrame(parent) QLabel *m_title = new QLabel(tr("Select a disk")); m_title->setFixedHeight(38); - m_title->setStyleSheet("font-size: 26px;"); + QFont ft = m_title->font(); + ft.setPointSize(26); + m_title->setFont(ft); +// m_title->setStyleSheet("font-size: 26px;"); QFrame *usbDeviceListPanel = new QFrame; usbDeviceListPanel->setObjectName("UsbDeviceListPanel"); diff --git a/src/app/view/usbselectview.h b/src/app/view/usbselectview.h old mode 100644 new mode 100755 diff --git a/src/app/view/widgetutil.cpp b/src/app/view/widgetutil.cpp old mode 100644 new mode 100755 diff --git a/src/app/view/widgetutil.h b/src/app/view/widgetutil.h old mode 100644 new mode 100755 diff --git a/src/app/windows.qrc b/src/app/windows.qrc old mode 100644 new mode 100755 diff --git a/src/libdbm/backend/bmdbushandler.h b/src/libdbm/backend/bmdbushandler.h old mode 100644 new mode 100755 index f85836e8..bf23521b --- a/src/libdbm/backend/bmdbushandler.h +++ b/src/libdbm/backend/bmdbushandler.h @@ -39,14 +39,18 @@ class BMDbusHandler : public BMHandler "/com/deepin/bootmaker", QDBusConnection::systemBus(), this); - + if (!m_dbus->isValid()) { + qDebug() << "m_dbus isValid false error:" << m_dbus->lastError(); + } + qDebug() << "m_dbus isValid true"; connect(m_dbus, &BMDBusInterface::DeviceListChanged, this, [ = ](const QString & deviceListJson) { + qDebug() << "DeviceListChanged,"; emit removablePartitionsChanged(deviceListFromJson(deviceListJson)); }); connect(m_dbus, &BMDBusInterface::Finished, this, &BMDbusHandler::finished); - connect(m_dbus, &BMDBusInterface::ReportProgress , + connect(m_dbus, &BMDBusInterface::ReportProgress, this, &BMDbusHandler::reportProgress); } @@ -58,7 +62,9 @@ public slots: void start() { + qDebug() << "start"; m_dbus->Start(); + qDebug() << "m_dbus Start error:" << m_dbus->lastError(); } void stop() @@ -68,6 +74,7 @@ public slots: const QList deviceList() const { + qDebug() << "deviceList"; return deviceListFromJson(m_dbus->DeviceList()); } @@ -76,9 +83,16 @@ public slots: const QString &partition, bool formatDevice) { + qDebug() << "install"; return m_dbus->Install(image, device, partition, formatDevice); } + bool checkfile(const QString &filepath) + { + qDebug() << "checkfile"; + return m_dbus->CheckFile(filepath); + } + private: BMDBusInterface *m_dbus = nullptr; }; diff --git a/src/libdbm/backend/bmdbusinterface.cpp b/src/libdbm/backend/bmdbusinterface.cpp old mode 100644 new mode 100755 diff --git a/src/libdbm/backend/bmdbusinterface.h b/src/libdbm/backend/bmdbusinterface.h old mode 100644 new mode 100755 index af9a1ab1..ae727d08 --- a/src/libdbm/backend/bmdbusinterface.h +++ b/src/libdbm/backend/bmdbusinterface.h @@ -28,7 +28,9 @@ class BMDBusInterface: public QDBusAbstractInterface Q_OBJECT public: static inline const char *staticInterfaceName() - { return "com.deepin.bootmaker"; } + { + return "com.deepin.bootmaker"; + } public: BMDBusInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); @@ -49,6 +51,13 @@ public Q_SLOTS: // METHODS return asyncCallWithArgumentList(QStringLiteral("Install"), argumentList); } + inline QDBusPendingReply CheckFile(const QString &filepath) + { + QList argumentList; + argumentList << QVariant::fromValue(filepath); + return asyncCallWithArgumentList(QStringLiteral("CheckFile"), argumentList); + } + inline QDBusPendingReply<> Reboot() { QList argumentList; @@ -74,8 +83,8 @@ public Q_SLOTS: // METHODS }; namespace com { - namespace deepin { - typedef ::BMDBusInterface bootmaker; - } +namespace deepin { +typedef ::BMDBusInterface bootmaker; +} } #endif diff --git a/src/libdbm/backend/bmhandler.h b/src/libdbm/backend/bmhandler.h old mode 100644 new mode 100755 index 9ba65ae3..21180222 --- a/src/libdbm/backend/bmhandler.h +++ b/src/libdbm/backend/bmhandler.h @@ -37,7 +37,8 @@ class BMHandler : public QObject ExtractImgeFailed, }; - explicit BMHandler(QObject *parent = 0): QObject(parent) { + explicit BMHandler(QObject *parent = 0): QObject(parent) + { connect(this, &BMHandler::startInstall, this, &BMHandler::install); } @@ -54,6 +55,7 @@ public slots: virtual void start() = 0; virtual void stop() = 0; virtual const QList deviceList() const = 0; + virtual bool checkfile(const QString &filepath) = 0; protected: virtual bool install(const QString &image, diff --git a/src/libdbm/backend/bootmaker.cpp b/src/libdbm/backend/bootmaker.cpp old mode 100644 new mode 100755 index 48ba05fc..eb854f39 --- a/src/libdbm/backend/bootmaker.cpp +++ b/src/libdbm/backend/bootmaker.cpp @@ -115,6 +115,8 @@ void BootMaker::reboot() void BootMaker::start() { + + qDebug() << "BootMaker start"; emit m_usbDeviceMonitor->startMonitor(); } @@ -125,9 +127,20 @@ void BootMaker::stop() const QList BootMaker::deviceList() const { + qDebug() << "BootMaker deviceList"; return m_usbDeviceMonitor->deviceList(); } - +bool BootMaker::checkfile(const QString &filepath) +{ + qDebug() << "CheckFile:" << filepath; + //check iso integrity + SevenZip sevenZipCheck(filepath, ""); + if (!sevenZipCheck.check()) { + qCritical() << "Error::file check error"; + return false; + } + return true; +} bool BootMaker::install(const QString &image, const QString &unused_device, const QString &partition, bool formatDevice) { emit m_usbDeviceMonitor->pauseMonitor(); diff --git a/src/libdbm/backend/bootmaker.h b/src/libdbm/backend/bootmaker.h old mode 100644 new mode 100755 index 1de16691..cd018cb6 --- a/src/libdbm/backend/bootmaker.h +++ b/src/libdbm/backend/bootmaker.h @@ -39,6 +39,7 @@ public slots: const QString &device, const QString &partition, bool formatDevice); + bool checkfile(const QString &filepath); private: DeviceMonitor *m_usbDeviceMonitor = nullptr; diff --git a/src/libdbm/backend/diskutil.cpp b/src/libdbm/backend/diskutil.cpp old mode 100644 new mode 100755 diff --git a/src/libdbm/backend/diskutil.h b/src/libdbm/backend/diskutil.h old mode 100644 new mode 100755 diff --git a/src/libdbm/backend/syslinux.cpp b/src/libdbm/backend/syslinux.cpp old mode 100644 new mode 100755 diff --git a/src/libdbm/backend/syslinux.h b/src/libdbm/backend/syslinux.h old mode 100644 new mode 100755 diff --git a/src/libdbm/blob.qrc b/src/libdbm/blob.qrc old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/sevnz/sevnz.dll b/src/libdbm/blob/sevnz/sevnz.dll old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/sevnz/sevnz.exe b/src/libdbm/blob/sevnz/sevnz.exe old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/syslinux/syslinux.cfg b/src/libdbm/blob/syslinux/syslinux.cfg old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/syslinux/win32/chain.c32 b/src/libdbm/blob/syslinux/win32/chain.c32 old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/syslinux/win32/gfxboot.c32 b/src/libdbm/blob/syslinux/win32/gfxboot.c32 old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/syslinux/win32/libcom32.c32 b/src/libdbm/blob/syslinux/win32/libcom32.c32 old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/syslinux/win32/libutil.c32 b/src/libdbm/blob/syslinux/win32/libutil.c32 old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/syslinux/win32/menu.c32 b/src/libdbm/blob/syslinux/win32/menu.c32 old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/syslinux/win32/syslinux.exe b/src/libdbm/blob/syslinux/win32/syslinux.exe old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/syslinux/win32/vesamenu.c32 b/src/libdbm/blob/syslinux/win32/vesamenu.c32 old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/xfbinst/fb.cfg b/src/libdbm/blob/xfbinst/fb.cfg old mode 100644 new mode 100755 diff --git a/src/libdbm/blob/xfbinst/xfbinst.exe b/src/libdbm/blob/xfbinst/xfbinst.exe old mode 100644 new mode 100755 diff --git a/src/libdbm/blob_linux.qrc b/src/libdbm/blob_linux.qrc old mode 100644 new mode 100755 diff --git a/src/libdbm/bminterface.cpp b/src/libdbm/bminterface.cpp old mode 100644 new mode 100755 index 743e4302..b56fdc00 --- a/src/libdbm/bminterface.cpp +++ b/src/libdbm/bminterface.cpp @@ -64,7 +64,7 @@ BMInterface::BMInterface(QObject *parent) : this, &BMInterface::deviceListChanged); connect(d->handler, &BMHandler::finished, this, &BMInterface::finished); - connect(d->handler, &BMHandler::reportProgress , + connect(d->handler, &BMHandler::reportProgress, this, &BMInterface::reportProgress); connect( this, &BMInterface::startInstall, @@ -96,10 +96,17 @@ void BMInterface::reboot() QList BMInterface::deviceList() { + qDebug() << "BMInterface deviceList"; Q_D(BMInterface); return d->handler->deviceList(); } +bool BMInterface::checkfile(const QString &filepath) +{ + Q_D(BMInterface); + return d->handler->checkfile(filepath); +} + //bool BMInterface::install(const QString &image, const QString &device, const QString &partition, bool formatDevice) //{ // Q_D(BMInterface); diff --git a/src/libdbm/bminterface.h b/src/libdbm/bminterface.h old mode 100644 new mode 100755 index fdd4d0fa..4e084d89 --- a/src/libdbm/bminterface.h +++ b/src/libdbm/bminterface.h @@ -54,6 +54,7 @@ public slots: void stop(); void reboot(); QList deviceList(); + bool checkfile(const QString &filepath); private: bool install(const QString &image, diff --git a/src/libdbm/libdbm.pro b/src/libdbm/libdbm.pro old mode 100644 new mode 100755 index bb0cbf73..4ee735e3 --- a/src/libdbm/libdbm.pro +++ b/src/libdbm/libdbm.pro @@ -5,7 +5,8 @@ QT -= gui TARGET = libdbm TEMPLATE = lib -CONFIG += staticlib c++11 +CONFIG += staticlib c++11 link_pkgconfig +PKGCONFIG += dtkwidget SOURCES += \ backend/bootmaker.cpp \ diff --git a/src/libdbm/util/deviceinfo.h b/src/libdbm/util/deviceinfo.h old mode 100644 new mode 100755 diff --git a/src/libdbm/util/devicemonitor.cpp b/src/libdbm/util/devicemonitor.cpp old mode 100644 new mode 100755 index 043759e9..52249ede --- a/src/libdbm/util/devicemonitor.cpp +++ b/src/libdbm/util/devicemonitor.cpp @@ -27,8 +27,11 @@ #include #include #include +#include #include "utils.h" +//#pragma execution_character_set("utf-8") + DeviceMonitor::DeviceMonitor(QObject *parent) : QObject(parent) { qRegisterMetaType>(); @@ -37,7 +40,11 @@ DeviceMonitor::DeviceMonitor(QObject *parent) : QObject(parent) m_timer->setInterval(3000); connect(m_timer, &QTimer::timeout, this, [ = ] { QList list = Utils::ListUsbDrives(); - qDebug() << "list" << list.length(); + qDebug() << "list length:" << list.length(); + for (int i = 0; i < list.size(); i++) + { + qDebug() << "list i:" << i << " path:" << list.at(i).path << " label:" << list.at(i).label; + } emit this->removablePartitionsChanged(list); }); diff --git a/src/libdbm/util/devicemonitor.h b/src/libdbm/util/devicemonitor.h old mode 100644 new mode 100755 diff --git a/src/libdbm/util/sevenzip.cpp b/src/libdbm/util/sevenzip.cpp old mode 100644 new mode 100755 diff --git a/src/libdbm/util/sevenzip.h b/src/libdbm/util/sevenzip.h old mode 100644 new mode 100755 diff --git a/src/libdbm/util/utils.cpp b/src/libdbm/util/utils.cpp old mode 100644 new mode 100755 index db4ab1dd..78906e35 --- a/src/libdbm/util/utils.cpp +++ b/src/libdbm/util/utils.cpp @@ -30,7 +30,6 @@ #include #endif - static void initQRC() { #ifdef Q_OS_LINUX @@ -40,8 +39,7 @@ static void initQRC() #endif } -namespace Utils -{ +namespace Utils { void loadTranslate() @@ -189,10 +187,12 @@ QMap CommandLsblkParse() df.waitForStarted(-1); df.waitForFinished(-1); QString dfout = df.readAll(); + qDebug() << "CommandLsblkParse dfout:" << dfout; QMap deviceInfos; - QJsonDocument jsonDoc = QJsonDocument::fromJson(dfout.toLatin1()); +// QJsonDocument jsonDoc = QJsonDocument::fromJson(dfout.toLatin1()); + QJsonDocument jsonDoc = QJsonDocument::fromJson(dfout.toLocal8Bit()); foreach (const QJsonValue &value, jsonDoc.object()["blockdevices"].toArray()) { QMap children; foreach (const QJsonValue &partiotion, value.toObject()["children"].toArray()) { @@ -200,6 +200,7 @@ QMap CommandLsblkParse() info.path = partiotion.toObject()["name"].toString(); info.uuid = partiotion.toObject()["uuid"].toString(); info.label = partiotion.toObject()["label"].toString(); +// info.label = QString::fromLocal8Bit(partiotion.toObject()["label"].toString().toLocal8Bit().data()); info.fstype = partiotion.toObject()["fstype"].toString(); children.insert(info.path, info); } @@ -219,6 +220,7 @@ QMap CommandLsblkParse() bool CheckInstallDisk(const QString &targetDev) { + qDebug() << "CheckInstallDisk"; if (XSys::DiskUtil::PF_FAT32 != XSys::DiskUtil::GetPartitionFormat(targetDev)) { qDebug() << "disk format error " << targetDev; return false; @@ -263,6 +265,7 @@ bool isUsbDisk(const QString &dev) QList ListUsbDrives() { + qDebug() << "ListUsbDrives"; QList deviceList; #ifdef Q_OS_WIN32 QFileInfoList extdrivesList = QDir::drives(); diff --git a/src/libdbm/util/utils.h b/src/libdbm/util/utils.h old mode 100644 new mode 100755 diff --git a/src/libdbm/vendor.pri b/src/libdbm/vendor.pri old mode 100644 new mode 100755 diff --git a/src/service/.gitignore b/src/service/.gitignore old mode 100644 new mode 100755 diff --git a/src/service/LogManager.cpp b/src/service/LogManager.cpp old mode 100644 new mode 100755 diff --git a/src/service/LogManager.h b/src/service/LogManager.h old mode 100644 new mode 100755 diff --git a/src/service/bootmakerservice.cpp b/src/service/bootmakerservice.cpp old mode 100644 new mode 100755 index 9f0c5e0f..dbd237d7 --- a/src/service/bootmakerservice.cpp +++ b/src/service/bootmakerservice.cpp @@ -165,6 +165,7 @@ void BootMakerService::Stop() //! return json of devicelist QString BootMakerService::DeviceList() { + qDebug() << "BootMakerService DeviceList"; Q_D(BootMakerService); if (!d->checkCaller()) { return ""; @@ -178,10 +179,21 @@ bool BootMakerService::Install(const QString &image, const QString &device, cons if (!d->checkCaller()) { return false; } + qDebug() << "---install image:" << image << " device:" << device << " partition:" << partition; emit d->bm->startInstall(image, device, partition, formatDevice); return true; } +bool BootMakerService::CheckFile(const QString &filepath) +{ + Q_D(BootMakerService); + if (!d->checkCaller()) { + return false; + } +// emit d->bm->startInstall(image, device, partition, formatDevice); + return d->bm->checkfile(filepath); +} + bool BootMakerServicePrivate::checkCaller() { Q_Q(BootMakerService); diff --git a/src/service/bootmakerservice.h b/src/service/bootmakerservice.h old mode 100644 new mode 100755 index dda7659b..5a937876 --- a/src/service/bootmakerservice.h +++ b/src/service/bootmakerservice.h @@ -27,7 +27,7 @@ class BootMakerServicePrivate; class BootMakerService : public QObject, - protected QDBusContext + protected QDBusContext { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "com.deepin.bootmaker") @@ -47,9 +47,10 @@ public slots: Q_SCRIPTABLE void Stop(); Q_SCRIPTABLE QString DeviceList(); Q_SCRIPTABLE bool Install(const QString &image, - const QString &device, - const QString &partition, - bool formatDevice); + const QString &device, + const QString &partition, + bool formatDevice); + Q_SCRIPTABLE bool CheckFile(const QString &filepath); private: QScopedPointer d_ptr; diff --git a/src/service/data/com.deepin.bootmaker.conf b/src/service/data/com.deepin.bootmaker.conf old mode 100644 new mode 100755 diff --git a/src/service/data/com.deepin.bootmaker.service b/src/service/data/com.deepin.bootmaker.service old mode 100644 new mode 100755 diff --git a/src/service/data/com.deepin.bootmaker.xml b/src/service/data/com.deepin.bootmaker.xml old mode 100644 new mode 100755 diff --git a/src/service/main.cpp b/src/service/main.cpp old mode 100644 new mode 100755 diff --git a/src/service/service.pro b/src/service/service.pro old mode 100644 new mode 100755 index 9417757f..74b521ab --- a/src/service/service.pro +++ b/src/service/service.pro @@ -6,7 +6,8 @@ QT -= gui CONFIG += c++11 TARGET = deepin-boot-maker-service -CONFIG += console +CONFIG += console link_pkgconfig +PKGCONFIG += dtkwidget CONFIG -= app_bundle TEMPLATE = app diff --git a/src/service/vendor.pri b/src/service/vendor.pri old mode 100644 new mode 100755 diff --git a/src/src.pro b/src/src.pro old mode 100644 new mode 100755 diff --git a/src/tools/exportPot b/src/tools/exportPot old mode 100644 new mode 100755 diff --git a/src/tools/exportPot.bat b/src/tools/exportPot.bat old mode 100644 new mode 100755 diff --git a/src/tools/importPo b/src/tools/importPo old mode 100644 new mode 100755 diff --git a/src/tools/importPo.bat b/src/tools/importPo.bat old mode 100644 new mode 100755 diff --git a/src/tools/translate_generation.py b/src/tools/translate_generation.py old mode 100644 new mode 100755 diff --git a/src/translate.qrc b/src/translate.qrc old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker.ts b/src/translations/deepin-boot-maker.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_af.ts b/src/translations/deepin-boot-maker_af.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_am_ET.ts b/src/translations/deepin-boot-maker_am_ET.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ar.ts b/src/translations/deepin-boot-maker_ar.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ast.ts b/src/translations/deepin-boot-maker_ast.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_az.ts b/src/translations/deepin-boot-maker_az.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_bg.ts b/src/translations/deepin-boot-maker_bg.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_bn.ts b/src/translations/deepin-boot-maker_bn.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ca.ts b/src/translations/deepin-boot-maker_ca.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_cs.ts b/src/translations/deepin-boot-maker_cs.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_da.ts b/src/translations/deepin-boot-maker_da.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_de.ts b/src/translations/deepin-boot-maker_de.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_el.ts b/src/translations/deepin-boot-maker_el.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_en_AU.ts b/src/translations/deepin-boot-maker_en_AU.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_eo.ts b/src/translations/deepin-boot-maker_eo.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_es.ts b/src/translations/deepin-boot-maker_es.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_es_419.ts b/src/translations/deepin-boot-maker_es_419.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_fa.ts b/src/translations/deepin-boot-maker_fa.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_fi.ts b/src/translations/deepin-boot-maker_fi.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_fr.ts b/src/translations/deepin-boot-maker_fr.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_gl_ES.ts b/src/translations/deepin-boot-maker_gl_ES.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_he.ts b/src/translations/deepin-boot-maker_he.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_hi_IN.ts b/src/translations/deepin-boot-maker_hi_IN.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_hr.ts b/src/translations/deepin-boot-maker_hr.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_hu.ts b/src/translations/deepin-boot-maker_hu.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_hy.ts b/src/translations/deepin-boot-maker_hy.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_id.ts b/src/translations/deepin-boot-maker_id.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_it.ts b/src/translations/deepin-boot-maker_it.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ja.ts b/src/translations/deepin-boot-maker_ja.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_kn_IN.ts b/src/translations/deepin-boot-maker_kn_IN.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ko.ts b/src/translations/deepin-boot-maker_ko.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ku_IQ.ts b/src/translations/deepin-boot-maker_ku_IQ.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ky.ts b/src/translations/deepin-boot-maker_ky.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ky@Arab.ts b/src/translations/deepin-boot-maker_ky@Arab.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_lo.ts b/src/translations/deepin-boot-maker_lo.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_lt.ts b/src/translations/deepin-boot-maker_lt.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ml.ts b/src/translations/deepin-boot-maker_ml.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_mn.ts b/src/translations/deepin-boot-maker_mn.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ms.ts b/src/translations/deepin-boot-maker_ms.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_nb.ts b/src/translations/deepin-boot-maker_nb.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ne.ts b/src/translations/deepin-boot-maker_ne.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_nl.ts b/src/translations/deepin-boot-maker_nl.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_pam.ts b/src/translations/deepin-boot-maker_pam.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_pl.ts b/src/translations/deepin-boot-maker_pl.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_pt.ts b/src/translations/deepin-boot-maker_pt.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_pt_BR.ts b/src/translations/deepin-boot-maker_pt_BR.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ro.ts b/src/translations/deepin-boot-maker_ro.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ru.ts b/src/translations/deepin-boot-maker_ru.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_sk.ts b/src/translations/deepin-boot-maker_sk.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_sl.ts b/src/translations/deepin-boot-maker_sl.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_sq.ts b/src/translations/deepin-boot-maker_sq.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_sr.ts b/src/translations/deepin-boot-maker_sr.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_sr_RS.ts b/src/translations/deepin-boot-maker_sr_RS.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_sv.ts b/src/translations/deepin-boot-maker_sv.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ta.ts b/src/translations/deepin-boot-maker_ta.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_tr.ts b/src/translations/deepin-boot-maker_tr.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_ug.ts b/src/translations/deepin-boot-maker_ug.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_uk.ts b/src/translations/deepin-boot-maker_uk.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_vi.ts b/src/translations/deepin-boot-maker_vi.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_zh_CN.ts b/src/translations/deepin-boot-maker_zh_CN.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_zh_HK.ts b/src/translations/deepin-boot-maker_zh_HK.ts old mode 100644 new mode 100755 diff --git a/src/translations/deepin-boot-maker_zh_TW.ts b/src/translations/deepin-boot-maker_zh_TW.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop.ts b/src/translations/desktop/desktop.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_af.ts b/src/translations/desktop/desktop_af.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_am.ts b/src/translations/desktop/desktop_am.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_am_ET.ts b/src/translations/desktop/desktop_am_ET.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_ar.ts b/src/translations/desktop/desktop_ar.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_ast.ts b/src/translations/desktop/desktop_ast.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_bg.ts b/src/translations/desktop/desktop_bg.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_bn.ts b/src/translations/desktop/desktop_bn.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_ca.ts b/src/translations/desktop/desktop_ca.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_cs.ts b/src/translations/desktop/desktop_cs.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_da.ts b/src/translations/desktop/desktop_da.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_de.ts b/src/translations/desktop/desktop_de.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_de_DE.ts b/src/translations/desktop/desktop_de_DE.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_el.ts b/src/translations/desktop/desktop_el.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_el_GR.ts b/src/translations/desktop/desktop_el_GR.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_en_AU.ts b/src/translations/desktop/desktop_en_AU.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_eo.ts b/src/translations/desktop/desktop_eo.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_es.ts b/src/translations/desktop/desktop_es.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_es_419.ts b/src/translations/desktop/desktop_es_419.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_es_AR.ts b/src/translations/desktop/desktop_es_AR.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_es_CL.ts b/src/translations/desktop/desktop_es_CL.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_es_ES.ts b/src/translations/desktop/desktop_es_ES.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_fa.ts b/src/translations/desktop/desktop_fa.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_fi.ts b/src/translations/desktop/desktop_fi.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_fr.ts b/src/translations/desktop/desktop_fr.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_gl_ES.ts b/src/translations/desktop/desktop_gl_ES.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_he.ts b/src/translations/desktop/desktop_he.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_hi_IN.ts b/src/translations/desktop/desktop_hi_IN.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_hr.ts b/src/translations/desktop/desktop_hr.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_hu.ts b/src/translations/desktop/desktop_hu.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_hy.ts b/src/translations/desktop/desktop_hy.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_id.ts b/src/translations/desktop/desktop_id.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_id_ID.ts b/src/translations/desktop/desktop_id_ID.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_it.ts b/src/translations/desktop/desktop_it.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_ja.ts b/src/translations/desktop/desktop_ja.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_ko.ts b/src/translations/desktop/desktop_ko.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_ky.ts b/src/translations/desktop/desktop_ky.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_lt.ts b/src/translations/desktop/desktop_lt.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_mn.ts b/src/translations/desktop/desktop_mn.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_ms.ts b/src/translations/desktop/desktop_ms.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_nb.ts b/src/translations/desktop/desktop_nb.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_nl.ts b/src/translations/desktop/desktop_nl.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_pam.ts b/src/translations/desktop/desktop_pam.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_pl.ts b/src/translations/desktop/desktop_pl.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_pl_PL.ts b/src/translations/desktop/desktop_pl_PL.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_pt.ts b/src/translations/desktop/desktop_pt.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_pt_BR.ts b/src/translations/desktop/desktop_pt_BR.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_pt_PT.ts b/src/translations/desktop/desktop_pt_PT.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_ro.ts b/src/translations/desktop/desktop_ro.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_ru.ts b/src/translations/desktop/desktop_ru.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_sk.ts b/src/translations/desktop/desktop_sk.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_sl.ts b/src/translations/desktop/desktop_sl.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_sr.ts b/src/translations/desktop/desktop_sr.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_sr_RS.ts b/src/translations/desktop/desktop_sr_RS.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_sv.ts b/src/translations/desktop/desktop_sv.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_tr.ts b/src/translations/desktop/desktop_tr.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_uk.ts b/src/translations/desktop/desktop_uk.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_vi.ts b/src/translations/desktop/desktop_vi.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_zh_CN.ts b/src/translations/desktop/desktop_zh_CN.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_zh_HK.ts b/src/translations/desktop/desktop_zh_HK.ts old mode 100644 new mode 100755 diff --git a/src/translations/desktop/desktop_zh_TW.ts b/src/translations/desktop/desktop_zh_TW.ts old mode 100644 new mode 100755 diff --git a/src/vendor/.gitignore b/src/vendor/.gitignore old mode 100644 new mode 100755 diff --git a/src/vendor/env.pri b/src/vendor/env.pri old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/.gitignore b/src/vendor/src/libxsys/.gitignore old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/.gitrepo b/src/vendor/src/libxsys/.gitrepo old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/Cmd/Cmd.cpp b/src/vendor/src/libxsys/Cmd/Cmd.cpp old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/Cmd/Cmd.h b/src/vendor/src/libxsys/Cmd/Cmd.h old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/Common/Result.cpp b/src/vendor/src/libxsys/Common/Result.cpp old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/Common/Result.h b/src/vendor/src/libxsys/Common/Result.h old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/DiskUtil/DiskUtil.cpp b/src/vendor/src/libxsys/DiskUtil/DiskUtil.cpp old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/DiskUtil/DiskUtil.h b/src/vendor/src/libxsys/DiskUtil/DiskUtil.h old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/DiskUtil/Syslinux.cpp b/src/vendor/src/libxsys/DiskUtil/Syslinux.cpp old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/DiskUtil/Syslinux.h b/src/vendor/src/libxsys/DiskUtil/Syslinux.h old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/FileSystem/FileSystem.cpp b/src/vendor/src/libxsys/FileSystem/FileSystem.cpp old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/FileSystem/FileSystem.h b/src/vendor/src/libxsys/FileSystem/FileSystem.h old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/LICENSE b/src/vendor/src/libxsys/LICENSE old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/README.md b/src/vendor/src/libxsys/README.md old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/XSys b/src/vendor/src/libxsys/XSys old mode 100644 new mode 100755 diff --git a/src/vendor/src/libxsys/libxsys.pro b/src/vendor/src/libxsys/libxsys.pro old mode 100644 new mode 100755