Mailinglist Archive: opensuse-commit (1828 mails)

< Previous Next >
commit yast2-libyui
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sat, 06 Sep 2008 05:02:17 +0200
  • Message-id: <20080906030217.77AE1678164@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-libyui
checked in at Sat Sep 6 05:02:17 CEST 2008.


--------
--- yast2-libyui/yast2-libyui.changes 2008-08-26 13:12:42.000000000 +0200
+++ yast2-libyui/yast2-libyui.changes 2008-09-04 15:36:48.949590000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 4 14:47:46 CEST 2008 - sh@xxxxxxx
+
+- Allow ButtonBox sanity check to be relaxed (bnc #422612)
+- V 2.17.7
+
+-------------------------------------------------------------------



Old:
----
yast2-libyui-2.17.6.tar.bz2

New:
----
yast2-libyui-2.17.7.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-libyui.spec ++++++
--- /var/tmp/diff_new_pack.I12206/_old 2008-09-06 05:01:49.000000000 +0200
+++ /var/tmp/diff_new_pack.I12206/_new 2008-09-06 05:01:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-libyui (Version 2.17.6)
+# spec file for package yast2-libyui (Version 2.17.7)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@


Name: yast2-libyui
-Version: 2.17.6
+Version: 2.17.7
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-libyui-2.17.6.tar.bz2
+Source0: yast2-libyui-2.17.7.tar.bz2
Prefix: /usr
Source1: yast2-libyui-rpmlintrc
BuildRequires: gcc-c++
@@ -77,7 +77,7 @@
Stefan Hundhammer <sh@xxxxxxx>

%prep
-%setup -n yast2-libyui-2.17.6
+%setup -n yast2-libyui-2.17.7

%build
%{prefix}/bin/y2tool y2autoconf
@@ -123,6 +123,9 @@
%{_datadir}/cmake/Modules/*
%doc %{prefix}/share/doc/packages/yast2-libyui
%changelog
+* Thu Sep 04 2008 sh@xxxxxxx
+- Allow ButtonBox sanity check to be relaxed (bnc #422612)
+- V 2.17.7
* Thu Aug 21 2008 sh@xxxxxxx
- Added YButtonBox widget (fate #303446)
- V 2.17.6

++++++ yast2-libyui-2.17.6.tar.bz2 -> yast2-libyui-2.17.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-libyui-2.17.6/src/YButtonBox.cc
new/yast2-libyui-2.17.7/src/YButtonBox.cc
--- old/yast2-libyui-2.17.6/src/YButtonBox.cc 2008-08-22 13:32:23.000000000
+0200
+++ new/yast2-libyui-2.17.7/src/YButtonBox.cc 2008-09-04 15:02:18.000000000
+0200
@@ -44,14 +44,16 @@
* Constructor
**/
YButtonBoxPrivate()
- : margins( YButtonBox::_defaultMargins )
+ : sanityCheckRelaxed( false )
+ , margins( YButtonBox::_defaultMargins )
{}

//
// Data members
//

- YButtonBoxMargins margins;
+ bool sanityCheckRelaxed;
+ YButtonBoxMargins margins;
};


@@ -569,6 +571,20 @@


void
+YButtonBox::setSanityCheckRelaxed( bool relaxed )
+{
+ priv->sanityCheckRelaxed = relaxed;
+}
+
+
+bool
+YButtonBox::sanityCheckRelaxed() const
+{
+ return priv->sanityCheckRelaxed;
+}
+
+
+void
YButtonBox::sanityCheck()
{
YPushButton * okButton = 0;
@@ -608,7 +624,7 @@
}
}

