DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Can now open and edit files directly from the preview plug-in

Browse Source
This commit is contained in:
Pierre Pronchery 2011-07-29 01:19:57 +00:00
parent 04dda49f3a
commit 2bd1581557
5 changed files with 73 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
po/de.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-07-29 02:47+0200\n" "POT-Creation-Date: 2011-07-29 03:19+0200\n"
"PO-Revision-Date: 2010-03-29 23:28+0200\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: English\n" "Language-Team: English\n"
@ -764,7 +764,7 @@ msgstr ""
msgid "Command exited with signal %d" msgid "Command exited with signal %d"
msgstr "" msgstr ""
#: ../src/plugins/preview.c:60 #: ../src/plugins/preview.c:64
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""

4
po/es.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-07-29 02:47+0200\n" "POT-Creation-Date: 2011-07-29 03:19+0200\n"
"PO-Revision-Date: 2010-03-30 01:04+0200\n" "PO-Revision-Date: 2010-03-30 01:04+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Spanish\n" "Language-Team: Spanish\n"
@ -764,7 +764,7 @@ msgstr ""
msgid "Command exited with signal %d" msgid "Command exited with signal %d"
msgstr "" msgstr ""
#: ../src/plugins/preview.c:60 #: ../src/plugins/preview.c:64
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""

4
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-07-29 02:47+0200\n" "POT-Creation-Date: 2011-07-29 03:19+0200\n"
"PO-Revision-Date: 2010-03-29 23:28+0200\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -798,7 +798,7 @@ msgstr "La commande a terminé avec le code d'erreur %d"
msgid "Command exited with signal %d" msgid "Command exited with signal %d"
msgstr "La commande a été terminée par le signal %d" msgstr "La commande a été terminée par le signal %d"
#: ../src/plugins/preview.c:60 #: ../src/plugins/preview.c:64
msgid "Preview" msgid "Preview"
msgstr "Prévisualisation" msgstr "Prévisualisation"

4
po/it.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-07-29 02:47+0200\n" "POT-Creation-Date: 2011-07-29 03:19+0200\n"
"PO-Revision-Date: 2010-04-07 23:18+0200\n" "PO-Revision-Date: 2010-04-07 23:18+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Italian\n" "Language-Team: Italian\n"
@ -764,7 +764,7 @@ msgstr ""
msgid "Command exited with signal %d" msgid "Command exited with signal %d"
msgstr "" msgstr ""
#: ../src/plugins/preview.c:60 #: ../src/plugins/preview.c:64
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""

65
src/plugins/preview.c
View File

