[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 936
Date : Tue May 2 16:57:22 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/dialogop.cpp
M /Trunk/XaraLX/Kernel/document.cpp
M /Trunk/XaraLX/Kernel/main3.cpp
M /Trunk/XaraLX/Kernel/optstune.cpp
M /Trunk/XaraLX/Kernel/optsview.cpp
M /Trunk/XaraLX/wxOil/camelot.cpp
More options dialog work, and a fix for a SEGV in the debug build in focus handling.
Diff:
Index: Trunk/XaraLX/Kernel/optsview.cpp
===================================================================
--- Trunk/XaraLX/Kernel/optsview.cpp (revision 935)
+++ Trunk/XaraLX/Kernel/optsview.cpp (revision 936)
@@ -490,10 +490,13 @@
}
#endif
+PORTNOTE("other", "Disabled colour editor model preference writing")
+#ifndef EXCLUDE_FROM_XARALX
SetOk = Camelot.SetPrefValue(TEXT("Displays"), TEXT("ColourEditorAutoModel"), &AutoColourModel);
INT32 DisplayModelPref = (INT32)DisplayModel;
SetOk = SetOk && Camelot.SetPrefValue(TEXT("Displays"), TEXT("ColourEditorDisplayModel"), &DisplayModelPref);
ERROR2IF(!SetOk,2,_R(IDE_OPTS_SETPREF_VIEW));
+#endif
// Error diffused view option
BOOL ViewDither = 2;
@@ -533,10 +536,13 @@
// SetOk = ProgressCursorSetPref(State);
// ERROR2IF(!SetOk,2,_R(IDE_OPTS_SETPREF_VIEW));
+PORTNOTE("other", "Disabled progress bar writing")
+#ifndef EXCLUDE_FROM_XARALX
// Show progress bar.
State = pPrefsDlg->GetLongGadgetValue(_R(IDC_OPTS_PROGRESS), 0, 1, 0, &Valid);
SetOk = Camelot.SetPrefValue(TEXT("Displays"), TEXT("ProgressBar"), &State);
ERROR2IF(!SetOk,2,_R(IDE_OPTS_SETPREF_VIEW));
+#endif
// Section = Window
@@ -1103,12 +1109,15 @@
INT32 DisplayModelPref = (INT32)DisplayModel;
INT32 SelectedIndex = 0;
+PORTNOTE("other", "Disabled colour editor model preference reading")
+#ifndef EXCLUDE_FROM_XARALX
// First check if automatic is set.
ReadOk = Camelot.GetPrefValue(TEXT("Displays"), TEXT("ColourEditorAutoModel"), &ColourEditorAutoModel);
TRACEUSER( "Neville", _T("set colour editor auto model mode '%d'
"),ColourEditorAutoModel);
// Now get the display model preference
ReadOk = ReadOk && Camelot.GetPrefValue(TEXT("Displays"), TEXT("ColourEditorDisplayModel"), &DisplayModelPref);
TRACEUSER( "Neville", _T("set colour editor model '%d'
"),DisplayModelPref);
+#endif
DisplayModel = (ColourModel)DisplayModelPref;
// Set up the list, passing in the default colour model, returning an index into the list
// of available colour models
@@ -1147,6 +1156,8 @@
// pPrefsDlg->SetLongGadgetValue(_R(IDC_OPTS_HOURGLASS), FALSE);
// ERROR2IF(!ReadOk,FALSE,_R(IDE_OPTS_READPREF_VIEW));
+PORTNOTE("other", "Disabled progress bar reading")
+#ifndef EXCLUDE_FROM_XARALX
BOOL ProgressBar = FALSE;
ReadOk = Camelot.GetPrefValue(TEXT("Displays"), TEXT("ProgressBar"), &ProgressBar);
if (ProgressBar != 0)
@@ -1154,6 +1165,7 @@
else
pPrefsDlg->SetLongGadgetValue(_R(IDC_OPTS_PROGRESS), FALSE);
ERROR2IF(!ReadOk,FALSE,_R(IDE_OPTS_READPREF_VIEW));
+#endif
// Section = Bitmaps
BOOL bSmoothing = TRUE;
Index: Trunk/XaraLX/Kernel/main3.cpp
===================================================================
--- Trunk/XaraLX/Kernel/main3.cpp (revision 935)
+++ Trunk/XaraLX/Kernel/main3.cpp (revision 936)
@@ -278,15 +278,14 @@
InitMenuSystem() && // Initialise Menu system (keep very last)
// (esp. after all Register'ing has been done)
+ AttrFillGeometry::Init() && // Initialise the fill editing operations
PORTNOTE("other","Removed another lot of initialization")
#ifndef EXCLUDE_FROM_XARALX
// This has been moved to CCamApp::InitCamelotApp so that it happens after MFC's document templates
// are set up.
-
// ===================
- AttrFillGeometry::Init() && // Initialise the fill editing operations
EPSFilter::InitPrefs() && // Initialise default font mappings and
// EPS export prefs
#endif
Index: Trunk/XaraLX/Kernel/dialogop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/dialogop.cpp (revision 935)
+++ Trunk/XaraLX/Kernel/dialogop.cpp (revision 936)
@@ -2422,6 +2422,7 @@
}
break;
+ case DIM_COMMIT:
case DIM_CANCEL:
case DIM_CREATE:
case DIM_BAR_DEATH:
@@ -2431,7 +2432,7 @@
// These messages need to be broadcast to all controls within the dialog
// temporarily ALWAYS destroy if we get as far as here on a DIM_CANCEL
- if ((pDlgMsg->DlgMsg==DIM_CANCEL) || Destroy )
+ if ((pDlgMsg->DlgMsg==DIM_CANCEL) || (pDlgMsg->DlgMsg==DIM_COMMIT) ||Destroy )
{
Close();
End();
Index: Trunk/XaraLX/Kernel/document.cpp
===================================================================
--- Trunk/XaraLX/Kernel/document.cpp (revision 935)
+++ Trunk/XaraLX/Kernel/document.cpp (revision 936)
@@ -2765,13 +2765,11 @@
BOOL Document::ReadPrefs()
{
-#ifndef EXCLUDE_FROM_XARALX
if (Camelot.DeclareSection(TEXT("Preferences"), 1))
{
Camelot.DeclarePref(TEXT("Preferences"), TEXT("RemoveExistingDocs"),
- &CCamDoc::m_RemoveExistingOnNewDoc, FALSE, TRUE);
+ &CCamDoc::s_RemoveExistingOnNewDoc, FALSE, TRUE);
}
-#endif
return TRUE;
}
Index: Trunk/XaraLX/Kernel/optstune.cpp
===================================================================
--- Trunk/XaraLX/Kernel/optstune.cpp (revision 935)
+++ Trunk/XaraLX/Kernel/optstune.cpp (revision 936)
@@ -485,6 +485,8 @@
#ifndef EXCLUDE_GALS
// Section = Gallery cache size
+PORTNOTE("other", "Disabled Library Thumbnails preference")
+#ifndef EXCLUDE_FROM_XARALX
BOOL Valid = TRUE;
INT32 CacheSize = pPrefsDlg->GetLongGadgetValue(_R(IDC_OPTS_CACHESIZE), 1, 99, _R(IDE_OPTS_INVALIDCACHESIZE), &Valid);
@@ -499,6 +501,7 @@
else
return FALSE; // Cache size incorrect, user has been warned already
#endif
+#endif
ok = CommitUndoSection();
if (ok != TRUE)
@@ -940,11 +943,13 @@
InitRenderingSection();
// Section = Gallery Cache size
-
+PORTNOTE("other", "Disabled Library Thumbnails preference")
+#ifndef EXCLUDE_FROM_XARALX
INT32 CacheSize = 1;
BOOL ReadOk = Camelot.GetPrefValue(TEXT("Libraries"), TEXT("Thumbnails"), &CacheSize);
pPrefsDlg->SetLongGadgetValue(_R(IDC_OPTS_CACHESIZE), CacheSize);
ERROR2IF(!ReadOk,FALSE,_R(IDE_OPTS_READPREF_TUNE));
+#endif
InitUndoSection();
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp (revision 935)
+++ Trunk/XaraLX/wxOil/camelot.cpp (revision 936)
@@ -212,7 +212,7 @@
// Whilst debugging focus can end-up NULL, so we protect ourselves
wxWindow* pFocusWnd = wxWindow::FindFocus();
wxClassInfo* pClassInfo = NULL != pFocusWnd ? pFocusWnd->GetClassInfo() : NULL;
- TRACEUSER( "luke", _T("Focus = %s
"), pClassInfo->GetClassName() );
+ TRACEUSER( "luke", _T("Focus = %s
"), pClassInfo?pClassInfo->GetClassName():_T("None") );
if( NULL != pFocusWnd &&
pClassInfo->IsKindOf( CLASSINFO(wxControl) ) &&
!pClassInfo->IsKindOf( CLASSINFO(wxButton) ) &&
Xara