- if ( childrenCount() > 1 )
+ if ( childrenCount() > 1 && ! sanityCheckRelaxed() )
{
if ( ! okButton || ! cancelButton )
YUI_THROW( YUIButtonRoleMismatchException( "Button role mismatch:
Must have both [OK] and [Cancel] roles" ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-libyui-2.17.6/src/YButtonBox.h
new/yast2-libyui-2.17.7/src/YButtonBox.h
--- old/yast2-libyui-2.17.6/src/YButtonBox.h 2008-08-22 13:12:02.000000000
+0200
+++ new/yast2-libyui-2.17.7/src/YButtonBox.h 2008-09-04 14:35:39.000000000
+0200
@@ -266,6 +266,33 @@
void sanityCheck();

/**
+ * Relax the sanity check done in sanityCheck(): Do not enforce that there
+ * has to be a YOKButton and a YCancelButton if there is more than one
+ * button.
+ *
+ * In very rare cases, it might be neccessary to have a less stringent
+ * sanity check: There are some very few legitimate cases for having a
+ * YButtonBox with multiple buttons, yet without a YCancelButton.
+ *
+ * Examples:
+ *
+ * ...message...
+ * <Countdown>
+ * [OK] [Stop]
+ *
+ * ...message...
+ * [OK] [Details]
+ *
+ * In those cases, it makes sense to relax the sanity check.
+ **/
+ void setSanityCheckRelaxed( bool relax = true );
+
+ /**
+ * Return 'true' if sanity checks are currently relaxed, 'false' if not.
+ **/
+ bool sanityCheckRelaxed() const;
+
+ /**
* Preferred width of the widget.
*
* Reimplemented from YWidget. This default method returns the sum of
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-libyui-2.17.6/src/YUI.cc
new/yast2-libyui-2.17.7/src/YUI.cc
--- old/yast2-libyui-2.17.6/src/YUI.cc 2008-08-22 18:50:48.000000000 +0200
+++ new/yast2-libyui-2.17.7/src/YUI.cc 2008-09-04 15:02:18.000000000 +0200
@@ -384,12 +384,12 @@
env == "xfce" )
{
buttonOrder = YKDEButtonOrder;
- lastEnv = env;
+ lastEnv = env;
}
else if ( env == "gnome" )
{
buttonOrder = YGnomeButtonOrder;
- lastEnv = env;
+ lastEnv = env;
}

//
@@ -402,12 +402,12 @@
if ( env.contains( "gnome" ) )
{
buttonOrder = YGnomeButtonOrder;
- lastEnv = env;
+ lastEnv = env;
}
else if ( env.contains( "kde" ) )
{
buttonOrder = YKDEButtonOrder;
- lastEnv = env;
+ lastEnv = env;
}


@@ -421,12 +421,12 @@
if ( env == "gnome" )
{
buttonOrder = YGnomeButtonOrder;
- lastEnv = env;
+ lastEnv = env;
}
else if ( env == "kde" )
{
buttonOrder = YKDEButtonOrder;
- lastEnv = env;
+ lastEnv = env;
}
else if ( ! env.value().empty() )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-libyui-2.17.6/src/YUISymbols.h
new/yast2-libyui-2.17.7/src/YUISymbols.h
--- old/yast2-libyui-2.17.6/src/YUISymbols.h 2008-08-21 17:13:39.000000000
+0200
+++ new/yast2-libyui-2.17.7/src/YUISymbols.h 2008-09-04 15:22:21.000000000
+0200
@@ -216,6 +216,7 @@
#define YUIOpt_okButton "okButton"
#define YUIOpt_outputField "outputField"
#define YUIOpt_plainText "plainText"
+#define YUIOpt_relaxSanityCheck "relaxSanityCheck"
#define YUIOpt_repoMgr "repoMgr"
#define YUIOpt_repoMode "repoMode"
#define YUIOpt_scaleToFit "scaleToFit"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-libyui-2.17.6/VERSION
new/yast2-libyui-2.17.7/VERSION
--- old/yast2-libyui-2.17.6/VERSION 2008-08-21 14:47:18.000000000 +0200
+++ new/yast2-libyui-2.17.7/VERSION 2008-09-04 14:37:11.000000000 +0200
@@ -1 +1 @@
-2.17.6
+2.17.7



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >