Hello community,
here is the log from the commit of package yast2-qt
checked in at Fri Jan 18 01:38:38 CET 2008.
--------
--- yast2-qt/yast2-qt.changes 2008-01-14 21:14:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2008-01-16 14:34:01.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Jan 16 14:32:01 CET 2008 - coolo@suse.de
+
+- disable patch again now that yast2-core is ready
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-old-core.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
++++ 1868 lines (skipped)
++++ between yast2-qt/yast2-qt.spec
++++ and /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.spec
++++++ yast2-qt-2.16.17.tar.bz2 ++++++
Files old/yast2-qt-2.16.17/core.17092 and new/yast2-qt-2.16.17/core.17092 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.17/src/QY2Styler.cc new/yast2-qt-2.16.17/src/QY2Styler.cc
--- old/yast2-qt-2.16.17/src/QY2Styler.cc 2008-01-14 20:54:10.000000000 +0100
+++ new/yast2-qt-2.16.17/src/QY2Styler.cc 2008-01-16 14:33:57.000000000 +0100
@@ -7,12 +7,17 @@
#include <QPainter>
#include <QSvgRenderer>
#include <QDebug>
+#include <iostream>
+#include <QPixmapCache>
+
+using namespace std;
QY2Styler *QY2Styler::_self = 0;
QY2Styler::QY2Styler( QObject *parent )
: QObject( parent )
{
+ QPixmapCache::setCacheLimit( 5 * 1024 );
_self = this;
}
@@ -68,22 +73,24 @@
{
QString name = obj->objectName();
- if ( ev->type() != QEvent::Resize )
+ if ( ev->type() != QEvent::Resize && ev->type() != QEvent::Show )
return QObject::eventFilter( obj, ev );
- qDebug( "eventFilter %s %s %d", qPrintable( name ), obj->metaObject()->className(), ev->type() );
-
if ( !_backgrounds.contains( name ) )
+ return QObject::eventFilter( obj, ev );
+
+ QWidget *wid = qobject_cast( obj );
+
+ if (! wid->isVisible() )
return QObject::eventFilter( obj, ev );
- qDebug( "eventFilter %s %s %d", qPrintable( name ), obj->metaObject()->className(), ev->type() );
+ //qDebug() << "eventFilter " << qPrintable( name ) << " " << obj->metaObject()->className() << " " << wid->isVisible();
- QWidget *wid = qobject_cast( obj );
if ( _backgrounds[name].pix.isNull() )
{
QString back = _backgrounds[ name ].filename;
_backgrounds[ name ].pix = QImage( back );
- qDebug( "loading %s for %s", qPrintable( back ), qPrintable( name ) );
+ //qDebug() << "loading " << qPrintable( back ) << " for " << qPrintable( name );
}
wid->setAutoFillBackground( true );
@@ -99,8 +106,17 @@
QPainter pain( &result );
if ( !_backgrounds[ name ].filename.endsWith( ".svg" ) )
{
- QImage scaled = _backgrounds[name].pix.scaled( fillRect.width(), fillRect.height() );
- pain.drawImage( fillRect.topLeft(), scaled, QRectF(QPointF(0,0), scaled.size()), Qt::OrderedAlphaDither);
+ QString key = QString( "style_%1_%2_%3" ).arg( name ).arg( fillRect.width() ).arg( fillRect.height() );
+ QPixmap scaled;
+ if ( QPixmapCache::find( key, scaled ) )
+ {
+ qDebug() << "found " << qPrintable( key );
+ } else {
+ qDebug() << "scale " << qPrintable( name ) << " " << fillRect.width() << " " << fillRect.height();
+ scaled = QPixmap::fromImage( _backgrounds[name].pix.scaled( fillRect.width(), fillRect.height() ) );
+ QPixmapCache::insert( key, scaled );
+ }
+ pain.drawPixmap( fillRect.topLeft(), scaled );
} else {
#if 0
QSvgRenderer rend( _backgroundFn[ name ] );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.17/src/YQDialog.cc new/yast2-qt-2.16.17/src/YQDialog.cc
--- old/yast2-qt-2.16.17/src/YQDialog.cc 2008-01-14 20:54:11.000000000 +0100
+++ new/yast2-qt-2.16.17/src/YQDialog.cc 2008-01-16 14:33:57.000000000 +0100
@@ -196,13 +196,13 @@
if ( newHeight > qApp->desktop()->height() )
newHeight = qApp->desktop()->height();
+ resize( newWidth, newHeight );
+
if ( hasChildren() )
{
+ firstChild()->setSize( newWidth, newHeight );
( ( QWidget* )firstChild()->widgetRep() )->show();
- firstChild()->setSize( newWidth, newHeight );
}
-
- resize( newWidth, newHeight );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.17/src/YQTable.cc new/yast2-qt-2.16.17/src/YQTable.cc
--- old/yast2-qt-2.16.17/src/YQTable.cc 2008-01-14 20:54:10.000000000 +0100
+++ new/yast2-qt-2.16.17/src/YQTable.cc 2008-01-16 14:33:57.000000000 +0100
@@ -74,6 +74,7 @@
// _qt_listView->adjustColumn( column );
}
_qt_listView->setHeaderLabels( headers );
+ _qt_listView->header()->setResizeMode( QHeaderView::ResizeToContents );
//
// Connect signals and slots
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.17/src/YQUI_core.cc new/yast2-qt-2.16.17/src/YQUI_core.cc
--- old/yast2-qt-2.16.17/src/YQUI_core.cc 2008-01-14 20:54:11.000000000 +0100
+++ new/yast2-qt-2.16.17/src/YQUI_core.cc 2008-01-16 14:33:57.000000000 +0100
@@ -93,6 +93,9 @@
if (_ui_inited)
return;
+ // yast has no use of the glib event loop
+ setenv( "QT_NO_GLIB", "1", 1 );
+
_ui_inited = true;
new QApplication( _ui_argc, _ui_argv);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.17/src/YQWizard.cc new/yast2-qt-2.16.17/src/YQWizard.cc
--- old/yast2-qt-2.16.17/src/YQWizard.cc 2008-01-14 20:54:11.000000000 +0100
+++ new/yast2-qt-2.16.17/src/YQWizard.cc 2008-01-16 14:33:57.000000000 +0100
@@ -279,6 +279,7 @@
if ( ! _stepsPanel )
return;
+ qDebug( "updateSteps" );
// Create a grid layout for the steps
delete _stepsPanel->layout();
QVBoxLayout *_stepsVBox = new QVBoxLayout( _stepsPanel );
@@ -368,6 +369,7 @@
void YQWizard::updateStepStates()
{
+ qDebug( "updateStepStates %d", _stepsDirty );
if ( _stepsDirty )
updateSteps();
@@ -408,6 +410,7 @@
void YQWizard::setCurrentStep( const string & id )
{
+ qDebug( "setCurrentStep %s", id.c_str() );
_currentStepID = fromUTF8( id );
updateStepStates();
}
@@ -415,6 +418,7 @@
void YQWizard::deleteSteps()
{
+ qDebug( "deleteSteps" );
qDeleteAll(_stepsList);
_stepsList.clear();
_stepsIDs.clear();
@@ -910,7 +914,8 @@
YUI_CHECK_NEW( menu );
_menuIDs.insert( fromUTF8( id ), menu );
- //FIXME _menuBar->insertItem( fromUTF8( text ), menu );
+ _menuBar->addMenu( menu );
+ menu->setTitle( fromUTF8( text ) );
connect( menu, SIGNAL( activated ( int ) ),
this, SLOT ( sendMenuEvent( int ) ) );
@@ -954,7 +959,7 @@
{
int id = _menuEntryIDs.size();
_menuEntryIDs.push_back( idString );
- //FIXME parentMenu->insertItem( fromUTF8( text ), id );
+ parentMenu->addAction( fromUTF8( text ) );
}
else
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org