Merge last PGO-green changeset of mozilla-inbound to mozilla-central

This commit is contained in:
Ed Morley 2012-06-01 15:27:36 +01:00
commit f5fef940b6
429 changed files with 9487 additions and 39676 deletions

2
.gitignore vendored
View File

@ -46,3 +46,5 @@ parser/html/java/javaparser/
.cproject .cproject
.settings/ .settings/
# Python stuff installed at build-time
*.egg-info/

View File

@ -45,3 +45,6 @@ _OPT\.OBJ/
\.project$ \.project$
\.cproject$ \.cproject$
\.settings/ \.settings/
# Python stuff installed at build-time
\.egg-info/

View File

@ -376,7 +376,7 @@ AccessibleWrap::CreateMaiInterfaces(void)
interfacesBits |= 1 << MAI_INTERFACE_ACTION; interfacesBits |= 1 << MAI_INTERFACE_ACTION;
// Text, Editabletext, and Hypertext interface. // Text, Editabletext, and Hypertext interface.
nsHyperTextAccessible* hyperText = AsHyperText(); HyperTextAccessible* hyperText = AsHyperText();
if (hyperText && hyperText->IsTextRole()) { if (hyperText && hyperText->IsTextRole()) {
interfacesBits |= 1 << MAI_INTERFACE_TEXT; interfacesBits |= 1 << MAI_INTERFACE_TEXT;
interfacesBits |= 1 << MAI_INTERFACE_EDITABLE_TEXT; interfacesBits |= 1 << MAI_INTERFACE_EDITABLE_TEXT;

View File

@ -4,12 +4,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef _NSHYPERTEXTACCESSIBLEWRAP_H #ifndef mozilla_a11y_HyperTextAccessibleWrap_h__
#define _NSHYPERTEXTACCESSIBLEWRAP_H #define mozilla_a11y_HyperTextAccessibleWrap_h__
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
typedef class nsHyperTextAccessible nsHyperTextAccessibleWrap; typedef class HyperTextAccessible HyperTextAccessibleWrap;
#endif #endif

View File

@ -6,7 +6,7 @@
#include "InterfaceInitFuncs.h" #include "InterfaceInitFuncs.h"
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
#include "nsMai.h" #include "nsMai.h"
#include "nsString.h" #include "nsString.h"

View File

@ -6,7 +6,7 @@
#include "InterfaceInitFuncs.h" #include "InterfaceInitFuncs.h"
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
#include "nsMai.h" #include "nsMai.h"
#include "nsMaiHyperlink.h" #include "nsMaiHyperlink.h"
@ -19,7 +19,7 @@ getLinkCB(AtkHypertext *aText, gint aLinkIndex)
if (!accWrap) if (!accWrap)
return nsnull; return nsnull;
nsHyperTextAccessible* hyperText = accWrap->AsHyperText(); HyperTextAccessible* hyperText = accWrap->AsHyperText();
NS_ENSURE_TRUE(hyperText, nsnull); NS_ENSURE_TRUE(hyperText, nsnull);
Accessible* hyperLink = hyperText->GetLinkAt(aLinkIndex); Accessible* hyperLink = hyperText->GetLinkAt(aLinkIndex);
@ -42,7 +42,7 @@ getLinkCountCB(AtkHypertext *aText)
if (!accWrap) if (!accWrap)
return -1; return -1;
nsHyperTextAccessible* hyperText = accWrap->AsHyperText(); HyperTextAccessible* hyperText = accWrap->AsHyperText();
NS_ENSURE_TRUE(hyperText, -1); NS_ENSURE_TRUE(hyperText, -1);
return hyperText->GetLinkCount(); return hyperText->GetLinkCount();
@ -55,7 +55,7 @@ getLinkIndexCB(AtkHypertext *aText, gint aCharIndex)
if (!accWrap) if (!accWrap)
return -1; return -1;
nsHyperTextAccessible* hyperText = accWrap->AsHyperText(); HyperTextAccessible* hyperText = accWrap->AsHyperText();
NS_ENSURE_TRUE(hyperText, -1); NS_ENSURE_TRUE(hyperText, -1);
PRInt32 index = -1; PRInt32 index = -1;

View File

@ -6,7 +6,7 @@
#include "InterfaceInitFuncs.h" #include "InterfaceInitFuncs.h"
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
#include "nsMai.h" #include "nsMai.h"
#include "nsIPersistentProperties2.h" #include "nsIPersistentProperties2.h"
@ -314,7 +314,7 @@ getCharacterCountCB(AtkText *aText)
if (!accWrap) if (!accWrap)
return 0; return 0;
nsHyperTextAccessible* textAcc = accWrap->AsHyperText(); HyperTextAccessible* textAcc = accWrap->AsHyperText();
return textAcc->IsDefunct() ? return textAcc->IsDefunct() ?
0 : static_cast<gint>(textAcc->CharacterCount()); 0 : static_cast<gint>(textAcc->CharacterCount());
} }

View File

@ -646,7 +646,7 @@ NotificationController::CreateTextChangeEventFor(AccMutationEvent* aEvent)
if (!container) if (!container)
return; return;
nsHyperTextAccessible* textAccessible = container->AsHyperText(); HyperTextAccessible* textAccessible = container->AsHyperText();
if (!textAccessible) if (!textAccessible)
return; return;

View File

@ -5,9 +5,9 @@
#include "TextAttrs.h" #include "TextAttrs.h"
#include "HyperTextAccessibleWrap.h"
#include "nsAccUtils.h" #include "nsAccUtils.h"
#include "nsCoreUtils.h" #include "nsCoreUtils.h"
#include "nsHyperTextAccessibleWrap.h"
#include "StyleInfo.h" #include "StyleInfo.h"
#include "gfxFont.h" #include "gfxFont.h"
@ -199,7 +199,7 @@ TextAttrsMgr::GetRange(TextAttr* aAttrArray[], PRUint32 aAttrArrayLen,
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
TextAttrsMgr::LangTextAttr:: TextAttrsMgr::LangTextAttr::
LangTextAttr(nsHyperTextAccessible* aRoot, LangTextAttr(HyperTextAccessible* aRoot,
nsIContent* aRootElm, nsIContent* aElm) : nsIContent* aRootElm, nsIContent* aElm) :
TTextAttr<nsString>(!aElm), mRootContent(aRootElm) TTextAttr<nsString>(!aElm), mRootContent(aRootElm)
{ {

View File

@ -11,17 +11,17 @@
#include "nsIPersistentProperties2.h" #include "nsIPersistentProperties2.h"
#include "nsStyleConsts.h" #include "nsStyleConsts.h"
class nsHyperTextAccessible; class HyperTextAccessible;
namespace mozilla { namespace mozilla {
namespace a11y { namespace a11y {
/** /**
* Used to expose text attributes for the hyper text accessible (see * Used to expose text attributes for the hyper text accessible (see
* nsHyperTextAccessible class). * HyperTextAccessible class).
* *
* @note "invalid: spelling" text attribute is implemented entirely in * @note "invalid: spelling" text attribute is implemented entirely in
* nsHyperTextAccessible class. * HyperTextAccessible class.
*/ */
class TextAttrsMgr class TextAttrsMgr
{ {
@ -29,7 +29,7 @@ public:
/** /**
* Constructor. Used to expose default text attributes. * Constructor. Used to expose default text attributes.
*/ */
TextAttrsMgr(nsHyperTextAccessible* aHyperTextAcc) : TextAttrsMgr(HyperTextAccessible* aHyperTextAcc) :
mOffsetAcc(nsnull), mHyperTextAcc(aHyperTextAcc), mOffsetAcc(nsnull), mHyperTextAcc(aHyperTextAcc),
mOffsetAccIdx(-1), mIncludeDefAttrs(true) { } mOffsetAccIdx(-1), mIncludeDefAttrs(true) { }
@ -45,7 +45,7 @@ public:
* should be calculated for * should be calculated for
* @param oOffsetAccIdx [optional] index in parent of offset accessible * @param oOffsetAccIdx [optional] index in parent of offset accessible
*/ */
TextAttrsMgr(nsHyperTextAccessible* aHyperTextAcc, TextAttrsMgr(HyperTextAccessible* aHyperTextAcc,
bool aIncludeDefAttrs, bool aIncludeDefAttrs,
Accessible* aOffsetAcc, Accessible* aOffsetAcc,
PRInt32 aOffsetAccIdx) : PRInt32 aOffsetAccIdx) :
@ -84,7 +84,7 @@ protected:
private: private:
Accessible* mOffsetAcc; Accessible* mOffsetAcc;
nsHyperTextAccessible* mHyperTextAcc; HyperTextAccessible* mHyperTextAcc;
PRInt32 mOffsetAccIdx; PRInt32 mOffsetAccIdx;
bool mIncludeDefAttrs; bool mIncludeDefAttrs;
@ -191,7 +191,7 @@ protected:
class LangTextAttr : public TTextAttr<nsString> class LangTextAttr : public TTextAttr<nsString>
{ {
public: public:
LangTextAttr(nsHyperTextAccessible* aRoot, nsIContent* aRootElm, LangTextAttr(HyperTextAccessible* aRoot, nsIContent* aRootElm,
nsIContent* aElm); nsIContent* aElm);
virtual ~LangTextAttr() { } virtual ~LangTextAttr() { }

View File

@ -7,7 +7,7 @@
#define TextUpdater_h_ #define TextUpdater_h_
#include "AccEvent.h" #include "AccEvent.h"
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
/** /**
* Used to find a difference between old and new text and fire text change * Used to find a difference between old and new text and fire text change
@ -85,7 +85,7 @@ private:
private: private:
DocAccessible* mDocument; DocAccessible* mDocument;
mozilla::a11y::TextLeafAccessible* mTextLeaf; mozilla::a11y::TextLeafAccessible* mTextLeaf;
nsHyperTextAccessible* mHyperText; HyperTextAccessible* mHyperText;
PRInt32 mTextOffset; PRInt32 mTextOffset;
}; };

View File

@ -10,7 +10,7 @@
#include "nsARIAMap.h" #include "nsARIAMap.h"
#include "nsCoreUtils.h" #include "nsCoreUtils.h"
#include "DocAccessible.h" #include "DocAccessible.h"
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
#include "nsIAccessibleTypes.h" #include "nsIAccessibleTypes.h"
#include "Role.h" #include "Role.h"
#include "States.h" #include "States.h"
@ -254,7 +254,7 @@ nsAccUtils::IsARIASelected(Accessible* aAccessible)
nsGkAtoms::_true, eCaseMatters); nsGkAtoms::_true, eCaseMatters);
} }
nsHyperTextAccessible* HyperTextAccessible*
nsAccUtils::GetTextAccessibleFromSelection(nsISelection* aSelection) nsAccUtils::GetTextAccessibleFromSelection(nsISelection* aSelection)
{ {
// Get accessible from selection's focus DOM point (the DOM point where // Get accessible from selection's focus DOM point (the DOM point where
@ -283,7 +283,7 @@ nsAccUtils::GetTextAccessibleFromSelection(nsISelection* aSelection)
} }
do { do {
nsHyperTextAccessible* textAcc = accessible->AsHyperText(); HyperTextAccessible* textAcc = accessible->AsHyperText();
if (textAcc) if (textAcc)
return textAcc; return textAcc;

View File

@ -23,7 +23,7 @@
class nsAccessNode; class nsAccessNode;
class Accessible; class Accessible;
class nsHyperTextAccessible; class HyperTextAccessible;
class nsHTMLTableAccessible; class nsHTMLTableAccessible;
class DocAccessible; class DocAccessible;
struct nsRoleMapEntry; struct nsRoleMapEntry;
@ -157,7 +157,7 @@ public:
* @param aSelection [in] the given selection * @param aSelection [in] the given selection
* @return text accessible * @return text accessible
*/ */
static nsHyperTextAccessible* static HyperTextAccessible*
GetTextAccessibleFromSelection(nsISelection* aSelection); GetTextAccessibleFromSelection(nsISelection* aSelection);
/** /**

View File

@ -14,6 +14,7 @@
#endif #endif
#include "FocusManager.h" #include "FocusManager.h"
#include "HTMLListAccessible.h" #include "HTMLListAccessible.h"
#include "HyperTextAccessibleWrap.h"
#include "nsAccessiblePivot.h" #include "nsAccessiblePivot.h"
#include "nsAccUtils.h" #include "nsAccUtils.h"
#include "nsARIAMap.h" #include "nsARIAMap.h"
@ -24,7 +25,6 @@
#include "nsHTMLSelectAccessible.h" #include "nsHTMLSelectAccessible.h"
#include "nsHTMLTableAccessibleWrap.h" #include "nsHTMLTableAccessibleWrap.h"
#include "nsHTMLTextAccessible.h" #include "nsHTMLTextAccessible.h"
#include "nsHyperTextAccessibleWrap.h"
#include "nsXFormsFormControlsAccessible.h" #include "nsXFormsFormControlsAccessible.h"
#include "nsXFormsWidgetsAccessible.h" #include "nsXFormsWidgetsAccessible.h"
#include "OuterDocAccessible.h" #include "OuterDocAccessible.h"
@ -205,7 +205,7 @@ nsAccessibilityService::CreateHyperTextAccessible(nsIContent* aContent,
nsIPresShell* aPresShell) nsIPresShell* aPresShell)
{ {
Accessible* accessible = Accessible* accessible =
new nsHyperTextAccessibleWrap(aContent, GetDocAccessible(aPresShell)); new HyperTextAccessibleWrap(aContent, GetDocAccessible(aPresShell));
NS_ADDREF(accessible); NS_ADDREF(accessible);
return accessible; return accessible;
} }
@ -1052,7 +1052,7 @@ nsAccessibilityService::GetOrCreateAccessible(nsINode* aNode,
return nsnull; return nsnull;
} }
newAcc = new nsHyperTextAccessibleWrap(content, docAcc); newAcc = new HyperTextAccessibleWrap(content, docAcc);
if (docAcc->BindToDocument(newAcc, aria::GetRoleMap(aNode))) if (docAcc->BindToDocument(newAcc, aria::GetRoleMap(aNode)))
return newAcc; return newAcc;
return nsnull; return nsnull;
@ -1227,7 +1227,7 @@ nsAccessibilityService::GetOrCreateAccessible(nsINode* aNode,
// other accessibles can point to it, or so that it can hold a state, etc. // other accessibles can point to it, or so that it can hold a state, etc.
if (isHTML) { if (isHTML) {
// Interesting HTML container which may have selectable text and/or embedded objects // Interesting HTML container which may have selectable text and/or embedded objects
newAcc = new nsHyperTextAccessibleWrap(content, docAcc); newAcc = new HyperTextAccessibleWrap(content, docAcc);
} }
else { // XUL, SVG, MathML etc. else { // XUL, SVG, MathML etc.
// Interesting generic non-HTML container // Interesting generic non-HTML container
@ -1657,7 +1657,7 @@ nsAccessibilityService::CreateHTMLAccessibleByMarkup(nsIFrame* aFrame,
nsRoleMapEntry* roleMapEntry = aria::GetRoleMap(aContent); nsRoleMapEntry* roleMapEntry = aria::GetRoleMap(aContent);
if (roleMapEntry && roleMapEntry->role != roles::NOTHING && if (roleMapEntry && roleMapEntry->role != roles::NOTHING &&
roleMapEntry->role != roles::LINK) { roleMapEntry->role != roles::LINK) {
Accessible* accessible = new nsHyperTextAccessibleWrap(aContent, aDoc); Accessible* accessible = new HyperTextAccessibleWrap(aContent, aDoc);
NS_IF_ADDREF(accessible); NS_IF_ADDREF(accessible);
return accessible; return accessible;
} }
@ -1690,7 +1690,7 @@ nsAccessibilityService::CreateHTMLAccessibleByMarkup(nsIFrame* aFrame,
tag == nsGkAtoms::h5 || tag == nsGkAtoms::h5 ||
tag == nsGkAtoms::h6 || tag == nsGkAtoms::h6 ||
tag == nsGkAtoms::q) { tag == nsGkAtoms::q) {
Accessible* accessible = new nsHyperTextAccessibleWrap(aContent, aDoc); Accessible* accessible = new HyperTextAccessibleWrap(aContent, aDoc);
NS_IF_ADDREF(accessible); NS_IF_ADDREF(accessible);
return accessible; return accessible;
} }

View File

@ -7,9 +7,9 @@
#include "nsAccessiblePivot.h" #include "nsAccessiblePivot.h"
#include "Accessible-inl.h" #include "Accessible-inl.h"
#include "nsAccUtils.h"
#include "nsHyperTextAccessible.h"
#include "DocAccessible.h" #include "DocAccessible.h"
#include "HyperTextAccessible.h"
#include "nsAccUtils.h"
#include "States.h" #include "States.h"
#include "nsArrayUtils.h" #include "nsArrayUtils.h"
@ -155,7 +155,7 @@ nsAccessiblePivot::SetTextRange(nsIAccessibleText* aTextAccessible,
(aStartOffset >= 0 || (aStartOffset != -1 && aEndOffset != -1)), (aStartOffset >= 0 || (aStartOffset != -1 && aEndOffset != -1)),
NS_ERROR_INVALID_ARG); NS_ERROR_INVALID_ARG);
nsRefPtr<nsHyperTextAccessible> newPosition = do_QueryObject(aTextAccessible); nsRefPtr<HyperTextAccessible> newPosition = do_QueryObject(aTextAccessible);
if (!newPosition || !IsRootDescendant(newPosition)) if (!newPosition || !IsRootDescendant(newPosition))
return NS_ERROR_INVALID_ARG; return NS_ERROR_INVALID_ARG;

View File

@ -6,10 +6,10 @@
#include "nsBaseWidgetAccessible.h" #include "nsBaseWidgetAccessible.h"
#include "Accessible-inl.h" #include "Accessible-inl.h"
#include "HyperTextAccessibleWrap.h"
#include "nsAccessibilityService.h" #include "nsAccessibilityService.h"
#include "nsAccUtils.h" #include "nsAccUtils.h"
#include "nsCoreUtils.h" #include "nsCoreUtils.h"
#include "nsHyperTextAccessibleWrap.h"
#include "Role.h" #include "Role.h"
#include "States.h" #include "States.h"

View File

@ -7,7 +7,7 @@
#define _nsBaseWidgetAccessible_H_ #define _nsBaseWidgetAccessible_H_
#include "AccessibleWrap.h" #include "AccessibleWrap.h"
#include "nsHyperTextAccessibleWrap.h" #include "HyperTextAccessibleWrap.h"
#include "nsIContent.h" #include "nsIContent.h"
/** /**

View File

@ -243,7 +243,7 @@ nsCaretAccessible::NormalSelectionChanged(nsISelection* aSelection)
return; // No selection return; // No selection
} }
nsHyperTextAccessible* textAcc = HyperTextAccessible* textAcc =
nsAccUtils::GetTextAccessibleFromSelection(aSelection); nsAccUtils::GetTextAccessibleFromSelection(aSelection);
if (!textAcc) if (!textAcc)
return; return;
@ -278,7 +278,7 @@ nsCaretAccessible::SpellcheckSelectionChanged(nsISelection* aSelection)
// misspelled word). If spellchecking is disabled (for example, // misspelled word). If spellchecking is disabled (for example,
// @spellcheck="false" on html:body) then we won't fire any event. // @spellcheck="false" on html:body) then we won't fire any event.
nsHyperTextAccessible* textAcc = HyperTextAccessible* textAcc =
nsAccUtils::GetTextAccessibleFromSelection(aSelection); nsAccUtils::GetTextAccessibleFromSelection(aSelection);
if (!textAcc) if (!textAcc)
return; return;

View File

@ -6,8 +6,8 @@
#ifndef __nsCaretAccessible_h__ #ifndef __nsCaretAccessible_h__
#define __nsCaretAccessible_h__ #define __nsCaretAccessible_h__
#include "HyperTextAccessible.h"
#include "NotificationController.h" #include "NotificationController.h"
#include "nsHyperTextAccessible.h"
#include "nsISelectionListener.h" #include "nsISelectionListener.h"
@ -118,7 +118,7 @@ private:
// If it was on a control, then its control's selection. Otherwise, it's for // If it was on a control, then its control's selection. Otherwise, it's for
// a document where the selection changed. // a document where the selection changed.
nsCOMPtr<nsIWeakReference> mLastUsedSelection; // Weak ref to nsISelection nsCOMPtr<nsIWeakReference> mLastUsedSelection; // Weak ref to nsISelection
nsRefPtr<nsHyperTextAccessible> mLastTextAccessible; nsRefPtr<HyperTextAccessible> mLastTextAccessible;
PRInt32 mLastCaretOffset; PRInt32 mLastCaretOffset;
mozilla::a11y::RootAccessible* mRootAccessible; mozilla::a11y::RootAccessible* mRootAccessible;

View File

@ -774,7 +774,7 @@ ARIAGridAccessible::GetSelectedColumnsArray(PRUint32* aColumnCount,
ARIAGridCellAccessible:: ARIAGridCellAccessible::
ARIAGridCellAccessible(nsIContent* aContent, DocAccessible* aDoc) : ARIAGridCellAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
@ -782,7 +782,7 @@ ARIAGridCellAccessible::
// nsISupports // nsISupports
NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridCellAccessible, NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridCellAccessible,
nsHyperTextAccessible, HyperTextAccessible,
nsIAccessibleTableCell) nsIAccessibleTableCell)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -956,7 +956,7 @@ ARIAGridCellAccessible::IsSelected(bool* aIsSelected)
void void
ARIAGridCellAccessible::ApplyARIAState(PRUint64* aState) const ARIAGridCellAccessible::ApplyARIAState(PRUint64* aState) const
{ {
nsHyperTextAccessibleWrap::ApplyARIAState(aState); HyperTextAccessibleWrap::ApplyARIAState(aState);
// Return if the gridcell has aria-selected="true". // Return if the gridcell has aria-selected="true".
if (*aState & states::SELECTED) if (*aState & states::SELECTED)
@ -982,7 +982,7 @@ ARIAGridCellAccessible::GetAttributesInternal(nsIPersistentProperties* aAttribut
if (IsDefunct()) if (IsDefunct())
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
nsresult rv = nsHyperTextAccessibleWrap::GetAttributesInternal(aAttributes); nsresult rv = HyperTextAccessibleWrap::GetAttributesInternal(aAttributes);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
// Expose "table-cell-index" attribute. // Expose "table-cell-index" attribute.

View File

@ -8,7 +8,7 @@
#include "nsIAccessibleTable.h" #include "nsIAccessibleTable.h"
#include "nsHyperTextAccessibleWrap.h" #include "HyperTextAccessibleWrap.h"
#include "TableAccessible.h" #include "TableAccessible.h"
#include "xpcAccessibleTable.h" #include "xpcAccessibleTable.h"
@ -88,7 +88,7 @@ protected:
/** /**
* Accessible for ARIA gridcell and rowheader/columnheader. * Accessible for ARIA gridcell and rowheader/columnheader.
*/ */
class ARIAGridCellAccessible : public nsHyperTextAccessibleWrap, class ARIAGridCellAccessible : public HyperTextAccessibleWrap,
public nsIAccessibleTableCell public nsIAccessibleTableCell
{ {
public: public:

View File

@ -2736,7 +2736,7 @@ Accessible::StartOffset()
{ {
NS_PRECONDITION(IsLink(), "StartOffset is called not on hyper link!"); NS_PRECONDITION(IsLink(), "StartOffset is called not on hyper link!");
nsHyperTextAccessible* hyperText = mParent ? mParent->AsHyperText() : nsnull; HyperTextAccessible* hyperText = mParent ? mParent->AsHyperText() : nsnull;
return hyperText ? hyperText->GetChildOffset(this) : 0; return hyperText ? hyperText->GetChildOffset(this) : 0;
} }
@ -2745,7 +2745,7 @@ Accessible::EndOffset()
{ {
NS_PRECONDITION(IsLink(), "EndOffset is called on not hyper link!"); NS_PRECONDITION(IsLink(), "EndOffset is called on not hyper link!");
nsHyperTextAccessible* hyperText = mParent ? mParent->AsHyperText() : nsnull; HyperTextAccessible* hyperText = mParent ? mParent->AsHyperText() : nsnull;
return hyperText ? (hyperText->GetChildOffset(this) + 1) : 0; return hyperText ? (hyperText->GetChildOffset(this) + 1) : 0;
} }

View File

@ -26,7 +26,7 @@ class AccGroupInfo;
class EmbeddedObjCollector; class EmbeddedObjCollector;
class KeyBinding; class KeyBinding;
class Accessible; class Accessible;
class nsHyperTextAccessible; class HyperTextAccessible;
class nsHTMLImageAccessible; class nsHTMLImageAccessible;
class nsHTMLImageMapAccessible; class nsHTMLImageMapAccessible;
struct nsRoleMapEntry; struct nsRoleMapEntry;
@ -244,7 +244,6 @@ public:
*/ */
virtual mozilla::a11y::GroupPos GroupPosition(); virtual mozilla::a11y::GroupPos GroupPosition();
/**
/** /**
* Used by ChildAtPoint() method to get direct or deepest child at point. * Used by ChildAtPoint() method to get direct or deepest child at point.
*/ */
@ -473,7 +472,7 @@ public:
DocAccessible* AsDoc(); DocAccessible* AsDoc();
inline bool IsHyperText() const { return mFlags & eHyperTextAccessible; } inline bool IsHyperText() const { return mFlags & eHyperTextAccessible; }
nsHyperTextAccessible* AsHyperText(); HyperTextAccessible* AsHyperText();
inline bool IsHTMLFileInput() const { return mFlags & eHTMLFileInputAccessible; } inline bool IsHTMLFileInput() const { return mFlags & eHTMLFileInputAccessible; }

View File

@ -78,7 +78,7 @@ static const PRUint32 kRelationAttrsLen = NS_ARRAY_LENGTH(kRelationAttrs);
DocAccessible:: DocAccessible::
DocAccessible(nsIDocument* aDocument, nsIContent* aRootContent, DocAccessible(nsIDocument* aDocument, nsIContent* aRootContent,
nsIPresShell* aPresShell) : nsIPresShell* aPresShell) :
nsHyperTextAccessibleWrap(aRootContent, this), HyperTextAccessibleWrap(aRootContent, this),
mDocument(aDocument), mScrollPositionChangedTicks(0), mDocument(aDocument), mScrollPositionChangedTicks(0),
mLoadState(eTreeConstructionPending), mLoadEventType(0), mLoadState(eTreeConstructionPending), mLoadEventType(0),
mVirtualCursor(nsnull), mVirtualCursor(nsnull),
@ -162,14 +162,13 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DocAccessible)
nsresult status; nsresult status;
if (!foundInterface) { if (!foundInterface) {
// HTML document accessible must inherit from nsHyperTextAccessible to get // HTML document accessible must inherit from HyperTextAccessible to get
// support text interfaces. XUL document accessible doesn't need this. // support text interfaces. XUL document accessible doesn't need this.
// However at some point we may push <body> to implement the interfaces and // However at some point we may push <body> to implement the interfaces and
// return DocAccessible to inherit from AccessibleWrap. // return DocAccessible to inherit from AccessibleWrap.
status = IsHyperText() ? status = IsHyperText() ?
nsHyperTextAccessible::QueryInterface(aIID, HyperTextAccessible::QueryInterface(aIID, (void**)&foundInterface) :
(void**)&foundInterface) :
Accessible::QueryInterface(aIID, (void**)&foundInterface); Accessible::QueryInterface(aIID, (void**)&foundInterface);
} else { } else {
NS_ADDREF(foundInterface); NS_ADDREF(foundInterface);
@ -180,8 +179,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DocAccessible)
return status; return status;
} }
NS_IMPL_ADDREF_INHERITED(DocAccessible, nsHyperTextAccessible) NS_IMPL_ADDREF_INHERITED(DocAccessible, HyperTextAccessible)
NS_IMPL_RELEASE_INHERITED(DocAccessible, nsHyperTextAccessible) NS_IMPL_RELEASE_INHERITED(DocAccessible, HyperTextAccessible)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// nsIAccessible // nsIAccessible
@ -531,7 +530,7 @@ DocAccessible::GetVirtualCursor(nsIAccessiblePivot** aVirtualCursor)
return NS_OK; return NS_OK;
} }
// nsHyperTextAccessible method // HyperTextAccessible method
already_AddRefed<nsIEditor> already_AddRefed<nsIEditor>
DocAccessible::GetEditor() const DocAccessible::GetEditor() const
{ {
@ -663,7 +662,7 @@ DocAccessible::Shutdown()
mNodeToAccessibleMap.Clear(); mNodeToAccessibleMap.Clear();
ClearCache(mAccessibleCache); ClearCache(mAccessibleCache);
nsHyperTextAccessibleWrap::Shutdown(); HyperTextAccessibleWrap::Shutdown();
GetAccService()->NotifyOfDocumentShutdown(kungFuDeathGripDoc); GetAccService()->NotifyOfDocumentShutdown(kungFuDeathGripDoc);
} }
@ -1305,7 +1304,7 @@ DocAccessible::HandleAccEvent(AccEvent* aEvent)
if (logging::IsEnabled(logging::eDocLoad)) if (logging::IsEnabled(logging::eDocLoad))
logging::DocLoadEventHandled(aEvent); logging::DocLoadEventHandled(aEvent);
return nsHyperTextAccessible::HandleAccEvent(aEvent); return HyperTextAccessible::HandleAccEvent(aEvent);
} }
#endif #endif
@ -1762,7 +1761,7 @@ DocAccessible::ProcessPendingEvent(AccEvent* aEvent)
{ {
PRUint32 eventType = aEvent->GetEventType(); PRUint32 eventType = aEvent->GetEventType();
if (eventType == nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED) { if (eventType == nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED) {
nsHyperTextAccessible* hyperText = aEvent->GetAccessible()->AsHyperText(); HyperTextAccessible* hyperText = aEvent->GetAccessible()->AsHyperText();
PRInt32 caretOffset; PRInt32 caretOffset;
if (hyperText && if (hyperText &&
NS_SUCCEEDED(hyperText->GetCaretOffset(&caretOffset))) { NS_SUCCEEDED(hyperText->GetCaretOffset(&caretOffset))) {

View File

@ -10,8 +10,8 @@
#include "nsIAccessibleDocument.h" #include "nsIAccessibleDocument.h"
#include "nsIAccessiblePivot.h" #include "nsIAccessiblePivot.h"
#include "HyperTextAccessibleWrap.h"
#include "nsEventShell.h" #include "nsEventShell.h"
#include "nsHyperTextAccessibleWrap.h"
#include "NotificationController.h" #include "NotificationController.h"
#include "nsClassHashtable.h" #include "nsClassHashtable.h"
@ -31,7 +31,7 @@ class nsAccessiblePivot;
const PRUint32 kDefaultCacheSize = 256; const PRUint32 kDefaultCacheSize = 256;
class DocAccessible : public nsHyperTextAccessibleWrap, class DocAccessible : public HyperTextAccessibleWrap,
public nsIAccessibleDocument, public nsIAccessibleDocument,
public nsIDocumentObserver, public nsIDocumentObserver,
public nsIObserver, public nsIObserver,
@ -91,7 +91,7 @@ public:
virtual void GetBoundsRect(nsRect& aRect, nsIFrame** aRelativeFrame); virtual void GetBoundsRect(nsRect& aRect, nsIFrame** aRelativeFrame);
// nsHyperTextAccessible // HyperTextAccessible
virtual already_AddRefed<nsIEditor> GetEditor() const; virtual already_AddRefed<nsIEditor> GetEditor() const;
// DocAccessible // DocAccessible

View File

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
#include "Accessible-inl.h" #include "Accessible-inl.h"
#include "nsAccessibilityService.h" #include "nsAccessibilityService.h"
@ -37,25 +37,26 @@
using namespace mozilla::a11y; using namespace mozilla::a11y;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// nsHyperTextAccessible // HyperTextAccessible
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
nsHyperTextAccessible:: HyperTextAccessible::
nsHyperTextAccessible(nsIContent* aNode, DocAccessible* aDoc) : HyperTextAccessible(nsIContent* aNode, DocAccessible* aDoc) :
AccessibleWrap(aNode, aDoc) AccessibleWrap(aNode, aDoc)
{ {
mFlags |= eHyperTextAccessible; mFlags |= eHyperTextAccessible;
} }
NS_IMPL_ADDREF_INHERITED(nsHyperTextAccessible, AccessibleWrap) NS_IMPL_ADDREF_INHERITED(HyperTextAccessible, AccessibleWrap)
NS_IMPL_RELEASE_INHERITED(nsHyperTextAccessible, AccessibleWrap) NS_IMPL_RELEASE_INHERITED(HyperTextAccessible, AccessibleWrap)
nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr) nsresult
HyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr)
{ {
*aInstancePtr = nsnull; *aInstancePtr = nsnull;
if (aIID.Equals(NS_GET_IID(nsHyperTextAccessible))) { if (aIID.Equals(NS_GET_IID(HyperTextAccessible))) {
*aInstancePtr = static_cast<nsHyperTextAccessible*>(this); *aInstancePtr = static_cast<HyperTextAccessible*>(this);
NS_ADDREF_THIS(); NS_ADDREF_THIS();
return NS_OK; return NS_OK;
} }
@ -86,7 +87,7 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt
} }
role role
nsHyperTextAccessible::NativeRole() HyperTextAccessible::NativeRole()
{ {
nsIAtom *tag = mContent->Tag(); nsIAtom *tag = mContent->Tag();
@ -127,7 +128,7 @@ nsHyperTextAccessible::NativeRole()
} }
PRUint64 PRUint64
nsHyperTextAccessible::NativeState() HyperTextAccessible::NativeState()
{ {
PRUint64 states = AccessibleWrap::NativeState(); PRUint64 states = AccessibleWrap::NativeState();
@ -147,8 +148,9 @@ nsHyperTextAccessible::NativeState()
} }
// Substring must be entirely within the same text node // Substring must be entirely within the same text node
nsIntRect nsHyperTextAccessible::GetBoundsForString(nsIFrame *aFrame, PRUint32 aStartRenderedOffset, nsIntRect
PRUint32 aEndRenderedOffset) HyperTextAccessible::GetBoundsForString(nsIFrame* aFrame, PRUint32 aStartRenderedOffset,
PRUint32 aEndRenderedOffset)
{ {
nsIntRect screenRect; nsIntRect screenRect;
NS_ENSURE_TRUE(aFrame, screenRect); NS_ENSURE_TRUE(aFrame, screenRect);
@ -215,11 +217,11 @@ nsIntRect nsHyperTextAccessible::GetBoundsForString(nsIFrame *aFrame, PRUint32 a
* Gets the specified text. * Gets the specified text.
*/ */
nsIFrame* nsIFrame*
nsHyperTextAccessible::GetPosAndText(PRInt32& aStartOffset, PRInt32& aEndOffset, HyperTextAccessible::GetPosAndText(PRInt32& aStartOffset, PRInt32& aEndOffset,
nsAString *aText, nsIFrame **aEndFrame, nsAString* aText, nsIFrame** aEndFrame,
nsIntRect *aBoundsRect, nsIntRect* aBoundsRect,
Accessible** aStartAcc, Accessible** aStartAcc,
Accessible** aEndAcc) Accessible** aEndAcc)
{ {
if (aStartOffset == nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT) { if (aStartOffset == nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT) {
aStartOffset = CharacterCount(); aStartOffset = CharacterCount();
@ -414,8 +416,8 @@ nsHyperTextAccessible::GetPosAndText(PRInt32& aStartOffset, PRInt32& aEndOffset,
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetText(PRInt32 aStartOffset, PRInt32 aEndOffset, HyperTextAccessible::GetText(PRInt32 aStartOffset, PRInt32 aEndOffset,
nsAString &aText) nsAString& aText)
{ {
aText.Truncate(); aText.Truncate();
@ -469,7 +471,8 @@ nsHyperTextAccessible::GetText(PRInt32 aStartOffset, PRInt32 aEndOffset,
/* /*
* Gets the character count. * Gets the character count.
*/ */
NS_IMETHODIMP nsHyperTextAccessible::GetCharacterCount(PRInt32 *aCharacterCount) NS_IMETHODIMP
HyperTextAccessible::GetCharacterCount(PRInt32* aCharacterCount)
{ {
NS_ENSURE_ARG_POINTER(aCharacterCount); NS_ENSURE_ARG_POINTER(aCharacterCount);
*aCharacterCount = 0; *aCharacterCount = 0;
@ -484,7 +487,8 @@ NS_IMETHODIMP nsHyperTextAccessible::GetCharacterCount(PRInt32 *aCharacterCount)
/* /*
* Gets the specified character. * Gets the specified character.
*/ */
NS_IMETHODIMP nsHyperTextAccessible::GetCharacterAtOffset(PRInt32 aOffset, PRUnichar *aCharacter) NS_IMETHODIMP
HyperTextAccessible::GetCharacterAtOffset(PRInt32 aOffset, PRUnichar* aCharacter)
{ {
NS_ENSURE_ARG_POINTER(aCharacter); NS_ENSURE_ARG_POINTER(aCharacter);
*aCharacter = nsnull; *aCharacter = nsnull;
@ -502,10 +506,10 @@ NS_IMETHODIMP nsHyperTextAccessible::GetCharacterAtOffset(PRInt32 aOffset, PRUni
} }
Accessible* Accessible*
nsHyperTextAccessible::DOMPointToHypertextOffset(nsINode *aNode, HyperTextAccessible::DOMPointToHypertextOffset(nsINode* aNode,
PRInt32 aNodeOffset, PRInt32 aNodeOffset,
PRInt32 *aHyperTextOffset, PRInt32* aHyperTextOffset,
bool aIsEndOffset) bool aIsEndOffset)
{ {
if (!aHyperTextOffset) if (!aHyperTextOffset)
return nsnull; return nsnull;
@ -637,9 +641,9 @@ nsHyperTextAccessible::DOMPointToHypertextOffset(nsINode *aNode,
} }
nsresult nsresult
nsHyperTextAccessible::HypertextOffsetToDOMPoint(PRInt32 aHTOffset, HyperTextAccessible::HypertextOffsetToDOMPoint(PRInt32 aHTOffset,
nsIDOMNode **aNode, nsIDOMNode** aNode,
PRInt32 *aOffset) PRInt32* aOffset)
{ {
nsCOMPtr<nsIDOMNode> endNode; nsCOMPtr<nsIDOMNode> endNode;
PRInt32 endOffset; PRInt32 endOffset;
@ -649,12 +653,12 @@ nsHyperTextAccessible::HypertextOffsetToDOMPoint(PRInt32 aHTOffset,
} }
nsresult nsresult
nsHyperTextAccessible::HypertextOffsetsToDOMRange(PRInt32 aStartHTOffset, HyperTextAccessible::HypertextOffsetsToDOMRange(PRInt32 aStartHTOffset,
PRInt32 aEndHTOffset, PRInt32 aEndHTOffset,
nsIDOMNode **aStartNode, nsIDOMNode** aStartNode,
PRInt32 *aStartOffset, PRInt32* aStartOffset,
nsIDOMNode **aEndNode, nsIDOMNode** aEndNode,
PRInt32 *aEndOffset) PRInt32* aEndOffset)
{ {
NS_ENSURE_ARG_POINTER(aStartNode); NS_ENSURE_ARG_POINTER(aStartNode);
*aStartNode = nsnull; *aStartNode = nsnull;
@ -725,13 +729,13 @@ nsHyperTextAccessible::HypertextOffsetsToDOMRange(PRInt32 aStartHTOffset,
} }
PRInt32 PRInt32
nsHyperTextAccessible::GetRelativeOffset(nsIPresShell *aPresShell, HyperTextAccessible::GetRelativeOffset(nsIPresShell* aPresShell,
nsIFrame *aFromFrame, nsIFrame* aFromFrame,
PRInt32 aFromOffset, PRInt32 aFromOffset,
Accessible* aFromAccessible, Accessible* aFromAccessible,
nsSelectionAmount aAmount, nsSelectionAmount aAmount,
nsDirection aDirection, nsDirection aDirection,
bool aNeedsStart) bool aNeedsStart)
{ {
const bool kIsJumpLinesOk = true; // okay to jump lines const bool kIsJumpLinesOk = true; // okay to jump lines
const bool kIsScrollViewAStop = false; // do not stop at scroll views const bool kIsScrollViewAStop = false; // do not stop at scroll views
@ -834,9 +838,9 @@ BOUNDARY_LINE_END From the line end before/at/after the offset to the ne
*/ */
nsresult nsresult
nsHyperTextAccessible::GetTextHelper(EGetTextType aType, AccessibleTextBoundary aBoundaryType, HyperTextAccessible::GetTextHelper(EGetTextType aType, AccessibleTextBoundary aBoundaryType,
PRInt32 aOffset, PRInt32 *aStartOffset, PRInt32 *aEndOffset, PRInt32 aOffset, PRInt32* aStartOffset, PRInt32* aEndOffset,
nsAString &aText) nsAString& aText)
{ {
aText.Truncate(); aText.Truncate();
@ -1017,8 +1021,10 @@ nsHyperTextAccessible::GetTextHelper(EGetTextType aType, AccessibleTextBoundary
* nsIAccessibleText impl. * nsIAccessibleText impl.
*/ */
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetTextBeforeOffset(PRInt32 aOffset, AccessibleTextBoundary aBoundaryType, HyperTextAccessible::GetTextBeforeOffset(PRInt32 aOffset,
PRInt32 *aStartOffset, PRInt32 *aEndOffset, nsAString & aText) AccessibleTextBoundary aBoundaryType,
PRInt32* aStartOffset,
PRInt32* aEndOffset, nsAString& aText)
{ {
if (aBoundaryType == BOUNDARY_CHAR) { if (aBoundaryType == BOUNDARY_CHAR) {
GetCharAt(aOffset, eGetBefore, aText, aStartOffset, aEndOffset); GetCharAt(aOffset, eGetBefore, aText, aStartOffset, aEndOffset);
@ -1029,8 +1035,10 @@ nsHyperTextAccessible::GetTextBeforeOffset(PRInt32 aOffset, AccessibleTextBounda
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetTextAtOffset(PRInt32 aOffset, AccessibleTextBoundary aBoundaryType, HyperTextAccessible::GetTextAtOffset(PRInt32 aOffset,
PRInt32 *aStartOffset, PRInt32 *aEndOffset, nsAString & aText) AccessibleTextBoundary aBoundaryType,
PRInt32* aStartOffset,
PRInt32* aEndOffset, nsAString& aText)
{ {
if (aBoundaryType == BOUNDARY_CHAR) { if (aBoundaryType == BOUNDARY_CHAR) {
GetCharAt(aOffset, eGetAt, aText, aStartOffset, aEndOffset); GetCharAt(aOffset, eGetAt, aText, aStartOffset, aEndOffset);
@ -1041,8 +1049,8 @@ nsHyperTextAccessible::GetTextAtOffset(PRInt32 aOffset, AccessibleTextBoundary a
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetTextAfterOffset(PRInt32 aOffset, AccessibleTextBoundary aBoundaryType, HyperTextAccessible::GetTextAfterOffset(PRInt32 aOffset, AccessibleTextBoundary aBoundaryType,
PRInt32 *aStartOffset, PRInt32 *aEndOffset, nsAString & aText) PRInt32* aStartOffset, PRInt32* aEndOffset, nsAString& aText)
{ {
if (aBoundaryType == BOUNDARY_CHAR) { if (aBoundaryType == BOUNDARY_CHAR) {
GetCharAt(aOffset, eGetAfter, aText, aStartOffset, aEndOffset); GetCharAt(aOffset, eGetAfter, aText, aStartOffset, aEndOffset);
@ -1058,11 +1066,11 @@ nsHyperTextAccessible::GetTextAfterOffset(PRInt32 aOffset, AccessibleTextBoundar
// out long rangeStartOffset, // out long rangeStartOffset,
// out long rangeEndOffset); // out long rangeEndOffset);
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetTextAttributes(bool aIncludeDefAttrs, HyperTextAccessible::GetTextAttributes(bool aIncludeDefAttrs,
PRInt32 aOffset, PRInt32 aOffset,
PRInt32 *aStartOffset, PRInt32* aStartOffset,
PRInt32 *aEndOffset, PRInt32* aEndOffset,
nsIPersistentProperties **aAttributes) nsIPersistentProperties** aAttributes)
{ {
// 1. Get each attribute and its ranges one after another. // 1. Get each attribute and its ranges one after another.
// 2. As we get each new attribute, we pass the current start and end offsets // 2. As we get each new attribute, we pass the current start and end offsets
@ -1134,7 +1142,7 @@ nsHyperTextAccessible::GetTextAttributes(bool aIncludeDefAttrs,
// nsIPersistentProperties // nsIPersistentProperties
// nsIAccessibleText::defaultTextAttributes // nsIAccessibleText::defaultTextAttributes
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetDefaultTextAttributes(nsIPersistentProperties **aAttributes) HyperTextAccessible::GetDefaultTextAttributes(nsIPersistentProperties** aAttributes)
{ {
NS_ENSURE_ARG_POINTER(aAttributes); NS_ENSURE_ARG_POINTER(aAttributes);
*aAttributes = nsnull; *aAttributes = nsnull;
@ -1154,7 +1162,7 @@ nsHyperTextAccessible::GetDefaultTextAttributes(nsIPersistentProperties **aAttri
} }
PRInt32 PRInt32
nsHyperTextAccessible::GetLevelInternal() HyperTextAccessible::GetLevelInternal()
{ {
nsIAtom *tag = mContent->Tag(); nsIAtom *tag = mContent->Tag();
if (tag == nsGkAtoms::h1) if (tag == nsGkAtoms::h1)
@ -1174,7 +1182,7 @@ nsHyperTextAccessible::GetLevelInternal()
} }
nsresult nsresult
nsHyperTextAccessible::GetAttributesInternal(nsIPersistentProperties *aAttributes) HyperTextAccessible::GetAttributesInternal(nsIPersistentProperties* aAttributes)
{ {
nsresult rv = AccessibleWrap::GetAttributesInternal(aAttributes); nsresult rv = AccessibleWrap::GetAttributesInternal(aAttributes);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
@ -1223,9 +1231,10 @@ nsHyperTextAccessible::GetAttributesInternal(nsIPersistentProperties *aAttribute
/* /*
* Given an offset, the x, y, width, and height values are filled appropriately. * Given an offset, the x, y, width, and height values are filled appropriately.
*/ */
NS_IMETHODIMP nsHyperTextAccessible::GetCharacterExtents(PRInt32 aOffset, PRInt32 *aX, PRInt32 *aY, NS_IMETHODIMP
PRInt32 *aWidth, PRInt32 *aHeight, HyperTextAccessible::GetCharacterExtents(PRInt32 aOffset, PRInt32* aX, PRInt32* aY,
PRUint32 aCoordType) PRInt32* aWidth, PRInt32* aHeight,
PRUint32 aCoordType)
{ {
return GetRangeExtents(aOffset, aOffset + 1, aX, aY, aWidth, aHeight, aCoordType); return GetRangeExtents(aOffset, aOffset + 1, aX, aY, aWidth, aHeight, aCoordType);
} }
@ -1233,10 +1242,11 @@ NS_IMETHODIMP nsHyperTextAccessible::GetCharacterExtents(PRInt32 aOffset, PRInt3
/* /*
* Given a start & end offset, the x, y, width, and height values are filled appropriately. * Given a start & end offset, the x, y, width, and height values are filled appropriately.
*/ */
NS_IMETHODIMP nsHyperTextAccessible::GetRangeExtents(PRInt32 aStartOffset, PRInt32 aEndOffset, NS_IMETHODIMP
PRInt32 *aX, PRInt32 *aY, HyperTextAccessible::GetRangeExtents(PRInt32 aStartOffset, PRInt32 aEndOffset,
PRInt32 *aWidth, PRInt32 *aHeight, PRInt32* aX, PRInt32* aY,
PRUint32 aCoordType) PRInt32* aWidth, PRInt32* aHeight,
PRUint32 aCoordType)
{ {
nsIntRect boundsRect; nsIntRect boundsRect;
nsIFrame *endFrameUnused; nsIFrame *endFrameUnused;
@ -1258,8 +1268,8 @@ NS_IMETHODIMP nsHyperTextAccessible::GetRangeExtents(PRInt32 aStartOffset, PRInt
* the screen or this widget's window depending on coords. * the screen or this widget's window depending on coords.
*/ */
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetOffsetAtPoint(PRInt32 aX, PRInt32 aY, HyperTextAccessible::GetOffsetAtPoint(PRInt32 aX, PRInt32 aY,
PRUint32 aCoordType, PRInt32 *aOffset) PRUint32 aCoordType, PRInt32* aOffset)
{ {
*aOffset = -1; *aOffset = -1;
@ -1339,7 +1349,7 @@ nsHyperTextAccessible::GetOffsetAtPoint(PRInt32 aX, PRInt32 aY,
// nsIAccessibleHyperText // nsIAccessibleHyperText
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetLinkCount(PRInt32 *aLinkCount) HyperTextAccessible::GetLinkCount(PRInt32* aLinkCount)
{ {
NS_ENSURE_ARG_POINTER(aLinkCount); NS_ENSURE_ARG_POINTER(aLinkCount);
*aLinkCount = 0; *aLinkCount = 0;
@ -1352,7 +1362,7 @@ nsHyperTextAccessible::GetLinkCount(PRInt32 *aLinkCount)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetLinkAt(PRInt32 aIndex, nsIAccessibleHyperLink** aLink) HyperTextAccessible::GetLinkAt(PRInt32 aIndex, nsIAccessibleHyperLink** aLink)
{ {
NS_ENSURE_ARG_POINTER(aLink); NS_ENSURE_ARG_POINTER(aLink);
*aLink = nsnull; *aLink = nsnull;
@ -1368,8 +1378,8 @@ nsHyperTextAccessible::GetLinkAt(PRInt32 aIndex, nsIAccessibleHyperLink** aLink)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetLinkIndex(nsIAccessibleHyperLink* aLink, HyperTextAccessible::GetLinkIndex(nsIAccessibleHyperLink* aLink,
PRInt32* aIndex) PRInt32* aIndex)
{ {
NS_ENSURE_ARG_POINTER(aLink); NS_ENSURE_ARG_POINTER(aLink);
@ -1382,8 +1392,7 @@ nsHyperTextAccessible::GetLinkIndex(nsIAccessibleHyperLink* aLink,
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetLinkIndexAtOffset(PRInt32 aOffset, HyperTextAccessible::GetLinkIndexAtOffset(PRInt32 aOffset, PRInt32* aLinkIndex)
PRInt32* aLinkIndex)
{ {
NS_ENSURE_ARG_POINTER(aLinkIndex); NS_ENSURE_ARG_POINTER(aLinkIndex);
*aLinkIndex = -1; // API says this magic value means 'not found' *aLinkIndex = -1; // API says this magic value means 'not found'
@ -1398,13 +1407,15 @@ nsHyperTextAccessible::GetLinkIndexAtOffset(PRInt32 aOffset,
/** /**
* nsIAccessibleEditableText impl. * nsIAccessibleEditableText impl.
*/ */
NS_IMETHODIMP nsHyperTextAccessible::SetAttributes(PRInt32 aStartPos, PRInt32 aEndPos, NS_IMETHODIMP
nsISupports *aAttributes) HyperTextAccessible::SetAttributes(PRInt32 aStartPos, PRInt32 aEndPos,
nsISupports* aAttributes)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
NS_IMETHODIMP nsHyperTextAccessible::SetTextContents(const nsAString &aText) NS_IMETHODIMP
HyperTextAccessible::SetTextContents(const nsAString& aText)
{ {
PRInt32 numChars = CharacterCount(); PRInt32 numChars = CharacterCount();
if (numChars == 0 || NS_SUCCEEDED(DeleteText(0, numChars))) { if (numChars == 0 || NS_SUCCEEDED(DeleteText(0, numChars))) {
@ -1414,7 +1425,7 @@ NS_IMETHODIMP nsHyperTextAccessible::SetTextContents(const nsAString &aText)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::InsertText(const nsAString &aText, PRInt32 aPosition) HyperTextAccessible::InsertText(const nsAString& aText, PRInt32 aPosition)
{ {
if (IsDefunct()) if (IsDefunct())
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -1431,7 +1442,7 @@ nsHyperTextAccessible::InsertText(const nsAString &aText, PRInt32 aPosition)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::CopyText(PRInt32 aStartPos, PRInt32 aEndPos) HyperTextAccessible::CopyText(PRInt32 aStartPos, PRInt32 aEndPos)
{ {
if (IsDefunct()) if (IsDefunct())
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -1446,7 +1457,7 @@ nsHyperTextAccessible::CopyText(PRInt32 aStartPos, PRInt32 aEndPos)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::CutText(PRInt32 aStartPos, PRInt32 aEndPos) HyperTextAccessible::CutText(PRInt32 aStartPos, PRInt32 aEndPos)
{ {
if (IsDefunct()) if (IsDefunct())
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -1461,7 +1472,7 @@ nsHyperTextAccessible::CutText(PRInt32 aStartPos, PRInt32 aEndPos)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::DeleteText(PRInt32 aStartPos, PRInt32 aEndPos) HyperTextAccessible::DeleteText(PRInt32 aStartPos, PRInt32 aEndPos)
{ {
if (IsDefunct()) if (IsDefunct())
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -1476,7 +1487,7 @@ nsHyperTextAccessible::DeleteText(PRInt32 aStartPos, PRInt32 aEndPos)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::PasteText(PRInt32 aPosition) HyperTextAccessible::PasteText(PRInt32 aPosition)
{ {
if (IsDefunct()) if (IsDefunct())
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -1491,13 +1502,13 @@ nsHyperTextAccessible::PasteText(PRInt32 aPosition)
} }
already_AddRefed<nsIEditor> already_AddRefed<nsIEditor>
nsHyperTextAccessible::GetEditor() const HyperTextAccessible::GetEditor() const
{ {
if (!mContent->HasFlag(NODE_IS_EDITABLE)) { if (!mContent->HasFlag(NODE_IS_EDITABLE)) {
// If we're inside an editable container, then return that container's editor // If we're inside an editable container, then return that container's editor
Accessible* ancestor = Parent(); Accessible* ancestor = Parent();
while (ancestor) { while (ancestor) {
nsHyperTextAccessible* hyperText = ancestor->AsHyperText(); HyperTextAccessible* hyperText = ancestor->AsHyperText();
if (hyperText) { if (hyperText) {
// Recursion will stop at container doc because it has its own impl // Recursion will stop at container doc because it has its own impl
// of GetEditor() // of GetEditor()
@ -1528,7 +1539,7 @@ nsHyperTextAccessible::GetEditor() const
*/ */
nsresult nsresult
nsHyperTextAccessible::SetSelectionRange(PRInt32 aStartPos, PRInt32 aEndPos) HyperTextAccessible::SetSelectionRange(PRInt32 aStartPos, PRInt32 aEndPos)
{ {
bool isFocusable = State() & states::FOCUSABLE; bool isFocusable = State() & states::FOCUSABLE;
@ -1581,7 +1592,7 @@ nsHyperTextAccessible::SetSelectionRange(PRInt32 aStartPos, PRInt32 aEndPos)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::SetCaretOffset(PRInt32 aCaretOffset) HyperTextAccessible::SetCaretOffset(PRInt32 aCaretOffset)
{ {
return SetSelectionRange(aCaretOffset, aCaretOffset); return SetSelectionRange(aCaretOffset, aCaretOffset);
} }
@ -1590,7 +1601,7 @@ nsHyperTextAccessible::SetCaretOffset(PRInt32 aCaretOffset)
* Gets the offset position of the caret (cursor). * Gets the offset position of the caret (cursor).
*/ */
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetCaretOffset(PRInt32 *aCaretOffset) HyperTextAccessible::GetCaretOffset(PRInt32* aCaretOffset)
{ {
NS_ENSURE_ARG_POINTER(aCaretOffset); NS_ENSURE_ARG_POINTER(aCaretOffset);
*aCaretOffset = -1; *aCaretOffset = -1;
@ -1647,7 +1658,7 @@ nsHyperTextAccessible::GetCaretOffset(PRInt32 *aCaretOffset)
} }
PRInt32 PRInt32
nsHyperTextAccessible::CaretLineNumber() HyperTextAccessible::CaretLineNumber()
{ {
// Provide the line number for the caret, relative to the // Provide the line number for the caret, relative to the
// currently focused node. Use a 1-based index // currently focused node. Use a 1-based index
@ -1714,15 +1725,15 @@ nsHyperTextAccessible::CaretLineNumber()
} }
already_AddRefed<nsFrameSelection> already_AddRefed<nsFrameSelection>
nsHyperTextAccessible::FrameSelection() HyperTextAccessible::FrameSelection()
{ {
nsIFrame* frame = GetFrame(); nsIFrame* frame = GetFrame();
return frame ? frame->GetFrameSelection() : nsnull; return frame ? frame->GetFrameSelection() : nsnull;
} }
void void
nsHyperTextAccessible::GetSelectionDOMRanges(PRInt16 aType, HyperTextAccessible::GetSelectionDOMRanges(PRInt16 aType,
nsTArray<nsRange*>* aRanges) nsTArray<nsRange*>* aRanges)
{ {
nsRefPtr<nsFrameSelection> frameSelection = FrameSelection(); nsRefPtr<nsFrameSelection> frameSelection = FrameSelection();
if (!frameSelection) if (!frameSelection)
@ -1765,7 +1776,7 @@ nsHyperTextAccessible::GetSelectionDOMRanges(PRInt16 aType,
* Gets the number of selected regions. * Gets the number of selected regions.
*/ */
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetSelectionCount(PRInt32* aSelectionCount) HyperTextAccessible::GetSelectionCount(PRInt32* aSelectionCount)
{ {
NS_ENSURE_ARG_POINTER(aSelectionCount); NS_ENSURE_ARG_POINTER(aSelectionCount);
*aSelectionCount = 0; *aSelectionCount = 0;
@ -1781,9 +1792,9 @@ nsHyperTextAccessible::GetSelectionCount(PRInt32* aSelectionCount)
* Gets the start and end offset of the specified selection. * Gets the start and end offset of the specified selection.
*/ */
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::GetSelectionBounds(PRInt32 aSelectionNum, HyperTextAccessible::GetSelectionBounds(PRInt32 aSelectionNum,
PRInt32* aStartOffset, PRInt32* aStartOffset,
PRInt32* aEndOffset) PRInt32* aEndOffset)
{ {
NS_ENSURE_ARG_POINTER(aStartOffset); NS_ENSURE_ARG_POINTER(aStartOffset);
NS_ENSURE_ARG_POINTER(aEndOffset); NS_ENSURE_ARG_POINTER(aEndOffset);
@ -1830,9 +1841,9 @@ nsHyperTextAccessible::GetSelectionBounds(PRInt32 aSelectionNum,
* Changes the start and end offset of the specified selection. * Changes the start and end offset of the specified selection.
*/ */
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::SetSelectionBounds(PRInt32 aSelectionNum, HyperTextAccessible::SetSelectionBounds(PRInt32 aSelectionNum,
PRInt32 aStartOffset, PRInt32 aStartOffset,
PRInt32 aEndOffset) PRInt32 aEndOffset)
{ {
nsRefPtr<nsFrameSelection> frameSelection = FrameSelection(); nsRefPtr<nsFrameSelection> frameSelection = FrameSelection();
NS_ENSURE_STATE(frameSelection); NS_ENSURE_STATE(frameSelection);
@ -1887,7 +1898,7 @@ nsHyperTextAccessible::SetSelectionBounds(PRInt32 aSelectionNum,
* Adds a selection bounded by the specified offsets. * Adds a selection bounded by the specified offsets.
*/ */
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::AddSelection(PRInt32 aStartOffset, PRInt32 aEndOffset) HyperTextAccessible::AddSelection(PRInt32 aStartOffset, PRInt32 aEndOffset)
{ {
nsRefPtr<nsFrameSelection> frameSelection = FrameSelection(); nsRefPtr<nsFrameSelection> frameSelection = FrameSelection();
NS_ENSURE_STATE(frameSelection); NS_ENSURE_STATE(frameSelection);
@ -1906,7 +1917,7 @@ nsHyperTextAccessible::AddSelection(PRInt32 aStartOffset, PRInt32 aEndOffset)
* Removes the specified selection. * Removes the specified selection.
*/ */
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::RemoveSelection(PRInt32 aSelectionNum) HyperTextAccessible::RemoveSelection(PRInt32 aSelectionNum)
{ {
nsRefPtr<nsFrameSelection> frameSelection = FrameSelection(); nsRefPtr<nsFrameSelection> frameSelection = FrameSelection();
NS_ENSURE_STATE(frameSelection); NS_ENSURE_STATE(frameSelection);
@ -1929,8 +1940,8 @@ nsHyperTextAccessible::RemoveSelection(PRInt32 aSelectionNum)
// scrollSubstringTo(in long startIndex, in long endIndex, // scrollSubstringTo(in long startIndex, in long endIndex,
// in unsigned long scrollType); // in unsigned long scrollType);
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::ScrollSubstringTo(PRInt32 aStartIndex, PRInt32 aEndIndex, HyperTextAccessible::ScrollSubstringTo(PRInt32 aStartIndex, PRInt32 aEndIndex,
PRUint32 aScrollType) PRUint32 aScrollType)
{ {
PRInt32 startOffset, endOffset; PRInt32 startOffset, endOffset;
nsCOMPtr<nsIDOMNode> startNode, endNode; nsCOMPtr<nsIDOMNode> startNode, endNode;
@ -1951,10 +1962,10 @@ nsHyperTextAccessible::ScrollSubstringTo(PRInt32 aStartIndex, PRInt32 aEndIndex,
// in unsigned long coordinateType, // in unsigned long coordinateType,
// in long x, in long y); // in long x, in long y);
NS_IMETHODIMP NS_IMETHODIMP
nsHyperTextAccessible::ScrollSubstringToPoint(PRInt32 aStartIndex, HyperTextAccessible::ScrollSubstringToPoint(PRInt32 aStartIndex,
PRInt32 aEndIndex, PRInt32 aEndIndex,
PRUint32 aCoordinateType, PRUint32 aCoordinateType,
PRInt32 aX, PRInt32 aY) PRInt32 aX, PRInt32 aY)
{ {
nsIFrame *frame = GetFrame(); nsIFrame *frame = GetFrame();
if (!frame) if (!frame)
@ -2023,7 +2034,7 @@ nsHyperTextAccessible::ScrollSubstringToPoint(PRInt32 aStartIndex,
// Accessible public // Accessible public
nsresult nsresult
nsHyperTextAccessible::GetNameInternal(nsAString& aName) HyperTextAccessible::GetNameInternal(nsAString& aName)
{ {
nsresult rv = AccessibleWrap::GetNameInternal(aName); nsresult rv = AccessibleWrap::GetNameInternal(aName);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
@ -2042,7 +2053,7 @@ nsHyperTextAccessible::GetNameInternal(nsAString& aName)
} }
void void
nsHyperTextAccessible::InvalidateChildren() HyperTextAccessible::InvalidateChildren()
{ {
mOffsets.Clear(); mOffsets.Clear();
@ -2050,7 +2061,7 @@ nsHyperTextAccessible::InvalidateChildren()
} }
bool bool
nsHyperTextAccessible::RemoveChild(Accessible* aAccessible) HyperTextAccessible::RemoveChild(Accessible* aAccessible)
{ {
PRInt32 childIndex = aAccessible->IndexInParent(); PRInt32 childIndex = aAccessible->IndexInParent();
PRInt32 count = mOffsets.Length() - childIndex; PRInt32 count = mOffsets.Length() - childIndex;
@ -2061,10 +2072,11 @@ nsHyperTextAccessible::RemoveChild(Accessible* aAccessible)
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// nsHyperTextAccessible public static // HyperTextAccessible public static
nsresult nsHyperTextAccessible::ContentToRenderedOffset(nsIFrame *aFrame, PRInt32 aContentOffset, nsresult
PRUint32 *aRenderedOffset) HyperTextAccessible::ContentToRenderedOffset(nsIFrame* aFrame, PRInt32 aContentOffset,
PRUint32* aRenderedOffset)
{ {
if (!aFrame) { if (!aFrame) {
// Current frame not rendered -- this can happen if text is set on // Current frame not rendered -- this can happen if text is set on
@ -2092,8 +2104,9 @@ nsresult nsHyperTextAccessible::ContentToRenderedOffset(nsIFrame *aFrame, PRInt3
return NS_OK; return NS_OK;
} }
nsresult nsHyperTextAccessible::RenderedToContentOffset(nsIFrame *aFrame, PRUint32 aRenderedOffset, nsresult
PRInt32 *aContentOffset) HyperTextAccessible::RenderedToContentOffset(nsIFrame* aFrame, PRUint32 aRenderedOffset,
PRInt32* aContentOffset)
{ {
*aContentOffset = 0; *aContentOffset = 0;
NS_ENSURE_TRUE(aFrame, NS_ERROR_FAILURE); NS_ENSURE_TRUE(aFrame, NS_ERROR_FAILURE);
@ -2118,12 +2131,12 @@ nsresult nsHyperTextAccessible::RenderedToContentOffset(nsIFrame *aFrame, PRUint
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// nsHyperTextAccessible public // HyperTextAccessible public
bool bool
nsHyperTextAccessible::GetCharAt(PRInt32 aOffset, EGetTextType aShift, HyperTextAccessible::GetCharAt(PRInt32 aOffset, EGetTextType aShift,
nsAString& aChar, PRInt32* aStartOffset, nsAString& aChar, PRInt32* aStartOffset,
PRInt32* aEndOffset) PRInt32* aEndOffset)
{ {
aChar.Truncate(); aChar.Truncate();
@ -2144,8 +2157,8 @@ nsHyperTextAccessible::GetCharAt(PRInt32 aOffset, EGetTextType aShift,
} }
PRInt32 PRInt32
nsHyperTextAccessible::GetChildOffset(PRUint32 aChildIndex, HyperTextAccessible::GetChildOffset(PRUint32 aChildIndex,
bool aInvalidateAfter) bool aInvalidateAfter)
{ {
if (aChildIndex == 0) { if (aChildIndex == 0) {
if (aInvalidateAfter) if (aInvalidateAfter)
@ -2175,7 +2188,7 @@ nsHyperTextAccessible::GetChildOffset(PRUint32 aChildIndex,
} }
PRInt32 PRInt32
nsHyperTextAccessible::GetChildIndexAtOffset(PRUint32 aOffset) HyperTextAccessible::GetChildIndexAtOffset(PRUint32 aOffset)
{ {
PRUint32 lastOffset = 0; PRUint32 lastOffset = 0;
PRUint32 offsetCount = mOffsets.Length(); PRUint32 offsetCount = mOffsets.Length();
@ -2216,14 +2229,14 @@ nsHyperTextAccessible::GetChildIndexAtOffset(PRUint32 aOffset)
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// nsHyperTextAccessible protected // HyperTextAccessible protected
nsresult nsresult
nsHyperTextAccessible::GetDOMPointByFrameOffset(nsIFrame* aFrame, HyperTextAccessible::GetDOMPointByFrameOffset(nsIFrame* aFrame,
PRInt32 aOffset, PRInt32 aOffset,
Accessible* aAccessible, Accessible* aAccessible,
nsIDOMNode** aNode, nsIDOMNode** aNode,
PRInt32* aNodeOffset) PRInt32* aNodeOffset)
{ {
NS_ENSURE_ARG(aAccessible); NS_ENSURE_ARG(aAccessible);
@ -2268,12 +2281,12 @@ nsHyperTextAccessible::GetDOMPointByFrameOffset(nsIFrame* aFrame,
return NS_OK; return NS_OK;
} }
// nsHyperTextAccessible // HyperTextAccessible
nsresult nsresult
nsHyperTextAccessible::RangeBoundToHypertextOffset(nsRange *aRange, HyperTextAccessible::RangeBoundToHypertextOffset(nsRange* aRange,
bool aIsStartBound, bool aIsStartBound,
bool aIsStartHTOffset, bool aIsStartHTOffset,
PRInt32 *aHTOffset) PRInt32* aHTOffset)
{ {
nsINode* node = nsnull; nsINode* node = nsnull;
PRInt32 nodeOffset = 0; PRInt32 nodeOffset = 0;
@ -2295,13 +2308,13 @@ nsHyperTextAccessible::RangeBoundToHypertextOffset(nsRange *aRange,
return NS_OK; return NS_OK;
} }
// nsHyperTextAccessible // HyperTextAccessible
nsresult nsresult
nsHyperTextAccessible::GetSpellTextAttribute(nsINode* aNode, HyperTextAccessible::GetSpellTextAttribute(nsINode* aNode,
PRInt32 aNodeOffset, PRInt32 aNodeOffset,
PRInt32 *aHTStartOffset, PRInt32* aHTStartOffset,
PRInt32 *aHTEndOffset, PRInt32* aHTEndOffset,
nsIPersistentProperties *aAttributes) nsIPersistentProperties* aAttributes)
{ {
nsTArray<nsRange*> ranges; nsTArray<nsRange*> ranges;
GetSelectionDOMRanges(nsISelectionController::SELECTION_SPELLCHECK, &ranges); GetSelectionDOMRanges(nsISelectionController::SELECTION_SPELLCHECK, &ranges);
@ -2372,7 +2385,7 @@ nsHyperTextAccessible::GetSpellTextAttribute(nsINode* aNode,
} }
bool bool
nsHyperTextAccessible::IsTextRole() HyperTextAccessible::IsTextRole()
{ {
if (mRoleMapEntry && if (mRoleMapEntry &&
(mRoleMapEntry->role == roles::GRAPHIC || (mRoleMapEntry->role == roles::GRAPHIC ||

View File

@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef _nsHyperTextAccessible_H_ #ifndef mozilla_a11y_HyperTextAccessible_h__
#define _nsHyperTextAccessible_H_ #define mozilla_a11y_HyperTextAccessible_h__
#include "nsIAccessibleText.h" #include "nsIAccessibleText.h"
#include "nsIAccessibleHyperText.h" #include "nsIAccessibleHyperText.h"
@ -35,14 +35,14 @@ const PRUnichar kForcedNewLineChar = '\n';
/** /**
* Special Accessible that knows how contain both text and embedded objects * Special Accessible that knows how contain both text and embedded objects
*/ */
class nsHyperTextAccessible : public AccessibleWrap, class HyperTextAccessible : public AccessibleWrap,
public nsIAccessibleText, public nsIAccessibleText,
public nsIAccessibleHyperText, public nsIAccessibleHyperText,
public nsIAccessibleEditableText public nsIAccessibleEditableText
{ {
public: public:
nsHyperTextAccessible(nsIContent* aContent, DocAccessible* aDoc); HyperTextAccessible(nsIContent* aContent, DocAccessible* aDoc);
virtual ~nsHyperTextAccessible() { } virtual ~HyperTextAccessible() { }
NS_DECL_ISUPPORTS_INHERITED NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIACCESSIBLETEXT NS_DECL_NSIACCESSIBLETEXT
@ -60,7 +60,7 @@ public:
virtual void InvalidateChildren(); virtual void InvalidateChildren();
virtual bool RemoveChild(Accessible* aAccessible); virtual bool RemoveChild(Accessible* aAccessible);
// nsHyperTextAccessible (static helper method) // HyperTextAccessible (static helper method)
// Convert content offset to rendered text offset // Convert content offset to rendered text offset
static nsresult ContentToRenderedOffset(nsIFrame *aFrame, PRInt32 aContentOffset, static nsresult ContentToRenderedOffset(nsIFrame *aFrame, PRInt32 aContentOffset,
@ -107,7 +107,7 @@ public:
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// nsHyperTextAccessible: DOM point to text offset conversions. // HyperTextAccessible: DOM point to text offset conversions.
/** /**
* Turn a DOM Node and offset into a character offset into this hypertext. * Turn a DOM Node and offset into a character offset into this hypertext.
@ -121,7 +121,7 @@ public:
* if >=0 and aNode is text, this represents a char offset * if >=0 and aNode is text, this represents a char offset
* if >=0 and aNode is not text, this represents a child node offset * if >=0 and aNode is not text, this represents a child node offset
* @param aResultOffset - the character offset into the current * @param aResultOffset - the character offset into the current
* nsHyperTextAccessible * HyperTextAccessible
* @param aIsEndOffset - if true, then then this offset is not inclusive. The character * @param aIsEndOffset - if true, then then this offset is not inclusive. The character
* indicated by the offset returned is at [offset - 1]. This means * indicated by the offset returned is at [offset - 1]. This means
* if the passed-in offset is really in a descendant, then the offset returned * if the passed-in offset is really in a descendant, then the offset returned
@ -131,7 +131,7 @@ public:
* descendant, then the returned offset will be on the relevant embedded object char. * descendant, then the returned offset will be on the relevant embedded object char.
* *
* @return the accessible child which contained the offset, if * @return the accessible child which contained the offset, if
* it is within the current nsHyperTextAccessible, * it is within the current HyperTextAccessible,
* otherwise nsnull * otherwise nsnull
*/ */
Accessible* DOMPointToHypertextOffset(nsINode *aNode, Accessible* DOMPointToHypertextOffset(nsINode *aNode,
@ -261,7 +261,7 @@ public:
virtual already_AddRefed<nsIEditor> GetEditor() const; virtual already_AddRefed<nsIEditor> GetEditor() const;
protected: protected:
// nsHyperTextAccessible // HyperTextAccessible
/** /**
* Transform magic offset into text offset. * Transform magic offset into text offset.
@ -410,19 +410,19 @@ private:
nsTArray<PRUint32> mOffsets; nsTArray<PRUint32> mOffsets;
}; };
NS_DEFINE_STATIC_IID_ACCESSOR(nsHyperTextAccessible, NS_DEFINE_STATIC_IID_ACCESSOR(HyperTextAccessible,
NS_HYPERTEXTACCESSIBLE_IMPL_CID) NS_HYPERTEXTACCESSIBLE_IMPL_CID)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Accessible downcasting method // Accessible downcasting method
inline nsHyperTextAccessible* inline HyperTextAccessible*
Accessible::AsHyperText() Accessible::AsHyperText()
{ {
return mFlags & eHyperTextAccessible ? return mFlags & eHyperTextAccessible ?
static_cast<nsHyperTextAccessible*>(this) : nsnull; static_cast<HyperTextAccessible*>(this) : nsnull;
} }
#endif // _nsHyperTextAccessible_H_ #endif

View File

@ -20,10 +20,12 @@ CPPSRCS = \
ARIAGridAccessible.cpp \ ARIAGridAccessible.cpp \
DocAccessible.cpp \ DocAccessible.cpp \
FormControlAccessible.cpp \ FormControlAccessible.cpp \
HyperTextAccessible.cpp \
OuterDocAccessible.cpp \ OuterDocAccessible.cpp \
RootAccessible.cpp \ RootAccessible.cpp \
TextLeafAccessible.cpp \ TextLeafAccessible.cpp \
$(NULL) $(NULL)
EXPORTS_NAMESPACES = mozilla/a11y EXPORTS_NAMESPACES = mozilla/a11y
EXPORTS_mozilla/a11y = \ EXPORTS_mozilla/a11y = \

View File

@ -204,7 +204,7 @@ HTMLRadioButtonAccessible::GetPositionAndSizeInternal(PRInt32* aPosInSet,
HTMLButtonAccessible:: HTMLButtonAccessible::
HTMLButtonAccessible(nsIContent* aContent, DocAccessible* aDoc) : HTMLButtonAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
@ -237,7 +237,7 @@ HTMLButtonAccessible::DoAction(PRUint8 aIndex)
PRUint64 PRUint64
HTMLButtonAccessible::State() HTMLButtonAccessible::State()
{ {
PRUint64 state = nsHyperTextAccessibleWrap::State(); PRUint64 state = HyperTextAccessibleWrap::State();
if (state == states::DEFUNCT) if (state == states::DEFUNCT)
return state; return state;
@ -256,7 +256,7 @@ HTMLButtonAccessible::State()
PRUint64 PRUint64
HTMLButtonAccessible::NativeState() HTMLButtonAccessible::NativeState()
{ {
PRUint64 state = nsHyperTextAccessibleWrap::NativeState(); PRUint64 state = HyperTextAccessibleWrap::NativeState();
nsEventStates elmState = mContent->AsElement()->State(); nsEventStates elmState = mContent->AsElement()->State();
if (elmState.HasState(NS_EVENT_STATE_DEFAULT)) if (elmState.HasState(NS_EVENT_STATE_DEFAULT))
@ -320,13 +320,13 @@ HTMLButtonAccessible::IsWidget() const
HTMLTextFieldAccessible:: HTMLTextFieldAccessible::
HTMLTextFieldAccessible(nsIContent* aContent, DocAccessible* aDoc) : HTMLTextFieldAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
NS_IMPL_ISUPPORTS_INHERITED3(HTMLTextFieldAccessible, NS_IMPL_ISUPPORTS_INHERITED3(HTMLTextFieldAccessible,
Accessible, Accessible,
nsHyperTextAccessible, HyperTextAccessible,
nsIAccessibleText, nsIAccessibleText,
nsIAccessibleEditableText) nsIAccessibleEditableText)
@ -393,7 +393,7 @@ HTMLTextFieldAccessible::Value(nsString& aValue)
void void
HTMLTextFieldAccessible::ApplyARIAState(PRUint64* aState) const HTMLTextFieldAccessible::ApplyARIAState(PRUint64* aState) const
{ {
nsHyperTextAccessibleWrap::ApplyARIAState(aState); HyperTextAccessibleWrap::ApplyARIAState(aState);
aria::MapToState(aria::eARIAAutoComplete, mContent->AsElement(), aState); aria::MapToState(aria::eARIAAutoComplete, mContent->AsElement(), aState);
} }
@ -401,7 +401,7 @@ HTMLTextFieldAccessible::ApplyARIAState(PRUint64* aState) const
PRUint64 PRUint64
HTMLTextFieldAccessible::State() HTMLTextFieldAccessible::State()
{ {
PRUint64 state = nsHyperTextAccessibleWrap::State(); PRUint64 state = HyperTextAccessibleWrap::State();
if (state & states::DEFUNCT) if (state & states::DEFUNCT)
return state; return state;
@ -420,7 +420,7 @@ HTMLTextFieldAccessible::State()
PRUint64 PRUint64
HTMLTextFieldAccessible::NativeState() HTMLTextFieldAccessible::NativeState()
{ {
PRUint64 state = nsHyperTextAccessibleWrap::NativeState(); PRUint64 state = HyperTextAccessibleWrap::NativeState();
// can be focusable, focused, protected. readonly, unavailable, selected // can be focusable, focused, protected. readonly, unavailable, selected
if (mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::type, if (mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::type,
@ -557,7 +557,7 @@ HTMLTextFieldAccessible::ContainerWidget() const
HTMLFileInputAccessible:: HTMLFileInputAccessible::
HTMLFileInputAccessible(nsIContent* aContent, DocAccessible* aDoc) : HTMLFileInputAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
mFlags |= eHTMLFileInputAccessible; mFlags |= eHTMLFileInputAccessible;
} }
@ -573,7 +573,7 @@ HTMLFileInputAccessible::NativeRole()
nsresult nsresult
HTMLFileInputAccessible::HandleAccEvent(AccEvent* aEvent) HTMLFileInputAccessible::HandleAccEvent(AccEvent* aEvent)
{ {
nsresult rv = nsHyperTextAccessibleWrap::HandleAccEvent(aEvent); nsresult rv = HyperTextAccessibleWrap::HandleAccEvent(aEvent);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
// Redirect state change events for inherited states to child controls. Note, // Redirect state change events for inherited states to child controls. Note,
@ -612,7 +612,7 @@ HTMLFileInputAccessible::HandleAccEvent(AccEvent* aEvent)
HTMLGroupboxAccessible:: HTMLGroupboxAccessible::
HTMLGroupboxAccessible(nsIContent* aContent, DocAccessible* aDoc) : HTMLGroupboxAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
@ -658,7 +658,7 @@ HTMLGroupboxAccessible::GetNameInternal(nsAString& aName)
Relation Relation
HTMLGroupboxAccessible::RelationByType(PRUint32 aType) HTMLGroupboxAccessible::RelationByType(PRUint32 aType)
{ {
Relation rel = nsHyperTextAccessibleWrap::RelationByType(aType); Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
// No override for label, so use <legend> for this <fieldset> // No override for label, so use <legend> for this <fieldset>
if (aType == nsIAccessibleRelation::RELATION_LABELLED_BY) if (aType == nsIAccessibleRelation::RELATION_LABELLED_BY)
rel.AppendTarget(mDoc, GetLegend()); rel.AppendTarget(mDoc, GetLegend());
@ -672,14 +672,14 @@ HTMLGroupboxAccessible::RelationByType(PRUint32 aType)
HTMLLegendAccessible:: HTMLLegendAccessible::
HTMLLegendAccessible(nsIContent* aContent, DocAccessible* aDoc) : HTMLLegendAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
Relation Relation
HTMLLegendAccessible::RelationByType(PRUint32 aType) HTMLLegendAccessible::RelationByType(PRUint32 aType)
{ {
Relation rel = nsHyperTextAccessibleWrap::RelationByType(aType); Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
if (aType != nsIAccessibleRelation::RELATION_LABEL_FOR) if (aType != nsIAccessibleRelation::RELATION_LABEL_FOR)
return rel; return rel;
@ -702,14 +702,14 @@ HTMLLegendAccessible::NativeRole()
HTMLFigureAccessible:: HTMLFigureAccessible::
HTMLFigureAccessible(nsIContent* aContent, DocAccessible* aDoc) : HTMLFigureAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
nsresult nsresult
HTMLFigureAccessible::GetAttributesInternal(nsIPersistentProperties* aAttributes) HTMLFigureAccessible::GetAttributesInternal(nsIPersistentProperties* aAttributes)
{ {
nsresult rv = nsHyperTextAccessibleWrap::GetAttributesInternal(aAttributes); nsresult rv = HyperTextAccessibleWrap::GetAttributesInternal(aAttributes);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
// Expose figure xml-role. // Expose figure xml-role.
@ -727,7 +727,7 @@ HTMLFigureAccessible::NativeRole()
nsresult nsresult
HTMLFigureAccessible::GetNameInternal(nsAString& aName) HTMLFigureAccessible::GetNameInternal(nsAString& aName)
{ {
nsresult rv = nsHyperTextAccessibleWrap::GetNameInternal(aName); nsresult rv = HyperTextAccessibleWrap::GetNameInternal(aName);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
if (!aName.IsEmpty()) if (!aName.IsEmpty())
@ -745,7 +745,7 @@ HTMLFigureAccessible::GetNameInternal(nsAString& aName)
Relation Relation
HTMLFigureAccessible::RelationByType(PRUint32 aType) HTMLFigureAccessible::RelationByType(PRUint32 aType)
{ {
Relation rel = nsHyperTextAccessibleWrap::RelationByType(aType); Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
if (aType == nsIAccessibleRelation::RELATION_LABELLED_BY) if (aType == nsIAccessibleRelation::RELATION_LABELLED_BY)
rel.AppendTarget(mDoc, Caption()); rel.AppendTarget(mDoc, Caption());
@ -772,7 +772,7 @@ HTMLFigureAccessible::Caption() const
HTMLFigcaptionAccessible:: HTMLFigcaptionAccessible::
HTMLFigcaptionAccessible(nsIContent* aContent, DocAccessible* aDoc) : HTMLFigcaptionAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
@ -785,7 +785,7 @@ HTMLFigcaptionAccessible::NativeRole()
Relation Relation
HTMLFigcaptionAccessible::RelationByType(PRUint32 aType) HTMLFigcaptionAccessible::RelationByType(PRUint32 aType)
{ {
Relation rel = nsHyperTextAccessibleWrap::RelationByType(aType); Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
if (aType != nsIAccessibleRelation::RELATION_LABEL_FOR) if (aType != nsIAccessibleRelation::RELATION_LABEL_FOR)
return rel; return rel;

View File

@ -7,7 +7,7 @@
#define MOZILLA_A11Y_HTMLFormControlAccessible_H_ #define MOZILLA_A11Y_HTMLFormControlAccessible_H_
#include "FormControlAccessible.h" #include "FormControlAccessible.h"
#include "nsHyperTextAccessibleWrap.h" #include "HyperTextAccessibleWrap.h"
namespace mozilla { namespace mozilla {
namespace a11y { namespace a11y {
@ -64,7 +64,7 @@ public:
* Accessible for HTML input@type="button", @type="submit", @type="image" * Accessible for HTML input@type="button", @type="submit", @type="image"
* and HTML button elements. * and HTML button elements.
*/ */
class HTMLButtonAccessible : public nsHyperTextAccessibleWrap class HTMLButtonAccessible : public HyperTextAccessibleWrap
{ {
public: public:
@ -93,7 +93,7 @@ public:
/** /**
* Accessible for HTML input@type="text" element. * Accessible for HTML input@type="text" element.
*/ */
class HTMLTextFieldAccessible : public nsHyperTextAccessibleWrap class HTMLTextFieldAccessible : public HyperTextAccessibleWrap
{ {
public: public:
@ -107,7 +107,7 @@ public:
NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName); NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
NS_IMETHOD DoAction(PRUint8 index); NS_IMETHOD DoAction(PRUint8 index);
// nsHyperTextAccessible // HyperTextAccessible
virtual already_AddRefed<nsIEditor> GetEditor() const; virtual already_AddRefed<nsIEditor> GetEditor() const;
// Accessible // Accessible
@ -130,7 +130,7 @@ public:
/** /**
* Accessible for input@type="file" element. * Accessible for input@type="file" element.
*/ */
class HTMLFileInputAccessible : public nsHyperTextAccessibleWrap class HTMLFileInputAccessible : public HyperTextAccessibleWrap
{ {
public: public:
HTMLFileInputAccessible(nsIContent* aContent, DocAccessible* aDoc); HTMLFileInputAccessible(nsIContent* aContent, DocAccessible* aDoc);
@ -143,7 +143,7 @@ public:
/** /**
* Accessible for HTML fieldset element. * Accessible for HTML fieldset element.
*/ */
class HTMLGroupboxAccessible : public nsHyperTextAccessibleWrap class HTMLGroupboxAccessible : public HyperTextAccessibleWrap
{ {
public: public:
HTMLGroupboxAccessible(nsIContent* aContent, DocAccessible* aDoc); HTMLGroupboxAccessible(nsIContent* aContent, DocAccessible* aDoc);
@ -161,7 +161,7 @@ protected:
/** /**
* Accessible for HTML legend element. * Accessible for HTML legend element.
*/ */
class HTMLLegendAccessible : public nsHyperTextAccessibleWrap class HTMLLegendAccessible : public HyperTextAccessibleWrap
{ {
public: public:
HTMLLegendAccessible(nsIContent* aContent, DocAccessible* aDoc); HTMLLegendAccessible(nsIContent* aContent, DocAccessible* aDoc);
@ -174,7 +174,7 @@ public:
/** /**
* Accessible for HTML5 figure element. * Accessible for HTML5 figure element.
*/ */
class HTMLFigureAccessible : public nsHyperTextAccessibleWrap class HTMLFigureAccessible : public HyperTextAccessibleWrap
{ {
public: public:
HTMLFigureAccessible(nsIContent* aContent, DocAccessible* aDoc); HTMLFigureAccessible(nsIContent* aContent, DocAccessible* aDoc);
@ -193,7 +193,7 @@ protected:
/** /**
* Accessible for HTML5 figcaption element. * Accessible for HTML5 figcaption element.
*/ */
class HTMLFigcaptionAccessible : public nsHyperTextAccessibleWrap class HTMLFigcaptionAccessible : public HyperTextAccessibleWrap
{ {
public: public:
HTMLFigcaptionAccessible(nsIContent* aContent, DocAccessible* aDoc); HTMLFigcaptionAccessible(nsIContent* aContent, DocAccessible* aDoc);

View File

@ -20,7 +20,7 @@ using namespace mozilla::a11y;
// HTMLListAccessible // HTMLListAccessible
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS_INHERITED0(HTMLListAccessible, nsHyperTextAccessible) NS_IMPL_ISUPPORTS_INHERITED0(HTMLListAccessible, HyperTextAccessible)
role role
HTMLListAccessible::NativeRole() HTMLListAccessible::NativeRole()
@ -34,7 +34,7 @@ HTMLListAccessible::NativeRole()
PRUint64 PRUint64
HTMLListAccessible::NativeState() HTMLListAccessible::NativeState()
{ {
return nsHyperTextAccessibleWrap::NativeState() | states::READONLY; return HyperTextAccessibleWrap::NativeState() | states::READONLY;
} }
@ -44,7 +44,7 @@ HTMLListAccessible::NativeState()
HTMLLIAccessible:: HTMLLIAccessible::
HTMLLIAccessible(nsIContent* aContent, DocAccessible* aDoc) : HTMLLIAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc), mBullet(nsnull) HyperTextAccessibleWrap(aContent, aDoc), mBullet(nsnull)
{ {
mFlags |= eHTMLListItemAccessible; mFlags |= eHTMLListItemAccessible;
@ -56,14 +56,14 @@ HTMLLIAccessible::
} }
} }
NS_IMPL_ISUPPORTS_INHERITED0(HTMLLIAccessible, nsHyperTextAccessible) NS_IMPL_ISUPPORTS_INHERITED0(HTMLLIAccessible, HyperTextAccessible)
void void
HTMLLIAccessible::Shutdown() HTMLLIAccessible::Shutdown()
{ {
mBullet = nsnull; mBullet = nsnull;
nsHyperTextAccessibleWrap::Shutdown(); HyperTextAccessibleWrap::Shutdown();
} }
role role
@ -78,7 +78,7 @@ HTMLLIAccessible::NativeRole()
PRUint64 PRUint64
HTMLLIAccessible::NativeState() HTMLLIAccessible::NativeState()
{ {
return nsHyperTextAccessibleWrap::NativeState() | states::READONLY; return HyperTextAccessibleWrap::NativeState() | states::READONLY;
} }
NS_IMETHODIMP NS_IMETHODIMP

View File

@ -7,7 +7,7 @@
#ifndef mozilla_a11y_HTMLListAccessible_h__ #ifndef mozilla_a11y_HTMLListAccessible_h__
#define mozilla_a11y_HTMLListAccessible_h__ #define mozilla_a11y_HTMLListAccessible_h__
#include "nsHyperTextAccessibleWrap.h" #include "HyperTextAccessibleWrap.h"
#include "nsBaseWidgetAccessible.h" #include "nsBaseWidgetAccessible.h"
namespace mozilla { namespace mozilla {
@ -18,11 +18,11 @@ class HTMLListBulletAccessible;
/** /**
* Used for HTML list (like HTML ul). * Used for HTML list (like HTML ul).
*/ */
class HTMLListAccessible : public nsHyperTextAccessibleWrap class HTMLListAccessible : public HyperTextAccessibleWrap
{ {
public: public:
HTMLListAccessible(nsIContent* aContent, DocAccessible* aDoc) : HTMLListAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) { } HyperTextAccessibleWrap(aContent, aDoc) { }
virtual ~HTMLListAccessible() { } virtual ~HTMLListAccessible() { }
// nsISupports // nsISupports
@ -37,7 +37,7 @@ public:
/** /**
* Used for HTML list item (e.g. HTML li). * Used for HTML list item (e.g. HTML li).
*/ */
class HTMLLIAccessible : public nsHyperTextAccessibleWrap class HTMLLIAccessible : public HyperTextAccessibleWrap
{ {
public: public:
HTMLLIAccessible(nsIContent* aContent, DocAccessible* aDoc); HTMLLIAccessible(nsIContent* aContent, DocAccessible* aDoc);

View File

@ -26,11 +26,6 @@ CPPSRCS = \
nsHTMLSelectAccessible.cpp \ nsHTMLSelectAccessible.cpp \
nsHTMLTableAccessible.cpp \ nsHTMLTableAccessible.cpp \
nsHTMLTextAccessible.cpp \ nsHTMLTextAccessible.cpp \
nsHyperTextAccessible.cpp \
$(NULL)
EXPORTS = \
nsHyperTextAccessible.h \
$(NULL) $(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib. # we don't want the shared lib, but we want to force the creation of a static lib.

View File

@ -11,7 +11,7 @@ using namespace mozilla::a11y;
nsHTMLCanvasAccessible:: nsHTMLCanvasAccessible::
nsHTMLCanvasAccessible(nsIContent* aContent, DocAccessible* aDoc) : nsHTMLCanvasAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessible(aContent, aDoc) HyperTextAccessible(aContent, aDoc)
{ {
} }

View File

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
#ifndef _nsHTMLCanvasAccessible_H_ #ifndef _nsHTMLCanvasAccessible_H_
#define _nsHTMLCanvasAccessible_H_ #define _nsHTMLCanvasAccessible_H_
@ -11,7 +11,7 @@
/** /**
* HTML canvas accessible (html:canvas). * HTML canvas accessible (html:canvas).
*/ */
class nsHTMLCanvasAccessible : public nsHyperTextAccessible class nsHTMLCanvasAccessible : public HyperTextAccessible
{ {
public: public:
nsHTMLCanvasAccessible(nsIContent* aContent, DocAccessible* aDoc); nsHTMLCanvasAccessible(nsIContent* aContent, DocAccessible* aDoc);

View File

@ -22,12 +22,12 @@ using namespace mozilla::a11y;
nsHTMLLinkAccessible:: nsHTMLLinkAccessible::
nsHTMLLinkAccessible(nsIContent* aContent, DocAccessible* aDoc) : nsHTMLLinkAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
// Expose nsIAccessibleHyperLink unconditionally // Expose nsIAccessibleHyperLink unconditionally
NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLLinkAccessible, nsHyperTextAccessibleWrap, NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLLinkAccessible, HyperTextAccessibleWrap,
nsIAccessibleHyperLink) nsIAccessibleHyperLink)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -42,7 +42,7 @@ nsHTMLLinkAccessible::NativeRole()
PRUint64 PRUint64
nsHTMLLinkAccessible::NativeState() nsHTMLLinkAccessible::NativeState()
{ {
PRUint64 states = nsHyperTextAccessibleWrap::NativeState(); PRUint64 states = HyperTextAccessibleWrap::NativeState();
states &= ~states::READONLY; states &= ~states::READONLY;
@ -77,7 +77,7 @@ nsHTMLLinkAccessible::Value(nsString& aValue)
{ {
aValue.Truncate(); aValue.Truncate();
nsHyperTextAccessible::Value(aValue); HyperTextAccessible::Value(aValue);
if (aValue.IsEmpty()) if (aValue.IsEmpty())
nsContentUtils::GetLinkLocation(mContent->AsElement(), aValue); nsContentUtils::GetLinkLocation(mContent->AsElement(), aValue);
} }
@ -85,7 +85,7 @@ nsHTMLLinkAccessible::Value(nsString& aValue)
PRUint8 PRUint8
nsHTMLLinkAccessible::ActionCount() nsHTMLLinkAccessible::ActionCount()
{ {
return IsLinked() ? 1 : nsHyperTextAccessible::ActionCount(); return IsLinked() ? 1 : HyperTextAccessible::ActionCount();
} }
NS_IMETHODIMP NS_IMETHODIMP
@ -94,7 +94,7 @@ nsHTMLLinkAccessible::GetActionName(PRUint8 aIndex, nsAString& aName)
aName.Truncate(); aName.Truncate();
if (!IsLinked()) if (!IsLinked())
return nsHyperTextAccessible::GetActionName(aIndex, aName); return HyperTextAccessible::GetActionName(aIndex, aName);
// Action 0 (default action): Jump to link // Action 0 (default action): Jump to link
if (aIndex != eAction_Jump) if (aIndex != eAction_Jump)
@ -108,7 +108,7 @@ NS_IMETHODIMP
nsHTMLLinkAccessible::DoAction(PRUint8 aIndex) nsHTMLLinkAccessible::DoAction(PRUint8 aIndex)
{ {
if (!IsLinked()) if (!IsLinked())
return nsHyperTextAccessible::DoAction(aIndex); return HyperTextAccessible::DoAction(aIndex);
// Action 0 (default action): Jump to link // Action 0 (default action): Jump to link
if (aIndex != eAction_Jump) if (aIndex != eAction_Jump)

View File

@ -6,9 +6,9 @@
#ifndef _nsHTMLLinkAccessible_H_ #ifndef _nsHTMLLinkAccessible_H_
#define _nsHTMLLinkAccessible_H_ #define _nsHTMLLinkAccessible_H_
#include "nsHyperTextAccessibleWrap.h" #include "HyperTextAccessibleWrap.h"
class nsHTMLLinkAccessible : public nsHyperTextAccessibleWrap class nsHTMLLinkAccessible : public HyperTextAccessibleWrap
{ {
public: public:
nsHTMLLinkAccessible(nsIContent* aContent, DocAccessible* aDoc); nsHTMLLinkAccessible(nsIContent* aContent, DocAccessible* aDoc);

View File

@ -174,7 +174,7 @@ nsHTMLSelectListAccessible::CacheOptSiblings(nsIContent *aParentContent)
nsHTMLSelectOptionAccessible:: nsHTMLSelectOptionAccessible::
nsHTMLSelectOptionAccessible(nsIContent* aContent, DocAccessible* aDoc) : nsHTMLSelectOptionAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
@ -225,7 +225,7 @@ nsHTMLSelectOptionAccessible::NativeState()
{ {
// As a nsHTMLSelectOptionAccessible we can have the following states: // As a nsHTMLSelectOptionAccessible we can have the following states:
// SELECTABLE, SELECTED, FOCUSED, FOCUSABLE, OFFSCREEN // SELECTABLE, SELECTED, FOCUSED, FOCUSABLE, OFFSCREEN
// Upcall to Accessible, but skip nsHyperTextAccessible impl // Upcall to Accessible, but skip HyperTextAccessible impl
// because we don't want EDITABLE or SELECTABLE_TEXT // because we don't want EDITABLE or SELECTABLE_TEXT
PRUint64 state = Accessible::NativeState(); PRUint64 state = Accessible::NativeState();
@ -307,7 +307,7 @@ nsHTMLSelectOptionAccessible::GetBoundsRect(nsRect& aTotalBounds,
if (combobox && (combobox->State() & states::COLLAPSED)) if (combobox && (combobox->State() & states::COLLAPSED))
combobox->GetBoundsRect(aTotalBounds, aBoundingFrame); combobox->GetBoundsRect(aTotalBounds, aBoundingFrame);
else else
nsHyperTextAccessibleWrap::GetBoundsRect(aTotalBounds, aBoundingFrame); HyperTextAccessibleWrap::GetBoundsRect(aTotalBounds, aBoundingFrame);
} }
/** select us! close combo box if necessary*/ /** select us! close combo box if necessary*/

View File

@ -69,7 +69,7 @@ protected:
/* /*
* Options inside the select, contained within the list * Options inside the select, contained within the list
*/ */
class nsHTMLSelectOptionAccessible : public nsHyperTextAccessibleWrap class nsHTMLSelectOptionAccessible : public HyperTextAccessibleWrap
{ {
public: public:
enum { eAction_Select = 0 }; enum { eAction_Select = 0 };

View File

@ -44,7 +44,7 @@ using namespace mozilla::a11y;
nsHTMLTableCellAccessible:: nsHTMLTableCellAccessible::
nsHTMLTableCellAccessible(nsIContent* aContent, DocAccessible* aDoc) : nsHTMLTableCellAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
@ -52,7 +52,7 @@ nsHTMLTableCellAccessible::
// nsHTMLTableCellAccessible: nsISupports implementation // nsHTMLTableCellAccessible: nsISupports implementation
NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLTableCellAccessible, NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLTableCellAccessible,
nsHyperTextAccessible, HyperTextAccessible,
nsIAccessibleTableCell) nsIAccessibleTableCell)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -67,7 +67,7 @@ nsHTMLTableCellAccessible::NativeRole()
PRUint64 PRUint64
nsHTMLTableCellAccessible::NativeState() nsHTMLTableCellAccessible::NativeState()
{ {
PRUint64 state = nsHyperTextAccessibleWrap::NativeState(); PRUint64 state = HyperTextAccessibleWrap::NativeState();
nsIFrame *frame = mContent->GetPrimaryFrame(); nsIFrame *frame = mContent->GetPrimaryFrame();
NS_ASSERTION(frame, "No frame for valid cell accessible!"); NS_ASSERTION(frame, "No frame for valid cell accessible!");
@ -87,7 +87,7 @@ nsHTMLTableCellAccessible::GetAttributesInternal(nsIPersistentProperties *aAttri
if (IsDefunct()) if (IsDefunct())
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
nsresult rv = nsHyperTextAccessibleWrap::GetAttributesInternal(aAttributes); nsresult rv = HyperTextAccessibleWrap::GetAttributesInternal(aAttributes);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
// table-cell-index attribute // table-cell-index attribute
@ -1512,7 +1512,7 @@ nsHTMLTableAccessible::IsProbablyLayoutTable()
Relation Relation
nsHTMLCaptionAccessible::RelationByType(PRUint32 aType) nsHTMLCaptionAccessible::RelationByType(PRUint32 aType)
{ {
Relation rel = nsHyperTextAccessible::RelationByType(aType); Relation rel = HyperTextAccessible::RelationByType(aType);
if (aType == nsIAccessibleRelation::RELATION_LABEL_FOR) if (aType == nsIAccessibleRelation::RELATION_LABEL_FOR)
rel.AppendTarget(Parent()); rel.AppendTarget(Parent());

View File

@ -6,7 +6,7 @@
#ifndef _nsHTMLTableAccessible_H_ #ifndef _nsHTMLTableAccessible_H_
#define _nsHTMLTableAccessible_H_ #define _nsHTMLTableAccessible_H_
#include "nsHyperTextAccessibleWrap.h" #include "HyperTextAccessibleWrap.h"
#include "nsIAccessibleTable.h" #include "nsIAccessibleTable.h"
#include "TableAccessible.h" #include "TableAccessible.h"
#include "xpcAccessibleTable.h" #include "xpcAccessibleTable.h"
@ -17,7 +17,7 @@ class nsITableCellLayout;
/** /**
* HTML table cell accessible (html:td). * HTML table cell accessible (html:td).
*/ */
class nsHTMLTableCellAccessible : public nsHyperTextAccessibleWrap, class nsHTMLTableCellAccessible : public HyperTextAccessibleWrap,
public nsIAccessibleTableCell public nsIAccessibleTableCell
{ {
public: public:
@ -178,11 +178,11 @@ protected:
/** /**
* HTML caption accessible (html:caption). * HTML caption accessible (html:caption).
*/ */
class nsHTMLCaptionAccessible : public nsHyperTextAccessibleWrap class nsHTMLCaptionAccessible : public HyperTextAccessibleWrap
{ {
public: public:
nsHTMLCaptionAccessible(nsIContent* aContent, DocAccessible* aDoc) : nsHTMLCaptionAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) { } HyperTextAccessibleWrap(aContent, aDoc) { }
virtual ~nsHTMLCaptionAccessible() { } virtual ~nsHTMLCaptionAccessible() { }
// nsIAccessible // nsIAccessible

View File

@ -67,11 +67,11 @@ nsHTMLBRAccessible::GetNameInternal(nsAString& aName)
nsHTMLLabelAccessible:: nsHTMLLabelAccessible::
nsHTMLLabelAccessible(nsIContent* aContent, DocAccessible* aDoc) : nsHTMLLabelAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLLabelAccessible, nsHyperTextAccessible) NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLLabelAccessible, HyperTextAccessible)
nsresult nsresult
nsHTMLLabelAccessible::GetNameInternal(nsAString& aName) nsHTMLLabelAccessible::GetNameInternal(nsAString& aName)
@ -91,11 +91,11 @@ nsHTMLLabelAccessible::NativeRole()
nsHTMLOutputAccessible:: nsHTMLOutputAccessible::
nsHTMLOutputAccessible(nsIContent* aContent, DocAccessible* aDoc) : nsHTMLOutputAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLOutputAccessible, nsHyperTextAccessible) NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLOutputAccessible, HyperTextAccessible)
Relation Relation
nsHTMLOutputAccessible::RelationByType(PRUint32 aType) nsHTMLOutputAccessible::RelationByType(PRUint32 aType)

View File

@ -38,7 +38,7 @@ public:
/** /**
* Used for HTML label element. * Used for HTML label element.
*/ */
class nsHTMLLabelAccessible : public nsHyperTextAccessibleWrap class nsHTMLLabelAccessible : public HyperTextAccessibleWrap
{ {
public: public:
nsHTMLLabelAccessible(nsIContent* aContent, DocAccessible* aDoc); nsHTMLLabelAccessible(nsIContent* aContent, DocAccessible* aDoc);
@ -53,7 +53,7 @@ public:
/** /**
* Used for HTML output element. * Used for HTML output element.
*/ */
class nsHTMLOutputAccessible : public nsHyperTextAccessibleWrap class nsHTMLOutputAccessible : public HyperTextAccessibleWrap
{ {
public: public:
nsHTMLOutputAccessible(nsIContent* aContent, DocAccessible* aDoc); nsHTMLOutputAccessible(nsIContent* aContent, DocAccessible* aDoc);

View File

@ -3,12 +3,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef _NSHYPERTEXTACCESSIBLEWRAP_H #ifndef mozilla_a11y_HyperTextAccessibleWrap_h__
#define _NSHYPERTEXTACCESSIBLEWRAP_H #define mozilla_a11y_HyperTextAccessibleWrap_h__
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
typedef class nsHyperTextAccessible nsHyperTextAccessibleWrap; typedef class HyperTextAccessible HyperTextAccessibleWrap;
#endif #endif

View File

@ -7,7 +7,7 @@
#import "mozHTMLAccessible.h" #import "mozHTMLAccessible.h"
#import "nsHyperTextAccessible.h" #import "HyperTextAccessible.h"
#import "nsCocoaUtils.h" #import "nsCocoaUtils.h"

View File

@ -4,13 +4,13 @@
#import "mozAccessible.h" #import "mozAccessible.h"
#import "nsHyperTextAccessible.h" #import "HyperTextAccessible.h"
@interface mozTextAccessible : mozAccessible @interface mozTextAccessible : mozAccessible
{ {
// both of these are the same old mGeckoAccessible, but already // both of these are the same old mGeckoAccessible, but already
// QI'd for us, to the right type, for convenience. // QI'd for us, to the right type, for convenience.
nsHyperTextAccessible *mGeckoTextAccessible; // strong HyperTextAccessible *mGeckoTextAccessible; // strong
nsIAccessibleEditableText *mGeckoEditableTextAccessible; // strong nsIAccessibleEditableText *mGeckoEditableTextAccessible; // strong
} }
@end @end

View File

@ -30,6 +30,6 @@ NS_IMPL_ISUPPORTS_INHERITED0(ARIAGridCellAccessibleWrap,
ARIAGridCellAccessible) ARIAGridCellAccessible)
IMPL_IUNKNOWN_INHERITED1(ARIAGridCellAccessibleWrap, IMPL_IUNKNOWN_INHERITED1(ARIAGridCellAccessibleWrap,
nsHyperTextAccessibleWrap, HyperTextAccessibleWrap,
CAccessibleTableCell) CAccessibleTableCell)

View File

@ -8,7 +8,7 @@
#include "CAccessibleEditableText.h" #include "CAccessibleEditableText.h"
#include "AccessibleEditableText_i.c" #include "AccessibleEditableText_i.c"
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
#include "nsString.h" #include "nsString.h"
@ -38,7 +38,7 @@ STDMETHODIMP
CAccessibleEditableText::copyText(long aStartOffset, long aEndOffset) CAccessibleEditableText::copyText(long aStartOffset, long aEndOffset)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -53,7 +53,7 @@ STDMETHODIMP
CAccessibleEditableText::deleteText(long aStartOffset, long aEndOffset) CAccessibleEditableText::deleteText(long aStartOffset, long aEndOffset)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -68,7 +68,7 @@ STDMETHODIMP
CAccessibleEditableText::insertText(long aOffset, BSTR *aText) CAccessibleEditableText::insertText(long aOffset, BSTR *aText)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -86,7 +86,7 @@ STDMETHODIMP
CAccessibleEditableText::cutText(long aStartOffset, long aEndOffset) CAccessibleEditableText::cutText(long aStartOffset, long aEndOffset)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -101,7 +101,7 @@ STDMETHODIMP
CAccessibleEditableText::pasteText(long aOffset) CAccessibleEditableText::pasteText(long aOffset)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -117,7 +117,7 @@ CAccessibleEditableText::replaceText(long aStartOffset, long aEndOffset,
BSTR *aText) BSTR *aText)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;

View File

@ -10,7 +10,7 @@
#include "Accessible2.h" #include "Accessible2.h"
#include "AccessibleText_i.c" #include "AccessibleText_i.c"
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
#include "nsIPersistentProperties2.h" #include "nsIPersistentProperties2.h"
@ -40,7 +40,7 @@ STDMETHODIMP
CAccessibleText::addSelection(long aStartOffset, long aEndOffset) CAccessibleText::addSelection(long aStartOffset, long aEndOffset)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -63,7 +63,7 @@ __try {
*aEndOffset = 0; *aEndOffset = 0;
*aTextAttributes = NULL; *aTextAttributes = NULL;
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -95,7 +95,7 @@ CAccessibleText::get_caretOffset(long *aOffset)
__try { __try {
*aOffset = -1; *aOffset = -1;
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -123,7 +123,7 @@ __try {
*aWidth = 0; *aWidth = 0;
*aHeight = 0; *aHeight = 0;
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -153,7 +153,7 @@ CAccessibleText::get_nSelections(long *aNSelections)
__try { __try {
*aNSelections = 0; *aNSelections = 0;
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -177,7 +177,7 @@ CAccessibleText::get_offsetAtPoint(long aX, long aY,
__try { __try {
*aOffset = 0; *aOffset = 0;
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -205,7 +205,7 @@ __try {
*aStartOffset = 0; *aStartOffset = 0;
*aEndOffset = 0; *aEndOffset = 0;
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -229,7 +229,7 @@ CAccessibleText::get_text(long aStartOffset, long aEndOffset, BSTR *aText)
__try { __try {
*aText = NULL; *aText = NULL;
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -259,7 +259,7 @@ __try {
*aEndOffset = 0; *aEndOffset = 0;
*aText = NULL; *aText = NULL;
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -306,7 +306,7 @@ __try {
*aEndOffset = 0; *aEndOffset = 0;
*aText = NULL; *aText = NULL;
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -353,7 +353,7 @@ __try {
*aEndOffset = 0; *aEndOffset = 0;
*aText = NULL; *aText = NULL;
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -393,7 +393,7 @@ STDMETHODIMP
CAccessibleText::removeSelection(long aSelectionIndex) CAccessibleText::removeSelection(long aSelectionIndex)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -408,7 +408,7 @@ STDMETHODIMP
CAccessibleText::setCaretOffset(long aOffset) CAccessibleText::setCaretOffset(long aOffset)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -424,7 +424,7 @@ CAccessibleText::setSelection(long aSelectionIndex, long aStartOffset,
long aEndOffset) long aEndOffset)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -442,7 +442,7 @@ CAccessibleText::get_nCharacters(long *aNCharacters)
__try { __try {
*aNCharacters = 0; *aNCharacters = 0;
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -458,7 +458,7 @@ CAccessibleText::scrollSubstringTo(long aStartIndex, long aEndIndex,
enum IA2ScrollType aScrollType) enum IA2ScrollType aScrollType)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -475,7 +475,7 @@ CAccessibleText::scrollSubstringToPoint(long aStartIndex, long aEndIndex,
long aX, long aY) long aX, long aY)
{ {
__try { __try {
nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this)); nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
if (textAcc->IsDefunct()) if (textAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;

View File

@ -67,7 +67,7 @@ DocAccessibleWrap::QueryInterface(REFIID iid, void** ppv)
*ppv = NULL; *ppv = NULL;
if (IID_ISimpleDOMDocument != iid) if (IID_ISimpleDOMDocument != iid)
return nsHyperTextAccessibleWrap::QueryInterface(iid, ppv); return HyperTextAccessibleWrap::QueryInterface(iid, ppv);
statistics::ISimpleDOMUsed(); statistics::ISimpleDOMUsed();
*ppv = static_cast<ISimpleDOMDocument*>(this); *ppv = static_cast<ISimpleDOMDocument*>(this);

View File

@ -5,20 +5,20 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsHyperTextAccessibleWrap.h" #include "HyperTextAccessibleWrap.h"
#include "nsEventShell.h" #include "nsEventShell.h"
NS_IMPL_ISUPPORTS_INHERITED0(nsHyperTextAccessibleWrap, NS_IMPL_ISUPPORTS_INHERITED0(HyperTextAccessibleWrap,
nsHyperTextAccessible) HyperTextAccessible)
IMPL_IUNKNOWN_INHERITED2(nsHyperTextAccessibleWrap, IMPL_IUNKNOWN_INHERITED2(HyperTextAccessibleWrap,
AccessibleWrap, AccessibleWrap,
ia2AccessibleHypertext, ia2AccessibleHypertext,
CAccessibleEditableText); CAccessibleEditableText);
nsresult nsresult
nsHyperTextAccessibleWrap::HandleAccEvent(AccEvent* aEvent) HyperTextAccessibleWrap::HandleAccEvent(AccEvent* aEvent)
{ {
PRUint32 eventType = aEvent->GetEventType(); PRUint32 eventType = aEvent->GetEventType();
@ -41,14 +41,14 @@ nsHyperTextAccessibleWrap::HandleAccEvent(AccEvent* aEvent)
} }
} }
return nsHyperTextAccessible::HandleAccEvent(aEvent); return HyperTextAccessible::HandleAccEvent(aEvent);
} }
nsresult nsresult
nsHyperTextAccessibleWrap::GetModifiedText(bool aGetInsertedText, HyperTextAccessibleWrap::GetModifiedText(bool aGetInsertedText,
nsAString& aText, nsAString& aText,
PRUint32 *aStartOffset, PRUint32* aStartOffset,
PRUint32 *aEndOffset) PRUint32* aEndOffset)
{ {
aText.Truncate(); aText.Truncate();
*aStartOffset = 0; *aStartOffset = 0;

View File

@ -5,21 +5,21 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef _NSHYPERTEXTACCESSIBLEWRAP_H #ifndef mozilla_a11y_HyperTextAccessibleWrap_h__
#define _NSHYPERTEXTACCESSIBLEWRAP_H #define mozilla_a11y_HyperTextAccessibleWrap_h__
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
#include "CAccessibleText.h" #include "CAccessibleText.h"
#include "CAccessibleEditableText.h" #include "CAccessibleEditableText.h"
#include "ia2AccessibleHyperText.h" #include "ia2AccessibleHyperText.h"
class nsHyperTextAccessibleWrap : public nsHyperTextAccessible, class HyperTextAccessibleWrap : public HyperTextAccessible,
public ia2AccessibleHypertext, public ia2AccessibleHypertext,
public CAccessibleEditableText public CAccessibleEditableText
{ {
public: public:
nsHyperTextAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) : HyperTextAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessible(aContent, aDoc) {} HyperTextAccessible(aContent, aDoc) {}
// IUnknown // IUnknown
DECL_IUNKNOWN_INHERITED DECL_IUNKNOWN_INHERITED

View File

@ -20,12 +20,12 @@ CPPSRCS = \
ApplicationAccessibleWrap.cpp \ ApplicationAccessibleWrap.cpp \
ARIAGridAccessibleWrap.cpp \ ARIAGridAccessibleWrap.cpp \
DocAccessibleWrap.cpp \ DocAccessibleWrap.cpp \
HyperTextAccessibleWrap.cpp \
nsAccessNodeWrap.cpp \ nsAccessNodeWrap.cpp \
nsHTMLWin32ObjectAccessible.cpp \ nsHTMLWin32ObjectAccessible.cpp \
nsXULMenuAccessibleWrap.cpp \ nsXULMenuAccessibleWrap.cpp \
nsXULListboxAccessibleWrap.cpp \ nsXULListboxAccessibleWrap.cpp \
nsXULTreeGridAccessibleWrap.cpp \ nsXULTreeGridAccessibleWrap.cpp \
nsHyperTextAccessibleWrap.cpp \
nsHTMLImageAccessibleWrap.cpp \ nsHTMLImageAccessibleWrap.cpp \
nsHTMLTableAccessibleWrap.cpp \ nsHTMLTableAccessibleWrap.cpp \
nsWinUtils.cpp \ nsWinUtils.cpp \

View File

@ -9,7 +9,7 @@
#include "AccessibleHypertext_i.c" #include "AccessibleHypertext_i.c"
#include "nsHyperTextAccessibleWrap.h" #include "HyperTextAccessibleWrap.h"
// IUnknown // IUnknown
@ -18,7 +18,7 @@ ia2AccessibleHypertext::QueryInterface(REFIID iid, void** ppv)
{ {
*ppv = NULL; *ppv = NULL;
if (IID_IAccessibleHypertext == iid) { if (IID_IAccessibleHypertext == iid) {
nsHyperTextAccessibleWrap* hyperAcc = static_cast<nsHyperTextAccessibleWrap*>(this); HyperTextAccessibleWrap* hyperAcc = static_cast<HyperTextAccessibleWrap*>(this);
if (hyperAcc->IsTextRole()) { if (hyperAcc->IsTextRole()) {
*ppv = static_cast<IAccessibleHypertext*>(this); *ppv = static_cast<IAccessibleHypertext*>(this);
(reinterpret_cast<IUnknown*>(*ppv))->AddRef(); (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
@ -38,7 +38,7 @@ ia2AccessibleHypertext::get_nHyperlinks(long* aHyperlinkCount)
__try { __try {
*aHyperlinkCount = 0; *aHyperlinkCount = 0;
nsHyperTextAccessibleWrap* hyperText = static_cast<nsHyperTextAccessibleWrap*>(this); HyperTextAccessibleWrap* hyperText = static_cast<HyperTextAccessibleWrap*>(this);
if (hyperText->IsDefunct()) if (hyperText->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -56,7 +56,7 @@ ia2AccessibleHypertext::get_hyperlink(long aLinkIndex,
__try { __try {
*aHyperlink = NULL; *aHyperlink = NULL;
nsHyperTextAccessibleWrap* hyperText = static_cast<nsHyperTextAccessibleWrap*>(this); HyperTextAccessibleWrap* hyperText = static_cast<HyperTextAccessibleWrap*>(this);
if (hyperText->IsDefunct()) if (hyperText->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;
@ -84,7 +84,7 @@ ia2AccessibleHypertext::get_hyperlinkIndex(long aCharIndex, long* aHyperlinkInde
__try { __try {
*aHyperlinkIndex = 0; *aHyperlinkIndex = 0;
nsHyperTextAccessibleWrap* hyperAcc = static_cast<nsHyperTextAccessibleWrap*>(this); HyperTextAccessibleWrap* hyperAcc = static_cast<HyperTextAccessibleWrap*>(this);
if (hyperAcc->IsDefunct()) if (hyperAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED; return CO_E_OBJNOTCONNECTED;

View File

@ -132,7 +132,7 @@ protected:
ISimpleDOMNode *MakeAccessNode(nsINode *aNode); ISimpleDOMNode *MakeAccessNode(nsINode *aNode);
/** /**
* It is used in nsHyperTextAccessibleWrap for IA2::newText/oldText * It is used in HyperTextAccessibleWrap for IA2::newText/oldText
* implementation. * implementation.
*/ */
static AccTextChangeEvent* gTextEvent; static AccTextChangeEvent* gTextEvent;

View File

@ -27,7 +27,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLTableCellAccessibleWrap,
nsHTMLTableCellAccessible) nsHTMLTableCellAccessible)
IMPL_IUNKNOWN_INHERITED1(nsHTMLTableCellAccessibleWrap, IMPL_IUNKNOWN_INHERITED1(nsHTMLTableCellAccessibleWrap,
nsHyperTextAccessibleWrap, HyperTextAccessibleWrap,
CAccessibleTableCell) CAccessibleTableCell)
@ -39,5 +39,5 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLTableHeaderCellAccessibleWrap,
nsHTMLTableHeaderCellAccessible) nsHTMLTableHeaderCellAccessible)
IMPL_IUNKNOWN_INHERITED1(nsHTMLTableHeaderCellAccessibleWrap, IMPL_IUNKNOWN_INHERITED1(nsHTMLTableHeaderCellAccessibleWrap,
nsHyperTextAccessibleWrap, HyperTextAccessibleWrap,
CAccessibleTableCell) CAccessibleTableCell)

View File

@ -38,5 +38,5 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsXULListCellAccessibleWrap,
nsXULListCellAccessible) nsXULListCellAccessible)
IMPL_IUNKNOWN_INHERITED1(nsXULListCellAccessibleWrap, IMPL_IUNKNOWN_INHERITED1(nsXULListCellAccessibleWrap,
nsHyperTextAccessibleWrap, HyperTextAccessibleWrap,
CAccessibleTableCell) CAccessibleTableCell)

View File

@ -3,12 +3,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef _NSHYPERTEXTACCESSIBLEWRAP_H #ifndef mozilla_a11y_HyperTextAccessibleWrap_h__
#define _NSHYPERTEXTACCESSIBLEWRAP_H #define mozilla_a11y_HyperTextAccessibleWrap_h__
#include "nsHyperTextAccessible.h" #include "HyperTextAccessible.h"
typedef class nsHyperTextAccessible nsHyperTextAccessibleWrap; typedef class HyperTextAccessible HyperTextAccessibleWrap;
#endif #endif

View File

@ -48,7 +48,7 @@ nsXFormsAccessibleBase::nsXFormsAccessibleBase()
nsXFormsAccessible:: nsXFormsAccessible::
nsXFormsAccessible(nsIContent* aContent, DocAccessible* aDoc) : nsXFormsAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
@ -135,7 +135,7 @@ nsXFormsAccessible::NativeState()
rv = sXFormsService->IsValid(DOMNode, &isValid); rv = sXFormsService->IsValid(DOMNode, &isValid);
NS_ENSURE_SUCCESS(rv, 0); NS_ENSURE_SUCCESS(rv, 0);
PRUint64 states = nsHyperTextAccessibleWrap::NativeState(); PRUint64 states = HyperTextAccessibleWrap::NativeState();
if (!isRelevant) if (!isRelevant)
states |= states::UNAVAILABLE; states |= states::UNAVAILABLE;

View File

@ -6,7 +6,7 @@
#ifndef _nsXFormsAccessible_H_ #ifndef _nsXFormsAccessible_H_
#define _nsXFormsAccessible_H_ #define _nsXFormsAccessible_H_
#include "nsHyperTextAccessibleWrap.h" #include "HyperTextAccessibleWrap.h"
#include "nsIXFormsUtilityService.h" #include "nsIXFormsUtilityService.h"
#define NS_NAMESPACE_XFORMS "http://www.w3.org/2002/xforms" #define NS_NAMESPACE_XFORMS "http://www.w3.org/2002/xforms"
@ -33,7 +33,7 @@ protected:
* XForms hint and XForms label elements should have accessible object. This * XForms hint and XForms label elements should have accessible object. This
* class is base class for accessible objects for these XForms elements. * class is base class for accessible objects for these XForms elements.
*/ */
class nsXFormsAccessible : public nsHyperTextAccessibleWrap, class nsXFormsAccessible : public HyperTextAccessibleWrap,
public nsXFormsAccessibleBase public nsXFormsAccessibleBase
{ {
public: public:
@ -109,7 +109,7 @@ class nsXFormsEditableAccessible : public nsXFormsAccessible
public: public:
nsXFormsEditableAccessible(nsIContent* aContent, DocAccessible* aDoc); nsXFormsEditableAccessible(nsIContent* aContent, DocAccessible* aDoc);
// nsHyperTextAccessible // HyperTextAccessible
virtual already_AddRefed<nsIEditor> GetEditor() const; virtual already_AddRefed<nsIEditor> GetEditor() const;
// Accessible // Accessible

View File

@ -119,7 +119,11 @@ nsXFormsInputAccessible::
{ {
} }
NS_IMPL_ISUPPORTS_INHERITED3(nsXFormsInputAccessible, Accessible, nsHyperTextAccessible, nsIAccessibleText, nsIAccessibleEditableText) NS_IMPL_ISUPPORTS_INHERITED3(nsXFormsInputAccessible,
Accessible,
HyperTextAccessible,
nsIAccessibleText,
nsIAccessibleEditableText)
role role
nsXFormsInputAccessible::NativeRole() nsXFormsInputAccessible::NativeRole()

View File

@ -688,13 +688,13 @@ XULToolbarSeparatorAccessible::NativeState()
XULTextFieldAccessible:: XULTextFieldAccessible::
XULTextFieldAccessible(nsIContent* aContent, DocAccessible* aDoc) : XULTextFieldAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
NS_IMPL_ISUPPORTS_INHERITED3(XULTextFieldAccessible, NS_IMPL_ISUPPORTS_INHERITED3(XULTextFieldAccessible,
Accessible, Accessible,
nsHyperTextAccessible, HyperTextAccessible,
nsIAccessibleText, nsIAccessibleText,
nsIAccessibleEditableText) nsIAccessibleEditableText)
@ -722,7 +722,7 @@ XULTextFieldAccessible::Value(nsString& aValue)
void void
XULTextFieldAccessible::ApplyARIAState(PRUint64* aState) const XULTextFieldAccessible::ApplyARIAState(PRUint64* aState) const
{ {
nsHyperTextAccessibleWrap::ApplyARIAState(aState); HyperTextAccessibleWrap::ApplyARIAState(aState);
aria::MapToState(aria::eARIAAutoComplete, mContent->AsElement(), aState); aria::MapToState(aria::eARIAAutoComplete, mContent->AsElement(), aState);
} }
@ -730,7 +730,7 @@ XULTextFieldAccessible::ApplyARIAState(PRUint64* aState) const
PRUint64 PRUint64
XULTextFieldAccessible::NativeState() XULTextFieldAccessible::NativeState()
{ {
PRUint64 state = nsHyperTextAccessibleWrap::NativeState(); PRUint64 state = HyperTextAccessibleWrap::NativeState();
nsCOMPtr<nsIContent> inputField(GetInputField()); nsCOMPtr<nsIContent> inputField(GetInputField());
NS_ENSURE_TRUE(inputField, state); NS_ENSURE_TRUE(inputField, state);
@ -846,7 +846,7 @@ XULTextFieldAccessible::CacheChildren()
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// XULTextFieldAccessible: nsHyperTextAccessible protected // XULTextFieldAccessible: HyperTextAccessible protected
already_AddRefed<nsFrameSelection> already_AddRefed<nsFrameSelection>
XULTextFieldAccessible::FrameSelection() XULTextFieldAccessible::FrameSelection()

View File

@ -9,7 +9,7 @@
// NOTE: alphabetically ordered // NOTE: alphabetically ordered
#include "AccessibleWrap.h" #include "AccessibleWrap.h"
#include "FormControlAccessible.h" #include "FormControlAccessible.h"
#include "nsHyperTextAccessibleWrap.h" #include "HyperTextAccessibleWrap.h"
#include "XULSelectControlAccessible.h" #include "XULSelectControlAccessible.h"
namespace mozilla { namespace mozilla {
@ -213,7 +213,7 @@ public:
/** /**
* Used for XUL textbox element. * Used for XUL textbox element.
*/ */
class XULTextFieldAccessible : public nsHyperTextAccessibleWrap class XULTextFieldAccessible : public HyperTextAccessibleWrap
{ {
public: public:
enum { eAction_Click = 0 }; enum { eAction_Click = 0 };
@ -226,7 +226,7 @@ public:
NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName); NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
NS_IMETHOD DoAction(PRUint8 index); NS_IMETHOD DoAction(PRUint8 index);
// nsHyperTextAccessible // HyperTextAccessible
virtual already_AddRefed<nsIEditor> GetEditor() const; virtual already_AddRefed<nsIEditor> GetEditor() const;
// Accessible // Accessible
@ -243,7 +243,7 @@ protected:
// Accessible // Accessible
virtual void CacheChildren(); virtual void CacheChildren();
// nsHyperTextAccessible // HyperTextAccessible
virtual already_AddRefed<nsFrameSelection> FrameSelection(); virtual already_AddRefed<nsFrameSelection> FrameSelection();
// nsXULTextFieldAccessible // nsXULTextFieldAccessible

View File

@ -926,7 +926,7 @@ nsXULListitemAccessible::ContainerWidget() const
nsXULListCellAccessible:: nsXULListCellAccessible::
nsXULListCellAccessible(nsIContent* aContent, DocAccessible* aDoc) : nsXULListCellAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
@ -934,7 +934,7 @@ nsXULListCellAccessible::
// nsISupports // nsISupports
NS_IMPL_ISUPPORTS_INHERITED1(nsXULListCellAccessible, NS_IMPL_ISUPPORTS_INHERITED1(nsXULListCellAccessible,
nsHyperTextAccessible, HyperTextAccessible,
nsIAccessibleTableCell) nsIAccessibleTableCell)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

View File

@ -135,7 +135,7 @@ private:
/** /**
* Class represents xul:listcell. * Class represents xul:listcell.
*/ */
class nsXULListCellAccessible : public nsHyperTextAccessibleWrap, class nsXULListCellAccessible : public HyperTextAccessibleWrap,
public nsIAccessibleTableCell public nsIAccessibleTableCell
{ {
public: public:

View File

@ -29,7 +29,7 @@ using namespace mozilla::a11y;
nsXULTextAccessible:: nsXULTextAccessible::
nsXULTextAccessible(nsIContent* aContent, DocAccessible* aDoc) : nsXULTextAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
@ -53,13 +53,13 @@ nsXULTextAccessible::NativeState()
{ {
// Labels and description have read only state // Labels and description have read only state
// They are not focusable or selectable // They are not focusable or selectable
return nsHyperTextAccessibleWrap::NativeState() | states::READONLY; return HyperTextAccessibleWrap::NativeState() | states::READONLY;
} }
Relation Relation
nsXULTextAccessible::RelationByType(PRUint32 aType) nsXULTextAccessible::RelationByType(PRUint32 aType)
{ {
Relation rel = nsHyperTextAccessibleWrap::RelationByType(aType); Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
if (aType == nsIAccessibleRelation::RELATION_LABEL_FOR) { if (aType == nsIAccessibleRelation::RELATION_LABEL_FOR) {
// Caption is the label for groupbox // Caption is the label for groupbox
nsIContent *parent = mContent->GetParent(); nsIContent *parent = mContent->GetParent();
@ -107,12 +107,12 @@ nsXULTooltipAccessible::NativeRole()
nsXULLinkAccessible:: nsXULLinkAccessible::
nsXULLinkAccessible(nsIContent* aContent, DocAccessible* aDoc) : nsXULLinkAccessible(nsIContent* aContent, DocAccessible* aDoc) :
nsHyperTextAccessibleWrap(aContent, aDoc) HyperTextAccessibleWrap(aContent, aDoc)
{ {
} }
// Expose nsIAccessibleHyperLink unconditionally // Expose nsIAccessibleHyperLink unconditionally
NS_IMPL_ISUPPORTS_INHERITED1(nsXULLinkAccessible, nsHyperTextAccessibleWrap, NS_IMPL_ISUPPORTS_INHERITED1(nsXULLinkAccessible, HyperTextAccessibleWrap,
nsIAccessibleHyperLink) nsIAccessibleHyperLink)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

View File

@ -6,13 +6,13 @@
#ifndef _nsXULTextAccessible_H_ #ifndef _nsXULTextAccessible_H_
#define _nsXULTextAccessible_H_ #define _nsXULTextAccessible_H_
#include "HyperTextAccessibleWrap.h"
#include "nsBaseWidgetAccessible.h" #include "nsBaseWidgetAccessible.h"
#include "nsHyperTextAccessibleWrap.h"
/** /**
* Used for XUL description and label elements. * Used for XUL description and label elements.
*/ */
class nsXULTextAccessible : public nsHyperTextAccessibleWrap class nsXULTextAccessible : public HyperTextAccessibleWrap
{ {
public: public:
nsXULTextAccessible(nsIContent* aContent, DocAccessible* aDoc); nsXULTextAccessible(nsIContent* aContent, DocAccessible* aDoc);
@ -38,7 +38,7 @@ public:
virtual PRUint64 NativeState(); virtual PRUint64 NativeState();
}; };
class nsXULLinkAccessible : public nsHyperTextAccessibleWrap class nsXULLinkAccessible : public HyperTextAccessibleWrap
{ {
public: public:

View File

@ -76,7 +76,7 @@
Mozilla Bug 472326 Mozilla Bug 472326
</a><br> </a><br>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=474261" <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=474261"
title="Test remaining implementations in nsHypertextAccessible::GetRole"> title="Test remaining implementations in nsHyperTextAccessible::GetRole">
bug 474261 bug 474261
</a><br> </a><br>
<a target="_blank" <a target="_blank"

View File

@ -489,3 +489,5 @@ pref("ui.click_hold_context_menus.delay", 1000);
// Enable device storage // Enable device storage
pref("device.storage.enabled", true); pref("device.storage.enabled", true);
pref("media.plugins.enabled", true);

View File

@ -78,3 +78,8 @@ xul|thumb {
border-radius: 3px; border-radius: 3px;
} }
/* -moz-touch-enabled? media elements */
video > xul|videocontrols,
audio > xul|videocontrols {
-moz-binding: url("chrome://global/content/bindings/videocontrols.xml#touchControls");
}

View File

@ -639,6 +639,7 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
@BINPATH@/components/B2GComponents.manifest @BINPATH@/components/B2GComponents.manifest
@BINPATH@/components/B2GComponents.xpt @BINPATH@/components/B2GComponents.xpt
@BINPATH@/components/CameraContent.js @BINPATH@/components/CameraContent.js
@BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@
@BINPATH@/chrome/marionette@JAREXT@ @BINPATH@/chrome/marionette@JAREXT@
@BINPATH@/chrome/marionette.manifest @BINPATH@/chrome/marionette.manifest
@BINPATH@/components/MarionetteComponents.manifest @BINPATH@/components/MarionetteComponents.manifest

View File

@ -1,4 +1,4 @@
This is the pdf.js project output, https://github.com/mozilla/pdf.js This is the pdf.js project output, https://github.com/mozilla/pdf.js
Current extension version is: 0.2.536 Current extension version is: 0.3.266

View File

@ -1,8 +1,4 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
'use strict'; 'use strict';
@ -14,13 +10,26 @@ let Cc = Components.classes;
let Ci = Components.interfaces; let Ci = Components.interfaces;
let Cm = Components.manager; let Cm = Components.manager;
let Cu = Components.utils; let Cu = Components.utils;
let application = Cc['@mozilla.org/fuel/application;1']
.getService(Ci.fuelIApplication);
Cu.import('resource://gre/modules/Services.jsm'); Cu.import('resource://gre/modules/Services.jsm');
function getBoolPref(pref, def) {
try {
return Services.prefs.getBoolPref(pref);
} catch (ex) {
return def;
}
}
function setStringPref(pref, value) {
let str = Cc['@mozilla.org/supports-string;1']
.createInstance(Ci.nsISupportsString);
str.data = value;
Services.prefs.setComplexValue(pref, Ci.nsISupportsString, str);
}
function log(str) { function log(str) {
if (!application.prefs.getValue(EXT_PREFIX + '.pdfBugEnabled', false)) if (!getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false))
return; return;
dump(str + '\n'); dump(str + '\n');
} }
@ -97,6 +106,6 @@ function install(aData, aReason) {
} }
function uninstall(aData, aReason) { function uninstall(aData, aReason) {
application.prefs.setValue(EXT_PREFIX + '.database', '{}'); setStringPref(EXT_PREFIX + '.database', '{}');
} }

View File

@ -1,3 +1,8 @@
resource pdf.js content/ resource pdf.js content/
component {6457a96b-2d68-439a-bcfa-44465fbcdbb1} components/PdfStreamConverter.js component {6457a96b-2d68-439a-bcfa-44465fbcdbb1} components/PdfStreamConverter.js
contract @mozilla.org/streamconv;1?from=application/pdf&to=*/* {6457a96b-2d68-439a-bcfa-44465fbcdbb1} contract @mozilla.org/streamconv;1?from=application/pdf&to=*/* {6457a96b-2d68-439a-bcfa-44465fbcdbb1}
# Additional resources for pdf.js
# PDFJS_SUPPORTED_LOCALES

View File

@ -1,8 +1,4 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
'use strict'; 'use strict';
@ -17,18 +13,51 @@ const PDFJS_EVENT_ID = 'pdf.js.message';
const PDF_CONTENT_TYPE = 'application/pdf'; const PDF_CONTENT_TYPE = 'application/pdf';
const EXT_PREFIX = 'extensions.uriloader@pdf.js'; const EXT_PREFIX = 'extensions.uriloader@pdf.js';
const MAX_DATABASE_LENGTH = 4096; const MAX_DATABASE_LENGTH = 4096;
const FIREFOX_ID = '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}';
const SEAMONKEY_ID = '{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}';
Cu.import('resource://gre/modules/XPCOMUtils.jsm'); Cu.import('resource://gre/modules/XPCOMUtils.jsm');
Cu.import('resource://gre/modules/Services.jsm'); Cu.import('resource://gre/modules/Services.jsm');
Cu.import('resource://gre/modules/NetUtil.jsm');
let application = Cc['@mozilla.org/fuel/application;1'] let appInfo = Cc['@mozilla.org/xre/app-info;1']
.getService(Ci.fuelIApplication); .getService(Ci.nsIXULAppInfo);
let privateBrowsing = Cc['@mozilla.org/privatebrowsing;1'] let privateBrowsing, inPrivateBrowsing;
.getService(Ci.nsIPrivateBrowsingService);
let inPrivateBrowswing = privateBrowsing.privateBrowsingEnabled; if (appInfo.ID === FIREFOX_ID) {
privateBrowsing = Cc['@mozilla.org/privatebrowsing;1']
.getService(Ci.nsIPrivateBrowsingService);
inPrivateBrowsing = privateBrowsing.privateBrowsingEnabled;
} else if (appInfo.ID === SEAMONKEY_ID) {
privateBrowsing = null;
inPrivateBrowsing = false;
}
function getBoolPref(pref, def) {
try {
return Services.prefs.getBoolPref(pref);
} catch (ex) {
return def;
}
}
function setStringPref(pref, value) {
let str = Cc['@mozilla.org/supports-string;1']
.createInstance(Ci.nsISupportsString);
str.data = value;
Services.prefs.setComplexValue(pref, Ci.nsISupportsString, str);
}
function getStringPref(pref, def) {
try {
return Services.prefs.getComplexValue(pref, Ci.nsISupportsString).data;
} catch (ex) {
return def;
}
}
function log(aMsg) { function log(aMsg) {
if (!application.prefs.getValue(EXT_PREFIX + '.pdfBugEnabled', false)) if (!getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false))
return; return;
let msg = 'PdfStreamConverter.js: ' + (aMsg.join ? aMsg.join('') : aMsg); let msg = 'PdfStreamConverter.js: ' + (aMsg.join ? aMsg.join('') : aMsg);
Services.console.logStringMessage(msg); Services.console.logStringMessage(msg);
@ -41,29 +70,97 @@ function getDOMWindow(aChannel) {
return win; return win;
} }
function getLocalizedStrings(path) {
var stringBundle = Cc['@mozilla.org/intl/stringbundle;1'].
getService(Ci.nsIStringBundleService).
createBundle('chrome://pdf.js/locale/' + path);
var map = {};
var enumerator = stringBundle.getSimpleEnumeration();
while (enumerator.hasMoreElements()) {
var string = enumerator.getNext().QueryInterface(Ci.nsIPropertyElement);
var key = string.key, property = 'textContent';
var i = key.lastIndexOf('.');
if (i >= 0) {
property = key.substring(i + 1);
key = key.substring(0, i);
}
if (!(key in map))
map[key] = {};
map[key][property] = string.value;
}
return map;
}
// All the priviledged actions. // All the priviledged actions.
function ChromeActions() { function ChromeActions() {
this.inPrivateBrowswing = privateBrowsing.privateBrowsingEnabled;
} }
ChromeActions.prototype = { ChromeActions.prototype = {
download: function(data) { download: function(data) {
Services.wm.getMostRecentWindow('navigator:browser').saveURL(data); let mimeService = Cc['@mozilla.org/mime;1'].getService(Ci.nsIMIMEService);
var handlerInfo = mimeService.
getFromTypeAndExtension('application/pdf', 'pdf');
var uri = NetUtil.newURI(data);
var extHelperAppSvc =
Cc['@mozilla.org/uriloader/external-helper-app-service;1'].
getService(Ci.nsIExternalHelperAppService);
var frontWindow = Cc['@mozilla.org/embedcomp/window-watcher;1'].
getService(Ci.nsIWindowWatcher).activeWindow;
var ioService = Services.io;
var channel = ioService.newChannel(data, null, null);
var listener = {
extListener: null,
onStartRequest: function(aRequest, aContext) {
this.extListener = extHelperAppSvc.doContent('application/pdf',
aRequest, frontWindow, false);
this.extListener.onStartRequest(aRequest, aContext);
},
onStopRequest: function(aRequest, aContext, aStatusCode) {
if (this.extListener)
this.extListener.onStopRequest(aRequest, aContext, aStatusCode);
},
onDataAvailable: function(aRequest, aContext, aInputStream, aOffset,
aCount) {
this.extListener.onDataAvailable(aRequest, aContext, aInputStream,
aOffset, aCount);
}
};
channel.asyncOpen(listener, null);
}, },
setDatabase: function(data) { setDatabase: function(data) {
if (this.inPrivateBrowswing) if (inPrivateBrowsing)
return; return;
// Protect against something sending tons of data to setDatabase. // Protect against something sending tons of data to setDatabase.
if (data.length > MAX_DATABASE_LENGTH) if (data.length > MAX_DATABASE_LENGTH)
return; return;
application.prefs.setValue(EXT_PREFIX + '.database', data); setStringPref(EXT_PREFIX + '.database', data);
}, },
getDatabase: function() { getDatabase: function() {
if (this.inPrivateBrowswing) if (inPrivateBrowsing)
return '{}'; return '{}';
return application.prefs.getValue(EXT_PREFIX + '.database', '{}'); return getStringPref(EXT_PREFIX + '.database', '{}');
},
getLocale: function() {
return getStringPref('general.useragent.locale', 'en-US');
},
getStrings: function(data) {
try {
// Lazy initialization of localizedStrings
if (!('localizedStrings' in this))
this.localizedStrings = getLocalizedStrings('viewer.properties');
var result = this.localizedStrings[data];
return JSON.stringify(result || null);
} catch (e) {
log('Unable to retrive localized strings: ' + e);
return 'null';
}
}, },
pdfBugEnabled: function() { pdfBugEnabled: function() {
return application.prefs.getValue(EXT_PREFIX + '.pdfBugEnabled', false); return getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false);
} }
}; };

View File

@ -1,8 +1,4 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
'use strict'; 'use strict';
@ -167,29 +163,29 @@ var StepperManager = (function StepperManagerClosure() {
enabled: false, enabled: false,
active: false, active: false,
// Stepper specific functions. // Stepper specific functions.
create: function create(pageNumber) { create: function create(pageIndex) {
var debug = document.createElement('div'); var debug = document.createElement('div');
debug.id = 'stepper' + pageNumber; debug.id = 'stepper' + pageIndex;
debug.setAttribute('hidden', true); debug.setAttribute('hidden', true);
debug.className = 'stepper'; debug.className = 'stepper';
stepperDiv.appendChild(debug); stepperDiv.appendChild(debug);
var b = document.createElement('option'); var b = document.createElement('option');
b.textContent = 'Page ' + (pageNumber + 1); b.textContent = 'Page ' + (pageIndex + 1);
b.value = pageNumber; b.value = pageIndex;
stepperChooser.appendChild(b); stepperChooser.appendChild(b);
var initBreakPoints = breakPoints[pageNumber] || []; var initBreakPoints = breakPoints[pageIndex] || [];
var stepper = new Stepper(debug, pageNumber, initBreakPoints); var stepper = new Stepper(debug, pageIndex, initBreakPoints);
steppers.push(stepper); steppers.push(stepper);
if (steppers.length === 1) if (steppers.length === 1)
this.selectStepper(pageNumber, false); this.selectStepper(pageIndex, false);
return stepper; return stepper;
}, },
selectStepper: function selectStepper(pageNumber, selectPanel) { selectStepper: function selectStepper(pageIndex, selectPanel) {
if (selectPanel) if (selectPanel)
this.manager.selectPanel(1); this.manager.selectPanel(1);
for (var i = 0; i < steppers.length; ++i) { for (var i = 0; i < steppers.length; ++i) {
var stepper = steppers[i]; var stepper = steppers[i];
if (stepper.pageNumber == pageNumber) if (stepper.pageIndex == pageIndex)
stepper.panel.removeAttribute('hidden'); stepper.panel.removeAttribute('hidden');
else else
stepper.panel.setAttribute('hidden', true); stepper.panel.setAttribute('hidden', true);
@ -197,11 +193,11 @@ var StepperManager = (function StepperManagerClosure() {
var options = stepperChooser.options; var options = stepperChooser.options;
for (var i = 0; i < options.length; ++i) { for (var i = 0; i < options.length; ++i) {
var option = options[i]; var option = options[i];
option.selected = option.value == pageNumber; option.selected = option.value == pageIndex;
} }
}, },
saveBreakPoints: function saveBreakPoints(pageNumber, bps) { saveBreakPoints: function saveBreakPoints(pageIndex, bps) {
breakPoints[pageNumber] = bps; breakPoints[pageIndex] = bps;
sessionStorage.setItem('pdfjsBreakPoints', JSON.stringify(breakPoints)); sessionStorage.setItem('pdfjsBreakPoints', JSON.stringify(breakPoints));
} }
}; };
@ -209,12 +205,12 @@ var StepperManager = (function StepperManagerClosure() {
// The stepper for each page's IRQueue. // The stepper for each page's IRQueue.
var Stepper = (function StepperClosure() { var Stepper = (function StepperClosure() {
function Stepper(panel, pageNumber, initialBreakPoints) { function Stepper(panel, pageIndex, initialBreakPoints) {
this.panel = panel; this.panel = panel;
this.len; this.len;
this.breakPoint = 0; this.breakPoint = 0;
this.nextBreakPoint = null; this.nextBreakPoint = null;
this.pageNumber = pageNumber; this.pageIndex = pageIndex;
this.breakPoints = initialBreakPoints; this.breakPoints = initialBreakPoints;
this.currentIdx = -1; this.currentIdx = -1;
} }
@ -260,7 +256,7 @@ var Stepper = (function StepperClosure() {
self.breakPoints.push(x); self.breakPoints.push(x);
else else
self.breakPoints.splice(self.breakPoints.indexOf(x), 1); self.breakPoints.splice(self.breakPoints.indexOf(x), 1);
StepperManager.saveBreakPoints(self.pageNumber, self.breakPoints); StepperManager.saveBreakPoints(self.pageIndex, self.breakPoints);
} }
})(i); })(i);
@ -282,7 +278,7 @@ var Stepper = (function StepperClosure() {
return null; return null;
}, },
breakIt: function breakIt(idx, callback) { breakIt: function breakIt(idx, callback) {
StepperManager.selectStepper(this.pageNumber, true); StepperManager.selectStepper(this.pageIndex, true);
var self = this; var self = this;
var dom = document; var dom = document;
self.currentIdx = idx; self.currentIdx = idx;
@ -427,8 +423,9 @@ var PDFBug = (function PDFBugClosure() {
panels.setAttribute('class', 'panels'); panels.setAttribute('class', 'panels');
ui.appendChild(panels); ui.appendChild(panels);
document.body.appendChild(ui); var container = document.getElementById('viewerContainer');
document.body.style.paddingRight = panelWidth + 'px'; container.appendChild(ui);
container.style.right = panelWidth + 'px';
// Initialize all the debugging tools. // Initialize all the debugging tools.
var tools = this.tools; var tools = this.tools;

View File

@ -0,0 +1,3 @@
<svg height="40" width="40" xmlns="http://www.w3.org/2000/svg">
<path d="M2.379,14.729 5.208,11.899 12.958,19.648 25.877,6.733 28.707,9.561 12.958,25.308z" fill="#333333"></path>
</svg>

After

Width:  |  Height:  |  Size: 188 B

View File

@ -1,7 +1,3 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg height="40" width="40" xmlns="http://www.w3.org/2000/svg"> <svg height="40" width="40" xmlns="http://www.w3.org/2000/svg">
<path d="M16,5.333c-7.732,0-14,4.701-14,10.5c0,1.982,0.741,3.833,2.016,5.414L2,25.667l5.613-1.441c2.339,1.317,5.237,2.107,8.387,2.107c7.732,0,14-4.701,14-10.5C30,10.034,23.732,5.333,16,5.333z" fill="#333333"></path> <path d="M16,5.333c-7.732,0-14,4.701-14,10.5c0,1.982,0.741,3.833,2.016,5.414L2,25.667l5.613-1.441c2.339,1.317,5.237,2.107,8.387,2.107c7.732,0,14-4.701,14-10.5C30,10.034,23.732,5.333,16,5.333z" fill="#333333"></path>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 289 B

View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<svg
xmlns:cc="http://creativecommons.org/ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
height="40"
width="40"
id="svg2995"
version="1.1">
<rect
style="fill:#f1e47b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-opacity:1"
id="rect3009"
width="30.169491"
height="24.576269"
x="4.237288"
y="6.7796612" />
<rect
style="fill:#000000;fill-opacity:1;stroke:none"
id="rect3781"
width="23.38983"
height="1.1864407"
x="7.6271186"
y="11.389831" />
<rect
style="fill:#000000;fill-opacity:1;stroke:none"
id="rect3781-1"
width="23.38983"
height="0.67796612"
x="7.6271191"
y="21.61017" />
<rect
style="fill:#000000;fill-opacity:1;stroke:none"
id="rect3781-7"
width="23.38983"
height="0.67796612"
x="7.4576273"
y="26.152542" />
<rect
style="fill:#000000;fill-opacity:1;stroke:none"
id="rect3781-1-4"
width="23.38983"
height="0.67796612"
x="7.6271186"
y="17.033899" />
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -1,662 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="240.00000"
inkscape:export-xdpi="240.00000"
inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
sodipodi:docname="bookmark.svg"
inkscape:version="0.48.1 r9760"
sodipodi:version="0.32"
id="svg249"
height="48.000000px"
width="48.000000px"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1"
viewbox="0 0 48 48">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 24 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="48 : 24 : 1"
inkscape:persp3d-origin="24 : 16 : 1"
id="perspective100" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5060"
id="radialGradient5031"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
cx="605.71429"
cy="486.64789"
fx="605.71429"
fy="486.64789"
r="117.14286" />
<linearGradient
inkscape:collect="always"
id="linearGradient5060">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop5062" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop5064" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5060"
id="radialGradient5029"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
cx="605.71429"
cy="486.64789"
fx="605.71429"
fy="486.64789"
r="117.14286" />
<linearGradient
id="linearGradient5048">
<stop
style="stop-color:black;stop-opacity:0;"
offset="0"
id="stop5050" />
<stop
id="stop5056"
offset="0.5"
style="stop-color:black;stop-opacity:1;" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop5052" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5048"
id="linearGradient5027"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
x1="302.85715"
y1="366.64789"
x2="302.85715"
y2="609.50507" />
<linearGradient
inkscape:collect="always"
id="linearGradient2906">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2908" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop2910" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient2896">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop2898" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop2900" />
</linearGradient>
<linearGradient
id="linearGradient2598">
<stop
style="stop-color:#859dbc;stop-opacity:1;"
offset="0"
id="stop2600" />
<stop
style="stop-color:#547299;stop-opacity:1;"
offset="1"
id="stop2602" />
</linearGradient>
<linearGradient
id="linearGradient2590">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2592" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop2594" />
</linearGradient>
<linearGradient
id="linearGradient5897">
<stop
style="stop-color:#000000;stop-opacity:0.0000000;"
offset="0.0000000"
id="stop5899" />
<stop
id="stop5905"
offset="0.50000000"
style="stop-color:#000000;stop-opacity:0.56701028;" />
<stop
style="stop-color:#000000;stop-opacity:0.0000000;"
offset="1.0000000"
id="stop5901" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient5866">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop5868" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop5870" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4404">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop4406" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop4408" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4542">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop4544" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop4546" />
</linearGradient>
<linearGradient
id="linearGradient15662">
<stop
id="stop15664"
offset="0.0000000"
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
<stop
id="stop15666"
offset="1.0000000"
style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient269">
<stop
id="stop270"
offset="0.0000000"
style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
<stop
id="stop271"
offset="1.0000000"
style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient259">
<stop
id="stop260"
offset="0.0000000"
style="stop-color:#fafafa;stop-opacity:1.0000000;" />
<stop
id="stop261"
offset="1.0000000"
style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient12512">
<stop
id="stop12513"
offset="0.0000000"
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
<stop
id="stop12517"
offset="0.50000000"
style="stop-color:#fff520;stop-opacity:0.89108908;" />
<stop
id="stop12514"
offset="1.0000000"
style="stop-color:#fff300;stop-opacity:0.0000000;" />
</linearGradient>
<radialGradient
r="14.375000"
fy="125.00000"
fx="55.000000"
cy="125.00000"
cx="55.000000"
gradientUnits="userSpaceOnUse"
id="radialGradient278"
xlink:href="#linearGradient12512"
inkscape:collect="always" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient269"
id="radialGradient15656"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.968273,0.000000,0.000000,1.036374,3.250000,0.489522)"
cx="8.8244190"
cy="3.7561285"
fx="8.8244190"
fy="3.7561285"
r="37.751713" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient259"
id="radialGradient15658"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.960493,0.000000,0.000000,1.044769,-0.103553,-0.159183)"
cx="33.966679"
cy="35.736916"
fx="33.966679"
fy="35.736916"
r="86.708450" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient15662"
id="radialGradient15668"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.973033,0.000000,0.000000,1.034937,3.168754,0.555277)"
cx="8.1435566"
cy="7.2678967"
fx="8.1435566"
fy="7.2678967"
r="38.158695" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4542"
id="radialGradient4548"
cx="24.306795"
cy="42.07798"
fx="24.306795"
fy="42.07798"
r="15.821514"
gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,0.000000,30.08928)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4404"
id="linearGradient4410"
x1="16.812500"
y1="1.8750000"
x2="16.812500"
y2="4.7187500"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1.319549,0.000000,0.000000,1.362060,40.38853,-0.362057)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5866"
id="linearGradient5872"
x1="19.452349"
y1="13.174174"
x2="19.685436"
y2="27.095339"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.224255,0.000000,0.000000,1.282176,0.371569,0.264657)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5897"
id="linearGradient5903"
x1="19.000000"
y1="9.7738247"
x2="19.000000"
y2="15.635596"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.319549,0.000000,0.000000,2.133926,-4.476133,-14.64845)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2590"
id="linearGradient2596"
x1="19.970377"
y1="6.1167107"
x2="19.970377"
y2="2.53125"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.319549,0.000000,0.000000,1.280356,-5.745298,0.249007)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2598"
id="linearGradient2604"
x1="18.431311"
y1="19.119474"
x2="18.402472"
y2="4.2702327"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.319549,0.000000,0.000000,1.299013,-3.106200,-1.336165)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2896"
id="linearGradient2902"
x1="14.584077"
y1="1.6392649"
x2="14.552828"
y2="2.4912448"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.000000,0.000000,0.000000,1.594214,0.000000,-0.790249)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2906"
id="linearGradient2912"
x1="13.354311"
y1="1.4866425"
x2="14.075844"
y2="2.4017651"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.000000,0.000000,0.000000,1.184816,0.000000,-0.727880)" />
</defs>
<sodipodi:namedview
inkscape:window-y="158"
inkscape:window-x="433"
inkscape:window-height="690"
inkscape:window-width="872"
inkscape:document-units="px"
inkscape:grid-bbox="true"
showgrid="false"
inkscape:current-layer="layer5"
inkscape:cy="24"
inkscape:cx="24"
inkscape:zoom="9.8333333"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="0.25490196"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:showpageshadow="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-maximized="0" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>New Bookmark</dc:title>
<dc:subject>
<rdf:Bag>
<rdf:li>bookmark</rdf:li>
<rdf:li>remember</rdf:li>
<rdf:li>favorite</rdf:li>
</rdf:Bag>
</dc:subject>
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
<dc:creator>
<cc:Agent>
<dc:title>Andreas Nilsson</dc:title>
</cc:Agent>
</dc:creator>
<dc:source />
<dc:contributor>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:contributor>
<dc:description>create bookmark action</dc:description>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
id="layer6"
inkscape:label="Shadow">
<g
style="display:inline"
id="g5022"
transform="matrix(2.165152e-2,0,0,1.485743e-2,43.0076,42.68539)">
<rect
y="-150.69685"
x="-1559.2523"
height="478.35718"
width="1339.6335"
id="rect4173"
style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
sodipodi:nodetypes="cccc"
id="path5058"
d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
id="path5018"
sodipodi:nodetypes="cccc" />
</g>
</g>
<g
style="display:inline"
inkscape:groupmode="layer"
inkscape:label="Base"
id="layer1">
<rect
style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
id="rect15391"
width="34.875000"
height="41.063431"
x="6.5000000"
y="3.5000000"
ry="1.1490481"
rx="1.1490486" />
<rect
style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
id="rect15660"
width="32.937012"
height="39.028210"
x="7.5024552"
y="4.5010486"
ry="0.14904849"
rx="0.14904852" />
<path
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.017543854"
d="M 11.505723,5.4942766 L 11.505723,43.400869"
id="path15672"
sodipodi:nodetypes="cc" />
<path
style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.20467831"
d="M 12.500000,5.0205154 L 12.500000,43.038228"
id="path15674"
sodipodi:nodetypes="cc" />
</g>
<g
inkscape:groupmode="layer"
id="layer5"
inkscape:label="Text"
style="display:inline">
<g
id="g2188">
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15686"
width="20.000006"
height="1.0000000"
x="15.999994"
y="9.0000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15688"
width="20.000006"
height="1.0000000"
x="15.999994"
y="11.000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15690"
width="20.000006"
height="1.0000000"
x="15.999994"
y="13.000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15692"
width="20.000006"
height="1.0000000"
x="15.999994"
y="15.000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15694"
width="20.000006"
height="1.0000000"
x="15.999994"
y="17.000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15696"
width="20.000006"
height="1.0000000"
x="15.999994"
y="19.000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15698"
width="20.000006"
height="1.0000000"
x="15.999994"
y="21.000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15700"
width="20.000006"
height="1.0000000"
x="15.999994"
y="23.000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15732"
width="9.0000057"
height="1.0000000"
x="15.999986"
y="25.000000"
rx="0.062003858"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15736"
width="20.000006"
height="1.0000000"
x="15.999986"
y="29.000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15738"
width="20.000006"
height="1.0000000"
x="15.999986"
y="31.000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15740"
width="20.000006"
height="1.0000000"
x="15.999986"
y="33.000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15742"
width="20.000006"
height="1.0000000"
x="15.999986"
y="35.000000"
rx="0.13778631"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
id="rect15744"
width="14.000014"
height="1.0000000"
x="15.999986"
y="37.000000"
rx="0.096450485"
ry="0.065390877" />
</g>
<path
style="opacity:0.28021976;fill:url(#linearGradient5872);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 28.245858,31.324906 L 21.147869,27.133701 L 14.30757,30.8838 L 13.761859,3.9475667 L 28.549598,3.9475667 L 28.245858,31.324906 z "
id="path5138"
sodipodi:nodetypes="cccccc" />
<path
style="fill:url(#linearGradient2604);fill-opacity:1;fill-rule:evenodd;stroke:#364878;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
d="M 12.427339,3.5180202 C 12.427339,3.5180202 12.240033,0.60520607 15.107867,0.54270607 L 25.119343,0.50728624 C 26.277287,0.50728624 26.581888,1.1910178 26.581888,2.1095589 L 26.581888,29.729916 L 20.545426,24.533862 L 14.674346,29.729916 L 14.591655,3.519629 L 12.427339,3.5180202 z "
id="path2204"
sodipodi:nodetypes="ccccccccc" />
<path
style="opacity:0.4450549;fill:url(#linearGradient4410);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 13.030252,3.0117919 C 13.011046,2.225362 13.312918,1.0801307 15.375418,1.0176307 L 25.027906,1 C 25.640922,1 26.090152,1.1674319 26.090152,1.7994802 L 26.060994,10.491851 L 15.317102,10.491851 L 15.192102,2.9993251 C 15.192102,2.9993251 13.030252,3.0117919 13.030252,3.0117919 z "
id="path3668"
sodipodi:nodetypes="cccccccs" />
<rect
style="opacity:0.28021976;fill:url(#linearGradient5903);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect5895"
width="10.556392"
height="12.803556"
x="15.317101"
y="6.6907959"
rx="0.062003858"
ry="0.065390877" />
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2596);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.19125683;display:inline"
d="M 24.476832,2.2095507 L 25.575535,3.113139 L 25.547445,27.511911 L 20.497463,23.203758 L 15.704084,27.415203 L 15.699081,2.7495618 L 24.476832,2.2095507 z "
id="path5969"
sodipodi:nodetypes="ccccccc" />
<path
style="opacity:0.48295456;color:#000000;fill:url(#linearGradient2912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 15.158602,3.9384083 L 15.114407,1.0335178 C 12.983906,1.0335178 12.993087,2.9680775 12.993087,3.9384083 L 15.158602,3.9384083 z "
id="path2894"
sodipodi:nodetypes="cccc" />
<path
sodipodi:nodetypes="cccc"
id="path2904"
d="M 15.158602,3.9384086 L 15.114407,1.8247593 C 12.81631,1.8426926 12.993087,3.9384086 12.993087,3.9384086 L 15.158602,3.9384086 z "
style="opacity:0.35795455;color:#000000;fill:url(#linearGradient2902);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 28 KiB

View File

@ -1,7 +0,0 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg height="40" width="40" xmlns="http://www.w3.org/2000/svg">
<path d="M2.379,14.729 5.208,11.899 12.958,19.648 25.877,6.733 28.707,9.561 12.958,25.308z" fill="#333333"></path>
</svg>

Before

Width:  |  Height:  |  Size: 401 B

View File

@ -1,533 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="document-print.svg"
sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
inkscape:version="0.46"
sodipodi:version="0.32"
id="svg2994"
height="48px"
width="48px"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
viewbox="0 0 48 48">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 24 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="48 : 24 : 1"
inkscape:persp3d-origin="24 : 16 : 1"
id="perspective84" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5060"
id="radialGradient5031"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
cx="605.71429"
cy="486.64789"
fx="605.71429"
fy="486.64789"
r="117.14286" />
<linearGradient
inkscape:collect="always"
id="linearGradient5060">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop5062" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop5064" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5060"
id="radialGradient5029"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
cx="605.71429"
cy="486.64789"
fx="605.71429"
fy="486.64789"
r="117.14286" />
<linearGradient
id="linearGradient5048">
<stop
style="stop-color:black;stop-opacity:0;"
offset="0"
id="stop5050" />
<stop
id="stop5056"
offset="0.5"
style="stop-color:black;stop-opacity:1;" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop5052" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5048"
id="linearGradient5027"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
x1="302.85715"
y1="366.64789"
x2="302.85715"
y2="609.50507" />
<linearGradient
inkscape:collect="always"
id="linearGradient7612">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop7614" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop7616" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient7612"
id="radialGradient7618"
cx="24.000000"
cy="41.875000"
fx="24.000000"
fy="41.875000"
r="19.125000"
gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,0.000000,27.91667)"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient4762">
<stop
style="stop-color:#ffffff;stop-opacity:0.12371134;"
offset="0.0000000"
id="stop4764" />
<stop
id="stop4768"
offset="0.10344828"
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop4766" />
</linearGradient>
<linearGradient
id="linearGradient4741">
<stop
id="stop4743"
offset="0.0000000"
style="stop-color:#dcdcda;stop-opacity:1.0000000;" />
<stop
id="stop4745"
offset="1.0000000"
style="stop-color:#bab9b7;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient4733">
<stop
id="stop4735"
offset="0.0000000"
style="stop-color:#000000;stop-opacity:0.23711340;" />
<stop
id="stop4737"
offset="1"
style="stop-color:#000000;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient4698">
<stop
id="stop4700"
offset="0.0000000"
style="stop-color:#fffffd;stop-opacity:1.0000000;" />
<stop
style="stop-color:#bbbbb9;stop-opacity:1.0000000;"
offset="0.50000000"
id="stop4706" />
<stop
id="stop4702"
offset="1.0000000"
style="stop-color:#000000;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient4688">
<stop
id="stop4690"
offset="0.0000000"
style="stop-color:#666666;stop-opacity:1.0000000;" />
<stop
id="stop4692"
offset="1"
style="stop-color:#000000;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient4680"
inkscape:collect="always">
<stop
id="stop4682"
offset="0"
style="stop-color:#f7f6f5;stop-opacity:1;" />
<stop
id="stop4684"
offset="1"
style="stop-color:#f7f6f5;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient4668">
<stop
id="stop4670"
offset="0"
style="stop-color:#8e8d87;stop-opacity:1;" />
<stop
style="stop-color:#cbc9c1;stop-opacity:1.0000000;"
offset="0.27586207"
id="stop4676" />
<stop
id="stop4672"
offset="1.0000000"
style="stop-color:#8e8d87;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient259">
<stop
id="stop260"
offset="0.0000000"
style="stop-color:#e0e0e0;stop-opacity:1.0000000;" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="0.40546969"
id="stop4886" />
<stop
style="stop-color:#cdcdcd;stop-opacity:1.0000000;"
offset="0.53448278"
id="stop4884" />
<stop
id="stop261"
offset="1.0000000"
style="stop-color:#494949;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient15662">
<stop
id="stop15664"
offset="0.0000000"
style="stop-color:#ffffff;stop-opacity:0.0000000;" />
<stop
id="stop15666"
offset="1.0000000"
style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
</linearGradient>
<radialGradient
r="2.1227016"
fy="26.925594"
fx="9.1295490"
cy="26.925594"
cx="9.1295490"
gradientUnits="userSpaceOnUse"
id="radialGradient1433"
xlink:href="#linearGradient4698"
inkscape:collect="always" />
<linearGradient
y2="72.064316"
x2="9.9128132"
y1="57.227650"
x1="9.8698082"
gradientTransform="matrix(2.772086,0.000000,0.000000,0.360739,0.618718,2.883883)"
gradientUnits="userSpaceOnUse"
id="linearGradient1447"
xlink:href="#linearGradient4733"
inkscape:collect="always" />
<linearGradient
y2="54.136139"
x2="10.338233"
y1="64.652260"
x1="10.338233"
gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
gradientUnits="userSpaceOnUse"
id="linearGradient1451"
xlink:href="#linearGradient4680"
inkscape:collect="always" />
<linearGradient
y2="62.282467"
x2="9.7052784"
y1="70.724976"
x1="9.7316532"
gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
gradientUnits="userSpaceOnUse"
id="linearGradient1453"
xlink:href="#linearGradient4688"
inkscape:collect="always" />
<linearGradient
y2="19.337463"
x2="20.717800"
y1="25.140253"
x1="20.771229"
gradientTransform="matrix(1.198769,0,0,0.853565,-0.143086,2.034513)"
gradientUnits="userSpaceOnUse"
id="linearGradient1456"
xlink:href="#linearGradient15662"
inkscape:collect="always" />
<linearGradient
y2="25.247311"
x2="24.789707"
y1="3.6785457"
x1="25.056711"
gradientTransform="matrix(0.944939,0,0,1.076147,6.844577e-2,4.093177)"
gradientUnits="userSpaceOnUse"
id="linearGradient1459"
xlink:href="#linearGradient259"
inkscape:collect="always" />
<linearGradient
y2="58.831264"
x2="15.487823"
y1="32.539238"
x1="15.387969"
gradientTransform="matrix(1.490161,0,0,0.668741,8.895132e-2,2)"
gradientUnits="userSpaceOnUse"
id="linearGradient1464"
xlink:href="#linearGradient4762"
inkscape:collect="always" />
<linearGradient
y2="88.294930"
x2="18.972126"
y1="88.294930"
x1="1.8456430"
gradientTransform="matrix(2.291824,0,0,0.434269,8.855179e-2,2)"
gradientUnits="userSpaceOnUse"
id="linearGradient1468"
xlink:href="#linearGradient4741"
inkscape:collect="always" />
<linearGradient
y2="88.294933"
x2="18.972126"
y1="88.294933"
x1="1.8456431"
gradientTransform="matrix(2.30272,0,0,0.437918,0,0.584034)"
gradientUnits="userSpaceOnUse"
id="linearGradient1471"
xlink:href="#linearGradient4668"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
inkscape:window-y="160"
inkscape:window-x="331"
inkscape:window-height="688"
inkscape:window-width="872"
inkscape:guide-bbox="true"
showguides="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
showgrid="false"
inkscape:current-layer="layer1"
inkscape:cy="-18.264187"
inkscape:cx="-72.591911"
inkscape:zoom="1"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="0.090196078"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:showpageshadow="false"
fill="#729fcf" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Print Document</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
<dc:source>http://jimmac.musichall.cz</dc:source>
<dc:subject>
<rdf:Bag>
<rdf:li>document</rdf:li>
<rdf:li>lpr</rdf:li>
<rdf:li>print</rdf:li>
<rdf:li>local</rdf:li>
<rdf:li>laser</rdf:li>
<rdf:li>bubblejet</rdf:li>
<rdf:li>inkjet</rdf:li>
<rdf:li>print</rdf:li>
<rdf:li>output</rdf:li>
<rdf:li>cups</rdf:li>
<rdf:li>lpd</rdf:li>
</rdf:Bag>
</dc:subject>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
inkscape:label="Layer 1"
id="layer1">
<g
style="display:inline"
id="g5022"
transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,39.75228)">
<rect
y="-150.69685"
x="-1559.2523"
height="478.35718"
width="1339.6335"
id="rect4173"
style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
sodipodi:nodetypes="cccc"
id="path5058"
d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
id="path5018"
sodipodi:nodetypes="cccc" />
</g>
<rect
ry="1.7115477"
rx="1.7115483"
y="36.004189"
x="4.75"
height="6.4915943"
width="38.4375"
id="rect4652"
style="fill:url(#linearGradient1471);fill-opacity:1;stroke:#595959;stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1" />
<path
sodipodi:nodetypes="cssssssssssss"
id="rect4609"
d="M 7.1308961,21.5 L 40.870615,21.5 C 41.255661,21.5 41.747648,21.788155 42.051049,22.223919 C 42.354451,22.659684 43.787518,24.83394 44.109448,25.297964 C 44.431378,25.761987 44.502397,26.201852 44.502397,26.774049 L 44.502397,38.850951 C 44.502397,39.764524 43.770402,40.5 42.861152,40.5 L 5.1403596,40.5 C 4.2311094,40.5 3.4991138,39.764524 3.4991138,38.850951 L 3.4991138,26.774049 C 3.4991138,26.280031 3.6002798,25.571641 3.9455202,25.120718 C 4.3811666,24.551713 5.5498664,22.57277 5.8581276,22.153118 C 6.1663887,21.733467 6.7324461,21.5 7.1308961,21.5 z "
style="color:#000000;fill:url(#linearGradient1468);fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
sodipodi:nodetypes="cssssssss"
id="path4718"
d="M 7.705278,21.975532 C 7.20729,21.975532 6.5669691,22.107308 6.3043987,22.511224 L 4.4657443,25.339651 C 4.169761,25.794966 4.4993705,26.868141 5.3900051,26.868141 L 42.678553,26.868141 C 43.883282,26.868141 43.8868,25.858073 43.602814,25.428039 L 41.851714,22.776389 C 41.534204,22.295589 41.418956,21.975532 40.625945,21.975532 L 7.705278,21.975532 z "
style="fill:#fbfbfb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1464);stroke-width:0.94696701;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 7.6002951,22.445756 L 40.374658,22.445756 C 40.739745,22.445756 41.206233,22.718629 41.493909,23.131283 C 41.781585,23.543938 42.788049,25.160945 43.093293,25.60036 C 43.398536,26.039775 43.528159,26.456312 43.528159,26.998164 L 43.528159,38.279261 C 43.528159,39.144385 43.394653,39.528356 42.532529,39.528356 L 5.530506,39.528356 C 4.6683828,39.528356 4.472593,39.144385 4.472593,38.279261 L 4.472593,26.998164 C 4.472593,26.530345 4.6930819,25.859523 5.0204282,25.432514 C 5.4334949,24.893685 6.1012112,23.461633 6.393495,23.064237 C 6.6857789,22.666841 7.222497,22.445756 7.6002951,22.445756 z "
id="path4750"
sodipodi:nodetypes="cssssssssssss" />
<path
sodipodi:nodetypes="ccccccc"
id="rect15391"
d="M 11.68177,4.4977642 L 36.313839,4.4977642 C 36.964072,4.4977642 37.487546,5.007949 37.487546,5.6416762 L 37.487546,24.348117 L 10.508063,24.348117 L 10.508063,5.6416762 C 10.508063,5.007949 11.031536,4.4977642 11.68177,4.4977642 z "
style="color:#000000;fill:url(#linearGradient1459);fill-opacity:1;fill-rule:nonzero;stroke:#898989;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
<rect
style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1456);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
id="rect15660"
width="25.000576"
height="18.836374"
x="11.498513"
y="5.4992466"
ry="0.17677675"
rx="0.17677672" />
<rect
ry="1.7115483"
rx="1.7115483"
y="27.375000"
x="6.8750000"
height="5.1875000"
width="33.750000"
id="rect4678"
style="fill:url(#linearGradient1451);fill-opacity:1.0000000;stroke:url(#linearGradient1453);stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
<path
transform="translate(0.000000,2.000000)"
d="M 10.871767 27.626486 A 1.2816310 1.2816310 0 1 1 8.3085046,27.626486 A 1.2816310 1.2816310 0 1 1 10.871767 27.626486 z"
sodipodi:ry="1.2816310"
sodipodi:rx="1.2816310"
sodipodi:cy="27.626486"
sodipodi:cx="9.5901356"
id="path4696"
style="fill:url(#radialGradient1433);fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="csscssssc"
id="path4731"
d="M 11.743718,25.416053 L 37.306218,25.478553 C 37.993716,25.480234 38.294038,25.107558 38.243718,24.478553 L 38.118718,22.916053 L 39.984835,22.916053 C 40.797335,22.916053 40.975035,23.108616 41.172335,23.478553 L 41.672335,24.416053 C 42.199130,25.403793 43.483508,26.390165 42.170495,26.390165 C 37.667784,26.390165 13.993718,26.041053 11.743718,25.416053 z "
style="fill:url(#linearGradient1447);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.36571429" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 42.9375,26.5 L 4.8125,26.5"
id="path4760"
sodipodi:nodetypes="cc" />
<g
transform="translate(0.000000,2.000000)"
style="opacity:0.43575415"
id="g4849">
<rect
style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
id="rect4831"
width="19.000000"
height="1.0000000"
x="14.000000"
y="5.0000000" />
<rect
y="7.0000000"
x="14.000000"
height="1.0000000"
width="19.000000"
id="rect4833"
style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
<rect
style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
id="rect4835"
width="19.000000"
height="1.0000000"
x="14.000000"
y="9.0000000" />
<rect
y="11.000000"
x="14.000000"
height="1.0000000"
width="19.000000"
id="rect4837"
style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
<rect
style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
id="rect4839"
width="11.000000"
height="1.0000000"
x="14.000000"
y="13.000000" />
</g>
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="arrow">
<path
sodipodi:nodetypes="cccccccc"
id="path8643"
d="M 21.02159,20.989431 L 27.989391,20.989431 L 27.989391,16.064984 L 31,16.064984 L 24.553756,8 L 17.435622,15.986875 L 21.023684,15.986875 L 21.02159,20.989431 z "
style="opacity:1;color:#000000;fill:#a7a7a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 23 KiB

View File

@ -1,620 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="document-save.svg"
sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
inkscape:version="0.46"
sodipodi:version="0.32"
id="svg2913"
height="48px"
width="48px"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
viewbox="0 0 48 48">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 24 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="48 : 24 : 1"
inkscape:persp3d-origin="24 : 16 : 1"
id="perspective104" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5060"
id="radialGradient5031"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
cx="605.71429"
cy="486.64789"
fx="605.71429"
fy="486.64789"
r="117.14286" />
<linearGradient
inkscape:collect="always"
id="linearGradient5060">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop5062" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop5064" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5060"
id="radialGradient5029"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
cx="605.71429"
cy="486.64789"
fx="605.71429"
fy="486.64789"
r="117.14286" />
<linearGradient
id="linearGradient5048">
<stop
style="stop-color:black;stop-opacity:0;"
offset="0"
id="stop5050" />
<stop
id="stop5056"
offset="0.5"
style="stop-color:black;stop-opacity:1;" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop5052" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5048"
id="linearGradient5027"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
x1="302.85715"
y1="366.64789"
x2="302.85715"
y2="609.50507" />
<linearGradient
inkscape:collect="always"
id="linearGradient6925">
<stop
style="stop-color:#204a87;stop-opacity:1;"
offset="0"
id="stop6927" />
<stop
style="stop-color:#204a87;stop-opacity:0;"
offset="1"
id="stop6929" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient6901">
<stop
style="stop-color:#3465a4;stop-opacity:1;"
offset="0"
id="stop6903" />
<stop
style="stop-color:#3465a4;stop-opacity:0;"
offset="1"
id="stop6905" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4991">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop4993" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop4995" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4991"
id="radialGradient4997"
cx="23.447077"
cy="6.4576745"
fx="23.447077"
fy="6.4576745"
r="19.0625"
gradientTransform="matrix(-1.314471,-1.006312e-2,-1.022964e-2,1.336221,46.22108,-4.909887)"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient2187"
inkscape:collect="always">
<stop
id="stop2189"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop2191"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2187"
id="linearGradient1764"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.914114,1.412791e-16,-1.412791e-16,0.914114,-3.868698,-2.706902)"
x1="33.059906"
y1="27.394117"
x2="12.624337"
y2="12.583769" />
<linearGradient
inkscape:collect="always"
id="linearGradient8662">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop8664" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop8666" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8662"
id="radialGradient8668"
cx="24.837126"
cy="36.421127"
fx="24.837126"
fy="36.421127"
r="15.644737"
gradientTransform="matrix(1.000000,-7.816467e-32,-1.132409e-32,0.536723,-5.897962e-14,16.87306)"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient2555">
<stop
id="stop2557"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
style="stop-color:#e6e6e6;stop-opacity:1.0000000;"
offset="0.50000000"
id="stop2561" />
<stop
id="stop2563"
offset="0.75000000"
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
<stop
style="stop-color:#e1e1e1;stop-opacity:1.0000000;"
offset="0.84166664"
id="stop2565" />
<stop
id="stop2559"
offset="1.0000000"
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient4274">
<stop
style="stop-color:#ffffff;stop-opacity:0.25490198;"
offset="0.0000000"
id="stop4276" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop4278" />
</linearGradient>
<linearGradient
id="linearGradient4264"
inkscape:collect="always">
<stop
id="stop4266"
offset="0"
style="stop-color:#000000;stop-opacity:1;" />
<stop
id="stop4268"
offset="1"
style="stop-color:#000000;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient4254"
inkscape:collect="always">
<stop
id="stop4256"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop4258"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient4244">
<stop
id="stop4246"
offset="0.0000000"
style="stop-color:#e4e4e4;stop-opacity:1.0000000;" />
<stop
id="stop4248"
offset="1.0000000"
style="stop-color:#d3d3d3;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient4236"
inkscape:collect="always">
<stop
id="stop4238"
offset="0"
style="stop-color:#eeeeee;stop-opacity:1;" />
<stop
id="stop4240"
offset="1"
style="stop-color:#eeeeee;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient4228">
<stop
id="stop4230"
offset="0.0000000"
style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
<stop
id="stop4232"
offset="1.0000000"
style="stop-color:#9f9f9f;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient4184">
<stop
id="stop4186"
offset="0.0000000"
style="stop-color:#838383;stop-opacity:1.0000000;" />
<stop
id="stop4188"
offset="1.0000000"
style="stop-color:#bbbbbb;stop-opacity:0.0000000;" />
</linearGradient>
<linearGradient
gradientTransform="translate(0.795493,3.799180)"
y2="35.281250"
x2="24.687500"
y1="35.281250"
x1="7.0625000"
gradientUnits="userSpaceOnUse"
id="linearGradient4209"
xlink:href="#linearGradient4184"
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="40.943935"
x2="36.183067"
y1="28.481176"
x1="7.6046205"
id="linearGradient4234"
xlink:href="#linearGradient4228"
inkscape:collect="always"
gradientTransform="translate(0.000000,5.125000)" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="33.758667"
x2="12.221823"
y1="37.205811"
x1="12.277412"
id="linearGradient4242"
xlink:href="#linearGradient4236"
inkscape:collect="always"
gradientTransform="translate(0.000000,5.125000)" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.286242,0.781698,-0.710782,1.169552,-2.354348,0.248140)"
r="20.935817"
fy="2.9585190"
fx="15.571491"
cy="2.9585190"
cx="15.571491"
id="radialGradient4250"
xlink:href="#linearGradient4244"
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="47.620636"
x2="44.096100"
y1="4.4331360"
x1="12.378357"
id="linearGradient4260"
xlink:href="#linearGradient4254"
inkscape:collect="always"
gradientTransform="translate(0.000000,5.125000)" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.000000,0.000000,0.000000,0.651032,-2.885063e-16,9.455693)"
r="23.555494"
fy="27.096155"
fx="23.201941"
cy="27.096155"
cx="23.201941"
id="radialGradient4270"
xlink:href="#linearGradient4264"
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="26.357183"
x2="23.688078"
y1="11.318835"
x1="23.688078"
id="linearGradient4272"
xlink:href="#linearGradient4274"
inkscape:collect="always"
gradientTransform="translate(0.000000,5.125000)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2555"
id="linearGradient2553"
x1="33.431175"
y1="31.964777"
x2="21.747974"
y2="11.780679"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6901"
id="linearGradient6907"
x1="14.751649"
y1="15.868432"
x2="8.8953285"
y2="16.743431"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6925"
id="linearGradient6931"
x1="12.25"
y1="18.25"
x2="7"
y2="21.118431"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
inkscape:window-y="30"
inkscape:window-x="0"
inkscape:window-height="818"
inkscape:window-width="999"
inkscape:document-units="px"
inkscape:grid-bbox="true"
showgrid="false"
inkscape:current-layer="layer2"
inkscape:cy="11.891468"
inkscape:cx="-133.68151"
inkscape:zoom="1"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="0.22745098"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:showpageshadow="false"
fill="#3465a4"
stroke="#204a87" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Save</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:subject>
<rdf:Bag>
<rdf:li>hdd</rdf:li>
<rdf:li>hard drive</rdf:li>
<rdf:li>save</rdf:li>
<rdf:li>io</rdf:li>
<rdf:li>store</rdf:li>
</rdf:Bag>
</dc:subject>
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
<dc:identifier />
<dc:source>http://jimmac.musichall.cz</dc:source>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="pix"
id="layer2"
inkscape:groupmode="layer">
<g
style="display:inline"
id="g5022"
transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,41.75228)">
<rect
y="-150.69685"
x="-1559.2523"
height="478.35718"
width="1339.6335"
id="rect4173"
style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
sodipodi:nodetypes="cccc"
id="path5058"
d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
id="path5018"
sodipodi:nodetypes="cccc" />
</g>
<path
sodipodi:nodetypes="cccsccccccccc"
id="path4196"
d="M 11.28569,13.087628 C 10.66069,13.087628 10.254441,13.377808 10.004442,13.931381 C 10.004441,13.931381 3.5356915,31.034938 3.5356915,31.034938 C 3.5356915,31.034938 3.2856915,31.706497 3.2856915,32.816188 C 3.2856915,32.816188 3.2856915,42.466156 3.2856915,42.466156 C 3.2856915,43.548769 3.943477,44.091158 4.9419415,44.091156 L 43.50444,44.091156 C 44.489293,44.091156 45.09819,43.372976 45.09819,42.247406 L 45.09819,32.597438 C 45.09819,32.597438 45.204153,31.827015 45.00444,31.284938 L 38.28569,14.087631 C 38.101165,13.575725 37.648785,13.099533 37.16069,13.087628 L 11.28569,13.087628 z "
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#535353;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="ccccccccc"
id="path4170"
d="M 3.2735915,32.121812 L 4.0381936,31.429597 L 41.647883,31.492097 L 45.11029,31.809395 L 45.11029,42.247927 C 45.11029,43.373496 44.503272,44.091258 43.518419,44.091258 L 4.9354314,44.091258 C 3.9369667,44.091258 3.2735915,43.549207 3.2735915,42.466594 L 3.2735915,32.121812 z "
style="fill:url(#linearGradient4234);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.02044296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="csccccccs"
id="path3093"
d="M 3.5490842,31.039404 C 2.8347985,32.50369 3.5484686,33.432261 4.5847985,33.432261 C 4.5847985,33.432261 43.584797,33.432261 43.584797,33.432261 C 44.703844,33.408451 45.430035,32.420356 45.013368,31.289403 L 38.299082,14.078704 C 38.114558,13.566798 37.64432,13.090606 37.156225,13.078701 L 11.299083,13.078701 C 10.674083,13.078701 10.263369,13.382274 10.01337,13.935847 C 10.01337,13.935847 3.5490842,31.039404 3.5490842,31.039404 z "
style="fill:url(#radialGradient4250);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<rect
y="36.299183"
x="7.857996"
height="5.5625"
width="17.625"
id="rect4174"
style="opacity:1;color:#000000;fill:url(#linearGradient4209);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.40899992;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
sodipodi:nodetypes="cscc"
id="path4194"
d="M 7.8579947,41.86168 C 7.8579947,41.86168 7.8579947,37.850195 7.8579947,37.850195 C 9.6935221,41.029421 16.154485,41.86168 20.795492,41.86168 C 20.795492,41.86168 7.8579947,41.86168 7.8579947,41.86168 z "
style="opacity:0.81142853;fill:url(#linearGradient4242);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="cccccccc"
id="path4201"
d="M 44.796162,30.753688 C 44.859684,32.003662 44.382159,33.069528 43.474046,33.097438 C 43.474046,33.097438 5.3553296,33.097437 5.3553297,33.097438 C 4.0660978,33.097438 3.4875937,32.772491 3.271279,32.229382 C 3.3630404,33.173714 4.0970964,33.878688 5.3553297,33.878688 C 5.3553296,33.878687 43.474046,33.878688 43.474046,33.878688 C 44.550053,33.845617 45.226851,32.454664 44.82621,30.883897 L 44.796162,30.753688 z "
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
id="path4211"
d="M 10.96875,15.28125 C 10.922675,15.481571 10.78125,15.668047 10.78125,15.875 C 10.78125,16.823605 11.37223,17.664474 12.125,18.46875 C 12.365268,18.314675 12.490117,18.114342 12.75,17.96875 C 11.809691,17.152746 11.196604,16.252168 10.96875,15.28125 z M 37.625,15.28125 C 37.396273,16.250866 36.782988,17.153676 35.84375,17.96875 C 36.117894,18.122332 36.247738,18.33699 36.5,18.5 C 37.257262,17.693344 37.8125,16.826956 37.8125,15.875 C 37.8125,15.668047 37.670906,15.481571 37.625,15.28125 z M 39.8125,23.71875 C 39.198709,27.758861 32.513887,30.96875 24.28125,30.96875 C 16.068996,30.968751 9.4211001,27.775964 8.78125,23.75 C 8.7488928,23.947132 8.65625,24.141882 8.65625,24.34375 C 8.6562503,28.661697 15.645354,32.187501 24.28125,32.1875 C 32.917146,32.1875 39.937499,28.661698 39.9375,24.34375 C 39.9375,24.130826 39.848449,23.926394 39.8125,23.71875 z "
style="opacity:0.69142857;color:#000000;fill:url(#linearGradient4272);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
transform="translate(8.838843e-2,5.301780)"
d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1 5.833631,25.593554 A 1.3700194 1.016466 0 1 1 8.5736699 25.593554 z"
sodipodi:ry="1.016466"
sodipodi:rx="1.3700194"
sodipodi:cy="25.593554"
sodipodi:cx="7.2036505"
id="path4224"
style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="path4226"
sodipodi:cx="7.2036505"
sodipodi:cy="25.593554"
sodipodi:rx="1.3700194"
sodipodi:ry="1.016466"
d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1 5.833631,25.593554 A 1.3700194 1.016466 0 1 1 8.5736699 25.593554 z"
transform="translate(33.96705,5.213390)" />
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4260);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 11.642515,13.540723 C 11.040823,13.540723 10.649724,13.820081 10.409049,14.35301 C 10.409048,14.35301 3.9940341,30.943732 3.9940341,30.943732 C 3.9940341,30.943732 3.7533573,31.590247 3.7533573,32.658555 C 3.7533573,32.658555 3.7533573,41.948651 3.7533573,41.948651 C 3.7533573,43.303391 4.1974134,43.57555 5.3478414,43.57555 L 43.034746,43.57555 C 44.357872,43.57555 44.569062,43.259153 44.569062,41.738058 L 44.569062,32.447962 C 44.569062,32.447962 44.671072,31.706271 44.478807,31.184409 L 37.885616,14.378434 C 37.707973,13.885617 37.334964,13.552184 36.865071,13.540723 L 11.642515,13.540723 z "
id="path4252"
sodipodi:nodetypes="cccsccccccccc" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
d="M 40.5,36.554166 L 40.5,41.575101"
id="path4282" />
<path
id="path4284"
d="M 38.5,36.613943 L 38.5,41.634878"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
d="M 36.5,36.613943 L 36.5,41.634878"
id="path4286" />
<path
id="path4288"
d="M 34.5,36.613943 L 34.5,41.634878"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
d="M 32.5,36.613943 L 32.5,41.634878"
id="path4290" />
<path
id="path4292"
d="M 30.5,36.613943 L 30.5,41.634878"
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
<path
id="path4294"
d="M 39.5,36.604065 L 39.5,41.625"
style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
<path
style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 37.5,36.663842 L 37.5,41.684777"
id="path4296" />
<path
id="path4298"
d="M 35.5,36.663842 L 35.5,41.684777"
style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
<path
style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
d="M 33.5,36.663842 L 33.5,41.684777"
id="path4300" />
<path
id="path4302"
d="M 31.5,36.663842 L 31.5,41.684777"
style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
<path
id="path4572"
d="M 7.875,36.3125 L 7.875,41.84375 L 20.4375,41.84375 L 8.21875,41.5 L 7.875,36.3125 z "
style="opacity:0.43999999;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:type="arc"
style="opacity:0.20571427;color:#000000;fill:url(#linearGradient2553);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93365198;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42372879;visibility:visible;display:inline;overflow:visible"
id="path2545"
sodipodi:cx="25"
sodipodi:cy="19.5625"
sodipodi:rx="14.875"
sodipodi:ry="6.6875"
d="M 39.875 19.5625 A 14.875 6.6875 0 1 1 10.125,19.5625 A 14.875 6.6875 0 1 1 39.875 19.5625 z"
transform="matrix(1.037815,0.000000,0.000000,1.060747,-1.632878,3.030370)" />
</g>
<g
inkscape:groupmode="layer"
id="layer1"
inkscape:label="down">
<path
transform="matrix(1.130190,1.178179e-16,7.918544e-17,-0.759601,-3.909725,53.66554)"
d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1 9.1923885,36.421127 A 15.644737 8.3968935 0 1 1 40.481863 36.421127 z"
sodipodi:ry="8.3968935"
sodipodi:rx="15.644737"
sodipodi:cy="36.421127"
sodipodi:cx="24.837126"
id="path8660"
style="opacity:0.14117647;color:#000000;fill:url(#radialGradient8668);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
<path
style="opacity:1;color:#000000;fill:url(#linearGradient6907);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient6931);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
d="M 3.2034501,25.835194 C 2.1729477,-5.3853369 28.741616,-0.4511153 28.582416,15.788689 L 35.89533,15.788689 L 24.517652,28.774671 L 12.585426,15.788689 C 12.585426,15.788689 20.126859,15.788689 20.126859,15.788689 C 20.583921,4.8193225 3.4092324,1.6100346 3.2034501,25.835194 z "
id="path1432"
sodipodi:nodetypes="ccccccc" />
<path
sodipodi:nodetypes="ccccccc"
id="path2177"
d="M 7.6642103,9.1041047 C 12.40638,-0.0400306 28.122336,2.7175443 27.761604,16.579393 L 34.078976,16.579393 C 34.078976,16.579393 24.513151,27.536769 24.513151,27.536769 L 14.41668,16.579393 C 14.41668,16.579393 20.87332,16.579393 20.87332,16.579393 C 21.144975,5.0041615 10.922265,5.5345215 7.6642103,9.1041047 z "
style="opacity:0.47159091;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1764);stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
<path
style="opacity:0.49431817;color:#000000;fill:url(#radialGradient4997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 34.767155,16.211613 L 32.782979,18.757322 C 27.372947,17.241029 24.896829,21.486664 17.109284,20.489112 L 13.247998,16.080077 L 20.434468,16.162862 C 20.483219,4.3164571 8.3443098,4.998966 5.0292663,13.627829 C 8.8372201,-1.2611216 27.893316,0.8064118 28.28332,16.114112 L 34.767155,16.211613 z "
id="path4989"
sodipodi:nodetypes="cccccccc" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 29 KiB

View File

@ -1,201 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="go-down.svg"
sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
inkscape:version="0.46"
sodipodi:version="0.32"
id="svg11300"
height="48px"
width="48px"
inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
viewbox="0 0 48 48">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 24 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="48 : 24 : 1"
inkscape:persp3d-origin="24 : 16 : 1"
id="perspective24" />
<linearGradient
id="linearGradient1442">
<stop
id="stop1444"
offset="0"
style="stop-color:#73d216" />
<stop
id="stop1446"
offset="1.0000000"
style="stop-color:#4e9a06" />
</linearGradient>
<linearGradient
id="linearGradient8662"
inkscape:collect="always">
<stop
id="stop8664"
offset="0"
style="stop-color:#000000;stop-opacity:1;" />
<stop
id="stop8666"
offset="1"
style="stop-color:#000000;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient8650"
inkscape:collect="always">
<stop
id="stop8652"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop8654"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8662"
id="radialGradient1444"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
cx="24.837126"
cy="36.421127"
fx="24.837126"
fy="36.421127"
r="15.644737" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient1442"
id="radialGradient1469"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
cx="35.292667"
cy="20.494493"
fx="35.292667"
fy="20.494493"
r="16.956199" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8650"
id="radialGradient1471"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(3.749427e-16,-2.046729,-1.557610,-2.853404e-16,44.11559,66.93275)"
cx="15.987216"
cy="1.5350308"
fx="15.987216"
fy="1.5350308"
r="17.171415" />
</defs>
<sodipodi:namedview
inkscape:window-y="30"
inkscape:window-x="0"
inkscape:window-height="818"
inkscape:window-width="1280"
inkscape:showpageshadow="false"
inkscape:document-units="px"
inkscape:grid-bbox="true"
showgrid="false"
inkscape:current-layer="layer1"
inkscape:cy="23.239067"
inkscape:cx="15.972815"
inkscape:zoom="11.313708"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="0.25490196"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
fill="#4e9a06"
stroke="#4e9a06" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
<dc:title>Go Down</dc:title>
<dc:subject>
<rdf:Bag>
<rdf:li>go</rdf:li>
<rdf:li>lower</rdf:li>
<rdf:li>down</rdf:li>
<rdf:li>arrow</rdf:li>
<rdf:li>pointer</rdf:li>
<rdf:li>&gt;</rdf:li>
</rdf:Bag>
</dc:subject>
<dc:contributor>
<cc:Agent>
<dc:title>Andreas Nilsson</dc:title>
</cc:Agent>
</dc:contributor>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
inkscape:label="Layer 1"
id="layer1">
<path
transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1 9.1923885,36.421127 A 15.644737 8.3968935 0 1 1 40.481863 36.421127 z"
sodipodi:ry="8.3968935"
sodipodi:rx="15.644737"
sodipodi:cy="36.421127"
sodipodi:cx="24.837126"
id="path8660"
style="opacity:0.20454545;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
<g
id="g1464"
transform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.02856,43.99921)">
<path
style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1469);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 14.519136,38.500000 L 32.524165,38.496094 L 32.524165,25.504468 L 40.519531,25.496656 L 23.374809,5.4992135 L 6.5285585,25.497284 L 14.524440,25.501074 L 14.519136,38.500000 z "
id="path8643"
sodipodi:nodetypes="cccccccc" />
<path
style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1471);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
d="M 39.429889,24.993467 L 32.023498,25.005186 L 32.026179,37.998023 L 16.647623,37.98887 C 17.417545,19.64788 27.370272,26.995797 32.029282,16.341991 L 39.429889,24.993467 z "
id="path8645"
sodipodi:nodetypes="cccccc" />
<path
sodipodi:nodetypes="cccccccc"
id="path8658"
d="M 15.520704,37.496094 L 31.522109,37.500000 L 31.522109,24.507050 L 38.338920,24.491425 L 23.384644,7.0388396 L 8.6781173,24.495782 L 15.518018,24.501029 L 15.520704,37.496094 z "
style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 8.2 KiB

View File

@ -1,197 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="go-up.svg"
sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
inkscape:version="0.46"
sodipodi:version="0.32"
id="svg11300"
height="48px"
width="48px"
inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
viewbox="0 0 48 48">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 24 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="48 : 24 : 1"
inkscape:persp3d-origin="24 : 16 : 1"
id="perspective23" />
<linearGradient
id="linearGradient2304">
<stop
id="stop2306"
offset="0"
style="stop-color:#73d216" />
<stop
id="stop2308"
offset="1.0000000"
style="stop-color:#4e9a06" />
</linearGradient>
<linearGradient
id="linearGradient8662"
inkscape:collect="always">
<stop
id="stop8664"
offset="0"
style="stop-color:#000000;stop-opacity:1;" />
<stop
id="stop8666"
offset="1"
style="stop-color:#000000;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient8650"
inkscape:collect="always">
<stop
id="stop8652"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop8654"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8650"
id="radialGradient1438"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-3.749427e-16,-2.046729,1.557610,-2.853404e-16,2.767009,66.93275)"
cx="24.53788"
cy="0.40010813"
fx="24.53788"
fy="0.40010813"
r="17.171415" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient2304"
id="radialGradient1441"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
cx="11.319205"
cy="22.454971"
fx="11.319205"
fy="22.454971"
r="16.956199" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8662"
id="radialGradient1444"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
cx="24.837126"
cy="36.421127"
fx="24.837126"
fy="36.421127"
r="15.644737" />
</defs>
<sodipodi:namedview
inkscape:window-y="30"
inkscape:window-x="0"
inkscape:window-height="818"
inkscape:window-width="1280"
inkscape:showpageshadow="false"
inkscape:document-units="px"
inkscape:grid-bbox="true"
showgrid="false"
inkscape:current-layer="layer1"
inkscape:cy="25.620377"
inkscape:cx="9.6380363"
inkscape:zoom="13.059378"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="0.25490196"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
fill="#73d216"
stroke="#73d216" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
<dc:title>Go Up</dc:title>
<dc:subject>
<rdf:Bag>
<rdf:li>go</rdf:li>
<rdf:li>higher</rdf:li>
<rdf:li>up</rdf:li>
<rdf:li>arrow</rdf:li>
<rdf:li>pointer</rdf:li>
<rdf:li>&gt;</rdf:li>
</rdf:Bag>
</dc:subject>
<dc:contributor>
<cc:Agent>
<dc:title>Andreas Nilsson</dc:title>
</cc:Agent>
</dc:contributor>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
inkscape:label="Layer 1"
id="layer1">
<path
transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1 9.1923885,36.421127 A 15.644737 8.3968935 0 1 1 40.481863 36.421127 z"
sodipodi:ry="8.3968935"
sodipodi:rx="15.644737"
sodipodi:cy="36.421127"
sodipodi:cx="24.837126"
id="path8660"
style="opacity:0.29946521;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cccccccc"
id="path8643"
d="M 14.491792,38.500000 L 32.469477,38.500000 L 32.469477,25.547437 L 40.500000,25.547437 L 23.374809,5.4992135 L 6.5285585,25.489471 L 14.497096,25.555762 L 14.491792,38.500000 z "
style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1441);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
sodipodi:nodetypes="cccscc"
id="path8645"
d="M 7.5855237,25.03253 L 14.995821,25.03253 L 15.062422,31.594339 C 20.718034,20.593878 31.055517,22.749928 31.656768,15.966674 C 31.656768,15.966674 23.366938,6.4219692 23.366938,6.4219692 L 7.5855237,25.03253 z "
style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1438);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
<path
style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
d="M 15.602735,37.500000 L 31.502578,37.500000 L 31.502578,24.507050 L 38.311576,24.507050 L 23.361206,7.0700896 L 8.6546798,24.550470 L 15.475049,24.528373 L 15.602735,37.500000 z "
id="path8658"
sodipodi:nodetypes="cccccccc" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 8.0 KiB

View File

@ -1,206 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48px"
height="48px"
id="svg3007"
version="1.1"
inkscape:version="0.48.1 r9760"
sodipodi:docname="nav-outline.svg">
<defs
id="defs3009">
<filter
inkscape:collect="always"
id="filter5333"
x="-0.16623206"
width="1.3324641"
y="-0.030014125"
height="1.0600282">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.47888561"
id="feGaussianBlur5335" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.945051"
inkscape:cx="20.614872"
inkscape:cy="23.423899"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1440"
inkscape:window-height="773"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0" />
<metadata
id="metadata3012">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<rect
style="fill:#f0f0f0;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
id="rect3783"
width="46.16272"
height="45.59861"
x="1.0341953"
y="0.99112236" />
<rect
style="fill:#404040;fill-opacity:1;stroke:none"
id="rect3787"
width="2.8205326"
height="2.7823999"
x="4.2307992"
y="4.093708" />
<rect
style="fill:#404040;fill-opacity:1;stroke:none"
id="rect5257"
width="24.68285"
height="1.4102663"
x="8.0855274"
y="4.657815" />
<rect
y="8.4185247"
x="8.4615984"
height="2.7823999"
width="2.8205326"
id="rect5259"
style="fill:#404040;fill-opacity:1;stroke:none" />
<rect
y="9.0766497"
x="12.410344"
height="1.4102663"
width="30.498053"
id="rect5261"
style="fill:#404040;fill-opacity:1;stroke:none" />
<rect
style="fill:#404040;fill-opacity:1;stroke:none"
id="rect5263"
width="2.8205326"
height="2.7823999"
x="8.4615984"
y="13.307448" />
<rect
style="fill:#404040;fill-opacity:1;stroke:none"
id="rect5265"
width="24.972752"
height="1.4102663"
x="12.410344"
y="13.965573" />
<rect
y="17.444229"
x="4.3248172"
height="2.7823999"
width="2.8205326"
id="rect5267"
style="fill:#404040;fill-opacity:1;stroke:none" />
<rect
y="18.008337"
x="8.1795454"
height="1.4102663"
width="25.101433"
id="rect5269"
style="fill:#404040;fill-opacity:1;stroke:none" />
<rect
style="fill:#404040;fill-opacity:1;stroke:none"
id="rect5271"
width="2.8205326"
height="2.7823999"
x="8.5556164"
y="21.769047" />
<rect
style="fill:#404040;fill-opacity:1;stroke:none"
id="rect5273"
width="28.782515"
height="1.4102663"
x="12.880433"
y="22.427172" />
<rect
y="26.65797"
x="13.475181"
height="2.7823999"
width="2.8205326"
id="rect5275"
style="fill:#404040;fill-opacity:1;stroke:none" />
<rect
y="27.316095"
x="17.479"
height="1.4102663"
width="23.681646"
id="rect5277"
style="fill:#404040;fill-opacity:1;stroke:none" />
<rect
style="fill:#404040;fill-opacity:1;stroke:none"
id="rect5279"
width="2.8205326"
height="2.7823999"
x="8.5130949"
y="31.006269" />
<rect
style="fill:#404040;fill-opacity:1;stroke:none"
id="rect5281"
width="24.557148"
height="1.4102663"
x="12.592034"
y="31.636858" />
<rect
y="35.464046"
x="13.475181"
height="2.7823999"
width="2.8205326"
id="rect5283"
style="fill:#404040;fill-opacity:1;stroke:none" />
<rect
y="36.055695"
x="17.744923"
height="1.4102663"
width="18.577394"
id="rect5285"
style="fill:#404040;fill-opacity:1;stroke:none" />
<rect
style="fill:#404040;fill-opacity:1;stroke:none"
id="rect5287"
width="2.8205326"
height="2.7823999"
x="13.54166"
y="40.35297" />
<rect
style="fill:#404040;fill-opacity:1;stroke:none"
id="rect5289"
width="23.080858"
height="1.4102663"
x="17.678442"
y="40.944618" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 5.5 KiB

View File

@ -1,287 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48px"
height="48px"
id="svg3007"
version="1.1"
inkscape:version="0.48.1 r9760"
sodipodi:docname="nav-thumbs.svg">
<defs
id="defs3009">
<filter
inkscape:collect="always"
id="filter5333"
x="-0.16623206"
width="1.3324641"
y="-0.030014125"
height="1.0600282">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.47888561"
id="feGaussianBlur5335" />
</filter>
<filter
inkscape:collect="always"
id="filter5966">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.3570515"
id="feGaussianBlur5968" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.945051"
inkscape:cx="9.375932"
inkscape:cy="24.942259"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1440"
inkscape:window-height="773"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0" />
<metadata
id="metadata3012">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<rect
style="fill:#484848;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
id="rect3783"
width="46.16272"
height="45.59861"
x="1.0341953"
y="0.99112236" />
<rect
y="4.7876148"
x="14.359808"
height="12.764274"
width="9.7061672"
id="rect5960"
style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
transform="matrix(1.0465713,0,0,1.0642851,3.6426579,-2.1141417)" />
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none"
id="rect5958"
width="9.7061672"
height="12.764274"
x="18.897236"
y="3.1920807" />
<rect
transform="matrix(1.0465713,0,0,1.0642851,3.6426579,13.043433)"
style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
id="rect5970"
width="9.7061672"
height="12.764274"
x="14.359808"
y="4.7876148" />
<rect
y="18.349655"
x="18.897236"
height="12.764274"
width="9.7061672"
id="rect5972"
style="fill:#ffffff;fill-opacity:1;stroke:none" />
<rect
y="4.7876148"
x="14.359808"
height="12.764274"
width="9.7061672"
id="rect5974"
style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
transform="matrix(1.0465713,0,0,0.9368834,3.6426579,29.209842)" />
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none"
id="rect5976"
width="9.7061672"
height="11.833546"
x="18.897236"
y="33.906113" />
<rect
y="4.905829"
x="19.960924"
height="0.66480595"
width="7.7117486"
id="rect5995"
style="fill:#808080;fill-opacity:1;stroke:none" />
<rect
style="fill:#808080;fill-opacity:1;stroke:none"
id="rect6177"
width="3.6219761"
height="0.66480595"
x="19.960924"
y="6.0340419" />
<rect
style="fill:#808080;fill-opacity:1;stroke:none"
id="rect6179"
width="7.7117486"
height="0.66480595"
x="19.960924"
y="7.2562728" />
<rect
y="8.3844862"
x="19.960924"
height="0.66480595"
width="5.6903667"
id="rect6181"
style="fill:#808080;fill-opacity:1;stroke:none" />
<rect
y="9.7007341"
x="19.960924"
height="0.66480595"
width="7.7117486"
id="rect6183"
style="fill:#808080;fill-opacity:1;stroke:none" />
<rect
style="fill:#808080;fill-opacity:1;stroke:none"
id="rect6185"
width="7.7117486"
height="0.66480595"
x="19.960924"
y="10.828948" />
<rect
y="12.051179"
x="19.960924"
height="0.66480595"
width="7.7117486"
id="rect6187"
style="fill:#808080;fill-opacity:1;stroke:none" />
<rect
y="14.213587"
x="23.204536"
height="0.66480595"
width="1.2245234"
id="rect6189"
style="fill:#808080;fill-opacity:1;stroke:none" />
<rect
style="fill:#808080;fill-opacity:1;stroke:none"
id="rect6209"
width="7.7117486"
height="0.66480595"
x="19.772888"
y="19.854652" />
<rect
y="39.08128"
x="19.913914"
height="0.66480595"
width="3.6219761"
id="rect6211"
style="fill:#808080;fill-opacity:1;stroke:none" />
<rect
y="22.205095"
x="19.772888"
height="0.66480595"
width="6.6305442"
id="rect6213"
style="fill:#808080;fill-opacity:1;stroke:none" />
<rect
style="fill:#808080;fill-opacity:1;stroke:none"
id="rect6215"
width="7.7587576"
height="0.66480595"
x="19.866905"
y="37.859051" />
<rect
style="fill:#808080;fill-opacity:1;stroke:none"
id="rect6217"
width="7.7117486"
height="0.66480595"
x="19.772888"
y="21.029873" />
<rect
y="25.777771"
x="19.772888"
height="0.66480595"
width="7.7117486"
id="rect6219"
style="fill:#808080;fill-opacity:1;stroke:none" />
<rect
style="fill:#808080;fill-opacity:1;stroke:none"
id="rect6221"
width="7.7117486"
height="0.66480595"
x="19.772888"
y="27.000002" />
<rect
style="fill:#808080;fill-opacity:1;stroke:none"
id="rect6223"
width="1.2245234"
height="0.66480595"
x="23.204536"
y="28.974375" />
<rect
style="fill:#808080;fill-opacity:1;stroke:none"
id="rect6225"
width="3.6219761"
height="0.66480595"
x="19.960922"
y="42.983021" />
<rect
style="fill:#808080;fill-opacity:1;stroke:none"
id="rect6227"
width="7.7117486"
height="0.66480595"
x="19.913914"
y="36.777847" />
<rect
y="35.602627"
x="19.913914"
height="0.66480595"
width="7.7117486"
id="rect6231"
style="fill:#808080;fill-opacity:1;stroke:none" />
<rect
style="fill:#808080;fill-opacity:1;stroke:none"
id="rect6233"
width="7.7117486"
height="0.66480595"
x="19.913914"
y="40.350525" />
<rect
y="41.572754"
x="19.913914"
height="0.66480595"
width="7.7117486"
id="rect6235"
style="fill:#808080;fill-opacity:1;stroke:none" />
<rect
style="fill:#0000e6;fill-opacity:0.44444448;stroke:none"
id="rect6237"
width="3.5256658"
height="1.927364"
x="22.077036"
y="23.367346" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 7.8 KiB

View File

@ -1,301 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48"
height="48"
id="svg3075"
version="1.1"
inkscape:version="0.48.1 r9760"
sodipodi:docname="pin-down.svg"
viewPort="0 0 48 48">
<defs
id="defs3077">
<linearGradient
inkscape:collect="always"
id="linearGradient3804">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3806" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop3808" />
</linearGradient>
<linearGradient
id="linearGradient3965">
<stop
id="stop3967"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
style="stop-color:#ffffff;stop-opacity:0"
offset="1"
id="stop3969" />
</linearGradient>
<linearGradient
id="linearGradient3885">
<stop
style="stop-color:#a8b5e9;stop-opacity:1;"
offset="0"
id="stop3889" />
<stop
id="stop3891"
offset="1"
style="stop-color:#1d4488;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient3865">
<stop
style="stop-color:#0e0ec3;stop-opacity:0"
offset="0"
id="stop3867" />
<stop
id="stop3883"
offset="0.5"
style="stop-color:#95b1e4;stop-opacity:1;" />
<stop
style="stop-color:#0d29c0;stop-opacity:1;"
offset="1"
id="stop3869" />
</linearGradient>
<linearGradient
id="linearGradient3853">
<stop
style="stop-color:#717171;stop-opacity:1;"
offset="0"
id="stop3855" />
<stop
id="stop3861"
offset="0.5"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
style="stop-color:#818181;stop-opacity:1;"
offset="1"
id="stop3857" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3885"
id="radialGradient3792"
cx="13.508819"
cy="30.521608"
fx="13.508819"
fy="30.521608"
r="13.254341"
gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3885"
id="linearGradient3802"
x1="15.306904"
y1="13.407407"
x2="29.35461"
y2="30.15519"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.2304178,0,0,1.1235308,-2.1158755,998.83747)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3804"
id="radialGradient3812"
cx="20.111172"
cy="28.238274"
fx="20.111172"
fy="28.238274"
r="7.6291947"
gradientTransform="matrix(1.2304178,0,0,1.1452771,-2.1158755,998.22337)"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3885"
id="radialGradient3822"
cx="23.985939"
cy="24.847366"
fx="23.985939"
fy="24.847366"
r="10.593476"
gradientTransform="matrix(0.63682384,0.44303926,-1.1714282,1.6838088,35.523491,-26.055439)"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
id="filter3856"
x="-0.30370581"
width="1.6074116"
y="-0.32771564"
height="1.6554313">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="4.7808869"
id="feGaussianBlur3858" />
</filter>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3885"
id="radialGradient3865"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
cx="13.508819"
cy="30.521608"
fx="13.508819"
fy="30.521608"
r="13.254341" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3885"
id="linearGradient3867"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.2304178,0,0,1.1235308,-2.1158755,998.83747)"
x1="15.306904"
y1="13.407407"
x2="29.35461"
y2="30.15519" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3804"
id="radialGradient3869"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.2304178,0,0,1.1452771,-2.1158755,998.22337)"
cx="20.111172"
cy="28.238274"
fx="20.111172"
fy="28.238274"
r="7.6291947" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3885"
id="radialGradient3871"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.63682384,0.44303926,-1.1714282,1.6838088,35.523491,-26.055439)"
cx="23.985939"
cy="24.847366"
fx="23.985939"
fy="24.847366"
r="10.593476" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3885"
id="linearGradient3875"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.98683814,0,0,0.9524914,3.4991888,1004.1467)"
x1="15.306904"
y1="13.407407"
x2="29.35461"
y2="30.15519" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3804"
id="radialGradient3877"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.195641,0.23932984,-0.18533175,0.95255553,4.5333676,999.33159)"
cx="20.111172"
cy="28.238274"
fx="20.111172"
fy="28.238274"
r="7.6291947" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3885"
id="radialGradient3880"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.5847553,0.52693722,-0.99805104,2.7064773,14.11088,-45.304477)"
cx="18.133854"
cy="19.778509"
fx="18.133854"
fy="19.778509"
r="10.593476" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3885"
id="radialGradient3882"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
cx="13.508819"
cy="30.521608"
fx="13.508819"
fy="30.521608"
r="13.254341" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="4.9558805"
inkscape:cx="3.0237013"
inkscape:cy="17.287267"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1291"
inkscape:window-height="776"
inkscape:window-x="16"
inkscape:window-y="0"
inkscape:window-maximized="0" />
<metadata
id="metadata3080">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1004.3622)">
<path
style="fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter3856)"
d="m 14.326415,1019.2702 c -8.3327876,4.0675 -9.8235436,10.8833 -8.8783416,15.1336 4.6840646,7.9754 8.3608166,13.8165 24.0118786,12.9139 9.657617,-3.7312 12.9762,-9.3269 13.519293,-15.7389 -0.547269,-4.3839 -1.957958,-9.3396 -5.649854,-14.9317 -3.965534,-2.471 -6.300859,-4.4246 -10.290805,-4.2374 -8.25193,0.5026 -8.752485,4.4502 -12.712171,6.8605 z"
id="path3826"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc"
transform="matrix(0.69099294,0,0,0.75978808,7.3427938,249.11025)" />
<path
sodipodi:type="arc"
style="fill:url(#radialGradient3882);fill-opacity:1;stroke:none"
id="path3011"
sodipodi:cx="21.176477"
sodipodi:cy="31.393986"
sodipodi:rx="13.254341"
sodipodi:ry="13.863736"
d="m 34.430819,31.393986 a 13.254341,13.863736 0 1 1 -26.5086827,0 13.254341,13.863736 0 1 1 26.5086827,0 z"
transform="matrix(0.98683814,0,0,0.83062636,2.696034,1005.3655)" />
<path
style="fill:url(#linearGradient3875);fill-opacity:1;stroke:url(#radialGradient3877);stroke-width:0.9695127;stroke-opacity:1"
d="m 17.246758,1026.7905 c -1.7156,4.5052 -2.482464,10.6205 8.726963,10.7476 4.849099,-1.8941 3.522783,-5.3561 6.021544,-11.8282 l -10.973104,-1.5977 z"
id="path3794"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
sodipodi:type="arc"
style="fill:url(#radialGradient3880);fill-opacity:1;stroke:none"
id="path3814"
sodipodi:cx="24.718111"
sodipodi:cy="23.38278"
sodipodi:rx="10.593476"
sodipodi:ry="9.6854639"
d="m 35.311587,23.38278 a 10.593476,9.6854639 0 1 1 -21.186952,0 10.593476,9.6854639 0 1 1 21.186952,0 z"
transform="matrix(0.85425691,0,0,0.84187503,3.9779774,1006.7561)" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 9.8 KiB

View File

@ -1,234 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48"
height="48"
id="svg3075"
version="1.1"
inkscape:version="0.48.1 r9760"
sodipodi:docname="pin-up.svg"
viewPort="0 0 48 48">
<defs
id="defs3077">
<linearGradient
id="linearGradient3965">
<stop
id="stop3967"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
style="stop-color:#ffffff;stop-opacity:0"
offset="1"
id="stop3969" />
</linearGradient>
<linearGradient
id="linearGradient3885">
<stop
style="stop-color:#a8b5e9;stop-opacity:1;"
offset="0"
id="stop3889" />
<stop
id="stop3891"
offset="1"
style="stop-color:#1d4488;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient3865">
<stop
style="stop-color:#0e0ec3;stop-opacity:1;"
offset="0"
id="stop3867" />
<stop
id="stop3883"
offset="0.5"
style="stop-color:#95b1e4;stop-opacity:1;" />
<stop
style="stop-color:#0d29c0;stop-opacity:1;"
offset="1"
id="stop3869" />
</linearGradient>
<linearGradient
id="linearGradient3853">
<stop
style="stop-color:#717171;stop-opacity:1;"
offset="0"
id="stop3855" />
<stop
id="stop3861"
offset="0.5"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
style="stop-color:#818181;stop-opacity:1;"
offset="1"
id="stop3857" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3853"
id="linearGradient3859"
x1="7.7696066"
y1="34.979828"
x2="11.854106"
y2="39.107044"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(4.8388015,1001.6582)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3885"
id="radialGradient3871"
cx="14.801222"
cy="1030.6609"
fx="14.801222"
fy="1030.6609"
r="10.177785"
gradientTransform="matrix(1,0,0,1.0108042,4.8388015,-13.880529)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3865"
id="linearGradient3881"
x1="15.012629"
y1="11.922465"
x2="31.098303"
y2="28.858271"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.97315436,4.8388015,1002.4769)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3885"
id="radialGradient3909"
cx="16.437693"
cy="22.596292"
fx="16.437693"
fy="22.596292"
r="1.7789712"
gradientTransform="matrix(1,0,0,8.3599999,0,-166.30871)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3865"
id="linearGradient3927"
x1="26.47109"
y1="1010.7343"
x2="35.294788"
y2="1019.8425"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(4.5541661,-2.1347654)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3965"
id="radialGradient3995"
cx="23.189369"
cy="25.704245"
fx="23.189369"
fy="25.704245"
r="37.336674"
gradientTransform="matrix(1,0,0,1.0332422,0,-0.85446479)"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
id="filter4009"
x="-0.19299152"
width="1.385983"
y="-0.18351803"
height="1.3670361">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="3.8667902"
id="feGaussianBlur4011" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.2819435"
inkscape:cx="18.697469"
inkscape:cy="17.287267"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="970"
inkscape:window-height="778"
inkscape:window-x="284"
inkscape:window-y="0"
inkscape:window-maximized="0" />
<metadata
id="metadata3080">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1004.3622)">
<path
style="fill:url(#radialGradient3995);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0;filter:url(#filter4009)"
d="M -0.85390618,50.988672 14.231769,27.790888 C 12.21393,25.133052 9.5514307,24.605255 9.9622384,18.824874 13.947134,14.236899 17.362759,16.258973 21.347654,16.54779 l 8.966014,-8.6813789 c 1.467204,-2.4778468 -1.023584,-4.6422045 0.569271,-7.25820222 4.802307,-0.84764718 6.662499,1.15219542 11.527733,6.26197842 4.061691,4.1873637 5.648882,7.0611607 4.411848,9.5352857 -1.075122,2.776443 -4.518349,-0.692782 -5.835025,0.56927 l -9.108332,10.104556 c -0.418785,3.74872 2.078647,7.861968 -1.280859,11.243098 -4.132171,0.818036 -6.734336,-1.933944 -9.819921,-3.557942 z"
id="path3955"
inkscape:connector-curvature="0"
transform="translate(0,1004.3622)"
sodipodi:nodetypes="ccccccccccccc" />
<g
id="g3929">
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path3083"
d="m 3.2884874,1051.0662 c 3.1862139,-6.2911 11.3693156,-15.19 15.4471616,-20.0327 l 2.86533,3.0086 c -3.476851,3.6575 -10.192375,10.8664 -18.3124916,17.0241 z"
style="fill:url(#linearGradient3859);fill-opacity:1;stroke:#a5a5a5;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path3863"
d="m 11.10078,1023.3294 c 5.038264,10.1095 11.83652,14.8875 18.358981,18.2167 1.196291,-2.5422 1.454996,-5.6203 0,-9.6776 l -8.539061,-8.6814 c -3.704654,-1.8936 -6.871076,-1.3652 -9.81992,0.1423 z"
style="fill:url(#radialGradient3871);fill-opacity:1;stroke:none" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path3873"
d="m 33.729292,1011.5171 -13.235545,11.4952 c 2.869602,4.2703 6.221839,7.4544 9.108332,9.1408 l 11.385416,-13.0187 z"
style="fill:url(#linearGradient3881);fill-opacity:1;stroke:none" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path3893"
d="m 33.228885,1011.6148 c 1.843189,2.7806 3.431654,5.6597 7.19852,7.6953 l 5.398891,1.7423 c -7.6738,-4.7914 -10.989683,-9.5828 -13.947133,-14.3741 z"
style="fill:url(#linearGradient3927);fill-opacity:1;stroke:none" />
<path
transform="matrix(0.68275275,-0.5590416,0.45791123,0.47036287,17.42507,1012.2127)"
d="m 18.216664,22.596292 a 1.7789712,14.872199 0 1 1 -3.557943,0 1.7789712,14.872199 0 1 1 3.557943,0 z"
sodipodi:ry="14.872199"
sodipodi:rx="1.7789712"
sodipodi:cy="22.596292"
sodipodi:cx="16.437693"
id="path3901"
style="fill:url(#radialGradient3909);fill-opacity:1;stroke:none"
sodipodi:type="arc" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 244 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 512 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 237 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 708 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 558 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 353 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 426 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 344 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 349 B

Some files were not shown because too many files have changed in this diff Show More