зеркало из https://github.com/mozilla/pjs.git
Added notion of templates to HT. Added several configurable properties.
This commit is contained in:
hyatt%netscape.com
Родитель
5316a8f701
Коммит
3137ff8440
|
|
@ -135,6 +135,7 @@ typedef HT_NotificationStruct* HT_Notification;
|
|||
#define HT_EVENT_COLUMN_REORDER 0x00800000UL
|
||||
#define HT_EVENT_COLUMN_SHOW 0x01000000UL
|
||||
#define HT_EVENT_COLUMN_HIDE 0x02000000UL
|
||||
#define HT_EVENT_VIEW_MODECHANGED 0x04000000UL
|
||||
|
||||
#define HT_EVENT_NO_NOTIFICATION_MASK 0x00000000UL
|
||||
#define HT_EVENT_DEFAULT_NOTIFICATION_MASK 0xFFFFFFFFUL
|
||||
|
|
@ -272,6 +273,8 @@ PR_PUBLIC_API(HT_Resource) HT_GetParent (HT_Resource node);
|
|||
PR_PUBLIC_API(HT_Error) HT_NodeDisplayString (HT_Resource node, char *buffer, int bufferLen); /* obsolete! */
|
||||
PR_PUBLIC_API(HT_Error) HT_ViewDisplayString (HT_View view, char *buffer, int bufferLen); /* obsolete! */
|
||||
|
||||
PR_PUBLIC_API(PRBool)
|
||||
HT_GetTemplateData(HT_Resource node, void* token, uint32 tokenType, void **nodeData);
|
||||
PR_PUBLIC_API(PRBool) HT_GetNodeData (HT_Resource node, void *token,
|
||||
uint32 tokenType, void **data);
|
||||
PR_PUBLIC_API(PRBool) HT_IsNodeDataEditable(HT_Resource node,
|
||||
|
|
@ -279,6 +282,10 @@ PR_PUBLIC_API(PRBool) HT_IsNodeDataEditable(HT_Resource node,
|
|||
PR_PUBLIC_API(HT_Error) HT_SetNodeData (HT_Resource node, void *token,
|
||||
uint32 tokenType, void *data);
|
||||
PR_PUBLIC_API(HT_Error) HT_SetNodeName (HT_Resource node, void *data);
|
||||
PR_PUBLIC_API(HT_Error) HT_ToggleTreeMode(HT_View view);
|
||||
PR_PUBLIC_API(PRBool) HT_InNavigationMode(HT_View view);
|
||||
PR_PUBLIC_API(HT_Error) HT_SetTreeStateForButton(HT_Resource node, char* state);
|
||||
PR_PUBLIC_API(char*) HT_GetTreeStateForButton(HT_Resource node);
|
||||
|
||||
/*
|
||||
* HT_GetLargeIconURL / HT_GetSmallIconURL
|
||||
|
|
|
|||
|
|
@ -180,6 +180,14 @@ typedef struct _RDF_NCVocabStruct {
|
|||
RDF_Resource viewDisabledColor; /* Color to use when item is disabled in a view. */
|
||||
RDF_Resource urlBar; /* Whether or not the button is a URL bar. */
|
||||
RDF_Resource urlBarWidth; /* The width of the URL bar. */
|
||||
|
||||
RDF_Resource buttonTreeMode; /* The tree mode (navigation, management) for the button. */
|
||||
RDF_Resource buttonTreeState; /* The tree state (docked, popup) for a button. */
|
||||
|
||||
RDF_Resource controlStripFGColor; /* The tree's control strip foreground */
|
||||
RDF_Resource controlStripBGColor; /* The tree's control strip background */
|
||||
RDF_Resource controlStripBGURL; /* The tree's control strip BG URL */
|
||||
|
||||
RDF_Resource pos;
|
||||
RDF_Resource from;
|
||||
RDF_Resource to;
|
||||
|
|
|
|||
|
|
@ -89,6 +89,9 @@ extern char *gRLForbiddenDomains;
|
|||
|
||||
void FE_Print(const char *pUrl); /* XXX this should be added to fe_proto.h */
|
||||
|
||||
HT_Pane gNavigationTemplate = NULL;
|
||||
HT_Pane gChromeTemplate = NULL;
|
||||
HT_Pane gManagementTemplate = NULL;
|
||||
|
||||
|
||||
void
|
||||
|
|
@ -100,6 +103,11 @@ HT_Startup()
|
|||
gMissionControlEnabled = false;
|
||||
PREF_GetBoolPref(MISSION_CONTROL_RDF_PREF, &gMissionControlEnabled);
|
||||
|
||||
/* Initialize the HT templates. */
|
||||
gChromeTemplate = newTemplatePane("NC:ChromeDefaults");
|
||||
gNavigationTemplate = newTemplatePane("NC:NavigationDefaults");
|
||||
gManagementTemplate = newTemplatePane("NC:ManagementDefaults");
|
||||
|
||||
/* HT timer every 12 seconds */
|
||||
htTimerID = FE_SetTimeout(htTimerRoutine, NULL, 1000 * 12);
|
||||
}
|
||||
|
|
@ -110,6 +118,11 @@ HT_Startup()
|
|||
void
|
||||
HT_Shutdown()
|
||||
{
|
||||
/* Free templates */
|
||||
HT_DeletePane(gNavigationTemplate);
|
||||
HT_DeletePane(gChromeTemplate);
|
||||
HT_DeletePane(gManagementTemplate);
|
||||
|
||||
freeMenuCommandList();
|
||||
gInited = PR_FALSE;
|
||||
gMissionControlEnabled = false;
|
||||
|
|
@ -1289,6 +1302,16 @@ HT_NewQuickFilePane(HT_Notification notify)
|
|||
return(pane);
|
||||
}
|
||||
|
||||
HT_Pane newTemplatePane(char* templateName)
|
||||
{
|
||||
HT_Pane pane = NULL;
|
||||
RDF_Resource tmpl;
|
||||
|
||||
if ((tmpl = RDF_GetResource(NULL, templateName, PR_TRUE)) != NULL)
|
||||
pane = paneFromResource(newNavCenterDB(), tmpl, NULL, true, true, 0);
|
||||
|
||||
return(pane);
|
||||
}
|
||||
|
||||
|
||||
PR_PUBLIC_API(HT_Pane)
|
||||
|
|
@ -5054,6 +5077,27 @@ ht_isURLReal(HT_Resource node)
|
|||
}
|
||||
|
||||
|
||||
PR_PUBLIC_API(PRBool)
|
||||
HT_GetTemplateData(HT_Resource node, void* token, uint32 tokenType, void **nodeData)
|
||||
{
|
||||
void* data = NULL;
|
||||
|
||||
if (HT_GetNodeData(node, token, tokenType, nodeData))
|
||||
return PR_TRUE;
|
||||
|
||||
/* Use the template instead */
|
||||
|
||||
/* Figure out which template to use based on the current mode of this view. */
|
||||
if (HT_GetPane(HT_GetView(node))->toolbar)
|
||||
return HT_GetNodeData(HT_TopNode(HT_GetSelectedView(gChromeTemplate)),
|
||||
token, tokenType, nodeData);
|
||||
if (HT_InNavigationMode(HT_GetView(node)))
|
||||
return HT_GetNodeData(HT_TopNode(HT_GetSelectedView(gNavigationTemplate)),
|
||||
token, tokenType, nodeData);
|
||||
return HT_GetNodeData(HT_TopNode(HT_GetSelectedView(gManagementTemplate)),
|
||||
token, tokenType, nodeData);
|
||||
}
|
||||
|
||||
|
||||
PR_PUBLIC_API(PRBool)
|
||||
HT_GetNodeData (HT_Resource node, void *token, uint32 tokenType, void **nodeData)
|
||||
|
|
@ -5168,7 +5212,6 @@ htVerifyUniqueToken(HT_Resource node, void *token, uint32 tokenType, char *data)
|
|||
}
|
||||
|
||||
|
||||
|
||||
PR_PUBLIC_API(HT_Error)
|
||||
HT_SetNodeData (HT_Resource node, void *token, uint32 tokenType, void *data)
|
||||
{
|
||||
|
|
@ -5287,6 +5330,20 @@ HT_IsNodeDataEditable(HT_Resource node, void *token, uint32 tokenType)
|
|||
(token == gNavCenter->showDivider) || (token == gNavCenter->selectedColumnHeaderFGColor) ||
|
||||
(token == gNavCenter->selectedColumnHeaderBGColor) || (token == gNavCenter->showColumnHilite) ||
|
||||
(token == gNavCenter->triggerPlacement) ||
|
||||
(token == gNavCenter->viewRolloverColor) ||
|
||||
(token == gNavCenter->viewPressedColor) || (token == gNavCenter->viewDisabledColor) ||
|
||||
(token == gNavCenter->toolbarBitmapPosition) || (token == gNavCenter->toolbarButtonsFixedSize) ||
|
||||
(token == gNavCenter->RDF_smallDisabledIcon) || (token == gNavCenter->RDF_largeDisabledIcon) ||
|
||||
(token == gNavCenter->RDF_smallRolloverIcon) || (token == gNavCenter->RDF_largeRolloverIcon) ||
|
||||
(token == gNavCenter->RDF_smallPressedIcon) || (token == gNavCenter->RDF_largePressedIcon) ||
|
||||
(token == gNavCenter->buttonTooltipText) || (token == gNavCenter->buttonStatusbarText) ||
|
||||
(token == gNavCenter->urlBar) || (token == gNavCenter->urlBarWidth) ||
|
||||
(token == gNavCenter->buttonTreeMode) || (token == gNavCenter->buttonTreeState) ||
|
||||
(token == gNavCenter->useInlineEditing) || (token == gNavCenter->useSingleClick) ||
|
||||
(token == gNavCenter->loadOpenState) || (token == gNavCenter->saveOpenState) ||
|
||||
(token == gNavCenter->useSelection) || (token == gNavCenter->controlStripFGColor) ||
|
||||
(token == gNavCenter->controlStripBGColor) || (token == gNavCenter->controlStripBGURL) ||
|
||||
|
||||
/* ((token == gWebData->RDF_URL) && ht_isURLReal(node)) || */
|
||||
#ifdef HT_PASSWORD_RTNS
|
||||
(token == gNavCenter->RDF_Password) ||
|
||||
|
|
@ -5326,6 +5383,94 @@ HT_IsNodeDataEditable(HT_Resource node, void *token, uint32 tokenType)
|
|||
return(canEditFlag);
|
||||
}
|
||||
|
||||
PR_PUBLIC_API(PRBool)
|
||||
HT_InNavigationMode(HT_View view)
|
||||
{
|
||||
char* answer;
|
||||
XP_ASSERT(view != NULL);
|
||||
|
||||
/* First check this view. */
|
||||
if (HT_GetNodeData(HT_TopNode(view), gNavCenter->buttonTreeMode, HT_COLUMN_STRING, &answer))
|
||||
{
|
||||
return stricmp("Management", answer);
|
||||
}
|
||||
|
||||
/* Need to check the chrome default template to determine which mode is dominant
|
||||
by default */
|
||||
if (HT_GetNodeData(HT_TopNode(HT_GetSelectedView(gChromeTemplate)),
|
||||
gNavCenter->buttonTreeMode, HT_COLUMN_STRING, &answer))
|
||||
{
|
||||
return stricmp("Management", answer);
|
||||
}
|
||||
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
||||
PR_PUBLIC_API(HT_Error)
|
||||
HT_ToggleTreeMode(HT_View view)
|
||||
{
|
||||
HT_Resource nodeToModify;
|
||||
HT_Error result;
|
||||
char* data;
|
||||
|
||||
XP_ASSERT(view != NULL);
|
||||
|
||||
/* Query this node for its current state. */
|
||||
if (HT_GetNodeData(HT_TopNode(view), gNavCenter->buttonTreeMode, HT_COLUMN_STRING, &data))
|
||||
nodeToModify = HT_TopNode(view);
|
||||
else
|
||||
{
|
||||
nodeToModify = HT_TopNode(HT_GetSelectedView(gChromeTemplate));
|
||||
HT_GetNodeData(HT_TopNode(HT_GetSelectedView(gChromeTemplate)),
|
||||
gNavCenter->buttonTreeMode, HT_COLUMN_STRING, &data);
|
||||
}
|
||||
|
||||
if (stricmp("Navigation", data))
|
||||
{
|
||||
result = HT_SetNodeData(nodeToModify, gNavCenter->buttonTreeMode, HT_COLUMN_STRING,
|
||||
"Navigation");
|
||||
resynchItem(nodeToModify, gNavCenter->buttonTreeMode, (void*)("Navigation"), TRUE);
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
result = HT_SetNodeData(nodeToModify, gNavCenter->buttonTreeMode, HT_COLUMN_STRING,
|
||||
"Management");
|
||||
resynchItem(nodeToModify, gNavCenter->buttonTreeMode, (void*)("Management"), TRUE);
|
||||
}
|
||||
|
||||
sendNotification(HT_TopNode(view), HT_EVENT_VIEW_MODECHANGED);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
PR_PUBLIC_API(char*)
|
||||
HT_GetTreeStateForButton(HT_Resource node)
|
||||
{
|
||||
char* answer = NULL;
|
||||
|
||||
if (HT_GetTemplateData(node, gNavCenter->buttonTreeState, HT_COLUMN_STRING, &answer))
|
||||
{
|
||||
return answer;
|
||||
}
|
||||
|
||||
return "Popup";
|
||||
}
|
||||
|
||||
PR_PUBLIC_API(HT_Error)
|
||||
HT_SetTreeStateForButton(HT_Resource node, char* state)
|
||||
{
|
||||
HT_Resource nodeToModify;
|
||||
void* data;
|
||||
|
||||
/* Query this node for its current state. */
|
||||
if (HT_GetNodeData(node, gNavCenter->buttonTreeState, HT_COLUMN_STRING, &data))
|
||||
nodeToModify = node;
|
||||
else nodeToModify = HT_TopNode(HT_GetSelectedView(gChromeTemplate));
|
||||
|
||||
return HT_SetNodeData(nodeToModify, gNavCenter->buttonTreeState, HT_COLUMN_STRING,
|
||||
state);
|
||||
}
|
||||
|
||||
|
||||
/* XXX HT_NodeDisplayString is obsolete! Don't use. */
|
||||
|
|
@ -5703,7 +5848,13 @@ htIsPropertyInMoreOptions(RDF_Resource r)
|
|||
(r == gNavCenter->RDF_smallRolloverIcon) || (r == gNavCenter->RDF_largeRolloverIcon) ||
|
||||
(r == gNavCenter->RDF_smallPressedIcon) || (r == gNavCenter->RDF_largePressedIcon) ||
|
||||
(r == gNavCenter->buttonTooltipText) || (r == gNavCenter->buttonStatusbarText) ||
|
||||
(r == gNavCenter->urlBar) || (r == gNavCenter->urlBarWidth))
|
||||
(r == gNavCenter->urlBar) || (r == gNavCenter->urlBarWidth) ||
|
||||
(r == gNavCenter->buttonTreeMode) || (r == gNavCenter->buttonTreeState) ||
|
||||
(r == gNavCenter->useInlineEditing) || (r == gNavCenter->useSingleClick) ||
|
||||
(r == gNavCenter->loadOpenState) || (r == gNavCenter->saveOpenState) ||
|
||||
(r == gNavCenter->useSelection) || (r == gNavCenter->controlStripFGColor) ||
|
||||
(r == gNavCenter->controlStripBGColor) || (r == gNavCenter->controlStripBGURL))
|
||||
|
||||
{
|
||||
retVal = PR_TRUE;
|
||||
}
|
||||
|
|
@ -9216,6 +9367,7 @@ RetainOldSitemaps (HT_Pane htPane, char *pUrl)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
void cleanupInt (HT_Pane htPane, HT_URLSiteMapAssoc *nsmp, RDF_Resource parent) {
|
||||
while (nsmp != NULL) {
|
||||
HT_URLSiteMapAssoc *next;
|
||||
|
|
|
|||
|
|
@ -349,7 +349,10 @@ PRBool implicitDomainURL (char* url);
|
|||
PRBool domainMatches (char *dom, char *url);
|
||||
void nextDomain (char* dom, size_t *n);
|
||||
PRBool relatedLinksEnabledURL (char* url);
|
||||
|
||||
HT_Pane newTemplatePane(char* templateName);
|
||||
void PaneDeleteSBPCleanup (HT_Pane htPane);
|
||||
|
||||
XP_END_PROTOS
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -253,6 +253,13 @@ createNavCenterVocab () {
|
|||
gNavCenter->viewRolloverColor = newResource("viewRolloverColor", 0 /* XXX */);
|
||||
gNavCenter->viewPressedColor = newResource("viewPressedColor", 0 /* XXX */);
|
||||
gNavCenter->viewDisabledColor = newResource("viewDisabledColor", 0 /* XXX */);
|
||||
gNavCenter->controlStripFGColor = newResource("controlStripFGColor", 0 /* XXX */);
|
||||
gNavCenter->controlStripBGColor = newResource("controlStripBGColor", 0 /* XXX */);
|
||||
gNavCenter->controlStripBGURL = newResource("controlStripBGURL", 0 /* XXX */);
|
||||
|
||||
/* Buttons */
|
||||
gNavCenter->buttonTreeMode = newResource("buttonTreeMode", 0 /* XXX */);
|
||||
gNavCenter->buttonTreeState = newResource("buttonTreeState", 0 /* XXX */);
|
||||
|
||||
/* Cookies */
|
||||
gNavCenter->cookieDomain = newResource("cookieDomain", 0 /* XXX */);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче