X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-properties-fonts.c;h=1670616d1dc75efe84c81047668f41c706f1af1e;hb=776a6fe02961d8901d21e172633d3c8d1c85dc93;hp=ce5109112d2d00d1d1da2b2dc07ce101545a0935;hpb=2ad5c80aafe43d53698e1084db86e34bf15290a9;p=evince.git diff --git a/shell/ev-properties-fonts.c b/shell/ev-properties-fonts.c index ce510911..1670616d 100644 --- a/shell/ev-properties-fonts.c +++ b/shell/ev-properties-fonts.c @@ -22,28 +22,20 @@ #include "config.h" #endif -#include "ev-properties-fonts.h" -#include "ev-document-fonts.h" -#include "ev-jobs.h" -#include "ev-job-queue.h" - #include -#include -#include +#include -enum -{ - FONT_NAME_COL, - NUM_COLS -}; +#include "ev-document-fonts.h" +#include "ev-job-scheduler.h" +#include "ev-jobs.h" +#include "ev-properties-fonts.h" struct _EvPropertiesFonts { GtkVBox base_instance; - GladeXML *xml; - GtkWidget *fonts_treeview; GtkWidget *fonts_progress_label; + EvJob *fonts_job; EvDocument *document; }; @@ -52,6 +44,9 @@ struct _EvPropertiesFontsClass { GtkVBoxClass base_class; }; +static void +job_fonts_finished_cb (EvJob *job, EvPropertiesFonts *properties); + G_DEFINE_TYPE (EvPropertiesFonts, ev_properties_fonts, GTK_TYPE_VBOX) static void @@ -59,10 +54,17 @@ 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, + properties); + ev_job_cancel (properties->fonts_job); + + g_object_unref (properties->fonts_job); + properties->fonts_job = NULL; } + + G_OBJECT_CLASS (ev_properties_fonts_parent_class)->dispose (object); } static void @@ -74,34 +76,82 @@ ev_properties_fonts_class_init (EvPropertiesFontsClass *properties_class) } static void -ev_properties_fonts_init (EvPropertiesFonts *properties) +font_cell_data_func (GtkTreeViewColumn *col, GtkCellRenderer *renderer, + GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) { - GladeXML *xml; - 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); + char *name; + char *details; + char *markup; + + 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 ("%s\n%s", + name, details); + } else { + markup = g_strdup_printf ("%s", name); + } - gtk_box_pack_start (GTK_BOX (properties), - glade_xml_get_widget (xml, "fonts_page_root"), - TRUE, TRUE, 0); + g_object_set (renderer, "markup", markup, NULL); + + g_free (markup); + g_free (details); + g_free (name); +} - properties->fonts_treeview = glade_xml_get_widget (xml, "fonts_treeview"); - properties->fonts_progress_label = glade_xml_get_widget (xml, "font_progress_label"); +static void +ev_properties_fonts_init (EvPropertiesFonts *properties) +{ + GtkWidget *swindow; + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + 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); - - 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); + 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_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 @@ -121,29 +171,23 @@ update_progress_label (GtkWidget *label, double progress) static void job_fonts_finished_cb (EvJob *job, EvPropertiesFonts *properties) -{ - EvDocumentFonts *document_fonts = EV_DOCUMENT_FONTS (job->document); - double progress; +{ + g_signal_handlers_disconnect_by_func (job, job_fonts_finished_cb, properties); + g_object_unref (properties->fonts_job); + properties->fonts_job = NULL; +} + +static void +job_fonts_updated_cb (EvJobFonts *job, gdouble progress, EvPropertiesFonts *properties) +{ + GtkTreeModel *model; + EvDocumentFonts *document_fonts = EV_DOCUMENT_FONTS (properties->document); - 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); - } + model = gtk_tree_view_get_model (GTK_TREE_VIEW (properties->fonts_treeview)); + /* Documen lock is already held by the jop */ + ev_document_fonts_fill_model (document_fonts, model); } void @@ -152,19 +196,21 @@ ev_properties_fonts_set_document (EvPropertiesFonts *properties, { GtkTreeView *tree_view = GTK_TREE_VIEW (properties->fonts_treeview); GtkListStore *list_store; - EvJob *job; properties->document = document; - list_store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING); + list_store = gtk_list_store_new (EV_DOCUMENT_FONTS_COLUMN_NUM_COLUMNS, + G_TYPE_STRING, 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); + properties->fonts_job = ev_job_fonts_new (properties->document); + g_signal_connect (properties->fonts_job, "updated", + G_CALLBACK (job_fonts_updated_cb), + properties); + g_signal_connect (properties->fonts_job, "finished", + G_CALLBACK (job_fonts_finished_cb), + properties); + ev_job_scheduler_push_job (properties->fonts_job, EV_JOB_PRIORITY_NONE); } GtkWidget *