preserve the window position of address book.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1028 ee746299-78ed-0310-b773-934348b2243d

5 files changed, 22 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c038d631..011d2f6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-03-06
 
+	* libsylph/prefs_common.[ch]
+	  src/addressbook.c: preserve the window position of address book.
+	  Moved the position of Help menu.
+
+2006-03-06
+
 	* src/compose.c: compose_select_account(): enabled View/Cc menu on
 	  mail accounts.
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index b7c0073a..2867cf15 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
 2006-03-06
 
+	* libsylph/prefs_common.[ch]
+	  src/addressbook.c: アドレス帳のウィンドウの位置を保存。ヘルプ
+	  メニューの位置を移動。
+
+2006-03-06
+
 	* src/compose.c: compose_select_account(): メールアカウントで View/Cc
 	  メニューを有効にした。
 
diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c
index 6fc160f8..a35fb2f7 100644
--- a/libsylph/prefs_common.c
+++ b/libsylph/prefs_common.c
@@ -218,6 +218,8 @@ static PrefParam param[] = {
 	{"compose_y", "32", &prefs_common.compose_y, P_INT},
 	{"compose_width", "600", &prefs_common.compose_width, P_INT},
 	{"compose_height", "560", &prefs_common.compose_height, P_INT},
+	{"addressbook_x", "32", &prefs_common.addressbook_x, P_INT},
+	{"addressbook_y", "32", &prefs_common.addressbook_y, P_INT},
 	{"addressbook_width", "620", &prefs_common.addressbook_width, P_INT},
 	{"addressbook_height", "360", &prefs_common.addressbook_height, P_INT},
 
diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h
index d94cd431..233604b3 100644
--- a/libsylph/prefs_common.h
+++ b/libsylph/prefs_common.h
@@ -157,6 +157,8 @@ struct _PrefsCommon
 	gint compose_width;
 	gint compose_height;
 
+	gint addressbook_x;
+	gint addressbook_y;
 	gint addressbook_width;
 	gint addressbook_height;
 
diff --git a/src/addressbook.c b/src/addressbook.c
index a3de83f2..fb469c3e 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -359,7 +359,7 @@ static GtkItemFactoryEntry addressbook_entries[] =
 	{N_("/_Address/_Delete"),	NULL,		addressbook_delete_address_cb,  0, NULL},
 	{N_("/_Tools"),			NULL,		NULL, 0, "<Branch>"},
 	{N_("/_Tools/Import _LDIF file"), NULL,		addressbook_import_ldif_cb,	0, NULL},
-	{N_("/_Help"),			NULL,		NULL, 0, "<LastBranch>"},
+	{N_("/_Help"),			NULL,		NULL, 0, "<Branch>"},
 	{N_("/_Help/_About"),		NULL,		about_show, 0, NULL}
 };
 
@@ -500,6 +500,8 @@ static void addressbook_create(void)
 	gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
 	gtk_widget_set_size_request(window, prefs_common.addressbook_width,
 				    prefs_common.addressbook_height);
+	gtk_window_move(GTK_WINDOW(window), prefs_common.addressbook_x,
+			prefs_common.addressbook_y);
 	gtk_widget_realize(window);
 
 	g_signal_connect(G_OBJECT(window), "delete_event",
@@ -744,6 +746,9 @@ static void addressbook_create(void)
 
 static gint addressbook_close(void)
 {
+	gtkut_widget_get_uposition(addrbook.window,
+				   &prefs_common.addressbook_x,
+				   &prefs_common.addressbook_y);
 	gtk_widget_hide(addrbook.window);
 	addressbook_export_to_file();
 	return TRUE;