[yast-commit] r46252 - in /trunk/qt-pkg/src: YQPkgChangeLogView.cc YQPkgDependenciesView.cc YQPkgDescriptionView.cc YQPkgGenericDetailsView.cc YQPkgGenericDetailsView.h YQPkgTechnicalDetailsView.cc

Author: dmacvicar Date: Tue Apr 8 17:41:41 2008 New Revision: 46252 URL: http://svn.opensuse.org/viewcvs/yast?rev=46252&view=rev Log: manage aspect with css here Modified: trunk/qt-pkg/src/YQPkgChangeLogView.cc trunk/qt-pkg/src/YQPkgDependenciesView.cc trunk/qt-pkg/src/YQPkgDescriptionView.cc trunk/qt-pkg/src/YQPkgGenericDetailsView.cc trunk/qt-pkg/src/YQPkgGenericDetailsView.h trunk/qt-pkg/src/YQPkgTechnicalDetailsView.cc Modified: trunk/qt-pkg/src/YQPkgChangeLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgChangeLogView.cc?rev=46252&r1=46251&r2=46252&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgChangeLogView.cc (original) +++ trunk/qt-pkg/src/YQPkgChangeLogView.cc Tue Apr 8 17:41:41 2008 @@ -52,9 +52,9 @@ return; } - QString html = htmlHeading( selectable, - true ); // showVersion - + QString html = htmlStart(); + html += htmlHeading( selectable, true ); + ZyppPkg installed = tryCastToZyppPkg( selectable->installedObj() ); if ( installed ) @@ -65,6 +65,7 @@ { html += "<p><i>" + _( "Information only available for installed packages." ) + "</i></p>"; } + html += htmlEnd(); setHtml( html ); } Modified: trunk/qt-pkg/src/YQPkgDependenciesView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgDependenciesView.cc?rev=46252&r1=46251&r2=46252&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgDependenciesView.cc (original) +++ trunk/qt-pkg/src/YQPkgDependenciesView.cc Tue Apr 8 17:41:41 2008 @@ -50,7 +50,8 @@ return; } - QString html_text = htmlHeading( selectable ); + QString html_text = htmlStart(); + html_text += htmlHeading( selectable ); ZyppObj candidate = selectable->candidateObj(); ZyppObj installed = selectable->installedObj(); @@ -68,6 +69,8 @@ html_text += simpleTable( installed ); } + html_text += htmlEnd(); + setHtml( html_text ); } Modified: trunk/qt-pkg/src/YQPkgDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgDescriptionView.cc?rev=46252&r1=46251&r2=46252&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgDescriptionView.cc (original) +++ trunk/qt-pkg/src/YQPkgDescriptionView.cc Tue Apr 8 17:41:41 2008 @@ -54,7 +54,9 @@ return; } - QString html_text = htmlHeading( selectable ); + QString html_text = htmlStart(); + + html_text += htmlHeading( selectable ); QString description = fromUTF8( selectable->theObj()->description() ); @@ -63,7 +65,7 @@ html_text += description; - + html_text += htmlEnd(); setHtml( html_text ); //FIXME ensureVisible( 0, 0 ); // Otherwise hyperlinks will be centered } Modified: trunk/qt-pkg/src/YQPkgGenericDetailsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgGenericDetailsView.cc?rev=46252&r1=46251&r2=46252&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgGenericDetailsView.cc (original) +++ trunk/qt-pkg/src/YQPkgGenericDetailsView.cc Tue Apr 8 17:41:41 2008 @@ -29,7 +29,6 @@ using std::string; - YQPkgGenericDetailsView::YQPkgGenericDetailsView( QWidget * parent ) : QTextBrowser( parent ) { @@ -41,6 +40,37 @@ connect( parent, SIGNAL( currentChanged(QWidget *) ), this, SLOT ( reload (QWidget *) ) ); } + + QString css; + css = "table.stats" + "{text-align: center;" + "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif ;" + "font-weight: normal;" + "font-size: 11px;" + "color: #fff;" + "width: 100%;" + "background-color: #666;" + "border: 1px;" + "border-collapse: collapse;" + "border-spacing: 4px;}" + "" + "table.stats td" + "{background-color: #CCC;" + "color: #000;" + "padding: 4px;" + "text-align: left;" + "border: 1px #fff solid;}" + "" + "table.stats td.hed" + "{background-color: #666;" + "color: #fff;" + "padding: 4px;" + "text-align: left;" + "border-bottom: 2px #fff solid;" + "font-size: 12px;" + "font-weight: bold;} "; + + document()->addResource( QTextDocument::StyleSheetResource, QUrl( "format.css" ), css ); } @@ -87,6 +117,21 @@ QString +YQPkgGenericDetailsView::htmlStart() +{ + return "<html><head>" + "<link rel='stylesheet' type='text/css' href='format.css'>" + "</head><body>"; +} + +QString +YQPkgGenericDetailsView::htmlEnd() +{ + return "</body></html>"; +} + + +QString YQPkgGenericDetailsView::htmlHeading( ZyppSel selectable, bool showVersion ) { if ( ! selectable ) @@ -102,7 +147,7 @@ QString html = "usingVisionImpairedPalette() ) - html += " bgcolor=#E0E0F8"; + html += " class=\"stats\""; html += "><tr><td><b>" + fromUTF8( zyppObj->name() ) @@ -138,10 +183,10 @@ QString YQPkgGenericDetailsView::table( const QString & contents ) { - QString html = "

