{"thread":{"id":"14988","subject":"[PATCH] Fix invalid menubar and toolbar entries in plugin.xml","startedAt":"2008-08-13T19:07:54Z","lastAt":"2008-08-14T22:07:21Z","messageCount":8,"participants":["Tor Arne Vestbø","Robin Rosenberg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"87086","messageId":"48A3310A.8080306@gmail.com","threadId":"14988","inReplyTo":null,"subject":"[PATCH] Fix invalid menubar and toolbar entries in plugin.xml","fromName":"Tor Arne Vestbø","fromEmail":"torarnv@gmail.com","sentAt":"2008-08-13T19:07:54Z","receivedAt":"2008-08-13T19:07:54Z","isPatch":true,"sender":{"key":"torarnv@gmail.com","avatar":"https://gravatar.com/avatar/847af0150a5a28ad86d9db1556a48aba04e7642c6a29a5a767f8c2bdf1720321?d=mp&s=160"},"body":"The default toolbar is identified by the path 'Normal',\nand we use the default group, named by 'additions'.\n\nThe menu entry was not used, and was causing an extra\nempty space in the menu bar.\n\nAlso, renamed the action set label to be consistent with\nwhat the other platform plugins do (no 'actions' postfix).\n\nSigned-off-by: Tor Arne Vestbø <torarnv@gmail.com>\n---\n org.spearce.egit.ui/plugin.properties |    2 +-\n org.spearce.egit.ui/plugin.xml        |   18 ++++--------------\n 2 files changed, 5 insertions(+), 15 deletions(-)\n\ndiff --git a/org.spearce.egit.ui/plugin.properties b/org.spearce.egit.ui/plugin.properties\nindex 3240ec0..ce3b058 100644\n--- a/org.spearce.egit.ui/plugin.properties\n+++ b/org.spearce.egit.ui/plugin.properties\n@@ -41,7 +41,7 @@ ResetAction_tooltip=Reset the current branch to the same or another commit\n BranchAction_label=&Branch...\n BranchAction_tooltip=Switch to another branch\n \n-GitActions_label=Git actions\n+GitActions_label=Git\n GitMenu_label=&Git\n \n \ndiff --git a/org.spearce.egit.ui/plugin.xml b/org.spearce.egit.ui/plugin.xml\nindex 393121f..97eb2a6 100644\n--- a/org.spearce.egit.ui/plugin.xml\n+++ b/org.spearce.egit.ui/plugin.xml\n@@ -243,12 +243,6 @@\n \t    label=\"%GitActions_label\"\n \t    visible=\"true\"\n \t    >\n-\t    <menu\n-           id=\"org.spearce.egit.ui.gitmenu\"\n-           label=\"%GitMenu_label\"\n-           path=\"org.spearce.egit.ui.gitmenu\"\n-           >\n-\t    </menu>\n \t\t<action\n \t\t       class=\"org.spearce.egit.ui.internal.actions.BranchAction\"\n \t\t       disabledIcon=\"icons/toolbar/checkoutd.png\"\n@@ -256,8 +250,7 @@\n \t\t       id=\"org.spearce.egit.ui.actionbranch\"\n \t\t       label=\"%BranchAction_label\"\n \t\t       style=\"push\"\n-\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repo\"\n-\t\t       toolbarPath=\"org.spearce.egit.ui\"\n+\t\t       toolbarPath=\"Normal/additions\"\n \t\t       tooltip=\"%BranchAction_tooltip\">\n \t\t</action>\n \t\t<action\n@@ -267,8 +260,7 @@\n \t\t       id=\"org.spearce.egit.ui.actioncommit\"\n \t\t       label=\"%CommitAction_label\"\n \t\t       style=\"push\"\n-\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repo\"\n-\t\t       toolbarPath=\"org.spearce.egit.ui\"\n+\t\t       toolbarPath=\"Normal/additions\"\n \t\t       tooltip=\"%CommitAction_tooltip\">\n \t\t</action>\n \t\t<action\n@@ -278,8 +270,7 @@\n \t\t       id=\"org.spearce.egit.ui.actionreset\"\n \t\t       label=\"%ResetAction_label\"\n \t\t       style=\"push\"\n-\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repo\"\n-\t\t       toolbarPath=\"org.spearce.egit.ui\"\n+\t\t       toolbarPath=\"Normal/additions\"\n \t\t       tooltip=\"%ResetAction_tooltip\">\n \t\t</action>\n \t\t<action\n@@ -288,9 +279,8 @@\n \t\t       icon=\"icons/toolbar/tracke.png\"\n \t\t       id=\"org.spearce.egit.ui.trackaction\"\n \t\t       label=\"%TrackAction_label\"\n-\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repo\"\n \t\t       style=\"push\"\n-\t\t       toolbarPath=\"org.spearce.egit.ui\"\n+\t\t       toolbarPath=\"Normal/additions\"\n \t\t       tooltip=\"Start tracking the selected resources\">\n \t\t</action>\n       </actionSet>\n-- \n1.5.6.5\n"},{"id":"87155","messageId":"200808140747.35753.robin.rosenberg.lists@dewire.com","threadId":"14988","inReplyTo":"48A3310A.8080306@gmail.com","subject":"Re: [EGIT PATCH] Fix invalid menubar and toolbar entries in plugin.xml","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2008-08-14T05:47:35Z","receivedAt":"2008-08-14T05:47:35Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"onsdagen den 13 augusti 2008 21.07.54 skrev Tor Arne Vestbø:\n> The default toolbar is identified by the path 'Normal',\n> and we use the default group, named by 'additions'.\n> \n> The menu entry was not used, and was causing an extra\n> empty space in the menu bar.\n\nSo that's why. Thanks. \n\nPlease try to prefix the patch with EGIT (or JGIT for JGit-only patches)\nso we won't waste the time of those on the list having no interesting in this implementation.\nI forgot it a few times myself.\n\n-- robin\n"},{"id":"87210","messageId":"200808141942.55448.robin.rosenberg.lists@dewire.com","threadId":"14988","inReplyTo":"200808140747.35753.robin.rosenberg.lists@dewire.com","subject":"Re: [EGIT PATCH] Fix invalid menubar and toolbar entries in plugin.xml","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2008-08-14T17:42:55Z","receivedAt":"2008-08-14T17:42:55Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"torsdagen den 14 augusti 2008 07.47.35 skrev Robin Rosenberg:\n> onsdagen den 13 augusti 2008 21.07.54 skrev Tor Arne Vestbø:\n> > The default toolbar is identified by the path 'Normal',\n> > and we use the default group, named by 'additions'.\n> > \n> > The menu entry was not used, and was causing an extra\n> > empty space in the menu bar.\n> \n> So that's why. Thanks. \n> \n> Please try to prefix the patch with EGIT (or JGIT for JGit-only patches)\n> so we won't waste the time of those on the list having no interesting in this implementation.\n\nWhen I applied this patch the Git menu disappeared. (3.3)\n\n-- robin\n"},{"id":"87221","messageId":"48A483EF.10508@gmail.com","threadId":"14988","inReplyTo":"200808141942.55448.robin.rosenberg.lists@dewire.com","subject":"Re: [EGIT PATCH] Fix invalid menubar and toolbar entries in plugin.xml","fromName":"Tor Arne Vestbø","fromEmail":"torarnv@gmail.com","sentAt":"2008-08-14T19:13:51Z","receivedAt":"2008-08-14T19:13:51Z","isPatch":true,"sender":{"key":"torarnv@gmail.com","avatar":"https://gravatar.com/avatar/847af0150a5a28ad86d9db1556a48aba04e7642c6a29a5a767f8c2bdf1720321?d=mp&s=160"},"body":"Robin Rosenberg wrote:\n>>> The menu entry was not used, and was causing an extra\n>>> empty space in the menu bar.\n> \n> When I applied this patch the Git menu disappeared. (3.3)\n\nAh, I see. It appears the menu was used, but because it had the wrong\npath ('org.spearce.egit.ui.gitmenu' instead of 'additions') the four \nentries did not show up in 3.4. \n\nEither way I suggest the patch is still valid, because it removes\nthe Git menu from the menu bar. This is consistent with what other \nplatform plugins do, ie. not populating the main menu bar with plugin\nspecific entries, but instead using sub menus, context menus and views.\n\nIn the long run we should probably also move the global toolbar entries\nto the synchronize view, when I get the chance to look at implementing \nthat. \n\nTor Arne\n"},{"id":"87228","messageId":"200808142242.20476.robin.rosenberg.lists@dewire.com","threadId":"14988","inReplyTo":"48A483EF.10508@gmail.com","subject":"Re: [EGIT PATCH] Fix invalid menubar and toolbar entries in plugin.xml","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2008-08-14T20:42:19Z","receivedAt":"2008-08-14T20:42:19Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"torsdagen den 14 augusti 2008 21.13.51 skrev Tor Arne Vestbø:\n> Robin Rosenberg wrote:\n> >>> The menu entry was not used, and was causing an extra\n> >>> empty space in the menu bar.\n> > \n> > When I applied this patch the Git menu disappeared. (3.3)\n> \n> Ah, I see. It appears the menu was used, but because it had the wrong\n> path ('org.spearce.egit.ui.gitmenu' instead of 'additions') the four \n> entries did not show up in 3.4. \nThat's our first 3.4 incompatibilty.\n\n> Either way I suggest the patch is still valid, because it removes\n> the Git menu from the menu bar. This is consistent with what other \nBut I don't want it removed... , but I can consider hiding the git actions by default.\n\n> platform plugins do, ie. not populating the main menu bar with plugin\nLots of plugins provide both menus and toolsbars so there is no inconsistence\nwith Git doing it. \n\n> specific entries, but instead using sub menus, context menus and views.\nYou can have it all. Eclipse is good at it. Anywhere there is a customizeable\ncontext menu now you'll get a number of actions for RevObject's like the reset\netc actions. If you add, say a refs view with RevObjects in it you'd get the\ncontextg menues there too.\n\n> In the long run we should probably also move the global toolbar entries\nNo. \n\n> to the synchronize view, when I get the chance to look at implementing \n> that. \n\nIt is not clear, I think, what the synchronize view would look like to be an effective\ngit gui, but if we toss ideas around we might come to some conclusions/agreements.\n\n> \n> Tor Arne\n> \n\n-- robin\n"},{"id":"87229","messageId":"200808142245.40152.robin.rosenberg.lists@dewire.com","threadId":"14988","inReplyTo":"200808142242.20476.robin.rosenberg.lists@dewire.com","subject":"[EGIT PATCH] Hide the Git menu and toolbars by default and fix the path of the Git menu","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2008-08-14T20:45:39Z","receivedAt":"2008-08-14T20:45:39Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"\nSigned-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>\n---\n org.spearce.egit.ui/plugin.xml |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/org.spearce.egit.ui/plugin.xml b/org.spearce.egit.ui/plugin.xml\nindex b809300..a52495b 100644\n--- a/org.spearce.egit.ui/plugin.xml\n+++ b/org.spearce.egit.ui/plugin.xml\n@@ -241,12 +241,12 @@\n \t    description=\"Common things to do with Git\"\n \t    id=\"org.spearce.egit.ui.gitaction\"\n \t    label=\"%GitActions_label\"\n-\t    visible=\"true\"\n+\t    visible=\"false\"\n \t    >\n \t    <menu\n            id=\"org.spearce.egit.ui.gitmenu\"\n            label=\"%GitMenu_label\"\n-           path=\"org.spearce.egit.ui.gitmenu\"\n+           path=\"additions\"\n            >\n \t    </menu>\n \t\t<action\n-- \n1.6.0.rc2.35.g04c6e9\n"},{"id":"87238","messageId":"48A4A6F8.3060205@gmail.com","threadId":"14988","inReplyTo":"200808142242.20476.robin.rosenberg.lists@dewire.com","subject":"Re: [EGIT PATCH] Fix invalid menubar and toolbar entries in plugin.xml","fromName":"Tor Arne Vestbø","fromEmail":"torarnv@gmail.com","sentAt":"2008-08-14T21:43:20Z","receivedAt":"2008-08-14T21:43:20Z","isPatch":true,"sender":{"key":"torarnv@gmail.com","avatar":"https://gravatar.com/avatar/847af0150a5a28ad86d9db1556a48aba04e7642c6a29a5a767f8c2bdf1720321?d=mp&s=160"},"body":"Robin Rosenberg wrote:\n>> Either way I suggest the patch is still valid, because it removes\n>> the Git menu from the menu bar. This is consistent with what other \n> But I don't want it removed... , but I can consider hiding the git actions by default.\n\nI see now that both the CVS and SVN plugins have top level menus and toolbars \n(they are hidden by default), so I'm perfectly fine with us doing the same.\n\nDo you want me to resubmit the patch, or is it enough with the patch you amended?\n\nThanks,\n\nTor Arne\n"},{"id":"87245","messageId":"48A4AC99.7080303@gmail.com","threadId":"14988","inReplyTo":"200808142242.20476.robin.rosenberg.lists@dewire.com","subject":"[EGIT PATCH v2] Fix invalid menubar and toolbar entries in plugin.xml","fromName":"Tor Arne Vestbø","fromEmail":"torarnv@gmail.com","sentAt":"2008-08-14T22:07:21Z","receivedAt":"2008-08-14T22:07:21Z","isPatch":true,"sender":{"key":"torarnv@gmail.com","avatar":"https://gravatar.com/avatar/847af0150a5a28ad86d9db1556a48aba04e7642c6a29a5a767f8c2bdf1720321?d=mp&s=160"},"body":"The default toolbar is identified by the path 'Normal',\nand we use the default group, named by 'additions'.\n\nAlso, renamed the action set label to be consistent with\nwhat the other platform plugins do (no 'actions' postfix).\n\nSigned-off-by: Tor Arne Vestbø <torarnv@gmail.com>\n---\n org.spearce.egit.ui/plugin.properties |    2 +-\n org.spearce.egit.ui/plugin.xml        |   23 +++++++++++++----------\n 2 files changed, 14 insertions(+), 11 deletions(-)\n\ndiff --git a/org.spearce.egit.ui/plugin.properties b/org.spearce.egit.ui/plugin.properties\nindex 3240ec0..ce3b058 100644\n--- a/org.spearce.egit.ui/plugin.properties\n+++ b/org.spearce.egit.ui/plugin.properties\n@@ -41,7 +41,7 @@ ResetAction_tooltip=Reset the current branch to the same or another commit\n BranchAction_label=&Branch...\n BranchAction_tooltip=Switch to another branch\n \n-GitActions_label=Git actions\n+GitActions_label=Git\n GitMenu_label=&Git\n \n \ndiff --git a/org.spearce.egit.ui/plugin.xml b/org.spearce.egit.ui/plugin.xml\nindex b809300..0b59a6e 100644\n--- a/org.spearce.egit.ui/plugin.xml\n+++ b/org.spearce.egit.ui/plugin.xml\n@@ -241,13 +241,16 @@\n \t    description=\"Common things to do with Git\"\n \t    id=\"org.spearce.egit.ui.gitaction\"\n \t    label=\"%GitActions_label\"\n-\t    visible=\"true\"\n+\t    visible=\"false\"\n \t    >\n \t    <menu\n            id=\"org.spearce.egit.ui.gitmenu\"\n            label=\"%GitMenu_label\"\n-           path=\"org.spearce.egit.ui.gitmenu\"\n+           path=\"additions\"\n            >\n+        <separator\n+              name=\"repositoryGroup\">\n+        </separator>\n \t    </menu>\n \t\t<action\n \t\t       class=\"org.spearce.egit.ui.internal.actions.BranchAction\"\n@@ -256,8 +259,8 @@\n \t\t       id=\"org.spearce.egit.ui.actionbranch\"\n \t\t       label=\"%BranchAction_label\"\n \t\t       style=\"push\"\n-\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repo\"\n-\t\t       toolbarPath=\"org.spearce.egit.ui\"\n+\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repositoryGroup\"\n+\t\t       toolbarPath=\"Normal/additions\"\n \t\t       tooltip=\"%BranchAction_tooltip\">\n \t\t</action>\n \t\t<action\n@@ -267,8 +270,8 @@\n \t\t       id=\"org.spearce.egit.ui.actioncommit\"\n \t\t       label=\"%CommitAction_label\"\n \t\t       style=\"push\"\n-\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repo\"\n-\t\t       toolbarPath=\"org.spearce.egit.ui\"\n+\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repositoryGroup\"\n+\t\t       toolbarPath=\"Normal/additions\"\n \t\t       tooltip=\"%CommitAction_tooltip\">\n \t\t</action>\n \t\t<action\n@@ -278,8 +281,8 @@\n \t\t       id=\"org.spearce.egit.ui.actionreset\"\n \t\t       label=\"%ResetAction_label\"\n \t\t       style=\"push\"\n-\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repo\"\n-\t\t       toolbarPath=\"org.spearce.egit.ui\"\n+\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repositoryGroup\"\n+\t\t       toolbarPath=\"Normal/additions\"\n \t\t       tooltip=\"%ResetAction_tooltip\">\n \t\t</action>\n \t\t<action\n@@ -288,9 +291,9 @@\n \t\t       icon=\"icons/toolbar/tracke.png\"\n \t\t       id=\"org.spearce.egit.ui.trackaction\"\n \t\t       label=\"%TrackAction_label\"\n-\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repo\"\n \t\t       style=\"push\"\n-\t\t       toolbarPath=\"org.spearce.egit.ui\"\n+\t\t       menubarPath=\"org.spearce.egit.ui.gitmenu/repositoryGroup\"\n+\t\t       toolbarPath=\"Normal/additions\"\n \t\t       tooltip=\"Start tracking the selected resources\">\n \t\t</action>\n       </actionSet>\n-- \n1.5.6.5\n"}]}