RID_SCDLG_CONFLICTS conversion to .ui

Change-Id: Ibdfa27e834cd8fba0f732233338e5fba699c1e90
Reviewed-on: https://gerrit.libreoffice.org/10778
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

4 files changed, 75 insertions, 248 deletions

diff --git a/sc/source/ui/inc/conflictsdlg.hrc b/sc/source/ui/inc/conflictsdlg.hrc
deleted file mode 100644
index bbdcd886a51f..000000000000
--- a/sc/source/ui/inc/conflictsdlg.hrc
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sc.hrc>
-
-#define FT_CONFLICTS            1
-#define LB_CONFLICTS            2
-#define BTN_KEEPMINE            3
-#define BTN_KEEPOTHER           4
-#define FL_CONFLICTS            5
-#define BTN_KEEPALLMINE         6
-#define BTN_KEEPALLOTHERS       7
-#define BTN_CANCEL              8
-#define BTN_HELP                9
-
-#define STR_TITLE_CONFLICT      1
-#define STR_TITLE_AUTHOR        2
-#define STR_TITLE_DATE          3
-#define STR_UNKNOWN_USER        4
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index 6123dbc79c62..05d16ff85a23 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -116,16 +116,12 @@ public:
 class ScConflictsDlg : public ModalDialog
 {
 private:
-    FixedText           maFtConflicts;
-    SvSimpleTableContainer m_aLbConflictsContainer;
-    SvxRedlinTable      maLbConflicts;
-    PushButton          maBtnKeepMine;
-    PushButton          maBtnKeepOther;
-    FixedLine           maFlConflicts;
-    PushButton          maBtnKeepAllMine;
-    PushButton          maBtnKeepAllOthers;
-    CancelButton        maBtnCancel;
-    HelpButton          maBtnHelp;
+    SvSimpleTableContainer *m_pLbConflictsContainer;
+    boost::scoped_ptr<SvxRedlinTable>    m_pLbConflicts;
+    PushButton          *m_pBtnKeepMine;
+    PushButton          *m_pBtnKeepOther;
+    PushButton          *m_pBtnKeepAllMine;
+    PushButton          *m_pBtnKeepAllOthers;
 
     OUString            maStrTitleConflict;
     OUString            maStrTitleAuthor;
@@ -164,7 +160,6 @@ public:
                         ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList );
                         virtual ~ScConflictsDlg();
 
-    virtual void        Resize() SAL_OVERRIDE;
     void                UpdateView();
 };
 
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index dacd1404ae3d..cda2832adb06 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -21,7 +21,7 @@
 #include <vcl/msgbox.hxx>
 
 #include "conflictsdlg.hxx"
-#include "conflictsdlg.hrc"
+#include "sc.hrc"
 #include "scresid.hxx"
 #include "viewdata.hxx"
 #include "dbfunc.hxx"
@@ -372,21 +372,13 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA
 // class ScConflictsDlg
 
 ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList )
-    :ModalDialog( pParent, ScResId( RID_SCDLG_CONFLICTS ) )
-    ,maFtConflicts      ( this, ScResId( FT_CONFLICTS ) )
-    ,m_aLbConflictsContainer(this, ScResId( LB_CONFLICTS))
-    ,maLbConflicts(m_aLbConflictsContainer)
-    ,maBtnKeepMine      ( this, ScResId( BTN_KEEPMINE ) )
-    ,maBtnKeepOther     ( this, ScResId( BTN_KEEPOTHER ) )
-    ,maFlConflicts      ( this, ScResId( FL_CONFLICTS ) )
-    ,maBtnKeepAllMine   ( this, ScResId( BTN_KEEPALLMINE ) )
-    ,maBtnKeepAllOthers ( this, ScResId( BTN_KEEPALLOTHERS ) )
-    ,maBtnCancel        ( this, ScResId( BTN_CANCEL ) )
-    ,maBtnHelp          ( this, ScResId( BTN_HELP ) )
+    :ModalDialog( pParent, "ConflictsDialog", "modules/scalc/ui/conflictsdialog.ui" )
+    ,m_pLbConflictsContainer  ( get<SvSimpleTableContainer>("container") )
+    ,m_pLbConflicts     ( new SvxRedlinTable(*m_pLbConflictsContainer) )
     ,maStrTitleConflict ( ScResId( STR_TITLE_CONFLICT ) )
     ,maStrTitleAuthor   ( ScResId( STR_TITLE_AUTHOR ) )
     ,maStrTitleDate     ( ScResId( STR_TITLE_DATE ) )