@ -36,6 +36,8 @@ typedef struct _Preview
/* widgets */ /* widgets */
GtkWidget * name; GtkWidget * name;
GtkWidget * open;
GtkWidget * edit;
GtkWidget * view_image; GtkWidget * view_image;
GtkWidget * view_text; GtkWidget * view_text;
GtkTextBuffer * view_text_buffer; GtkTextBuffer * view_text_buffer;
@ -48,8 +50,10 @@ static void _preview_destroy(BrowserPlugin * plugin);
static void _preview_refresh(BrowserPlugin * plugin, char const * path); static void _preview_refresh(BrowserPlugin * plugin, char const * path);
/* callbacks */ /* callbacks */
static void _preview_on_edit(gpointer data);
static gboolean _preview_on_idle_image(gpointer data); static gboolean _preview_on_idle_image(gpointer data);
static gboolean _preview_on_idle_text(gpointer data); static gboolean _preview_on_idle_text(gpointer data);
static void _preview_on_open(gpointer data);
/* public */ /* public */
@ -73,6 +77,7 @@ static GtkWidget * _preview_init(BrowserPlugin * plugin)
{ {
Preview * preview; Preview * preview;
PangoFontDescription * font; PangoFontDescription * font;
GtkSizeGroup * group;
GtkWidget * vbox; GtkWidget * vbox;
GtkWidget * widget; GtkWidget * widget;
@ -82,6 +87,7 @@ static GtkWidget * _preview_init(BrowserPlugin * plugin)
preview->path = NULL; preview->path = NULL;
preview->source = 0; preview->source = 0;
/* widgets */ /* widgets */
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
/* name */ /* name */
preview->name = gtk_label_new(NULL); preview->name = gtk_label_new(NULL);
@ -93,6 +99,21 @@ static GtkWidget * _preview_init(BrowserPlugin * plugin)
gtk_widget_modify_font(preview->name, font); gtk_widget_modify_font(preview->name, font);
pango_font_description_free(font); pango_font_description_free(font);
gtk_box_pack_start(GTK_BOX(vbox), preview->name, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), preview->name, FALSE, TRUE, 0);
/* mime */
widget = gtk_hbox_new(FALSE, 4);
preview->open = gtk_button_new_from_stock(GTK_STOCK_OPEN);
gtk_size_group_add_widget(group, preview->open);
g_signal_connect_swapped(preview->open, "clicked", G_CALLBACK(
_preview_on_open), plugin);
gtk_box_pack_start(GTK_BOX(widget), preview->open, FALSE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
widget = gtk_hbox_new(FALSE, 4);
preview->edit = gtk_button_new_from_stock(GTK_STOCK_EDIT);
gtk_size_group_add_widget(group, preview->edit);
g_signal_connect_swapped(preview->edit, "clicked", G_CALLBACK(
_preview_on_edit), plugin);
gtk_box_pack_start(GTK_BOX(widget), preview->edit, FALSE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
/* image */ /* image */
preview->view_image = gtk_image_new(); preview->view_image = gtk_image_new();
gtk_widget_set_no_show_all(preview->view_image, TRUE); gtk_widget_set_no_show_all(preview->view_image, TRUE);
@ -134,6 +155,7 @@ static void _preview_destroy(BrowserPlugin * plugin)
/* preview_refresh */ /* preview_refresh */
static void _refresh_mime(Preview * preview, Mime * mime, char const * type);
static int _refresh_name(BrowserPlugin * plugin, Preview * preview, static int _refresh_name(BrowserPlugin * plugin, Preview * preview,
char const * path); char const * path);
static void _refresh_reset(Preview * preview); static void _refresh_reset(Preview * preview);
@ -155,6 +177,7 @@ static void _preview_refresh(BrowserPlugin * plugin, char const * path)
return; return;
if((type = mime_type(mime, path)) == NULL) if((type = mime_type(mime, path)) == NULL)
return; return;
_refresh_mime(preview, mime, type);
if(strncmp(type, image, sizeof(image) - 1) == 0) if(strncmp(type, image, sizeof(image) - 1) == 0)
preview->source = g_idle_add(_preview_on_idle_image, plugin); preview->source = g_idle_add(_preview_on_idle_image, plugin);
else if(strncmp(type, text, sizeof(text) - 1) == 0) else if(strncmp(type, text, sizeof(text) - 1) == 0)
@ -169,6 +192,14 @@ static void _preview_refresh(BrowserPlugin * plugin, char const * path)
} }
} }
static void _refresh_mime(Preview * preview, Mime * mime, char const * type)
{
if(mime_get_handler(mime, type, "open") != NULL)
gtk_widget_show(preview->open);
if(mime_get_handler(mime, type, "edit") != NULL)
gtk_widget_show(preview->edit);
}
static int _refresh_name(BrowserPlugin * plugin, Preview * preview, static int _refresh_name(BrowserPlugin * plugin, Preview * preview,
char const * path) char const * path)
{ {
@ -189,12 +220,26 @@ static void _refresh_reset(Preview * preview)
if(preview->source != 0) if(preview->source != 0)
g_source_remove(preview->source); g_source_remove(preview->source);
preview->source = 0; preview->source = 0;
gtk_widget_hide(preview->open);
gtk_widget_hide(preview->edit);
gtk_widget_hide(preview->view_image); gtk_widget_hide(preview->view_image);
gtk_widget_hide(preview->view_text); gtk_widget_hide(preview->view_text);
} }
/* callbacks */ /* callbacks */
/* preview_on_edit */
static void _preview_on_edit(gpointer data)
{
BrowserPlugin * plugin = data;
Preview * preview = plugin->priv;
Mime * mime = plugin->helper->get_mime(plugin->helper->browser);
if(preview->path != NULL)
mime_action(mime, "edit", preview->path);
}
/* preview_on_idle_image */ /* preview_on_idle_image */
static gboolean _preview_on_idle_image(gpointer data) static gboolean _preview_on_idle_image(gpointer data)
{ {
@ -243,8 +288,28 @@ static gboolean _preview_on_idle_text(gpointer data)
} }
/* FIXME use a GIOChannel instead */ /* FIXME use a GIOChannel instead */
if((s = read(fd, buf, sizeof(buf))) > 0) if((s = read(fd, buf, sizeof(buf))) > 0)
{
if(s == sizeof(buf))
{
buf[sizeof(buf) - 3] = '.';
buf[sizeof(buf) - 2] = '.';
buf[sizeof(buf) - 1] = '.';
}
gtk_text_buffer_set_text(preview->view_text_buffer, buf, s); gtk_text_buffer_set_text(preview->view_text_buffer, buf, s);
}
close(fd); close(fd);
gtk_widget_show(preview->view_text); gtk_widget_show(preview->view_text);
return FALSE; return FALSE;
} }
/* preview_on_open */
static void _preview_on_open(gpointer data)
{
BrowserPlugin * plugin = data;
Preview * preview = plugin->priv;
Mime * mime = plugin->helper->get_mime(plugin->helper->browser);
if(preview->path != NULL)
mime_action(mime, "open", preview->path);
}