From 66b1a62fa433183471861d650459827b381dbcd8 Mon Sep 17 00:00:00 2001
From: Martin Kleusberg <mkleusberg@gmail.com>
Date: Sun, 17 Mar 2013 13:02:49 +0100
Subject: [PATCH] Better image file handling in EditDialog

Put the image editor into a scrollarea so the dialog doesn't screw up
when importing a large image file.

When importing a file add a filter to the file dialog to only show image
files.
---
 src/EditDialog.cpp |  8 +++++++-
 src/EditDialog.ui  | 25 ++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/EditDialog.cpp b/src/EditDialog.cpp
index 70ab4050..4e5d3a90 100644
--- a/src/EditDialog.cpp
+++ b/src/EditDialog.cpp
@@ -59,11 +59,17 @@ void EditDialog::loadText(const QByteArray& data, int row, int col)
 
 void EditDialog::importData()
 {
+    // Get list of supported image file formats to include them in the file dialog filter
+    QString image_formats;
+    QList<QByteArray> image_formats_list = QImageReader::supportedImageFormats();
+    for(int i=0;i<image_formats_list.size();++i)
+        image_formats.append(QString("*.%1 ").arg(QString::fromUtf8(image_formats_list.at(i))));
+
     QString fileName = QFileDialog::getOpenFileName(
                 this,
                 tr("Choose a file"),
                 defaultlocation,
-                tr("Text files(*.txt);;All files(*)"));
+                tr("Text files(*.txt);;Image files(%1);;All files(*)").arg(image_formats));
     if(QFile::exists(fileName))
     {
         QFile file(fileName);
diff --git a/src/EditDialog.ui b/src/EditDialog.ui
index ce50b9b1..1855e9a9 100644
--- a/src/EditDialog.ui
+++ b/src/EditDialog.ui
@@ -95,7 +95,30 @@
       </property>
      </widget>
      <widget class="QWidget" name="editorBinary"/>
-     <widget class="QLabel" name="editorImage"/>
+     <widget class="QScrollArea" name="editorImageScrollArea">
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="scrollAreaWidgetContents">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>358</width>
+         <height>267</height>
+        </rect>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QLabel" name="editorImage">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
     </widget>
    </item>
    <item>