-    ,maStrUnknownUser   ( ScResId( STR_UNKNOWN_USER ) )
+    ,maStrUnknownUser   ( ScResId( STR_UNKNOWN_USER_CONFLICT ) )
     ,mpViewData         ( pViewData )
     ,mpOwnDoc           ( NULL )
     ,mpOwnTrack         ( NULL )
@@ -397,6 +389,11 @@ ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocume
     ,mbInSelectHdl      ( false )
     ,mbInDeselectHdl    ( false )
 {
+    get(m_pBtnKeepMine, "keepmine");
+    get(m_pBtnKeepOther, "keepother");
+    get(m_pBtnKeepAllMine, "keepallmine");
+    get(m_pBtnKeepAllOthers, "keepallothers");
+
     OSL_ENSURE( mpViewData, "ScConflictsDlg CTOR: mpViewData is null!" );
     mpOwnDoc = ( mpViewData ? mpViewData->GetDocument() : NULL );
     OSL_ENSURE( mpOwnDoc, "ScConflictsDlg CTOR: mpOwnDoc is null!" );
@@ -406,12 +403,10 @@ ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocume
     mpSharedTrack = ( mpSharedDoc ? mpSharedDoc->GetChangeTrack() : NULL );
     OSL_ENSURE( mpSharedTrack, "ScConflictsDlg CTOR: mpSharedTrack is null!" );
 
-    FreeResource();
-
     SetMinOutputSizePixel( maDialogSize );
 
     long nTabs[] = { 3, 10, 216, 266 };
-    maLbConflicts.SetTabs( nTabs );
+    m_pLbConflicts->SetTabs( nTabs );
 
     OUString aTab('\t');
     OUString aHeader( maStrTitleConflict );
@@ -419,29 +414,29 @@ ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocume
     aHeader += maStrTitleAuthor;
     aHeader += aTab;
     aHeader += maStrTitleDate;
-    maLbConflicts.InsertHeaderEntry( aHeader, HEADERBAR_APPEND, HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER );
+    m_pLbConflicts->InsertHeaderEntry( aHeader, HEADERBAR_APPEND, HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER );
 
-    maLbConflicts.SetStyle( maLbConflicts.GetStyle() | WB_HASLINES | WB_CLIPCHILDREN | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL );
-    maLbConflicts.SetSelectionMode( MULTIPLE_SELECTION );
-    maLbConflicts.SetHighlightRange();
+    m_pLbConflicts->SetStyle( m_pLbConflicts->GetStyle() | WB_HASLINES | WB_CLIPCHILDREN | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL );
+    m_pLbConflicts->SetSelectionMode( MULTIPLE_SELECTION );
+    m_pLbConflicts->SetHighlightRange();
 
     maSelectionTimer.SetTimeout( 100 );
     maSelectionTimer.SetTimeoutHdl( LINK( this, ScConflictsDlg, UpdateSelectionHdl ) );
 
-    maLbConflicts.SetSelectHdl( LINK( this, ScConflictsDlg, SelectHandle ) );
-    maLbConflicts.SetDeselectHdl( LINK( this, ScConflictsDlg, DeselectHandle ) );
+    m_pLbConflicts->SetSelectHdl( LINK( this, ScConflictsDlg, SelectHandle ) );
+    m_pLbConflicts->SetDeselectHdl( LINK( this, ScConflictsDlg, DeselectHandle ) );
 
-    maBtnKeepMine.SetClickHdl( LINK( this, ScConflictsDlg, KeepMineHandle ) );
-    maBtnKeepOther.SetClickHdl( LINK( this, ScConflictsDlg, KeepOtherHandle ) );
-    maBtnKeepAllMine.SetClickHdl( LINK( this, ScConflictsDlg, KeepAllMineHandle ) );
-    maBtnKeepAllOthers.SetClickHdl( LINK( this, ScConflictsDlg, KeepAllOthersHandle ) );
+    m_pBtnKeepMine->SetClickHdl( LINK( this, ScConflictsDlg, KeepMineHandle ) );
+    m_pBtnKeepOther->SetClickHdl( LINK( this, ScConflictsDlg, KeepOtherHandle ) );
+    m_pBtnKeepAllMine->SetClickHdl( LINK( this, ScConflictsDlg, KeepAllMineHandle ) );
+    m_pBtnKeepAllOthers->SetClickHdl( LINK( this, ScConflictsDlg, KeepAllOthersHandle ) );
 
     UpdateView();
 
-    SvTreeListEntry* pEntry = maLbConflicts.First();
+    SvTreeListEntry* pEntry = m_pLbConflicts->First();
     if ( pEntry != NULL )
     {
-        maLbConflicts.Select( pEntry );
+        m_pLbConflicts->Select( pEntry );
     }
 }
 
