2 files changed, 75 insertions, 89 deletions

diff --git a/data/mat.ui b/data/mat.ui
index 5ed4e7e..c0f66f5 100644
--- a/data/mat.ui
+++ b/data/mat.ui
@@ -1,7 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkListStore" id="Liststore">
+  <object class="GtkImage" id="GtkProperties">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-properties</property>
+  </object>
+  <object class="GtkImage" id="GtkRemove">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="xpad">1</property>
+    <property name="stock">gtk-remove</property>
+  </object>
+  <object class="GtkImage" id="GtkAbout">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-about</property>
+  </object>
+  <object class="GtkImage" id="GtkClear">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-clear</property>
+  </object>
+  <object class="GtkImage" id="GtkFind">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-find</property>
+  </object>
+  <object class="GtkImage" id="GtkInfo">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-info</property>
+  </object>
+  <object class="GtkListStore" id="MainWindowListstore">
     <columns>
       <!-- column-name Obj -->
       <column type="PyObject"/>
@@ -20,17 +51,14 @@
     <property name="default_height">400</property>
     <signal name="destroy" handler="cb_close_application" swapped="no"/>
     <child>
-      <object class="GtkBox" id="MainVBox">
-        <property name="visible">True</property>
+      <object class="GtkBox" id="MainWinfowVBox">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="Menubar">
-            <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="File">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_File</property>
                 <property name="use_underline">True</property>
@@ -79,7 +107,7 @@
                         <property name="label" translatable="yes">Preferences</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="image">image2</property>
+                        <property name="image">GtkProperties</property>
                         <property name="use_stock">False</property>
                         <accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="cb_preferences_popup" swapped="no"/>
@@ -90,7 +118,7 @@
                         <property name="label" translatable="yes">Clear</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="image">image1</property>
+                        <property name="image">GtkRemove</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="cb_clear_list" swapped="no"/>
                       </object>
@@ -114,7 +142,7 @@
                         <property name="label">Clean</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="image">image3</property>
+                        <property name="image">GtkClear</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="cb_mat_clean" swapped="no"/>
                       </object>
@@ -124,7 +152,7 @@
                         <property name="label">Check</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="image">image4</property>
+                        <property name="image">GtkFind</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="cb_mat_check" swapped="no"/>
                       </object>
@@ -148,7 +176,7 @@
                         <property name="label">Supported formats</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="image">image5</property>
+                        <property name="image">GtkInfo</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="cb_supported_popup" swapped="no"/>
                       </object>
@@ -158,7 +186,7 @@
                         <property name="label">About</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="image">image6</property>
+                        <property name="image">GtkAbout</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="cb_about_popup" swapped="no"/>
                       </object>
@@ -180,7 +208,7 @@
             <property name="toolbar_style">both</property>
             <property name="icon_size">5</property>
             <child>
-              <object class="GtkToolButton" id="add">
+              <object class="GtkToolButton" id="ToolbarAdd">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Add</property>
@@ -193,7 +221,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="clean">
+              <object class="GtkToolButton" id="ToolbarClean">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Clean</property>
@@ -206,7 +234,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="check">
+              <object class="GtkToolButton" id="ToolbarCheck">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Check</property>
@@ -219,7 +247,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="clear">
+              <object class="GtkToolButton" id="ToolbarClear">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Clear</property>
@@ -240,27 +268,24 @@
         </child>
         <child>
           <object class="GtkScrolledWindow" id="ScrolledWindow">
-            <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkTreeView" id="Treeview">
-                <property name="can_focus">True</property>
+              <object class="GtkTreeView" id="MainWindowTreeview">
+                <property name="can_focus">False</property>
                 <property name="events"/>
-                <property name="hexpand">True</property>
-                <property name="model">Liststore</property>
+                <property name="model">MainWindowListstore</property>
                 <property name="rules_hint">True</property>
                 <property name="search_column">1</property>
                 <property name="fixed_height_mode">True</property>
-                <property name="rubber_banding">True</property>
                 <signal name="drag-data-received" handler="cb_drag_data_received" swapped="no"/>
                 <signal name="row-activated" handler="cb_popup_metadata" swapped="no"/>
                 <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection1">
+                  <object class="GtkTreeSelection" id="MainWindowTreeviewSelection">
                     <property name="mode">multiple</property>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkTreeViewColumn" id="tvc-filename">
+                  <object class="GtkTreeViewColumn" id="MainWindowTreeviewFilename">
                     <property name="resizable">True</property>
                     <property name="sizing">fixed</property>
                     <property name="title" translatable="yes">Filename</property>
@@ -269,7 +294,7 @@
                     <property name="sort_indicator">True</property>
                     <property name="sort_column_id">1</property>
                     <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext_filename"/>
+                      <object class="GtkCellRendererText" id="MainWindowTreeviewFilenameRender"/>
                       <attributes>
                         <attribute name="text">1</attribute>
                       </attributes>
@@ -277,7 +302,7 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkTreeViewColumn" id="tvc_state">
+                  <object class="GtkTreeViewColumn" id="MainWindowTreeviewState">
                     <property name="resizable">True</property>
                     <property name="sizing">fixed</property>
                     <property name="title" translatable="yes">State</property>
