search

guberm / tortoisegit

Automatically exported from code.google.com/p/tortoisegit
0 stars 0 forks source link

Can not un-check the menu item "Abort Merge" in Settings dialog #2035

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago 
What steps will reproduce the problem?
1. open Settings dialog.
2. click on Context Menu node.
3. un-check the item "Abort Merge". (it was checked someday.)
4. push OK to leave.
5. open Settings again.

What is the expected output? What do you see instead?

Expected:
 "Abort Merge" should be un-checked.
Instead:
 "Abort Merge" is still checked.

What version of TortoiseGit and msysgit are you using? On
what operating system?

TGit 1.8.6.6
msysGit 1.8.4
Win7 64

Please provide any additional information below.

Pull Request:
http://code.google.com/r/b8732003-test/source/detail?r=ee646e49a323292d4fca7bb48
73b0c24d632878e

Also have the same problem in Set Extend Menu Item.

Because "Merge" and "Abort Merge" use the same menu id, "About Merge" should be 
behind "Merge".

Because "Edit conflicts" and "Resolved" is put together with "About Merge", 
they moved, too.

Original issue reported on code.google.com by yuelinho...@gmail.com on 14 Dec 2013 at 1:23

GoogleCodeExporter commented 9 years ago 
:)
Solution 2:
Create new menu id for "Abort Merge"

http://code.google.com/r/b8732003-test/source/detail?r=6d9859bf79f9628d99db51930
254191c4e910321

Original comment by yuelinho...@gmail.com on 14 Dec 2013 at 9:21

GoogleCodeExporter commented 9 years ago 
[deleted comment]
GoogleCodeExporter commented 9 years ago 
[deleted comment]
GoogleCodeExporter commented 9 years ago 
This issue was closed by revision 4fb46ae0de0d.

Original comment by ch3co...@gmail.com on 14 Dec 2013 at 9:44

GoogleCodeExporter commented 9 years ago 
This issue was closed by revision 0e9a4fb5f719.

Original comment by ch3co...@gmail.com on 14 Dec 2013 at 11:14

GoogleCodeExporter commented 9 years ago 
May a better idea would be to only show the first item in the checkbox lists if 
more than one shares the same id.

Original comment by sstrickr...@googlemail.com on 14 Dec 2013 at 11:19

GoogleCodeExporter commented 9 years ago

Original comment by sstrickr...@googlemail.com on 14 Dec 2013 at 11:20

GoogleCodeExporter commented 9 years ago 
Workaround on 1.8.5 & 1.8.6:

Un-check both "Abort Merge" and "Mterge" at the same time.

Sorry for that both of the solutions are not good enough. :)

Original comment by yuelinho...@gmail.com on 14 Dec 2013 at 2:15

GoogleCodeExporter commented 9 years ago 
No need to be sorry, both solution were good, but we want to perfect solution ;)

Original comment by sstrickr...@googlemail.com on 14 Dec 2013 at 2:26

GoogleCodeExporter commented 9 years ago 
Can you please post the links to all your proposals here?

Original comment by sstrickr...@googlemail.com on 25 Dec 2013 at 7:22

GoogleCodeExporter commented 9 years ago 
1) Move "Edit conflicts", "Resolved", "Abort Merge" down.
   https://code.google.com/r/b8732003-test/source/detail?r=ee646e49a323292d4fca7bb4873b0c24d632878e
   Reason: "Switch" and "Merge" should be put together.
   But: the items about merge is very important function, I would not like "move down".

2) Create new menu id for "Abort Merge"
   https://code.google.com/r/b8732003-test/source/detail?r=ffaeb6b503b444a17fd112dc7d7b6671af8a9525
   Reason: All items stay at original position.
   But: the rest of menu id is rare, I would not like to waste one.)

3) Move "Merge" up (above "Abort Merge")
   https://code.google.com/r/b8732003-test/source/detail?r=77e3c5de2231976df450e25b4af19b7f5c47dc23
   Reason: "Abort Merge", "Edit conflicts" and "Resolved" should be put together.
   Sould "Merge" and "Switch" put together? Maybe not.

4) Lower the dependence of the sharing menu id and Move "Merge" up (above "Edit 
conflicts")
   https://code.google.com/r/b8732003-test/source/detail?r=77e3c5de2231976df450e25b4af19b7f5c47dc23
    plus
   https://code.google.com/r/b8732003-test/source/detail?r=4b624fe50cfdb46089d0f6d4d91318f4572c8126
    plus
   https://code.google.com/r/b8732003-test/source/detail?r=c5e3a2ca28e9ceaa771c8881e5532789934ed662
   Reason: Based on comment #6, and I also don't like the dependence that the sharing menu id should put together one by one.
   I want to show "Merge" in Settings instead "Abort Merge", so the "Merge" still move up.

If you choose the one of 1) ~ 3), perhaps adding some comment/note in 
MenuInfo.cpp to remind devs, like:
"The sharing menuId should put together one by one, and only the first one will 
be shown in Settings"

Actually, all of them are not the perfect one.
Wish:
 All item in context menu could move to any where. (no dependence)
 All item in Settings could be shown. (Perhaps check/un-check one item with sharing menu id, the others also are checked/un-checked automatically.)

Original comment by yuelinho...@gmail.com on 26 Dec 2013 at 2:14