@@ -497,35 +492,35 @@ OUString ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocum
 
 void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle )
 {
-    SvTreeListEntry* pSelEntry = maLbConflicts.GetCurEntry();
+    SvTreeListEntry* pSelEntry = m_pLbConflicts->GetCurEntry();
     if ( !pSelEntry )
     {
-        pSelEntry = maLbConflicts.FirstSelected();
+        pSelEntry = m_pLbConflicts->FirstSelected();
     }
     if ( !pSelEntry )
     {
         return;
     }
 
-    SvTreeListEntry* pRootEntry = maLbConflicts.GetRootLevelParent( pSelEntry );
+    SvTreeListEntry* pRootEntry = m_pLbConflicts->GetRootLevelParent( pSelEntry );
     if ( pRootEntry )
     {
         if ( bSelectHandle )
         {
-            maLbConflicts.SelectAll( false );
+            m_pLbConflicts->SelectAll( false );
         }
-        if ( !maLbConflicts.IsSelected( pRootEntry ) )
+        if ( !m_pLbConflicts->IsSelected( pRootEntry ) )
         {
-            maLbConflicts.Select( pRootEntry );
+            m_pLbConflicts->Select( pRootEntry );
         }
-        SvTreeListEntry* pEntry = maLbConflicts.FirstChild( pRootEntry );
+        SvTreeListEntry* pEntry = m_pLbConflicts->FirstChild( pRootEntry );
         while ( pEntry )
         {
-            if ( !maLbConflicts.IsSelected( pEntry ) )
+            if ( !m_pLbConflicts->IsSelected( pEntry ) )
             {
-                maLbConflicts.Select( pEntry );
+                m_pLbConflicts->Select( pEntry );
             }
-            pEntry = maLbConflicts.NextSibling( pEntry );
+            pEntry = m_pLbConflicts->NextSibling( pEntry );
         }
     }
 }
@@ -569,10 +564,10 @@ IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl)
     ScTabView* pTabView = mpViewData->GetView();
     pTabView->DoneBlockMode();
     bool bContMark = false;
-    SvTreeListEntry* pEntry = maLbConflicts.FirstSelected();
+    SvTreeListEntry* pEntry = m_pLbConflicts->FirstSelected();
     while ( pEntry )
     {
-        if ( pEntry != maLbConflicts.GetRootLevelParent( pEntry ) )
+        if ( pEntry != m_pLbConflicts->GetRootLevelParent( pEntry ) )
         {
             RedlinData* pUserData = static_cast< RedlinData* >( pEntry->GetUserData() );
             if  ( pUserData )
@@ -584,14 +579,14 @@ IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl)
                     const ScBigRange& rBigRange = ( static_cast< const ScChangeAction* >( pAction ) )->GetBigRange();
                     if ( rBigRange.IsValid( mpOwnDoc ) )
                     {
-                        bool bSetCursor = !maLbConflicts.NextSelected( pEntry );
+                        bool bSetCursor = !m_pLbConflicts->NextSelected( pEntry );
                         pTabView->MarkRange( rBigRange.MakeRange(), bSetCursor, bContMark );
                         bContMark = true;
                     }
                 }
             }
         }
-        pEntry = maLbConflicts.NextSelected( pEntry );
+        pEntry = m_pLbConflicts->NextSelected( pEntry );
     }
 
     return 0;
@@ -609,8 +604,8 @@ void ScConflictsDlg::SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictA
 
 void ScConflictsDlg::KeepHandler( bool bMine )
 {
-    SvTreeListEntry* pEntry = maLbConflicts.FirstSelected();
-    SvTreeListEntry* pRootEntry = ( pEntry ? maLbConflicts.GetRootLevelParent( pEntry ) : NULL );
+    SvTreeListEntry* pEntry = m_pLbConflicts->FirstSelected();
+    SvTreeListEntry* pRootEntry = ( pEntry ? m_pLbConflicts->GetRootLevelParent( pEntry ) : NULL );
     if ( !pRootEntry )
     {
         return;
@@ -618,9 +613,9 @@ void ScConflictsDlg::KeepHandler( bool bMine )
     SetPointer( Pointer( POINTER_WAIT ) );
     ScConflictAction eConflictAction = ( bMine ? SC_CONFLICT_ACTION_KEEP_MINE : SC_CONFLICT_ACTION_KEEP_OTHER );
     SetConflictAction( pRootEntry, eConflictAction );
-    maLbConflicts.RemoveEntry( pRootEntry );
+    m_pLbConflicts->RemoveEntry( pRootEntry );
     SetPointer( Pointer( POINTER_ARROW ) );
-    if ( maLbConflicts.GetEntryCount() == 0 )
+    if ( m_pLbConflicts->GetEntryCount() == 0 )
     {
         EndDialog( RET_OK );
     }
@@ -628,8 +623,8 @@ void ScConflictsDlg::KeepHandler( bool bMine )
 
 void ScConflictsDlg::KeepAllHandler( bool bMine )
 {
-    SvTreeListEntry* pEntry = maLbConflicts.First();
-    SvTreeListEntry* pRootEntry = ( pEntry ? maLbConflicts.GetRootLevelParent( pEntry ) : NULL );
+    SvTreeListEntry* pEntry = m_pLbConflicts->First();
+    SvTreeListEntry* pRootEntry = ( pEntry ? m_pLbConflicts->GetRootLevelParent( pEntry ) : NULL );
     if ( !pRootEntry )
     {
         return;
@@ -639,11 +634,11 @@ void ScConflictsDlg::KeepAllHandler( bool bMine )
     while ( pRootEntry )
     {
         SetConflictAction( pRootEntry, eConflictAction );
-        pRootEntry = maLbConflicts.NextSibling( pRootEntry );
+        pRootEntry = m_pLbConflicts->NextSibling( pRootEntry );
     }
-    maLbConflicts.SetUpdateMode( false );
-    maLbConflicts.Clear();
-    maLbConflicts.SetUpdateMode( true );
+    m_pLbConflicts->SetUpdateMode( false );
+    m_pLbConflicts->Clear();
+    m_pLbConflicts->SetUpdateMode( true );
     SetPointer( Pointer( POINTER_ARROW ) );
     EndDialog( RET_OK );
 }
@@ -676,68 +671,6 @@ IMPL_LINK_NOARG(ScConflictsDlg, KeepAllOthersHandle)
     return 0;
 }
 
-static void lcl_MoveControlX( Window& rWindow, long nDelta )
-{
-    Point aPos( rWindow.GetPosPixel() );
-    aPos.X() += nDelta;
-    rWindow.SetPosPixel( aPos );
-}
-
-static void lcl_MoveControlY( Window& rWindow, long nDelta )
-{
-    Point aPos( rWindow.GetPosPixel() );
-    aPos.Y() += nDelta;
-    rWindow.SetPosPixel( aPos );
-}
-
-static void lcl_ChangeControlWidth( Window& rWindow, long nDelta )
-{
-    Size aSize( rWindow.GetSizePixel() );
-    aSize.Width() += nDelta;
-    rWindow.SetSizePixel( aSize );
-}
-
-static void lcl_ChangeControlHeight( Window& rWindow, long nDelta )
-{
-    Size aSize( rWindow.GetSizePixel() );
-    aSize.Height() += nDelta;
-    rWindow.SetSizePixel( aSize );
-}
-
-void ScConflictsDlg::Resize()
-{
-    Size aSize( GetSizePixel() );
-    long nDeltaWidth = aSize.Width() - maDialogSize.Width();
-    long nDeltaHeight = aSize.Height() - maDialogSize.Height();
-    maDialogSize = aSize;
-
-    lcl_ChangeControlWidth( maFtConflicts, nDeltaWidth );
-
-    lcl_ChangeControlWidth( m_aLbConflictsContainer, nDeltaWidth );
-    lcl_ChangeControlHeight( m_aLbConflictsContainer, nDeltaHeight );
-
-    lcl_MoveControlX( maBtnKeepMine, nDeltaWidth / 2 );
-    lcl_MoveControlY( maBtnKeepMine, nDeltaHeight );
-
-    lcl_MoveControlX( maBtnKeepOther, nDeltaWidth / 2 );
-    lcl_MoveControlY( maBtnKeepOther, nDeltaHeight );
-
-    lcl_MoveControlY( maFlConflicts, nDeltaHeight );
-    lcl_ChangeControlWidth( maFlConflicts, nDeltaWidth );
-
-    lcl_MoveControlX( maBtnKeepAllMine, nDeltaWidth );
-    lcl_MoveControlY( maBtnKeepAllMine, nDeltaHeight );
-
-    lcl_MoveControlX( maBtnKeepAllOthers, nDeltaWidth );
-    lcl_MoveControlY( maBtnKeepAllOthers, nDeltaHeight );
-
-    lcl_MoveControlX( maBtnCancel, nDeltaWidth );
-    lcl_MoveControlY( maBtnCancel, nDeltaHeight );
-
-    lcl_MoveControlX( maBtnHelp, nDeltaWidth );
-    lcl_MoveControlY( maBtnHelp, nDeltaHeight );
-}
-
 void ScConflictsDlg::UpdateView()
 {
     ScConflictsList::iterator aEndItr = mrConflictsList.end();
@@ -748,7 +681,7 @@ void ScConflictsDlg::UpdateView()
         {
             RedlinData* pRootUserData = new RedlinData();
             pRootUserData->pData = static_cast< void* >( pConflictEntry );
-            SvTreeListEntry* pRootEntry = maLbConflicts.InsertEntry( GetConflictString( *aItr ), pRootUserData );
+            SvTreeListEntry* pRootEntry = m_pLbConflicts->InsertEntry( GetConflictString( *aItr ), pRootUserData );
 
             ScChangeActionList::const_iterator aEndShared = aItr->maSharedActions.end();
             for ( ScChangeActionList::const_iterator aItrShared = aItr->maSharedActions.begin(); aItrShared != aEndShared; ++aItrShared )
@@ -767,7 +700,7 @@ void ScConflictsDlg::UpdateView()
                     }
 
                     OUString aString( GetActionString( pAction, mpSharedDoc ) );
-                    maLbConflicts.InsertEntry( aString, static_cast< RedlinData* >( NULL ), pRootEntry );
+                    m_pLbConflicts->InsertEntry( aString, static_cast< RedlinData* >( NULL ), pRootEntry );
                 }
             }
 
@@ -790,11 +723,11 @@ void ScConflictsDlg::UpdateView()
                     OUString aString( GetActionString( pAction, mpOwnDoc ) );
                     RedlinData* pUserData = new RedlinData();
                     pUserData->pData = static_cast< void* >( pAction );
-                    maLbConflicts.InsertEntry( aString, pUserData, pRootEntry );
+                    m_pLbConflicts->InsertEntry( aString, pUserData, pRootEntry );
                 }
             }
 
