merge in changes from wizard-rework. Still work in progress,
authorcoolo <coolo@e0cc52ee-31ee-0310-8b87-e83c4596d67c>
Mon, 3 Dec 2007 17:27:38 +0000 (17:27 +0000)
committercoolo <coolo@e0cc52ee-31ee-0310-8b87-e83c4596d67c>
Mon, 3 Dec 2007 17:27:38 +0000 (17:27 +0000)
but it's technically working :)

git-svn-id: http://svn.opensuse.org/svn/yast/branches/tmp/coolo/qt4-port@42630 e0cc52ee-31ee-0310-8b87-e83c4596d67c

17 files changed:
VERSION [deleted file]
VERSION.cmake
src/CMakeLists.txt
src/YQReplacePoint.cc
src/YQUI.h
src/YQUI_core.cc
src/YQWizard.cc
src/YQWizard.h
theme/Os103-installer-mockup.png [new file with mode: 0644]
theme/alpha_dummy-1.svg [new file with mode: 0644]
theme/background-1024x768.png
theme/g22503.png [new file with mode: 0644]
theme/rect2174.png [new file with mode: 0644]
theme/step-current.png
theme/step-done.png
theme/step-todo.png
theme/style.qss

diff --git a/VERSION b/VERSION
deleted file mode 100644 (file)
index 3c5d010..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2.16.6
index 5749e09..842e658 100644 (file)
@@ -1,3 +1,3 @@
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "16")
-SET(VERSION_PATCH "3")
+SET(VERSION_PATCH "6")
index d9a7930..38b63a2 100644 (file)
@@ -49,7 +49,7 @@ SET_TARGET_PROPERTIES( py2qt4 PROPERTIES SOVERSION 2 )
 
 INSTALL(TARGETS py2qt4 LIBRARY DESTINATION ${YAST_PLUGIN_DIR} )
 
-#ADD_SUBDIRECTORY(pkg)
+ADD_SUBDIRECTORY(pkg)
 
 #SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" )
 
index f37f0b2..744a915 100644 (file)
@@ -35,7 +35,7 @@ YQReplacePoint::YQReplacePoint( YWidget * parent )
 void YQReplacePoint::showChild()
 {
     YWidget * child = firstChild();
-    
+
     if ( child )
     {
        QWidget * qChild = (QWidget *) child->widgetRep();
index 01504c5..34c80a7 100644 (file)
@@ -230,16 +230,14 @@ public:
      *
      * Reimplemented from YUI.
      **/
-    virtual void blockEvents( bool block = true )
-       { _event_handler.blockEvents( block ); }
+    virtual void blockEvents( bool block = true );
 
     /**
      * Returns 'true' if events are currently blocked.
      *
      * Reimplemented from YUI.
      **/
-    virtual bool eventsBlocked() const
-       { return _event_handler.eventsBlocked(); }
+    virtual bool eventsBlocked() const;
 
     /**
      * Returns the current product name
@@ -631,6 +629,8 @@ protected:
      **/
     YSimpleEventHandler _event_handler;
 
+    int blocked_level;
+
     /**
      * Saved normal palette
      **/
@@ -651,9 +651,9 @@ protected:
      **/
     bool _askedForLeftHandedMouse;
 
-  bool _ui_inited;
-  int _ui_argc;
-  char **_ui_argv;
+    bool _ui_inited;
+    int _ui_argc;
+    char **_ui_argv;
 };
 
 #endif // YQUI_h
index c251f7d..66d59ed 100644 (file)
@@ -72,6 +72,7 @@ YQUI::YQUI( int argc, char **argv, bool with_threads, const char * macro_file )
     _leftHandedMouse           = false;
     _askedForLeftHandedMouse   = false;
     screenShotNameTemplate     = "";
+    blocked_level               = 0;
 
     qInstallMsgHandler( qMessageHandler );
 
@@ -136,8 +137,9 @@ void YQUI::init_ui()
        wflags |= Qt::FramelessWindowHint;
     }
 
-    _main_win = new QWidget( 0, 0, wflags ); // parent, name, wflags
+    _main_win = new QWidget( 0, wflags ); // parent, 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 +153,8 @@ void YQUI::init_ui()
     _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 );
@@ -442,7 +445,11 @@ YEvent * YQUI::userInput( unsigned long timeout_millisec )
 {
     init_ui();
 
-    // y2milestone( "userInput %ld", timeout_millisec );
+    _event_handler.blockEvents( false );
+    _eventLoop->wakeUp();
+    blocked_level = 0;
+
+    //y2milestone( "userInput %ld", timeout_millisec );
 
     YEvent *   event  = 0;
     YQDialog * dialog = dynamic_cast<YQDialog *> ( YDialog::currentDialog( false ) );
@@ -462,12 +469,7 @@ YEvent * YQUI::userInput( unsigned long timeout_millisec )
 
        normalCursor();
        _do_exit_loop = true; // should exit_loop() be called in sendEvent()?
-
-        while ( ! pendingEvent() )
-       {
-           _eventLoop->processEvents(QEventLoop::WaitForMoreEvents);
-       }
-
+        _eventLoop->exec();
        _do_exit_loop = false;
 
        event = _event_handler.consumePendingEvent();
@@ -653,6 +655,31 @@ YQUI::setTextdomain( const char * domain )
 }
 
 
+void YQUI::blockEvents( bool block )
+{
+    if ( block )
+    {
+        if ( ++blocked_level == 1 )
+        {
+            _event_handler.blockEvents( true );
+            _eventLoop->exit();
+        }
+    }
+    else
+    {
+        if ( --blocked_level == 0 )
+        {
+            _event_handler.blockEvents( false );
+            _eventLoop->wakeUp();
+        }
+    }
+}
+
+
+bool YQUI::eventsBlocked() const
+{
+    return _event_handler.eventsBlocked();
+}
 
 static void
 qMessageHandler( QtMsgType type, const char * msg )
index 9e8aa3e..7c77229 100644 (file)
@@ -30,6 +30,9 @@
 #include <YShortcut.h>
 
 #include <QDialog>
+#include <QSvgRenderer>
+#include <QPainter>
+#include <QStackedWidget>
 #include "ui_QHelpDialog.h"
 #include <q3hbox.h>
 #include <q3header.h>
@@ -140,7 +143,7 @@ YQWizard::YQWizard( YWidget *               parent,
     //layoutTitleBar( this );
 
     layout->addLayout( layoutSideBar( this ) );
-    layout->addLayout( layoutWorkArea( this ) );
+    layout->addWidget( layoutWorkArea( this ) );
 }
 
 
@@ -204,11 +207,10 @@ void YQWizard::layoutTitleBar( QWidget * parent )
 
 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 );
@@ -232,8 +234,10 @@ QLayout *YQWizard::layoutSideBar( QWidget * parent )
 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")
 
@@ -444,6 +448,8 @@ YQWizard::Step * YQWizard::findStep( const QString & id )
 
 void YQWizard::layoutHelpPanel()
 {
+    return;
+
     //
     // Button box with bottom gradient
     //
@@ -470,6 +476,7 @@ void YQWizard::layoutHelpPanel()
        button = new QPushButton( _( "Steps" ), buttonBox );
        YUI_CHECK_NEW( button );
        _stepsButton = button;
+        _stepsButton->hide();
 
        pixmap = QPixmap( PIXMAP_DIR "steps-button.png" );
     }
@@ -690,11 +697,14 @@ string YQWizard::currentTreeSelection()
 
 
 
-QLayout *YQWizard::layoutWorkArea( QFrame * parent )
+QWidget *YQWizard::layoutWorkArea( QWidget * parent )
 {
-    QVBoxLayout *vbox = new QVBoxLayout();
+    QFrame *workArea = new QFrame( parent );
+    workArea->setObjectName( "work_area" );
+
+    QVBoxLayout *vbox = new QVBoxLayout( workArea );
 
-    _menuBar = new QMenuBar( parent );
+    _menuBar = new QMenuBar( workArea );
     YUI_CHECK_NEW( _menuBar );
 
     _menuBar->hide(); // will be made visible when menus are added
@@ -709,13 +719,13 @@ QLayout *YQWizard::layoutWorkArea( QFrame * parent )
     //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 );
@@ -726,17 +736,17 @@ QLayout *YQWizard::layoutWorkArea( QFrame * parent )
     // 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;
 }
 
 
