2 files changed, 116 insertions, 25 deletions

diff --git a/data/mat.ui b/data/mat.ui
index d8a52fd..8e96efe 100644
--- a/data/mat.ui
+++ b/data/mat.ui
@@ -315,6 +315,111 @@
       </object>
     </child>
   </object>
+  <object class="GtkListStore" id="MetadataPopupListStore">
+    <columns>
+      <!-- column-name Name -->
+      <column type="gchararray"/>
+      <!-- column-name Content -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkDialog" id="MetadataPopup">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Metadatas</property>
+    <property name="default_width">520</property>
+    <property name="default_height">260</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="deletable">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox2">
+        <property name="can_focus">False</property>
+        <property name="vexpand">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="metadata_buttons">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="metadata_ok_button">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkTreeView" id="MetadataPopupTreeView">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="model">MetadataPopupListStore</property>
+            <property name="rules_hint">True</property>
+            <property name="search_column">0</property>
+            <property name="fixed_height_mode">True</property>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="treeview-selection2"/>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="Name">
+                <property name="sizing">fixed</property>
+                <property name="title" translatable="yes">Name</property>
+                <property name="expand">True</property>
+                <property name="sort_column_id">0</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                  <attributes>
+                    <attribute name="text">0</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="Content">
+                <property name="sizing">fixed</property>
+                <property name="title" translatable="yes">Content</property>
+                <property name="expand">True</property>
+                <property name="sort_column_id">1</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">metadata_ok_button</action-widget>
+    </action-widgets>
+  </object>
   <object class="GtkDialog" id="SupportedWindow">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Supported formats</property>
diff --git a/mat-gui b/mat-gui
index 63aa735..aefe72a 100755
--- a/mat-gui
+++ b/mat-gui
@@ -153,36 +153,22 @@ class GUI(object):
             Popup that display on double-clic
             metadata from a file
         '''
-        label = _('<b>%s</b>\'s metadatas:\n') % self.liststore[row][1]
-        meta = ''
+        MetadataPopupListStore = self.builder.get_object('MetadataPopupListStore')
+        MetadataPopupListStore.clear()
         if self.liststore[row][0].file.is_clean():
-            meta = _('No metadata found')
+            MetadataPopupListStore.append([_('No metadata found'), ''])
             self.liststore[row][2] = _('Clean')
         else:
             self.liststore[row][2] = _('Dirty')
-            iterator = self.liststore[row][0].file.get_meta().iteritems()
-            for i, j in iterator:
-                name = '-<b>' + str(i) + '</b>: '
-                meta += (name + str(j) + '\n')
+            for i, j in self.liststore[row][0].file.get_meta().iteritems():
+                MetadataPopupListStore.append([i, j])
 
-        w = Gtk.MessageDialog(self.window,
-            Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
-            Gtk.MessageType.INFO, Gtk.ButtonsType.CLOSE, label)
-        w.set_resizable(True)
-        w.set_size_request(400, 300)
-        scrolled_window = Gtk.ScrolledWindow()
-        scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
-        w.vbox.pack_start(scrolled_window, True, True, 0)
-        content = Gtk.Label(label=meta)
-        content.set_selectable(True)
-        content.set_alignment(0, 0)
-        content.set_use_markup(True)
-        scrolled_window.add_with_viewport(content)
-        w.set_markup(label)
-        w.show_all()
-        click = w.run()
-        if click:
-            w.destroy()
+        popup_metadata = self.builder.get_object('MetadataPopup')
+        popup_metadata.set_title(_("%s's metadata") % self.liststore[row][0].file.basename)
+        popup_metadata.show_all()
+        click = popup_metadata.run()
+        if not click:  # Close
+            popup_metadata.hide()
 
     def cb_about_popup(self, button):
         ''' About popup '''