-            maLbConflicts.Expand( pRootEntry );
+            m_pLbConflicts->Expand( pRootEntry );
         }
     }
 }
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src
index f4fc65b70f33..c4666770dc76 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.src
+++ b/sc/source/ui/miscdlgs/conflictsdlg.src
@@ -17,90 +17,26 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "conflictsdlg.hrc"
+#include "sc.hrc"
 
-ModalDialog RID_SCDLG_CONFLICTS
+String STR_TITLE_CONFLICT
 {
-    OutputSize = TRUE ;
-    HelpId = HID_SCDLG_CONFLICTS ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 338 , 192 ) ;
-    Text [ en-US ] = "Resolve Conflicts" ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    FixedText FT_CONFLICTS
-    {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 326 , 26 ) ;
-        WordBreak = TRUE ;
-        Text [ en-US ] = "There are conflicting changes in this shared spreadsheet. Conflicts must be resolved before saving the spreadsheet. Keep either own or other changes." ;
-    };
-    Control LB_CONFLICTS
-    {
-        Pos = MAP_APPFONT ( 6 , 34 ) ;
-        Size = MAP_APPFONT ( 326 , 104 ) ;
-        Border = TRUE ;
-    };
-    PushButton BTN_KEEPMINE
-    {
-        HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE";
-        Pos = MAP_APPFONT ( 72 , 145 ) ;
-        Size = MAP_APPFONT ( 76 , 14 ) ;
-        Text [ en-US ] = "Keep ~Mine" ;
-    };
-    PushButton BTN_KEEPOTHER
-    {
-        HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER";
-        Pos = MAP_APPFONT ( 190 , 145 ) ;
-        Size = MAP_APPFONT ( 76 , 14 ) ;
-        Text [ en-US ] = "Keep ~Other" ;
-    };
-    FixedLine FL_CONFLICTS
-    {
-        Pos = MAP_APPFONT ( 1 , 162 ) ;
-        Size = MAP_APPFONT ( 338 , 8 ) ;
-    };
-    PushButton BTN_KEEPALLMINE
-    {
-        HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE";
-        Pos = MAP_APPFONT ( 6 , 172 ) ;
-        Size = MAP_APPFONT ( 104 , 14 ) ;
-        Text [ en-US ] = "~Keep All Mine" ;
-    };
-    PushButton BTN_KEEPALLOTHERS
-    {
-        HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS";
-        Pos = MAP_APPFONT ( 116 , 172 ) ;
-        Size = MAP_APPFONT ( 104 , 14 ) ;
-        Text [ en-US ] = "Keep ~All Others" ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 226 , 172 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 282 , 172 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    String STR_TITLE_CONFLICT
-    {
-        Text [ en-US ] = "Conflict" ;
-    };
-    String STR_TITLE_AUTHOR
-    {
-        Text [ en-US ] = "Author" ;
-    };
-    String STR_TITLE_DATE
-    {
-        Text [ en-US ] = "Date" ;
-    };
-    String STR_UNKNOWN_USER
-    {
-        Text [ en-US ] = "Unknown User" ;
-    };
+    Text [ en-US ] = "Conflict" ;
+};
+
+String STR_TITLE_AUTHOR
+{
+    Text [ en-US ] = "Author" ;
+};
+
+String STR_TITLE_DATE
+{
+    Text [ en-US ] = "Date" ;
+};
+
+String STR_UNKNOWN_USER_CONFLICT
+{
+    Text [ en-US ] = "Unknown User" ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */