AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Test cell renderers.

Browse Source 
2005-05-02  Matthias Clasen  <mclasen@redhat.com>

	* tests/testiconview.c: Test cell renderers.

	* gtk/gtk.symbols: Add new functions.

	* gtk/gtkiconview.[hc]: Implement GtkCellLayout and use
	cell renderers for drawing and editing. (#148144, #160242)
This commit is contained in:
Matthias Clasen 2005-05-02 20:28:37 +00:00 committed by Matthias Clasen
parent ba91bf6d18
commit 93a430fdf0
7 changed files with 2034 additions and 634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2005-05-02 Matthias Clasen <mclasen@redhat.com>
* tests/testiconview.c: Test cell renderers.
* gtk/gtk.symbols: Add new functions.
* gtk/gtkiconview.[hc]: Implement GtkCellLayout and use
cell renderers for drawing and editing. (#148144, #160242)
2005-05-02 Matthias Clasen <mclasen@redhat.com> 2005-05-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcellrenderertext.c (get_size): Return a sufficient * gtk/gtkcellrenderertext.c (get_size): Return a sufficient

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
2005-05-02 Matthias Clasen <mclasen@redhat.com>
* tests/testiconview.c: Test cell renderers.
* gtk/gtk.symbols: Add new functions.
* gtk/gtkiconview.[hc]: Implement GtkCellLayout and use
cell renderers for drawing and editing. (#148144, #160242)
2005-05-02 Matthias Clasen <mclasen@redhat.com> 2005-05-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcellrenderertext.c (get_size): Return a sufficient * gtk/gtkcellrenderertext.c (get_size): Return a sufficient

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
2005-05-02 Matthias Clasen <mclasen@redhat.com>
* tests/testiconview.c: Test cell renderers.
* gtk/gtk.symbols: Add new functions.
* gtk/gtkiconview.[hc]: Implement GtkCellLayout and use
cell renderers for drawing and editing. (#148144, #160242)
2005-05-02 Matthias Clasen <mclasen@redhat.com> 2005-05-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcellrenderertext.c (get_size): Return a sufficient * gtk/gtkcellrenderertext.c (get_size): Return a sufficient

3
gtk/gtk.symbols
View File

@ -1654,12 +1654,14 @@ gtk_icon_theme_set_search_path_utf8
#if IN_FILE(__GTK_ICON_VIEW_C__) #if IN_FILE(__GTK_ICON_VIEW_C__)
gtk_icon_view_get_column_spacing gtk_icon_view_get_column_spacing
gtk_icon_view_get_columns gtk_icon_view_get_columns
gtk_icon_view_get_cursor
gtk_icon_view_get_item_width gtk_icon_view_get_item_width
gtk_icon_view_get_margin gtk_icon_view_get_margin
gtk_icon_view_get_markup_column gtk_icon_view_get_markup_column
gtk_icon_view_get_model gtk_icon_view_get_model
gtk_icon_view_get_orientation gtk_icon_view_get_orientation
gtk_icon_view_get_path_at_pos gtk_icon_view_get_path_at_pos
gtk_icon_view_get_item_at_pos
gtk_icon_view_get_pixbuf_column gtk_icon_view_get_pixbuf_column
gtk_icon_view_get_row_spacing gtk_icon_view_get_row_spacing
gtk_icon_view_get_selected_items gtk_icon_view_get_selected_items
@ -1676,6 +1678,7 @@ gtk_icon_view_selected_foreach
gtk_icon_view_select_path gtk_icon_view_select_path
gtk_icon_view_set_column_spacing gtk_icon_view_set_column_spacing
gtk_icon_view_set_columns gtk_icon_view_set_columns
gtk_icon_view_set_cursor
gtk_icon_view_set_item_width gtk_icon_view_set_item_width
gtk_icon_view_set_margin gtk_icon_view_set_margin
gtk_icon_view_set_markup_column gtk_icon_view_set_markup_column

2463
gtk/gtkiconview.c
View File

File diff suppressed because it is too large Load Diff

89
gtk/gtkiconview.h
View File

@ -21,6 +21,7 @@
#include <gtk/gtkcontainer.h> #include <gtk/gtkcontainer.h>
#include <gtk/gtktreemodel.h> #include <gtk/gtktreemodel.h>
#include <gtk/gtkcellrenderer.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -69,54 +70,60 @@ struct _GtkIconViewClass
gboolean (* activate_cursor_item) (GtkIconView *icon_view); gboolean (* activate_cursor_item) (GtkIconView *icon_view);
}; };
GType gtk_icon_view_get_type (void) G_GNUC_CONST; GType gtk_icon_view_get_type (void) G_GNUC_CONST;
GtkWidget *gtk_icon_view_new (void); GtkWidget * gtk_icon_view_new (void);
GtkWidget *gtk_icon_view_new_with_model (GtkTreeModel *model); GtkWidget * gtk_icon_view_new_with_model (GtkTreeModel *model);
void gtk_icon_view_set_model (GtkIconView *icon_view, void gtk_icon_view_set_model (GtkIconView *icon_view,
GtkTreeModel *model); GtkTreeModel *model);
GtkTreeModel *gtk_icon_view_get_model (GtkIconView *icon_view); GtkTreeModel * gtk_icon_view_get_model (GtkIconView *icon_view);
void gtk_icon_view_set_text_column (GtkIconView *icon_view, void gtk_icon_view_set_text_column (GtkIconView *icon_view,
gint column); gint column);
gint gtk_icon_view_get_text_column (GtkIconView *icon_view); gint gtk_icon_view_get_text_column (GtkIconView *icon_view);
void gtk_icon_view_set_markup_column (GtkIconView *icon_view, void gtk_icon_view_set_markup_column (GtkIconView *icon_view,
gint column); gint column);
gint gtk_icon_view_get_markup_column (GtkIconView *icon_view); gint gtk_icon_view_get_markup_column (GtkIconView *icon_view);
void gtk_icon_view_set_pixbuf_column (GtkIconView *icon_view, void gtk_icon_view_set_pixbuf_column (GtkIconView *icon_view,
gint column); gint column);
gint gtk_icon_view_get_pixbuf_column (GtkIconView *icon_view); gint gtk_icon_view_get_pixbuf_column (GtkIconView *icon_view);
void gtk_icon_view_set_orientation (GtkIconView *icon_view, void gtk_icon_view_set_orientation (GtkIconView *icon_view,
GtkOrientation orientation); GtkOrientation orientation);
GtkOrientation gtk_icon_view_get_orientation (GtkIconView *icon_view); GtkOrientation gtk_icon_view_get_orientation (GtkIconView *icon_view);
void gtk_icon_view_set_columns (GtkIconView *icon_view, void gtk_icon_view_set_columns (GtkIconView *icon_view,
gint columns); gint columns);
gint gtk_icon_view_get_columns (GtkIconView *icon_view); gint gtk_icon_view_get_columns (GtkIconView *icon_view);
void gtk_icon_view_set_item_width (GtkIconView *icon_view, void gtk_icon_view_set_item_width (GtkIconView *icon_view,
gint item_width); gint item_width);
gint gtk_icon_view_get_item_width (GtkIconView *icon_view); gint gtk_icon_view_get_item_width (GtkIconView *icon_view);
void gtk_icon_view_set_spacing (GtkIconView *icon_view, void gtk_icon_view_set_spacing (GtkIconView *icon_view,
gint spacing); gint spacing);
gint gtk_icon_view_get_spacing (GtkIconView *icon_view); gint gtk_icon_view_get_spacing (GtkIconView *icon_view);
void gtk_icon_view_set_row_spacing (GtkIconView *icon_view, void gtk_icon_view_set_row_spacing (GtkIconView *icon_view,
gint row_spacing); gint row_spacing);
gint gtk_icon_view_get_row_spacing (GtkIconView *icon_view); gint gtk_icon_view_get_row_spacing (GtkIconView *icon_view);
void gtk_icon_view_set_column_spacing (GtkIconView *icon_view, void gtk_icon_view_set_column_spacing (GtkIconView *icon_view,
gint column_spacing); gint column_spacing);
gint gtk_icon_view_get_column_spacing (GtkIconView *icon_view); gint gtk_icon_view_get_column_spacing (GtkIconView *icon_view);
void gtk_icon_view_set_margin (GtkIconView *icon_view, void gtk_icon_view_set_margin (GtkIconView *icon_view,
gint margin); gint margin);
gint gtk_icon_view_get_margin (GtkIconView *icon_view); gint gtk_icon_view_get_margin (GtkIconView *icon_view);
GtkTreePath * gtk_icon_view_get_path_at_pos (GtkIconView *icon_view, GtkTreePath * gtk_icon_view_get_path_at_pos (GtkIconView *icon_view,
gint x, gint x,
gint y); gint y);
void gtk_icon_view_selected_foreach (GtkIconView *icon_view, gboolean gtk_icon_view_get_item_at_pos (GtkIconView *icon_view,
GtkIconViewForeachFunc func, gint x,
gpointer data); gint y,
void gtk_icon_view_set_selection_mode (GtkIconView *icon_view, GtkTreePath **path,
GtkSelectionMode mode); GtkCellRenderer **cell);
void gtk_icon_view_selected_foreach (GtkIconView *icon_view,
GtkIconViewForeachFunc func,
gpointer data);
void gtk_icon_view_set_selection_mode (GtkIconView *icon_view,
GtkSelectionMode mode);
GtkSelectionMode gtk_icon_view_get_selection_mode (GtkIconView *icon_view); GtkSelectionMode gtk_icon_view_get_selection_mode (GtkIconView *icon_view);
void gtk_icon_view_select_path (GtkIconView *icon_view, void gtk_icon_view_select_path (GtkIconView *icon_view,
GtkTreePath *path); GtkTreePath *path);
@ -129,6 +136,14 @@ void gtk_icon_view_select_all (GtkIconView *icon_
void gtk_icon_view_unselect_all (GtkIconView *icon_view); void gtk_icon_view_unselect_all (GtkIconView *icon_view);
void gtk_icon_view_item_activated (GtkIconView *icon_view, void gtk_icon_view_item_activated (GtkIconView *icon_view,
GtkTreePath *path); GtkTreePath *path);
void gtk_icon_view_set_cursor (GtkIconView *icon_view,
GtkTreePath *path,
GtkCellRenderer *cell,
gboolean start_editing);
gboolean gtk_icon_view_get_cursor (GtkIconView *icon_view,
GtkTreePath **path,
GtkCellRenderer **cell);
G_END_DECLS G_END_DECLS
#endif /* __GTK_ICON_VIEW_H__ */ #endif /* __GTK_ICON_VIEW_H__ */

86
tests/testiconview.c
View File

@ -46,8 +46,9 @@ fill_model (GtkTreeModel *model)
1, "Really really\nreally really loooooooooong item name", 1, "Really really\nreally really loooooooooong item name",
2, 0, 2, 0,
3, "This is a <b>Test</b> of <i>markup</i>", 3, "This is a <b>Test</b> of <i>markup</i>",
4, TRUE,
-1); -1);
while (i < NUMBER_OF_ITEMS - 1) while (i < NUMBER_OF_ITEMS - 1)
{ {
str = g_strdup_printf ("Icon %d", i); str = g_strdup_printf ("Icon %d", i);
@ -58,6 +59,7 @@ fill_model (GtkTreeModel *model)
1, str, 1, str,
2, i, 2, i,
3, str2, 3, str2,
4, TRUE,
-1); -1);
g_free (str); g_free (str);
g_free (str2); g_free (str2);
@ -72,7 +74,7 @@ create_model (void)
{ {
GtkListStore *store; GtkListStore *store;
store = gtk_list_store_new (4, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING); store = gtk_list_store_new (5, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_BOOLEAN);
return GTK_TREE_MODEL (store); return GTK_TREE_MODEL (store);
} }
@ -238,7 +240,6 @@ select_nonexisting (GtkWidget *button, GtkIconView *icon_list)
GtkTreePath *path = gtk_tree_path_new_from_indices (999999, -1); GtkTreePath *path = gtk_tree_path_new_from_indices (999999, -1);
gtk_icon_view_select_path (icon_list, path); gtk_icon_view_select_path (icon_list, path);
gtk_tree_path_free (path); gtk_tree_path_free (path);
gtk_icon_view_select_all (icon_list);
} }
static void static void
@ -282,6 +283,41 @@ item_activated (GtkIconView *icon_view,
} }
static void
toggled (GtkCellRendererToggle *cell,
gchar *path_string,
gpointer data)
{
GtkTreeModel *model = GTK_TREE_MODEL (data);
GtkTreeIter iter;
GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
gboolean value;
gtk_tree_model_get_iter (model, &iter, path);
gtk_tree_model_get (model, &iter, 4, &value, -1);
value = !value;
gtk_list_store_set (GTK_LIST_STORE (model), &iter, 4, value, -1);
gtk_tree_path_free (path);
}
static void
edited (GtkCellRendererText *cell,
gchar *path_string,
gchar *new_text,
gpointer data)
{
GtkTreeModel *model = GTK_TREE_MODEL (data);
GtkTreeIter iter;
GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
gtk_tree_model_get_iter (model, &iter, path);
gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, new_text, -1);
gtk_tree_path_free (path);
}
static void static void
item_cb (GtkWidget *menuitem, item_cb (GtkWidget *menuitem,
ItemData *data) ItemData *data)
@ -301,8 +337,7 @@ do_popup_menu (GtkWidget *icon_list,
path = gtk_icon_view_get_path_at_pos (GTK_ICON_VIEW (icon_list), path = gtk_icon_view_get_path_at_pos (GTK_ICON_VIEW (icon_list),
event->x, event->y); event->x, event->y);
g_print ("foo: %p\n", path);
if (!path) if (!path)
return; return;
@ -364,6 +399,7 @@ main (gint argc, gchar **argv)
GtkWidget *button; GtkWidget *button;
GtkWidget *prop_editor; GtkWidget *prop_editor;
GtkTreeModel *model; GtkTreeModel *model;
GtkCellRenderer *cell;
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
@ -396,9 +432,42 @@ main (gint argc, gchar **argv)
model = create_model (); model = create_model ();
gtk_icon_view_set_model (GTK_ICON_VIEW (icon_list), model); gtk_icon_view_set_model (GTK_ICON_VIEW (icon_list), model);
fill_model (model); fill_model (model);
#if 0
gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_list), 0); gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_list), 0);
gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_list), 1); gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_list), 1);
#else
cell = gtk_cell_renderer_toggle_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_list), cell, FALSE);
g_object_set (cell, "activatable", TRUE, NULL);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_list),
cell, "active", 4, NULL);
g_signal_connect (cell, "toggled", G_CALLBACK (toggled), model);
cell = gtk_cell_renderer_pixbuf_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_list), cell, FALSE);
g_object_set (cell,
"follow-state", TRUE,
NULL);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_list),
cell, "pixbuf", 0, NULL);
cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_list), cell, FALSE);
g_object_set (cell,
"editable", TRUE,
"xalign", 0.5,
"wrap-mode", PANGO_WRAP_WORD_CHAR,
"wrap-width", 100,
NULL);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_list),
cell, "text", 1, NULL);
g_signal_connect (cell, "edited", G_CALLBACK (edited), model);
#endif
prop_editor = create_prop_editor (G_OBJECT (icon_list), 0); prop_editor = create_prop_editor (G_OBJECT (icon_list), 0);
gtk_widget_show_all (prop_editor); gtk_widget_show_all (prop_editor);
@ -408,6 +477,7 @@ main (gint argc, gchar **argv)
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_paned_add1 (GTK_PANED (paned), scrolled_window); gtk_paned_add1 (GTK_PANED (paned), scrolled_window);
bbox = gtk_hbutton_box_new (); bbox = gtk_hbutton_box_new ();
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
@ -448,15 +518,13 @@ main (gint argc, gchar **argv)
g_signal_connect (button, "clicked", G_CALLBACK (select_nonexisting), icon_list); g_signal_connect (button, "clicked", G_CALLBACK (select_nonexisting), icon_list);
gtk_box_pack_start_defaults (GTK_BOX (bbox), button); gtk_box_pack_start_defaults (GTK_BOX (bbox), button);
gtk_paned_pack1 (GTK_PANED (paned), vbox, TRUE, FALSE);
icon_list = gtk_icon_view_new (); icon_list = gtk_icon_view_new ();
scrolled_window = gtk_scrolled_window_new (NULL, NULL); scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_container_add (GTK_CONTAINER (scrolled_window), icon_list); gtk_container_add (GTK_CONTAINER (scrolled_window), icon_list);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_paned_pack2 (GTK_PANED (paned), scrolled_window, TRUE, FALSE); gtk_paned_add2 (GTK_PANED (paned), scrolled_window);
gtk_widget_show_all (window); gtk_widget_show_all (window);