usingVisionImpairedPalette() ) - html += " bgcolor=#F0F0F0"; + html += " class=\"stats\""; + html += ">" + contents + "</table>"; return html; @@ -159,7 +204,7 @@ YQPkgGenericDetailsView::cell( QString contents ) { contents = htmlEscape( contents ); - return "<td valign=top>" + contents + "</td>"; + return "<td>" + contents + "</td>"; } @@ -167,7 +212,7 @@ YQPkgGenericDetailsView::cell( int contents ) { QString html; - html.sprintf( "<td valign=top>%d</td>", contents ); + html.sprintf( "<td>%d</td>", contents ); return html; } @@ -190,7 +235,7 @@ QString YQPkgGenericDetailsView::hcell( QString contents ) { - QString html = "

usingVisionImpairedPalette() ) html += " bgcolor=#D0D0D0"; Modified: trunk/qt-pkg/src/YQPkgGenericDetailsView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgGenericDetailsView.h?rev=46252&r1=46251&r2=46252&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgGenericDetailsView.h (original) +++ trunk/qt-pkg/src/YQPkgGenericDetailsView.h Tue Apr 8 17:41:41 2008 @@ -60,6 +60,12 @@ virtual QSize minimumSizeHint() const; /** + * starts the html tag and set the style + */ + static QString htmlStart(); + static QString htmlEnd(); + + /** * Returns a uniform heading in HTML format for the specified selectable: * name and summary * or name, version and summary, if 'showVersion' is 'true' Modified: trunk/qt-pkg/src/YQPkgTechnicalDetailsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgTechnicalDetailsView.cc?rev=46252&r1=46251&r2=46252&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgTechnicalDetailsView.cc (original) +++ trunk/qt-pkg/src/YQPkgTechnicalDetailsView.cc Tue Apr 8 17:41:41 2008 @@ -54,7 +54,11 @@ return; } - QString html_text = htmlHeading( selectable ); + + + QString html_text = htmlStart(); + + html_text += htmlHeading( selectable ); ZyppPkg candidate = tryCastToZyppPkg( selectable->candidateObj() ); ZyppPkg installed = tryCastToZyppPkg( selectable->installedObj() ); @@ -72,6 +76,8 @@ html_text += simpleTable( selectable, installed ); } + html_text += htmlEnd(); + setHtml( html_text ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org 0 0 Reply Sign in to reply online Use email software Back to the thread Back to the list