diff options
| -rw-r--r-- | data/empathy-log-window.html | 66 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 23 |
2 files changed, 89 insertions, 0 deletions
diff --git a/data/empathy-log-window.html b/data/empathy-log-window.html index 2b87647fc..f2e0cdfe1 100644 --- a/data/empathy-log-window.html +++ b/data/empathy-log-window.html @@ -15,6 +15,16 @@ div.row p { display: inline; white-space: pre-wrap; } + +span.open:after { + content: "\25BE"; + margin-right: 2px; +} + +span.closed:after { + content: "\25B8"; + margin-right: 2px; +} </style> <script type="text/javascript"> function filterNodes (node, tagName) @@ -42,6 +52,11 @@ function getContent(node) return filterNodes(node, 'P')[0]; } +function getToggle(node) +{ + return filterNodes(node, 'SPAN')[0]; +} + function insertRow (path, text) { var treeview = document.getElementById('treeview'); @@ -67,10 +82,44 @@ function insertRow (path, text) parentnode.appendChild(newnode); else parentnode.insertBefore(newnode, nodes[path[i]]); + + // add an expander + var toggle = document.createElement('span'); + newnode.appendChild(toggle); + toggle.setAttribute('class', 'closed'); + toggle.style.display = 'none'; + + toggle.onclick = function (e) + { + var display; + var nodes; + + if (toggle.getAttribute('class') == 'closed') + { + toggle.setAttribute('class', 'open'); + display = 'block'; + } + else + { + toggle.setAttribute('class', 'closed'); + display = 'none'; + } + + // console.log("clicked: " + display); + + nodes = getNodes(newnode); + + for (var i = 0; i < nodes.length; i++) + nodes[i].style.display = display; + }; var contents = document.createElement('p'); newnode.appendChild(contents); contents.innerHTML = text; + + // if the node is not a top-level node, hide it + if (parentnode != treeview) + newnode.style.display = 'none'; } function changeRow (path, text) @@ -121,6 +170,23 @@ function reorderRows (path, new_order) for (var i = 0; i < nodes.length; i++) node.appendChild(nodes[new_order[i]]); } + +function hasChildRows (path, has_children) +{ + var treeview = document.getElementById('treeview'); + var node = treeview; + + // walk the tree + for (var i = 0; i < path.length; i++) + node = getNodes(node)[path[i]]; + + var toggle = getToggle(node); + + if (has_children) + toggle.style.display = 'inline'; + else + toggle.style.display = 'none'; +} </script> </head> diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 9459ce26b..ef6450f36 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -430,6 +430,27 @@ store_events_row_deleted (GtkTreeModel *model, } static void +store_events_has_child_rows (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + EmpathyLogWindow *self) +{ + char *str = gtk_tree_path_to_string (path); + char *script; + + script = g_strdup_printf ("javascript:hasChildRows([%s], %u);", + g_strdelimit (str, ":", ','), + gtk_tree_model_iter_has_child (model, iter)); + + // g_print ("%s\n", script); + webkit_web_view_execute_script (WEBKIT_WEB_VIEW (self->priv->webview), + script); + + g_free (str); + g_free (script); +} + +static void store_events_rows_reordered (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, @@ -695,6 +716,8 @@ empathy_log_window_init (EmpathyLogWindow *self) G_CALLBACK (store_events_row_deleted), self); g_signal_connect (self->priv->store_events, "rows-reordered", G_CALLBACK (store_events_rows_reordered), self); + g_signal_connect (self->priv->store_events, "row-has-child-toggled", + G_CALLBACK (store_events_has_child_rows), self); // debug gtk_notebook_set_show_tabs (GTK_NOTEBOOK (self->priv->notebook), TRUE); |