summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdoc/src/template/scripts/functions.js17
-rw-r--r--doc/src/template/scripts/narrow.js13
-rw-r--r--doc/src/template/style/OfflineStyle.css15
-rwxr-xr-xdoc/src/template/style/style.css91
-rw-r--r--src/gui/styles/qmacstyle_mac.mm2
-rw-r--r--tools/designer/src/lib/uilib/abstractformbuilder.cpp17
-rw-r--r--tools/qdoc3/htmlgenerator.cpp14
-rw-r--r--tools/qdoc3/test/qt-build-docs.qdocconf10
-rw-r--r--tools/qdoc3/test/qt-html-templates.qdocconf12
9 files changed, 137 insertions, 54 deletions
diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 58a0248..2723ff2 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -104,9 +104,9 @@ function processNokiaData(response){
}
- if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
- if(articleCount == 0){$('#ul002').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
- if(exampleCount == 0){$('#ul003').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
+ if(lookupCount == 0){$('#ul001').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
+ if(articleCount == 0){$('#ul002').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
+ if(exampleCount == 0){$('#ul003').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
// reset count variables;
lookupCount=0;
articleCount = 0;
@@ -160,7 +160,8 @@ else
var searchString = $('#pageType').val() ;
if ((searchString == null) || (searchString.length < 3)) {
$('#pageType').removeClass('loading');
- $('.liveResult').remove(); // replaces removeResults();
+ $('.liveResult').remove();
+ $('.searching').remove();
CheckEmptyAndLoadList();
$('.report').remove();
// debug$('.content').prepend('<li>too short or blank</li>'); // debug
@@ -169,9 +170,7 @@ else
if (this.timer) clearTimeout(this.timer);
this.timer = setTimeout(function () {
$('#pageType').addClass('loading');
- // debug$('.content').prepend('<li>new search started </li>');// debug
- // debug$('.content').prepend('<p class=\"report\">Search string ' +searchString +'</p>'); // debug
-
+ $('.list ul').prepend('<li class="menuAlert searching">Searching...</li>');
$.ajax({
contentType: "application/x-www-form-urlencoded",
url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
@@ -180,9 +179,9 @@ else
type: 'post',
success: function (response, textStatus) {
- $('.liveResult').remove(); // replaces removeResults();
+ $('.liveResult').remove();
$('#pageType').removeClass('loading');
-
+ $('.list ul').prepend('<li class="menuAlert searching">Searching...</li>');
processNokiaData(response);
}
diff --git a/doc/src/template/scripts/narrow.js b/doc/src/template/scripts/narrow.js
index 12d0ce8..35c81bf 100644
--- a/doc/src/template/scripts/narrow.js
+++ b/doc/src/template/scripts/narrow.js
@@ -59,9 +59,20 @@ var narrowInit = function() {
}
$(document).ready(function(){
- if ($('body').hasClass('narrow')) {
+/* if ($('body').hasClass('narrow')) {
narrowInit();
}
+ */
+ if($(window).width()<600) {
+ $('body').addClass('narrow');
+
+ if ($("#narrowsearch").length == 0) {
+ narrowInit();
+ }
+ }
+ else {
+ $('body').removeClass('narrow');
+ }
});
$(window).bind('resize', function () {
diff --git a/doc/src/template/style/OfflineStyle.css b/doc/src/template/style/OfflineStyle.css
index ddd580a..afa7de0 100644
--- a/doc/src/template/style/OfflineStyle.css
+++ b/doc/src/template/style/OfflineStyle.css
@@ -337,9 +337,10 @@
}
.wrap .content li
{
- padding-left: 12px;
+ /*padding-left: 12px;*/
background: url(../images/bullet_sq.png) no-repeat 0 5px;
font: normal 400 10pt/1 Verdana;
+ /* color: #44a51c;*/
margin-bottom: 10px;
}
@@ -794,6 +795,18 @@ ul.sf-menu li li li.sfHover ul {
left: 10em; /* match ul width */
top: 0;
}
+ .wrap .content ol li {
+ background:none;
+ font:400 10pt/1 Verdana;
+ margin-bottom:10px;
+ margin-left:12px;
+ }
+ .wrap .content ol li {
+ list-style-type:decimal;
+
+ }
+
+
}
/* end of screen media */
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 47fe2e0..78a21f6 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -256,9 +256,9 @@
.sidebar .box h2
{
- font: normal 18px/1.2 Arial;
+ font: 600 16px/1.2 Arial;
padding: 0;
- min-height: 32px;
+/* min-height: 32px;*/
}
.sidebar .box h2 span
{
@@ -271,10 +271,10 @@
}
.sidebar #lookup.box h2 span
{
- background: url(../images/sprites-combined.png) no-repeat -6px -311px;
+/* background: url(../images/sprites-combined.png) no-repeat -6px -311px;
width: 27px;
height: 35px;
- margin-right: 13px;
+ margin-right: 13px;*/
}
.sidebar .box#topics h2
{
@@ -282,10 +282,10 @@
}
.sidebar #topics.box h2 span
{
- background: url(../images/sprites-combined.png) no-repeat -94px -311px;
+ /* background: url(../images/sprites-combined.png) no-repeat -94px -311px;
width: 27px;
height: 32px;
- margin-right: 13px;
+ margin-right: 13px;*/
}
.sidebar .box#examples h2
{
@@ -293,32 +293,30 @@
}
.sidebar #examples.box h2 span
{
- background: url(../images/sprites-combined.png) no-repeat -48px -311px;
+ /* background: url(../images/sprites-combined.png) no-repeat -48px -311px;
width: 30px;
height: 31px;
- margin-right: 9px;
+ margin-right: 9px;*/
}
.sidebar .box .list
{
display: block;
max-height:200px;
+ min-height:120px;
overflow-y:auto;
overflow-x:none;
}
- .sidebar .box .live
- {
- display: none;
- height: 100px;
- overflow: auto;
- }
- .list li a:hover, .live li a:hover
+ .list li a:hover
{
text-decoration: underline;
}
.sidebar .box ul
{
- padding:10px;
+ /*padding:10px;*/
+ padding-bottom:5px;
+ padding-left:10px;
+ padding-top:5px;
}
.sidebar .box ul li
{
@@ -330,6 +328,14 @@
{
background: url(../images/box_bg.png) repeat-x 0 bottom;
}
+ .sidebar .box ul li.menuAlert
+ {
+ background: none;
+ color:gray;
+ font-style:italic;
+ }
+
+
.wrap
{
margin: 0 5px 0 208px;
@@ -461,11 +467,12 @@
.wrap .content li
{
- padding-left: 12px;
+ /*padding-left: 12px;*/
background: url(../images/bullet_sq.png) no-repeat 0 5px;
font: normal 400 10pt/1 Verdana;
/* color: #44a51c;*/
margin-bottom: 10px;
+ padding-left:12px;
}
.content li:hover
{
@@ -493,6 +500,7 @@
{
line-height: 20px;
padding: 5px;
+ /* text-align:justify;*/
}
.wrap .content table p
{
@@ -776,7 +784,7 @@
td.rightAlign
{
- padding: 3px 15px 3px 10px;
+ padding: 3px 5px 3px 10px;
}
table tr.odd
{
@@ -898,10 +906,14 @@
}
.generic{
- max-width:75%;
+ /*max-width:75%;*/
}
.generic td{
- padding:0;
+ padding:5px;
+ }
+
+ .generic .alphaChar{
+ margin-top:5px;
}
.generic .odd .alphaChar{
@@ -915,7 +927,9 @@
.alignedsummary{}
.propsummary{}
.memItemLeft{}
- .memItemRight{}
+ .memItemRight{
+ padding:3px 15px 3px 0;
+ }
.bottomAlign{}
.highlightedCode
{
@@ -923,7 +937,9 @@
}
.LegaleseLeft{}
.valuelist{}
- .annotated{}
+ .annotated td{
+ padding: 3px 5px 3px 5px;
+ }
.obsolete{}
.compat{}
.flags{}
@@ -984,6 +1000,7 @@
border-color: #E6E6E6;
font-weight: bold;
word-spacing:3px;
+ padding:3px 5px;
}
.functionIndex {
@@ -1173,8 +1190,36 @@ pre.highlightedCode {
display: block;
overflow:hidden;
}
-
+.floatingResult{
+ z-index:1;
+ position:relative;
+ padding-top:0px;
+ background-color:white;
+ border:solid 1px black;
+ height:250px;
+ width:600px;
+ overflow-x:hidden;
+ overflow-y:auto;
}
+
+ .floatingResult:hover{
+ display:block;
+ }
+ .floatingResult:hover{
+ /*display:none;*/
+ }
+
+ .wrap .content ol li {
+ background:none;
+ font:400 10pt/1 Verdana;
+ margin-bottom:10px;
+ margin-left:12px;
+ }
+ .wrap .content ol li {
+ list-style-type:decimal;
+
+ }
+
/* end of screen media */
/* start of print media */
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index f029602..d18383c 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -1808,7 +1808,7 @@ void qt_mac_fill_background(QPainter *painter, const QRegion &rgn, const QBrush
painter->setClipRegion(rgn);
- CGContextRef cg = qt_mac_cg_context(target);
+ QCFType<CGContextRef> cg = qt_mac_cg_context(target);
CGContextSaveGState(cg);
HIThemeSetFill(kThemeBrushDialogBackgroundActive, 0, cg, kHIThemeOrientationInverted);
diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
index a0c9e83..6f009e3 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -2125,6 +2125,21 @@ void QAbstractFormBuilder::saveComboBoxExtraInfo(QComboBox *comboBox, DomWidget
ui_widget->setElementItem(ui_items);
}
+// Return the buttongroups assigned to a button except the internal one
+// (with empty object name) used by Q3ButtonGroup.
+static inline const QButtonGroup *formButtonGroup(const QAbstractButton *widget)
+{
+ const QButtonGroup *buttonGroup = widget->group();
+ if (!buttonGroup)
+ return 0;
+ if (buttonGroup->objectName().isEmpty()) {
+ if (const QWidget *parent = widget->parentWidget())
+ if (!qstrcmp(parent->metaObject()->className(), "Q3ButtonGroup"))
+ return 0;
+ }
+ return buttonGroup;
+}
+
/*!
\internal
\since 4.5
@@ -2133,7 +2148,7 @@ void QAbstractFormBuilder::saveComboBoxExtraInfo(QComboBox *comboBox, DomWidget
void QAbstractFormBuilder::saveButtonExtraInfo(const QAbstractButton *widget, DomWidget *ui_widget, DomWidget *)
{
typedef QList<DomProperty*> DomPropertyList;
- if (const QButtonGroup *buttonGroup = widget->group()) {
+ if (const QButtonGroup *buttonGroup = formButtonGroup(widget)) {
DomPropertyList attributes = ui_widget->elementAttribute();
DomString *domString = new DomString();
domString->setText(buttonGroup->objectName());
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index f6b8c06..339c390 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1831,13 +1831,13 @@ void HtmlGenerator::generateHeader(const QString& title,
out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />";
// syntax highlighter js and css
- // out() << " <link type=\"text/css\" rel=\"stylesheet\" href=\"style/shCore.css\"/>\n";
- // out() << " <link type=\"text/css\" rel=\"stylesheet\" href=\"style/shThemeDefault.css\"/>\n";
- // out() << " <script type=\"text/javascript\" src=\"scripts/shCore.js\"></script>\n";
- // out() << " <script type=\"text/javascript\" src=\"scripts/shBrushCpp.js\"></script>\n";
- // out() << " <script type=\"text/javascript\">\n";
- // out() << " SyntaxHighlighter.all();\n";
- // out() << " </script>\n";
+ // out() << " <link type=\"text/css\" rel=\"stylesheet\" href=\"style/shCore.css\"/>\n";
+ // out() << " <link type=\"text/css\" rel=\"stylesheet\" href=\"style/shThemeDefault.css\"/>\n";
+ // out() << " <script type=\"text/javascript\" src=\"scripts/shCore.js\"></script>\n";
+ // out() << " <script type=\"text/javascript\" src=\"scripts/shBrushCpp.js\"></script>\n";
+ // out() << " <script type=\"text/javascript\">\n";
+ // out() << " SyntaxHighlighter.all();\n";
+ // out() << " </script>\n";
out() << "</head>\n";
out() << "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n";
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 216ac6a..09cbc45 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -44,6 +44,16 @@ qhp.Qt.extraFiles = index.html \
images/dynamiclayouts-example.png \
scripts/functions.js \
scripts/jquery.js \
+ scripts/shBrushCpp.js \
+ scripts/shCore.js \
+ scripts/shLegacy.js \
+ scripts/narrow.js \
+ scripts/superfish.js \
+ style/shCore.css \
+ style/shThemeDefault.css \
+ style/narrow.css \
+ style/superfish.css \
+ style/superfish_skin.css \
style/OfflineStyle.css \
style/style_ie6.css \
style/style_ie7.css \
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 60f5fb1..1fb000b 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -165,14 +165,4 @@ HTML.footer = " <!-- /div -->\n" \
" </form>\n" \
" </div>\n" \
" <div id=\"blurpage\">\n" \
- " </div>\n" \
- "<script type=\"text/javascript\">\n" \
- " var _gaq = _gaq || [];\n" \
- " _gaq.push([\'_setAccount\', \'UA-4457116-5\']);\n" \
- " _gaq.push([\'_trackPageview\']);\n" \
- " (function() {\n" \
- " var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;\n" \
- " ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';\n" \
- " var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);\n" \
- " })();\n" \
- "</script>\n"
+ " </div>\n"
generated by cgit v0.12 at 2024-09-27 01:28:29 (GMT)