Implement Plugins panel, not quite finished but already useful
This commit is contained in:
Christian Dywan
parent
ab57a44784
commit
0fbc478a8a
4 changed files with 379 additions and 0 deletions
|
|
@ -22,6 +22,7 @@
|
|||
#include "midori-extensions.h"
|
||||
#include "midori-panel.h"
|
||||
#include "midori-preferences.h"
|
||||
#include "midori-plugins.h"
|
||||
#include "midori-stock.h"
|
||||
#include "midori-view.h"
|
||||
#include "midori-websettings.h"
|
||||
|
|
@ -1202,6 +1203,11 @@ midori_app_add_browser_cb (MidoriApp* app,
|
|||
gtk_widget_show (addon);
|
||||
midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon));
|
||||
|
||||
/* Plugins */
|
||||
addon = g_object_new (MIDORI_TYPE_PLUGINS, "app", app, NULL);
|
||||
gtk_widget_show (addon);
|
||||
midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon));
|
||||
|
||||
/* Extensions */
|
||||
addon = g_object_new (MIDORI_TYPE_EXTENSIONS, "app", app, NULL);
|
||||
gtk_widget_show (addon);
|
||||
|
|
|
|||
329
panels/midori-plugins.c
Normal file
329
panels/midori-plugins.c
Normal file
|
|
@ -0,0 +1,329 @@
|
|||
/*
|
||||
Copyright (C) 2009 Christian Dywan <christian@twotoasts.de>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
See the file COPYING for the full license text.
|
||||
*/
|
||||
|
||||
#include "midori-plugins.h"
|
||||
|
||||
#include "midori-app.h"
|
||||
#include "midori-stock.h"
|
||||
#include "midori-viewable.h"
|
||||
|
||||
#include "sokoke.h"
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
struct _MidoriPlugins
|
||||
{
|
||||
GtkVBox parent_instance;
|
||||
|
||||
GtkWidget* toolbar;
|
||||
GtkWidget* treeview;
|
||||
MidoriApp* app;
|
||||
};
|
||||
|
||||
struct _MidoriPluginsClass
|
||||
{
|
||||
GtkVBoxClass parent_class;
|
||||
};
|
||||
|
||||
static void
|
||||
midori_plugins_viewable_iface_init (MidoriViewableIface* iface);
|
||||
|
||||
G_DEFINE_TYPE_WITH_CODE (MidoriPlugins, midori_plugins, GTK_TYPE_VBOX,
|
||||
G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE,
|
||||
midori_plugins_viewable_iface_init));
|
||||
|
||||
enum
|
||||
{
|
||||
PROP_0,
|
||||
|
||||
PROP_APP
|
||||
};
|
||||
|
||||
static void
|
||||
midori_plugins_set_property (GObject* object,
|
||||
guint prop_id,
|
||||
const GValue* value,
|
||||
GParamSpec* pspec);
|
||||
|
||||
static void
|
||||
midori_plugins_get_property (GObject* object,
|
||||
guint prop_id,
|
||||
GValue* value,
|
||||
GParamSpec* pspec);
|
||||
|
||||
static void
|
||||
midori_plugins_class_init (MidoriPluginsClass* class)
|
||||
{
|
||||
GObjectClass* gobject_class;
|
||||
GParamFlags flags;
|
||||
|
||||
gobject_class = G_OBJECT_CLASS (class);
|
||||
gobject_class->set_property = midori_plugins_set_property;
|
||||
gobject_class->get_property = midori_plugins_get_property;
|
||||
|
||||
flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT;
|
||||
|
||||
g_object_class_install_property (gobject_class,
|
||||
PROP_APP,
|
||||
g_param_spec_object (
|
||||
"app",
|
||||
"App",
|
||||
"The app",
|
||||
MIDORI_TYPE_APP,
|
||||
flags));
|
||||
}
|
||||
|
||||
static const gchar*
|
||||
midori_plugins_get_label (MidoriViewable* viewable)
|
||||
{
|
||||
return _("Plugins");
|
||||
}
|
||||
|
||||
static const gchar*
|
||||
midori_plugins_get_stock_id (MidoriViewable* viewable)
|
||||
{
|
||||
/* FIXME: We need a dedicated stock id */
|
||||
return GTK_STOCK_CONVERT /* STOCK_PLUGINS */;
|
||||
}
|
||||
|
||||
static GtkWidget*
|
||||
midori_plugins_get_toolbar (MidoriViewable* plugins)
|
||||
{
|
||||
if (!MIDORI_PLUGINS (plugins)->toolbar)
|
||||
{
|
||||
GtkWidget* toolbar;
|
||||
GtkToolItem* toolitem;
|
||||
|
||||
toolbar = gtk_toolbar_new ();
|
||||
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
|
||||
gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
|
||||
toolitem = gtk_tool_item_new ();
|
||||
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
|
||||
gtk_widget_show (GTK_WIDGET (toolitem));
|
||||
|
||||
MIDORI_PLUGINS (plugins)->toolbar = toolbar;
|
||||
}
|
||||
|
||||
return MIDORI_PLUGINS (plugins)->toolbar;
|
||||
}
|
||||
|
||||
static void
|
||||
midori_plugins_viewable_iface_init (MidoriViewableIface* iface)
|
||||
{
|
||||
iface->get_stock_id = midori_plugins_get_stock_id;
|
||||
iface->get_label = midori_plugins_get_label;
|
||||
iface->get_toolbar = midori_plugins_get_toolbar;
|
||||
}
|
||||
|
||||
static void
|
||||
midori_plugins_set_property (GObject* object,
|
||||
guint prop_id,
|
||||
const GValue* value,
|
||||
GParamSpec* pspec)
|
||||
{
|
||||
MidoriPlugins* plugins = MIDORI_PLUGINS (object);
|
||||
|
||||
switch (prop_id)
|
||||
{
|
||||
case PROP_APP:
|
||||
plugins->app = g_value_get_object (value);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
midori_plugins_get_property (GObject* object,
|
||||
guint prop_id,
|
||||
GValue* value,
|
||||
GParamSpec* pspec)
|
||||
{
|
||||
MidoriPlugins* plugins = MIDORI_PLUGINS (object);
|
||||
|
||||
switch (prop_id)
|
||||
{
|
||||
case PROP_APP:
|
||||
g_value_set_object (value, plugins->app);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
midori_plugins_treeview_render_icon_cb (GtkTreeViewColumn* column,
|
||||
GtkCellRenderer* renderer,
|
||||
GtkTreeModel* model,
|
||||
GtkTreeIter* iter,
|
||||
GtkWidget* treeview)
|
||||
{
|
||||
g_object_set (renderer, "stock-id", GTK_STOCK_EXECUTE, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
midori_plugins_treeview_render_text_cb (GtkTreeViewColumn* column,
|
||||
GtkCellRenderer* renderer,
|
||||
GtkTreeModel* model,
|
||||
GtkTreeIter* iter,
|
||||
GtkWidget* treeview)
|
||||
{
|
||||
gchar* name;
|
||||
gchar* text;
|
||||
gchar* description;
|
||||
|
||||
gtk_tree_model_get (model, iter, 0, &name, 1, &description, -1);
|
||||
|
||||
text = g_strdup_printf ("%s\n%s", name, description);
|
||||
g_free (name);
|
||||
g_free (description);
|
||||
g_object_set (renderer, "text", text, NULL);
|
||||
g_free (text);
|
||||
}
|
||||
|
||||
static void
|
||||
midori_plugins_add_item (MidoriPlugins* plugins,
|
||||
const gchar* name,
|
||||
const gchar* description)
|
||||
{
|
||||
gchar* desc;
|
||||
GtkTreeIter iter;
|
||||
GtkTreeModel* model;
|
||||
|
||||
desc = g_strdup (description);
|
||||
if (desc)
|
||||
{
|
||||
gsize i, n;
|
||||
|
||||
n = strlen (desc);
|
||||
for (i = 0; i < n; i++)
|
||||
if (desc[i] == ';')
|
||||
desc[i] = '\n';
|
||||
}
|
||||
model = gtk_tree_view_get_model (GTK_TREE_VIEW (plugins->treeview));
|
||||
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
|
||||
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
|
||||
0, name, 1, desc, -1);
|
||||
g_free (desc);
|
||||
}
|
||||
|
||||
static void
|
||||
midori_plugins_init (MidoriPlugins* plugins)
|
||||
{
|
||||
/* Create the treeview */
|
||||
GtkTreeViewColumn* column;
|
||||
GtkCellRenderer* renderer_text;
|
||||
GtkCellRenderer* renderer_pixbuf;
|
||||
GtkListStore* liststore = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
|
||||
plugins->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore));
|
||||
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (plugins->treeview), FALSE);
|
||||
column = gtk_tree_view_column_new ();
|
||||
renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
|
||||
gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE);
|
||||
gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf,
|
||||
(GtkTreeCellDataFunc)midori_plugins_treeview_render_icon_cb,
|
||||
plugins->treeview, NULL);
|
||||
renderer_text = gtk_cell_renderer_text_new ();
|
||||
gtk_tree_view_column_pack_start (column, renderer_text, FALSE);
|
||||
gtk_tree_view_column_set_cell_data_func (column, renderer_text,
|
||||
(GtkTreeCellDataFunc)midori_plugins_treeview_render_text_cb,
|
||||
plugins->treeview, NULL);
|
||||
gtk_tree_view_append_column (GTK_TREE_VIEW (plugins->treeview), column);
|
||||
g_object_unref (liststore);
|
||||
gtk_widget_show (plugins->treeview);
|
||||
gtk_box_pack_start (GTK_BOX (plugins), plugins->treeview, TRUE, TRUE, 0);
|
||||
|
||||
/* FIXME: Monitor folders for newly added and removes files */
|
||||
if (g_module_supported ())
|
||||
{
|
||||
/* FIXME: WebKit is also looking in legacy folders,
|
||||
we should have API to obtain that same list. */
|
||||
gchar** plugin_dirs;
|
||||
gsize i = 0;
|
||||
|
||||
if (g_getenv ("MOZ_PLUGIN_PATH"))
|
||||
plugin_dirs = g_strsplit (g_getenv ("MOZ_PLUGIN_PATH"), ":", 0);
|
||||
else
|
||||
plugin_dirs = g_strsplit ("/usr/lib/mozilla/plugins", ":", 0);
|
||||
|
||||
while (plugin_dirs[i])
|
||||
{
|
||||
gchar* plugin_path;
|
||||
GDir* plugin_dir;
|
||||
|
||||
plugin_path = g_build_filename (plugin_dirs[i], NULL);
|
||||
plugin_dir = g_dir_open (plugin_path, 0, NULL);
|
||||
if (plugin_dir != 0)
|
||||
{
|
||||
const gchar* filename;
|
||||
|
||||
while ((filename = g_dir_read_name (plugin_dir)))
|
||||
{
|
||||
gchar* fullname;
|
||||
GModule* module;
|
||||
typedef int (*NP_GetValue_func)(void* instance,
|
||||
int variable,
|
||||
void* value);
|
||||
NP_GetValue_func NP_GetValue;
|
||||
const gchar* plugin_name;
|
||||
const gchar* plugin_description;
|
||||
|
||||
fullname = g_build_filename (plugin_path, filename, NULL);
|
||||
module = g_module_open (fullname, G_MODULE_BIND_LOCAL);
|
||||
g_free (fullname);
|
||||
|
||||
if (module && g_module_symbol (module, "NP_GetValue",
|
||||
(gpointer) &NP_GetValue))
|
||||
{
|
||||
typedef const gchar* (*NP_GetMIMEDescription_func)(void);
|
||||
NP_GetMIMEDescription_func NP_GetMIMEDescription;
|
||||
|
||||
NP_GetValue (NULL, 2, &plugin_name);
|
||||
if (g_module_symbol (module, "NP_GetMIMEDescription",
|
||||
(gpointer) &NP_GetMIMEDescription))
|
||||
plugin_description = NP_GetMIMEDescription ();
|
||||
else
|
||||
plugin_description = g_module_error ();
|
||||
}
|
||||
else
|
||||
{
|
||||
plugin_name = filename;
|
||||
plugin_description = g_module_error ();
|
||||
}
|
||||
|
||||
midori_plugins_add_item (plugins, plugin_name, plugin_description);
|
||||
}
|
||||
g_dir_close (plugin_dir);
|
||||
}
|
||||
g_free (plugin_path);
|
||||
i++;
|
||||
}
|
||||
g_strfreev (plugin_dirs);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* midori_plugins_new:
|
||||
*
|
||||
* Creates a new empty plugins.
|
||||
*
|
||||
* Return value: a new #MidoriPlugins
|
||||
*
|
||||
* Since: 0.1.3
|
||||
**/
|
||||
GtkWidget*
|
||||
midori_plugins_new (void)
|
||||
{
|
||||
MidoriPlugins* plugins = g_object_new (MIDORI_TYPE_PLUGINS, NULL);
|
||||
|
||||
return GTK_WIDGET (plugins);
|
||||
}
|
||||
43
panels/midori-plugins.h
Normal file
43
panels/midori-plugins.h
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
/*
|
||||
Copyright (C) 2009 Christian Dywan <christian@twotoasts.de>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
See the file COPYING for the full license text.
|
||||
*/
|
||||
|
||||
#ifndef __MIDORI_PLUGINS_H__
|
||||
#define __MIDORI_PLUGINS_H__
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define MIDORI_TYPE_PLUGINS \
|
||||
(midori_plugins_get_type ())
|
||||
#define MIDORI_PLUGINS(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_PLUGINS, MidoriPlugins))
|
||||
#define MIDORI_PLUGINS_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_PLUGINS, MidoriPluginsClass))
|
||||
#define MIDORI_IS_PLUGINS(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_PLUGINS))
|
||||
#define MIDORI_IS_PLUGINS_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_PLUGINS))
|
||||
#define MIDORI_PLUGINS_GET_CLASS(obj) \
|
||||
(G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_PLUGINS, MidoriPluginsClass))
|
||||
|
||||
typedef struct _MidoriPlugins MidoriPlugins;
|
||||
typedef struct _MidoriPluginsClass MidoriPluginsClass;
|
||||
|
||||
GType
|
||||
midori_plugins_get_type (void);
|
||||
|
||||
GtkWidget*
|
||||
midori_plugins_new (void);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __MIDORI_PLUGINS_H__ */
|
||||
|
|
@ -15,6 +15,7 @@ midori/gjs.c
|
|||
panels/midori-addons.c
|
||||
panels/midori-console.c
|
||||
panels/midori-extensions.c
|
||||
panels/midori-plugins.c
|
||||
katze/katze-throbber.c
|
||||
katze/katze-utils.c
|
||||
katze/katze-item.c
|
||||
|
|
|
|||
Loading…
Reference in a new issue