[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 956
Date : Thu May 4 21:25:34 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/Makefile.am
M /Trunk/XaraLX/Kernel/dialogop.h
M /Trunk/XaraLX/Kernel/guides.cpp
M /Trunk/XaraLX/Kernel/layerprp.cpp
M /Trunk/XaraLX/Kernel/prpsgds.cpp
M /Trunk/XaraLX/Kernel/prpslyrs.cpp
M /Trunk/XaraLX/Kernel/sginit.cpp
M /Trunk/XaraLX/Kernel/sglayer.cpp
M /Trunk/XaraLX/wxOil/dlgmgr.cpp
M /Trunk/XaraLX/wxOil/dlgmgr.h
Fix layer properties dialog, guideline creation
Diff:
Index: Trunk/XaraLX/Kernel/prpslyrs.cpp
===================================================================
--- Trunk/XaraLX/Kernel/prpslyrs.cpp (revision 955)
+++ Trunk/XaraLX/Kernel/prpslyrs.cpp (revision 956)
@@ -375,7 +375,7 @@
// Check if we are on a frame layer or not
// If we are then we must disable some items
// At present, these are the visible and editable flags as these are not user controlled.
- BOOL FrameLayer = FALSE;
+// BOOL FrameLayer = FALSE;
if (pLayer != NULL && pLayer->IsFrame())
EnableNonFrameItem = FALSE;
#endif
@@ -448,7 +448,7 @@
pPropertiesDlg->SetBoolGadgetSelected(_R(IDC_LAYERTAB_EDITABLE),!pLayer->GetLockedFlagState());
}
- pPropertiesDlg->SetStringGadgetValue(_R(IDC_LAYERTAB_NAME),&LayerID);
+ pPropertiesDlg->SetStringGadgetValue(_R(IDC_LAYERTAB_NAME), LayerID);
ChangeControlStatus(!GreyStatus);
@@ -522,6 +522,9 @@
case DIM_TEXT_CHANGED:
UpdateApplyState();
break;
+
+ default:
+ break;
}
return TRUE;
}
Index: Trunk/XaraLX/Kernel/Makefile.am
===================================================================
--- Trunk/XaraLX/Kernel/Makefile.am (revision 955)
+++ Trunk/XaraLX/Kernel/Makefile.am (revision 956)
@@ -66,6 +66,6 @@
ngsentry.cpp ngsetop.cpp ngdialog.cpp property.cpp \
optsedit.cpp optsmisc.cpp optspntr.cpp optstune.cpp optsview.cpp optsgrid.cpp \
optspage.cpp optsundo.cpp optsscal.cpp optsunit.cpp pagesize.cpp radio.cpp \
- xpfcaps.cpp xpfilter.cpp xpfrgn.cpp
+ xpfcaps.cpp xpfilter.cpp xpfrgn.cpp layerprp.cpp prpsgds.cpp prpslyrs.cpp
AM_CXXFLAGS = $(XARAFLAGS)
Index: Trunk/XaraLX/Kernel/sglayer.cpp
===================================================================
--- Trunk/XaraLX/Kernel/sglayer.cpp (revision 955)
+++ Trunk/XaraLX/Kernel/sglayer.cpp (revision 956)
@@ -2676,8 +2676,6 @@
//#ifdef WEBSTER
// GIFAnimationPropertyTabs * pTabHandler = GIFAnimationPropertyTabsDlg::GetGIFAnimationPropertiesTabs();
//#else
-PORTNOTE("galleries", "Disabled layer properties tab dialog")
-#ifndef EXCLUDE_FROM_XARALX
LayerPropertyTabs * pTabHandler = LayerPropertyTabsDlg::GetLayerPropertiesTabs();
//#endif // webster -RanbirR
if (pTabHandler)
@@ -2686,7 +2684,6 @@
if (pDlg != NULL)
pDlg->Open();
}
-#endif
}
}
#endif
@@ -3296,15 +3293,12 @@
//#ifdef WEBSTER
// GIFAnimationPropertyTabs * pTabHandler = GIFAnimationPropertyTabsDlg::GetGIFAnimationPropertiesTabs();
//#else
-PORTNOTE("galleries", "Disabled layer properties tab dialog")
-#ifndef EXCLUDE_FROM_XARALX
LayerPropertyTabs * pTabHandler = LayerPropertyTabsDlg::GetLayerPropertiesTabs();
//#endif //webster
if (pTabHandler)
{
pTabHandler->SetCurrentLayer(pLayerGalItem->GetDisplayedLayer());
}
-#endif
}
#endif
ok = ok && AddCommand(TheMenu, (StringBase *) &SGCmd_New);
@@ -3377,14 +3371,11 @@
//#ifdef WEBSTR
// GIFAnimationPropertyTabs * pTabHandler = GIFAnimationPropertyTabsDlg::GetGIFAnimationPropertiesTabs();
//#else
-PORTNOTE("galleries", "Disabled layer properties tab dialog")
-#ifndef EXCLUDE_FROM_XARALX
LayerPropertyTabs * pTabHandler = LayerPropertyTabsDlg::GetLayerPropertiesTabs();
//#endif //webster RanbirR
if (pTabHandler)
State.Greyed = (pTabHandler->GetTabbedDlg() != NULL);
else
-#endif
State.Greyed = TRUE;
}
#endif
Index: Trunk/XaraLX/Kernel/guides.cpp
===================================================================
--- Trunk/XaraLX/Kernel/guides.cpp (revision 955)
+++ Trunk/XaraLX/Kernel/guides.cpp (revision 956)
@@ -2623,6 +2623,8 @@
case DIM_COMMIT:
EndDialog = CommitValues();
+ if (!EndDialog)
+ Msg->DlgMsg = DIM_NONE; // stop default handler from closing dialog
break;
case DIM_SOFT_COMMIT:
@@ -2646,6 +2648,7 @@
{ // Isn't this pretty?
Close(); // Close the dialog
End(); // Destroy dialog
+ return OK;
}
}
Index: Trunk/XaraLX/Kernel/sginit.cpp
===================================================================
--- Trunk/XaraLX/Kernel/sginit.cpp (revision 955)
+++ Trunk/XaraLX/Kernel/sginit.cpp (revision 956)
@@ -174,9 +174,9 @@
#ifndef WEBSTER
OpDisplayLayerGallery::Init() &&
LayerNameDlg::Init() &&
-#ifndef EXCLUDE_FROM_XARALX
LayerPropertyTabsDlg::Init() &&
+#ifndef EXCLUDE_FROM_XARALX
OpDisplayLineGallery::Init() &&
#endif // EXCLUDE_FROM_XARALX
#ifdef _DEBUG // For now name gallery only on debug builds
Index: Trunk/XaraLX/Kernel/prpsgds.cpp
===================================================================
--- Trunk/XaraLX/Kernel/prpsgds.cpp (revision 955)
+++ Trunk/XaraLX/Kernel/prpsgds.cpp (revision 956)
@@ -114,7 +114,7 @@
//#include "nev.h" // error messages
#include "prpsgds.h"
#include "guides.h"
-#include "coldrop.h"
+//#include "coldrop.h"
#include "fixmem.h"
#include "document.h"
//#include "markn.h"
@@ -174,9 +174,11 @@
GuidesPropertiesTab::~GuidesPropertiesTab()
{
+PORTNOTE("other", "Disabled Colour Dropdown")
+#ifndef EXCLUDE_FROM_XARALX
if (pColourDropDown != NULL)
delete pColourDropDown;
-
+#endif
GuidelineList.DeleteAll();
}
@@ -513,6 +515,8 @@
BOOL GuidesPropertiesTab::ShowColours()
{
+PORTNOTE("other", "Disabled Colour Dropdown")
+#ifndef EXCLUDE_FROM_XARALX
if (pColourDropDown != NULL)
{
IndexedColour* pIndexedColour = NULL;
@@ -549,7 +553,7 @@
else
pColourDropDown->FillInColourList(NULL,0);
}
-
+#endif
return TRUE;
}
@@ -645,6 +649,8 @@
BOOL GuidesPropertiesTab::ColourListChanged(Document* pDoc)
{
+PORTNOTE("other", "Disabled Colour Dropdown")
+#ifndef EXCLUDE_FROM_XARALX
ERROR2IF(pPropertiesDlg == NULL,FALSE,"GuidesPropertiesTab::UpdateGuidelineSection() called with no dialog pointer");
ERROR2IF(pColourDropDown == NULL,FALSE,"ptr to 'colour drop down' is NULL");
@@ -660,7 +666,7 @@
else
pColourDropDown->ClearList();
}
-
+#endif
return TRUE;
}
@@ -699,56 +705,56 @@
break;
case DIM_LFT_BN_CLICKED:
//LayerPropertyTabs::SetApplyNowState(TRUE);
- switch (Msg->GadgetID)
+ if (FALSE) {}
+ else if (Msg->GadgetID == _R(IDC_GUIDETAB_HORZ))
{
- case _R(IDC_GUIDETAB_HORZ):
- if (GuideType != GUIDELINE_HORZ)
- {
- GuideType = GUIDELINE_HORZ;
- ShowDetails();
- }
- break;
-
- case _R(IDC_GUIDETAB_VERT):
- if (GuideType != GUIDELINE_VERT)
- {
- GuideType = GUIDELINE_VERT;
- ShowDetails();
- }
- break;
-
- case _R(IDC_GUIDETAB_PROPERTIES):
- PropertiesClicked();
+ if (GuideType != GUIDELINE_HORZ)
+ {
+ GuideType = GUIDELINE_HORZ;
ShowDetails();
- break;
-
- case _R(IDC_GUIDETAB_NEW):
- NewClicked();
+ }
+ }
+ else if (Msg->GadgetID == _R(IDC_GUIDETAB_VERT))
+ {
+ if (GuideType != GUIDELINE_VERT)
+ {
+ GuideType = GUIDELINE_VERT;
ShowDetails();
- break;
-
- case _R(IDC_GUIDETAB_DELETE):
- DeleteClicked();
- ShowDetails();
- break;
+ }
}
+ else if (Msg->GadgetID == _R(IDC_GUIDETAB_PROPERTIES))
+ {
+ PropertiesClicked();
+ ShowDetails();
+ }
+ else if (Msg->GadgetID == _R(IDC_GUIDETAB_NEW))
+ {
+ NewClicked();
+ ShowDetails();
+ }
+ else if (Msg->GadgetID == _R(IDC_GUIDETAB_DELETE))
+ {
+ DeleteClicked();
+ ShowDetails();
+ }
break;
case DIM_SELECTION_CHANGED:
case DIM_TEXT_CHANGED:
//LayerPropertyTabs::SetApplyNowState(TRUE);
- switch (Msg->GadgetID)
+ if (FALSE) {}
+ else if (Msg->GadgetID == _R(IDC_GUIDETAB_GUIDELINELIST))
{
- case _R(IDC_GUIDETAB_GUIDELINELIST):
- ChangeControlStatus(!GreyStatus);
- break;
-
- case _R(IDC_GUIDETAB_COLOURLIST):
- ColourChanged(pPropertiesDlg->GetSelectedValueIndex(Msg->GadgetID));
- ShowDetails();
- break;
+ ChangeControlStatus(!GreyStatus);
}
+ else if (Msg->GadgetID == _R(IDC_GUIDETAB_COLOURLIST))
+ {
+ ColourChanged(pPropertiesDlg->GetSelectedValueIndex(Msg->GadgetID));
+ ShowDetails();
+ }
break;
+ default:
+ break;
}
return TRUE;
}
@@ -770,6 +776,8 @@
BOOL GuidesPropertiesTab::ColourChanged(INT32 Index)
{
+PORTNOTE("other", "Disabled Colour Dropdown")
+#ifndef EXCLUDE_FROM_XARALX
if (pColourDropDown == NULL || Index < 0)
return FALSE;
@@ -789,7 +797,7 @@
// pLayer->SetGuideColour(pNewColour);
// LayerSGallery::ForceRedrawLayer(pDocument,pLayer);
}
-
+#endif
return TRUE;
}
@@ -813,6 +821,8 @@
INT32* pIndexList = pPropertiesDlg->GetSelectedItems(_R(IDC_GUIDETAB_GUIDELINELIST));
INT32 Count = GuidelineList.GetCount();
+ INT32 i;
+
BOOL ok = (pIndexList != NULL && Count > 0);
NodeGuideline** pGuidelineList = NULL;
@@ -824,7 +834,7 @@
if (ok)
{
- for (INT32 i=0;(pIndexList[i] >= 0) && (i < Count);i++)
+ for (i=0; (pIndexList[i] >= 0) && (i < Count);i++)
{
GuidelineListItem* pItem = (GuidelineListItem*)GuidelineList.FindItem(pIndexList[i]);
if (pItem != NULL)
@@ -908,7 +918,7 @@
if (Index < 0 || pLayer == NULL) return FALSE;
BOOL Valid;
- MILLIPOINT Ordinate = pPropertiesDlg->GetDimensionGadgetValue(_R(IDC_GUIDETAB_GUIDELINELIST),pLayer,&Valid,Index);
+ /*MILLIPOINT Ordinate =*/ pPropertiesDlg->GetDimensionGadgetValue(_R(IDC_GUIDETAB_GUIDELINELIST),pLayer,&Valid,Index);
if (Valid)
{
@@ -1000,9 +1010,12 @@
TRACEUSER( "Neville", _T("GuidesPropertiesTab::InitSection
"));
ERROR2IF(pPropertiesDlg == NULL,FALSE,"GuidesPropertiesTab::InitSection called with no dialog pointer");
+PORTNOTE("other", "Disabled colour dropdown")
+#ifndef EXCLUDE_FROM_XARALX
pColourDropDown = new ColourDropDown;
if (pColourDropDown != NULL)
pColourDropDown->Init(pPropertiesDlg->GetReadWriteWindowID(),_R(IDC_GUIDETAB_COLOURLIST));
+#endif
ShowDetails();
@@ -1080,7 +1093,7 @@
pLayer->SetGuideColour(EntryParam.pColour);
LayerSGallery::ForceRedrawLayer(pDoc,pLayer);
- BROADCAST_TO_ALL(LayerMsg(pLayer,LayerMsg::LayerReason::GUIDELINES_CHANGED));
+ BROADCAST_TO_ALL(LayerMsg(pLayer,LayerMsg::GUIDELINES_CHANGED));
}
ERROR3IF(pDoc == NULL, "pDoc is NULL");
Index: Trunk/XaraLX/Kernel/layerprp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/layerprp.cpp (revision 955)
+++ Trunk/XaraLX/Kernel/layerprp.cpp (revision 956)
@@ -362,13 +362,13 @@
switch ( TheMsg->State )
{
-// case DocChangingMsg::DocState::TITLECHANGED:
- case DocChangingMsg::DocState::SELCHANGED:
+// case DocChangingMsg::TITLECHANGED:
+ case DocChangingMsg::SELCHANGED:
{
// In the different cases there are different document pointers that
// we must use.
Document *pDocument = NULL;
- if (TheMsg->State == DocChangingMsg::DocState::TITLECHANGED)
+ if (TheMsg->State == DocChangingMsg::TITLECHANGED)
{
// Document title has changed message.
pDocument = TheMsg->pChangingDoc;
@@ -431,7 +431,7 @@
// the same document and hence the selected document/spread/view does
// not change and so we do not get the last update.
// Could cache all messages from BORN to this and only update on this.
- case DocChangingMsg::DocState::BORNANDSTABLE:
+ case DocChangingMsg::BORNANDSTABLE:
{
// In the different cases there are different document pointers that
// we must use, in this case the changing doc is relevent.
@@ -462,6 +462,8 @@
}
}
break;
+ default:
+ break;
}
}
@@ -477,7 +479,7 @@
switch ( TheMsg->State )
{
- case DocViewMsg::DocViewState::SELCHANGED:
+ case DocViewMsg::SELCHANGED:
{
if (TheMsg->pNewDocView != NULL)
{
@@ -505,6 +507,8 @@
}
}
break;
+ default:
+ break;
}
}
@@ -520,7 +524,7 @@
switch ( TheMsg->Reason )
{
// The selected spread has changed
- case SpreadMsg::SpreadReason::SELCHANGED:
+ case SpreadMsg::SELCHANGED:
{
// pOldSpread = ptr to the old selected spread
// pNewSpread = ptr to the new selected spread
@@ -552,7 +556,7 @@
break;
/* // The layers of a spread have changed.
- case SpreadMsg::SpreadReason::LAYERCHANGES:
+ case SpreadMsg::LAYERCHANGES:
{
// pOldSpread = pNewSpread = spread whose layers have changed
if (TheMsg->pNewSpread != NULL)
@@ -582,6 +586,8 @@
}
break;
*/
+ default:
+ break;
}
}
@@ -593,7 +599,7 @@
switch ( TheMsg->Reason )
{
// The active layer has changed.
- case LayerMsg::LayerReason::ACTIVE_LAYER_CHANGED:
+ case LayerMsg::ACTIVE_LAYER_CHANGED:
{
if (TheMsg->pNewLayer != NULL)
{
@@ -619,7 +625,7 @@
}
break;
- case LayerMsg::LayerReason::GUIDELINES_CHANGED:
+ case LayerMsg::GUIDELINES_CHANGED:
{
// Only pass on if the layer that's changed is the same as the layer we consider
// to be the active layer.
@@ -642,6 +648,8 @@
}
}
break;
+ default:
+ break;
}
}
@@ -660,7 +668,7 @@
switch ( TheMsg->State )
{
- case OptionsChangingMsg::OptionsState::NEWUNITS:
+ case OptionsChangingMsg::NEWUNITS:
{
// Current display units may have changed changed so may need to update
// any display fields on other tabs which are using units.
@@ -682,6 +690,8 @@
}
break;
}
+ default:
+ break;
}
}
@@ -757,6 +767,9 @@
case DIM_CANCEL: // Want to quit
EndDialog = TRUE;
break;
+
+ default:
+ break;
}
}
@@ -792,20 +805,17 @@
// Allow the base class access to the message, it will do the
// DLG_EAT_IF_HUNGRY(Msg) for us
+
// Must do this before the Close and End
Result = DialogTabOp::Message(Message);
// End dialog here
if (EndDialog)
{
- Close(); // Hide the dialog box
- End(); // Finish the operation
-
// Make sure that we remove our options tabs link to the dialog box class
// as the dialog will now be destroyed
pLayerProperties->SetTabbedDlg(NULL);
}
-
// Check if have been sending an init/create message and if so then set flag False.
// Only do this in the init/create case as we might be sent one of these and then
@@ -827,18 +837,20 @@
switch ( Msg->State )
{
- case ColourChangingMsg::ColourState::LISTDESELECTED:
+ case ColourChangingMsg::LISTDESELECTED:
pDoc = NULL;
CallColourListChanged = TRUE;
break;
- case ColourChangingMsg::ColourState::LISTPAGED:
- case ColourChangingMsg::ColourState::LISTUPDATED:
- case ColourChangingMsg::ColourState::COLOURUPDATED:
- case ColourChangingMsg::ColourState::COLOURUPDATEDINVISIBLE:
+ case ColourChangingMsg::LISTPAGED:
+ case ColourChangingMsg::LISTUPDATED:
+ case ColourChangingMsg::COLOURUPDATED:
+ case ColourChangingMsg::COLOURUPDATEDINVISIBLE:
pDoc = Msg->ScopeDoc;
CallColourListChanged = TRUE;
break;
+ default:
+ break;
}
// Call the ColourListChanged() func is the colour list has changed
@@ -1241,7 +1253,7 @@
********************************************************************************************/
-LayerPropertyTabs::Init()
+BOOL LayerPropertyTabs::Init()
{
// Do nothing for now.
return TRUE;
@@ -1308,15 +1320,14 @@
// Only include the tab if it is a document based option
if ( pLayerProperty->IsPropertyRequired() )
{
- switch (pLayerProperty->GetPageID())
+ if (pLayerProperty->GetPageID() == _R(IDD_TAB_LAYER_PROPERTIES))
{
- case _R(IDD_TAB_LAYER_PROPERTIES):
- LayersTabNumber = i; // note that tab number
- break;
- case _R(IDD_TAB_GUIDELINE_PROPERTIES):
- GuidesTabNumber = i; // note that tab number
- break;
+ LayersTabNumber = i; // note that tab number
}
+ else if (pLayerProperty->GetPageID() == _R(IDD_TAB_GUIDELINE_PROPERTIES))
+ {
+ GuidesTabNumber = i; // note that tab number
+ }
i += 1; // increment the counter
}
@@ -1342,7 +1353,7 @@
BOOL LayerPropertyTabs::DeinitLayerPropertyTabs()
{
- LayerPropertyTabs *pLayerProperty = NULL;
+// LayerPropertyTabs *pLayerProperty = NULL;
// Now, we can get rid of our LayerPropertyTabs
LayerPropertyTabsList.DeleteAll();
@@ -1572,7 +1583,7 @@
CDlgResID LayerPropertyTabs::GetPageID()
{
- return NULL;
+ return 0;
}
/******************************************************************************************
Index: Trunk/XaraLX/Kernel/dialogop.h
===================================================================
--- Trunk/XaraLX/Kernel/dialogop.h (revision 955)
+++ Trunk/XaraLX/Kernel/dialogop.h (revision 956)
@@ -298,7 +298,7 @@
Node* pNode,
BOOL IncludeUnitSpecifier = TRUE,
BOOL EndOfList = FALSE,
- INT32 ListPos = -1);
+ INT32 ListPos = 0);
BOOL SetMemoryGadgetValue( CGadgetID Gadget,
UINT32 value,
Index: Trunk/XaraLX/wxOil/dlgmgr.h
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.h (revision 955)
+++ Trunk/XaraLX/wxOil/dlgmgr.h (revision 956)
@@ -473,7 +473,7 @@
Node* pNode,
BOOL IncludeUnitSpecifier = TRUE,
BOOL EndOfList = FALSE,
- INT32 ListPos = -1
+ INT32 ListPos = 0
);
static BOOL SetMemoryGadgetValue( CWindowID WindowID,
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 955)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 956)
@@ -961,7 +961,7 @@
(EventType == wxEVT_COMMAND_RADIOBUTTON_SELECTED) ||
FALSE)
{
- msg.DlgMsg = DIM_SELECTION_CHANGED;
+ msg.DlgMsg = DIM_LFT_BN_CLICKED; // apparently not a DIM_SELECTION_CHANGED - the click itself is eaten by the radio control - please do not change - AMB
HandleMessage = TRUE;
}
else if (
Xara