Hello community,
here is the log from the commit of package yast2-qt for openSUSE:Factory
checked in at Wed Jul 29 17:33:08 CEST 2009.
--------
--- yast2-qt/yast2-qt.changes 2009-03-12 21:55:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2009-07-29 12:55:43.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jul 29 12:45:08 CEST 2009 - kmachalkova@suse.cz
+
+- Use YIconLoader to search for icons (add icon search path, use
+ findIcon in IconButton widget) (FaTe #306356)
+- V 2.18.7
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-qt-2.18.6.tar.bz2
New:
----
yast2-qt-2.18.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.upEcG6/_old 2009-07-29 17:32:49.000000000 +0200
+++ /var/tmp/diff_new_pack.upEcG6/_new 2009-07-29 17:32:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.18.6)
+# spec file for package yast2-qt (Version 2.18.7)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,12 +18,12 @@
Name: yast2-qt
-Version: 2.18.6
+Version: 2.18.7
Release: 1
-License: GPL v2 or later
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.18.6.tar.bz2
+Source0: yast2-qt-2.18.7.tar.bz2
+Group: System/YaST
+License: GPL v2 or later
BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen
BuildRequires: libdrm-devel
@@ -37,8 +37,9 @@
BuildRequires: cmake
Summary: YaST2 - Graphical User Interface
BuildRequires: yast2-devtools >= 2.16.3
-BuildRequires: yast2-libyui-devel >= 2.18.7
-Requires: yast2-libyui >= 2.18.7
+#YIconLoader
+BuildRequires: yast2-libyui-devel >= 2.18.8
+Requires: yast2-libyui >= 2.18.8
Requires: yast2_theme >= 2.16.1
Provides: yast2_ui
Provides: y2base:/usr/lib/YaST2/servers/qt
@@ -53,15 +54,8 @@
One of several user interfaces available for YaST2, based on Qt and the
X Window System.
-
-
-Authors:
---------
- Mathias Kettner
- Stefan Hundhammer
-
%package devel
-License: YaST License
+License: GPL v2 or later
Summary: Development package for graphical YaST2 user interfaces
Group: Development/Libraries/YaST
Requires: yast2-qt = %{version}
@@ -79,12 +73,6 @@
for YaST2 and dynamically link those against the YaST2 Qt user
interface rather than loading the respective plug-ins.
-
-
-Authors:
---------
- yast-devel@opensuse.org
-
%prep
%setup
++++++ yast2-qt-2.18.6.tar.bz2 -> yast2-qt-2.18.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/VERSION.cmake new/yast2-qt-2.18.7/VERSION.cmake
--- old/yast2-qt-2.18.6/VERSION.cmake 2009-03-12 21:55:39.000000000 +0100
+++ new/yast2-qt-2.18.7/VERSION.cmake 2009-07-29 12:52:55.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "18")
-SET(VERSION_PATCH "6")
+SET(VERSION_PATCH "7")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/package/yast2-qt.changes new/yast2-qt-2.18.7/package/yast2-qt.changes
--- old/yast2-qt-2.18.6/package/yast2-qt.changes 2009-03-12 21:55:39.000000000 +0100
+++ new/yast2-qt-2.18.7/package/yast2-qt.changes 2009-07-29 12:52:55.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Jul 29 12:45:08 CEST 2009 - kmachalkova@suse.cz
+
+- Use YIconLoader to search for icons (add icon search path, use
+ findIcon in IconButton widget) (FaTe #306356)
+- V 2.18.7
+
+-------------------------------------------------------------------
Wed Mar 11 15:30:46 CET 2009 - kmachalkova@suse.cz
- Added tooltips to BarGraph widget (duplicate segment text in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/src/YQApplication.cc new/yast2-qt-2.18.7/src/YQApplication.cc
--- old/yast2-qt-2.18.6/src/YQApplication.cc 2009-03-12 21:55:39.000000000 +0100
+++ new/yast2-qt-2.18.7/src/YQApplication.cc 2009-07-29 12:52:55.000000000 +0200
@@ -63,7 +63,9 @@
{
yuiDebug() << "YQApplication constructor start" << endl;
- setIconBasePath( ICONDIR "/icons/22x22/apps/" );
+ //setIconBasePath( ICONDIR "/icons/22x22/apps/" );
+ // the above works too, but let's try it the icon-loader way - FaTE #306356
+ iconLoader()->addIconSearchPath( ICONDIR "/icons/" );
loadPredefinedQtTranslations();
yuiDebug() << "YQApplication constructor end" << endl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/src/YQBarGraph.cc new/yast2-qt-2.18.7/src/YQBarGraph.cc
--- old/yast2-qt-2.18.6/src/YQBarGraph.cc 2009-03-12 21:55:39.000000000 +0100
+++ new/yast2-qt-2.18.7/src/YQBarGraph.cc 2009-07-29 12:52:55.000000000 +0200
@@ -96,6 +96,8 @@
int x_off = YQBarGraphOuterMargin;
int y_off = YQBarGraphOuterMargin;
int valueTotal = 0;
+ QFontMetrics fm = painter.fontMetrics();
+
toolTips.clear();
for ( int i=0; i < segments(); i++ )
@@ -108,6 +110,7 @@
{
const YBarGraphSegment & seg = segment(i);
int segWidth = ( (long) totalWidth * seg.value() ) / valueTotal;
+ int stringWidth = 0;
if ( i == segments()-1 )
{
@@ -155,14 +158,21 @@
if ( txt.contains( "%1" ) )
txt = txt.arg( seg.value() ); // substitute variable
- painter.drawText( x_off + YQBarGraphLabelHorizontalMargin,
+ stringWidth = fm.size(0,txt).width();
+
+ // draw the text only if it fits the current segment width ...
+ if (stringWidth < segWidth)
+ {
+ painter.drawText( x_off + YQBarGraphLabelHorizontalMargin,
y_off + YQBarGraphLabelVerticalMargin,
segWidth - 2 * YQBarGraphLabelHorizontalMargin + 1,
segHeight - 2 * YQBarGraphLabelVerticalMargin + 1,
Qt::AlignCenter, txt );
+ }
-
+ // ... but always make it available via tooltip
toolTips.insert(make_pair( x_off, txt));
+
// Prepare for the next segment
x_off += segWidth;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/src/YQGenericButton.cc new/yast2-qt-2.18.7/src/YQGenericButton.cc
--- old/yast2-qt-2.18.6/src/YQGenericButton.cc 2009-03-12 21:55:39.000000000 +0100
+++ new/yast2-qt-2.18.7/src/YQGenericButton.cc 2009-07-29 12:52:55.000000000 +0200
@@ -121,7 +121,8 @@
return;
}
- qIconName = QString( ICONDIR ) + "/" + qIconName;
+ // Search for the icon - FaTE #306356
+ qIconName = fromUTF8( YQUI::yqApp()->iconLoader()->findIcon( iconName ) );
QPixmap icon( qIconName );
if ( icon.isNull() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/yast2-qt.spec.in new/yast2-qt-2.18.7/yast2-qt.spec.in
--- old/yast2-qt-2.18.6/yast2-qt.spec.in 2009-03-12 21:55:39.000000000 +0100
+++ new/yast2-qt-2.18.7/yast2-qt.spec.in 2009-07-29 12:52:55.000000000 +0200
@@ -2,6 +2,8 @@
@HEADER@
+Group: System/YaST
+License: GPL v2 or later
BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen
BuildRequires: libdrm-devel
@@ -14,10 +16,11 @@
BuildRequires: update-desktop-files
BuildRequires: cmake
-Summary: -
+Summary: YaST2 - Graphical User Interface
BuildRequires: yast2-devtools >= 2.16.3
-BuildRequires: yast2-libyui-devel >= 2.18.7
-Requires: yast2-libyui >= 2.18.7
+#YIconLoader
+BuildRequires: yast2-libyui-devel >= 2.18.8
+Requires: yast2-libyui >= 2.18.8
Requires: yast2_theme >= 2.16.1
Provides: yast2_ui
Provides: y2base:/usr/lib/YaST2/servers/qt
@@ -29,16 +32,26 @@
Recommends: yast2-qt-pkg
%description
--
+One of several user interfaces available for YaST2, based on Qt and the
+X Window System.
%package devel
-Summary: -
-Group: Development/Libraries
+Summary: Development package for graphical YaST2 user interfaces
+Group: Development/Libraries/YaST
Requires: yast2-qt = %{version}
Requires: yast2-libyui-devel
%description devel
--
+Shared libs for the YaST2 Qt user interface.
+
+This is not necessary for developing YaST2 scripts (YCP) -- the YaST2
+main program (y2bignfat) will load those components on demand as
+plug-ins. Those plug-ins, however, are available within the base
+package (yast2-ui-qt).
+
+You only need this package if you really wish to develop new binaries
+for YaST2 and dynamically link those against the YaST2 Qt user
+interface rather than loading the respective plug-ins.
%prep
%setup
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org