debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify MidoriConsole, remove Private

Browse source
This commit is contained in:
Christian Dywan 2008-06-19 20:40:01 +02:00
parent a7ebd75387
commit 585977cb02
2 changed files with 23 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
midori/midori-console.c
View file

@ -14,32 +14,28 @@
#include "sokoke.h" #include "sokoke.h"
#include <glib/gi18n.h> #include <glib/gi18n.h>
G_DEFINE_TYPE (MidoriConsole, midori_console, GTK_TYPE_VBOX) struct _MidoriConsole
struct _MidoriConsolePrivate
{ {
GtkVBox parent_instance;
GtkWidget* toolbar; GtkWidget* toolbar;
GtkWidget* treeview; GtkWidget* treeview;
}; };
#define MIDORI_CONSOLE_GET_PRIVATE(obj) \ G_DEFINE_TYPE (MidoriConsole, midori_console, GTK_TYPE_VBOX)
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
MIDORI_TYPE_CONSOLE, MidoriConsolePrivate))
static void static void
midori_console_class_init (MidoriConsoleClass* class) midori_console_class_init (MidoriConsoleClass* class)
{ {
g_type_class_add_private (class, sizeof (MidoriConsolePrivate)); /* Nothing to do */
} }
static void static void
midori_console_button_clear_clicked_cb (GtkToolItem* toolitem, midori_console_button_clear_clicked_cb (GtkToolItem* toolitem,
MidoriConsole* console) MidoriConsole* console)
{ {
MidoriConsolePrivate* priv = console->priv;
GtkTreeModel* model = gtk_tree_view_get_model ( GtkTreeModel* model = gtk_tree_view_get_model (
GTK_TREE_VIEW (priv->treeview)); GTK_TREE_VIEW (console->treeview));
gtk_tree_store_clear (GTK_TREE_STORE (model)); gtk_tree_store_clear (GTK_TREE_STORE (model));
} }
@ -50,12 +46,12 @@ midori_console_treeview_render_icon_cb (GtkTreeViewColumn* column,
GtkTreeIter* iter, GtkTreeIter* iter,
GtkWidget* treeview) GtkWidget* treeview)
{ {
// gchar* source_id; /* gchar* source_id;
// gtk_tree_model_get (model, iter, 2, &source_id, -1); gtk_tree_model_get (model, iter, 2, &source_id, -1); */
g_object_set (renderer, "stock-id", GTK_STOCK_DIALOG_WARNING, NULL); g_object_set (renderer, "stock-id", GTK_STOCK_DIALOG_WARNING, NULL);
// g_free (source_id); /* g_free (source_id); */
} }
static void static void
@ -97,37 +93,33 @@ midori_console_treeview_row_activated_cb (GtkTreeView* treeview,
static void static void
midori_console_init (MidoriConsole* console) midori_console_init (MidoriConsole* console)
{ {
console->priv = MIDORI_CONSOLE_GET_PRIVATE (console); /* Create the treeview */
MidoriConsolePrivate* priv = console->priv;
// Create the treeview
GtkTreeViewColumn* column; GtkTreeViewColumn* column;
GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_text;
GtkCellRenderer* renderer_pixbuf; GtkCellRenderer* renderer_pixbuf;
GtkTreeStore* treestore = gtk_tree_store_new (3, G_TYPE_STRING, GtkTreeStore* treestore = gtk_tree_store_new (3, G_TYPE_STRING,
G_TYPE_INT, G_TYPE_INT,
G_TYPE_STRING); G_TYPE_STRING);
priv->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); console->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->treeview), FALSE); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (console->treeview), FALSE);
column = gtk_tree_view_column_new (); column = gtk_tree_view_column_new ();
renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE);
gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf,
(GtkTreeCellDataFunc)midori_console_treeview_render_icon_cb, (GtkTreeCellDataFunc)midori_console_treeview_render_icon_cb,
priv->treeview, NULL); console->treeview, NULL);
renderer_text = gtk_cell_renderer_text_new (); renderer_text = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (column, renderer_text, FALSE); gtk_tree_view_column_pack_start (column, renderer_text, FALSE);
gtk_tree_view_column_set_cell_data_func (column, renderer_text, gtk_tree_view_column_set_cell_data_func (column, renderer_text,
(GtkTreeCellDataFunc)midori_console_treeview_render_text_cb, (GtkTreeCellDataFunc)midori_console_treeview_render_text_cb,
priv->treeview, NULL); console->treeview, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (priv->treeview), column); gtk_tree_view_append_column (GTK_TREE_VIEW (console->treeview), column);
g_object_unref (treestore); g_object_unref (treestore);
g_signal_connect (priv->treeview, "row-activated", g_signal_connect (console->treeview, "row-activated",
G_CALLBACK (midori_console_treeview_row_activated_cb), G_CALLBACK (midori_console_treeview_row_activated_cb),
console); console);
gtk_widget_show (priv->treeview); gtk_widget_show (console->treeview);
gtk_box_pack_start (GTK_BOX (console), priv->treeview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (console), console->treeview, TRUE, TRUE, 0);
} }
/** /**
@ -159,15 +151,13 @@ midori_console_get_toolbar (MidoriConsole* console)
{ {
g_return_val_if_fail (MIDORI_IS_CONSOLE (console), NULL); g_return_val_if_fail (MIDORI_IS_CONSOLE (console), NULL);
MidoriConsolePrivate* priv = console->priv; if (!console->toolbar)
if (!priv->toolbar)
{ {
GtkWidget* toolbar = gtk_toolbar_new (); GtkWidget* toolbar = gtk_toolbar_new ();
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
GtkToolItem* toolitem = gtk_tool_item_new (); GtkToolItem* toolitem = gtk_tool_item_new ();
// TODO: What about a find entry here that filters e.g. by url? /* TODO: What about a find entry here that filters e.g. by url? */
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
gtk_widget_show (GTK_WIDGET (toolitem)); gtk_widget_show (GTK_WIDGET (toolitem));
toolitem = gtk_separator_tool_item_new (); toolitem = gtk_separator_tool_item_new ();
@ -182,10 +172,10 @@ midori_console_get_toolbar (MidoriConsole* console)
G_CALLBACK (midori_console_button_clear_clicked_cb), console); G_CALLBACK (midori_console_button_clear_clicked_cb), console);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
gtk_widget_show (GTK_WIDGET (toolitem)); gtk_widget_show (GTK_WIDGET (toolitem));
priv->toolbar = toolbar; console->toolbar = toolbar;
} }
return priv->toolbar; return console->toolbar;
} }
/** /**
@ -205,9 +195,7 @@ midori_console_add (MidoriConsole* console,
{ {
g_return_if_fail (MIDORI_IS_CONSOLE (console)); g_return_if_fail (MIDORI_IS_CONSOLE (console));
MidoriConsolePrivate* priv = console->priv; GtkTreeView* treeview = GTK_TREE_VIEW (console->treeview);
GtkTreeView* treeview = GTK_TREE_VIEW (priv->treeview);
GtkTreeModel* treemodel = gtk_tree_view_get_model (treeview); GtkTreeModel* treemodel = gtk_tree_view_get_model (treeview);
gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel), gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel),
NULL, NULL, G_MAXINT, NULL, NULL, G_MAXINT,

8
midori/midori-console.h
View file

@ -32,16 +32,8 @@ G_BEGIN_DECLS
(G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_CONSOLE, MidoriConsoleClass)) (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_CONSOLE, MidoriConsoleClass))
typedef struct _MidoriConsole MidoriConsole; typedef struct _MidoriConsole MidoriConsole;
typedef struct _MidoriConsolePrivate MidoriConsolePrivate;
typedef struct _MidoriConsoleClass MidoriConsoleClass; typedef struct _MidoriConsoleClass MidoriConsoleClass;
struct _MidoriConsole
{
GtkVBox parent_instance;
MidoriConsolePrivate* priv;
};
struct _MidoriConsoleClass struct _MidoriConsoleClass
{ {
GtkVBoxClass parent_class; GtkVBoxClass parent_class;