зеркало из https://github.com/mozilla/pjs.git
Changes to support the toolbar icons (in their four different states).
This commit is contained in:
hyatt%netscape.com
Родитель
8dd947cb21
Коммит
220791ba00
|
|
@ -673,12 +673,12 @@ void CGenericFrame::FinishMenuExpansion(HT_Resource pRoot)
|
|||
CTreeMenu *pSubMenu=new CTreeMenu;
|
||||
pSubMenu->CreatePopupMenu();
|
||||
|
||||
IconType nIconType = DetermineIconType(pEntry, FALSE);
|
||||
IconType nIconType = DetermineIconType(pEntry, FALSE, HT_SMALLICON);
|
||||
void* pCustomIcon = NULL;
|
||||
if (nIconType == LOCAL_FILE)
|
||||
pCustomIcon = FetchLocalFileIcon(pEntry);
|
||||
else if (nIconType == ARBITRARY_URL)
|
||||
pCustomIcon = FetchCustomIcon(pEntry, pMenu, FALSE);
|
||||
pCustomIcon = FetchCustomIcon(pEntry, pMenu, FALSE, HT_SMALLICON);
|
||||
CTreeItem *item= new CTreeItem(m_pBookmarkFolderBitmap, m_pBookmarkFolderOpenBitmap,
|
||||
(UINT)pSubMenu->GetSafeHmenu(),csAmpersandName, pSubMenu);
|
||||
|
||||
|
|
@ -695,7 +695,7 @@ void CGenericFrame::FinishMenuExpansion(HT_Resource pRoot)
|
|||
else
|
||||
{
|
||||
// We're an URL
|
||||
IconType nIconType = DetermineIconType(pEntry, FALSE);
|
||||
IconType nIconType = DetermineIconType(pEntry, FALSE, HT_SMALLICON);
|
||||
void* pCustomIcon = NULL;
|
||||
if (nIconType == LOCAL_FILE)
|
||||
pCustomIcon = FetchLocalFileIcon(pEntry);
|
||||
|
|
|
|||
|
|
@ -1,216 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
#ifndef RDFACC_H
|
||||
#define RDFACC_H
|
||||
|
||||
#include "cxstubs.h"
|
||||
|
||||
class CIsomorphicCommandMap
|
||||
{
|
||||
private:
|
||||
CMapStringToString mapFromXPToFE;
|
||||
CMapStringToString mapFromFEToXP;
|
||||
|
||||
public:
|
||||
static CIsomorphicCommandMap* InitializeCommandMap(const CString& initType);
|
||||
// This function builds the command map and prepopulates it with the set of commands
|
||||
// that can be responded to.
|
||||
|
||||
void AddItem(CString xpItem, UINT feResource);
|
||||
// Adds an isomorphic entry into the two maps.
|
||||
|
||||
void RemoveXPItem(CString xpItem);
|
||||
// Removes the isomorphic entry from the two maps (keyed on the XP item).
|
||||
|
||||
void RemoveFEItem(UINT feResource);
|
||||
// Removes the isomorphic entry from the two maps (keyed on the FE resource ID)
|
||||
|
||||
UINT GetFEResource(CString xpItem);
|
||||
// Given an XP name, retrieves the FE resource.
|
||||
|
||||
CString GetXPResource(UINT resource);
|
||||
// Given an FE resource, retrieves the XP name.
|
||||
};
|
||||
|
||||
|
||||
class CCustomImageObject;
|
||||
class CRDFImage;
|
||||
|
||||
enum IconType { BUILTIN_BITMAP, LOCAL_FILE, ARBITRARY_URL }; // TODO: Use this icon type for the tree AND the toolbars
|
||||
|
||||
class CHTFEData
|
||||
{
|
||||
private:
|
||||
CHTFEData() {}; // Disallow the instantiation of objects of this class.
|
||||
|
||||
public:
|
||||
|
||||
static void FlushIconInfo();
|
||||
|
||||
static CMapStringToPtr m_LocalFileCache;
|
||||
// Hashed on file extension e.g., .html would hold the icon for HTML files.
|
||||
// Special keys: "open folder" and "closed folder" are used to hold the folder icons.
|
||||
// file URLs are used to represent drives, e.g., file:///a|/
|
||||
// "no extension" is used to represent files with no extension
|
||||
|
||||
static CMapStringToPtr m_CustomURLCache;
|
||||
// Hashed on the URL of the image. Holds pointers to CRDFImages.
|
||||
};
|
||||
|
||||
class CRDFColumn : public CObject
|
||||
{
|
||||
private:
|
||||
char* name; // The column's name.
|
||||
int width; // The column's width
|
||||
void* token; // The column token
|
||||
uint32 tokenType; // The column token type
|
||||
CString buffer; // A temp. storage buffer for column data
|
||||
|
||||
public:
|
||||
CRDFColumn(char* n, int w, void* t, uint32 tt)
|
||||
:name(n), width(w), token(t), tokenType(tt) {}
|
||||
|
||||
uint32 GetDataType() const { return tokenType; }
|
||||
char* GetName() { return name; }
|
||||
void* GetToken() { return token; }
|
||||
CString& GetStorageBuffer() { return buffer; }
|
||||
};
|
||||
|
||||
class CRDFMenuCommand : public CObject
|
||||
{
|
||||
private:
|
||||
HT_MenuCmd htCommandID;
|
||||
char* name;
|
||||
|
||||
public:
|
||||
CRDFMenuCommand(char* n, HT_MenuCmd ht)
|
||||
:name(n), htCommandID(ht) {}
|
||||
|
||||
HT_MenuCmd GetHTCommand() { return htCommandID; }
|
||||
};
|
||||
|
||||
class CRDFCommandMap
|
||||
{
|
||||
private:
|
||||
CObArray commandMap; // Contains a mapping of idents to objects. This is used
|
||||
// for columns and for menus.
|
||||
public:
|
||||
CRDFCommandMap()
|
||||
{
|
||||
}
|
||||
|
||||
private:
|
||||
CRDFCommandMap(const CRDFCommandMap& la)
|
||||
{} // Object cannot be copied
|
||||
|
||||
public:
|
||||
~CRDFCommandMap()
|
||||
{
|
||||
Clear();
|
||||
}
|
||||
|
||||
int AddCommand(CObject* theObject)
|
||||
{
|
||||
return commandMap.Add(theObject);
|
||||
}
|
||||
|
||||
CObject* GetCommand(int i) { return commandMap[i]; }
|
||||
|
||||
void Clear()
|
||||
{
|
||||
int count = commandMap.GetSize();
|
||||
for (int i = count-1; i >= 0; i--)
|
||||
{
|
||||
CObject* obj = commandMap[i];
|
||||
commandMap.RemoveAt(i);
|
||||
delete obj;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
class CRDFOutliner;
|
||||
|
||||
class CRDFEditWnd : public CEdit
|
||||
{
|
||||
protected:
|
||||
CRDFOutliner* m_pOwner;
|
||||
public:
|
||||
CRDFEditWnd(CRDFOutliner* owner) { m_pOwner = owner; }
|
||||
~CRDFEditWnd() {};
|
||||
|
||||
virtual BOOL PreTranslateMessage ( MSG * msg );
|
||||
|
||||
protected:
|
||||
// Generated message map functions
|
||||
//{{AFX_MSG(CRDFEditWnd)
|
||||
afx_msg void OnDestroy();
|
||||
afx_msg void OnSetFocus(CWnd* pOldWnd);
|
||||
afx_msg void OnKillFocus( CWnd* pNewWnd );
|
||||
//}}AFX_MSG
|
||||
DECLARE_MESSAGE_MAP()
|
||||
|
||||
};
|
||||
|
||||
// The RDF Context
|
||||
class CRDFCX : public CStubsCX
|
||||
{
|
||||
private:
|
||||
CWnd* m_pCurrentRDFWindow;
|
||||
|
||||
public:
|
||||
CRDFCX(ContextType ctMyType, MWContextType XPType)
|
||||
:CStubsCX(ctMyType, XPType) { m_pCurrentRDFWindow = NULL; };
|
||||
|
||||
virtual CWnd *GetDialogOwner() const;
|
||||
|
||||
void TrackRDFWindow(CWnd* pWnd) { m_pCurrentRDFWindow = pWnd; };
|
||||
|
||||
};
|
||||
|
||||
BOOL IsLocalFile(const char* pURL);
|
||||
BOOL IsExecutableURL(const char* pURL);
|
||||
HICON DrawLocalFileIcon(HT_Resource r, int left, int top, HDC hdc);
|
||||
CRDFImage* DrawArbitraryURL(HT_Resource r, int left, int top, int imageWidth,
|
||||
int imageHeight, HDC hDC, COLORREF bkColor,
|
||||
CCustomImageObject* pObject, BOOL largeIcon);
|
||||
CRDFImage* DrawRDFImage(CRDFImage* pImage, int left, int top, int imageWidth, int imageHeight, HDC hDC,
|
||||
COLORREF bkColor);
|
||||
|
||||
HICON FetchLocalFileIcon(HT_Resource r);
|
||||
CRDFImage* FetchCustomIcon(HT_Resource r, CCustomImageObject* pObject, BOOL largeIcon);
|
||||
IconType DetermineIconType(HT_Resource pNode, BOOL largeIcon);
|
||||
|
||||
void PaintBackground(HDC hdc, CRect rect, CRDFImage* pImage, int xSrcOffset=-1, int ySrcOffset=-1);
|
||||
// This function tiles and paints the background image in the tree.
|
||||
|
||||
void Compute3DColors(COLORREF rgbColor, COLORREF &rgbLight, COLORREF &rgbDark);
|
||||
// This function computes the appropriate highlight and shadow colors to
|
||||
// use against a custom background.
|
||||
|
||||
void ResolveToPaletteColor(COLORREF& color, HPALETTE hPal);
|
||||
|
||||
void DrawArrow(HDC hDC, COLORREF arrowColor, int type, CRect rect, BOOL enabled);
|
||||
// Can be used to draw 4-pixel (1,3,5,7) arrowheads in any direction.
|
||||
|
||||
const int LEFT_ARROW = 0;
|
||||
const int RIGHT_ARROW = 1;
|
||||
const int DOWN_ARROW = 2;
|
||||
const int UP_ARROW = 3;
|
||||
|
||||
#endif // RDFACC_H
|
||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -201,9 +201,30 @@ int CRDFToolbarButton::Create(CWnd *pParent, int nToolbarStyle, CSize noviceButt
|
|||
return bResult;
|
||||
}
|
||||
|
||||
HT_IconType CRDFToolbarButton::TranslateButtonState()
|
||||
{
|
||||
if (!m_bEnabled)
|
||||
return HT_TOOLBAR_DISABLED;
|
||||
|
||||
switch (m_eState)
|
||||
{
|
||||
case eNORMAL:
|
||||
return HT_TOOLBAR_ENABLED;
|
||||
case eDISABLED:
|
||||
return HT_TOOLBAR_DISABLED;
|
||||
case eBUTTON_UP:
|
||||
return HT_TOOLBAR_ROLLOVER;
|
||||
case eBUTTON_DOWN:
|
||||
return HT_TOOLBAR_PRESSED;
|
||||
default:
|
||||
return HT_TOOLBAR_ENABLED;
|
||||
}
|
||||
}
|
||||
|
||||
void CRDFToolbarButton::UpdateIconInfo()
|
||||
{
|
||||
m_nIconType = DetermineIconType(m_Node, UseLargeIcons());
|
||||
HT_IconType iconState = TranslateButtonState();
|
||||
m_nIconType = DetermineIconType(m_Node, TRUE, iconState);
|
||||
UINT oldBitmapID = m_nBitmapID;
|
||||
m_nBitmapID = GetBitmapID();
|
||||
if (m_nBitmapID != oldBitmapID)
|
||||
|
|
@ -934,7 +955,7 @@ void CRDFToolbarButton::FillInMenu(HT_Resource theNode)
|
|||
HT_Resource theItem = NULL;
|
||||
while (theItem = HT_GetNextItem(theCursor))
|
||||
{
|
||||
IconType nIconType = DetermineIconType(theItem, FALSE);
|
||||
IconType nIconType = DetermineIconType(theItem, FALSE, HT_SMALLICON);
|
||||
void* pCustomIcon = NULL;
|
||||
if (nIconType == LOCAL_FILE)
|
||||
pCustomIcon = FetchLocalFileIcon(theItem);
|
||||
|
|
@ -1062,7 +1083,7 @@ void CRDFToolbarButton::DrawCustomIcon(HDC hDC, int x, int y)
|
|||
|
||||
CRDFImage* pCustomImage = DrawArbitraryURL(m_Node, x, y, m_bitmapSize.cx, m_bitmapSize.cy, hDC,
|
||||
pToolbar->GetBackgroundColor(),
|
||||
this, UseLargeIcons());
|
||||
this, TRUE, TranslateButtonState());
|
||||
|
||||
if (!pCustomImage->FrameSuccessfullyLoaded())
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ public:
|
|||
|
||||
virtual BOOL UseLargeIcons() { return FALSE; }
|
||||
virtual void UpdateIconInfo();
|
||||
HT_IconType TranslateButtonState();
|
||||
|
||||
virtual void DrawButtonBitmap(HDC hDC, CRect rcImg);
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче