From: Marco Pesenti Gritti Date: Mon, 4 Jul 2005 11:58:16 +0000 (+0000) Subject: Split the properties pages in two different objects, depend only on the X-Git-Tag: EVINCE_0_3_3~180 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=19be09f257f9250cb45fa96e05ab16d6e9ff7ba9;p=evince.git Split the properties pages in two different objects, depend only on the 2005-07-04 Marco Pesenti Gritti * Makefile.am: * configure.ac: * data/evince-properties.glade: * properties/.cvsignore: * properties/Makefile.am: * properties/ev-properties-view.c: (ev_properties_view_dispose), (ev_properties_view_class_init), (ev_properties_view_format_date), (make_valid_utf8), (set_property), (ev_properties_view_set_info), (ev_properties_view_init), (ev_properties_view_new): * properties/ev-properties-view.h: * shell/Makefile.am: * shell/ev-properties-dialog.c: (ev_properties_dialog_class_init), (ev_properties_dialog_init), (ev_properties_dialog_set_document), (ev_properties_dialog_new): * shell/ev-properties-dialog.h: * shell/ev-properties-fonts.c: (ev_properties_fonts_dispose), (ev_properties_fonts_class_init), (ev_properties_fonts_init), (update_progress_label), (job_fonts_finished_cb), (ev_properties_fonts_set_document), (ev_properties_fonts_new): * shell/ev-properties-fonts.h: * shell/ev-properties.c: * shell/ev-properties.h: * shell/ev-window.c: (ev_window_setup_document), (ev_window_cmd_file_properties): Split the properties pages in two different objects, depend only on the backend where possible, use widgets instead of gobject for the glade part, reimplement the dialog itself with gtk. I need this to implement nautilus properties page. --- diff --git a/ChangeLog b/ChangeLog index 4f5f8324..03fcb83a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +2005-07-04 Marco Pesenti Gritti + + * Makefile.am: + * configure.ac: + * data/evince-properties.glade: + * properties/.cvsignore: + * properties/Makefile.am: + * properties/ev-properties-view.c: (ev_properties_view_dispose), + (ev_properties_view_class_init), (ev_properties_view_format_date), + (make_valid_utf8), (set_property), (ev_properties_view_set_info), + (ev_properties_view_init), (ev_properties_view_new): + * properties/ev-properties-view.h: + * shell/Makefile.am: + * shell/ev-properties-dialog.c: (ev_properties_dialog_class_init), + (ev_properties_dialog_init), (ev_properties_dialog_set_document), + (ev_properties_dialog_new): + * shell/ev-properties-dialog.h: + * shell/ev-properties-fonts.c: (ev_properties_fonts_dispose), + (ev_properties_fonts_class_init), (ev_properties_fonts_init), + (update_progress_label), (job_fonts_finished_cb), + (ev_properties_fonts_set_document), (ev_properties_fonts_new): + * shell/ev-properties-fonts.h: + * shell/ev-properties.c: + * shell/ev-properties.h: + * shell/ev-window.c: (ev_window_setup_document), + (ev_window_cmd_file_properties): + + Split the properties pages in two different objects, depend + only on the backend where possible, use widgets instead + of gobject for the glade part, reimplement the dialog + itself with gtk. + I need this to implement nautilus properties page. + 2005-07-03 Matthew S. Wilson * tiff/tiff-document.c (tiff_document_ps_export_begin) diff --git a/Makefile.am b/Makefile.am index 8f0cec18..229a03bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ endif # Applications -SUBDIRS += shell thumbnailer +SUBDIRS += properties shell thumbnailer intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in diff --git a/configure.ac b/configure.ac index d49fe82c..ad43ee60 100644 --- a/configure.ac +++ b/configure.ac @@ -306,6 +306,7 @@ dvi/Makefile dvi/mdvi-lib/Makefile po/Makefile.in backend/Makefile +properties/Makefile shell/Makefile thumbnailer/Makefile help/Makefile diff --git a/data/evince-properties.glade b/data/evince-properties.glade index c18a08f7..c33c5514 100644 --- a/data/evince-properties.glade +++ b/data/evince-properties.glade @@ -3,871 +3,753 @@ - - 5 - Properties + + GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT + GTK_WIN_POS_NONE False True False True False False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_CENTER + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST True - False - - + + + 12 True + 12 + 2 False - 2 + 6 + 12 - - + + True - GTK_BUTTONBOX_END + <b>Title:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - + + + True + <b>Subject:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - False - True - GTK_PACK_END + 0 + 1 + 1 + 2 + fill + + + + + + + True + <b>Author:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + <b>Keywords:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + <b>Creator:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 4 + 5 + fill + + + + + + + True + <b>Producer:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 5 + 6 + fill + + + + + + + True + <b>Created:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 6 + 7 + fill + + + + + + + True + <b>Modified:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 7 + 8 + fill + + + + + + + True + <b>Security:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 8 + 9 + fill + + + + + + + True + <b>Format:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 9 + 10 + fill + + + + + + + True + <b>Number of Pages:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 10 + 11 + fill + + + + + + + True + <b>Optimized:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 11 + 12 + fill + - - 5 + True True - True - True - GTK_POS_TOP - False - False + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 6 + 7 + fill + + + - - - 12 - True - 12 - 2 - False - 6 - 12 - - - - True - <b>Title:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - <b>Subject:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - <b>Author:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - <b>Keywords:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - <b>Creator:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - <b>Producer:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - <b>Created:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 6 - 7 - fill - - - - - - - True - <b>Modified:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 7 - 8 - fill - - - - - - - True - <b>Security:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 8 - 9 - fill - - - - - - - True - <b>Format:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 9 - 10 - fill - - - - - - - True - <b>Number of Pages:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 10 - 11 - fill - - - - - - - True - <b>Optimized:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 11 - 12 - fill - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 6 - 7 - fill - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 7 - 8 - fill - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 8 - 9 - fill - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 9 - 10 - fill - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 10 - 11 - fill - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 11 - 12 - fill - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 5 - 6 - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 4 - 5 - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 3 - 4 - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 2 - 3 - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - - False - True - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_END - 25 - False - 0 - - - 1 - 2 - 0 - 1 - - - - - - False - True - - + + + True + True + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 7 + 8 + fill + + + - - - True - General - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - + + + True + True + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 8 + 9 + fill + + + - - - 12 - True - False - 6 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - False - True - - + + + True + True + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 9 + 10 + fill + + + + + + + True + True + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 10 + 11 + fill + + + + + + + True + True + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 11 + 12 + fill + + + + + + + True + True + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 5 + 6 + + + + + + + True + True + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 4 + 5 + + + + + + + True + True + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 3 + 4 + + + + + + + True + True + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 2 + 3 + + + + + + + True + True + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 1 + 2 + + + + + + + True + True + + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + 25 + False + 0 + + + 1 + 2 + 0 + 1 + + + + + + + + + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + + + + 12 + True + False + 6 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - + True - Fonts - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + True + False + False + False + True + False + False + False - - tab - @@ -876,6 +758,31 @@ True + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + diff --git a/properties/.cvsignore b/properties/.cvsignore new file mode 100644 index 00000000..282522db --- /dev/null +++ b/properties/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/properties/Makefile.am b/properties/Makefile.am new file mode 100644 index 00000000..bac8f359 --- /dev/null +++ b/properties/Makefile.am @@ -0,0 +1,15 @@ +NULL= + +INCLUDES= \ + -DDATADIR=\"$(pkgdatadir)\" \ + -I$(top_srcdir)/backend \ + $(SHELL_CFLAGS) \ + $(EVINCE_DISABLE_DEPRECATED) \ + $(NULL) + +noinst_LTLIBRARIES = libevproperties.la + +libevproperties_la_SOURCES= \ + ev-properties-view.c \ + ev-properties-view.h \ + $(NULL) diff --git a/shell/ev-properties.c b/properties/ev-properties-view.c similarity index 55% rename from shell/ev-properties.c rename to properties/ev-properties-view.c index d7974c0f..297cbc5d 100644 --- a/shell/ev-properties.c +++ b/properties/ev-properties-view.c @@ -22,11 +22,8 @@ #include "config.h" #endif -#include "ev-properties.h" +#include "ev-properties-view.h" #include "ev-document-fonts.h" -#include "ev-jobs.h" -#include "ev-job-queue.h" -#include "ev-page-cache.h" #include #include @@ -35,12 +32,6 @@ #include #include -enum -{ - FONT_NAME_COL, - NUM_COLS -}; - typedef enum { TITLE_PROPERTY, @@ -78,29 +69,22 @@ static const PropertyInfo properties_info[] = { { SECURITY_PROPERTY, "security" } }; -struct _EvProperties { - GObject base_instance; +struct _EvPropertiesView { + GtkVBox base_instance; GladeXML *xml; - - GtkWidget *dialog; - GtkWidget *fonts_treeview; - GtkWidget *fonts_progress_label; - GtkWidget *font_page; - - EvDocument *document; }; -struct _EvPropertiesClass { - GObjectClass base_class; +struct _EvPropertiesViewClass { + GtkVBoxClass base_class; }; -G_DEFINE_TYPE (EvProperties, ev_properties, G_TYPE_OBJECT) +G_DEFINE_TYPE (EvPropertiesView, ev_properties_view, GTK_TYPE_VBOX) static void -ev_properties_dispose (GObject *object) +ev_properties_view_dispose (GObject *object) { - EvProperties *properties = EV_PROPERTIES (object); + EvPropertiesView *properties = EV_PROPERTIES_VIEW (object); if (properties->xml) { g_object_unref (properties->xml); @@ -109,54 +93,16 @@ ev_properties_dispose (GObject *object) } static void -ev_properties_class_init (EvPropertiesClass *properties_class) +ev_properties_view_class_init (EvPropertiesViewClass *properties_class) { GObjectClass *g_object_class = G_OBJECT_CLASS (properties_class); - g_object_class->dispose = ev_properties_dispose; -} - -static void -dialog_destroy_cb (GtkWidget *dialog, EvProperties *properties) -{ - g_object_unref (properties); -} - -static void -ev_properties_init (EvProperties *properties) -{ - GladeXML *xml; - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - - /* Create a new GladeXML object from XML file glade_file */ - xml = glade_xml_new (DATADIR "/evince-properties.glade", NULL, NULL); - properties->xml = xml; - g_assert (xml != NULL); - - properties->dialog = glade_xml_get_widget (xml, "properties_dialog"); - properties->fonts_treeview = glade_xml_get_widget (xml, "fonts_treeview"); - properties->fonts_progress_label = glade_xml_get_widget (xml, "font_progress_label"); - properties->font_page = glade_xml_get_widget (xml, "fonts_page"); - - 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); - - renderer = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (GTK_TREE_VIEW_COLUMN (column), renderer, FALSE); - gtk_tree_view_column_set_title (GTK_TREE_VIEW_COLUMN (column), _("Name")); - gtk_tree_view_column_set_attributes (GTK_TREE_VIEW_COLUMN (column), renderer, - "text", EV_DOCUMENT_FONTS_COLUMN_NAME, - NULL); - - g_signal_connect (properties->dialog, "destroy", - G_CALLBACK (dialog_destroy_cb), properties); + g_object_class->dispose = ev_properties_view_dispose; } /* Returns a locale specific date and time representation */ static char * -ev_properties_format_date (GTime utime) +ev_properties_view_format_date (GTime utime) { time_t time = (time_t) utime; struct tm t; @@ -239,80 +185,12 @@ set_property (GladeXML *xml, Property property, const char *text) g_free (valid_text); } -static void -update_progress_label (GtkWidget *label, double progress) -{ - if (progress > 0) { - char *progress_text; - progress_text = g_strdup_printf (_("Gathering font information... %3d%%"), - (int) (progress * 100)); - gtk_label_set_text (GTK_LABEL (label), progress_text); - g_free (progress_text); - gtk_widget_show (label); - } else { - gtk_widget_hide (label); - } -} - -static void -job_fonts_finished_cb (EvJob *job, EvProperties *properties) -{ - EvDocumentFonts *document_fonts = EV_DOCUMENT_FONTS (job->document); - double progress; - - progress = ev_document_fonts_get_progress (document_fonts); - update_progress_label (properties->fonts_progress_label, progress); - - if (EV_JOB_FONTS (job)->scan_completed) { - g_signal_handlers_disconnect_by_func - (job, job_fonts_finished_cb, properties); - } else { - GtkTreeModel *model; - EvJob *new_job; - - model = gtk_tree_view_get_model - (GTK_TREE_VIEW (properties->fonts_treeview)); - ev_document_doc_mutex_lock (); - ev_document_fonts_fill_model (document_fonts, model); - ev_document_doc_mutex_unlock (); - new_job = ev_job_fonts_new (job->document); - ev_job_queue_add_job (job, EV_JOB_PRIORITY_LOW); - g_object_unref (new_job); - } -} - -static void -setup_fonts_view (EvProperties *properties) -{ - GtkTreeView *tree_view = GTK_TREE_VIEW (properties->fonts_treeview); - GtkListStore *list_store; - EvJob *job; - - list_store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING); - gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (list_store)); - - job = ev_job_fonts_new (properties->document); - g_signal_connect_object (job, "finished", - G_CALLBACK (job_fonts_finished_cb), - properties, 0); - ev_job_queue_add_job (job, EV_JOB_PRIORITY_LOW); - g_object_unref (job); -} - void -ev_properties_set_document (EvProperties *properties, - EvDocument *document) +ev_properties_view_set_info (EvPropertiesView *properties, const EvDocumentInfo *info) { - EvPageCache *page_cache; GladeXML *xml = properties->xml; - const EvDocumentInfo *info; char *text; - properties->document = document; - - page_cache = ev_page_cache_get (document); - info = ev_page_cache_get_info (page_cache); - if (info->fields_mask & EV_DOCUMENT_INFO_TITLE) { set_property (xml, TITLE_PROPERTY, info->title); } @@ -332,12 +210,12 @@ ev_properties_set_document (EvProperties *properties, set_property (xml, CREATOR_PROPERTY, info->creator); } if (info->fields_mask & EV_DOCUMENT_INFO_CREATION_DATE) { - text = ev_properties_format_date (info->creation_date); + text = ev_properties_view_format_date (info->creation_date); set_property (xml, CREATION_DATE_PROPERTY, text); g_free (text); } if (info->fields_mask & EV_DOCUMENT_INFO_MOD_DATE) { - text = ev_properties_format_date (info->modified_date); + text = ev_properties_view_format_date (info->modified_date); set_property (xml, MOD_DATE_PROPERTY, text); g_free (text); } @@ -356,31 +234,29 @@ ev_properties_set_document (EvProperties *properties, if (info->fields_mask & EV_DOCUMENT_INFO_SECURITY) { set_property (xml, SECURITY_PROPERTY, info->security); } - - if (EV_IS_DOCUMENT_FONTS (document)) { - gtk_widget_show (properties->font_page); - setup_fonts_view (properties); - } else { - gtk_widget_hide (properties->font_page); - } } -EvProperties * -ev_properties_new () +static void +ev_properties_view_init (EvPropertiesView *properties) { - EvProperties *properties; + GladeXML *xml; - properties = g_object_new (EV_TYPE_PROPERTIES, NULL); + /* Create a new GladeXML object from XML file glade_file */ + xml = glade_xml_new (DATADIR "/evince-properties.glade", "general_page_root", NULL); + properties->xml = xml; + g_assert (xml != NULL); - return properties; + gtk_box_pack_start (GTK_BOX (properties), + glade_xml_get_widget (xml, "general_page_root"), + TRUE, TRUE, 0); } -void -ev_properties_show (EvProperties *properties, GtkWidget *parent) +GtkWidget * +ev_properties_view_new (void) { - gtk_window_set_transient_for (GTK_WINDOW (properties->dialog), - GTK_WINDOW (parent)); - g_signal_connect (properties->dialog, "response", - G_CALLBACK (gtk_widget_destroy), NULL); - gtk_widget_show (properties->dialog); + EvPropertiesView *properties; + + properties = g_object_new (EV_TYPE_PROPERTIES, NULL); + + return GTK_WIDGET (properties); } diff --git a/properties/ev-properties-view.h b/properties/ev-properties-view.h new file mode 100644 index 00000000..d95520fc --- /dev/null +++ b/properties/ev-properties-view.h @@ -0,0 +1,48 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */ +/* this file is part of evince, a gnome document viewer + * + * Copyright (C) 2005 Red Hat, Inc + * + * Evince is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Evince is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __EV_PROPERTIES_VIEW_H__ +#define __EV_PROPERTIES_VIEW_H__ + +#include "ev-document-info.h" + +#include + +G_BEGIN_DECLS + +typedef struct _EvPropertiesView EvPropertiesView; +typedef struct _EvPropertiesViewClass EvPropertiesViewClass; +typedef struct _EvPropertiesViewPrivate EvPropertiesViewPrivate; + +#define EV_TYPE_PROPERTIES (ev_properties_view_get_type()) +#define EV_PROPERTIES_VIEW(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_PROPERTIES, EvPropertiesView)) +#define EV_PROPERTIES_VIEW_CLASS(klass) (G_TYPE_CHACK_CLASS_CAST((klass), EV_TYPE_PROPERTIES, EvPropertiesViewClass)) +#define EV_IS_PROPERTIES_VIEW(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_PROPERTIES)) +#define EV_IS_PROPERTIES_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_PROPERTIES)) +#define EV_PROPERTIES_VIEW_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_PROPERTIES, EvPropertiesViewClass)) + +GType ev_properties_view_get_type (void); +GtkWidget *ev_properties_view_new (void); +void ev_properties_view_set_info (EvPropertiesView *properties, + const EvDocumentInfo *info); + +G_END_DECLS + +#endif /* __EV_PROPERTIES_VIEW_H__ */ diff --git a/shell/Makefile.am b/shell/Makefile.am index 71faed51..e4010a93 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -10,6 +10,7 @@ INCLUDES= \ -I$(top_srcdir)/backend \ -I$(top_srcdir)/pdf \ -I$(top_srcdir)/pixbuf \ + -I$(top_srcdir)/properties \ -I$(top_srcdir)/tiff \ -I$(top_srcdir)/ps \ -I$(top_srcdir)/djvu \ @@ -82,8 +83,10 @@ evince_SOURCES= \ ev-pixbuf-cache.h \ ev-print-job.c \ ev-print-job.h \ - ev-properties.c \ - ev-properties.h \ + ev-properties-dialog.c \ + ev-properties-dialog.h \ + ev-properties-fonts.c \ + ev-properties-fonts.h \ ev-utils.c \ ev-utils.h \ ev-view.c \ @@ -117,6 +120,7 @@ evince_LDADD= \ $(top_builddir)/cut-n-paste/zoom-control/libephymisc.la \ $(top_builddir)/cut-n-paste/zoom-control/libephywidgets.la \ $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \ + $(top_builddir)/properties/libevproperties.la \ $(top_builddir)/lib/libev.la \ -ltiff -lz \ libevbackendfactory.la \ diff --git a/shell/ev-properties.h b/shell/ev-properties.h deleted file mode 100644 index 410ed1a9..00000000 --- a/shell/ev-properties.h +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */ -/* this file is part of evince, a gnome document viewer - * - * Copyright (C) 2005 Red Hat, Inc - * - * Evince is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * Evince is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef __EV_PROPERTIES_H__ -#define __EV_PROPERTIES_H__ - -#include "ev-document.h" - -#include - -G_BEGIN_DECLS - -typedef struct _EvProperties EvProperties; -typedef struct _EvPropertiesClass EvPropertiesClass; -typedef struct _EvPropertiesPrivate EvPropertiesPrivate; - -#define EV_TYPE_PROPERTIES (ev_properties_get_type()) -#define EV_PROPERTIES(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_PROPERTIES, EvProperties)) -#define EV_PROPERTIES_CLASS(klass) (G_TYPE_CHACK_CLASS_CAST((klass), EV_TYPE_PROPERTIES, EvPropertiesClass)) -#define EV_IS_PROPERTIES(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_PROPERTIES)) -#define EV_IS_PROPERTIES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_PROPERTIES)) -#define EV_PROPERTIES_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_PROPERTIES, EvPropertiesClass)) - -GType ev_properties_get_type (void); -EvProperties *ev_properties_new (void); -void ev_properties_set_document (EvProperties *properties, - EvDocument *document); -void ev_properties_show (EvProperties *properties, - GtkWidget *parent); - -G_END_DECLS - -#endif /* __EV_PROPERTIES_H__ */ diff --git a/shell/ev-window.c b/shell/ev-window.c index 72b7a38c..1c1d8354 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -37,7 +37,7 @@ #include "ev-password.h" #include "ev-password-view.h" #include "ev-print-job.h" -#include "ev-properties.h" +#include "ev-properties-dialog.h" #include "ev-document-thumbnails.h" #include "ev-document-links.h" #include "ev-document-fonts.h" @@ -107,7 +107,7 @@ struct _EvWindowPrivate { GtkWidget *sidebar_thumbs; /* Dialogs */ - EvProperties *properties; + GtkWidget *properties; /* UI Builders */ GtkActionGroup *action_group; @@ -668,8 +668,8 @@ ev_window_setup_document (EvWindow *ev_window) update_document_mode (ev_window, info->mode); if (ev_window->priv->properties) { - ev_properties_set_document (ev_window->priv->properties, - ev_window->priv->document); + ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties), + ev_window->priv->document); } } @@ -1319,14 +1319,16 @@ static void ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window) { if (ev_window->priv->properties == NULL) { - ev_window->priv->properties = ev_properties_new (); - ev_properties_set_document (ev_window->priv->properties, - ev_window->priv->document); + ev_window->priv->properties = ev_properties_dialog_new (); + ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties), + ev_window->priv->document); g_object_add_weak_pointer (G_OBJECT (ev_window->priv->properties), (gpointer *) &(ev_window->priv->properties)); + gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties), + GTK_WINDOW (ev_window)); } - ev_properties_show (ev_window->priv->properties, GTK_WIDGET (ev_window)); + gtk_widget_show (ev_window->priv->properties); } static void