TDE
/
tdelibs
7
1
Fork 0
Code Issues 16 Pull Requests 8 Releases Wiki Activity

Fix -tdehtml-* rename regression. This resolves bugs 1825 and 1692

Browse Source
pull/16/head
Michele Calgaro 10 years ago
parent ca0e1f81a7
commit 6b4be5f2df
33 changed files with 2356 additions and 3062 deletions
Show Stats Download Patch File Download Diff File

4
kate/data/ccss.xml
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
<language name="CleanCSS" version="1.01" kateversion="2.5" section="Markup" extensions="*.ccss" author="Massimiliano Torromeo" license="BSD">
<language name="CleanCSS" version="1.02" kateversion="2.5" section="Markup" extensions="*.ccss" author="Massimiliano Torromeo" license="BSD">
<highlighting>
<list name="properties">
@ -171,7 +171,7 @@
<item> -o-text-overflow </item>
<!-- konq specific -->
<item> -tdehtml-background-size </item>
<item> -khtml-background-size </item>
<item> konq_bgpos_x </item>
<item> konq_bgpos_y </item>

18
kate/data/css-php.xml
Unescape View File

@ -21,7 +21,7 @@ Changelog:
<language name="CSS/PHP" hidden="true" version="2.07" kateversion="2.5" section="Other" extensions="" indenter="cstyle" mimetype="" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
<language name="CSS/PHP" hidden="true" version="2.08" kateversion="2.5" section="Other" extensions="" indenter="cstyle" mimetype="" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
<highlighting>
<list name="properties">
@ -263,14 +263,14 @@ Changelog:
<!-- konq specific -->
<item> konq_bgpos_x </item>
<item> konq_bgpos_y </item>
<item> -tdehtml-background-size </item>
<item> -tdehtml-border-top-left-radius </item>
<item> -tdehtml-border-top-right-radius </item>
<item> -tdehtml-border-bottom-left-radius </item>
<item> -tdehtml-border-bottom-right-radius </item>
<item> -tdehtml-border-radius </item>
<item> -tdehtml-box-shadow </item>
<item> -tdehtml-opacity </item>
<item> -khtml-background-size </item>
<item> -khtml-border-top-left-radius </item>
<item> -khtml-border-top-right-radius </item>
<item> -khtml-border-bottom-left-radius </item>
<item> -khtml-border-bottom-right-radius </item>
<item> -khtml-border-radius </item>
<item> -khtml-box-shadow </item>
<item> -khtml-opacity </item>
<!-- Webkit rendering engine CSS property extensions -->
<item> -webkit-appearance </item>

18
kate/data/css.xml
Unescape View File

@ -15,7 +15,7 @@ Changelog:
-->
<language name="CSS" version="2.08" kateversion="2.5" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
<language name="CSS" version="2.09" kateversion="2.5" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
<highlighting>
<list name="properties">
@ -257,14 +257,14 @@ Changelog:
<!-- konq specific -->
<item> konq_bgpos_x </item>
<item> konq_bgpos_y </item>
<item> -tdehtml-background-size </item>
<item> -tdehtml-border-top-left-radius </item>
<item> -tdehtml-border-top-right-radius </item>
<item> -tdehtml-border-bottom-left-radius </item>
<item> -tdehtml-border-bottom-right-radius </item>
<item> -tdehtml-border-radius </item>
<item> -tdehtml-box-shadow </item>
<item> -tdehtml-opacity </item>
<item> -khtml-background-size </item>
<item> -khtml-border-top-left-radius </item>
<item> -khtml-border-top-right-radius </item>
<item> -khtml-border-bottom-left-radius </item>
<item> -khtml-border-bottom-right-radius </item>
<item> -khtml-border-radius </item>
<item> -khtml-box-shadow </item>
<item> -khtml-opacity </item>
<!-- Webkit rendering engine CSS property extensions -->
<item> -webkit-appearance </item>

4
kate/data/scss.xml
Unescape View File

@ -21,7 +21,7 @@
-->
<language name="SCSS" version="2.05" kateversion="2.5" section="Markup" extensions="*.scss" indenter="cstyle"
<language name="SCSS" version="2.06" kateversion="2.5" section="Markup" extensions="*.scss" indenter="cstyle"
mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
<highlighting>
@ -189,7 +189,7 @@
<item> -o-text-overflow </item>
<!-- konq specific -->
<item> -tdehtml-background-size </item>
<item> -khtml-background-size </item>
<item> konq_bgpos_x </item>
<item> konq_bgpos_y </item>

8
kate/data/update-files.xml
Unescape View File

@ -24,7 +24,7 @@
<Definition name="BibTeX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bibtex.xml" version="1.18"/>
<Definition name="B-Method" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bmethod.xml" version="0.3"/>
<Definition name="C" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/c.xml" version="1.46"/>
<Definition name="CleanCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ccss.xml" version="1.01"/>
<Definition name="CleanCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ccss.xml" version="1.02"/>
<Definition name="Cg" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cg.xml" version="1.12"/>
<Definition name="CGiS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cgis.xml" version="1.03"/>
<Definition name="ChangeLog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/changelog.xml" version="1.05"/>
@ -42,8 +42,8 @@
<Definition name="C++11" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cpp11.xml" version="1.64"/>
<Definition name="Crack" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/crk.xml" version="1.2"/>
<Definition name="C#" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cs.xml" version="1.16"/>
<Definition name="CSS/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css-php.xml" version="2.07"/>
<Definition name="CSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css.xml" version="2.08"/>
<Definition name="CSS/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css-php.xml" version="2.08"/>
<Definition name="CSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css.xml" version="2.09"/>
<Definition name="CUE Sheet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cue.xml" version="0.92"/>
<Definition name="Curry" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/curry.xml" version="0.4"/>
<Definition name="D" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/d.xml" version="1.63"/>
@ -173,7 +173,7 @@
<Definition name="Scala" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scala.xml" version="1.01"/>
<Definition name="Scheme" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scheme.xml" version="1.14"/>
<Definition name="scilab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sci.xml" version="1.04"/>
<Definition name="SCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scss.xml" version="2.05"/>
<Definition name="SCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scss.xml" version="2.06"/>
<Definition name="sed" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sed.xml" version="1.01"/>
<Definition name="SGML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sgml.xml" version="1.03"/>
<Definition name="Sieve" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sieve.xml" version="1.06"/>

24
tdehtml/ChangeLog
Unescape View File

@ -314,7 +314,7 @@
2005-12-09 Germain Garand <germain@ebooksfrance.org>
implement quirky HTML alignment ; introduce special float values
-tdehtml-left/-tdehtml-right to this effect.
-khtml-left/-khtml-right to this effect.
* css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also.
* css/cssstyleselector.cpp: ditto.
@ -662,7 +662,7 @@
Implement ideographic enumeration including the CSS 2.1 cjk-ideographic and several from CSS 3 List (working draft).
Also add three more numeric: (Lao, Thai and Tibetan)
* css/cssvalues.in: Add new CSS3 values with -tdehtml-
* css/cssvalues.in: Add new CSS3 values with -khtml-
* rendering/render_style.h: Add new enums
* rendering/enumerate.cpp: Implement the ideographic algorithm.
@ -1393,8 +1393,8 @@
* rendering/render_list.cpp: New algorithms for hiragana, katakana,
armenian, georgian and decimal-leading-zero.
Also fix greek and latin list-styles for larger values.
* css/cssvalues.cpp: Parse box, -tdehtml-diamond, -tdehtml-arabic-indic,
-tdehtml-persian, -tdehtml-urdu and -tdehtml-upper-greek
* css/cssvalues.cpp: Parse box, -khtml-diamond, -khtml-arabic-indic,
-khtml-persian, -khtml-urdu and -khtml-upper-greek
* rendering/render_style.h: Expand list-style enum
2004-11-30 Germain Garand <germain@ebooksfrance.org>
@ -1451,10 +1451,10 @@
Implement CSS border on form-widgets
* css/cssvalues.in: Add -tdehtml-native
* css/cssparser.cpp: Accept -tdehtml-native as a border-type
* css/cssvalues.in: Add -khtml-native
* css/cssparser.cpp: Accept -khtml-native as a border-type
* css/cssstyleselector.cpp: BNATIVE and not BNONE is now lowest border-style
* css/html4.css: Make -tdehtml-native default border-style for form-widgets
* css/html4.css: Make -khtml-native default border-style for form-widgets
* render/render_style.h: Add BNATIVE
* render/render_object.cpp: Treat BNATIVE like BNONE
* render/render_replaced.cpp: Remove native, and paint CSS border when allowed
@ -1463,7 +1463,7 @@
float and flowAroundFloat fixes.
* css/html4.css: make fieldset -tdehtml-around-floats (#92979)
* css/html4.css: make fieldset -khtml-around-floats (#92979)
* rendering/render_block.cpp (layoutBlockChildren): cleanup float/flowAroundFloats
logic. Merges: add better RTL layouting of fAFs.
@ -2095,14 +2095,14 @@
* tdehtml_part.cpp: (clear) Stopping marquees.
* css/cssparser.cpp: (parserValue) Parse overflow: marquee.
Inserted CSS3 Properties section.
Moved -tdehtml-user-input to CSS3 Properties.
Added parsing of -tdehtml-marquee{,-direction,-increment,-style,-repetition,
Moved -khtml-user-input to CSS3 Properties.
Added parsing of -khtml-marquee{,-direction,-increment,-style,-repetition,
-speed}.
* css/cssproperties.{c,h}: Regenerated.
* css/cssproperties.in: Added -tdehtml-marquee{,-direction,-increment,
* css/cssproperties.in: Added -khtml-marquee{,-direction,-increment,
-style,-repetition, -speed} keywords.
* css/cssstyleselector: (applyRule) Handle overflow: marquee.
Handle applying of -tdehtml-marquee{,-direction,-increment,-style,-repetition,
Handle applying of -khtml-marquee{,-direction,-increment,-style,-repetition,
-speed}.
* css/cssvalues.{c,h}: Regenerated.
* css/cssvalues.in: Added marquee, forwards, backwards, ahead, reverse,

4
tdehtml/css/css_base.cpp
Unescape View File

@ -172,10 +172,10 @@ void CSSSelector::extractPseudoType() const
value = value.lower();
switch (value[0]) {
case '-':
if (value == "-tdehtml-replaced")
if (value == "-khtml-replaced")
_pseudoType = PseudoReplaced;
else
if (value == "-tdehtml-marker")
if (value == "-khtml-marker")
_pseudoType = PseudoMarker;
element = true;
break;

28
tdehtml/css/css_renderstyledeclarationimpl.cpp
Unescape View File

@ -199,23 +199,23 @@ DOMString tdehtml::stringForListStyleType(EListStyleType type)
case tdehtml::LBOX:
return "box";
case tdehtml::LDIAMOND:
return "-tdehtml-diamond";
return "-khtml-diamond";
case tdehtml::LDECIMAL:
return "decimal";
case tdehtml::DECIMAL_LEADING_ZERO:
return "decimal-leading-zero";
case tdehtml::ARABIC_INDIC:
return "-tdehtml-arabic-indic";
return "-khtml-arabic-indic";
case tdehtml::LAO:
return "-tdehtml-lao";
return "-khtml-lao";
case tdehtml::PERSIAN:
return "-tdehtml-persian";
return "-khtml-persian";
case tdehtml::URDU:
return "-tdehtml-urdu";
return "-khtml-urdu";
case tdehtml::THAI:
return "-tdehtml-thai";
return "-khtml-thai";
case tdehtml::TIBETAN:
return "-tdehtml-tibetan";
return "-khtml-tibetan";
case tdehtml::LOWER_ROMAN:
return "lower-roman";
case tdehtml::UPPER_ROMAN:
@ -229,21 +229,21 @@ DOMString tdehtml::stringForListStyleType(EListStyleType type)
case tdehtml::CJK_IDEOGRAPHIC:
return "cjk-ideographic";
case tdehtml::JAPANESE_FORMAL:
return "-tdehtml-japanese-formal";
return "-khtml-japanese-formal";
case tdehtml::JAPANESE_INFORMAL:
return "-tdehtml-japanese-informal";
return "-khtml-japanese-informal";
case tdehtml::SIMP_CHINESE_FORMAL:
return "-tdehtml-simp-chinese-formal";
return "-khtml-simp-chinese-formal";
case tdehtml::SIMP_CHINESE_INFORMAL:
return "-tdehtml-simp-chinese-informal";
return "-khtml-simp-chinese-informal";
case tdehtml::TRAD_CHINESE_FORMAL:
return "-tdehtml-trad-chinese-formal";
return "-khtml-trad-chinese-formal";
case tdehtml::TRAD_CHINESE_INFORMAL:
return "-tdehtml-trad-chinese-informal";
return "-khtml-trad-chinese-informal";
case tdehtml::LOWER_GREEK:
return "lower-greek";
case tdehtml::UPPER_GREEK:
return "-tdehtml-upper-greek";
return "-khtml-upper-greek";
case tdehtml::LOWER_ALPHA:
return "lower-alpha";
case tdehtml::UPPER_ALPHA:

3
tdehtml/css/css_valueimpl.cpp
Unescape View File

@ -308,10 +308,9 @@ bool CSSStyleDeclarationImpl::setProperty(int id, const DOMString &value, bool i
CSSParser parser( strictParsing );
bool success = parser.parseValue( this, id, value, important, nonCSSHint );
if(!success) {
if(!success)
kdDebug( 6080 ) << "CSSStyleDeclarationImpl::setProperty invalid property: [" << getPropertyName(id).string()
<< "] value: [" << value.string() << "]"<< endl;
}
else
setChanged();
return success;

10
tdehtml/css/cssparser.cpp
Unescape View File

@ -184,7 +184,7 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM
{
styleElement = sheet;
const char tdehtml_rule[] = "@-tdehtml-rule{";
const char tdehtml_rule[] = "@-khtml-rule{";
int length = string.length() + 4 + strlen(tdehtml_rule);
assert( !data );
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
@ -212,7 +212,7 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id,
styleElement = declaration->stylesheet();
const char tdehtml_value[] = "@-tdehtml-value{";
const char tdehtml_value[] = "@-khtml-value{";
int length = string.length() + 4 + strlen(tdehtml_value);
assert( !data );
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
@ -254,7 +254,7 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con
styleElement = declaration->stylesheet();
const char tdehtml_decls[] = "@-tdehtml-decls{";
const char tdehtml_decls[] = "@-khtml-decls{";
int length = string.length() + 4 + strlen(tdehtml_decls);
assert( !data );
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
@ -572,7 +572,7 @@ bool CSSParser::parseValue( int propId, bool important )
break;
case CSS_PROP_DISPLAY:
// inline | block | list-item | run-in | inline-block | -tdehtml-ruler | table |
// inline | block | list-item | run-in | inline-block | -khtml-ruler | table |
// inline-table | table-row-group | table-header-group | table-footer-group | table-row |
// table-column-group | table-column | table-cell | table-caption | none | inherit
if ((id >= CSS_VAL_INLINE && id <= CSS_VAL_TABLE_CAPTION) || id == CSS_VAL_NONE)
@ -611,7 +611,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_OUTLINE_STYLE: // <border-style> | inherit
case CSS_PROP_BORDER_TOP_STYLE: //// <border-style> | inherit
case CSS_PROP_BORDER_RIGHT_STYLE: // Defined as: none | hidden | dotted | dashed |
case CSS_PROP_BORDER_BOTTOM_STYLE: // solid | double | groove | ridge | inset | outset | -tdehtml-native
case CSS_PROP_BORDER_BOTTOM_STYLE: // solid | double | groove | ridge | inset | outset | -khtml-native
case CSS_PROP_BORDER_LEFT_STYLE: ////
if (id >= CSS_VAL__TDEHTML_NATIVE && id <= CSS_VAL_DOUBLE)
valid_primitive = true;

60
tdehtml/css/cssproperties.c
Unescape View File

@ -295,7 +295,7 @@ findProp (register const char *str, register unsigned int len)
#line 104 "cssproperties.gperf"
{"text-indent", CSS_PROP_TEXT_INDENT},
#line 69 "cssproperties.gperf"
{"-tdehtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},
{"-khtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},
#line 14 "cssproperties.gperf"
{"background-color", CSS_PROP_BACKGROUND_COLOR},
#line 100 "cssproperties.gperf"
@ -305,7 +305,7 @@ findProp (register const char *str, register unsigned int len)
#line 47 "cssproperties.gperf"
{"counter-reset", CSS_PROP_COUNTER_RESET},
#line 93 "cssproperties.gperf"
{"-tdehtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},
{"-khtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},
#line 15 "cssproperties.gperf"
{"background-image", CSS_PROP_BACKGROUND_IMAGE},
#line 96 "cssproperties.gperf"
@ -319,11 +319,11 @@ findProp (register const char *str, register unsigned int len)
#line 52 "cssproperties.gperf"
{"float", CSS_PROP_FLOAT},
#line 21 "cssproperties.gperf"
{"-tdehtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},
{"-khtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},
#line 70 "cssproperties.gperf"
{"-tdehtml-marquee", CSS_PROP__TDEHTML_MARQUEE},
{"-khtml-marquee", CSS_PROP__TDEHTML_MARQUEE},
#line 27 "cssproperties.gperf"
{"-tdehtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING},
{"-khtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING},
#line 46 "cssproperties.gperf"
{"counter-increment", CSS_PROP_COUNTER_INCREMENT},
#line 128 "cssproperties.gperf"
@ -337,7 +337,7 @@ findProp (register const char *str, register unsigned int len)
#line 31 "cssproperties.gperf"
{"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
#line 22 "cssproperties.gperf"
{"-tdehtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},
{"-khtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},
#line 17 "cssproperties.gperf"
{"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
#line 126 "cssproperties.gperf"
@ -353,7 +353,7 @@ findProp (register const char *str, register unsigned int len)
#line 68 "cssproperties.gperf"
{"margin-left", CSS_PROP_MARGIN_LEFT},
#line 142 "cssproperties.gperf"
{"-tdehtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},
{"-khtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},
#line 79 "cssproperties.gperf"
{"min-width", CSS_PROP_MIN_WIDTH},
#line 127 "cssproperties.gperf"
@ -361,13 +361,13 @@ findProp (register const char *str, register unsigned int len)
#line 92 "cssproperties.gperf"
{"padding-left", CSS_PROP_PADDING_LEFT},
#line 71 "cssproperties.gperf"
{"-tdehtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},
{"-khtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},
#line 73 "cssproperties.gperf"
{"-tdehtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},
{"-khtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},
#line 95 "cssproperties.gperf"
{"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
#line 74 "cssproperties.gperf"
{"-tdehtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},
{"-khtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},
#line 94 "cssproperties.gperf"
{"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},
#line 81 "cssproperties.gperf"
@ -383,7 +383,7 @@ findProp (register const char *str, register unsigned int len)
#line 134 "cssproperties.gperf"
{"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
#line 72 "cssproperties.gperf"
{"-tdehtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},
{"-khtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},
#line 116 "cssproperties.gperf"
{"word-spacing", CSS_PROP_WORD_SPACING},
#line 111 "cssproperties.gperf"
@ -405,13 +405,13 @@ findProp (register const char *str, register unsigned int len)
#line 32 "cssproperties.gperf"
{"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
#line 26 "cssproperties.gperf"
{"-tdehtml-border-horizontal-spacing", CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING},
{"-khtml-border-horizontal-spacing", CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING},
#line 33 "cssproperties.gperf"
{"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},
#line 34 "cssproperties.gperf"
{"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE},
#line 23 "cssproperties.gperf"
{"-tdehtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},
{"-khtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},
#line 135 "cssproperties.gperf"
{"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
#line 129 "cssproperties.gperf"
@ -435,7 +435,7 @@ findProp (register const char *str, register unsigned int len)
#line 84 "cssproperties.gperf"
{"outline-style", CSS_PROP_OUTLINE_STYLE},
#line 141 "cssproperties.gperf"
{"-tdehtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},
{"-khtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},
#line 87 "cssproperties.gperf"
{"overflow-x", CSS_PROP_OVERFLOW_X},
#line 113 "cssproperties.gperf"
@ -449,7 +449,7 @@ findProp (register const char *str, register unsigned int len)
#line 83 "cssproperties.gperf"
{"outline-offset", CSS_PROP_OUTLINE_OFFSET},
#line 75 "cssproperties.gperf"
{"-tdehtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},
{"-khtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},
#line 55 "cssproperties.gperf"
{"font-style", CSS_PROP_FONT_STYLE},
#line 35 "cssproperties.gperf"
@ -544,13 +544,13 @@ static const char * const propertyList[] = {
"background-position",
"background-position-x",
"background-position-y",
"-tdehtml-background-clip",
"-tdehtml-background-origin",
"-tdehtml-background-size",
"-khtml-background-clip",
"-khtml-background-origin",
"-khtml-background-size",
"border-collapse",
"border-spacing",
"-tdehtml-border-horizontal-spacing",
"-tdehtml-border-vertical-spacing",
"-khtml-border-horizontal-spacing",
"-khtml-border-vertical-spacing",
"border-top-color",
"border-right-color",
"border-bottom-color",
@ -592,13 +592,13 @@ static const char * const propertyList[] = {
"margin-right",
"margin-bottom",
"margin-left",
"-tdehtml-margin-start",
"-tdehtml-marquee",
"-tdehtml-marquee-direction",
"-tdehtml-marquee-increment",
"-tdehtml-marquee-repetition",
"-tdehtml-marquee-speed",
"-tdehtml-marquee-style",
"-khtml-margin-start",
"-khtml-marquee",
"-khtml-marquee-direction",
"-khtml-marquee-increment",
"-khtml-marquee-repetition",
"-khtml-marquee-speed",
"-khtml-marquee-style",
"max-height",
"max-width",
"min-height",
@ -616,7 +616,7 @@ static const char * const propertyList[] = {
"padding-right",
"padding-bottom",
"padding-left",
"-tdehtml-padding-start",
"-khtml-padding-start",
"page-break-after",
"page-break-before",
"page-break-inside",
@ -664,8 +664,8 @@ static const char * const propertyList[] = {
"scrollbar-darkshadow-color",
"scrollbar-track-color",
"scrollbar-arrow-color",
"-tdehtml-flow-mode",
"-tdehtml-user-input",
"-khtml-flow-mode",
"-khtml-user-input",
0
};
DOMString getPropertyName(unsigned short id)

30
tdehtml/css/cssproperties.in
Unescape View File

@ -20,14 +20,14 @@ background-position
background-position-x
background-position-y
# CSS3 Extensions
-tdehtml-background-clip
-tdehtml-background-origin
-tdehtml-background-size
-khtml-background-clip
-khtml-background-origin
-khtml-background-size
border-collapse
border-spacing
-tdehtml-border-horizontal-spacing
-tdehtml-border-vertical-spacing
-khtml-border-horizontal-spacing
-khtml-border-vertical-spacing
border-top-color
border-right-color
border-bottom-color
@ -69,13 +69,13 @@ margin-top
margin-right
margin-bottom
margin-left
-tdehtml-margin-start
-tdehtml-marquee
-tdehtml-marquee-direction
-tdehtml-marquee-increment
-tdehtml-marquee-repetition
-tdehtml-marquee-speed
-tdehtml-marquee-style
-khtml-margin-start
-khtml-marquee
-khtml-marquee-direction
-khtml-marquee-increment
-khtml-marquee-repetition
-khtml-marquee-speed
-khtml-marquee-style
max-height
max-width
min-height
@ -93,7 +93,7 @@ padding-top
padding-right
padding-bottom
padding-left
-tdehtml-padding-start
-khtml-padding-start
#page
page-break-after
page-break-before
@ -144,5 +144,5 @@ scrollbar-darkshadow-color
scrollbar-track-color
scrollbar-arrow-color
# tdehtml internals
-tdehtml-flow-mode
-tdehtml-user-input
-khtml-flow-mode
-khtml-user-input

2
tdehtml/css/cssstyleselector.cpp
Unescape View File

@ -3964,7 +3964,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
}
break;
case CSS_PROP_TEXT_OVERFLOW: {
// This property is supported by WinIE, and so we leave off the "-tdehtml-" in order to
// This property is supported by WinIE, and so we leave off the "-khtml-" in order to
// work with WinIE-specific pages that use the property.
HANDLE_INHERIT_AND_INITIAL(textOverflow, TextOverflow)
if (!primitiveValue || !primitiveValue->getIdent())

1233
tdehtml/css/cssvalues.c
View File

File diff suppressed because it is too large Load Diff

54
tdehtml/css/cssvalues.in
Unescape View File

@ -16,7 +16,7 @@ initial
# CSS_PROP_BORDER_TOP_STYLE
# CSS_PROP_BORDER_BOTTOM_STYLE
# CSS_PROP_BORDER_LEFT_STYLE
-tdehtml-native
-khtml-native
none
hidden
inset
@ -73,7 +73,7 @@ medium
large
x-large
xx-large
-tdehtml-xxx-large
-khtml-xxx-large
smaller
larger
#
@ -156,7 +156,7 @@ windowtext
#
# colors in non strict mode
grey
-tdehtml-text
-khtml-text
#
# CSS_PROP_BACKGROUND_REPEAT:
#
@ -176,18 +176,18 @@ text-bottom
top
bottom
# HTML alignment MIDDLE has no corresponding CSS alignment
-tdehtml-baseline-middle
-khtml-baseline-middle
#
# CSS_PROP_TEXT_ALIGN:
#
-tdehtml-auto
-khtml-auto
left
right
center
justify
-tdehtml-left
-tdehtml-right
-tdehtml-center
-khtml-left
-khtml-right
-khtml-center
#
# CSS_PROP_LIST_STYLE_POSITION:
#
@ -200,29 +200,29 @@ disc
circle
square
box
-tdehtml-diamond
-khtml-diamond
decimal
decimal-leading-zero
-tdehtml-arabic-indic
-tdehtml-lao
-tdehtml-persian
-tdehtml-urdu
-tdehtml-thai
-tdehtml-tibetan
-khtml-arabic-indic
-khtml-lao
-khtml-persian
-khtml-urdu
-khtml-thai
-khtml-tibetan
lower-roman
upper-roman
hebrew
armenian
georgian
cjk-ideographic
-tdehtml-japanese-formal
-tdehtml-japanese-informal
-tdehtml-simp-chinese-formal
-tdehtml-simp-chinese-informal
-tdehtml-trad-chinese-formal
-tdehtml-trad-chinese-informal
-khtml-japanese-formal
-khtml-japanese-informal
-khtml-simp-chinese-formal
-khtml-simp-chinese-informal
-khtml-trad-chinese-formal
-khtml-trad-chinese-informal
lower-greek
-tdehtml-upper-greek
-khtml-upper-greek
lower-alpha
lower-latin
upper-alpha
@ -231,8 +231,8 @@ hiragana
katakana
hiragana-iroha
katakana-iroha
-tdehtml-open-quote
-tdehtml-close-quote
-khtml-open-quote
-khtml-close-quote
#none
#
# CSS_PROP_DISPLAY:
@ -307,7 +307,7 @@ nowrap
pre
pre-wrap
pre-line
-tdehtml-nowrap
-khtml-nowrap
#
# CSS_PROP_WORD_WRAP
#
@ -351,8 +351,8 @@ thin
underline
#
# CSS_PROP__TDEHTML_FLOW_MODE
-tdehtml-normal
-tdehtml-around-floats
-khtml-normal
-khtml-around-floats
# CSS3 Values
# CSS_PROP__TDEHTML_BOX_SIZING

30
tdehtml/css/html4.css
Unescape View File

@ -11,7 +11,7 @@
html {
display: block;
color: -tdehtml-text;
color: -khtml-text;
}
/*
@ -99,7 +99,7 @@ q:after {
center {
display: block;
/* special centering to be able to emulate the html4/netscape behavior */
text-align: -tdehtml-center;
text-align: -khtml-center;
}
hr {
@ -107,7 +107,7 @@ hr {
margin: 12px auto;
border-style: inset;
border-width: 1px;
-tdehtml-flow-mode: -tdehtml-around-floats
-khtml-flow-mode: -khtml-around-floats
}
map {
@ -171,7 +171,7 @@ table {
display: table;
border-collapse: separate;
border-spacing: 2px;
-tdehtml-flow-mode: -tdehtml-around-floats;
-khtml-flow-mode: -khtml-around-floats;
box-sizing: border-box;
}
@ -181,11 +181,11 @@ table[align="center"] {
}
table[align="left"] {
float: -tdehtml-left;
float: -khtml-left;
}
table[align="right"] {
float: -tdehtml-right;
float: -khtml-right;
}
thead {
@ -232,7 +232,7 @@ th {
caption {
display: table-caption;
text-align: -tdehtml-center;
text-align: -khtml-center;
}
/*
@ -243,19 +243,19 @@ ul, menu, dir {
display: block;
list-style-type: disc;
margin: 1__qem 0 1em 0;
-tdehtml-padding-start: 40px
-khtml-padding-start: 40px
}
ol {
display: block;
list-style-type: decimal;
margin: 1__qem 0 1em 0;
-tdehtml-padding-start: 40px
-khtml-padding-start: 40px
}
li {
display: list-item;
-tdehtml-flow-mode: -tdehtml-around-floats;
-khtml-flow-mode: -khtml-around-floats;
}
@ -273,7 +273,7 @@ dd {
}
dl > dd {
-tdehtml-margin-start: 40px;
-khtml-margin-start: 40px;
}
dl {
@ -329,7 +329,7 @@ fieldset {
padding: 0.75em 0.625em;
margin: 1.0em 0;
border: 2px groove threedface;
-tdehtml-flow-mode: -tdehtml-around-floats
-khtml-flow-mode: -khtml-around-floats
}
button {
@ -346,7 +346,7 @@ button:active {
}
input, textarea {
text-align: -tdehtml-auto;
text-align: -khtml-auto;
}
input, textarea, select, button {
@ -357,7 +357,7 @@ input, textarea, select, button {
input { color: windowtext;
font-family: sans-serif;
font-size: small;
border: 2px -tdehtml-native;
border: 2px -khtml-native;
}
input[type="hidden"] {
@ -396,7 +396,7 @@ select {
textarea {
color: windowtext;
font-family: monospace;
border: 2px -tdehtml-native;
border: 2px -khtml-native;
}
/*

2
tdehtml/css/makevalues
Unescape View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
# This file is part of the KDE libraries
#
# Copyright (C) 1999 Waldo Bastian (bastian@kde.org)

2189
tdehtml/css/parser.cpp
View File

File diff suppressed because it is too large Load Diff

124
tdehtml/css/parser.h
Unescape View File

@ -1,35 +1,28 @@
/* A Bison parser, made by GNU Bison 2.5. */
/* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
as a parser skeleton. Alternatively, if you modify or redistribute
the parser skeleton itself, you may (at your option) remove this
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
/* A Bison parser, made by GNU Bison 1.875d. */
/* Skeleton parser for Yacc-like parsing with Bison,
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
/* Tokens. */
#ifndef YYTOKENTYPE
@ -85,14 +78,59 @@
UNICODERANGE = 303
};
#endif
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
#define UNIMPORTANT_TOK 258
#define S 259
#define SGML_CD 260
#define INCLUDES 261
#define DASHMATCH 262
#define BEGINSWITH 263
#define ENDSWITH 264
#define CONTAINS 265
#define STRING 266
#define IDENT 267
#define NTH 268
#define HASH 269
#define IMPORT_SYM 270
#define PAGE_SYM 271
#define MEDIA_SYM 272
#define FONT_FACE_SYM 273
#define CHARSET_SYM 274
#define NAMESPACE_SYM 275
#define TDEHTML_RULE_SYM 276
#define TDEHTML_DECLS_SYM 277
#define TDEHTML_VALUE_SYM 278
#define IMPORTANT_SYM 279
#define QEMS 280
#define EMS 281
#define EXS 282
#define PXS 283
#define CMS 284
#define MMS 285
#define INS 286
#define PTS 287
#define PCS 288
#define DEGS 289
#define RADS 290
#define GRADS 291
#define MSECS 292
#define SECS 293
#define HERZ 294
#define KHERZ 295
#define DIMEN 296
#define PERCENTAGE 297
#define FLOAT 298
#define INTEGER 299
#define URI 300
#define FUNCTION 301
#define NOTFUNCTION 302
#define UNICODERANGE 303
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
typedef union YYSTYPE {
CSSRuleImpl *rule;
CSSSelector *selector;
TQPtrList<CSSSelector> *selectorList;
@ -112,15 +150,15 @@ typedef union YYSTYPE
char tok;
Value value;
ValueList *valueList;
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
/* Line 1285 of yacc.c. */
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif

4
tdehtml/css/parser.y
Unescape View File

@ -86,7 +86,7 @@ static inline int getValueID(const char *tagStr, int len)
%union {
CSSRuleImpl *rule;
CSSSelector *selector;
TQPtrList<CSSSelector> *selectorList;
QPtrList<CSSSelector> *selectorList;
bool ok;
MediaListImpl *mediaList;
CSSMediaRuleImpl *mediaRule;
@ -525,7 +525,7 @@ ruleset:
selector_list:
selector %prec UNIMPORTANT_TOK {
if ( $1 ) {
$$ = new TQPtrList<CSSSelector>;
$$ = new QPtrList<CSSSelector>;
$$->setAutoDelete( true );
#ifdef CSS_DEBUG
kdDebug( 6080 ) << " got simple selector:" << endl;

4
tdehtml/css/quirks.css
Unescape View File

@ -21,10 +21,10 @@ img[align="right"] {
table {
white-space: normal;
line-height: normal;
color: -tdehtml-text;
color: -khtml-text;
font-size: medium;
empty-cells: hide;
text-align: -tdehtml-auto;
text-align: -khtml-auto;
font-weight: initial;
}

1498
tdehtml/css/tokenizer.cpp
View File

File diff suppressed because it is too large Load Diff

6
tdehtml/css/tokenizer.flex
Unescape View File

@ -50,9 +50,9 @@ nth (-?[0-9]*n[\+-][0-9]+)|(-?[0-9]*n)
"@font-face" {yyTok = FONT_FACE_SYM; return yyTok;}
"@charset" {yyTok = CHARSET_SYM; return yyTok;}
"@namespace" {yyTok = NAMESPACE_SYM; return yyTok; }
"@-tdehtml-rule" {yyTok = TDEHTML_RULE_SYM; return yyTok; }
"@-tdehtml-decls" {yyTok = TDEHTML_DECLS_SYM; return yyTok; }
"@-tdehtml-value" {yyTok = TDEHTML_VALUE_SYM; return yyTok; }
"@-khtml-rule" {yyTok = TDEHTML_RULE_SYM; return yyTok; }
"@-khtml-decls" {yyTok = TDEHTML_DECLS_SYM; return yyTok; }
"@-khtml-value" {yyTok = TDEHTML_VALUE_SYM; return yyTok; }
"!"{w}"important" {yyTok = IMPORTANT_SYM; return yyTok;}

2
tdehtml/ecma/kjs_proxy.cpp
Unescape View File

@ -355,7 +355,7 @@ void KJSProxyImpl::applyUserAgent()
// If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
userAgent.find(TQString::fromLatin1("compatible")) == -1 &&
userAgent.find(TQString::fromLatin1("TDEHTML")) == -1)
userAgent.find(TQString::fromLatin1("KHTML")) == -1)
{
m_script->setCompatMode(Interpreter::NetscapeCompat);
#ifdef KJS_VERBOSE

3
tdehtml/html/html_elementimpl.cpp
Unescape View File

@ -436,9 +436,8 @@ void HTMLElementImpl::addHTMLColor( int id, const DOMString &c )
color.sprintf("#%02x%02x%02x", colors[0], colors[1], colors[2] );
// tqDebug( "trying to add fixed color string '%s'", color.latin1() );
if ( m_styleDecls->setProperty(id, DOMString(color), false, true) ) {
if ( m_styleDecls->setProperty(id, DOMString(color), false, true) )
return;
}
}
}
m_styleDecls->setProperty(id, CSS_VAL_BLACK, false, true);

18
tdehtml/rendering/bidi.cpp
Unescape View File

@ -877,7 +877,7 @@ bool RenderBlock::clearLineOfPageBreaks(InlineFlowBox* lineBox)
lineBox->verticallyAlignBoxes(m_height);
}
#ifdef PAGE_DEBUG
kdDebug(6040) << "Cleared line " << lineBox->yPos() << "px" << endl;
kdDebug(6040) << "Cleared line " << lineBox->yPos() - oldYPos << "px" << endl;
#endif
setContainsPageBreak(true);
}
@ -1254,8 +1254,8 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
}
#if BIDI_DEBUG > 0
// kdDebug(6041) << "reached end of line current=" << current.obj << "/" << current.pos
// << ", eor=" << eor.obj << "/" << eor.pos << endl;
kdDebug(6041) << "reached end of line current=" << current.obj << "/" << current.pos
<< ", eor=" << eor.obj << "/" << eor.pos << endl;
#endif
if ( !emptyRun && bidi.sor != bidi.current ) {
bidi.eor = bidi.last;
@ -1286,10 +1286,10 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
#if BIDI_DEBUG > 0
kdDebug(6041) << "lineLow = " << (uint)levelLow << ", lineHigh = " << (uint)levelHigh << endl;
kdDebug(6041) << "logical order is:" << endl;
// TQPtrListIterator<BidiRun> it2(runs);
// BidiRun *r2;
// for ( ; (r2 = it2.current()); ++it2 )
// kdDebug(6041) << " " << r2 << " start=" << r2->start << " stop=" << r2->stop << " level=" << (uint)r2->level << endl;
TQPtrListIterator<BidiRun> it2(runs);
BidiRun *r2;
for ( ; (r2 = it2.current()); ++it2 )
kdDebug(6041) << " " << r2 << " start=" << r2->start << " stop=" << r2->stop << " level=" << (uint)r2->level << endl;
#endif
int count = sBidiRunCount - 1;
@ -1318,8 +1318,8 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
#if BIDI_DEBUG > 0
kdDebug(6041) << "visual order is:" << endl;
// for (BidiRun* curr = sFirstRun; curr; curr = curr->nextRun)
// kdDebug(6041) << " " << curr << endl;
for (BidiRun* curr = sFirstRun; curr; curr = curr->nextRun)
kdDebug(6041) << " " << curr << endl;
#endif
}

10
tdehtml/rendering/render_block.cpp
Unescape View File

@ -26,11 +26,11 @@
*
*/
// #define DEBUG
// #define DEBUG_LAYOUT
// #define BOX_DEBUG
// #define FLOAT_DEBUG
// #define PAGE_DEBUG
//#define DEBUG
//#define DEBUG_LAYOUT
//#define BOX_DEBUG
//#define FLOAT_DEBUG
//#define PAGE_DEBUG
#include <kdebug.h>
#include "rendering/render_text.h"

2
tdehtml/rendering/render_generated.cpp
Unescape View File

@ -259,7 +259,7 @@ void RenderQuote::generateContent()
visual = true;
if (!m_counterNode)
m_counterNode = getCounter("-tdehtml-quotes", visual, false);
m_counterNode = getCounter("-khtml-quotes", visual, false);
int value = m_counterNode->count();
if (m_counterNode->isReset()) value = m_counterNode->value();

4
tdehtml/rendering/render_object.cpp
Unescape View File

@ -2077,7 +2077,7 @@ bool RenderObject::hasCounter(const TQString& counter) const
element()->id() == ID_DIR))
return true;
} else
if (counter == "-tdehtml-quotes" && isQuote()) {
if (counter == "-khtml-quotes" && isQuote()) {
return (static_cast<const RenderQuote*>(this)->quoteCount() != 0);
}
return false;
@ -2146,7 +2146,7 @@ CounterNode* RenderObject::getCounter(const TQString& counter, bool view, bool c
// kdDebug( 6040 ) << renderName() << " counter-reset: " << counter << " " << val << endl;
}
}
else if (counter == "-tdehtml-quotes" && isQuote()) {
else if (counter == "-khtml-quotes" && isQuote()) {
i = new CounterNode(this);
val = static_cast<RenderQuote*>(this)->quoteCount();
}

12
tdehtml/tdehtml_printsettings.cpp
Unescape View File

@ -93,16 +93,16 @@ TDEHTMLPrintSettings::~TDEHTMLPrintSettings()
void TDEHTMLPrintSettings::getOptions(TQMap<TQString,TQString>& opts, bool /*incldef*/)
{
opts["app-tdehtml-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");
opts["app-tdehtml-printimages"] = (m_printimages->isChecked() ? "true" : "false");
opts["app-tdehtml-printheader"] = (m_printheader->isChecked() ? "true" : "false");
opts["app-khtml-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");
opts["app-khtml-printimages"] = (m_printimages->isChecked() ? "true" : "false");
opts["app-khtml-printheader"] = (m_printheader->isChecked() ? "true" : "false");
}
void TDEHTMLPrintSettings::setOptions(const TQMap<TQString,TQString>& opts)
{
m_printfriendly->setChecked(opts["app-tdehtml-printfriendly"] != "false");
m_printimages->setChecked(opts["app-tdehtml-printimages"] != "false");
m_printheader->setChecked(opts["app-tdehtml-printheader"] != "false");
m_printfriendly->setChecked(opts["app-khtml-printfriendly"] != "false");
m_printimages->setChecked(opts["app-khtml-printimages"] != "false");
m_printheader->setChecked(opts["app-khtml-printheader"] != "false");
}
#include "tdehtml_printsettings.moc"

6
tdehtml/tdehtmlview.cpp
Unescape View File

@ -2801,7 +2801,7 @@ void TDEHTMLView::print(bool quick)
// We ignore margin settings for html and body when printing
// and use the default margins from the print-system
// (In Qt 3.0.x the default margins are hardcoded in Qt)
m_part->xmlDocImpl()->setPrintStyleSheet( printer->option("app-tdehtml-printfriendly") == "true" ?
m_part->xmlDocImpl()->setPrintStyleSheet( printer->option("app-khtml-printfriendly") == "true" ?
"* { background-image: none !important;"
" background-color: white !important;"
" color: black !important; }"
@ -2825,7 +2825,7 @@ void TDEHTMLView::print(bool quick)
m_part->xmlDocImpl()->styleSelector()->computeFontSizes(&metrics, 100);
m_part->xmlDocImpl()->updateStyleSelector();
root->setPrintImages( printer->option("app-tdehtml-printimages") == "true");
root->setPrintImages( printer->option("app-khtml-printimages") == "true");
root->makePageBreakAvoidBlocks();
root->setNeedsLayoutAndMinMaxRecalc();
@ -2834,7 +2834,7 @@ void TDEHTMLView::print(bool quick)
// check sizes ask for action.. (scale or clip)
bool printHeader = (printer->option("app-tdehtml-printheader") == "true");
bool printHeader = (printer->option("app-khtml-printheader") == "true");
int headerHeight = 0;
TQFont headerFont("Sans Serif", 8);

2
tdehtml/xml/dom2_rangeimpl.cpp
Unescape View File

@ -1139,7 +1139,7 @@ DOMString RangeImpl::toHTML( int &exceptioncode )
text = DOMString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
"<head>\n"
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
"<meta name=\"Generator\" content=\"TDEHTML, the KDE Web Page Viewer\" />\n"
"<meta name=\"Generator\" content=\"TDEHTML, the TDE Web Page Viewer\" />\n"
"</head>\n") +
text +
"</html>";

2
tdeio/tdeio/tdeprotocolmanager.cpp
Unescape View File

@ -72,7 +72,7 @@ KProtocolManagerPrivate::~KProtocolManagerPrivate()
// DEFAULT USERAGENT STRING
#define CFG_DEFAULT_UAGENT(X) \
TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) TDEHTML/%4.%5.%6 (like Gecko)") \
TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/TDEHTML/%4.%5.%6 (like Gecko)") \
.arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(X).arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE)
void KProtocolManager::reparseConfiguration()

Write Preview
Loading…
Cancel
Save