Mailinglist Archive: opensuse-commit (857 mails)
| < Previous | Next > |
commit yast2-qt
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 21 Nov 2007 03:28:27 +0100
- Message-id: <20071121022827.CDA3C678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-qt
checked in at Wed Nov 21 03:28:27 CET 2007.
--------
--- yast2-qt/yast2-qt.changes 2007-11-16 20:25:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2007-11-20
18:04:28.724359000 +0100
@@ -1,0 +2,13 @@
+Tue Nov 20 18:03:00 CET 2007 - sh@xxxxxxx
+
+- Prevent self-generated events in YQDumbTab
+- Fixed cut-off YQInputField labels
+- V 2.16.3
+
+-------------------------------------------------------------------
+Mon Nov 19 13:44:00 CET 2007 - tgoettlicher@xxxxxxx
+
+- fixed ignored arch selection in package selector (#304966)
+- V 2.16.2
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.16.1.tar.bz2
New:
----
yast2-qt-2.16.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.Q28770/_old 2007-11-21 03:28:21.000000000 +0100
+++ /var/tmp/diff_new_pack.Q28770/_new 2007-11-21 03:28:21.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.16.1)
+# spec file for package yast2-qt (Version 2.16.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-qt
-Version: 2.16.1
+Version: 2.16.3
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.16.1.tar.bz2
+Source0: yast2-qt-2.16.3.tar.bz2
Prefix: /usr
BuildRequires: boost-devel curl-devel dbus-1-devel docbook-xsl-stylesheets
doxygen hal-devel libdrm-devel libjpeg-devel libxcrypt-devel libxslt
libzypp-devel perl-XML-Writer qt3-devel rpm-devel sgml-skel
update-desktop-files yast2-core-devel yast2-devtools
Summary: YaST2 - Graphical User Interface
@@ -43,7 +43,7 @@
Stefan Hundhammer <sh@xxxxxxx>
%prep
-%setup -n yast2-qt-2.16.1
+%setup -n yast2-qt-2.16.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -88,6 +88,13 @@
/usr/share/YaST2/data/lang_fonts
%doc %{prefix}/share/doc/packages/yast2-qt
%changelog
+* Tue Nov 20 2007 - sh@xxxxxxx
+- Prevent self-generated events in YQDumbTab
+- Fixed cut-off YQInputField labels
+- V 2.16.3
+* Mon Nov 19 2007 - tgoettlicher@xxxxxxx
+- fixed ignored arch selection in package selector (#304966)
+- V 2.16.2
* Fri Nov 16 2007 - sh@xxxxxxx
- Merged mod-ui branch to trunk
- V 2.16.1
++++++ yast2-qt-2.16.1.tar.bz2 -> yast2-qt-2.16.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.1/src/pkg/YQPkgVersionsView.cc
new/yast2-qt-2.16.3/src/pkg/YQPkgVersionsView.cc
--- old/yast2-qt-2.16.1/src/pkg/YQPkgVersionsView.cc 2007-11-16
12:41:12.000000000 +0100
+++ new/yast2-qt-2.16.3/src/pkg/YQPkgVersionsView.cc 2007-11-20
18:02:09.000000000 +0100
@@ -177,6 +177,7 @@
ZyppStatus status = _selectable->status();
if ( _selectable->installedObj() &&
+ _selectable->installedObj()->arch() ==
newCandidate->arch() &&
_selectable->installedObj()->edition() ==
newCandidate->edition() )
{
// Switch back to the original instance -
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.1/src/YQDumbTab.cc
new/yast2-qt-2.16.3/src/YQDumbTab.cc
--- old/yast2-qt-2.16.1/src/YQDumbTab.cc 2007-11-16 12:41:12.000000000
+0100
+++ new/yast2-qt-2.16.3/src/YQDumbTab.cc 2007-11-20 17:48:22.000000000
+0100
@@ -20,8 +20,12 @@
#define y2log_component "qt-ui"
#include <ycp/y2log.h>
#include <qtabbar.h>
+#include <qevent.h>
+#include <qpainter.h>
+#include <qdrawutil.h>
#include <algorithm>
+#include "YQSignalBlocker.h"
#include "QY2LayoutUtils.h"
#include "utf8.h"
#include "YQUI.h"
@@ -29,7 +33,8 @@
#include "YQAlignment.h"
#include "YEvent.h"
-#define YQDumbTabSpacing 4
+#define YQDumbTabSpacing 2
+#define YQDumbTabFrameMargin 4
YQDumbTab::YQDumbTab( YWidget * parent )
@@ -64,6 +69,7 @@
void
YQDumbTab::addItem( YItem * item )
{
+ YQSignalBlocker sigBlocker( _tabBar );
YDumbTab::addItem( item );
QTab * tab = new QTab( fromUTF8( item->label() ) );
@@ -79,6 +85,8 @@
void
YQDumbTab::selectItem( YItem * item, bool selected )
{
+ YQSignalBlocker sigBlocker( _tabBar );
+
if ( selected )
{
// Don't try to suppress any signals sent here with a YQSignalBlocker,
@@ -157,10 +165,32 @@
void
+YQDumbTab::paintEvent( QPaintEvent * event )
+{
+ QPainter painter( this );
+
+ int x_offset = 0;
+ int y_offset = _tabBar->height() + YQDumbTabSpacing;
+ int frameHeight = height() - y_offset;
+ int frameWidth = width();
+
+ qDrawWinPanel( &painter,
+ x_offset, y_offset,
+ frameWidth, frameHeight,
+ colorGroup(),
+ false, // sunken
+ (const QBrush *) 0 ); // brush - don't fill interior
+}
+
+
+void
YQDumbTab::setSize( int newWidth, int newHeight )
{
QWidget::resize( newWidth, newHeight );
int remainingHeight = newHeight;
+ int remainingWidth = newWidth;
+ int x_offset = 0;
+ int y_offset = 0;
//
// _tabBar (fixed height)
@@ -180,19 +210,33 @@
// Spacing between tabBar and client area
//
- if ( remainingHeight >= YQDumbTabSpacing )
- remainingHeight -= YQDumbTabSpacing;
- else
+ remainingHeight -= YQDumbTabSpacing;
+ y_offset = newHeight - remainingHeight;
+
+ //
+ // 3D border
+ //
+
+ remainingHeight -= 2 * YQDumbTabFrameMargin;
+ remainingWidth -= 2 * YQDumbTabFrameMargin;
+ x_offset += YQDumbTabFrameMargin;
+ y_offset += YQDumbTabFrameMargin;
+
+ if ( remainingHeight < 0 )
remainingHeight = 0;
+
+ if ( remainingWidth < 0 )
+ remainingWidth = 0;
//
// Client area
//
+
- firstChild()->setSize( newWidth, remainingHeight );
+ firstChild()->setSize( remainingWidth, remainingHeight );
QWidget * qChild = (QWidget *) firstChild()->widgetRep();
- qChild->move( 0, newHeight - remainingHeight );
+ qChild->move( x_offset, y_offset );
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.1/src/YQDumbTab.h
new/yast2-qt-2.16.3/src/YQDumbTab.h
--- old/yast2-qt-2.16.1/src/YQDumbTab.h 2007-11-16 12:41:12.000000000 +0100
+++ new/yast2-qt-2.16.3/src/YQDumbTab.h 2007-11-20 17:13:56.000000000 +0100
@@ -24,6 +24,7 @@
#include "YDumbTab.h"
class QTabBar;
+class QPaintEvent;
class YQDumbTab : public QWidget, public YDumbTab
@@ -98,6 +99,14 @@
**/
virtual void setSize( int newWidth, int newHeight );
+protected:
+
+ /**
+ * Draw widget content.
+ *
+ * Reimplemented from QWidget.
+ **/
+ virtual void paintEvent( QPaintEvent * );
public slots:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.1/src/YQInputField.cc
new/yast2-qt-2.16.3/src/YQInputField.cc
--- old/yast2-qt-2.16.1/src/YQInputField.cc 2007-11-16 12:41:12.000000000
+0100
+++ new/yast2-qt-2.16.3/src/YQInputField.cc 2007-11-19 17:57:33.000000000
+0100
@@ -115,8 +115,10 @@
int YQInputField::preferredWidth()
{
- int minSize = shrinkable() ? 20 : 200;
- int hintWidth = _caption->isShown() ? _caption->sizeHint().width() : 0;
+ int minSize = shrinkable() ? 30 : 200;
+ int hintWidth = _caption->isShown()
+ ? _caption->sizeHint().width() + 2 * YQWidgetMargin
+ : 0;
return max( minSize, hintWidth );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-qt-2.16.1/VERSION new/yast2-qt-2.16.3/VERSION
--- old/yast2-qt-2.16.1/VERSION 2007-11-16 16:36:00.000000000 +0100
+++ new/yast2-qt-2.16.3/VERSION 2007-11-20 18:04:01.000000000 +0100
@@ -1 +1 @@
-2.16.1
+2.16.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |