Removed Removed

2008-12-03  Carlos Garcia Campos  <carlosgc@gnome.org>

	* configure.ac:
	* data/Makefile.am:
	* data/evince-password.glade: Removed
	* data/evince-properties.glade: Removed
	* properties/ev-properties-view.c:
	(ev_properties_view_class_init), (set_property),
	(ev_properties_view_set_info), (ev_properties_view_init):
	* shell/ev-properties-fonts.c: (ev_properties_fonts_dispose),
	(font_cell_data_func), (ev_properties_fonts_init):

	Remove Glade dependency.

svn path=/trunk/; revision=3289

diff --git a/ChangeLog b/ChangeLog
index 260bc4114c84e53976c4cd6018e2752c4c43bd14..87e6cf43b3fd9fc4d3b11b4ade43e470e77263cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-12-03  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * configure.ac:
+       * data/Makefile.am:
+       * data/evince-password.glade: Removed
+       * data/evince-properties.glade: Removed
+       * properties/ev-properties-view.c:
+       (ev_properties_view_class_init), (set_property),
+       (ev_properties_view_set_info), (ev_properties_view_init):
+       * shell/ev-properties-fonts.c: (ev_properties_fonts_dispose),
+       (font_cell_data_func), (ev_properties_fonts_init):
+
+       Remove Glade dependency.
+       
 2008-12-03  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * backend/comics/comics-document.c: (comics_document_load):

diff --git a/configure.ac b/configure.ac
index 87b14947963cd8b22ed1bf0858d92fb9cb40f062..b70875bfdd0594c08dde7feecee2651d63379c11 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -54,8 +54,8 @@ LIBXML_REQUIRED=2.5.0
 
 PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED)
-PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
-PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0 libglade-2.0 gconf-2.0)
+PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0 gconf-2.0)
 
 PKG_CHECK_MODULES(SMCLIENT, gtk+-2.0 gthread-2.0)
 AC_SUBST(SMCLIENT_CFLAGS)

diff --git a/data/Makefile.am b/data/Makefile.am
index ad42ab78fbcd1563931904296acd8dc8476e9616..9df94a971bcc07a8a63163f27f802f74ebb7a3f6 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,16 +21,6 @@ ui_DATA =                            \
        hand-open.png                   \
        $(NULL)
 
-#
-# Glade
-#
-
-gladedir = $(pkgdatadir)
-glade_DATA =                           \
-       evince-password.glade           \
-       evince-properties.glade         \
-       $(NULL)
-
 #
 # Desktop file
 #
@@ -102,7 +92,6 @@ update-icon-cache:
 #
 
 EXTRA_DIST =                           \
-       $(glade_DATA)                   \
        $(ui_DATA)                      \
        $(DESKTOP_IN_FILES)             \
        $(schema_in_files)              \

diff --git a/data/evince-password.glade b/data/evince-password.glade
deleted file mode 100644 (file)
index 7eab071..0000000
--- a/data/evince-password.glade
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="password_dialog">
-  <property name="border_width">6</property>
-  <property name="title" translatable="yes"></property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
-
-      <child internal-child="action_area">
-       <widget class="GtkHButtonBox" id="dialog-action_area1">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-         <child>
-           <widget class="GtkButton" id="cancelbutton1">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-cancel</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">-6</property>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="ok_button">
-             <property name="visible">True</property>
-             <property name="sensitive">False</property>
-             <property name="can_default">True</property>
-             <property name="has_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-ok</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">-5</property>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-         <property name="pack_type">GTK_PACK_END</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkHBox" id="hbox-contents">
-         <property name="border_width">6</property>
-         <property name="visible">True</property>
-         <property name="homogeneous">False</property>
-         <property name="spacing">12</property>
-
-         <child>
-           <widget class="GtkImage" id="image1">
-             <property name="visible">True</property>
-             <property name="stock">gtk-dialog-authentication</property>
-             <property name="icon_size">6</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-           </widget>
-           <packing>
-             <property name="padding">0</property>
-             <property name="expand">False</property>
-             <property name="fill">True</property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkVBox" id="vbox1">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">12</property>
-
-             <child>
-               <widget class="GtkLabel" id="password_label">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="no">Test password label</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">True</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">True</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0</property>
-                 <property name="yalign">0</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkHBox" id="hbox2">
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">3</property>
-
-                 <child>
-                   <widget class="GtkLabel" id="label2">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Password:</property>
-                     <property name="use_underline">True</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="mnemonic_widget">password_entry</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkEntry" id="password_entry">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="editable">True</property>
-                     <property name="visibility">False</property>
-                     <property name="max_length">0</property>
-                     <property name="text" translatable="yes"></property>
-                     <property name="has_frame">True</property>
-                     <property name="activates_default">True</property>
-                     <accessibility>
-                       <atkproperty name="AtkObject::accessible_name" translatable="yes">Password Entry</atkproperty>
-                     </accessibility>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkLabel" id="bad_password_label">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="no">&lt;span size=&quot;smaller&quot;&gt;Test bad password label&lt;/span&gt;</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">True</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">1</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkCheckButton" id="savesession_checkbutton">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="use_underline">True</property>
-                 <property name="label" translatable="yes">Remember password for this session</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                 <property name="focus_on_click">True</property>
-                 <property name="active">False</property>
-                 <property name="inconsistent">False</property>
-                 <property name="draw_indicator">True</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkCheckButton" id="savekeyring_checkbutton">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="use_underline">True</property>
-                 <property name="label" translatable="yes">Save password in keyring</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                 <property name="focus_on_click">True</property>
-                 <property name="active">False</property>
-                 <property name="inconsistent">False</property>
-                 <property name="draw_indicator">True</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-           </widget>
-           <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
-           </packing>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>

diff --git a/data/evince-properties.glade b/data/evince-properties.glade
deleted file mode 100644 (file)
index 68cce71..0000000
--- a/data/evince-properties.glade
+++ /dev/null
@@ -1,849 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="general_page">
-  <property name="title" translatable="yes"></property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkTable" id="general_page_root">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="n_rows">13</property>
-      <property name="n_columns">2</property>
-      <property name="homogeneous">False</property>
-      <property name="row_spacing">6</property>
-      <property name="column_spacing">12</property>
-
-      <child>
-       <widget class="GtkLabel" id="title_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Title:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">0</property>
-         <property name="bottom_attach">1</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="subject_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Subject:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">1</property>
-         <property name="bottom_attach">2</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="author_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Author:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">2</property>
-         <property name="bottom_attach">3</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="keywords_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Keywords:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">3</property>
-         <property name="bottom_attach">4</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="creator_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Creator:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">4</property>
-         <property name="bottom_attach">5</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="producer_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Producer:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">5</property>
-         <property name="bottom_attach">6</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="created_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Created:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">6</property>
-         <property name="bottom_attach">7</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="modified_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Modified:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">7</property>
-         <property name="bottom_attach">8</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="security_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Security:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">8</property>
-         <property name="bottom_attach">9</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="version_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Format:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">9</property>
-         <property name="bottom_attach">10</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="pages_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Number of Pages:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">10</property>
-         <property name="bottom_attach">11</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="optimized_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Optimized:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">11</property>
-         <property name="bottom_attach">12</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="created">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">6</property>
-         <property name="bottom_attach">7</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="modified">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">7</property>
-         <property name="bottom_attach">8</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="security">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">8</property>
-         <property name="bottom_attach">9</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="version">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">9</property>
-         <property name="bottom_attach">10</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="pages">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">10</property>
-         <property name="bottom_attach">11</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="optimized">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">11</property>
-         <property name="bottom_attach">12</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="producer">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">5</property>
-         <property name="bottom_attach">6</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="creator">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">4</property>
-         <property name="bottom_attach">5</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="keywords">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">3</property>
-         <property name="bottom_attach">4</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="author">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">2</property>
-         <property name="bottom_attach">3</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="subject">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">1</property>
-         <property name="bottom_attach">2</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="title">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">0</property>
-         <property name="bottom_attach">1</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="paper_size_caption">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">&lt;b&gt;Paper Size:&lt;/b&gt;</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">1</property>
-         <property name="top_attach">12</property>
-         <property name="bottom_attach">13</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="papersize">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">True</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">True</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-         <property name="width_chars">25</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="left_attach">1</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">12</property>
-         <property name="bottom_attach">13</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="fonts_page">
-  <property name="title" translatable="yes"></property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="fonts_page_root">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child>
-       <widget class="GtkScrolledWindow" id="scrolledwindow1">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-         <property name="shadow_type">GTK_SHADOW_IN</property>
-         <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-         <child>
-           <widget class="GtkTreeView" id="fonts_treeview">
-             <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="headers_visible">False</property>
-             <property name="rules_hint">False</property>
-             <property name="reorderable">False</property>
-             <property name="enable_search">True</property>
-             <property name="fixed_height_mode">False</property>
-             <property name="hover_selection">False</property>
-             <property name="hover_expand">False</property>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkLabel" id="font_progress_label">
-         <property name="visible">True</property>
-         <property name="label"></property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">False</property>
-         <property name="justify">GTK_JUSTIFY_LEFT</property>
-         <property name="wrap">False</property>
-         <property name="selectable">False</property>
-         <property name="xalign">0</property>
-         <property name="yalign">0.5</property>
-         <property name="xpad">0</property>
-         <property name="ypad">0</property>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">False</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>

diff --git a/properties/ev-properties-view.c b/properties/ev-properties-view.c
index e4bdd3f25252da824d74863b97ed1dcc46d13c0b..65f29d115162b87f180c710908ebf16a191b024b 100644 (file)
--- a/properties/ev-properties-view.c
+++ b/properties/ev-properties-view.c
@@ -30,13 +30,10 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include "ev-properties-view.h"
-#include "ev-document-fonts.h"
 
-typedef enum
-{
+typedef enum {
        TITLE_PROPERTY,
        SUBJECT_PROPERTY,
        AUTHOR_PROPERTY,
@@ -52,32 +49,31 @@ typedef enum
        PAPER_SIZE_PROPERTY
 } Property;
 
-typedef struct
-{
+typedef struct {
        Property property;
-       const char *label_id;
+       const char *label;
 } PropertyInfo;
 
 static const PropertyInfo properties_info[] = {
-       { TITLE_PROPERTY, "title" },
-       { SUBJECT_PROPERTY, "subject" },
-       { AUTHOR_PROPERTY, "author" },
-       { KEYWORDS_PROPERTY, "keywords" },
-       { PRODUCER_PROPERTY, "producer" },
-       { CREATOR_PROPERTY, "creator" },
-       { CREATION_DATE_PROPERTY, "created" },
-       { MOD_DATE_PROPERTY, "modified" },
-       { N_PAGES_PROPERTY, "pages" },
-       { LINEARIZED_PROPERTY, "optimized" },
-       { FORMAT_PROPERTY, "version" },
-       { SECURITY_PROPERTY, "security" },
-       { PAPER_SIZE_PROPERTY, "papersize" }
+       { TITLE_PROPERTY,         N_("Title") },
+       { SUBJECT_PROPERTY,       N_("Subject") },
+       { AUTHOR_PROPERTY,        N_("Author") },
+       { KEYWORDS_PROPERTY,      N_("Keywords") },
+       { PRODUCER_PROPERTY,      N_("Producer") },
+       { CREATOR_PROPERTY,       N_("Creator") },
+       { CREATION_DATE_PROPERTY, N_("Created") },
+       { MOD_DATE_PROPERTY,      N_("Modified") },
+       { N_PAGES_PROPERTY,       N_("Number of Pages") },
+       { LINEARIZED_PROPERTY,    N_("Optimized") },
+       { FORMAT_PROPERTY,        N_("Format") },
+       { SECURITY_PROPERTY,      N_("Security") },
+       { PAPER_SIZE_PROPERTY,    N_("Paper Size") }
 };
 
 struct _EvPropertiesView {
        GtkVBox base_instance;
 
-       GladeXML *xml;
+       GtkWidget *table;
 };
 
 struct _EvPropertiesViewClass {
@@ -86,25 +82,9 @@ struct _EvPropertiesViewClass {
 
 G_DEFINE_TYPE (EvPropertiesView, ev_properties_view, GTK_TYPE_VBOX)
 
-static void
-ev_properties_view_dispose (GObject *object)
-{
-       EvPropertiesView *properties = EV_PROPERTIES_VIEW (object);
-
-       if (properties->xml) {
-               g_object_unref (properties->xml);
-               properties->xml = NULL;
-       }
-
-       G_OBJECT_CLASS (ev_properties_view_parent_class)->dispose (object);
-}
-
 static void
 ev_properties_view_class_init (EvPropertiesViewClass *properties_class)
 {
-       GObjectClass *g_object_class = G_OBJECT_CLASS (properties_class);
-
-       g_object_class->dispose = ev_properties_view_dispose;
 }
 
 /* Returns a locale specific date and time representation */
@@ -166,30 +146,49 @@ make_valid_utf8 (const gchar *name)
 }
 
 static void
-set_property (GladeXML *xml, Property property, const char *text)
+set_property (GtkTable    *table,
+             Property     property,
+             const gchar *text,
+             gint        *row)
 {
-       GtkWidget *widget;
-       char *valid_text;
-
-       widget = glade_xml_get_widget (xml, properties_info[property].label_id);
-       g_return_if_fail (GTK_IS_LABEL (widget));
+       GtkWidget *label;
+       gchar     *markup;
+       gchar     *valid_text;
+
+       label = gtk_label_new (NULL);
+       g_object_set (G_OBJECT (label), "xalign", 0.0, NULL);
+       markup = g_strdup_printf ("<b>%s:</b>", properties_info[property].label);
+       gtk_label_set_markup (GTK_LABEL (label), markup);
+       g_free (markup);
+       
+       gtk_table_attach (table, label, 0, 1, *row, *row + 1,
+                         GTK_FILL, GTK_FILL, 0, 0);
+       gtk_widget_show (label);
+
+       label = gtk_label_new (NULL);
+       g_object_set (G_OBJECT (label),
+                     "xalign", 0.0,
+                     "width_chars", 25,
+                     "selectable", TRUE,
+                     "ellipsize", PANGO_ELLIPSIZE_END,
+                     NULL);
+       
 
        if (text == NULL || text[0] == '\000') {
-               gchar *markup;
-
                markup = g_markup_printf_escaped ("<i>%s</i>", _("None"));
-               gtk_label_set_markup (GTK_LABEL (widget), markup);
+               gtk_label_set_markup (GTK_LABEL (label), markup);
                g_free (markup);
-
-               return;
+       } else {
+               valid_text = make_valid_utf8 (text ? text : "");
+               gtk_label_set_text (GTK_LABEL (label), valid_text);
+               g_free (valid_text);
        }
-       text = text ? text : "";
 
-       valid_text = make_valid_utf8 (text);
+       gtk_table_attach (table, label, 1, 2, *row, *row + 1,
+                         GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+       gtk_widget_show (label);
 
-       gtk_label_set_text (GTK_LABEL (widget), valid_text);
-
-       g_free (valid_text);
+       *row += 1;
 }
 
 static GtkUnit
@@ -300,56 +299,57 @@ ev_regular_paper_size (const EvDocumentInfo *info)
 void
 ev_properties_view_set_info (EvPropertiesView *properties, const EvDocumentInfo *info)
 {
-       GladeXML *xml = properties->xml;
-       char *text;
+       GtkWidget *table;
+       gchar     *text;
+       gint       row = 0;
 
+       table = properties->table;
+       
        if (info->fields_mask & EV_DOCUMENT_INFO_TITLE) {
-               set_property (xml, TITLE_PROPERTY, info->title);
+               set_property (GTK_TABLE (table), TITLE_PROPERTY, info->title, &row);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_SUBJECT) {
-               set_property (xml, SUBJECT_PROPERTY, info->subject);
+               set_property (GTK_TABLE (table), SUBJECT_PROPERTY, info->subject, &row);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_AUTHOR) {
-               set_property (xml, AUTHOR_PROPERTY, info->author);
+               set_property (GTK_TABLE (table), AUTHOR_PROPERTY, info->author, &row);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_KEYWORDS) {
-               set_property (xml, KEYWORDS_PROPERTY, info->keywords);
+               set_property (GTK_TABLE (table), KEYWORDS_PROPERTY, info->keywords, &row);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_PRODUCER) {
-               set_property (xml, PRODUCER_PROPERTY, info->producer);
+               set_property (GTK_TABLE (table), PRODUCER_PROPERTY, info->producer, &row);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_CREATOR) {
-               set_property (xml, CREATOR_PROPERTY, info->creator);
+               set_property (GTK_TABLE (table), CREATOR_PROPERTY, info->creator, &row);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_CREATION_DATE) {
                text = ev_properties_view_format_date (info->creation_date);
-               set_property (xml, CREATION_DATE_PROPERTY, text);
+               set_property (GTK_TABLE (table), CREATION_DATE_PROPERTY, text, &row);
                g_free (text);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_MOD_DATE) {
                text = ev_properties_view_format_date (info->modified_date);
-               set_property (xml, MOD_DATE_PROPERTY, text);
+               set_property (GTK_TABLE (table), MOD_DATE_PROPERTY, text, &row);
                g_free (text);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_FORMAT) {
-               text = g_strdup_printf ("%s", info->format);
-               set_property (xml, FORMAT_PROPERTY, text);
-               g_free (text);
+               set_property (GTK_TABLE (table), FORMAT_PROPERTY, info->format, &row);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_N_PAGES) {
                text = g_strdup_printf ("%d", info->n_pages);
-               set_property (xml, N_PAGES_PROPERTY, text);
+               set_property (GTK_TABLE (table), N_PAGES_PROPERTY, text, &row);
                g_free (text);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_LINEARIZED) {
-               set_property (xml, LINEARIZED_PROPERTY, info->linearized);
+               set_property (GTK_TABLE (table), LINEARIZED_PROPERTY, info->linearized, &row);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_SECURITY) {
-               set_property (xml, SECURITY_PROPERTY, info->security);
+               set_property (GTK_TABLE (table), SECURITY_PROPERTY, info->security, &row);
        }
        if (info->fields_mask & EV_DOCUMENT_INFO_PAPER_SIZE) {
                text = ev_regular_paper_size (info);
-               set_property (xml, PAPER_SIZE_PROPERTY, text);
+               set_property (GTK_TABLE (table), PAPER_SIZE_PROPERTY, text, &row);
                g_free (text);
        }
 }
@@ -357,16 +357,13 @@ ev_properties_view_set_info (EvPropertiesView *properties, const EvDocumentInfo
 static void
 ev_properties_view_init (EvPropertiesView *properties)
 {
-       GladeXML *xml;
-
-       /* Create a new GladeXML object from XML file glade_file */
-       xml = glade_xml_new (DATADIR "/evince-properties.glade", "general_page_root", GETTEXT_PACKAGE);
-       properties->xml = xml;
-       g_assert (xml != NULL);
-
-       gtk_box_pack_start (GTK_BOX (properties),
-                           glade_xml_get_widget (xml, "general_page_root"),
+       properties->table = gtk_table_new (13, 2, FALSE);
+       gtk_table_set_col_spacings (GTK_TABLE (properties->table), 12);
+       gtk_table_set_row_spacings (GTK_TABLE (properties->table), 6);
+       gtk_container_set_border_width (GTK_CONTAINER (properties->table), 12);
+       gtk_box_pack_start (GTK_BOX (properties), properties->table, 
                            TRUE, TRUE, 0);
+       gtk_widget_show (properties->table);
 }
 
 void

diff --git a/shell/ev-properties-fonts.c b/shell/ev-properties-fonts.c
index 783a5657aa14ad9d28b990257947a0010aaaf40a..1670616d1dc75efe84c81047668f41c706f1af1e 100644 (file)
--- a/shell/ev-properties-fonts.c
+++ b/shell/ev-properties-fonts.c
@@ -24,7 +24,6 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include "ev-document-fonts.h"
 #include "ev-job-scheduler.h"
@@ -34,8 +33,6 @@
 struct _EvPropertiesFonts {
        GtkVBox base_instance;
 
-       GladeXML *xml;
-
        GtkWidget *fonts_treeview;
        GtkWidget *fonts_progress_label;
        EvJob     *fonts_job;
@@ -57,11 +54,6 @@ ev_properties_fonts_dispose (GObject *object)
 {
        EvPropertiesFonts *properties = EV_PROPERTIES_FONTS (object);
 
-       if (properties->xml) {
-               g_object_unref (properties->xml);
-               properties->xml = NULL;
-       }
-       
        if (properties->fonts_job) {
                g_signal_handlers_disconnect_by_func (properties->fonts_job, 
                                                      job_fonts_finished_cb, 
@@ -91,10 +83,10 @@ font_cell_data_func (GtkTreeViewColumn *col, GtkCellRenderer *renderer,
        char *details;
        char *markup;
 
-       gtk_tree_model_get(model, iter,
-                          EV_DOCUMENT_FONTS_COLUMN_NAME, &name,
-                          EV_DOCUMENT_FONTS_COLUMN_DETAILS, &details,
-                          -1); 
+       gtk_tree_model_get (model, iter,
+                           EV_DOCUMENT_FONTS_COLUMN_NAME, &name,
+                           EV_DOCUMENT_FONTS_COLUMN_DETAILS, &details,
+                           -1);        
 
        if (details) {
                markup = g_strdup_printf ("<b><big>%s</big></b>\n<small>%s</small>",
@@ -113,33 +105,53 @@ font_cell_data_func (GtkTreeViewColumn *col, GtkCellRenderer *renderer,
 static void
 ev_properties_fonts_init (EvPropertiesFonts *properties)
 {
-       GladeXML *xml;
-       GtkCellRenderer *renderer;
+       GtkWidget         *swindow;
+       GtkCellRenderer   *renderer;
        GtkTreeViewColumn *column;
 
-       /* Create a new GladeXML object from XML file glade_file */
-       xml = glade_xml_new (DATADIR "/evince-properties.glade", "fonts_page_root", NULL);
-       properties->xml = xml;
-       g_assert (xml != NULL);
-
-       gtk_box_pack_start (GTK_BOX (properties),
-                           glade_xml_get_widget (xml, "fonts_page_root"),
-                           TRUE, TRUE, 0);
-
-       properties->fonts_treeview = glade_xml_get_widget (xml, "fonts_treeview");
-       properties->fonts_progress_label = glade_xml_get_widget (xml, "font_progress_label");
-
+       gtk_container_set_border_width (GTK_CONTAINER (properties), 12);
+       gtk_box_set_spacing (GTK_BOX (properties), 6);
+       
+       swindow = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
+                                       GTK_POLICY_AUTOMATIC,
+                                       GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow),
+                                            GTK_SHADOW_IN);
+       
+       properties->fonts_treeview = gtk_tree_view_new ();
+       gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (properties->fonts_treeview),
+                                          FALSE);
        column = gtk_tree_view_column_new ();
        gtk_tree_view_column_set_expand (GTK_TREE_VIEW_COLUMN (column), TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW (properties->fonts_treeview), column);
+       gtk_tree_view_append_column (GTK_TREE_VIEW (properties->fonts_treeview),
+                                    column);
 
        renderer = GTK_CELL_RENDERER (g_object_new (GTK_TYPE_CELL_RENDERER_TEXT,
                                                    "ypad", 6, NULL));
-       gtk_tree_view_column_pack_start (GTK_TREE_VIEW_COLUMN (column), renderer, FALSE);
-       gtk_tree_view_column_set_title (GTK_TREE_VIEW_COLUMN (column), _("Font"));
+       gtk_tree_view_column_pack_start (GTK_TREE_VIEW_COLUMN (column),
+                                        renderer, FALSE);
+       gtk_tree_view_column_set_title (GTK_TREE_VIEW_COLUMN (column),
+                                       _("Font"));
        gtk_tree_view_column_set_cell_data_func (column, renderer,
                                                 font_cell_data_func,
                                                 NULL, NULL);
+
+       gtk_container_add (GTK_CONTAINER (swindow), properties->fonts_treeview);
+       gtk_widget_show (properties->fonts_treeview);
+
+       gtk_box_pack_start (GTK_BOX (properties), swindow, 
+                           TRUE, TRUE, 0);
+       gtk_widget_show (swindow);
+
+       properties->fonts_progress_label = gtk_label_new (NULL);
+       g_object_set (G_OBJECT (properties->fonts_progress_label),
+                     "xalign", 0.0,
+                     NULL);
+       gtk_box_pack_start (GTK_BOX (properties),
+                           properties->fonts_progress_label,
+                           FALSE, FALSE, 0);
+       gtk_widget_show (properties->fonts_progress_label);
 }
 
 static void