Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell/ev-window.c
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2005-07-04 11:58:16 (GMT)
committer Marco Pesenti Gritti <marco@src.gnome.org>2005-07-04 11:58:16 (GMT)
commit19be09f257f9250cb45fa96e05ab16d6e9ff7ba9 (patch)
treedfdad6d80601449e9100e423e9b92d8241ebcbf5 /shell/ev-window.c
parentb7abdba401b7aec50e93ecd1df1ce76cb1f315c1 (diff)
Split the properties pages in two different objects, depend only on the
2005-07-04 Marco Pesenti Gritti <mpg@redhat.com> * 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.
Diffstat (limited to 'shell/ev-window.c')
-rw-r--r--shell/ev-window.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 72b7a38..1c1d835 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