From 28f6c25b08afdf4ae611501b491bbb29eb8ca1f7 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Sun, 20 Aug 2006 13:53:55 +0000
Subject: [PATCH] Dialog filling tweaks.

SVN revision: 24936
---
 src/dialog.c | 56 +++++++++++++++++++++++++++++++---------------------
 src/dialog.h |  2 ++
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/dialog.c b/src/dialog.c
index 868ded59..e62d425e 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -222,6 +222,11 @@ static int          DialogItemCheckButtonGetState(DItem * di);
 
 static void         DialogUpdate(Dialog * d);
 
+static void         DialogAddFooter(Dialog * d, DItem * parent,
+				    int flags, DialogCallbackFunc * cb);
+static void         DialogAddHeader(Dialog * d, DItem * parent,
+				    const char *img, const char *txt);
+
 static Ecore_List  *dialog_list = NULL;
 
 static char         dialog_update_pending = 0;
@@ -730,17 +735,30 @@ _DialogClose(Dialog * d)
    EwinHide(d->ewin);
 }
 
-static void         DialogAddHeader(DItem * parent, const char *img,
-				    const char *txt);
-static void         DialogAddFooter(Dialog * d, int flags,
-				    DialogCallbackFunc * cb);
-
 void
 DialogShowSimple(const DialogDef * dd, void *data)
 {
    DialogShowSimpleWithName(dd, dd->name, data);
 }
 
+void
+DialogFill(Dialog * d, DItem * parent, const DialogDef * dd, void *data)
+{
+   DItem              *content;
+
+   if (Conf.dialogs.headers && (dd->header_image || dd->header_text))
+      DialogAddHeader(d, parent, dd->header_image, _(dd->header_text));
+
+   content = DialogAddItem(parent, DITEM_TABLE);
+   if (!content)
+      return;
+
+   dd->fill(d, content, data);
+
+   if (dd->func)
+      DialogAddFooter(d, parent, dd->flags, dd->func);
+}
+
 void
 DialogShowSimpleWithName(const DialogDef * dd, const char *name, void *data)
 {
@@ -766,17 +784,7 @@ DialogShowSimpleWithName(const DialogDef * dd, const char *name, void *data)
    if (!table)
       return;
 
-   if (Conf.dialogs.headers && (dd->header_image || dd->header_text))
-      DialogAddHeader(table, dd->header_image, _(dd->header_text));
-
-   table = DialogAddItem(d->item, DITEM_TABLE);
-   if (!table)
-      return;
-
-   dd->fill(d, table, data);
-
-   if (dd->func)
-      DialogAddFooter(d, dd->flags, dd->func);
+   DialogFill(d, table, dd, data);
 
    DialogShow(d);
 }
@@ -932,13 +940,13 @@ DialogAddItem(DItem * dii, int type)
 }
 
 static void
-DialogAddHeader(DItem * parent, const char *img, const char *txt)
+DialogAddHeader(Dialog * d __UNUSED__, DItem * parent, const char *img,
+		const char *txt)
 {
    DItem              *table, *di;
 
    /* FIXME - Center table horizontally */
    table = DialogAddItem(parent, DITEM_TABLE);
-   DialogItemSetColSpan(table, 1);
    DialogItemTableSetOptions(table, 2, 0, 0, 0);
    DialogItemSetAlign(table, 512, 0);
 
@@ -952,12 +960,16 @@ DialogAddHeader(DItem * parent, const char *img, const char *txt)
 }
 
 static void
-DialogAddFooter(Dialog * d, int flags, DialogCallbackFunc * cb)
+DialogAddFooter(Dialog * d, DItem * parent __UNUSED__, int flags,
+		DialogCallbackFunc * cb)
 {
-   DItem              *di;
+   DItem              *table, *di;
 
-   di = DialogAddItem(d->item, DITEM_SEPARATOR);
-   DialogItemSetColSpan(di, d->item->item.table.num_columns);
+   di = DialogAddItem(parent, DITEM_SEPARATOR);
+
+   table = DialogAddItem(parent, DITEM_TABLE);
+   DialogItemTableSetOptions(table, 1, 0, 0, 0);
+   DialogItemSetAlign(table, 512, 0);
 
    if (flags & 4)
      {
diff --git a/src/dialog.h b/src/dialog.h
index 724715cf..71d08614 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -90,6 +90,8 @@ void                DialogItemTableEmpty(DItem * di);
 void                DialogShowSimple(const DialogDef * dd, void *data);
 void                DialogShowSimpleWithName(const DialogDef * dd,
 					     const char *name, void *data);
+void                DialogFill(Dialog * d, DItem * parent, const DialogDef * dd,
+			       void *data);
 
 void                DialogAddButton(Dialog * d, const char *text,
 				    DialogCallbackFunc * func, char doclose,