@@ -745,7 +755,7 @@ void YQWizard::layoutClientArea( QWidget * parent )
 {
     _clientArea = new Q3VBox( parent );
     YUI_CHECK_NEW( _clientArea );
-    _clientArea->layout()->setMargin( 4 );
+    // _clientArea->layout()->setMargin( 4 );
 
     //
     // HVCenter for wizard contents
@@ -753,6 +763,7 @@ void YQWizard::layoutClientArea( QWidget * parent )
 
     _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 );
@@ -785,9 +796,8 @@ QLayout *YQWizard::layoutButtonBox( QWidget * parent )
     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 );
@@ -837,6 +847,8 @@ QLayout *YQWizard::layoutButtonBox( QWidget * parent )
     // "Next" button
     //
 
+    hbox->addSpacing( 5 );
+
     _nextButton         = new YQWizardButton( this, parent, _nextButtonLabel );
     YUI_CHECK_NEW( _nextButton );
 
@@ -999,7 +1011,7 @@ void YQWizard::showSteps()
 {
     if ( _sideBar && _stepsPanel )
     {
-       _sideBar->raiseWidget( _stepsPanel );
+       _sideBar->setCurrentWidget( _stepsPanel );
     }
 }
 
@@ -1008,7 +1020,7 @@ void YQWizard::showTree()
 {
     if ( _sideBar && _treePanel )
     {
-       _sideBar->raiseWidget( _treePanel );
+       _sideBar->setCurrentWidget( _treePanel );
     }
 }
 
@@ -1149,8 +1161,6 @@ void YQWizard::resizeClientArea()
     _contents->setSize( contentsRect.width(), contentsRect.height() );
 }
 