@@ -286,7 +311,7 @@
                     <property name="sort_indicator">True</property>
                     <property name="sort_column_id">4</property>
                     <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext_state"/>
+                      <object class="GtkCellRendererText" id="MainWindowTreeviewStateRenderer"/>
                       <attributes>
                         <attribute name="text">2</attribute>
                       </attributes>
@@ -304,7 +329,6 @@
         </child>
         <child>
           <object class="GtkStatusbar" id="Statusbar">
-            <property name="visible">True</property>
             <property name="can_focus">False</property>
           </object>
           <packing>
@@ -316,38 +340,29 @@
       </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="title" translatable="yes">Metadata</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>
     <signal name="delete-event" handler="cb_hide_widget" swapped="no"/>
     <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox2">
+      <object class="GtkBox" id="MetadataPopupVbox">
         <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">
+          <object class="GtkButtonBox" id="MetadataPopupButtons">
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="metadata_ok_button">
+              <object class="GtkButton" id="MetadataPopupOKButton">
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -370,25 +385,23 @@
         </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"/>
+              <object class="GtkTreeSelection" id="MetadataPopupTreeViewSelection"/>
             </child>
             <child>
-              <object class="GtkTreeViewColumn" id="Name">
+              <object class="GtkTreeViewColumn" id="MetadataPopupTreeViewName">
                 <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"/>
+                  <object class="GtkCellRendererText" id="MetadataPopupTreeViewNameCell"/>
                   <attributes>
                     <attribute name="text">0</attribute>
                   </attributes>
@@ -396,13 +409,13 @@
               </object>
             </child>
             <child>
-              <object class="GtkTreeViewColumn" id="Content">
+              <object class="GtkTreeViewColumn" id="MetadataPopupTreeViewContent">
                 <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"/>
+                  <object class="GtkCellRendererText" id="MetadataPopupTreeViewContentCell"/>
                   <attributes>
                     <attribute name="text">1</attribute>
                   </attributes>
@@ -419,9 +432,17 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">metadata_ok_button</action-widget>
+      <action-widget response="0">MetadataPopupOKButton</action-widget>
     </action-widgets>
   </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="SupportedWindow">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Supported formats</property>
@@ -431,15 +452,14 @@
     <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>
     <property name="has_resize_grip">False</property>
     <signal name="delete-event" handler="cb_hide_widget" swapped="no"/>
     <child internal-child="vbox">
-      <object class="GtkBox" id="supported_vbox">
+      <object class="GtkBox" id="SupportedWindowVbox">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkGrid" id="supported_grid">
+          <object class="GtkGrid" id="SupportedWindowGrid">
             <property name="can_focus">False</property>
             <property name="row_spacing">5</property>
             <child>
@@ -448,7 +468,6 @@
                 <property name="can_focus">False</property>
                 <property name="editable">False</property>
                 <property name="has_frame">False</property>
-                <property name="invisible_char">●</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -459,7 +478,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="supported_label_support">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Support</property>
               </object>
@@ -511,7 +529,6 @@
             </child>
             <child>
               <object class="GtkComboBoxText" id="supported_cbox">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">5</property>
                 <property name="has_entry">True</property>
@@ -549,7 +566,6 @@
               <object class="GtkTextView" id="supported_metadata">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="hscroll_policy">natural</property>
                 <property name="editable">False</property>
                 <property name="wrap_mode">word</property>
               </object>
@@ -564,6 +580,7 @@
               <object class="GtkTextView" id="supported_remaining">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="editable">False</property>
                 <property name="wrap_mode">word</property>
               </object>
               <packing>
@@ -577,6 +594,7 @@
               <object class="GtkTextView" id="supported_method">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="editable">False</property>
                 <property name="wrap_mode">word</property>
               </object>
               <packing>
@@ -600,7 +618,6 @@
             <child>
               <object class="GtkButton" id="supported_OK">
                 <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>
@@ -625,35 +642,4 @@
       <action-widget response="0">supported_OK</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="xpad">1</property>
-    <property name="stock">gtk-remove</property>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-properties</property>
-  </object>
-  <object class="GtkImage" id="image3">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-clear</property>
-  </object>
-  <object class="GtkImage" id="image4">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-find</property>
-  </object>
-  <object class="GtkImage" id="image5">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-info</property>
-  </object>
-  <object class="GtkImage" id="image6">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-about</property>
-  </object>
 </interface>
diff --git a/mat-gui b/mat-gui
index e4f36ea..d0bf606 100755
--- a/mat-gui
+++ b/mat-gui
@@ -52,14 +52,14 @@ class GUI(object):
 
         self.window = self.builder.get_object('MainWindow')
         self.window.set_icon(icon)
-        self.liststore = self.builder.get_object('Liststore')
+        self.liststore = self.builder.get_object('MainWindowListstore')
         ''' The Liststore contains:
                 0: The CFile instance that represents the file
                 1: The file's name
                 2: The file's state (Localised string)
         '''
 
-        self.treeview = self.builder.get_object('Treeview')
+        self.treeview = self.builder.get_object('MainWindowTreeview')
 
         self.statusbar = self.builder.get_object('Statusbar')
         self.statusbar.push(1, _('Ready'))