Release 2.0.3.1

Change-Id: I460c99539ae02594338df220f584ec2e622027f3
linuxdeepin · Oct 26, 2017 · ce19fd1 · ce19fd1
1 parent 2f4b2e3
commit ce19fd1
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/.clog.toml b/.clog.toml
@@ -0,0 +1,5 @@
+[clog]
+repository = "https://github.com/linuxdeepin/deepin-boot-maker"
+from-latest-tag = true
+
+changelog = "CHANGELOG.md"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,17 @@
+<a name="2.0.3.1"></a>
+## 2.0.3.1 (2017-10-25)
+
+
+#### Features
+
+*   hidpi support ([2f4b2e3b](https://github.com/linuxdeepin/deepin-boot-maker/commit/2f4b2e3b8fe580a364b32c56b3e3151631729d6d))
+*   use DPageIndicator ([8b60da94](https://github.com/linuxdeepin/deepin-boot-maker/commit/8b60da946dbfc1a368c49f59eb6f4f558179d182))
+*   use Dtk::Widget::DWaterProgress as progress bar ([fcbab6f1](https://github.com/linuxdeepin/deepin-boot-maker/commit/fcbab6f19c71fdf363a433eee9b1fdbc3641b26e))
+
+#### Bug Fixes
+
+*   remove self draw checkbox ([f746286d](https://github.com/linuxdeepin/deepin-boot-maker/commit/f746286d4bf969826644c77636d7ebde4a689b8b))
+*   correct windows build depends path ([2c633237](https://github.com/linuxdeepin/deepin-boot-maker/commit/2c6332378f3ec769ace7419f1714a30e356dba3e))
+
+
+
diff --git a/src/app/bmwindow.cpp b/src/app/bmwindow.cpp
@@ -118,7 +118,7 @@ BMWindow::BMWindow(QWidget *parent)
     QString acknowledgementLink = "https://www.deepin.org/acknowledgments/deepin-boot-maker#thanks";
     qApp->setProductName(tr("Deepin Boot Maker"));
     qApp->setApplicationAcknowledgementPage(acknowledgementLink);
-    qApp->setProductIcon(QIcon(":/theme/light/image/deepin-boot-maker.svg").pixmap(96, 96));
+    qApp->setProductIcon(QIcon(":/theme/light/image/deepin-boot-maker.svg"));
     qApp->setApplicationDescription(descriptionText);
 
     auto title = titlebar();

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -44,17 +44,18 @@ DCORE_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
 
 #ifdef Q_OS_MAC
-static bool switchToRoot(QApplication &app) {
+static bool switchToRoot(QApplication &app)
+{
     QStringList allappargs = app.arguments();
     QProcess whoamip;
     whoamip.start("whoami");
     whoamip.waitForFinished();
 
-    if(QString(whoamip.readAll()).remove("\r").remove("\n") != "root") {
+    if (QString(whoamip.readAll()).remove("\r").remove("\n") != "root") {
         QString argsconc = "";
         QString argsconcSingleQuote = "";
 
-        for(int i = 1; i < allappargs.size(); ++i) {
+        for (int i = 1; i < allappargs.size(); ++i) {
             argsconc += QString("\"%1\" ").arg(allappargs.at(i));
             argsconcSingleQuote += QString("'%1' ").arg(allappargs.at(i));
         }
@@ -82,14 +83,17 @@ int main(int argc, char **argv)
     DApplication::loadDXcbPlugin();
 
     DApplication app(argc, argv);
+    app.setAttribute(Qt::AA_UseHighDpiPixmaps);
+    app.setAttribute(Qt::AA_EnableHighDpiScaling);
     app.setOrganizationName("deepin");
     app.setApplicationName("deepin-boot-maker");
     app.setApplicationVersion("2.0.0");
     app.setTheme("light");
 
 #ifdef Q_OS_MAC
-    if(switchToRoot(app))
+    if (switchToRoot(app)) {
         exit(0);
+    }
 #endif
 
     const QString m_format = "%{time}{yyyyMMdd.HH:mm:ss.zzz}[%{type:1}][%{function:-40} %{line:-4} %{threadid:-8} ] %{message}\n";
@@ -138,7 +142,7 @@ void loadFonts()
     preferList.append("SimHei");
     preferList.append("黑体");
 
-    foreach(QString font, preferList) {
+    foreach (QString font, preferList) {
         if (fontlist.contains(font)) {
             QFont newFont = QFont(font);
             qApp->setFont(newFont);

diff --git a/src/app/view/resource/resource.qrc b/src/app/view/resource/resource.qrc
@@ -22,6 +22,5 @@
         <file>theme/light/image/deepin-boot-maker.svg</file>
         <file>theme/light/image/dash.svg</file>
         <file>theme/light/image/deepin-boot-maker.ico</file>
-        <file>theme/light/image/deepin-boot-maker.svg</file>
     </qresource>
 </RCC>