#2629 Add Conflict Open to all menus

Branch_+_Trunk
closed-accepted
Kimmo Varis
Usability (141)
5
2008-07-25
2008-07-23
Kimmo Varis
No

Denis didn't find this menuitem at first. As it is only shown for main frame only.

I thought users would just open WinMerge and then select conflict file to open. But of course one can open conflict file when file/folder compare is already open.

So this patch adds menuitem to CDirView and CMergeEditView.

Index: Merge.rc

--- Merge.rc (revision 5658)
+++ Merge.rc (working copy)
@@ -192,6 +192,7 @@
BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Op&en Conflict File...", ID_FILE_OPENCONFLICT
MENUITEM SEPARATOR
MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
@@ -312,6 +313,7 @@
BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Op&en Conflict File...", ID_FILE_OPENCONFLICT
MENUITEM SEPARATOR
MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT

Discussion

  • Kimmo Varis
    Kimmo Varis
    2008-07-23

    The patch

     
  • Kimmo Varis
    Kimmo Varis
    2008-07-23

    • assigned_to: nobody --> kimmov
    • status: open --> open-accepted
     
  • Kimmo Varis
    Kimmo Varis
    2008-07-23

    Logged In: YES
    user_id=631874
    Originator: YES

    Committed to SVN trunk:
    Completed: At revision: 5667

    Will commit to 2.10 branch in few days.

     
  • Kimmo Varis
    Kimmo Varis
    2008-07-25

    • status: open-accepted --> closed-accepted
     
  • Kimmo Varis
    Kimmo Varis
    2008-07-25

    Logged In: YES
    user_id=631874
    Originator: YES

    Committed to 2.10 branch:
    Completed: At revision: 5679