ecos: host/tools/configtool/standalone/wxwin/conflictsdlg.cpp annotate

annotate host/tools/configtool/standalone/wxwin/conflictsdlg.cpp @ 3292:7f8e529b4d82 default tip

Fix FREESCALE_EDMA_NBYTES_MLOFFYES_MLOFF() so it works with negative offsets.

author	vae
date	Wed, 29 Apr 2015 23:31:48 +0000
parents	4b1912ce7f4f
children

rev	line source
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	1 // ####ECOSHOSTGPLCOPYRIGHTBEGIN####
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	2 // -------------------------------------------
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	3 // This file is part of the eCos host tools.
3277 047bbfee43f6 * standalone/wxwin/appsettings.cpp, jld parents: 2729 diff changeset	4 // Copyright (C) 1998, 1999, 2000, 2014 Free Software Foundation, Inc.
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	5 //
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	6 // This program is free software; you can redistribute it and/or modify
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	7 // it under the terms of the GNU General Public License as published by
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	8 // the Free Software Foundation; either version 2 or (at your option) any
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	9 // later version.
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	10 //
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	11 // This program is distributed in the hope that it will be useful, but
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	12 // WITHOUT ANY WARRANTY; without even the implied warranty of
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	14 // General Public License for more details.
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	15 //
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	16 // You should have received a copy of the GNU General Public License
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	17 // along with this program; if not, write to the
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	18 // Free Software Foundation, Inc., 51 Franklin Street,
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	19 // Fifth Floor, Boston, MA 02110-1301, USA.
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	20 // -------------------------------------------
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 2466 diff changeset	21 // ####ECOSHOSTGPLCOPYRIGHTEND####
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	22 // conflictsdlg.cpp :
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	23 //
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	24 //===========================================================================
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	25 //#####DESCRIPTIONBEGIN####
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	26 //
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	27 // Author(s): julians
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	28 // Contact(s): julians
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	29 // Date: 2000/09/06
171 42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 160 diff changeset	30 // Version: $Id: conflictsdlg.cpp,v 1.4 2001/07/09 14:21:32 julians Exp $
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	31 // Purpose:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	32 // Description: Implementation file for the ecResolveConflictsDialog
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	33 // Requires:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	34 // Provides:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	35 // See also:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	36 // Known bugs:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	37 // Usage:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	38 //
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	39 //####DESCRIPTIONEND####
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	40 //
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	41 //===========================================================================
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	42
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	43 // ============================================================================
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	44 // declarations
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	45 // ============================================================================
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	46
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	47 // ----------------------------------------------------------------------------
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	48 // headers
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	49 // ----------------------------------------------------------------------------
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	50 #ifdef __GNUG__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	51 #pragma implementation "conflictsdlg.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	52 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	53
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	54 // Includes other headers for precompiled compilation
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	55 #include "ecpch.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	56
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	57 #ifdef __BORLANDC__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	58 #pragma hdrstop
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	59 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	60
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	61 #include "configtool.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	62 #include "conflictsdlg.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	63 #include "conflictwin.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	64 #include "solutionswin.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	65 #include "configtooldoc.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	66 #include "configtoolview.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	67 #include "configtree.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	68
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	69 #include "wx/cshelp.h"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	70
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	71 BEGIN_EVENT_TABLE(ecResolveConflictsDialog, ecDialog)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	72 EVT_BUTTON(ecID_CONFLICTS_ALL, ecResolveConflictsDialog::OnAll)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	73 EVT_BUTTON(ecID_CONFLICTS_NONE, ecResolveConflictsDialog::OnNone)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	74 EVT_BUTTON(ecID_CONFLICTS_CONTINUE, ecResolveConflictsDialog::OnContinue)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	75 EVT_UPDATE_UI(ecID_CONFLICTS_ALL, ecResolveConflictsDialog::OnUpdateAll)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	76 EVT_UPDATE_UI(ecID_CONFLICTS_NONE, ecResolveConflictsDialog::OnUpdateNone)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	77 EVT_LIST_ITEM_SELECTED(ecID_CONFLICTS_CONFLICTS, ecResolveConflictsDialog::OnConflictSelected)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	78 EVT_LIST_ITEM_DESELECTED(ecID_CONFLICTS_CONFLICTS, ecResolveConflictsDialog::OnConflictDeselected)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	79 EVT_INIT_DIALOG(ecResolveConflictsDialog::OnInitDialog)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	80 END_EVENT_TABLE()
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	81
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	82 // ----------------------------------------------------------------------------
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	83 // main frame
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	84 // ----------------------------------------------------------------------------
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	85
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	86 // Frame constructor
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	87 ecResolveConflictsDialog::ecResolveConflictsDialog(wxWindow* parent, std::list<CdlConflict> conflicts, CdlTransaction transaction, wxList *parConflictsOfInterest):
3277 047bbfee43f6 * standalone/wxwin/appsettings.cpp, jld parents: 2729 diff changeset	88 m_Map(wxKEY_INTEGER),
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	89 m_conflicts(conflicts),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	90 m_Transaction(transaction),
3277 047bbfee43f6 * standalone/wxwin/appsettings.cpp, jld parents: 2729 diff changeset	91 m_parConflictsOfInterest(parConflictsOfInterest)
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	92 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	93 // Stop values from being changed by other mechanisms during the
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	94 // duration of this dialog.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	95 wxGetApp().LockValues();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	96
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	97 m_conflictsCtrl = NULL;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	98 m_solutionsCtrl = NULL;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	99
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	100 SetExtraStyle(wxDIALOG_EX_CONTEXTHELP);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	101
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	102 ecDialog::Create(parent, ecID_RESOLVE_CONFLICTS_DIALOG, _("Resolve conflicts"),
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	103 wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	104
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	105 std::list<CdlConflict>::const_iterator conf_i;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	106 for (conf_i= m_conflicts.begin (); conf_i != m_conflicts.end (); conf_i++)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	107 { // for each conflict
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	108 int nSolutions = (*conf_i)->get_solution().size();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	109 SolutionInfo pInfo = (SolutionInfo ) malloc(sizeof(SolutionInfo)+(nSolutions-1)*sizeof(int));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	110 pInfo->nCount = nSolutions;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	111 int i;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	112 for ( i = 0; i < nSolutions; i++)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	113 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	114 pInfo->arItem[i] = SolutionInfo::CHECKED;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	115 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	116 m_Map.Put((long) conf_i, (wxObject) pInfo);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	117 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	118
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	119 CreateControls(this);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	120
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	121 Centre(wxBOTH);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	122 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	123
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	124 ecResolveConflictsDialog::~ecResolveConflictsDialog()
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	125 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	126 m_Map.BeginFind();
2466 480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	127 #if wxCHECK_VERSION(2, 6, 0)
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	128 wxHashTable::Node* node = NULL;
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	129 while ((node = m_Map.Next()))
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	130 {
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	131 SolutionInfo pInfo = (SolutionInfo) node->GetData();
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	132 #else
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	133 wxNode* node = NULL;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	134 while ((node = m_Map.Next()))
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	135 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	136 SolutionInfo pInfo = (SolutionInfo) node->Data();
2466 480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	137 #endif
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	138 free(pInfo);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	139 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	140 m_Map.Clear();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	141
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	142 // OK to change values again
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	143 wxGetApp().UnlockValues();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	144 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	145
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	146 void ecResolveConflictsDialog::CreateControls(wxWindow* parent)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	147 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	148 // Create custom windows first
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	149 m_conflictsCtrl = new ecConflictListCtrl(parent, ecID_CONFLICTS_CONFLICTS, wxDefaultPosition, wxSize(470, 110), wxLC_REPORT\|wxCLIP_CHILDREN\|wxSUNKEN_BORDER);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	150 m_solutionsCtrl = new ecSolutionListCtrl(parent, ecID_CONFLICTS_SOLUTIONS, wxDefaultPosition, wxSize(470, 110), wxLC_REPORT\|wxCLIP_CHILDREN\|wxSUNKEN_BORDER);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	151
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	152 wxSizer *item0 = new wxBoxSizer( wxVERTICAL );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	153
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	154 wxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	155
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	156 wxButton *item2 = new wxButton( parent, ecID_CONFLICTS_CONTINUE, _("&Continue"), wxDefaultPosition, wxDefaultSize, 0 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	157 item2->SetDefault();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	158 item1->Add( item2, 0, wxALIGN_CENTRE\|wxALL, 5 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	159
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	160 wxButton *item3 = new wxButton( parent, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	161 item1->Add( item3, 0, wxALIGN_CENTRE\|wxALL, 5 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	162
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	163 item0->Add( item1, 0, wxALIGN_RIGHT\|wxALIGN_CENTER_VERTICAL\|wxALL, 5 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	164
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	165 wxWindow *item4 = parent->FindWindow( ecID_CONFLICTS_CONFLICTS );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	166 wxASSERT( item4 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	167 item0->Add( item4, 1, wxGROW\|wxALIGN_CENTER_VERTICAL\|wxALL, 5 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	168
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	169 wxSizer *item5 = new wxBoxSizer( wxHORIZONTAL );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	170
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	171 wxStaticText *item6 = new wxStaticText( parent, ecID_CONFLICTS_MSG, _("Proposed Solutions:"), wxDefaultPosition, wxSize(250,-1), 0 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	172 item5->Add( item6, 0, wxALIGN_BOTTOM\|wxALIGN_CENTER_HORIZONTAL\|wxALL, 0 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	173
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	174 item5->Add( 30, 20, 1, wxALIGN_CENTRE\|wxALL, 0 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	175
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	176 wxButton *item7 = new wxButton( parent, ecID_CONFLICTS_NONE, _("&None"), wxDefaultPosition, wxDefaultSize, 0 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	177 item5->Add( item7, 0, wxALIGN_CENTRE\|wxALL, 5 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	178
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	179 wxButton *item8 = new wxButton( parent, ecID_CONFLICTS_ALL, _("&All"), wxDefaultPosition, wxDefaultSize, 0 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	180 item5->Add( item8, 0, wxALIGN_CENTRE\|wxALL, 5 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	181
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	182 item0->Add( item5, 0, wxGROW\|wxALIGN_CENTER_VERTICAL\|wxALL, 5 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	183
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	184 wxWindow *item9 = parent->FindWindow( ecID_CONFLICTS_SOLUTIONS );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	185 wxASSERT( item9 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	186 item0->Add( item9, 1, wxGROW\|wxALIGN_CENTER_VERTICAL\|wxALL, 5 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	187
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	188 #ifdef __WXGTK__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	189 wxButton *contextButton = new wxContextHelpButton( parent );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	190 item1->Add( contextButton, 0, wxALIGN_CENTRE\|wxALL, 5 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	191 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	192
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	193 parent->SetAutoLayout( TRUE );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	194 parent->SetSizer( item0 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	195
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	196 // N.B. I find I have to call Layout, then Fit, to make this
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	197 // work.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	198 parent->Layout();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	199 item0->Fit( parent );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	200 item0->SetSizeHints( parent );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	201
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	202 // Add context-sensitive help text
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	203 parent->FindWindow( ecID_CONFLICTS_CONFLICTS )->SetHelpText(_("Displays the set of conflicts for which the fixes are offered."));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	204 parent->FindWindow( ecID_CONFLICTS_SOLUTIONS )->SetHelpText(_("Displays fixes for the currently selected conflict. Use the checkboxes to enable or disable each fix."));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	205 parent->FindWindow( ecID_CONFLICTS_CONTINUE )->SetHelpText(_("Continues the current transaction, applying the selected solutions."));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	206 parent->FindWindow( wxID_CANCEL )->SetHelpText(_("Cancels the current transaction, without applying any solutions."));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	207 parent->FindWindow( ecID_CONFLICTS_NONE )->SetHelpText(_("Resets all fix checkboxes to the unchecked state."));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	208 parent->FindWindow( ecID_CONFLICTS_ALL )->SetHelpText(_("Resets all fix checkboxes to the checked state."));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	209
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	210 #if __WXGTK__
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	211 parent->FindWindow( wxID_CONTEXT_HELP )->SetHelpText(_("Invokes context-sensitive help for the clicked-on window."));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	212 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	213 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	214
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	215 void ecResolveConflictsDialog::OnInitDialog(wxInitDialogEvent& event)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	216 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	217 wxDialog::OnInitDialog(event);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	218
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	219 // Select the first item and fill the solution set
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	220 m_conflictsCtrl->AddConflicts(m_conflicts);
2466 480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	221
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	222 #if wxCHECK_VERSION(2, 6, 0)
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	223 if (m_parConflictsOfInterest && m_parConflictsOfInterest->GetCount()>0)
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	224 #else
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	225 if (m_parConflictsOfInterest && m_parConflictsOfInterest->Number()>0)
2466 480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	226 #endif
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	227 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	228 wxList &arConflictsOfInterest = *m_parConflictsOfInterest;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	229 int i, j;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	230 for ( i = m_conflictsCtrl->GetItemCount() - 1; i >= 0; --i )
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	231 {
2466 480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	232 #if wxCHECK_VERSION(2, 6, 0)
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	233 for ( j = arConflictsOfInterest.GetCount() - 1; j>=0; --j )
480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	234 #else
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	235 for ( j = arConflictsOfInterest.Number() - 1; j>=0; --j )
2466 480aa5d146e3 * configtool/standalone/wxwin/admindlg.cpp, jld parents: 171 diff changeset	236 #endif
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	237 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	238 CdlConflict conflict = (CdlConflict)m_conflictsCtrl->GetItemData(i);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	239 if ( ((CdlConflict) arConflictsOfInterest[j]) == conflict )
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	240 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	241 m_conflictsCtrl->SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	242 m_conflictsCtrl->EnsureVisible(i);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	243 arConflictsOfInterest.DeleteObject(arConflictsOfInterest[j]);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	244 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	245 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	246 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	247 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	248 } else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	249 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	250 for ( int i = m_conflictsCtrl->GetItemCount()-1; i>=0; --i )
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	251 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	252 m_conflictsCtrl->SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	253 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	254 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	255 m_conflictsCtrl->SetFocus();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	256 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	257
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	258 void ecResolveConflictsDialog::OnContinue(wxCommandEvent& event)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	259 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	260 // Ensure we have the current conflict check array
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	261 int i;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	262 for (i = 0; i < m_conflictsCtrl->GetItemCount(); i++)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	263 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	264 if (m_conflictsCtrl->GetItemState(i, wxLIST_STATE_SELECTED) & wxLIST_STATE_SELECTED)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	265 RemoveConflictSolutions((CdlConflict) m_conflictsCtrl->GetItemData(i));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	266 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	267
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	268 // Dismiss the window
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	269 EndModal(wxID_OK);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	270
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	271 std::list<CdlConflict>::const_iterator conf_i;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	272
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	273 for (conf_i= m_conflicts.begin (); conf_i != m_conflicts.end (); conf_i++) // for each conflict
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	274 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	275 CdlConflict conflict=*conf_i;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	276 //int nSolutions=conflict->get_solution().size();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	277 SolutionInfo &info=Info(conflict);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	278 int nIndex=0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	279 const std::vector<std::pair<CdlValuable, CdlValue> >&Solution=conflict->get_solution();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	280 for (std::vector<std::pair<CdlValuable, CdlValue> >::const_iterator soln_i = Solution.begin();soln_i != Solution.end(); soln_i++) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	281 if(SolutionInfo::CHECKED==info.arItem[nIndex++]){
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	282 CdlValuable valuable = soln_i->first;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	283 CdlValue value=soln_i->second;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	284 CdlValueFlavor flavor = valuable->get_flavor();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	285 const wxString strName(valuable->get_name().c_str());
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	286 const wxString strValue(value.get_value().c_str());
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	287 bool rc = TRUE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	288 wxString str;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	289 try
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	290 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	291 switch(flavor)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	292 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	293 case CdlValueFlavor_None :
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	294 str = wxT("set CdlValueFlavor_None");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	295 rc = FALSE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	296 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	297 case CdlValueFlavor_Bool :
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	298 str.Printf(_("%s %s\n"), (const wxChar) (value.is_enabled()?_("disable"):_("enable")), (const wxChar) strName);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	299 valuable->set_enabled (m_Transaction, value.is_enabled(), CdlValueSource_User);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	300 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	301 case CdlValueFlavor_BoolData :
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	302 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	303 bool bEnabled=value.is_enabled();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	304 str.Printf(_("%s %s and set value to %s\n"), (const wxChar) (bEnabled? _("disable"):_("enable")), (const wxChar) strName, (const wxChar*) strValue);
171 42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 160 diff changeset	305 // Surely this is wrong - we don't want to set the same value, we want to
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 160 diff changeset	306 // set a NEW value.
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 160 diff changeset	307 // CdlSimpleValue simple_value = valuable->get_simple_value ();
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 160 diff changeset	308 //valuable->set_enabled_and_value (m_Transaction, bEnabled, simple_value, CdlValueSource_User);
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 160 diff changeset	309 valuable->set_enabled_and_value (m_Transaction, bEnabled, ecUtils::UnicodeToStdStr (strValue), CdlValueSource_User);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	310 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	311 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	312 case CdlValueFlavor_Data :
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	313 str.Printf(_("set %s to %s\n"), (const wxChar) strName, (const wxChar) strValue);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	314 valuable->set_value (m_Transaction, ecUtils::UnicodeToStdStr (strValue), CdlValueSource_User);
3278 4b1912ce7f4f * standalone/wxwin/appsettings.cpp, jld parents: 3277 diff changeset	315 break;
4b1912ce7f4f * standalone/wxwin/appsettings.cpp, jld parents: 3277 diff changeset	316 default :
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	317 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	318 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	319 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	320 catch(...)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	321 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	322 rc = FALSE;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	323 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	324 if(rc)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	325 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	326 wxGetApp().GetConfigToolDoc()->Modify(TRUE);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	327 } else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	328 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	329 wxString msg;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	330 msg.Printf(_("Failed to %s\n"), (const wxChar*) str);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	331 wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_EXCLAMATION\|wxOK);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	332 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	333 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	334 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	335 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	336 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	337
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	338 void ecResolveConflictsDialog::OnAll(wxCommandEvent& event)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	339 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	340 SetAll(TRUE);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	341 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	342
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	343 void ecResolveConflictsDialog::OnNone(wxCommandEvent& event)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	344 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	345 SetAll(FALSE);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	346 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	347
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	348 void ecResolveConflictsDialog::SetAll(bool bOnOff)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	349 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	350 long i;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	351 for ( i = m_solutionsCtrl->GetItemCount()-1; i >= 0; --i)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	352 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	353 m_solutionsCtrl->SetChecked(i, bOnOff);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	354 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	355 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	356
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	357 // Update All button
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	358 void ecResolveConflictsDialog::OnUpdateAll(wxUpdateUIEvent& event)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	359 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	360 if (!m_solutionsCtrl)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	361 return;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	362
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	363 int nCheckCount=0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	364 int nItemCount = m_solutionsCtrl->GetItemCount();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	365 int i;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	366 for (i=nItemCount-1;i>=0;--i)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	367 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	368 nCheckCount+=m_solutionsCtrl->IsChecked(i);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	369 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	370 event.Enable(nItemCount>0 && nCheckCount<nItemCount);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	371 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	372
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	373 // Update None button
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	374 void ecResolveConflictsDialog::OnUpdateNone(wxUpdateUIEvent& event)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	375 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	376 if (!m_solutionsCtrl)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	377 return;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	378
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	379 int nCheckCount=0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	380 int nItemCount=m_solutionsCtrl->GetItemCount();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	381 int i;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	382 for (i=nItemCount-1;i>=0;--i){
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	383 nCheckCount+=m_solutionsCtrl->IsChecked(i);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	384 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	385 event.Enable(nItemCount>0 && nCheckCount>0);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	386 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	387
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	388 // Currently there is no 'locate' button so this is not called from anywhere.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	389 // However, the intention in the MFC configtool must have been to use it,
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	390 // although it wasn't in the Resolve Conflicts dialog.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	391 void ecResolveConflictsDialog::OnLocate()
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	392 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	393 ecConfigItem *pItem = m_conflictsCtrl->AssociatedItem(m_nContextItem, m_nContextRow);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	394 if (pItem) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	395 if (wxGetApp().GetTreeCtrl())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	396 wxGetApp().GetTreeCtrl()->SelectItem(pItem->GetTreeItem());
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	397 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	398 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	399
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	400 void ecResolveConflictsDialog::RemoveConflictSolutions(CdlConflict conflict)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	401 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	402 SolutionInfo &info=Info(conflict);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	403 int i, j, k;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	404 for ( i = 0; i < info.nCount; i++ )
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	405 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	406 int nItem=info.arItem[i];
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	407 wxASSERT(nItem>=0);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	408 info.arItem[i] = (m_solutionsCtrl->IsChecked(nItem) ? SolutionInfo::CHECKED:SolutionInfo::UNCHECKED);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	409 int nRefs = m_solutionsCtrl->GetItemData(nItem);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	410 if (1 == nRefs)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	411 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	412 m_solutionsCtrl->DeleteItem(nItem);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	413 for ( k = 0; k < m_conflictsCtrl->GetItemCount(); k++ )
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	414 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	415 SolutionInfo &info2 = Info((CdlConflict)m_conflictsCtrl->GetItemData(k));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	416 for ( j = 0; j < info2.nCount; j++)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	417 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	418 if (info2.arItem[j] > nItem)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	419 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	420 info2.arItem[j] --;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	421 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	422 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	423 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	424 } else
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	425 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	426 m_solutionsCtrl->SetItemData(nItem, nRefs-1);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	427 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	428 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	429 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	430
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	431 void ecResolveConflictsDialog::AddConflictSolutions(CdlConflict conflict)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	432 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	433 // SolutionInfo allows each conflict to know which solutions have been found for it
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	434 SolutionInfo &info=Info(conflict);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	435
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	436 const std::vector<std::pair<CdlValuable, CdlValue> >&Solution=conflict->get_solution();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	437
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	438 int i=0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	439 for (std::vector<std::pair<CdlValuable, CdlValue> >::const_iterator soln_i = Solution.begin();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	440 soln_i != Solution.end(); soln_i++)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	441 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	442 CdlValuable valuable = soln_i->first;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	443 CdlValue value = soln_i->second;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	444 CdlValueFlavor flavor = valuable->get_flavor();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	445
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	446 wxString strValue;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	447 switch(flavor)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	448 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	449 case CdlValueFlavor_None :
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	450 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	451 case CdlValueFlavor_Bool :
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	452 strValue = value.is_enabled() ? _("Enabled") : _("Disabled");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	453 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	454 case CdlValueFlavor_BoolData :
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	455 strValue.Printf(wxT("%s, %s"), (const wxChar) (value.is_enabled() ? _("Enabled") : _("Disabled")), (const wxChar) value.get_value().c_str());
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	456 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	457 case CdlValueFlavor_Data :
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	458 strValue = value.get_value().c_str();
3278 4b1912ce7f4f * standalone/wxwin/appsettings.cpp, jld parents: 3277 diff changeset	459 break;
4b1912ce7f4f * standalone/wxwin/appsettings.cpp, jld parents: 3277 diff changeset	460 default :
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	461 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	462 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	463
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	464 const wxString strName(soln_i->first->get_name().c_str());
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	465
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	466 long nIndex = m_solutionsCtrl->FindItem(0, strName);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	467 wxListItem listItem;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	468 listItem.m_mask = wxLIST_MASK_TEXT;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	469 listItem.m_itemId = nIndex;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	470 listItem.m_col = 1;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	471 if (nIndex != -1)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	472 m_solutionsCtrl->GetItem(listItem);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	473
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	474 if (-1 == nIndex \|\| strValue != listItem.m_text)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	475 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	476 // We don't have an existing solution that matches this one
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	477 nIndex = m_solutionsCtrl->GetItemCount();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	478 m_solutionsCtrl->InsertItem(nIndex, strName);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	479 m_solutionsCtrl->SetItemData(nIndex, 1);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	480 m_solutionsCtrl->SetItem(nIndex, 1, strValue);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	481
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	482 wxASSERT(info.arItem[i]<0);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	483
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	484 m_solutionsCtrl->SetChecked(nIndex, SolutionInfo::CHECKED==info.arItem[i]);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	485 } else {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	486 // We do - to avoid duplicates, increment the "ref count"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	487 m_solutionsCtrl->SetItemData(nIndex, m_solutionsCtrl->GetItemData(nIndex)+1);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	488 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	489 info.arItem[i++]=nIndex;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	490
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	491 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	492 wxStaticText* staticCtrl = (wxStaticText*) FindWindow(ecID_CONFLICTS_MSG);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	493
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	494 if(0==i){
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	495 staticCtrl->SetLabel(_("No solution is available for this conflict"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	496 m_solutionsCtrl->Show(FALSE);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	497 } else {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	498 staticCtrl->SetLabel(_("Proposed solution:"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	499 m_solutionsCtrl->Show(TRUE);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	500 // TODO (if necessary)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	501 #if 0
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	502 m_List.SetColumnWidth(0,LVSCW_AUTOSIZE);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	503 CRect rect;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	504 m_List.GetClientRect(rect);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	505 m_List.SetColumnWidth(1,rect.Width()-m_List.GetColumnWidth(0));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	506 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	507 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	508 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	509
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	510 ecResolveConflictsDialog::SolutionInfo & ecResolveConflictsDialog::Info(const CdlConflict conflict)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	511 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	512 SolutionInfo pInfo = (SolutionInfo) m_Map.Get((long) conflict);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	513 return * pInfo;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	514 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	515
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	516 void ecResolveConflictsDialog::OnConflictSelected(wxListEvent& event)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	517 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	518 CdlConflict conflict=(CdlConflict) m_conflictsCtrl->GetItemData(event.GetIndex());
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	519
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	520 if (1 == m_solutionsCtrl->GetSelectedItemCount())
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	521 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	522 // TODO ??
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	523 // GetDlgItem(IDC_STATIC1)->ShowWindow(SW_HIDE);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	524 m_solutionsCtrl->Show(TRUE);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	525 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	526 AddConflictSolutions(conflict);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	527 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	528
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	529 void ecResolveConflictsDialog::OnConflictDeselected(wxListEvent& event)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	530 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	531 CdlConflict conflict=(CdlConflict) m_conflictsCtrl->GetItemData(event.GetIndex());
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	532
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	533 RemoveConflictSolutions(conflict);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	534 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	535
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	536
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	537 #if 0
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	538 // TODO?
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	539
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	540 // We need to use this because the OnItemChanged handler successive receives "not selected" followed by "selected"
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	541 // notifications. The result is that the "Select one or more conflicts to display available solutions" message
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	542 // would be seen briefly when clicking from one selection to another.
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	543 BOOL ecResolveConflictsDialog::OnClick(UINT,LPNMLISTVIEW pnmv, LRESULT* pResult)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	544 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	545 if(-1==pnmv->iItem && 0==m_List.GetSelectedCount()){
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	546 SetDlgItemText(IDC_STATIC1,_T("Select one or more conflicts to display available solutions"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	547 m_List.ShowWindow(SW_HIDE);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	548 GetDlgItem(IDC_STATIC1)->ShowWindow(SW_SHOW);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	549 GetDlgItem(IDC_RESET)->EnableWindow(false);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	550 GetDlgItem(IDC_CONFLICTS_NONE)->EnableWindow(false);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	551 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	552 *pResult = 0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	553 return false; // not handled
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	554 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	555
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	556 // TODO
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	557 BOOL ecResolveConflictsDialog::OnRClick(UINT, LPNMITEMACTIVATE pnmv, LRESULT* pResult)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	558 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	559 DWORD dwPos=GetMessagePos();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	560 CPoint pt(GET_X_LPARAM(dwPos),GET_Y_LPARAM(dwPos));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	561 m_nContextItem=pnmv->iItem;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	562 m_nContextRow=pnmv->iSubItem;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	563 if(-1!=m_nContextItem){
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	564 //m_RulesList.SetItemState(m_nContextItem,LVIS_SELECTED,LVIS_SELECTED);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	565 Menu menu;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	566 menu.CreatePopupMenu();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	567 menu.AppendMenu(1==m_RulesList.GetSelectedCount() && m_RulesList.AssociatedItem(m_nContextItem,m_nContextRow)?MF_STRING:(MF_STRING\|MF_GRAYED),ID_LOCATE,_T("&Locate"));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	568 #ifndef PLUGIN
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	569 SuppressNextContextMenuMessage();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	570 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	571 menu.TrackPopupMenu(TPM_LEFTALIGN\|TPM_LEFTBUTTON\|TPM_RIGHTBUTTON, pt.x,pt.y,this);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	572 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	573
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	574 *pResult = 0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	575 return TRUE; // handled
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	576 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	577
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	578 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: diff changeset	579

Mercurial > ecos

annotate host/tools/configtool/standalone/wxwin/conflictsdlg.cpp @ 3292:7f8e529b4d82 default tip