File 0001-designer-Add-command-line-option-refresh-t... of Package mingw32-libqt5-qttools

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-designer-Add-command-line-option-refresh-to-update-f.patch of Package mingw32-libqt5-qttools (Revision 8b1f33e35b7ca4bbedcb909a8c05e210)

Currently displaying revision 8b1f33e35b7ca4bbedcb909a8c05e210 , Show latest

From 53e6a890368f472830c631e2053bbbeb6db2c823 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 4 Feb 2020 15:46:17 +0100
Subject: [PATCH] designer: Add command line option '--refresh' to update
 formatting of ui files

---
 src/designer/src/designer/main.cpp      |  1 +
 src/designer/src/designer/qdesigner.cpp | 18 +++++++++++++++++-
 src/designer/src/designer/qdesigner.h   |  3 ++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/designer/src/designer/main.cpp b/src/designer/src/designer/main.cpp
index 236f2413..593e3a91 100644
--- a/src/designer/src/designer/main.cpp
+++ b/src/designer/src/designer/main.cpp
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
     case QDesigner::ParseArgumentsError:
         return 1;
     case QDesigner::ParseArgumentsHelpRequested:
+    case QDesigner::ParseArgumentsFinish:
         return 0;
     }
     app.setQuitOnLastWindowClosed(false);
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp
index d4b9b755..34df1881 100644
--- a/src/designer/src/designer/qdesigner.cpp
+++ b/src/designer/src/designer/qdesigner.cpp
@@ -32,6 +32,7 @@
 #include "qdesigner_server.h"
 #include "qdesigner_settings.h"
 #include "qdesigner_workbench.h"
+#include "qdesigner_formwindow.h"
 #include "mainwindow.h"
 
 #include <qdesigner_propertysheet_p.h>
@@ -167,6 +168,7 @@ struct Options
     bool server{false};
     quint16 clientPort{0};
     bool enableInternalDynamicProperties{false};
+    bool refresh{false};
 };
 
 static inline QDesigner::ParseArgumentsResult
@@ -195,6 +197,9 @@ static inline QDesigner::ParseArgumentsResult
     parser.addPositionalArgument(QStringLiteral("files"),
                                  QStringLiteral("The UI files to open."));
 
+    const QCommandLineOption refreshOption(QStringLiteral("refresh"),
+                                          QStringLiteral("Update the formatting of the file by overwriting it"));
+    parser.addOption(refreshOption);
     if (!parser.parse(QCoreApplication::arguments())) {
         *errorMessage = parser.errorText();
         return QDesigner::ParseArgumentsError;
@@ -214,6 +219,7 @@ static inline QDesigner::ParseArgumentsResult
     if (parser.isSet(resourceDirOption))
         options->resourceDir = parser.value(resourceDirOption);
     options->enableInternalDynamicProperties = parser.isSet(internalDynamicPropertyOption);
+    options->refresh = parser.isSet(refreshOption);
     options->files = parser.positionalArguments();
     return QDesigner::ParseArgumentsSuccess;
 }
@@ -264,9 +270,19 @@ QDesigner::ParseArgumentsResult QDesigner::parseCommandLineArguments()
             const QFileInfo fi(fileName);
             if (fi.exists() && fi.isRelative())
                 fileName = fi.absoluteFilePath();
-            m_workbench->readInForm(fileName);
+            if (options.refresh) {
+                QString error;
+                QDesignerFormWindow *w = m_workbench->openForm(fileName, &error);
+                m_workbench->writeOutForm(w->editor(), fileName);
+                m_workbench->removeFormWindow(w);
+            } else
+                m_workbench->readInForm(fileName);
         }
     }
+
+    if (options.refresh) {
+        return QDesigner::ParseArgumentsFinish;
+    }
     if ( m_workbench->formWindowCount())
         m_suppressNewFormShow = true;
 
diff --git a/src/designer/src/designer/qdesigner.h b/src/designer/src/designer/qdesigner.h
index fd82b2b9..b8451298 100644
--- a/src/designer/src/designer/qdesigner.h
+++ b/src/designer/src/designer/qdesigner.h
@@ -53,7 +53,8 @@ public:
     enum ParseArgumentsResult {
         ParseArgumentsSuccess,
         ParseArgumentsError,
-        ParseArgumentsHelpRequested
+        ParseArgumentsHelpRequested,
+        ParseArgumentsFinish
     };
 
     QDesigner(int &argc, char **argv);
-- 
2.16.4

Places

File 0001-designer-Add-command-line-option-refresh-to-update-f.patch of Package mingw32-libqt5-qttools (Revision 8b1f33e35b7ca4bbedcb909a8c05e210)

Places