aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2007-12-04 18:57:59 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-12-04 18:57:59 +0800
commitf4d3ee5d5923e8a91b45fc6dd8eb8fb2857f41de (patch)
tree3ef9dad0d4187b2b42f3e7216a88b07e885dba79
parent70663baf3f0e922ed4f6c5560880b66281aaf037 (diff)
downloadgsoc2013-evolution-f4d3ee5d5923e8a91b45fc6dd8eb8fb2857f41de.tar.gz
gsoc2013-evolution-f4d3ee5d5923e8a91b45fc6dd8eb8fb2857f41de.tar.zst
gsoc2013-evolution-f4d3ee5d5923e8a91b45fc6dd8eb8fb2857f41de.zip
** Fix for bug #500210
2007-12-04 Milan Crha <mcrha@redhat.com> ** Fix for bug #500210 * plugins/plugin-manager/plugin-manager.c: Changed coding-style to be more accurate to other sources, but the main change was to show configuration options of the plugin into extra tab, instead of new popup under 'Configure' button. * e-util/e-plugin.h: * e-util/e-plugin.c: (e_plugin_configure), (e_plugin_is_configurable), (epl_configure), (e_plugin_get_configure_widget), (epl_get_configure_widget): Removed old configure functions, replaced by get_configure_widget functions, to be able show plugin configuration in a tab of plugin manager. svn path=/trunk/; revision=34639
-rw-r--r--e-util/ChangeLog11
-rw-r--r--e-util/e-plugin.c58
-rw-r--r--e-util/e-plugin.h8
-rw-r--r--plugins/plugin-manager/ChangeLog8
-rw-r--r--plugins/plugin-manager/plugin-manager.c382
5 files changed, 251 insertions, 216 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 0c5834debc..06a841a3d7 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-04 Milan Crha <mcrha@redhat.com>
+
+ ** Part of fix for bug #500210
+
+ * e-plugin.h:
+ * e-plugin.c: (e_plugin_configure), (e_plugin_is_configurable),
+ (epl_configure), (e_plugin_get_configure_widget),
+ (epl_get_configure_widget): Removed old configure functions,
+ replaced by get_configure_widget functions, to be able show
+ plugin configuration in a tab of plugin manager.
+
2007-12-03 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #392747
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 054298a942..0a87513adf 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -685,18 +685,20 @@ e_plugin_enable(EPlugin *ep, int state)
}
/**
-* e_plugin_configure:
-* @ep:
-*
-*
-**/
-
-void
-e_plugin_configure (EPlugin *ep)
+ * e_plugin_get_configure_widget
+ *
+ * @param ep EPlugin of our interest.
+ * @return Configure widget or NULL if there is no configure option for the plugin.
+ *
+ * Plugin itself should have implemented "e_plugin_lib_get_configure_widget" function
+ * of prototype EPluginLibGetConfigureWidgetFunc.
+ **/
+GtkWidget *
+e_plugin_get_configure_widget (EPlugin *ep)
{
EPluginClass *ptr;
ptr = ((EPluginClass *)G_OBJECT_GET_CLASS(ep));
- ptr->configure (ep);
+ return ptr->get_configure_widget (ep);
}
/**
@@ -929,37 +931,23 @@ epl_construct(EPlugin *ep, xmlNodePtr root)
return 0;
}
-gboolean
-e_plugin_is_configurable (EPlugin *ep)
+static GtkWidget *
+epl_get_configure_widget (EPlugin *ep)
{
- EPluginLibConfigureFunc configure;
-
- pd(printf ("\n epl_configure \n"));
+ EPluginLibGetConfigureWidgetFunc get_configure_widget;
- if (epl_loadmodule(ep) != 0) {
- pd(printf ("\n epl_loadmodule \n"));
- return FALSE;
- }
+ pd (printf ("\n epl_get_configure_widget \n"));
- if (g_module_symbol(epl->module, "e_plugin_lib_configure", (void *)&configure)) {
- pd(printf ("\n g_module_symbol is loaded\n"));
- return TRUE;
+ if (epl_loadmodule (ep) != 0) {
+ pd (printf ("\n epl_loadmodule \n"));
+ return NULL;
}
- return FALSE;
-}
-
-static void
-epl_configure (EPlugin *ep)
-{
- EPluginLibConfigureFunc configure;
-
- pd(printf ("\n epl_configure \n"));
- /* Probably we dont need a load_module */
- if (g_module_symbol(epl->module, "e_plugin_lib_configure", (void *)&configure)) {
- pd(printf ("\n g_module_symbol is loaded\n"));
- configure (epl);
+ if (g_module_symbol (epl->module, "e_plugin_lib_get_configure_widget", (void *)&get_configure_widget)) {
+ pd (printf ("\n g_module_symbol is loaded\n"));
+ return (GtkWidget*) get_configure_widget (epl);
}
+ return NULL;
}
static void
@@ -1009,7 +997,7 @@ epl_class_init(EPluginClass *klass)
klass->construct = epl_construct;
klass->invoke = epl_invoke;
klass->enable = epl_enable;
- klass->configure = epl_configure;
+ klass->get_configure_widget = epl_get_configure_widget;
klass->type = "shlib";
}
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index 1d628dacd4..07795d0ca8 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -5,6 +5,7 @@
#include <glib.h>
#include <glib-object.h>
#include <libxml/tree.h>
+#include <gtk/gtkwidget.h>
/* ********************************************************************** */
@@ -85,7 +86,7 @@ struct _EPluginClass {
int (*construct)(EPlugin *, xmlNodePtr root);
void *(*invoke)(EPlugin *, const char *name, void *data);
void (*enable)(EPlugin *, int state);
- void (*configure)(EPlugin *);
+ GtkWidget *(*get_configure_widget)(EPlugin *);
};
GType e_plugin_get_type(void);
@@ -99,9 +100,8 @@ void e_plugin_register_type(GType type);
void *e_plugin_invoke(EPlugin *ep, const char *name, void *data);
void e_plugin_enable(EPlugin *eph, int state);
-void e_plugin_configure (EPlugin *eph);
-gboolean e_plugin_is_configurable (EPlugin *ep);
+GtkWidget *e_plugin_get_configure_widget (EPlugin *ep);
/* static helpers */
/* maps prop or content to 'g memory' */
@@ -123,7 +123,7 @@ typedef void *(*EPluginLibFunc)(EPluginLib *ep, void *data);
* initialised. In the future it may also be called when the plugin
* is disabled. */
typedef int (*EPluginLibEnableFunc)(EPluginLib *ep, int enable);
-typedef int (*EPluginLibConfigureFunc)(EPluginLib *ep);
+typedef void *(*EPluginLibGetConfigureWidgetFunc)(EPluginLib *ep);
/**
* struct _EPluginLib -
diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog
index 108affe08c..f7b8a3eeeb 100644
--- a/plugins/plugin-manager/ChangeLog
+++ b/plugins/plugin-manager/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-04 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #500210
+
+ * plugin-manager.c: Changed coding-style to be more accurate to other
+ sources, but the main change was to show configuration options of the
+ plugin into extra tab, instead of new popup under 'Configure' button.
+
2007-11-19 Sankar P <psankar@novell.com>
** Fix for bug #498173
diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c
index 4bd4694fa3..73b6a37f78 100644
--- a/plugins/plugin-manager/plugin-manager.c
+++ b/plugins/plugin-manager/plugin-manager.c
@@ -28,6 +28,7 @@
#include <gtk/gtkstock.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkhbox.h>
+#include <gtk/gtknotebook.h>
#include "e-util/e-plugin.h"
#include "shell/es-menu.h"
@@ -45,7 +46,8 @@ enum
{
COL_PLUGIN_ENABLED = 0,
COL_PLUGIN_NAME,
- COL_PLUGIN_DATA
+ COL_PLUGIN_DATA,
+ COL_PLUGIN_CFG_WIDGET
};
static struct {
@@ -65,308 +67,342 @@ struct _Manager {
GtkLabel *labels[LABEL_LAST];
GtkLabel *items[LABEL_LAST];
+ GtkWidget *config_plugin_label;
+ GtkWidget *active_cfg_widget;
+
GSList *plugins;
};
/* for tracking if we're shown */
static GtkDialog *dialog;
-static const int RESPONSE_CONFIGURE = 1;
-
void org_gnome_plugin_manager_manage(void *ep, ESMenuTargetShell *t);
-int e_plugin_lib_configure(EPluginLib *ep);
static void
-eppm_set_label(GtkLabel *l, const char *v)
+eppm_set_label (GtkLabel *l, const char *v)
{
gtk_label_set_label(l, v?v:_("Unknown"));
}
static void
-eppm_show_plugin(Manager *m, EPlugin *ep)
+eppm_show_plugin (Manager *m, EPlugin *ep, GtkWidget *cfg_widget)
{
- char *string = NULL;
-
if (ep) {
- string = g_strdup_printf("<span size=\"x-large\">%s</span>", ep->name);
- gtk_label_set_markup(GTK_LABEL(m->items[LABEL_NAME]), string);
- g_free(string);
+ char *string;
+
+ string = g_strdup_printf ("<span size=\"x-large\">%s</span>", ep->name);
+ gtk_label_set_markup (GTK_LABEL (m->items[LABEL_NAME]), string);
+ gtk_label_set_markup (GTK_LABEL (m->config_plugin_label), string);
+ g_free (string);
if (ep->authors) {
GSList *l = ep->authors;
- GString *out = g_string_new("");
+ GString *out = g_string_new ("");
- for (;l;l = g_slist_next(l)) {
+ for (; l; l = g_slist_next (l)) {
EPluginAuthor *epa = l->data;
if (l != ep->authors)
- g_string_append(out, ",\n");
+ g_string_append (out, ",\n");
if (epa->name)
- g_string_append(out, epa->name);
+ g_string_append (out, epa->name);
if (epa->email) {
- g_string_append(out, " <");
- g_string_append(out, epa->email);
- g_string_append(out, ">");
+ g_string_append (out, " <");
+ g_string_append (out, epa->email);
+ g_string_append (out, ">");
}
}
- gtk_label_set_label(m->items[LABEL_AUTHOR], out->str);
- g_string_free(out, TRUE);
+ gtk_label_set_label (m->items[LABEL_AUTHOR], out->str);
+ g_string_free (out, TRUE);
} else {
- eppm_set_label(m->items[LABEL_AUTHOR], NULL);
+ eppm_set_label (m->items[LABEL_AUTHOR], NULL);
}
- eppm_set_label(m->items[LABEL_DESCRIPTION], ep->description);
+ eppm_set_label (m->items[LABEL_DESCRIPTION], ep->description);
} else {
int i;
- for (i=0;i<LABEL_LAST;i++)
- gtk_label_set_label(m->items[i], "");
+ gtk_label_set_markup (GTK_LABEL (m->config_plugin_label), "");
+ for (i = 0; i < LABEL_LAST; i++)
+ gtk_label_set_label (m->items[i], "");
+ }
+
+ if (m->active_cfg_widget != cfg_widget) {
+ if (m->active_cfg_widget)
+ gtk_widget_hide (m->active_cfg_widget);
+
+ if (cfg_widget)
+ gtk_widget_show (cfg_widget);
+
+ m->active_cfg_widget = cfg_widget;
}
}
static void
-eppm_selection_changed(GtkTreeSelection *selection, Manager *m)
+eppm_selection_changed (GtkTreeSelection *selection, Manager *m)
{
GtkTreeModel *model;
GtkTreeIter iter;
- if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
+ if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
EPlugin *ep;
- gboolean enabled = FALSE;
-
- gtk_tree_model_get(model, &iter, COL_PLUGIN_DATA, &ep, -1);
- eppm_show_plugin(m, ep);
+ GtkWidget *cfg_widget = NULL;
- enabled = e_plugin_is_configurable (ep);
-
- gtk_dialog_set_response_sensitive (m->dialog, RESPONSE_CONFIGURE, enabled);
+ gtk_tree_model_get (model, &iter, COL_PLUGIN_DATA, &ep, COL_PLUGIN_CFG_WIDGET, &cfg_widget, -1);
+ eppm_show_plugin (m, ep, cfg_widget);
} else {
- eppm_show_plugin(m, NULL);
+ eppm_show_plugin (m, NULL, NULL);
}
}
static void
-eppm_enable_toggled(GtkCellRendererToggle *renderer, const char *path_string, Manager *m)
+eppm_enable_toggled (GtkCellRendererToggle *renderer, const char *path_string, Manager *m)
{
GtkTreePath *path;
GtkTreeIter iter;
EPlugin *plugin;
- path = gtk_tree_path_new_from_string(path_string);
+ path = gtk_tree_path_new_from_string (path_string);
- if (gtk_tree_model_get_iter(m->model, &iter, path)) {
- gtk_tree_model_get(m->model, &iter, COL_PLUGIN_DATA, &plugin, -1);
- e_plugin_enable(plugin, !plugin->enabled);
+ if (gtk_tree_model_get_iter (m->model, &iter, path)) {
+ gtk_tree_model_get (m->model, &iter, COL_PLUGIN_DATA, &plugin, -1);
+ e_plugin_enable (plugin, !plugin->enabled);
- g_warning( plugin->name );
+ g_warning (plugin->name);
- gtk_list_store_set(GTK_LIST_STORE(m->model), &iter,
- COL_PLUGIN_ENABLED, plugin->enabled,
- -1);
+ gtk_list_store_set (GTK_LIST_STORE(m->model), &iter,
+ COL_PLUGIN_ENABLED, plugin->enabled,
+ -1);
}
- gtk_tree_path_free(path);
+ gtk_tree_path_free (path);
}
static void
-eppm_free(void *data)
+eppm_free (void *data)
{
Manager *m = data;
GSList *l;
- for (l = m->plugins;l;l=g_slist_next(l))
- g_object_unref(l->data);
- g_slist_free(m->plugins);
-
- g_object_unref(m->model);
+ for (l = m->plugins; l; l = g_slist_next (l))
+ g_object_unref (l->data);
- g_free(m);
+ g_slist_free (m->plugins);
+ g_object_unref (m->model);
+ g_free (m);
}
static void
-eppm_response(GtkDialog *w, int button, Manager *m)
+eppm_response (GtkDialog *w, int button, Manager *m)
{
if (button == GTK_RESPONSE_CLOSE) {
- gtk_widget_destroy((GtkWidget*)w);
+ gtk_widget_destroy (GTK_WIDGET (w));
dialog = NULL;
- } else if (button == RESPONSE_CONFIGURE) {
- GtkTreeSelection *selection = NULL;
- GtkTreeModel *model = NULL;
- GtkTreeIter iter;
-
- selection = gtk_tree_view_get_selection(m->treeview);
- if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
- EPlugin *ep = NULL;
-
- gtk_tree_model_get(model, &iter, COL_PLUGIN_DATA, &ep, -1);
-
- e_plugin_configure (ep);
- } else
- d(printf ("\n\a No Plugin is selected \n\a"));
}
}
void
-org_gnome_plugin_manager_manage(void *ep, ESMenuTargetShell *t)
+org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t)
{
Manager *m;
int i;
GtkWidget *hbox, *w;
+ GtkWidget *notebook, *overview_page, *configure_page, *def_configure_label;
GtkListStore *store;
GtkTreeSelection *selection;
GtkCellRenderer *renderer;
GSList *l;
char *string;
- GtkWidget *vbox, *subvbox;
+ GtkWidget *subvbox;
if (dialog) {
- gdk_window_raise(((GtkWidget *)dialog)->window);
+ gdk_window_raise (GTK_WIDGET (dialog)->window);
return;
}
- m = g_malloc0(sizeof(*m));
+ m = g_malloc0 (sizeof (*m));
/* Setup the ui */
- m->dialog = (GtkDialog *)gtk_dialog_new_with_buttons(_("Plugin Manager"),
- (GtkWindow *)gtk_widget_get_toplevel(t->target.widget),
+ m->dialog = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Plugin Manager"),
+ GTK_WINDOW (gtk_widget_get_toplevel (t->target.widget)),
GTK_DIALOG_DESTROY_WITH_PARENT,
- _("Con_figure"), RESPONSE_CONFIGURE,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
- NULL);
-
- gtk_window_set_default_size((GtkWindow *)m->dialog, 640, 400);
- g_object_set((GObject *)m->dialog, "has_separator", FALSE, NULL);
-
- hbox = gtk_hbox_new(FALSE, 0);
- gtk_container_set_border_width((GtkContainer *)hbox, 12);
- gtk_box_pack_start((GtkBox *)m->dialog->vbox, hbox, TRUE, TRUE, 0);
-
- string = g_strdup_printf("<i>%s</i>", _("Note: Some changes will not take effect until restart"));
-
- w = g_object_new(gtk_label_get_type(),
- "label", string,
- "wrap", FALSE,
- "use_markup", TRUE,
- NULL);
- gtk_widget_show(w);
-
- gtk_box_pack_start((GtkBox *)m->dialog->vbox, w, FALSE, TRUE, 6);
-
- store = gtk_list_store_new(3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER);
+ NULL));
+
+ gtk_window_set_default_size (GTK_WINDOW (m->dialog), 640, 400);
+ g_object_set (G_OBJECT (m->dialog), "has_separator", FALSE, NULL);
+
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
+ gtk_box_pack_start (GTK_BOX (m->dialog->vbox), hbox, TRUE, TRUE, 0);
+
+ string = g_strdup_printf ("<i>%s</i>", _("Note: Some changes will not take effect until restart"));
+
+ w = g_object_new (gtk_label_get_type (),
+ "label", string,
+ "wrap", FALSE,
+ "use_markup", TRUE,
+ NULL);
+ gtk_widget_show (w);
+ g_free (string);
+
+ gtk_box_pack_start (GTK_BOX (m->dialog->vbox), w, FALSE, TRUE, 6);
+
+ notebook = gtk_notebook_new ();
+ gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), TRUE);
+ gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
+ gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE);
+ gtk_notebook_set_homogeneous_tabs (GTK_NOTEBOOK (notebook), TRUE);
+
+ overview_page = gtk_vbox_new (FALSE, 0);
+ configure_page = gtk_vbox_new (FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (overview_page), 10);
+ gtk_container_set_border_width (GTK_CONTAINER (configure_page), 10);
+ gtk_notebook_append_page_menu (GTK_NOTEBOOK (notebook), overview_page, gtk_label_new (_("Overview")), NULL);
+ gtk_notebook_append_page_menu (GTK_NOTEBOOK (notebook), configure_page, gtk_label_new (_("Configuration")), NULL);
+
+ gtk_widget_show (notebook);
+ gtk_widget_show (overview_page);
+ gtk_widget_show (configure_page);
+
+ /* name of plugin on "Configuration" tab */
+ m->config_plugin_label = g_object_new (
+ gtk_label_get_type (),
+ "wrap", TRUE,
+ "selectable", FALSE,
+ "xalign", 0.0,
+ "yalign", 0.0, NULL);
+ gtk_widget_show (m->config_plugin_label);
+ gtk_box_pack_start (GTK_BOX (configure_page), m->config_plugin_label, FALSE, FALSE, 6);
+
+ def_configure_label = gtk_label_new (_("There is no configuration option for this plugin."));
+ gtk_widget_hide (def_configure_label);
+ gtk_box_pack_start (GTK_BOX (configure_page), def_configure_label, FALSE, FALSE, 6);
+
+ store = gtk_list_store_new (4, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER, GTK_TYPE_WIDGET);
/* fill store */
- m->plugins = e_plugin_list_plugins();
+ m->plugins = e_plugin_list_plugins ();
- for (l=m->plugins;l;l=g_slist_next(l)) {
+ for (l = m->plugins; l; l = g_slist_next (l)) {
EPlugin *ep = l->data;
GtkTreeIter iter;
+ GtkWidget *cfg_widget;
/* hide ourselves always */
- if (!strcmp(ep->id, "org.gnome.evolution.plugin.manager"))
+ if (!strcmp (ep->id, "org.gnome.evolution.plugin.manager"))
continue;
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- COL_PLUGIN_ENABLED, ep->enabled,
- COL_PLUGIN_NAME, ep->name?ep->name:ep->id,
- COL_PLUGIN_DATA, ep,
- -1);
- }
+ cfg_widget = e_plugin_get_configure_widget (ep);
+ if (!cfg_widget) {
+ cfg_widget = def_configure_label;
+ } else {
+ gtk_widget_hide (cfg_widget);
+ gtk_box_pack_start (GTK_BOX (configure_page), cfg_widget, FALSE, FALSE, 6);
+ }
- gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE (store),
- COL_PLUGIN_NAME, GTK_SORT_ASCENDING);
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ COL_PLUGIN_ENABLED, ep->enabled,
+ COL_PLUGIN_NAME, ep->name ? ep->name : ep->id,
+ COL_PLUGIN_DATA, ep,
+ COL_PLUGIN_CFG_WIDGET, cfg_widget,
+ -1);
+ }
/* setup the treeview */
- m->treeview = (GtkTreeView *)gtk_tree_view_new();
- gtk_tree_view_set_reorderable(GTK_TREE_VIEW(m->treeview), FALSE);
- gtk_tree_view_set_model(m->treeview, GTK_TREE_MODEL (store));
- gtk_tree_view_set_search_column(m->treeview, COL_PLUGIN_NAME);
- gtk_tree_view_set_headers_visible(m->treeview, TRUE);
+ m->treeview = GTK_TREE_VIEW (gtk_tree_view_new ());
+ gtk_tree_view_set_reorderable (m->treeview, FALSE);
+ gtk_tree_view_set_model (m->treeview, GTK_TREE_MODEL (store));
+ gtk_tree_view_set_search_column (m->treeview, COL_PLUGIN_NAME);
+ gtk_tree_view_set_headers_visible (m->treeview, TRUE);
- m->model = GTK_TREE_MODEL(store);
+ m->model = GTK_TREE_MODEL (store);
- renderer = gtk_cell_renderer_toggle_new();
- gtk_tree_view_insert_column_with_attributes(m->treeview,
- COL_PLUGIN_ENABLED, _("Enabled"),
- renderer, "active", COL_PLUGIN_ENABLED,
- NULL);
- g_signal_connect(renderer, "toggled", G_CALLBACK(eppm_enable_toggled), m);
+ renderer = gtk_cell_renderer_toggle_new ();
+ gtk_tree_view_insert_column_with_attributes (m->treeview,
+ COL_PLUGIN_ENABLED, _("Enabled"),
+ renderer, "active", COL_PLUGIN_ENABLED,
+ NULL);
+ g_signal_connect (renderer, "toggled", G_CALLBACK (eppm_enable_toggled), m);
renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes(m->treeview,
- COL_PLUGIN_NAME, _("Plugin"),
- renderer, "text", COL_PLUGIN_NAME,
- NULL);
+ gtk_tree_view_insert_column_with_attributes (m->treeview,
+ COL_PLUGIN_NAME, _("Plugin"),
+ renderer, "text", COL_PLUGIN_NAME,
+ NULL);
/* set sort column */
- gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(m->model), COL_PLUGIN_NAME, GTK_SORT_ASCENDING);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (m->model), COL_PLUGIN_NAME, GTK_SORT_ASCENDING);
+
+ w = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (w), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (w), GTK_SHADOW_IN);
+ gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (m->treeview));
+
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (w), FALSE, TRUE, 6);
- w = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy((GtkScrolledWindow *)w, GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
- gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)w, GTK_SHADOW_IN);
- gtk_container_add((GtkContainer *)w, (GtkWidget *)m->treeview);
- gtk_box_pack_start((GtkBox *)hbox, (GtkWidget *)w, FALSE, TRUE, 6);
+ /* Show all widgets in hbox before we pack there notebook, because not all widgets in notebook
+ are going to be visible at one moment. */
+ gtk_widget_show_all (hbox);
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_box_pack_start((GtkBox *)hbox, vbox, TRUE, TRUE, 6);
+ gtk_box_pack_start (GTK_BOX (hbox), notebook, TRUE, TRUE, 6);
/* this is plugin's name label */
- subvbox = gtk_vbox_new(FALSE, 0);
- m->items[0] = g_object_new(gtk_label_get_type(),
- "wrap", TRUE,
- "selectable", FALSE,
- "xalign", 0.0,
- "yalign", 0.0, NULL);
- gtk_box_pack_start((GtkBox *)subvbox, (GtkWidget *)m->items[0], TRUE, TRUE, 0);
- gtk_box_pack_start((GtkBox *)vbox, subvbox, FALSE, TRUE, 6);
+ subvbox = gtk_vbox_new (FALSE, 6);
+ m->items[0] = g_object_new (gtk_label_get_type (),
+ "wrap", TRUE,
+ "selectable", FALSE,
+ "xalign", 0.0,
+ "yalign", 0.0, NULL);
+ gtk_box_pack_start (GTK_BOX (subvbox), GTK_WIDGET (m->items[0]), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (overview_page), subvbox, FALSE, TRUE, 6);
/* this is every other data */
- for (i=1;i<LABEL_LAST;i++) {
+ for (i = 1; i < LABEL_LAST; i++) {
char *markup;
- subvbox = gtk_vbox_new(FALSE, 0);
-
- markup = g_strdup_printf("<span weight=\"bold\">%s :</span>", _(label_info[i].label));
- m->labels[i] = g_object_new(gtk_label_get_type(),
- "label", markup,
- "use_markup", TRUE,
+ subvbox = gtk_vbox_new (FALSE, 6);
+
+ markup = g_strdup_printf ("<span weight=\"bold\">%s :</span>", _(label_info[i].label));
+ m->labels[i] = g_object_new (gtk_label_get_type (),
+ "label", markup,
+ "use_markup", TRUE,
+ "xalign", 0.0,
+ "yalign", 0.0, NULL);
+ gtk_box_pack_start (GTK_BOX (subvbox), GTK_WIDGET (m->labels[i]), FALSE, TRUE, 0);
+ g_free (markup);
+
+ m->items[i] = g_object_new (gtk_label_get_type (),
+ "wrap", TRUE,
+ "selectable", TRUE,
+ "can-focus", FALSE,
"xalign", 0.0,
"yalign", 0.0, NULL);
- gtk_box_pack_start((GtkBox *)subvbox, (GtkWidget *)m->labels[i], FALSE, TRUE, 0);
- g_free(markup);
-
- m->items[i] = g_object_new(gtk_label_get_type(),
- "wrap", TRUE,
- "selectable", TRUE,
- "xalign", 0.0,
- "yalign", 0.0, NULL);
- gtk_box_pack_start((GtkBox *)subvbox, (GtkWidget *)m->items[i], TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (subvbox), GTK_WIDGET (m->items[i]), TRUE, TRUE, 0);
- gtk_box_pack_start((GtkBox *)vbox, subvbox, FALSE, TRUE, 6);
+ gtk_box_pack_start (GTK_BOX (overview_page), subvbox, FALSE, TRUE, 6);
}
- gtk_widget_show_all(hbox);
-
- selection = gtk_tree_view_get_selection(m->treeview);
- gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
- g_signal_connect(selection, "changed", G_CALLBACK(eppm_selection_changed), m);
+ gtk_widget_show_all (overview_page);
+ selection = gtk_tree_view_get_selection (m->treeview);
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+ g_signal_connect (selection, "changed", G_CALLBACK (eppm_selection_changed), m);
- atk_object_set_name (gtk_widget_get_accessible ((GtkWidget *)m->treeview), _("Plugin"));
+ atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (m->treeview)), _("Plugin"));
- g_object_set_data_full((GObject *)m->dialog, "plugin-manager", m, eppm_free);
- g_signal_connect(m->dialog, "response", G_CALLBACK(eppm_response), m);
+ g_object_set_data_full (G_OBJECT (m->dialog), "plugin-manager", m, eppm_free);
+ g_signal_connect (m->dialog, "response", G_CALLBACK (eppm_response), m);
- gtk_widget_show((GtkWidget *)m->dialog);
+ gtk_widget_show (GTK_WIDGET (m->dialog));
}
-int e_plugin_lib_enable(EPluginLib *ep, int enable);
-
-int e_plugin_lib_configure(EPluginLib *ep);
+int e_plugin_lib_enable (EPluginLib *ep, int enable);
int
-e_plugin_lib_enable(EPluginLib *ep, int enable)
+e_plugin_lib_enable (EPluginLib *ep, int enable)
{
if (enable) {
} else {
@@ -376,11 +412,3 @@ e_plugin_lib_enable(EPluginLib *ep, int enable)
return 0;
}
-
-int
-e_plugin_lib_configure(EPluginLib *ep)
-{
- d(printf ("\n\a e_plugin_lib_configure in plugin-manager\n\a"));
- /* Makes no sense as this plugin is never shown */
- return 0;
-}