Hello community,
here is the log from the commit of package yast2-qt
checked in at Wed Dec 19 22:15:56 CET 2007.
--------
--- yast2-qt/yast2-qt.changes 2007-12-19 09:13:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2007-12-19 19:25:43.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Dec 19 19:21:42 CET 2007 - coolo@suse.de
+
+- give the help popup a search function
+- support non-padding widgets for backgrounds
+- V 2.16.11
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.16.10.tar.bz2
New:
----
yast2-qt-2.16.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.tj9766/_old 2007-12-19 22:15:14.000000000 +0100
+++ /var/tmp/diff_new_pack.tj9766/_new 2007-12-19 22:15:14.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.16.10)
+# spec file for package yast2-qt (Version 2.16.11)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,12 +10,12 @@
Name: yast2-qt
-Version: 2.16.10
-Release: 2
+Version: 2.16.11
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.16.10.tar.bz2
+Source0: yast2-qt-2.16.11.tar.bz2
BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libqt4-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel update-desktop-files yast2-devtools
Summary: YaST2 - Graphical User Interface
BuildRequires: yast2-core-devel >= 2.16.16
@@ -78,6 +78,10 @@
%changelog
* Wed Dec 19 2007 - coolo@suse.de
+- give the help popup a search function
+- support non-padding widgets for backgrounds
+- V 2.16.11
+* Wed Dec 19 2007 - coolo@suse.de
- fix file list
* Tue Dec 18 2007 - coolo@suse.de
- implement timezone widget
++++++ yast2-qt-2.16.10.tar.bz2 -> yast2-qt-2.16.11.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/CMakeLists.txt new/yast2-qt-2.16.11/src/CMakeLists.txt
--- old/yast2-qt-2.16.10/src/CMakeLists.txt 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/src/CMakeLists.txt 2007-12-19 19:24:55.000000000 +0100
@@ -10,25 +10,69 @@
-DQTLIBDIR=\\\"${LIB_INSTALL_DIR}\\\"
)
-SET(qt_yast_plugin_SRCS
- QY2CharValidator.cc QY2ComboTabWidget.cc QY2DiskUsageList.cc
- QY2ListView.cc QY2Settings.cc Y2CCQt.cc
- YFrameBuffer.cc YQAlignment.cc YQApplication.cc YQBarGraph.cc
- YQCheckBox.cc YQCheckBoxFrame.cc YQComboBox.cc YQDateField.cc
- YQDialog.cc YQDownloadProgress.cc YQDumbTab.cc YQMainWinDock.cc
- YQEmpty.cc YQFrame.cc YQGenericButton.cc YQIconPool.cc
- YQImage.cc YQInputField.cc YQIntField.cc YQLabel.cc YQLayoutBox.cc
- YQLogView.cc YQMenuButton.cc YQMultiLineEdit.cc
- YQMultiProgressMeter.cc YQMultiSelectionBox.cc
- YQOptionalWidgetFactory.cc YQPackageSelectorPlugin.cc
- YQPartitionSplitter.cc YQProgressBar.cc YQPushButton.cc
- YQRadioButton.cc YQRadioButtonGroup.cc YQReplacePoint.cc
- YQRichText.cc YQSelectionBox.cc YQSignalBlocker.cc YQSlider.cc
- YQSpacing.cc YQSquash.cc YQTable.cc YQTimeField.cc YQTree.cc
- YQUI_builtins.cc YQUI_core.cc YQUI_widgets.cc YQUI_x11.cc
- YQWidgetCaption.cc YQWidgetFactory.cc YQWizardButton.cc
- YQWizard.cc QY2Styler.cc YQTimezoneSelector.cc
-)
+SET( qt_yast_plugin_SRCS
+
+ QY2CharValidator.cc
+ QY2ComboTabWidget.cc
+ QY2DiskUsageList.cc
+ QY2HelpDialog.cc
+ QY2ListView.cc
+ QY2Settings.cc
+ QY2Styler.cc
+ Y2CCQt.cc
+ YFrameBuffer.cc
+ YQAlignment.cc
+ YQApplication.cc
+ YQBarGraph.cc
+ YQCheckBox.cc
+ YQCheckBoxFrame.cc
+ YQComboBox.cc
+ YQDateField.cc
+ YQDialog.cc
+ YQDownloadProgress.cc
+ YQDumbTab.cc
+ YQEmpty.cc
+ YQFrame.cc
+ YQGenericButton.cc
+ YQIconPool.cc
+ YQImage.cc
+ YQInputField.cc
+ YQIntField.cc
+ YQLabel.cc
+ YQLayoutBox.cc
+ YQLogView.cc
+ YQMainWinDock.cc
+ YQMenuButton.cc
+ YQMultiLineEdit.cc
+ YQMultiProgressMeter.cc
+ YQMultiSelectionBox.cc
+ YQOptionalWidgetFactory.cc
+ YQPackageSelectorPlugin.cc
+ YQPartitionSplitter.cc
+ YQProgressBar.cc
+ YQPushButton.cc
+ YQRadioButton.cc
+ YQRadioButtonGroup.cc
+ YQReplacePoint.cc
+ YQRichText.cc
+ YQSelectionBox.cc
+ YQSignalBlocker.cc
+ YQSlider.cc
+ YQSpacing.cc
+ YQSquash.cc
+ YQTable.cc
+ YQTimeField.cc
+ YQTimezoneSelector.cc
+ YQTree.cc
+ YQUI_builtins.cc
+ YQUI_core.cc
+ YQUI_widgets.cc
+ YQUI_x11.cc
+ YQWidgetCaption.cc
+ YQWidgetFactory.cc
+ YQWizard.cc
+ YQWizardButton.cc
+ )
QT4_AUTOMOC(${qt_yast_plugin_SRCS})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/pkg/CMakeLists.txt new/yast2-qt-2.16.11/src/pkg/CMakeLists.txt
--- old/yast2-qt-2.16.10/src/pkg/CMakeLists.txt 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/src/pkg/CMakeLists.txt 2007-12-19 19:24:56.000000000 +0100
@@ -16,7 +16,46 @@
)
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format-nonliteral -fmessage-length=0" )
-SET(qt_yast_pkg_plugin_SRCS YQPackageSelectorBase.cc YQPackageSelector.cc YQPackageSelectorHelp.cc YQPatternSelector.cc YQPkgChangeLogView.cc YQPkgChangesDialog.cc YQPkgConflictDialog.cc YQPkgConflictList.cc YQPkgDependenciesView.cc YQPkgDescriptionDialog.cc YQPkgDescriptionView.cc YQPkgDiskUsageList.cc YQPkgDiskUsageWarningDialog.cc YQPkgFileListView.cc YQPkgGenericDetailsView.cc YQPkgLangList.cc YQPkgList.cc YQPkgObjList.cc YQPkgPatchFilterView.cc YQPkgPatchList.cc YQPkgPatternList.cc YQPkgProductDialog.cc YQPkgProductList.cc YQPkgRepoFilterView.cc YQPkgRepoList.cc YQPkgRpmGroupTagsFilterView.cc YQPkgSearchFilterView.cc YQPkgSelDescriptionView.cc YQPkgSelList.cc YQPkgSelMapper.cc YQPkgStatusFilterView.cc YQPkgTechnicalDetailsView.cc YQPkgTextDialog.cc YQPkgUpdateProblemFilterView.cc YQPkgVersionsView.cc YQSimplePatchSelector.cc QY2LayoutUtils.cc )
+SET(qt_yast_pkg_plugin_SRCS
+
+ QY2LayoutUtils.cc
+ YQPackageSelectorBase.cc
+ YQPackageSelector.cc
+ YQPackageSelectorHelp.cc
+ YQPatternSelector.cc
+ YQSimplePatchSelector.cc
+ YQPkgChangeLogView.cc
+ YQPkgChangesDialog.cc
+ YQPkgConflictDialog.cc
+ YQPkgConflictList.cc
+ YQPkgDependenciesView.cc
+ YQPkgDescriptionDialog.cc
+ YQPkgDescriptionView.cc
+ YQPkgDiskUsageList.cc
+ YQPkgDiskUsageWarningDialog.cc
+ YQPkgFileListView.cc
+ YQPkgGenericDetailsView.cc
+ YQPkgLangList.cc
+ YQPkgList.cc
+ YQPkgObjList.cc
+ YQPkgPatchFilterView.cc
+ YQPkgPatchList.cc
+ YQPkgPatternList.cc
+ YQPkgProductDialog.cc
+ YQPkgProductList.cc
+ YQPkgRepoFilterView.cc
+ YQPkgRepoList.cc
+ YQPkgRpmGroupTagsFilterView.cc
+ YQPkgSearchFilterView.cc
+ YQPkgSelDescriptionView.cc
+ YQPkgSelList.cc
+ YQPkgSelMapper.cc
+ YQPkgStatusFilterView.cc
+ YQPkgTechnicalDetailsView.cc
+ YQPkgTextDialog.cc
+ YQPkgUpdateProblemFilterView.cc
+ YQPkgVersionsView.cc
+ )
QT4_AUTOMOC(${qt_yast_pkg_plugin_SRCS})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/pkg/icons/viewmag.xpm new/yast2-qt-2.16.11/src/pkg/icons/viewmag.xpm
--- old/yast2-qt-2.16.10/src/pkg/icons/viewmag.xpm 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.16.11/src/pkg/icons/viewmag.xpm 2007-12-19 19:24:56.000000000 +0100
@@ -0,0 +1,133 @@
+/* XPM */
+static const char *viewmag[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 111 2",
+" c #7A4D27",
+". c #61596B",
+"X c #6E6F7D",
+"o c #874D18",
+"O c #A05A13",
+"+ c #AF6816",
+"@ c #BD7116",
+"# c #855427",
+"$ c #94622D",
+"% c #A36E2C",
+"& c #815C41",
+"* c #81624C",
+"= c #AD7E4A",
+"- c #D5902D",
+"; c #D7902C",
+": c #D8912B",
+"> c #DF9A33",
+", c #D1A65A",
+"< c #D7AE63",
+"1 c #D2B16D",
+"2 c #D1B16E",
+"3 c #DAB66D",
+"4 c #F3CC77",
+"5 c #F5D07A",
+"6 c #F5D07B",
+"7 c #707482",
+"8 c #887D81",
+"9 c #7F8188",
+"0 c #7E8289",
+"q c #83848A",
+"w c #86898D",
+"e c #998C8D",
+"r c #838993",
+"t c #8C8D91",
+"y c #8C8C94",
+"u c #8E8F97",
+"i c #888898",
+"p c #89909A",
+"a c #8E939D",
+"s c #8E929F",
+"d c #8E949D",
+"f c #929499",
+"g c #91979E",
+"h c #A0A8B2",
+"j c #A6AEB7",
+"k c #AAAEB8",
+"l c #ACB0B6",
+"z c #AEB2B9",
+"x c #ACB3BB",
+"c c #AFB5BB",
+"v c #B0B6BB",
+"b c #B1B6BC",
+"n c #B1BAC1",
+"m c #B4BDC3",
+"M c #B4BEC4",
+"N c #B9C3C9",
+"B c #BBC5CA",
+"V c #BEC6CB",
+"C c #BDC7CC",
+"Z c #BEC8CD",
+"A c #BFC8CE",
+"S c #BFC9CE",
+"D c #C6C8C9",
+"F c #C4CACC",
+"G c #C3CCCE",
+"H c #C2CCD0",
+"J c #C3CDD0",
+"K c #C4CED2",
+"L c #C5CED3",
+"P c #C6CFD3",
+"I c #C7D1D5",
+"U c #C8D1D4",
+"Y c #C9D3D7",
+"T c #CBD4D7",
+"R c #CCD6D9",
+"E c #CDD7DA",
+"W c #CED8DA",
+"Q c #D1D5D5",
+"! c #D0D9DB",
+"~ c #D1DBDC",
+"^ c #D2DBDC",
+"/ c #D2DADD",
+"( c #D5DDDF",
+") c #D5DEDF",
+"_ c #D6DEE0",
+"` c #D6DFE0",
+"' c #D7E0E2",
+"] c #D8E1E2",
+"[ c #D9E2E3",
+"{ c #DAE2E2",
+"} c #DBE2E3",
+"| c #DDE5E5",
+" . c #DEE6E7",
+".. c #DFE7E7",
+"X. c #E1E1E2",
+"o. c #E0E7E8",
+"O. c #E0E8E8",
+"+. c #E1E8E9",
+"@. c #E2EAEA",
+"#. c #E3EAEA",
+"$. c #E6EAEA",
+"%. c #E6ECEC",
+"&. c #E7EDED",
+"*. c #E8EDED",
+"=. c #EBF0F0",
+"-. c #ECF0F1",
+";. c #EDF1F1",
+":. c #F0F4F4",
+">. c #F3F6F6",
+",. c #F8F9F9",
+"<. c None",
+/* pixels */
+"<.<.<.k x c b z <.<.<.<.<.<.<.<.",
+"<.<.j M C S A V v <.<.<.<.<.<.<.",
+"<.h N T ^ R K I U l <.<.<.<.<.<.",
+"s n Y ..*./ ` ~ ) F <.<.<.<.<.<.",
+"a B ! &.-._ o.| .{ f <.<.<.<.<.",
+"g Z P E ( +.&.%.*.%.t <.<.<.<.<.",
+"r S L ! } %.*.;.:.$.q <.<.<.<.<.",
+"7 m H R [ #.=.>.,.D <.<.<.<.<.<.",
+"<.p J W ] @.=.>.X.y <.<.<.<.<.<.",
+"<.<.d G ' O.*.Q u i e <.<.<.<.<.",
+"<.<.<.0 0 w 9 X <.8 = ; @ <.<.<.",
+"<.<.<.<.<.<.<.<.<.<., 6 > + <.<.",
+"<.<.<.<.<.<.<.<.<.<.% 3 5 : O <.",
+"<.<.<.<.<.<.<.<.<.<.<.$ 1 4 - o ",
+"<.<.<.<.<.<.<.<.<.<.<.<.# 2 < & ",
+"<.<.<.<.<.<.<.<.<.<.<.<.<. * . "
+};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/pkg/YQPackageSelector.cc new/yast2-qt-2.16.11/src/pkg/YQPackageSelector.cc
--- old/yast2-qt-2.16.10/src/pkg/YQPackageSelector.cc 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/src/pkg/YQPackageSelector.cc 2007-12-19 19:24:56.000000000 +0100
@@ -1391,7 +1391,9 @@
void
YQPackageSelector::pkgExcludeRulesChanged()
{
+#if 0
QAction *action = dynamic_cast(QObject::sender());
+#endif
if ( _viewMenu && _pkgList )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/pkg/YQPkgProductList.cc new/yast2-qt-2.16.11/src/pkg/YQPkgProductList.cc
--- old/yast2-qt-2.16.10/src/pkg/YQPkgProductList.cc 2007-12-19 09:13:19.000000000 +0100
+++ new/yast2-qt-2.16.11/src/pkg/YQPkgProductList.cc 2007-12-19 19:24:56.000000000 +0100
@@ -37,8 +37,8 @@
{
y2debug( "Creating product list" );
- int numCol = 0;
#if FIXME
+ int numCol = 0;
addColumn( "" ); _statusCol = numCol++;
addColumn( _( "Product" ) ); _nameCol = numCol++;
addColumn( _( "Summary" ) ); _summaryCol = numCol++;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/pkg/YQPkgSelList.cc new/yast2-qt-2.16.11/src/pkg/YQPkgSelList.cc
--- old/yast2-qt-2.16.10/src/pkg/YQPkgSelList.cc 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/src/pkg/YQPkgSelList.cc 2007-12-19 19:24:56.000000000 +0100
@@ -36,8 +36,8 @@
{
y2debug( "Creating selection list" );
- int numCol = 0;
#if FIXME
+ int numCol = 0;
addColumn( "" ); _statusCol = numCol++;
addColumn( _( "Selection" ) ); _summaryCol = numCol++;
setAllColumnsShowFocus( true );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/QHelpDialog.ui new/yast2-qt-2.16.11/src/QHelpDialog.ui
--- old/yast2-qt-2.16.10/src/QHelpDialog.ui 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/src/QHelpDialog.ui 2007-12-19 19:24:55.000000000 +0100
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>300</height>
+ <width>581</width>
+ <height>388</height>
</rect>
</property>
<property name="windowTitle" >
@@ -21,6 +21,16 @@
<item>
<layout class="QHBoxLayout" >
<item>
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit" />
+ </item>
+ <item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
@@ -36,7 +46,7 @@
<item>
<widget class="QPushButton" name="pushButton" >
<property name="text" >
- <string>Close</string>
+ <string>&Close</string>
</property>
</widget>
</item>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/QY2HelpDialog.cc new/yast2-qt-2.16.11/src/QY2HelpDialog.cc
--- old/yast2-qt-2.16.10/src/QY2HelpDialog.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.16.11/src/QY2HelpDialog.cc 2007-12-19 19:24:55.000000000 +0100
@@ -0,0 +1,50 @@
+#include
+#include "ui_QHelpDialog.h"
+#include <QDebug>
+#include <QTextObject>
+
+#include "pkg/icons/viewmag.xpm"
+
+QY2HelpDialog::QY2HelpDialog( const QString& helpText, QWidget *parent )
+ : QDialog( parent )
+{
+ _ui = new Ui_QHelpDialog();
+ _ui->setupUi( this );
+ _ui->textBrowser->setText( helpText );
+
+ _ui->label->setPixmap ( QPixmap( viewmag ) );
+ connect( _ui->lineEdit, SIGNAL( textEdited( QString ) ),
+ SLOT( searchStringChanged( QString ) ) );
+
+ _ui->lineEdit->setFocus( Qt::OtherFocusReason );
+}
+
+QY2HelpDialog::~QY2HelpDialog()
+{
+ delete _ui;
+}
+
+void QY2HelpDialog::searchStringChanged( QString text )
+{
+ QTextCharFormat fmt;
+ fmt.setBackground( Qt::yellow );
+ QTextDocument *d = _ui->textBrowser->document();
+
+ for ( QList<QTextCursor>::iterator it = _marks.begin(); it != _marks.end(); ++it )
+ ( *it ).setCharFormat( QTextCharFormat() );
+ _marks.clear();
+
+ QTextCursor c( d );
+
+ while ( true )
+ {
+ c = d->find( text, c );
+ if ( c.isNull() )
+ break;
+ c.setCharFormat( fmt );
+ c.select( QTextCursor::WordUnderCursor );
+ _marks.push_back( c );
+ }
+}
+
+#include "QY2HelpDialog.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/QY2HelpDialog.h new/yast2-qt-2.16.11/src/QY2HelpDialog.h
--- old/yast2-qt-2.16.10/src/QY2HelpDialog.h 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.16.11/src/QY2HelpDialog.h 2007-12-19 19:24:55.000000000 +0100
@@ -0,0 +1,26 @@
+#ifndef _QY2HelpDialog_h
+#define _QY2HelpDialog_h
+
+#include <QDialog>
+
+class QTextCursor;
+class Ui_QHelpDialog;
+
+class QY2HelpDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ QY2HelpDialog( const QString &helpText, QWidget *parent );
+ ~QY2HelpDialog();
+
+public slots:
+ void searchStringChanged( QString );
+
+private:
+ Ui_QHelpDialog *_ui;
+ QList<QTextCursor> _marks;
+};
+
+#endif
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/QY2Styler.cc new/yast2-qt-2.16.11/src/QY2Styler.cc
--- old/yast2-qt-2.16.10/src/QY2Styler.cc 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/src/QY2Styler.cc 2007-12-19 19:24:55.000000000 +0100
@@ -6,6 +6,7 @@
#include <QWidget>
#include <QPainter>
#include <QSvgRenderer>
+#include <QDebug>
QY2Styler *QY2Styler::_self = 0;
@@ -39,7 +40,14 @@
line.replace( urlx, ": url(" + themeDir() + urlx.cap( 1 ) + ")");
if ( backgroundx.exactMatch( line ) )
- _backgroundFn[backgroundx.cap( 1 )] = themeDir() + backgroundx.cap( 2 );
+ {
+ QStringList name = backgroundx.cap( 1 ).split( '#' );
+ qDebug() << name;
+ _backgrounds[ name[0] ].filename = themeDir() + backgroundx.cap( 2 );
+ _backgrounds[ name[0] ].full = false;
+ if ( name.size() > 1 )
+ _backgrounds[ name[0] ].full = ( name[1] == "full" );
+ }
result += line;
}
@@ -63,34 +71,40 @@
if ( ev->type() != QEvent::Resize )
return QObject::eventFilter( obj, ev );
- if ( !_backgroundFn.contains( name ) )
+ qDebug( "eventFilter %s %s %d", qPrintable( name ), obj->metaObject()->className(), ev->type() );
+
+ if ( !_backgrounds.contains( name ) )
return QObject::eventFilter( obj, ev );
qDebug( "eventFilter %s %s %d", qPrintable( name ), obj->metaObject()->className(), ev->type() );
QWidget *wid = qobject_cast( obj );
- if ( !_backgroundPx.contains( name ) )
+ if ( _backgrounds[name].pix.isNull() )
{
- QString back = _backgroundFn[ name ];
- _backgroundPx[ name ] = QImage( back );
+ QString back = _backgrounds[ name ].filename;
+ _backgrounds[ name ].pix = QImage( back );
qDebug( "loading %s for %s", qPrintable( back ), qPrintable( name ) );
}
wid->setAutoFillBackground( true );
QPixmap result( wid->size() );
- if ( wid->contentsRect() != wid->rect() )
+ QRect fillRect = wid->contentsRect();
+ if ( _backgrounds[name].full )
+ fillRect = wid->rect();
+
+ if ( fillRect != wid->rect() )
result.fill( QColor( 0, 128, 0, 0 ) );
QPainter pain( &result );
- if ( !_backgroundFn[ name ].endsWith( ".svg" ) )
+ if ( !_backgrounds[ name ].filename.endsWith( ".svg" ) )
{
- QImage scaled = _backgroundPx[name].scaled( wid->contentsRect().width(), wid->contentsRect().height() );
- pain.drawImage( wid->contentsRect().topLeft(), scaled, QRectF(QPointF(0,0), scaled.size()), Qt::OrderedAlphaDither);
+ QImage scaled = _backgrounds[name].pix.scaled( fillRect.width(), fillRect.height() );
+ pain.drawImage( fillRect.topLeft(), scaled, QRectF(QPointF(0,0), scaled.size()), Qt::OrderedAlphaDither);
} else {
#if 0
QSvgRenderer rend( _backgroundFn[ name ] );
- rend.render( &pain, wid->contentsRect() );
+ rend.render( &pain, fillRect );
#endif
}
QPalette p = wid->palette();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/QY2Styler.h new/yast2-qt-2.16.11/src/QY2Styler.h
--- old/yast2-qt-2.16.10/src/QY2Styler.h 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/src/QY2Styler.h 2007-12-19 19:24:55.000000000 +0100
@@ -29,8 +29,13 @@
bool eventFilter( QObject * obj, QEvent * ev );
private:
- QHash _backgroundFn;
- QHash _backgroundPx;
+ struct BackgrInfo {
+ QString filename;
+ QImage pix;
+ bool full;
+ };
+
+ QHash _backgrounds;
static QY2Styler *_self;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/YQCheckBoxFrame.cc new/yast2-qt-2.16.11/src/YQCheckBoxFrame.cc
--- old/yast2-qt-2.16.10/src/YQCheckBoxFrame.cc 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/src/YQCheckBoxFrame.cc 2007-12-19 19:24:55.000000000 +0100
@@ -169,9 +169,7 @@
int left, top, right, bottom;
getContentsMargins( &left, &top, &right, &bottom );
- preferredWidth += left + right;
-
- return preferredWidth;
+ return preferredWidth + left + right;
}
@@ -181,9 +179,7 @@
int left, top, right, bottom;
getContentsMargins( &left, &top, &right, &bottom );
- preferredHeight += top + left;
-
- return preferredHeight;
+ return preferredHeight + top + left;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/YQFrame.cc new/yast2-qt-2.16.11/src/YQFrame.cc
--- old/yast2-qt-2.16.10/src/YQFrame.cc 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/src/YQFrame.cc 2007-12-19 19:24:55.000000000 +0100
@@ -21,7 +21,7 @@
#include
#include "YQUI.h"
#include "utf8.h"
-//Added by qt3to4:
+#include <QDebug>
using std::max;
@@ -58,13 +58,15 @@
if ( hasChildren() )
{
- int newChildWidth = max ( 0, newWidth - 2 * 11 - 1 );
- int newChildHeight = max ( 0, newHeight - 11 - fontMetrics().height() - 1 );
+ int left, top, right, bottom;
+ getContentsMargins( &left, &top, &right, &bottom );
+ int newChildWidth = newWidth - left - right;
+ int newChildHeight = newHeight - bottom - top;
firstChild()->setSize( newChildWidth, newChildHeight );
QWidget * qChild = (QWidget *) firstChild()->widgetRep();
- qChild->move( 11, fontMetrics().height() );
+ qChild->move( left, top );
}
}
@@ -79,24 +81,21 @@
int YQFrame::preferredWidth()
{
- int preferredWidth;
- int childPreferredWidth = hasChildren() ? firstChild()->preferredWidth() : 0;
-
- preferredWidth = max( childPreferredWidth,
- (10 + fontMetrics().width( title() ) ) );
- preferredWidth += 2*11 + 1;
-
- return preferredWidth;
+ int preferredWidth = hasChildren() ? firstChild()->preferredWidth() : 0;
+ int left, top, right, bottom;
+ getContentsMargins( &left, &top, &right, &bottom );
+ return preferredWidth + left + right;
}
int YQFrame::preferredHeight()
{
int preferredHeight = hasChildren() ? firstChild()->preferredHeight() : 0;
- preferredHeight += 11 + fontMetrics().height() + 1;
+ int left, top, right, bottom;
+ getContentsMargins( &left, &top, &right, &bottom );
- return preferredHeight;
+ return preferredHeight + top + left;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/YQMultiProgressMeter.cc new/yast2-qt-2.16.11/src/YQMultiProgressMeter.cc
--- old/yast2-qt-2.16.10/src/YQMultiProgressMeter.cc 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/src/YQMultiProgressMeter.cc 2007-12-19 19:24:55.000000000 +0100
@@ -244,9 +244,9 @@
{
QStyleOptionProgressBarV2 opts;
opts.initFrom(this);
- opts.progress = currentValue( segment);
+ opts.progress = (int) currentValue( segment);
opts.minimum = 0;
- opts.maximum = maxValue( segment);
+ opts.maximum = (int) maxValue( segment);
opts.invertedAppearance = true;
opts.rect = QRect( offset, border, length, thickness );
style()->drawControl(QStyle::CE_ProgressBarGroove, &opts, &painter, this);
@@ -258,9 +258,9 @@
{
QStyleOptionProgressBarV2 opts;
opts.initFrom(this);
- opts.progress = maxValue( segment) - currentValue( segment);
+ opts.progress = (int) ( maxValue( segment) - currentValue( segment) );
opts.minimum = 0;
- opts.maximum = maxValue( segment);
+ opts.maximum = (int) maxValue( segment);
opts.rect = QRect( offset, border, length, thickness );
style()->drawControl(QStyle::CE_ProgressBarGroove, &opts, &painter, this);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/src/YQWizard.cc new/yast2-qt-2.16.11/src/YQWizard.cc
--- old/yast2-qt-2.16.10/src/YQWizard.cc 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/src/YQWizard.cc 2007-12-19 19:24:55.000000000 +0100
@@ -31,7 +31,6 @@
#include <QSvgRenderer>
#include <QPainter>
#include <QStackedWidget>
-#include "ui_QHelpDialog.h"
#include
#include
#include
@@ -46,6 +45,7 @@
#include "QY2ListView.h"
#include "QY2Styler.h"
+#include "QY2HelpDialog.h"
#include <QGridLayout>
#include
@@ -686,6 +686,7 @@
// Help button - intentionally without keyboard shortcut
_helpButton = new QPushButton( _( "Help" ), parent );
YUI_CHECK_NEW( _helpButton );
+ _helpButton->setShortcut( Qt::Key_F1 );
connect( _helpButton, SIGNAL( clicked() ),
this, SLOT ( showHelp() ) );
@@ -865,10 +866,7 @@
void YQWizard::showHelp()
{
- QDialog helpDlg( this );
- Ui_QHelpDialog ui;
- ui.setupUi( &helpDlg );
- ui.textBrowser->setText( _qHelpText );
+ QY2HelpDialog helpDlg( _qHelpText, this );
helpDlg.exec();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.10/VERSION.cmake new/yast2-qt-2.16.11/VERSION.cmake
--- old/yast2-qt-2.16.10/VERSION.cmake 2007-12-19 09:13:18.000000000 +0100
+++ new/yast2-qt-2.16.11/VERSION.cmake 2007-12-19 19:24:54.000000000 +0100
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "16")
-SET(VERSION_PATCH "10")
+SET(VERSION_PATCH "11")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org