Mailinglist Archive: opensuse-commit (1059 mails)
| < Previous | Next > |
commit yast2-qt
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 10 Jan 2008 15:00:31 +0100
- Message-id: <20080110140031.7DC1D67833B@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-qt
checked in at Thu Jan 10 15:00:31 CET 2008.
--------
--- yast2-qt/yast2-qt.changes 2007-12-29 14:26:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2008-01-10
14:48:46.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Jan 10 14:47:56 CET 2008 - coolo@xxxxxxx
+
+- find a brute force way to make patterns selectable
+- V 2.16.14
+
+-------------------------------------------------------------------
+Wed Jan 9 14:59:05 CET 2008 - sh@xxxxxxx
+
+- V 2.16.13
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.16.12.tar.bz2
New:
----
yast2-qt-2.16.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.Pj7930/_old 2008-01-10 15:00:01.000000000 +0100
+++ /var/tmp/diff_new_pack.Pj7930/_new 2008-01-10 15:00:01.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-qt (Version 2.16.12)
+# spec file for package yast2-qt (Version 2.16.14)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,12 +10,12 @@
Name: yast2-qt
-Version: 2.16.12
-Release: 5
+Version: 2.16.14
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.16.12.tar.bz2
+Source0: yast2-qt-2.16.14.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
Summary: YaST2 - Graphical User Interface
BuildRequires: yast2-core-devel >= 2.16.17
@@ -78,6 +78,11 @@
%_libdir/YaST2/plugin/libpy2qt_pkg.so
%changelog
+* Thu Jan 10 2008 - coolo@xxxxxxx
+- find a brute force way to make patterns selectable
+- V 2.16.14
+* Wed Jan 09 2008 - sh@xxxxxxx
+- V 2.16.13
* Sat Dec 29 2007 - coolo@xxxxxxx
- some fixes in the package selector
* Fri Dec 21 2007 - coolo@xxxxxxx
++++++ yast2-qt-2.16.12.tar.bz2 -> yast2-qt-2.16.14.tar.bz2 ++++++
Files old/yast2-qt-2.16.12/core.17092 and new/yast2-qt-2.16.14/core.17092 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPatternSelector.cc
new/yast2-qt-2.16.14/src/pkg/YQPatternSelector.cc
--- old/yast2-qt-2.16.12/src/pkg/YQPatternSelector.cc 2007-12-29
14:26:18.000000000 +0100
+++ new/yast2-qt-2.16.14/src/pkg/YQPatternSelector.cc 2008-01-10
14:48:42.000000000 +0100
@@ -148,7 +148,7 @@
false ); // no autoFilter -
filterMatch() is not connected
Q_CHECK_PTR( _patternList );
layout->addWidget(_patternList);
- _patternList->header()->hide();
+ //_patternList->header()->hide();
}
if ( ! _patternList )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.cc
new/yast2-qt-2.16.14/src/pkg/YQPkgConflictList.cc
--- old/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.cc 2007-12-29
14:26:18.000000000 +0100
+++ new/yast2-qt-2.16.14/src/pkg/YQPkgConflictList.cc 2008-01-10
14:48:42.000000000 +0100
@@ -154,7 +154,6 @@
void
YQPkgConflictList::saveToFile( const QString filename, bool interactive ) const
{
-#if 0
// Open file
QFile file(filename);
@@ -183,17 +182,12 @@
header += QDateTime::currentDateTime().toString( "yyyy-MM-dd hh:mm:ss" );
header += " ####\n\n";
- file.write(header.toUtf8());
+ file.write(header.toUtf8());
-
- // Recursively write all items
- int count=0;
- const QTreeWidgetItem * item;
-
- while ( (item = topLevelItem(count)) )
+ YQPkgConflict * conflict;
+ foreach( conflict, _conflicts )
{
- saveItemToFile( file, item );
- count++;
+ conflict->saveToFile( file );
}
@@ -207,59 +201,6 @@
if ( file.isOpen() )
file.close();
-#endif
-}
-
-
-void
-YQPkgConflictList::saveItemToFile( QFile &file,
- const YQPkgConflict * item ) const
-{
-#if FIXME
- if ( ! item || ! file.isOpen() )
- return;
-
- // Write indentation
- for ( int level = 0; level < item->depth(); level++ )
- file.write( " " );
-
- // Write item
-
- const QTreeWidgetItem * checkListItem = dynamic_cast<const QTreeWidgetItem
*> (item);
-
- if ( checkListItem )
- {
- switch ( checkListItem->type() )
- {
- QString buffer;
- case Q3CheckListItem::CheckBox:
- buffer.sprintf( "[%c] ", checkListItem->( checkState(0) ==
Qt::Checked ) ? 'x' : ' ' );
- break;
- case Q3CheckListItem::RadioButton:
- sbuffer.sprintf( "(%c) ", checkListItem->( checkState(0) ==
Qt::Checked ) ? 'x' : ' ' );
- break;
- default:
- break;
- }
- file.write(buffer.toUtf8());
- }
-
- buffer.sprintf("%s\n", qPrintable(item->text(0)) );
- file.write(buffer.toUtf8());
-
- if ( item->isExpanded() )
- {
- // Recursively write children
-
- const QTreeWidgetItem * child = item->firstChild();
-
- while ( child )
- {
- saveItemToFile( file, child );
- child = child->nextSibling();
- }
- }
-#endif
}
YQPkgConflict::YQPkgConflict( QWidget * parent,
@@ -354,4 +295,30 @@
return zypp::ProblemSolution_Ptr(); // Null pointer
}
+void
+YQPkgConflict::saveToFile( QFile &file ) const
+{
+ if ( ! file.isOpen() )
+ return;
+
+ // Write item
+
+ QMap<QRadioButton*, zypp::ProblemSolution_Ptr>::const_iterator it;
+
+ file.write( problem()->description().c_str() );
+ file.write( "\n" );
+ file.write( problem()->details().c_str() );
+ file.write( "\n" );
+
+ QString buffer;
+
+ for ( it = _solutions.begin(); it != _solutions.end(); ++it )
+ {
+ QRadioButton *button = it.key();
+ buffer.sprintf( " [%c] %s\n", button->isChecked() ? 'x' : ' ',
qPrintable( button->text() ) );
+ file.write(buffer.toUtf8());
+ }
+ file.write( "\n\n" );
+}
+
#include "YQPkgConflictList.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.h
new/yast2-qt-2.16.14/src/pkg/YQPkgConflictList.h
--- old/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.h 2007-12-29
14:26:18.000000000 +0100
+++ new/yast2-qt-2.16.14/src/pkg/YQPkgConflictList.h 2008-01-10
14:48:42.000000000 +0100
@@ -106,11 +106,6 @@
protected:
- /**
- * (Recursively) save one item to file.
- **/
- void saveItemToFile( QFile &file, const YQPkgConflict * item ) const;
-
QList<YQPkgConflict*> _conflicts;
QVBoxLayout *_layout;
@@ -156,6 +151,10 @@
**/
zypp::ProblemSolution_Ptr userSelectedResolution();
+ /**
+ * save one item to file.
+ **/
+ void saveToFile( QFile &file ) const;
protected:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgDiskUsageList.cc
new/yast2-qt-2.16.14/src/pkg/YQPkgDiskUsageList.cc
--- old/yast2-qt-2.16.12/src/pkg/YQPkgDiskUsageList.cc 2007-12-29
14:26:18.000000000 +0100
+++ new/yast2-qt-2.16.14/src/pkg/YQPkgDiskUsageList.cc 2008-01-10
14:48:42.000000000 +0100
@@ -86,18 +86,14 @@
_items.insert( QString::fromUtf8(partitionDu.dir.c_str()), item );
}
}
- resizeColumnToContents( nameCol() );
+ resizeColumnToContents( totalSizeCol() );
resizeColumnToContents( usedSizeCol() );
resizeColumnToContents( freeSizeCol() );
- resizeColumnToContents( totalSizeCol() );
sortByColumn( percentageBarCol(), Qt::DescendingOrder );
- header()->setResizeMode( percentageBarCol(), QHeaderView::Stretch );
- header()->setResizeMode( totalSizeCol(), QHeaderView::Fixed );
- header()->setResizeMode( nameCol(), QHeaderView::ResizeToContents );
- header()->setResizeMode( usedSizeCol(), QHeaderView::ResizeToContents );
- header()->setResizeMode( freeSizeCol(), QHeaderView::ResizeToContents );
+ header()->setResizeMode( nameCol(), QHeaderView::Stretch );
+ header()->setResizeMode( QHeaderView::Interactive );
}
@@ -158,7 +154,7 @@
YQPkgDiskUsageList::sizeHint() const
{
QFontMetrics fms( font() );
- return QSize( fms.width( "/var/usr/home 100% 100.32GB" ) + 50, 100 );
+ return QSize( fms.width( "/var/usr/home 100% 100.32GB 100.3GB" ) + 50,
100 );
#ifdef FIXME
int width = header()->headerWidth()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgObjList.cc
new/yast2-qt-2.16.14/src/pkg/YQPkgObjList.cc
--- old/yast2-qt-2.16.12/src/pkg/YQPkgObjList.cc 2007-12-29
14:26:18.000000000 +0100
+++ new/yast2-qt-2.16.14/src/pkg/YQPkgObjList.cc 2008-01-10
14:48:42.000000000 +0100
@@ -91,6 +91,7 @@
connect( this, SIGNAL( currentItemChanged ( QTreeWidgetItem *,
QTreeWidgetItem * ) ),
this, SLOT ( currentItemChangedInternal( QTreeWidgetItem * )
) );
+ setIconSize( QSize( 22, 16 ) );
}
@@ -706,7 +707,7 @@
Q_CHECK_PTR( item );
item->setText( nameCol() >= 0 ? nameCol() : 0, text );
- item->setBackgroundColor( QColor( 0xE0, 0xE0, 0xF8 ) );
+ item->setBackgroundColor( 0, QColor( 0xE0, 0xE0, 0xF8 ) );
}
@@ -1047,6 +1048,7 @@
{
if ( statusCol() >= 0 )
{
+ y2debug( "setStatusIcon" );
bool enabled = editable() && _pkgObjList->editable();
setIcon( statusCol(), _pkgObjList->statusIcon( status(), enabled,
bySelection() ) );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgPatchList.cc
new/yast2-qt-2.16.14/src/pkg/YQPkgPatchList.cc
--- old/yast2-qt-2.16.12/src/pkg/YQPkgPatchList.cc 2007-12-29
14:26:18.000000000 +0100
+++ new/yast2-qt-2.16.14/src/pkg/YQPkgPatchList.cc 2008-01-10
14:48:42.000000000 +0100
@@ -253,7 +253,7 @@
Q_CHECK_PTR( item );
item->setText( 1, text );
- item->setBackgroundColor( QColor( 0xE0, 0xE0, 0xF8 ) );
+ item->setBackgroundColor( 0, QColor( 0xE0, 0xE0, 0xF8 ) );
}
@@ -482,9 +482,9 @@
switch ( _patchCategory )
{
- case YQPkgYaSTPatch: setTextColor( QColor( 0, 0, 0xC0 ) );
break; // medium blue
- case YQPkgSecurityPatch: setTextColor( Qt::red );
break;
- case YQPkgRecommendedPatch: setTextColor( QColor( 0, 0, 0xC0 ) );
break; // medium blue
+ case YQPkgYaSTPatch: setTextColor( 0, QColor( 0, 0, 0xC0 )
); break; // medium blue
+ case YQPkgSecurityPatch: setTextColor( 0, Qt::red );
break;
+ case YQPkgRecommendedPatch: setTextColor( 0, QColor( 0, 0, 0xC0 )
); break; // medium blue
case YQPkgOptionalPatch: break;
case YQPkgDocumentPatch: break;
case YQPkgUnknownPatchCategory: break;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgPatternList.cc
new/yast2-qt-2.16.14/src/pkg/YQPkgPatternList.cc
--- old/yast2-qt-2.16.12/src/pkg/YQPkgPatternList.cc 2007-12-29
14:26:18.000000000 +0100
+++ new/yast2-qt-2.16.14/src/pkg/YQPkgPatternList.cc 2008-01-10
14:48:42.000000000 +0100
@@ -43,8 +43,9 @@
{
y2debug( "Creating pattern list" );
- int numCol = 0;
+ int numCol = 1;
QStringList headers;
+ headers << "";
headers << ""; _statusCol = numCol++;
// Translators: "Pattern" refers to so-called "installation patterns",
@@ -56,7 +57,9 @@
headers << _( "Pattern" ); _summaryCol = numCol++;
+ setColumnCount( 3 );
setHeaderLabels(headers);
+
// Can use the same colum for "broken" and "satisfied":
// Both states are mutually exclusive
@@ -66,8 +69,20 @@
// header()->setStretchEnabled( _statusCol , false );
// header()->setStretchEnabled( _summaryCol, true );
+ setSortingEnabled( true );
+ sortByColumn( summaryCol(), Qt::AscendingOrder );
+
setAllColumnsShowFocus( true );
- //setTreeStepSize( 0 );
+
+ header()->setResizeMode( statusCol(), QHeaderView::Fixed );
+ header()->setResizeMode( summaryCol(), QHeaderView::Stretch );
+
+ header()->resizeSection( statusCol(), 25 );
+ setColumnWidth( statusCol(), 25 );
+ setColumnWidth( summaryCol(), 100 );
+ header()->resizeSection( 0, 0 );
+
+ //header()->setMinimumSectionSize( 25 );
if ( autoFilter )
{
@@ -309,6 +324,7 @@
_zyppPattern = tryCastToZyppPattern( selectable()->theObj() );
setStatusIcon();
+ setFirstColumnSpanned ( false );
}
@@ -347,7 +363,7 @@
, _patternList( patternList )
{
setText( _patternList->summaryCol(), category );
- setBackgroundColor( CATEGORY_BACKGROUND );
+ setBackgroundColor( _patternList->summaryCol(), CATEGORY_BACKGROUND );
setExpanded( true );
setTreeIcon();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/QY2ListView.cc
new/yast2-qt-2.16.14/src/QY2ListView.cc
--- old/yast2-qt-2.16.12/src/QY2ListView.cc 2007-12-29 14:26:17.000000000
+0100
+++ new/yast2-qt-2.16.14/src/QY2ListView.cc 2008-01-10 14:48:41.000000000
+0100
@@ -333,10 +333,24 @@
}
+#if 0
+class QY2ListViewItemDelegate : public QItemDelegate
+{
+public:
+ QY2ListViewItemDelegate( QTreeWidget *parent ) : QItemDelegate( parent ) {}
+ virtual void paint ( QPainter * painter, const QStyleOptionViewItem &
option, const QModelIndex & index ) const
+ {
+ painter->save();
-
-
+ QY2ListViewItem *item = dynamic_cast<QY2ListViewItem
*>(_view->itemFromIndex(index));
+ if ( item )
+ {
+ }
+ painter->restore();
+ }
+};
+#endif
QY2ListViewItem::QY2ListViewItem( QY2ListView * parentListView,
const QString & text )
@@ -396,22 +410,6 @@
return QTreeWidgetItem::operator<(otherListViewItem);
}
-// void
-// QY2ListViewItem::paintCell( QPainter * painter,
-// const QColorGroup & colorGroup,
-// int column,
-// int width,
-// int alignment )
-// {
-// QColorGroup cg = colorGroup;
-//
-// if ( _textColor.isValid() ) cg.setColor( QColorGroup::Text,
_textColor );
-// if ( _backgroundColor.isValid() ) cg.setColor( QColorGroup::Base,
_backgroundColor );
-//
-// QTreeWidgetItem::paintCell( painter, cg, column, width, alignment );
-// }
-
-
QY2CheckListItem::QY2CheckListItem( QY2ListView * parentListView,
const QString & text )
: QY2ListViewItem( parentListView, text)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/QY2ListView.h
new/yast2-qt-2.16.14/src/QY2ListView.h
--- old/yast2-qt-2.16.12/src/QY2ListView.h 2007-12-29 14:26:17.000000000
+0100
+++ new/yast2-qt-2.16.14/src/QY2ListView.h 2008-01-10 14:48:41.000000000
+0100
@@ -263,20 +263,6 @@
int serial() const { return _serial; }
/**
- * Set the text foreground color for all columns.
- * For more specific purposes reimiplement paintCell().
- **/
- void setTextColor( const QColor & col )
- { _textColor = col; }
-
- /**
- * Set the text background color for all columns.
- * For more specific purposes reimiplement paintCell().
- **/
- void setBackgroundColor( const QColor & col )
- { _backgroundColor = col; }
-
- /**
* Returns a tool tip text for a specific column of this item.
* 'column' is -1 if the mouse pointer is in the tree indentation area.
*
@@ -384,26 +370,11 @@
protected:
- /**
- * Paint method. Reimplemented from @ref QTreeWidgetItem so different
- * colors can be used.
- *
- * Reimplemented from QTreeWidgetItem.
- **/
- /*virtual void paintCell( QPainter * painter,
- const QColorGroup & colorGroup,
- int column,
- int width,
- int alignment );
- */
//
// Data members
//
int _serial;
-
- QColor _textColor;
- QColor _backgroundColor;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/YQAlignment.cc
new/yast2-qt-2.16.14/src/YQAlignment.cc
--- old/yast2-qt-2.16.12/src/YQAlignment.cc 2007-12-29 14:26:17.000000000
+0100
+++ new/yast2-qt-2.16.14/src/YQAlignment.cc 2008-01-10 14:48:41.000000000
+0100
@@ -70,13 +70,15 @@
void YQAlignment::setBackgroundPixmap( const string & pixmapFileName )
{
string pixmapName = pixmapFileName;
-
+
YAlignment::setBackgroundPixmap( pixmapName ); // Prepend path etc.
pixmapName = YAlignment::backgroundPixmap();
if ( pixmapName.empty() ) // Delete any old background pixmap
{
- setPalette(QPalette());
+ QPalette pal = palette();
+ pal.setBrush(backgroundRole(), QBrush());
+ setPalette(pal);
}
else // Set a new background pixmap
{
@@ -88,9 +90,9 @@
}
else
{
- QPalette palette;
- palette.setBrush(backgroundRole(), QBrush(pixmap));
- setPalette(palette);
+ QPalette pal = palette();
+ pal.setBrush(backgroundRole(), QBrush(pixmap));
+ setPalette(pal);
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/YQBarGraph.cc
new/yast2-qt-2.16.14/src/YQBarGraph.cc
--- old/yast2-qt-2.16.12/src/YQBarGraph.cc 2007-12-29 14:26:17.000000000
+0100
+++ new/yast2-qt-2.16.14/src/YQBarGraph.cc 2008-01-10 14:48:41.000000000
+0100
@@ -124,7 +124,7 @@
textColor.green(),
textColor.blue() ) );
- QString txt = QString::fromStdString( seg.label() );
+ QString txt = fromUTF8( seg.label() );
if ( txt.contains( "%1" ) )
txt = txt.arg( seg.value() ); // substitute variable
@@ -199,7 +199,7 @@
for ( int i=0; i < segments(); i++ )
{
- QString txt = QString::fromStdString( segment(i).label() );
+ QString txt = fromUTF8( segment(i).label() );
if ( txt.contains( "%1" ) )
txt = txt.arg( segment(i).value() );
@@ -225,7 +225,7 @@
for ( int i=0; i < segments(); i++ )
{
- QString txt = QString::fromStdString( segment(i).label() );
+ QString txt = fromUTF8( segment(i).label() );
if ( txt.contains( "%1" ) )
txt = txt.arg( segment(i).value() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/YQRichText.cc
new/yast2-qt-2.16.14/src/YQRichText.cc
--- old/yast2-qt-2.16.12/src/YQRichText.cc 2007-12-29 14:26:17.000000000
+0100
+++ new/yast2-qt-2.16.14/src/YQRichText.cc 2008-01-10 14:48:41.000000000
+0100
@@ -53,12 +53,12 @@
if ( plainTextMode )
{
- _textBrowser->setPlainText(QString::fromUtf8(text.c_str()));
+ _textBrowser->setPlainText( fromUTF8( text ) );
_textBrowser->setWordWrapMode( QTextOption::NoWrap );
}
else
{
- _textBrowser->setHtml(QString::fromUtf8(text.c_str()));
+ _textBrowser->setHtml( fromUTF8( text ) );
}
setValue( text );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/YQTable.cc
new/yast2-qt-2.16.14/src/YQTable.cc
--- old/yast2-qt-2.16.12/src/YQTable.cc 2007-12-29 14:26:17.000000000 +0100
+++ new/yast2-qt-2.16.14/src/YQTable.cc 2008-01-10 14:48:41.000000000 +0100
@@ -57,7 +57,7 @@
_qt_listView->setColumnCount(columns());
for ( int i=0; i < columns(); i++ )
{
- headers << QString::fromUtf8(header(i).c_str());
+ headers << fromUTF8(header(i));
int qt_alignment = Qt::AlignLeft;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/YQTimezoneSelector.cc
new/yast2-qt-2.16.14/src/YQTimezoneSelector.cc
--- old/yast2-qt-2.16.12/src/YQTimezoneSelector.cc 2007-12-29
14:26:17.000000000 +0100
+++ new/yast2-qt-2.16.14/src/YQTimezoneSelector.cc 2008-01-10
14:48:41.000000000 +0100
@@ -111,7 +111,7 @@
setWidgetRep( this );
setMouseTracking(true);
- d->_pix.load( QString::fromStdString( pixmap ) );
+ d->_pix.load( fromUTF8( pixmap ) );
setStretchable( YD_HORIZ, true );
setStretchable( YD_VERT, true );
@@ -136,7 +136,7 @@
if (tooltip == timezones.end() )
continue;
- loc.tip = QString::fromStdString( tooltip->second );
+ loc.tip = fromUTF8( tooltip->second );
if ( arr.size() > 3 )
loc.comment = arr[3];
loc.latitude = convert_pos ( arr[1].left( split_index ), 2);
@@ -342,7 +342,7 @@
void YQTimezoneSelector::setCurrentZone( const std::string &_zone, bool zoom )
{
- QString zone = QString::fromStdString( _zone );
+ QString zone = fromUTF8( _zone );
if ( d->_best.zone == zone )
return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/YQUI_core.cc
new/yast2-qt-2.16.14/src/YQUI_core.cc
--- old/yast2-qt-2.16.12/src/YQUI_core.cc 2007-12-29 14:26:17.000000000
+0100
+++ new/yast2-qt-2.16.14/src/YQUI_core.cc 2008-01-10 14:48:41.000000000
+0100
@@ -275,6 +275,9 @@
// Intentionally NOT calling dlclose() to libqt-mt
// (see constructor for explanation)
+
+ qApp->exit();
+ qApp->deleteLater();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/YQUI.h
new/yast2-qt-2.16.14/src/YQUI.h
--- old/yast2-qt-2.16.12/src/YQUI.h 2007-12-29 14:26:17.000000000 +0100
+++ new/yast2-qt-2.16.14/src/YQUI.h 2008-01-10 14:48:41.000000000 +0100
@@ -65,7 +65,7 @@
/**
* Destructor.
**/
- ~YQUI();
+ virtual ~YQUI();
/**
* Access the global Qt-UI.
@@ -265,7 +265,7 @@
*
* Reimplemented from YUI.
**/
- void idleLoop( int fd_ycp );
+ virtual void idleLoop( int fd_ycp );
/**
* Return a representation for the glyph symbol specified in UTF-8 encoding
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/src/YQWizard.cc
new/yast2-qt-2.16.14/src/YQWizard.cc
--- old/yast2-qt-2.16.12/src/YQWizard.cc 2007-12-29 14:26:17.000000000
+0100
+++ new/yast2-qt-2.16.14/src/YQWizard.cc 2008-01-10 14:48:41.000000000
+0100
@@ -47,6 +47,7 @@
#include "QY2Styler.h"
#include "QY2HelpDialog.h"
#include <QGridLayout>
+#include <QHeaderView>
#include <qevent.h>
#include "utf8.h"
@@ -446,9 +447,7 @@
YUI_CHECK_NEW( _tree );
vbox->addWidget( _tree );
- //FIXME
-// _tree->addColumn( "" );
-// _tree->header()->hide();
+ _tree->header()->hide();
_tree->setRootIsDecorated( true );
_tree->setSortByInsertionSequence( true );
@@ -1056,8 +1055,13 @@
YQWizardButton * wizardButton = dynamic_cast<YQWizardButton *> (button);
- if ( wizardButton )
- wizardButton->setVisible( !newLabel.empty() );
+ if ( wizardButton ) {
+ // QWizardButton only implements hide and show, not setVisible
+ if ( newLabel.empty() )
+ wizardButton->hide();
+ else
+ wizardButton->show();
+ }
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.12/VERSION.cmake
new/yast2-qt-2.16.14/VERSION.cmake
--- old/yast2-qt-2.16.12/VERSION.cmake 2007-12-29 14:26:16.000000000 +0100
+++ new/yast2-qt-2.16.14/VERSION.cmake 2008-01-10 14:48:41.000000000 +0100
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "16")
-SET(VERSION_PATCH "12")
+SET(VERSION_PATCH "14")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |