[Pkg-privacy-commits] [mat] 03/09: Fix the segfault when listing supported files
Sascha Steinbiss
sascha at steinbiss.name
Tue Jan 5 20:06:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
sascha-guest pushed a commit to branch master
in repository mat.
commit e702b614c6a121dc9210b8d4a158d2fe2e54af8e
Author: jvoisin <julien.voisin at dustri.org>
Date: Sun Jan 3 19:28:00 2016 +0100
Fix the segfault when listing supported files
This should close https://labs.riseup.net/code/issues/10839
---
data/FORMATS | 1 +
data/mat.glade | 663 +++++++++++++++++++++++++++++----------------------------
libmat/mat.py | 8 +-
mat-gui | 18 +-
4 files changed, 345 insertions(+), 345 deletions(-)
diff --git a/data/FORMATS b/data/FORMATS
index 7945cb8..50a3a92 100644
--- a/data/FORMATS
+++ b/data/FORMATS
@@ -8,6 +8,7 @@
<method>Removal of harmful fields with exiftool.</method>
<remaining>None</remaining>
</format>
+
<format>
<name>Portable Network Graphics</name>
<extension>.png</extension>
diff --git a/data/mat.glade b/data/mat.glade
index bd56f34..f4a23c5 100644
--- a/data/mat.glade
+++ b/data/mat.glade
@@ -20,286 +20,6 @@
<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">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>
- <signal name="delete-event" handler="cb_hide_widget" swapped="no"/>
- <child internal-child="vbox">
- <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="MetadataPopupButtons">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="MetadataPopupOKButton">
- <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">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="MetadataPopupScrolledWindow">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkTreeView" id="MetadataPopupTreeView">
- <property name="can_focus">False</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="MetadataPopupTreeViewName">
- <property name="resizable">True</property>
- <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="MetadataPopupTreeViewNameCell"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <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="MetadataPopupTreeViewContentCell">
- <property name="editable">True</property>
- </object>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">MetadataPopupOKButton</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="SupportedWindow">
- <property name="can_focus">False</property>
- <property name="title" translatable="yes">Supported formats</property>
- <property name="resizable">False</property>
- <property name="modal">True</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>
- <signal name="delete-event" handler="cb_hide_widget" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkBox" id="SupportedWindowVbox">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="supported_action_area">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="supported_OK">
- <property name="label">gtk-ok</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">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="SupportedWindowGrid">
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <child>
- <object class="GtkEntry" id="supported_support">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="editable">False</property>
- <property name="has_frame">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="supported_label_support">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Support</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="supported_label_metadata">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Metadata</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="supported_label_method">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Method</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="supported_label_remaining">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Remaining</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="supported_cbox">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="has_entry">True</property>
- <signal name="changed" handler="cb_update_supported_popup" swapped="no"/>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxtext-entry2">
- <property name="can_focus">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="supported_label_format">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">39</property>
- <property name="label" translatable="yes">Fileformat</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTextView" id="supported_metadata">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <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>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <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>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <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>
@@ -458,90 +178,202 @@
<child>
<object class="GtkToolbar" id="Toolbar">
<property name="can_focus">False</property>
- <property name="toolbar_style">both</property>
- <property name="icon_size">5</property>
- <child>
- <object class="GtkToolButton" id="ToolbarAdd">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Add</property>
- <property name="stock_id">gtk-add</property>
- <signal name="clicked" handler="cb_add_files" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="toolbar_style">both</property>
+ <property name="icon_size">5</property>
+ <child>
+ <object class="GtkToolButton" id="ToolbarAdd">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="stock_id">gtk-add</property>
+ <signal name="clicked" handler="cb_add_files" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="ToolbarClean">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Clean</property>
+ <property name="stock_id">gtk-clear</property>
+ <signal name="clicked" handler="cb_mat_clean" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="ScrolledWindow">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkTreeView" id="MainWindowTreeview">
+ <property name="can_focus">False</property>
+ <property name="events"/>
+ <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="MainWindowTreeviewSelection">
+ <property name="mode">multiple</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="MainWindowTreeviewFilename">
+ <property name="resizable">True</property>
+ <property name="sizing">fixed</property>
+ <property name="title" translatable="yes">Filename</property>
+ <property name="expand">True</property>
+ <property name="clickable">True</property>
+ <property name="sort_indicator">True</property>
+ <property name="sort_column_id">1</property>
+ <child>
+ <object class="GtkCellRendererText" id="MainWindowTreeviewFilenameRender"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="MainWindowTreeviewState">
+ <property name="resizable">True</property>
+ <property name="sizing">fixed</property>
+ <property name="title" translatable="yes">State</property>
+ <property name="expand">True</property>
+ <property name="clickable">True</property>
+ <property name="sort_indicator">True</property>
+ <property name="sort_column_id">2</property>
+ <child>
+ <object class="GtkCellRendererText" id="MainWindowTreeviewStateRenderer"/>
+ <attributes>
+ <attribute name="text">2</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkStatusbar" id="Statusbar">
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkDialog" id="MetadataPopup">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</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="transient_for">MainWindow</property>
+ <signal name="delete-event" handler="cb_hide_widget" swapped="no"/>
+ <child internal-child="vbox">
+ <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="MetadataPopupButtons">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
- <object class="GtkToolButton" id="ToolbarClean">
+ <object class="GtkButton" id="MetadataPopupOKButton">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Clean</property>
- <property name="stock_id">gtk-clear</property>
- <signal name="clicked" handler="cb_mat_clean" swapped="no"/>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</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">1</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="ScrolledWindow">
+ <object class="GtkScrolledWindow" id="MetadataPopupScrolledWindow">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkTreeView" id="MainWindowTreeview">
+ <object class="GtkTreeView" id="MetadataPopupTreeView">
<property name="can_focus">False</property>
- <property name="events"/>
- <property name="model">MainWindowListstore</property>
+ <property name="vexpand">True</property>
+ <property name="model">MetadataPopupListStore</property>
<property name="rules_hint">True</property>
- <property name="search_column">1</property>
+ <property name="search_column">0</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="MainWindowTreeviewSelection">
- <property name="mode">multiple</property>
- </object>
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
</child>
<child>
- <object class="GtkTreeViewColumn" id="MainWindowTreeviewFilename">
+ <object class="GtkTreeViewColumn" id="MetadataPopupTreeViewName">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
- <property name="title" translatable="yes">Filename</property>
+ <property name="title" translatable="yes">Name</property>
<property name="expand">True</property>
- <property name="clickable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">1</property>
+ <property name="sort_column_id">0</property>
<child>
- <object class="GtkCellRendererText" id="MainWindowTreeviewFilenameRender"/>
+ <object class="GtkCellRendererText" id="MetadataPopupTreeViewNameCell"/>
<attributes>
- <attribute name="text">1</attribute>
+ <attribute name="text">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
- <object class="GtkTreeViewColumn" id="MainWindowTreeviewState">
- <property name="resizable">True</property>
+ <object class="GtkTreeViewColumn" id="MetadataPopupTreeViewContent">
<property name="sizing">fixed</property>
- <property name="title" translatable="yes">State</property>
+ <property name="title" translatable="yes">Content</property>
<property name="expand">True</property>
- <property name="clickable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">2</property>
+ <property name="sort_column_id">1</property>
<child>
- <object class="GtkCellRendererText" id="MainWindowTreeviewStateRenderer"/>
+ <object class="GtkCellRendererText" id="MetadataPopupTreeViewContentCell">
+ <property name="editable">True</property>
+ </object>
<attributes>
- <attribute name="text">2</attribute>
+ <attribute name="text">1</attribute>
</attributes>
</child>
</object>
@@ -550,22 +382,193 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">MetadataPopupOKButton</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="SupportedWindow">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Supported formats</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="type_hint">normal</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="transient_for">MainWindow</property>
+ <signal name="delete-event" handler="cb_hide_widget" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="SupportedWindowVbox">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="supported_action_area">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="supported_OK">
+ <property name="label">gtk-ok</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">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkStatusbar" id="Statusbar">
+ <object class="GtkGrid" id="SupportedWindowGrid">
<property name="can_focus">False</property>
+ <property name="row_spacing">5</property>
+ <child>
+ <object class="GtkEntry" id="supported_support">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="editable">False</property>
+ <property name="has_frame">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="supported_label_support">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Support</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="supported_label_metadata">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Metadata</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="supported_label_method">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Method</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="supported_label_remaining">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Remaining</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="supported_cbox">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="has_entry">True</property>
+ <signal name="changed" handler="cb_update_supported_popup" swapped="no"/>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxtext-entry2">
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="supported_label_format">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">39</property>
+ <property name="label" translatable="yes">Fileformat</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTextView" id="supported_metadata">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">word</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <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>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <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>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
</child>
+ <action-widgets>
+ <action-widget response="0">supported_OK</action-widget>
+ </action-widgets>
</object>
</interface>
diff --git a/libmat/mat.py b/libmat/mat.py
index 6ac1dc7..f0539f8 100644
--- a/libmat/mat.py
+++ b/libmat/mat.py
@@ -17,13 +17,7 @@ __author__ = 'jvoisin'
# Silence
LOGGING_LEVEL = logging.ERROR
-fname = ''
-
-# Verbose
-# LOGGING_LEVEL = logging.DEBUG
-# logname = 'report.log'
-
-logging.basicConfig(filename=fname, level=LOGGING_LEVEL)
+logging.basicConfig(filename='', level=LOGGING_LEVEL)
import strippers # this is loaded here because we need LOGGING_LEVEL
diff --git a/mat-gui b/mat-gui
index cd03345..3037021 100755
--- a/mat-gui
+++ b/mat-gui
@@ -80,10 +80,11 @@ class GUI(object):
xml_parser.parse(xmlfile)
supported_cbox = self.builder.get_object('supported_cbox')
- store = Gtk.ListStore(int, str)
+ store = Gtk.ListStore(GObject.TYPE_INT, GObject.TYPE_STRING)
for i, j in enumerate(self.supported_dict.list):
store.append([i, j['name']])
supported_cbox.set_model(store)
+ supported_cbox.set_entry_text_column(1)
supported_cbox.set_active(0)
self.builder.get_object('supported_metadata').set_buffer(Gtk.TextBuffer())
@@ -160,15 +161,15 @@ class GUI(object):
""" Popup that display on double-click
metadata from a file
"""
- metadatapopupliststore = self.builder.get_object('MetadataPopupListStore')
- metadatapopupliststore.clear()
+ metadataPopupListStore = self.builder.get_object('metadataPopupListStore')
+ metadataPopupListStore.clear()
if self.liststore[row][0].file.is_clean():
self.liststore[row][2] = _('Clean')
- metadatapopupliststore.append([_('No metadata found'), ''])
+ metadataPopupListStore.append([_('No metadata found'), ''])
else:
self.liststore[row][2] = _('Dirty')
for i, j in self.liststore[row][0].file.get_meta().iteritems():
- metadatapopupliststore.append([i, j])
+ metadataPopupListStore.append([i, j])
popup_metadata = self.builder.get_object('MetadataPopup')
title = self.liststore[row][0].file.basename
@@ -190,6 +191,7 @@ class GUI(object):
w.set_website('https://mat.boum.org')
w.set_website_label(_('Website'))
w.set_position(Gtk.WindowPosition.CENTER)
+ w.set_transient_for(self.window)
w.run()
w.destroy()
@@ -345,10 +347,10 @@ non-anonymised) file to output archive'))
vbox.pack_start(treeview, True, True, 0)
# Create columns
- renderertext = Gtk.CellRendererText()
- column = Gtk.TreeViewColumn(_('Filename'), renderertext, text=0)
+ rendererText = Gtk.CellRendererText()
+ column = Gtk.TreeViewColumn(_('Filename'), rendererText, text=0)
treeview.append_column(column)
- column = Gtk.TreeViewColumn(_('Reason'), renderertext, text=1)
+ column = Gtk.TreeViewColumn(_('Reason'), rendererText, text=1)
treeview.append_column(column)
dialog.show_all()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/mat.git
More information about the Pkg-privacy-commits
mailing list