-
-
 bool YQWizard::eventFilter( QObject * obj, QEvent * ev )
 {
     if ( ev->type() == QEvent::Resize && obj == _contents )
@@ -1177,6 +1187,8 @@ void YQWizard::setButtonLabel( YPushButton * button, const string & newLabel )
 
 void YQWizard::showReleaseNotesButton( const string & label, const string & id )
 {
+    return; // no longer supported!
+
     if ( ! _releaseNotesButton )
     {
        y2error( "NULL Release Notes button" );
@@ -1221,21 +1233,31 @@ void YQWizard::retranslateInternalButtons()
 
 void YQWizard::Step::setStatus( Status s )
 {
-    if ( !_statusLabel || _status == s )
+    if ( !_statusLabel || !_nameLabel || _status == s )
         return;
 
     _status = s;
 
     if ( s == Todo )
-        _statusLabel->setProperty( "class", "todo-step QLabel" );
+    {
+        _statusLabel->setProperty( "class", "todo-step-status QLabel" );
+        _nameLabel->setProperty( "class", "todo-step-name QLabel" );
+    }
 
     if ( s == Done )
-        _statusLabel->setProperty( "class", "done-step QLabel" );
+    {
+        _statusLabel->setProperty( "class", "done-step-status QLabel" );
+        _nameLabel->setProperty( "class", "done-step-name QLabel" );
+    }
 
     if ( s == Current )
-        _statusLabel->setProperty( "class", "current-step QLabel" );
+    {
+        _statusLabel->setProperty( "class", "current-step-status QLabel" );
+        _nameLabel->setProperty( "class", "current-step-name QLabel" );
+    }
 
     qApp->style()->polish( _statusLabel );
+    qApp->style()->polish( _nameLabel );
 }
 
 #include "YQWizard.moc"
index addef4e..2c1adf0 100644 (file)
@@ -47,7 +47,7 @@ class QPushButton;
 class QSpacerItem;
 class Q3TextBrowser;
 class QToolButton;
-class Q3WidgetStack;
+class QStackedWidget;
 class YReplacePoint;
 class QTreeWidgetItem;
 class YQAlignment;
@@ -446,7 +446,7 @@ protected:
     void layoutStepsPanel();
     void layoutHelpPanel();
     void layoutTreePanel();
-    QLayout *layoutWorkArea    ( QFrame * parentHBox );
+    QWidget *layoutWorkArea    ( QWidget * parent );
     void layoutClientArea( QWidget * parent );
     QLayout *layoutButtonBox( QWidget * parent );
 
@@ -526,7 +526,7 @@ protected:
     QString     _qHelpText;
 
 
-    Q3WidgetStack *    _sideBar;
+    QStackedWidget *   _sideBar;
     QWidget     *       _stepsPanel;
     QPushButton *      _releaseNotesButton;
     string              _releaseNotesButtonId;
diff --git a/theme/Os103-installer-mockup.png b/theme/Os103-installer-mockup.png
new file mode 100644 (file)
index 0000000..bdaf46d
Binary files /dev/null and b/theme/Os103-installer-mockup.png differ
diff --git a/theme/alpha_dummy-1.svg b/theme/alpha_dummy-1.svg
new file mode 100644 (file)
index 0000000..a072e2c
--- /dev/null
@@ -0,0 +1,199 @@
+<?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:none">
+    <g
+       id="g2250"
+       transform="matrix(0.8193774,0,0,0.9887048,286.32606,-30.736663)"
+       inkscape:export-xdpi="89.93"
+       inkscape:export-ydpi="89.93">
+      <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>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="bg"
+     style="display:none">
+    <image
+       y="2.0855021"
+       x="0.057330478"
+       id="image3214"
+       height="768"
+       width="1024"
+       sodipodi:absref="/home/coolo/prod/yast2/qt4/theme/background-1024x768.png"
+       xlink:href="background-1024x768.png" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="links"
+     style="display:inline">
+    <path
+       style="fill:#bdd1be;fill-opacity:0.41445783;fill-rule:nonzero;stroke:none;stroke-width:0.55000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 77.463272,60.120266 L 259.44856,60.120266 L 260.66485,589.20561 L 77.463272,590.4219 C 70.261272,590.4219 64.463272,584.6239 64.463272,577.4219 L 64.463272,73.120267 C 64.463272,65.918266 70.261272,60.120266 77.463272,60.120266 z "
+       id="rect2174"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
index e84f999..8351006 100644 (file)
Binary files a/theme/background-1024x768.png and b/theme/background-1024x768.png differ
diff --git a/theme/g22503.png b/theme/g22503.png
new file mode 100644 (file)
index 0000000..5e0f255
Binary files /dev/null and b/theme/g22503.png differ
diff --git a/theme/rect2174.png b/theme/rect2174.png
new file mode 100644 (file)
index 0000000..9ce4efb
Binary files /dev/null and b/theme/rect2174.png differ
index f1eb78e..d59ca92 100644 (file)
Binary files a/theme/step-current.png and b/theme/step-current.png differ
index 89935b2..80f244d 100644 (file)
Binary files a/theme/step-done.png and b/theme/step-done.png differ
index 96228ab..99a5d2e 100644 (file)
Binary files a/theme/step-todo.png and b/theme/step-todo.png differ
index 5ea953e..8450e60 100644 (file)
@@ -1,23 +1,44 @@
-/* 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;
 }
 
-QDWidget { border-style: solid; border-width: 5px;  } 
+#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; }
 
-/* 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;
+   min-width: 195px;
+   max-width: 195px;
+}
+
 QPushButton {
-    padding: 3px;
-    margin-left: 20px;
-    min-width: 9ex;
-    min-height: 2.5ex;
     color: black;
 }
 
@@ -25,32 +46,23 @@ QTextBrowser {
     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;
+.current-step-name {
+   font: bold 10pt;
 }
 
-/* Nice to have the background color change when hovered. */
-QRadioButton:hover, QCheckBox:hover {
-    background-color: wheat;
-}
-
-.todo {
+.todo-step-status {
    qproperty-pixmap: url(step-todo.png);
    max-width: 14px;
    min-width: 14px;
 }
 
-.done {
+.done-step-status {
    qproperty-pixmap: url(step-done.png);
    max-width: 14px;
    min-width: 14px;
 }
 
-.current {
+.current-step-status {
    qproperty-pixmap: url(step-current.png);
    max-width: 14px;
    min-width: 14px;
@@ -58,12 +70,19 @@ QRadioButton:hover, QCheckBox:hover {
 
 .steps_heading {
    font: bold;  
-   font-size: 14pt;
+   color: black;
+   margin-bottom: 7px;
+   font-size: 11pt;
 }
 
-#DialogIcon {}
+#DialogIcon { max-width: 0px; margin: 0px; }
 #DialogHeading { 
   font-size: 20px; 
   padding: 12pt;
+  color: white;
+  font-style: bold;
+  margin: 0px;
 }
 
+.Contents QWidget { color: black; } 
+