projects
/
raktpdf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added license header to main.c.
[raktpdf.git]
/
src
/
rakt-window.c
diff --git
a/src/rakt-window.c
b/src/rakt-window.c
index 59dfca47a2aa9a44a028472359e405d8e0e71d3d..9f45644dd918818f1350b79b83f5836dcbedafe8 100644
(file)
--- a/
src/rakt-window.c
+++ b/
src/rakt-window.c
@@
-30,9
+30,7
@@
#include "rakt-window.h"
#include "rakt-window.h"
-typedef struct RaktWindowPriv RaktWindowPriv;
-
-struct RaktWindowPriv {
+typedef struct {
GtkWidget *content_vbox;
/* Menu & toolbar */
GtkWidget *content_vbox;
/* Menu & toolbar */
@@
-44,7
+42,7
@@
struct RaktWindowPriv {
GdkPixbuf *pixbuf;
PopplerDocument *document;
gint page_no;
GdkPixbuf *pixbuf;
PopplerDocument *document;
gint page_no;
-};
+}
RaktWindowPriv
;
static void window_finalize (GObject *object);
static void window_finalize (GObject *object);
@@
-60,12
+58,15
@@
static const GtkActionEntry action_entries[] = {
{
"FileMenu", NULL, "_File", NULL, NULL, NULL
},
{
"FileMenu", NULL, "_File", NULL, NULL, NULL
},
+ {
+ "GoMenu", NULL, "_Go", NULL, NULL, NULL
+ },
{
"HelpMenu", NULL, "_Help", NULL, NULL, NULL
},
{
{
"HelpMenu", NULL, "_Help", NULL, NULL, NULL
},
{
- "Open", GTK_STOCK_OPEN,
- "
_Open", "
<control>O", "Open a PDF file",
+ "Open", GTK_STOCK_OPEN,
"_Open",
+ "<control>O", "Open a PDF file",
G_CALLBACK (on_action_open)
},
{
G_CALLBACK (on_action_open)
},
{
@@
-79,13
+80,13
@@
static const GtkActionEntry action_entries[] = {
G_CALLBACK (on_action_go_previous)
},
{
G_CALLBACK (on_action_go_previous)
},
{
- "Quit", GTK_STOCK_QUIT,
- "
_Quit", "
<control>Q", "Quit the application",
+ "Quit", GTK_STOCK_QUIT,
"_Quit",
+ "<control>Q", "Quit the application",
G_CALLBACK (on_action_quit)
},
{
G_CALLBACK (on_action_quit)
},
{
- "About", GTK_STOCK_ABOUT,
-
"_About",
NULL, "About this application",
+ "About", GTK_STOCK_ABOUT,
"_About",
+ NULL, "About this application",
G_CALLBACK (on_action_about)
}
};
G_CALLBACK (on_action_about)
}
};
@@
-98,6
+99,10
@@
static const gchar *ui_layout =
" <separator action='Sep1'/>"
" <menuitem action='Quit'/>"
" </menu>"
" <separator action='Sep1'/>"
" <menuitem action='Quit'/>"
" </menu>"
+ " <menu action='GoMenu'>"
+ " <menuitem action='Previous'/>"
+ " <menuitem action='Next'/>"
+ " </menu>"
" <menu action='HelpMenu'>"
" <menuitem action='About'/>"
" </menu>"
" <menu action='HelpMenu'>"
" <menuitem action='About'/>"
" </menu>"
@@
-151,23
+156,18
@@
render_page (RaktWindow *window)
poppler_page_render_to_pixbuf (page, 0, 0, width, height, 1.0, 0,
priv->pixbuf);
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), priv->pixbuf);
poppler_page_render_to_pixbuf (page, 0, 0, width, height, 1.0, 0,
priv->pixbuf);
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), priv->pixbuf);
+ gtk_widget_show (priv->image);
}
static void
}
static void
-open_document (RaktWindow *window, gchar *
file
)
+open_document (RaktWindow *window, gchar *
uri
)
{
RaktWindowPriv *priv;
GError *error = NULL;
{
RaktWindowPriv *priv;
GError *error = NULL;
- gchar real[PATH_MAX], buf[16 + PATH_MAX];
priv = GET_PRIV (window);
priv = GET_PRIV (window);
- realpath (file, real);
-
- g_strlcpy (buf, "file://", sizeof (buf));
- g_strlcat (buf, real, sizeof (buf));
-
- priv->document = poppler_document_new_from_file (buf, NULL, &error);
+ priv->document = poppler_document_new_from_file (uri, NULL, &error);
priv->page_no = 0;
render_page (window);
priv->page_no = 0;
render_page (window);
@@
-178,6
+178,7
@@
window_create_menu (RaktWindow *window)
{
RaktWindowPriv *priv;
GtkActionGroup *action_group;
{
RaktWindowPriv *priv;
GtkActionGroup *action_group;
+ GtkAccelGroup *accel_group;
GError *error = NULL;
priv = GET_PRIV (window);
GError *error = NULL;
priv = GET_PRIV (window);
@@
-193,6
+194,10
@@
window_create_menu (RaktWindow *window)
gtk_action_group_add_actions (action_group, action_entries,
G_N_ELEMENTS (action_entries), window);
gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, 0);
gtk_action_group_add_actions (action_group, action_entries,
G_N_ELEMENTS (action_entries), window);
gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, 0);
+
+ accel_group = gtk_ui_manager_get_accel_group (priv->ui_manager);
+ gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+
g_object_unref (action_group);
gtk_ui_manager_add_ui_from_string (priv->ui_manager, ui_layout, -1, &error);
g_object_unref (action_group);
gtk_ui_manager_add_ui_from_string (priv->ui_manager, ui_layout, -1, &error);
@@
-216,7
+221,7
@@
on_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
{
gtk_main_quit ();
{
gtk_main_quit ();
- return
FALS
E;
+ return
TRU
E;
}
static void
}
static void
@@
-237,7
+242,6
@@
rakt_window_init (RaktWindow *window)
priv->image = gtk_image_new ();
priv->image = gtk_image_new ();
- gtk_widget_show (priv->image);
gtk_box_pack_start (GTK_BOX (priv->content_vbox), priv->image,
TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (priv->content_vbox), priv->image,
TRUE, TRUE, 0);
@@
-298,10
+302,11
@@
on_action_open (GtkAction *action, RaktWindow *window)
n = gtk_dialog_run (GTK_DIALOG (dialog));
if (n == GTK_RESPONSE_ACCEPT) {
n = gtk_dialog_run (GTK_DIALOG (dialog));
if (n == GTK_RESPONSE_ACCEPT) {
- gchar *
file
;
+ gchar *
uri
;
- file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
- open_document (window, file);
+ uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+ open_document (window, uri);
+ g_free (uri);
}
gtk_widget_destroy (dialog);
}
gtk_widget_destroy (dialog);