Author: coolo Date: Thu Nov 29 18:27:39 2007 New Revision: 42517 URL: http://svn.opensuse.org/viewcvs/yast?rev=42517&view=rev Log: closer Added: branches/tmp/coolo/wizard-rework/theme/Os103-installer-mockup.png (with props) branches/tmp/coolo/wizard-rework/theme/alpha_dummy-1.svg branches/tmp/coolo/wizard-rework/theme/g22503.png (with props) Modified: branches/tmp/coolo/wizard-rework/src/YQUI_core.cc branches/tmp/coolo/wizard-rework/src/YQWizard.cc branches/tmp/coolo/wizard-rework/src/YQWizard.h branches/tmp/coolo/wizard-rework/theme/style.qss Modified: branches/tmp/coolo/wizard-rework/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/YQUI_core.cc?rev=42517&r1=42516&r2=42517&view=diff ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQUI_core.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQUI_core.cc Thu Nov 29 18:27:39 2007 @@ -138,6 +138,7 @@ _main_win = new QWidget( 0, 0, wflags ); // parent, name, wflags _main_win->setFocusPolicy( Qt::StrongFocus ); + _main_win->setObjectName( "main_window" ); // Create widget stack for `opt(`defaultsize) dialogs QVBoxLayout *vbox = new QVBoxLayout( _main_win ); @@ -151,7 +152,8 @@ _main_win->installEventFilter( this ); #endif - _main_win->resize( _default_size ); + //_main_win->resize( _default_size ); + _main_win->setFixedSize( 1024, 768 ); if ( _fullscreen || ! _have_wm ) _main_win->move( 0, 0 ); Modified: branches/tmp/coolo/wizard-rework/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/YQWizard.cc?rev=42517&r1=42516&r2=42517&view=diff ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQWizard.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQWizard.cc Thu Nov 29 18:27:39 2007 @@ -29,6 +29,8 @@ #include <YShortcut.h> #include <QDialog> +#include <QSvgRenderer> +#include <QPainter> #include "ui_QHelpDialog.h" #include <q3hbox.h> #include <q3header.h> @@ -139,7 +141,7 @@ //layoutTitleBar( this ); layout->addLayout( layoutSideBar( this ) ); - layout->addLayout( layoutWorkArea( this ) ); + layout->addWidget( layoutWorkArea( this ) ); } @@ -300,6 +302,7 @@ // Create a grid layout for the steps QVBoxLayout *_stepsVBox = new QVBoxLayout( _stepsPanel ); + _stepsVBox->setMargin( 0 ); QGridLayout *_stepsGrid = new QGridLayout( ); YUI_CHECK_NEW( _stepsGrid ); @@ -687,11 +690,15 @@ -QLayout *YQWizard::layoutWorkArea( QFrame * parent ) +QWidget *YQWizard::layoutWorkArea( QWidget * parent ) { - QVBoxLayout *vbox = new QVBoxLayout(); + QFrame *workArea = new QFrame( parent ); + workArea->setObjectName( "work_area" ); + workArea->setProperty( "class", "work_area QWidget" ); - _menuBar = new QMenuBar( parent ); + QVBoxLayout *vbox = new QVBoxLayout( workArea ); + + _menuBar = new QMenuBar( workArea ); YUI_CHECK_NEW( _menuBar ); _menuBar->hide(); // will be made visible when menus are added @@ -706,13 +713,13 @@ //headingHBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert vbox->addLayout( headingHBox ); - _dialogIcon = new QLabel( parent ); + _dialogIcon = new QLabel( workArea ); YUI_CHECK_NEW( _dialogIcon ); headingHBox->addWidget( _dialogIcon ); _dialogIcon->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) ); // hor/vert _dialogIcon->setObjectName( "DialogIcon" ); - _dialogHeading = new QLabel( parent ); + _dialogHeading = new QLabel( workArea ); YUI_CHECK_NEW( _dialogHeading ); headingHBox->addWidget( _dialogHeading ); _dialogHeading->setAlignment( Qt::AlignLeft | Qt::WordBreak ); @@ -723,17 +730,17 @@ // Client area (the part that belongs to the YCP application) // - layoutClientArea( parent ); + layoutClientArea( workArea ); vbox->addWidget( _clientArea ); // // Button box // - QLayout *bb = layoutButtonBox( parent ); + QLayout *bb = layoutButtonBox( workArea ); vbox->addLayout( bb ); - return vbox; + return workArea; } @@ -742,7 +749,7 @@ { _clientArea = new Q3VBox( parent ); YUI_CHECK_NEW( _clientArea ); - _clientArea->layout()->setMargin( 4 ); + // _clientArea->layout()->setMargin( 4 ); // // HVCenter for wizard contents @@ -750,6 +757,7 @@ _contents = new YQAlignment( this, _clientArea, YAlignCenter, YAlignCenter ); YUI_CHECK_NEW( _contents ); + _contents->QObject::setProperty( "class", "Contents" ); _contents->setStretchable( YD_HORIZ, true ); _contents->setStretchable( YD_VERT, true ); @@ -782,9 +790,8 @@ QHBoxLayout * hbox = new QHBoxLayout(); // parent, spacing YUI_CHECK_NEW( hbox ); - hbox->setSpacing( 5 ); - hbox->setMargin( 5 ); - + hbox->setSpacing( 0 ); + hbox->setMargin( 0 ); // Help button - intentionally without keyboard shortcut _helpButton = new QPushButton( _( "Help" ), parent ); @@ -1146,8 +1153,6 @@ _contents->setSize( contentsRect.width(), contentsRect.height() ); } - - bool YQWizard::eventFilter( QObject * obj, QEvent * ev ) { if ( ev->type() == QEvent::Resize && obj == _contents ) @@ -1174,6 +1179,8 @@ void YQWizard::showReleaseNotesButton( const string & label, const string & id ) { + return; // no longer supported! + if ( ! _releaseNotesButton ) { y2error( "NULL Release Notes button" ); Modified: branches/tmp/coolo/wizard-rework/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/YQWizard.h?rev=42517&r1=42516&r2=42517&view=diff ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQWizard.h (original) +++ branches/tmp/coolo/wizard-rework/src/YQWizard.h Thu Nov 29 18:27:39 2007 @@ -444,7 +444,7 @@ void layoutStepsPanel(); void layoutHelpPanel(); void layoutTreePanel(); - QLayout *layoutWorkArea ( QFrame * parentHBox ); + QWidget *layoutWorkArea ( QWidget * parent ); void layoutClientArea( QWidget * parent ); QLayout *layoutButtonBox( QWidget * parent ); Added: branches/tmp/coolo/wizard-rework/theme/Os103-installer-mockup.png URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/theme/Os103-installer-mockup.png?rev=42517&view=auto ============================================================================== Binary file - no diff available. Added: branches/tmp/coolo/wizard-rework/theme/alpha_dummy-1.svg URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/theme/alpha_dummy-1.svg?rev=42517&view=auto ============================================================================== --- branches/tmp/coolo/wizard-rework/theme/alpha_dummy-1.svg (added) +++ branches/tmp/coolo/wizard-rework/theme/alpha_dummy-1.svg Thu Nov 29 18:27:39 2007 @@ -0,0 +1,172 @@ +<?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://web.resource.org/cc/" + 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="1024" + height="768" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.45.1" + version="1.0" + sodipodi:docbase="/home/coolo/prod/yast2/qt4/theme" + sodipodi:docname="alpha_dummy-1.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <defs + id="defs4"> + <linearGradient + id="linearGradient3374"> + <stop + id="stop3376" + offset="0" + style="stop-color:#bbbbbb;stop-opacity:0.8035714;" /> + <stop + id="stop3378" + offset="1" + style="stop-color:#a4d55c;stop-opacity:0.13392857;" /> + </linearGradient> + <linearGradient + id="linearGradient3211"> + <stop + style="stop-color:#bbbbbb;stop-opacity:1;" + offset="0" + id="stop3213" /> + <stop + style="stop-color:#bbbbbb;stop-opacity:0.6785714;" + offset="1" + id="stop3215" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3211" + id="radialGradient3219" + cx="543.65918" + cy="385.40079" + fx="543.65918" + fy="385.40079" + r="334.73709" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3211" + id="radialGradient3366" + gradientUnits="userSpaceOnUse" + cx="543.65918" + cy="385.40079" + fx="543.65918" + fy="385.40079" + r="334.73709" + gradientTransform="matrix(1.0708839,0,0,0.9538517,-70.195845,14.384805)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3374" + id="radialGradient3372" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.071928,0,0,0.9550448,-70.763373,13.924936)" + cx="543.65918" + cy="385.40079" + fx="543.65918" + fy="385.40079" + r="334.73709" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3211" + id="radialGradient2254" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3069483,0,0,0.9647487,-435.11314,45.636946)" + cx="543.65918" + cy="385.40079" + fx="543.65918" + fy="385.40079" + r="334.73709" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3374" + id="radialGradient2256" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3082225,0,0,0.9659555,-435.80577,45.171823)" + cx="543.65918" + cy="385.40079" + fx="543.65918" + fy="385.40079" + r="334.73709" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.82217356" + inkscape:cx="508.78358" + inkscape:cy="365.23368" + inkscape:document-units="px" + inkscape:current-layer="layer2" + width="1024px" + height="768px" + borderlayer="false" + inkscape:window-width="1089" + inkscape:window-height="934" + inkscape:window-x="302" + inkscape:window-y="43" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer1" + inkscape:label="gree" + style="display:none"> + <image + y="-0.34707281" + x="0.057333887" + id="image2247" + height="768" + width="1024" + sodipodi:absref="/home/coolo/prod/yast2/qt4/theme/Os103-installer-mockup.png" + xlink:href="Os103-installer-mockup.png" /> + </g> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="thinks" + style="display:inline"> + <g + id="g2250" + transform="matrix(0.8193774,0,0,0.9887048,286.32606,-30.736663)"> + <rect + ry="13.148517" + rx="15.865705" + y="78.526886" + x="-30.047575" + height="646.06683" + width="873.67725" + id="rect2221" + style="opacity:0.72809664;fill:url(#radialGradient2254);fill-opacity:1;stroke:#ffffff;stroke-width:1.0543915;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + ry="13.148517" + rx="15.865705" + y="78.122795" + x="-30.473461" + height="646.87506" + width="874.52887" + id="rect3370" + style="opacity:0.72809664;fill:url(#radialGradient2256);fill-opacity:1;stroke:#4e9a06;stroke-width:1.0555644;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.94117647;display:inline" /> + </g> + </g> +</svg> Added: branches/tmp/coolo/wizard-rework/theme/g22503.png URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/theme/g22503.png?rev=42517&view=auto ============================================================================== Binary file - no diff available. Modified: branches/tmp/coolo/wizard-rework/theme/style.qss URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/theme/style.qss?rev=42517&r1=42516&r2=42517&view=diff ============================================================================== --- branches/tmp/coolo/wizard-rework/theme/style.qss (original) +++ branches/tmp/coolo/wizard-rework/theme/style.qss Thu Nov 29 18:27:39 2007 @@ -1,12 +1,23 @@ -/* Hintergrund: background-$RESULTION */ -.YQWizard { - pbackground-image: url(bottom-gradient.png); +#main_window { background-image: url(background-1024x768.png); background-position: bottom; background-repeat: repeat-x; } +#work_area { + background-image: url(g22503.png); + background-position: top left; + background-repeat: none; + background-origin: border; + background-clip: padding; + border-style: none; + padding-left: 0px; + padding-top: 50px; + padding-right: 110px; + padding-bottom: 80px; +} + QDWidget { border-style: solid; border-width: 5px; } QWidget { color: white; } @@ -65,9 +76,13 @@ font-size: 14pt; } -#DialogIcon {} +#DialogIcon { max-width: 0px; } #DialogHeading { font-size: 20px; padding: 12pt; + color: white; + font-style: bold; } +.Contents QWidget { color: black; } + -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
