reorder UI to help user customize easily.

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2790 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

2 files changed, 28 insertions, 23 deletions

diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index 4f7fea73..2718d0c0 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -96,13 +96,6 @@ show_status(void)
     outmsg(mystatus);
 }
 
-static int
-u_movie(void)
-{
-    cuser.uflag ^= MOVIE_FLAG;
-    return 0;
-}
-
 void
 movie(int i)
 {
@@ -385,25 +378,32 @@ static const commands_t namelist[] = {
     {NULL, 0, NULL}
 };
 
+void Customize(); // user.c
+int u_customize()
+{
+    Customize();
+    return 0;
+}
+
 /* User menu */
 static const commands_t userlist[] = {
-    {u_info, PERM_LOGINOK,          "IInfo          設定個人資料與密碼"},
-    {calendar, PERM_LOGINOK,          "CCalendar      個人行事曆"},
-    {u_editcalendar, PERM_LOGINOK,    "CDEditCalendar 編輯個人行事曆"},
+    {u_info, PERM_LOGINOK,    	    "IInfo          設定個人資料與密碼"},
+    {u_customize, PERM_LOGINOK,     "IUCustomize    個人化設定"},
+    {calendar, PERM_LOGINOK,        "CCalendar      個人行事曆"},
+    {u_editcalendar, PERM_LOGINOK,  "CDEditCalendar 編輯個人行事曆"},
     {u_loginview, PERM_LOGINOK,     "LLogin View    選擇進站畫面"},
-    {u_movie, 0,                    "MMovie         切換動畫模示"},
 #ifdef  HAVE_SUICIDE
     {u_kill, PERM_BASIC,            "IKill          自殺！！"},
 #endif
     {u_editplan, PERM_LOGINOK,      "QQueryEdit     編輯名片檔"},
     {u_editsig, PERM_LOGINOK,       "SSignature     編輯簽名檔"},
 #if HAVE_FREECLOAK
-    {u_cloak, PERM_LOGINOK,           "KKCloak        隱身術"},
+    {u_cloak, PERM_LOGINOK,         "KKCloak        隱身術"},
 #else
     {u_cloak, PERM_CLOAK,           "KKCloak        隱身術"},
 #endif
     {u_register, PERM_BASIC,        "RRegister      填寫《註冊申請單》"},
-    {u_list, PERM_SYSOP,            "UUsers         列出註冊名單"},
+    {u_list, PERM_SYSOP,            "XUsers         列出註冊名單"},
 #ifdef MERGEBBS
 //    {m_sob, PERM_LOGUSER|PERM_SYSOP,             "SSOB Import    沙灘變身術"},
     {m_sob, PERM_BASIC,             "SSOB Import    沙灘變身術"},
diff --git a/mbbsd/user.c b/mbbsd/user.c
index 6a0a9047..9cd8a3fb 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -265,7 +265,7 @@ violate_law(userec_t * u, int unum)
     pressanykey();
 }
 
-static void Customize(void)
+void Customize(void)
 {
     char    done = 0, mindbuf[5];
     int     key;
@@ -290,21 +290,23 @@ static void Customize(void)
 	prints("%-30s%10s\n", "D. 目前的心情", mindbuf);
 	prints("%-30s%10s\n", "E. 高亮度顯示我的最愛", 
 	       (!(cuser.uflag2 & FAVNOHILIGHT) ? "是" : "否"));
-	maxc = 'E';
+	prints("%-30s%10s\n", "F. 動態看板", 
+	       ((cuser.uflag & MOVIE_FLAG) ? "是" : "否"));
+	maxc = 'F';
 
 #ifdef PLAY_ANGEL
 	if( HAS_PERM(PERM_ANGEL) ){
-	    prints("%-30s%10s\n", "F. 開放小主人詢問", 
+	    prints("%-30s%10s\n", "G. 開放小主人詢問", 
 		    (REJECT_QUESTION ? "否" : "是"));
-	    prints("%-30s%10s\n", "G. 接受的小主人性別", am[ANGEL_STATUS()]);
-	    maxc = 'G';
+	    prints("%-30s%10s\n", "H. 接受的小主人性別", am[ANGEL_STATUS()]);
+	    maxc = 'H';
 	}
 #endif
 
 #if defined(DBCSAWARE_GETDATA) || defined(DBCSAWARE_EDIT)
-	prints("%-30s%10s\n", "H. 自動偵測全型中文",
+	prints("%-30s%10s\n", "I. 自動偵測全型中文",
 			(!(cuser.uflag & RAWDBCS_FLAG) ? "是" : "否"));
-	maxc = 'H';
+	maxc = 'I';
 #endif
 	    key = getkey("請按 [A-%c] 切換設定，按 [Return] 結束：", maxc);
 
@@ -337,9 +339,12 @@ static void Customize(void)
 	case 'e':
 	    cuser.uflag2 ^= FAVNOHILIGHT;
 	    break;
+	case 'f':
+	    cuser.uflag ^= MOVIE_FLAG;
+	    break;
 
 #ifdef PLAY_ANGEL
-	case 'f':
+	case 'g':
 	    if( HAS_PERM(PERM_ANGEL) ){
 		SwitchBeingAngel();
 		break;
@@ -347,7 +352,7 @@ static void Customize(void)
 	    done = 1;
 	    break;
 
-	case 'g':
+	case 'h':
 	    if( HAS_PERM(PERM_ANGEL) ){
 		SwitchAngelSex(ANGEL_STATUS() + 1);
 		break;
@@ -355,7 +360,7 @@ static void Customize(void)
 #endif
 
 #if defined(DBCSAWARE_GETDATA) || defined(DBCSAWARE_EDIT)
-	case 'h':
+	case 'i':
 	    cuser.uflag ^= RAWDBCS_FLAG;
 	    break;
 #endif