Author: coolo
Date: Thu Nov 29 22:47:45 2007
New Revision: 42521
URL: http://svn.opensuse.org/viewcvs/yast?rev=42521&view=rev
Log:
backup
Added:
branches/tmp/coolo/wizard-rework/theme/rect2174.png (with props)
Modified:
branches/tmp/coolo/wizard-rework/src/YQWizard.cc
branches/tmp/coolo/wizard-rework/src/YQWizard.h
branches/tmp/coolo/wizard-rework/theme/alpha_dummy-1.svg
branches/tmp/coolo/wizard-rework/theme/style.qss
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=42521&r1=42520&r2=42521&view=diff
==============================================================================
--- branches/tmp/coolo/wizard-rework/src/YQWizard.cc (original)
+++ branches/tmp/coolo/wizard-rework/src/YQWizard.cc Thu Nov 29 22:47:45 2007
@@ -31,6 +31,7 @@
#include <QDialog>
#include <QSvgRenderer>
#include <QPainter>
+#include <QStackedWidget>
#include "ui_QHelpDialog.h"
#include
#include
@@ -205,11 +206,10 @@
QLayout *YQWizard::layoutSideBar( QWidget * parent )
{
- _sideBar = new Q3WidgetStack( parent );
+ _sideBar = new QStackedWidget( parent );
YUI_CHECK_NEW( _sideBar );
_sideBar->setMinimumWidth( YQUI::ui()->defaultSize( YD_HORIZ ) / 5 );
_sideBar->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred ) ); // hor/vert
- _sideBar->setMargin( 0 );
QVBoxLayout *vbox = new QVBoxLayout( );
vbox->addWidget( _sideBar );
@@ -233,8 +233,10 @@
void YQWizard::layoutStepsPanel()
{
// Steps
- _stepsPanel = new QWidget( _sideBar );
+ _stepsPanel = new QFrame( _sideBar );
_sideBar->addWidget( _stepsPanel );
+ _sideBar->setObjectName( "steps" );
+ _stepsPanel->setProperty( "class", "steps QFrame" );
// Steps panel bottom buttons ("Help", "Release Notes")
@@ -302,7 +304,6 @@
// Create a grid layout for the steps
QVBoxLayout *_stepsVBox = new QVBoxLayout( _stepsPanel );
- _stepsVBox->setMargin( 0 );
QGridLayout *_stepsGrid = new QGridLayout( );
YUI_CHECK_NEW( _stepsGrid );
@@ -446,6 +447,8 @@
void YQWizard::layoutHelpPanel()
{
+ return;
+
//
// Button box with bottom gradient
//
@@ -472,6 +475,7 @@
button = new QPushButton( _( "Steps" ), buttonBox );
YUI_CHECK_NEW( button );
_stepsButton = button;
+ _stepsButton->hide();
pixmap = QPixmap( PIXMAP_DIR "steps-button.png" );
}
@@ -694,7 +698,6 @@
{
QFrame *workArea = new QFrame( parent );
workArea->setObjectName( "work_area" );
- workArea->setProperty( "class", "work_area QWidget" );
QVBoxLayout *vbox = new QVBoxLayout( workArea );
@@ -841,6 +844,8 @@
// "Next" button
//
+ hbox->addSpacing( 5 );
+
_nextButton = new YQWizardButton( this, parent, _nextButtonLabel );
YUI_CHECK_NEW( _nextButton );
@@ -1003,7 +1008,7 @@
{
if ( _sideBar && _stepsPanel )
{
- _sideBar->raiseWidget( _stepsPanel );
+ _sideBar->setCurrentWidget( _stepsPanel );
}
}
@@ -1012,7 +1017,7 @@
{
if ( _sideBar && _treePanel )
{
- _sideBar->raiseWidget( _treePanel );
+ _sideBar->setCurrentWidget( _treePanel );
}
}
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=42521&r1=42520&r2=42521&view=diff
==============================================================================
--- branches/tmp/coolo/wizard-rework/src/YQWizard.h (original)
+++ branches/tmp/coolo/wizard-rework/src/YQWizard.h Thu Nov 29 22:47:45 2007
@@ -45,7 +45,7 @@
class QSpacerItem;
class Q3TextBrowser;
class QToolButton;
-class Q3WidgetStack;
+class QStackedWidget;
class YReplacePoint;
class YQAlignment;
@@ -524,7 +524,7 @@
QString _qHelpText;
- Q3WidgetStack * _sideBar;
+ QStackedWidget * _sideBar;
QWidget * _stepsPanel;
QPushButton * _releaseNotesButton;
string _releaseNotesButtonId;
Modified: 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=42521&r1=42520&r2=42521&view=diff
==============================================================================
--- branches/tmp/coolo/wizard-rework/theme/alpha_dummy-1.svg (original)
+++ branches/tmp/coolo/wizard-rework/theme/alpha_dummy-1.svg Thu Nov 29 22:47:45 2007
@@ -131,7 +131,7 @@
inkscape:groupmode="layer"
id="layer1"
inkscape:label="gree"
- style="display:inline">
+ style="display:none">
+ style="display:none">
</g>
</g>
+
+
+ </g>
+
+
+ </g>
</svg>
Added: branches/tmp/coolo/wizard-rework/theme/rect2174.png
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/theme/rect2174.png?rev=42521&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=42521&r1=42520&r2=42521&view=diff
==============================================================================
--- branches/tmp/coolo/wizard-rework/theme/style.qss (original)
+++ branches/tmp/coolo/wizard-rework/theme/style.qss Thu Nov 29 22:47:45 2007
@@ -18,17 +18,25 @@
padding-bottom: 80px;
}
-QDWidget { border-style: solid; border-width: 5px; }
+QDWidget { border-style: solid; border-width: 5px; }
QWidget { color: white; }
-/* We provide a min-width and min-height for push buttons
- so that they look elegant regardless of the width of the text. */
+#steps
+{
+ background-image: url(rect2174.png);
+ background-position: top right;
+ background-repeat: none;
+ background-origin: border;
+ background-clip: padding;
+ border-style: none;
+ padding-left: 20px;
+ padding-top: 10px;
+ margin-top: 60px;
+ margin-left: 10px;
+}
+
QPushButton {
- padding: 3px;
- margin-left: 20px;
- min-width: 9ex;
- min-height: 2.5ex;
color: black;
}
@@ -36,19 +44,6 @@
color: black;
}
-/* Increase the padding, so the text is shifted when the button is
- pressed. */
-QPushButton:pressed {
- padding-left: 5px;
- padding-top: 5px;
- background-color: #d0d67c;
-}
-
-/* Nice to have the background color change when hovered. */
-QRadioButton:hover, QCheckBox:hover {
- background-color: wheat;
-}
-
.current-step-name {
font: bold;
}
@@ -76,12 +71,13 @@
font-size: 14pt;
}
-#DialogIcon { max-width: 0px; }
+#DialogIcon { max-width: 0px; margin: 0px; }
#DialogHeading {
font-size: 20px;
padding: 12pt;
color: white;
font-style: bold;
+ margin: 0px;
}
.Contents QWidget { color: black; }
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org