Re: hub - r27132 - in abiword/trunk: plugins/mathview/xp src/wp/ap/xp

For the record: I'm against this.

I do however *not* mind an *additional* "Table" item in the Insert memu,
and an additional "Table" item in the format menu.

Right now you annoyed every current user that is accustomed to the
current behavior with very little gain.

  Marc

On Sat, 2009-07-04 at 19:51 +0200, cvs@abisource.com wrote:
> Author: hub
> Date: 2009-07-04 19:51:39 +0200 (Sat, 04 Jul 2009)
> New Revision: 27132
>
> Modified:
> abiword/trunk/plugins/mathview/xp/AbiMathView.cpp
> abiword/trunk/src/wp/ap/xp/ap_Menu_ActionSet.cpp
> abiword/trunk/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h
> abiword/trunk/src/wp/ap/xp/ap_String_Id.h
> Log:
> change the menu layout
> http://abisource.com/mailinglists/abiword-dev/2009/Jul/0008.html
>
>
> Modified: abiword/trunk/plugins/mathview/xp/AbiMathView.cpp
> ===================================================================
> --- abiword/trunk/plugins/mathview/xp/AbiMathView.cpp 2009-07-04 17:45:55 UTC (rev 27131)
> +++ abiword/trunk/plugins/mathview/xp/AbiMathView.cpp 2009-07-04 17:51:39 UTC (rev 27132)
> @@ -1,7 +1,7 @@
> /*
> -* * Copyright (C) 2004 Luca Padovani <lpadovan@cs.unibo.it>
> + * Copyright (C) 2004 Luca Padovani <lpadovan@cs.unibo.it>
> * Copyright (C) 2005 Martin Sevior <msevior@physics.unimelb.edu.au>
> - *
> + *
> * This program is free software; you can redistribute it and/or
> * modify it under the terms of the GNU General Public License
> * as published by the Free Software Foundation; either version 2
> @@ -179,7 +179,7 @@
>
> // Put it after Insert Picture in the Main menu
>
> - newEquationID= pFact->addNewMenuAfter("Main",NULL,AP_MENU_ID_INSERT_ENDNOTE,EV_MLF_BeginSubMenu);
> + newEquationID= pFact->addNewMenuAfter("Main",NULL,AP_MENU_ID_INSERT_GRAPHIC,EV_MLF_BeginSubMenu);
> UT_DEBUGMSG(("newEquationID %d \n",newEquationID));
>
>
>
> Modified: abiword/trunk/src/wp/ap/xp/ap_Menu_ActionSet.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/xp/ap_Menu_ActionSet.cpp 2009-07-04 17:45:55 UTC (rev 27131)
> +++ abiword/trunk/src/wp/ap/xp/ap_Menu_ActionSet.cpp 2009-07-04 17:51:39 UTC (rev 27132)
> @@ -275,7 +275,7 @@
> _s(AP_MENU_ID_DELETE_ANNOTATION, 0,0,0,0, "deleteHyperlink", NULL, NULL);
>
> _s(AP_MENU_ID_TABLE,1,0,0,0,NULL,NULL,NULL);
> - _s(AP_MENU_ID_TABLE_INSERT,1,0,0,0, NULL, NULL, NULL);
> + _s(AP_MENU_ID_TABLE_INSERT,1,0,0,0, NULL, ap_GetState_InTable, NULL);
> _s(AP_MENU_ID_TABLE_INSERT_TABLE,0,1,0,0, "insertTable",ap_GetState_TableOK, NULL);
> _s(AP_MENU_ID_TABLE_INSERTTABLE,0,1,0,0, "insertTable",ap_GetState_TableOK , NULL);
> _s(AP_MENU_ID_TABLE_INSERT_COLUMNS_BEFORE,0,0,0,0, "insertColsBefore", ap_GetState_InTable, NULL);
>
> Modified: abiword/trunk/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h
> ===================================================================
> --- abiword/trunk/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h 2009-07-04 17:45:55 UTC (rev 27131)
> +++ abiword/trunk/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h 2009-07-04 17:51:39 UTC (rev 27132)
> @@ -162,25 +162,32 @@
>
> BeginSubMenu(AP_MENU_ID_INSERT)
> MenuItem(AP_MENU_ID_INSERT_BREAK)
> + MenuItem(AP_MENU_ID_INSERT_HEADER)
> + MenuItem(AP_MENU_ID_INSERT_FOOTER)
> +
> + Separator()
> +
> + MenuItem(AP_MENU_ID_TABLE_INSERT_TABLE)
> + MenuItem(AP_MENU_ID_INSERT_TEXTBOX)
> + MenuItem(AP_MENU_ID_INSERT_TABLEOFCONTENTS)
> + MenuItem(AP_MENU_ID_INSERT_FOOTNOTE)
> + MenuItem(AP_MENU_ID_INSERT_ENDNOTE)
> +
> + Separator()
> +
> + MenuItem(AP_MENU_ID_INSERT_SYMBOL)
> MenuItem(AP_MENU_ID_INSERT_PAGENO)
> MenuItem(AP_MENU_ID_INSERT_DATETIME)
> MenuItem(AP_MENU_ID_INSERT_FIELD)
> - MenuItem(AP_MENU_ID_INSERT_TEXTBOX)
> + MenuItem(AP_MENU_ID_INSERT_BOOKMARK)
> + MenuItem(AP_MENU_ID_INSERT_HYPERLINK)
> #if !XAP_SIMPLE_MENU
> MenuItem(AP_MENU_ID_INSERT_MAILMERGE)
> #endif
> - MenuItem(AP_MENU_ID_INSERT_SYMBOL)
>
> Separator()
>
> - MenuItem(AP_MENU_ID_INSERT_HEADER)
> - MenuItem(AP_MENU_ID_INSERT_FOOTER)
> MenuItem(AP_MENU_ID_INSERT_FILE)
> - MenuItem(AP_MENU_ID_INSERT_BOOKMARK)
> - MenuItem(AP_MENU_ID_INSERT_HYPERLINK)
> - MenuItem(AP_MENU_ID_INSERT_TABLEOFCONTENTS)
> - MenuItem(AP_MENU_ID_INSERT_FOOTNOTE)
> - MenuItem(AP_MENU_ID_INSERT_ENDNOTE)
>
> #if defined(TOOLKIT_GTK) && !XAP_SIMPLE_MENU
> MenuItem(AP_MENU_ID_INSERT_CLIPART)
> @@ -202,6 +209,7 @@
> MenuItem(AP_MENU_ID_FMT_FONT)
> MenuItem(AP_MENU_ID_FMT_PARAGRAPH)
> MenuItem(AP_MENU_ID_FMT_BULLETS)
> + MenuItem(AP_MENU_ID_TABLE_FORMAT)
> MenuItem(AP_MENU_ID_FMT_FRAME)
> MenuItem(AP_MENU_ID_FMT_IMAGE)
> #if 0 // someone code and turn this back on
> @@ -327,7 +335,6 @@
> BeginSubMenu(AP_MENU_ID_TABLE)
>
> BeginSubMenu(AP_MENU_ID_TABLE_INSERT)
> - MenuItem(AP_MENU_ID_TABLE_INSERT_TABLE)
> MenuItem(AP_MENU_ID_TABLE_INSERT_COLUMNS_BEFORE)
> MenuItem(AP_MENU_ID_TABLE_INSERT_COLUMNS_AFTER)
> MenuItem(AP_MENU_ID_TABLE_INSERT_ROWS_BEFORE)
> @@ -364,7 +371,6 @@
> // Not for 2.4
> MenuItem(AP_MENU_ID_TABLE_SPLIT_TABLE)
> #endif
> - MenuItem(AP_MENU_ID_TABLE_FORMAT)
> BeginSubMenu(AP_MENU_ID_TABLE_TEXTTOTABLE)
> MenuItem(AP_MENU_ID_TABLE_TEXTTOTABLE_ALL)
> MenuItem(AP_MENU_ID_TABLE_TEXTTOTABLE_NOSPACES)
>
> Modified: abiword/trunk/src/wp/ap/xp/ap_String_Id.h
> ===================================================================
> --- abiword/trunk/src/wp/ap/xp/ap_String_Id.h 2009-07-04 17:45:55 UTC (rev 27131)
> +++ abiword/trunk/src/wp/ap/xp/ap_String_Id.h 2009-07-04 17:51:39 UTC (rev 27132)
> @@ -953,6 +953,7 @@
> dcl(MENU_LABEL_FMT_FONT,"&Font")
> dcl(MENU_LABEL_FMT_PARAGRAPH,"&Paragraph")
> dcl(MENU_LABEL_FMT_BULLETS,"Bullets and &Numbering")
> +dcl(MENU_LABEL_TABLE_FORMAT, "&Table")
> dcl(MENU_LABEL_FMT_DOCUMENT,"&Document")
> dcl(MENU_LABEL_FMT_BORDERS,"Borders and Shading")
> dcl(MENU_LABEL_FMT_HDRFTR,"Header/Footers")
> @@ -1053,7 +1054,6 @@
> dcl(MENU_LABEL_TABLE_MERGE_CELLS, "&Merge Cells")
> dcl(MENU_LABEL_TABLE_SPLIT_CELLS, "S&plit Cells")
> dcl(MENU_LABEL_TABLE_SPLIT_TABLE, "Spli&t Table")
> -dcl(MENU_LABEL_TABLE_FORMAT, "&Format Table")
> dcl(MENU_LABEL_TABLE_AUTOFIT, "&Autofit Table")
> dcl(MENU_LABEL_TABLE_TEXTTOTABLE, "Convert Text to Table")
> dcl(MENU_LABEL_TABLE_TEXTTOTABLE_ALL, "Split text at spaces, commas, or tabs")
>
> -----------------------------------------------
> To unsubscribe from this list, send a message to
> abisource-cvs-commit-request@abisource.com with the word
> unsubscribe in the message body.
Received on Sat Jul 4 20:13:07 2009