Stupid idiot, I thought i lost these files and remade them.

	The menu merging one looks better anyway.

svn path=/trunk/; revision=27935

1 files changed, 67 insertions, 0 deletions

diff --git a/doc/devel/images/e-popup-merge-2.pic b/doc/devel/images/e-popup-merge-2.pic
new file mode 100644
index 0000000000..277d451517
--- /dev/null
+++ b/doc/devel/images/e-popup-merge-2.pic
@@ -0,0 +1,67 @@
+
+.PS 5
+space=0.7
+down
+define item {
+	[ right
+		box ht 0.25 wid 0 $1 ljust invis
+		box ht 0.25 wid 3 "" invis ]
+	[ right
+		box ht 0.25 wid 0 $3 ljust invis
+		box ht 0.25 wid 3 $2 ljust invis ]
+	box ht 0.5 wid 3 at last [].n
+}
+
+define link {
+	line -> from $1.e + (0.1,0) to $2.w - (0.1,0)
+}
+
+define title {
+	box ht 0.5 wid 3 $1 invis
+}
+
+A: [
+	title("Core Menu")
+
+	Copy: item("Copy", "many", "00.copy")
+	Paste: item("Paste", "", "01.paste")
+	Bar1: item("-----", "one", "20.")
+	Open: item("Open", "one", "21.open")
+	Save: item("Save...", "one", "22.save")
+	Bar2: item("-----", "", "40.")
+	Read: item("Mark as Read", "mark_read", "41.markread")
+	Unread: item("Mark as Unread", "mark_unread", "42.markunread")
+]
+
+move
+B: [
+	title("Additional Items")
+
+	ReplyList: item("Reply To List", "one", "02.replylist")
+	Forward: item("Forward", "any", "03.forward")
+]
+
+C: [
+	title("Merged Menu")
+
+	Paste: item("Paste", "", "01.paste")
+	ReplyList: item("Reply To List", "", "02.replylist")
+	Forward: item("Forward", "", "03.forward")
+	Bar1: item("-----", "", "20.")
+	Open: item("Open", "", "21.open");
+	Save: item("Save...", "", "22.save")
+	Bar2: item("-----", "", "40.")
+	Read: item("Mark as Read", "", "41.markread")
+] with .nw at A.ne + ( 2,-1)
+
+link(A.Paste, C.Paste)
+link(B.ReplyList, C.ReplyList)
+link(B.Forward, C.Forward)
+link(A.Bar1, C.Bar1)
+link(A.Open, C.Open)
+link(A.Save, C.Save)
+link(A.Bar2, C.Bar2)
+link(A.Read, C.Read)
+
+.PE
+