[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:00:53 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit bd6a1fde31ee9942df7e0f79b7f3556554ae22da
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 15 06:08:29 2002 +0000
WebCore:
- fixed most of the problems with OPTGROUP
* khtml/html/htmlparser.cpp: (KHTMLParser::insertNode):
Make OPTGROUPs pop out of other unclosed OPTGROUPs, not just out of options.
* kwq/KWQListBox.h: Add private member function.
* kwq/KWQListBox.mm:
(QListBox::insertItem): Use shared insertItem function.
(QListBox::insertGroupLabel): Create an attributed string for the group label,
with bold font.
(-[KWQListBoxTableViewDelegate tableView:shouldSelectRow:]): Return YES only
for the plain strings, that way you can't select the group labels.
* WebCore.pbproj/project.pbxproj: Let PB do its thing.
WebBrowser:
* BrowserDocument.h: Remove unused BrowserDocumentPageTitleChangedNotification.
* BrowserDocument.m:
(-[BrowserDocument _pageTitleHasChanged]): Remove unused notification.
(-[BrowserDocument goToBugReportingPage:]): Escape URL so it works in the form parameters.
* PoofAnimator.m: (-[PoofAnimator init]): Remove use of private _setHasShadow:
which is just the same thing as the public setHasShadow:.
* BrowserWindowController.m: Tweak formatting.
* Preferences.subproj/GeneralPreferences.m: Tweak.
* WebBrowser.pbproj/project.pbxproj: Let PB do its thing.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2685 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a4cc44f..2d27bed 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-11-14 Darin Adler <darin at apple.com>
+
+ - fixed most of the problems with OPTGROUP
+
+ * khtml/html/htmlparser.cpp: (KHTMLParser::insertNode):
+ Make OPTGROUPs pop out of other unclosed OPTGROUPs, not just out of options.
+
+ * kwq/KWQListBox.h: Add private member function.
+ * kwq/KWQListBox.mm:
+ (QListBox::insertItem): Use shared insertItem function.
+ (QListBox::insertGroupLabel): Create an attributed string for the group label,
+ with bold font.
+ (-[KWQListBoxTableViewDelegate tableView:shouldSelectRow:]): Return YES only
+ for the plain strings, that way you can't select the group labels.
+
+ * WebCore.pbproj/project.pbxproj: Let PB do its thing.
+
2002-11-14 David Hyatt <hyatt at apple.com>
Fix spinner.com mislayout on the PLT. Make sure
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a4cc44f..2d27bed 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2002-11-14 Darin Adler <darin at apple.com>
+
+ - fixed most of the problems with OPTGROUP
+
+ * khtml/html/htmlparser.cpp: (KHTMLParser::insertNode):
+ Make OPTGROUPs pop out of other unclosed OPTGROUPs, not just out of options.
+
+ * kwq/KWQListBox.h: Add private member function.
+ * kwq/KWQListBox.mm:
+ (QListBox::insertItem): Use shared insertItem function.
+ (QListBox::insertGroupLabel): Create an attributed string for the group label,
+ with bold font.
+ (-[KWQListBoxTableViewDelegate tableView:shouldSelectRow:]): Return YES only
+ for the plain strings, that way you can't select the group labels.
+
+ * WebCore.pbproj/project.pbxproj: Let PB do its thing.
+
2002-11-14 David Hyatt <hyatt at apple.com>
Fix spinner.com mislayout on the PLT. Make sure
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a4cc44f..2d27bed 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2002-11-14 Darin Adler <darin at apple.com>
+
+ - fixed most of the problems with OPTGROUP
+
+ * khtml/html/htmlparser.cpp: (KHTMLParser::insertNode):
+ Make OPTGROUPs pop out of other unclosed OPTGROUPs, not just out of options.
+
+ * kwq/KWQListBox.h: Add private member function.
+ * kwq/KWQListBox.mm:
+ (QListBox::insertItem): Use shared insertItem function.
+ (QListBox::insertGroupLabel): Create an attributed string for the group label,
+ with bold font.
+ (-[KWQListBoxTableViewDelegate tableView:shouldSelectRow:]): Return YES only
+ for the plain strings, that way you can't select the group labels.
+
+ * WebCore.pbproj/project.pbxproj: Let PB do its thing.
+
2002-11-14 David Hyatt <hyatt at apple.com>
Fix spinner.com mislayout on the PLT. Make sure
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 83de1b3..e5fe98f 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -72,7 +72,6 @@
F58C8A07025BD3BC018635CA,
F531DDEC02F0C34D018635CA,
);
- hasScannedForEncodings = 1;
isa = PBXProject;
knownRegions = (
English,
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 57c9d84..3048915 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -703,9 +703,10 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
}
break;
case ID_OPTION:
+ case ID_OPTGROUP:
if (id == ID_OPTGROUP)
{
- popBlock(ID_OPTION);
+ popBlock(current->id());
handled = true;
}
else if(id == ID_SELECT)
diff --git a/WebCore/kwq/KWQListBox.h b/WebCore/kwq/KWQListBox.h
index fa431ff..a934a8e 100644
--- a/WebCore/kwq/KWQListBox.h
+++ b/WebCore/kwq/KWQListBox.h
@@ -34,8 +34,10 @@ class QListBoxItem;
#ifdef __OBJC__
@class NSMutableArray;
+ at class NSObject;
#else
class NSMutableArray;
+class NSObject;
#endif
class QListBox : public QScrollView {
@@ -63,6 +65,8 @@ public:
void selectionChanged() { _selectionChanged.call(); }
private:
+ void insertItem(NSObject *, unsigned index);
+
NSMutableArray *_items;
bool _insertingItems;
mutable float _width;
diff --git a/WebCore/kwq/KWQListBox.mm b/WebCore/kwq/KWQListBox.mm
index 47efe51..6ef20d2 100644
--- a/WebCore/kwq/KWQListBox.mm
+++ b/WebCore/kwq/KWQListBox.mm
@@ -117,14 +117,13 @@ void QListBox::setSelectionMode(SelectionMode mode)
[tableView setAllowsMultipleSelection:mode != Single];
}
-void QListBox::insertItem(const QString &text, unsigned index)
+void QListBox::insertItem(NSObject *o, unsigned index)
{
unsigned c = count();
- NSString *s = text.getNSString();
if (index >= c) {
- [_items addObject:s];
+ [_items addObject:o];
} else {
- [_items replaceObjectAtIndex:index withObject:s];
+ [_items replaceObjectAtIndex:index withObject:o];
}
if (!_insertingItems) {
@@ -134,11 +133,23 @@ void QListBox::insertItem(const QString &text, unsigned index)
_widthGood = NO;
}
+void QListBox::insertItem(const QString &text, unsigned index)
+{
+ insertItem(text.getNSString(), index);
+}
+
void QListBox::insertGroupLabel(const QString &text, unsigned index)
{
- // FIXME: This should be a non-selectable item, I think.
- // Not sure how to do this in HTML.
- insertItem(text, index);
+ static NSDictionary *groupLabelAttributes;
+ if (groupLabelAttributes == nil) {
+ groupLabelAttributes = [[NSDictionary dictionaryWithObject:
+ [NSFont boldSystemFontOfSize:[NSFont smallSystemFontSize]] forKey:NSFontAttributeName] retain];
+ }
+
+ NSAttributedString *s = [[NSAttributedString alloc]
+ initWithString:text.getNSString() attributes:groupLabelAttributes];
+ insertItem(s, index);
+ [s release];
}
void QListBox::beginBatchInsert()
@@ -244,4 +255,9 @@ QSize QListBox::sizeForNumberOfLines(int lines) const
_box->clicked();
}
+- (BOOL)tableView:(NSTableView *)tableView shouldSelectRow:(int)row
+{
+ return [[_items objectAtIndex:row] isKindOfClass:[NSString class]];
+}
+
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list