From 63e5a4dd1cf187fe6b62bd0da60529746f2ff7a1 Mon Sep 17 00:00:00 2001
From: Nikolaj Schlej <schlej@live.de>
Date: Thu, 13 Aug 2015 20:28:10 +0200
Subject: [PATCH] UT 0.20.7

- added "Open in new window..." action
---
 uefitool.cpp      | 20 +++++++++++++++++---
 uefitool.h        |  4 ++++
 uefitool.ui       | 12 ++++++++++++
 uefitool_main.cpp |  1 +
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/uefitool.cpp b/uefitool.cpp
index 4ff8781..14b2e56 100644
--- a/uefitool.cpp
+++ b/uefitool.cpp
@@ -17,7 +17,7 @@
 UEFITool::UEFITool(QWidget *parent) :
 QMainWindow(parent),
 ui(new Ui::UEFITool), 
-version(tr("0.20.6"))
+version(tr("0.20.7"))
 {
     clipboard = QApplication::clipboard();
 
@@ -31,6 +31,7 @@ version(tr("0.20.6"))
 
     // Connect signals to slots
     connect(ui->actionOpenImageFile, SIGNAL(triggered()), this, SLOT(openImageFile()));
+    connect(ui->actionOpenImageFileInNewWindow, SIGNAL(triggered()), this, SLOT(openImageFileInNewWindow()));
     connect(ui->actionSaveImageFile, SIGNAL(triggered()), this, SLOT(saveImageFile()));
     connect(ui->actionSearch, SIGNAL(triggered()), this, SLOT(search()));
     connect(ui->actionExtract, SIGNAL(triggered()), this, SLOT(extractAsIs()));
@@ -83,6 +84,11 @@ UEFITool::~UEFITool()
     delete searchDialog;
 }
 
+void UEFITool::setProgramPath(QString path)
+{ 
+    currentProgramPath = path; 
+};
+
 void UEFITool::init()
 {
     // Clear components
@@ -358,6 +364,8 @@ void UEFITool::replace(const UINT8 mode)
                 path = QFileDialog::getOpenFileName(this, tr("Select volume file to replace body"), currentDir, "Volume files (*.vol *.bin);;All files (*)");
             else if (model->subtype(index) == EFI_SECTION_RAW)
                 path = QFileDialog::getOpenFileName(this, tr("Select raw file to replace body"), currentDir, "Raw files (*.raw *.bin);;All files (*)");
+            else if (model->subtype(index) == EFI_SECTION_PE32 || model->subtype(index) == EFI_SECTION_TE || model->subtype(index) == EFI_SECTION_PIC)
+                path = QFileDialog::getOpenFileName(this, tr("Select EFI executable file to replace body"), currentDir, "EFI executable files (*.efi *.dxe *.pei *.bin);;All files (*)");
             else
                 path = QFileDialog::getOpenFileName(this, tr("Select file to replace body"), currentDir, "Binary files (*.bin);;All files (*)");
         }
@@ -521,7 +529,7 @@ void UEFITool::exit()
 
 void UEFITool::saveImageFile()
 {
-    QString path = QFileDialog::getSaveFileName(this, tr("Save BIOS image file"), currentDir, "BIOS image files (*.rom *.bin *.cap *.bio *.fd *.wph *.efi *.dec);;All files (*)");
+    QString path = QFileDialog::getSaveFileName(this, tr("Save BIOS image file"), currentDir, "BIOS image files (*.rom *.bin *.cap *.bio *.fd *.wph *.dec);;All files (*)");
 
     if (path.isEmpty())
         return;
@@ -552,10 +560,16 @@ void UEFITool::saveImageFile()
 
 void UEFITool::openImageFile()
 {
-    QString path = QFileDialog::getOpenFileName(this, tr("Open BIOS image file"), currentDir, "BIOS image files (*.rom *.bin *.cap *.bio *.fd *.wph *.efi *.dec);;All files (*)");
+    QString path = QFileDialog::getOpenFileName(this, tr("Open BIOS image file"), currentDir, "BIOS image files (*.rom *.bin *.cap *.bio *.fd *.wph *.dec);;All files (*)");
     openImageFile(path);
 }
 
+void UEFITool::openImageFileInNewWindow()
+{
+    QString path = QFileDialog::getOpenFileName(this, tr("Open BIOS image file in new window"), currentDir, "BIOS image files (*.rom *.bin *.cap *.bio *.fd *.wph *.dec);;All files (*)");
+    QProcess::startDetached(currentProgramPath, QStringList(path));
+}
+
 void UEFITool::openImageFile(QString path)
 {
     if (path.trimmed().isEmpty())
diff --git a/uefitool.h b/uefitool.h
index dda7fdc..edac83b 100644
--- a/uefitool.h
+++ b/uefitool.h
@@ -27,6 +27,7 @@
 #include <QMessageBox>
 #include <QMimeData>
 #include <QPlainTextEdit>
+#include <QProcess>
 #include <QSettings>
 #include <QSplitter>
 #include <QString>
@@ -51,6 +52,7 @@ public:
     ~UEFITool();
 
     void openImageFile(QString path);
+    void setProgramPath(QString path);
 
     private slots:
     void init();
@@ -58,6 +60,7 @@ public:
     void scrollTreeView(QListWidgetItem* item);
 
     void openImageFile();
+    void openImageFileInNewWindow();
     void saveImageFile();
     void search();
 
@@ -95,6 +98,7 @@ private:
     SearchDialog* searchDialog;
     QClipboard* clipboard;
     QString currentDir;
+    QString currentProgramPath;
     QQueue<MessageListItem> messageItems;
     const QString version;
 
diff --git a/uefitool.ui b/uefitool.ui
index 82868da..5b5953a 100644
--- a/uefitool.ui
+++ b/uefitool.ui
@@ -188,6 +188,7 @@
      <string>&amp;File</string>
     </property>
     <addaction name="actionOpenImageFile"/>
+    <addaction name="actionOpenImageFileInNewWindow"/>
     <addaction name="actionSaveImageFile"/>
     <addaction name="separator"/>
     <addaction name="actionSearch"/>
@@ -522,6 +523,17 @@
     <string>Ctrl+Alt+C</string>
    </property>
   </action>
+  <action name="actionOpenImageFileInNewWindow">
+   <property name="text">
+    <string>&amp;Open image file in new window...</string>
+   </property>
+   <property name="toolTip">
+    <string>Open image file in new window</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+O</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
diff --git a/uefitool_main.cpp b/uefitool_main.cpp
index e5764c0..a9ac03a 100644
--- a/uefitool_main.cpp
+++ b/uefitool_main.cpp
@@ -23,6 +23,7 @@ int main(int argc, char *argv[])
     a.setApplicationName("UEFITool");
 
     UEFITool w;
+    w.setProgramPath(a.arguments().at(0));
     if (a.arguments().length() > 1)
         w.openImageFile(a.arguments().at(1));
     w.show();