Added a column for entities

This commit is contained in:
Pierre Pronchery 2010-11-16 14:13:21 +00:00
parent a54417511c
commit fa68a9c333
2 changed files with 36 additions and 16 deletions

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: XMLEditor 0.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-11-15 03:41+0100\n"
"POT-Creation-Date: 2010-11-16 15:08+0100\n"
"PO-Revision-Date: 2010-11-14 00:20+0100\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n"
@ -46,11 +46,11 @@ msgstr "_Préférences"
#: ../src/xmleditor.c:106
msgid "_Expand all"
msgstr ""
msgstr "Tout _montrer"
#: ../src/xmleditor.c:108
msgid "_Collapse all"
msgstr ""
msgstr "Tout _fermer"
#: ../src/xmleditor.c:115
msgid "_About"
@ -92,41 +92,49 @@ msgstr "Enregistrer sous"
msgid "Preferences"
msgstr "Préférences"
#: ../src/xmleditor.c:208
#: ../src/xmleditor.c:212
msgid "Name"
msgstr "Nom"
#: ../src/xmleditor.c:229
#: ../src/xmleditor.c:216
msgid "Entity"
msgstr "Entité"
#: ../src/xmleditor.c:220
msgid "Data"
msgstr "Données"
#: ../src/xmleditor.c:241
msgid "XML editor - "
msgstr "Éditeur XML - "
#: ../src/xmleditor.c:230
#: ../src/xmleditor.c:242
msgid "(Untitled)"
msgstr "(Sans titre)"
#: ../src/xmleditor.c:290 ../src/xmleditor.c:295
#: ../src/xmleditor.c:302 ../src/xmleditor.c:307
msgid "Error"
msgstr "Erreur"
#: ../src/xmleditor.c:321 ../src/xmleditor.c:331 ../src/xmleditor.c:468
#: ../src/xmleditor.c:473
#: ../src/xmleditor.c:333 ../src/xmleditor.c:343 ../src/xmleditor.c:485
#: ../src/xmleditor.c:490
msgid "Warning"
msgstr "Avertissement"
#: ../src/xmleditor.c:325
#: ../src/xmleditor.c:337
msgid ""
"There are unsaved changes.\n"
"Are you sure you want to close?"
msgstr ""
#: ../src/xmleditor.c:414
#: ../src/xmleditor.c:431
msgid "Open file..."
msgstr "Ouvrir un fichier..."
#: ../src/xmleditor.c:472
#: ../src/xmleditor.c:489
msgid "This file already exists. Overwrite?"
msgstr "Ce fichier existe déjà. Écraser?"
#: ../src/xmleditor.c:491
#: ../src/xmleditor.c:508
msgid "Save as..."
msgstr "Enregistrer sous..."

View File

@ -36,9 +36,9 @@ static char const _license[] =
/* private */
/* types */
typedef enum _XMLEditorColumn {
XEC_TAGNAME = 0, XEC_DATA
XEC_TAGNAME = 0, XEC_DATA, XEC_ENTITY
} XMLEditorColumn;
#define XEC_LAST XEC_DATA
#define XEC_LAST XEC_ENTITY
#define XEC_COUNT (XEC_LAST + 1)
struct _XMLEditor
@ -196,11 +196,14 @@ XMLEditor * xmleditor_new(void)
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
xmleditor->store = gtk_tree_store_new(XEC_COUNT,
G_TYPE_STRING, /* XEC_TAGNAME */
G_TYPE_STRING); /* XEC_DATA */
G_TYPE_STRING, /* XEC_DATA */
G_TYPE_STRING); /* XEC_ENTITY */
xmleditor->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(
xmleditor->store));
#if 0
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(xmleditor->view),
FALSE);
#endif
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(xmleditor->view), TRUE);
renderer = gtk_cell_renderer_text_new();
g_object_set(G_OBJECT(renderer), "editable", TRUE, NULL);
@ -210,6 +213,10 @@ XMLEditor * xmleditor_new(void)
"text", XEC_TAGNAME, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(xmleditor->view), column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Entity"), renderer,
"text", XEC_ENTITY, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(xmleditor->view), column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Data"), renderer,
"text", XEC_DATA, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(xmleditor->view), column);
@ -398,6 +405,11 @@ static void _open_document_node(XMLEditor * xmleditor, XMLNode * node,
gtk_tree_store_set(xmleditor->store, &iter, XEC_DATA,
node->data.buffer, -1);
break;
case XML_NODE_TYPE_ENTITY:
gtk_tree_store_append(xmleditor->store, &iter, parent);
gtk_tree_store_set(xmleditor->store, &iter, XEC_ENTITY,
node->entity.name, -1);
break;
case XML_NODE_TYPE_TAG:
gtk_tree_store_append(xmleditor->store, &iter, parent);
gtk_tree_store_set(xmleditor->store, &iter, XEC_TAGNAME,