Hello community,
here is the log from the commit of package yast2-gtk
checked in at Fri Feb 1 00:01:12 CET 2008.
--------
--- yast2-gtk/yast2-gtk.changes 2008-01-27 21:04:56.000000000 +0100
+++ yast2-gtk/yast2-gtk.changes 2008-01-31 20:11:55.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Jan 31 20:11:40 CET 2008 - coolo@suse.de
+
+- make it compile against latest yast2-core
+
+-------------------------------------------------------------------
Old:
----
yast2-gtk-2.16.1.tar.bz2
New:
----
yast2-gtk-2.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-gtk.spec ++++++
--- /var/tmp/diff_new_pack.c31473/_old 2008-02-01 00:00:42.000000000 +0100
+++ /var/tmp/diff_new_pack.c31473/_new 2008-02-01 00:00:42.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-gtk (Version 2.16.1)
+# spec file for package yast2-gtk (Version 2.16.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,17 +12,17 @@
Name: yast2-gtk
Url: http://en.opensuse.org/YaST2-GTK
-Version: 2.16.1
-Release: 6
+Version: 2.16.2
+Release: 1
License: LGPL v2.1 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-gtk-2.16.1.tar.bz2
+Source0: yast2-gtk-2.16.2.tar.bz2
Prefix: /usr
Source2: yast2-gtk-rpmlintrc
BuildRequires: blocxx-devel gcc-c++ gtk2-devel libxcrypt-devel libzypp-devel yast2-devtools
-BuildRequires: yast2-core-devel >= 2.16.21
-Requires: yast2-core >= 2.16.21
+BuildRequires: yast2-core-devel >= 2.16.25
+Requires: yast2-core >= 2.16.25
Summary: YaST2 - Gtk Graphical User Interface
Provides: yast2_ui
@@ -38,7 +38,7 @@
Michael Meeks
%prep
-%setup -n yast2-gtk-2.16.1
+%setup -n yast2-gtk-2.16.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,15 +67,16 @@
%doc %{prefix}/share/doc/packages/yast2-gtk
%{_libdir}/YaST2/plugin/libpy2gtk.so.*
%{_libdir}/YaST2/plugin/libpy2gtk.so
-
%changelog
+* Thu Jan 31 2008 coolo@suse.de
+- make it compile against latest yast2-core
* Sun Jan 27 2008 coolo@suse.de
- fix changelog
* Fri Jan 18 2008 coolo@suse.de
- Ricardo fixed make test
* Wed Jan 16 2008 coolo@suse.de
- update to latest yast2-core API
-* Fri Jan 11 2008 btimothy@suse.de
+* Sat Jan 12 2008 btimothy@suse.de
- Updating the tarball directly from SVN Trunk revision to be
version 2.15.9r43566 so the package won't fail to build anymore.
- Removed all the old patches since they are no longer necessary
++++++ yast2-gtk-2.16.1.tar.bz2 -> yast2-gtk-2.16.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/ChangeLog new/yast2-gtk-2.16.2/ChangeLog
--- old/yast2-gtk-2.16.1/ChangeLog 2008-01-18 10:33:30.000000000 +0100
+++ new/yast2-gtk-2.16.2/ChangeLog 2008-01-27 21:04:06.000000000 +0100
@@ -1,3 +1,14 @@
+2008-01-24 Ricardo Cruz
+
+ * src/YGDumbTab.cc: bug fix: honor tab default flag.
+
+ * src/YGCheckBoxFrame.cc: bug fix: setEnabling() is now setEnabled().
+
+2008-01-21 Ricardo Cruz
+
+ * src/ygtkfindentry.c: bug fix: clear icon hidden on delete, and not shown
+ on some cases (see the selector).
+
2008-01-17 Ricardo Cruz
* src/pkg-selector-help.h: added help to package selector. Thanks to
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGDialog.cc new/yast2-gtk-2.16.2/src/YGDialog.cc
--- old/yast2-gtk-2.16.1/src/YGDialog.cc 2008-01-16 14:36:27.000000000 +0100
+++ new/yast2-gtk-2.16.2/src/YGDialog.cc 2008-01-31 20:10:18.000000000 +0100
@@ -421,3 +421,24 @@
return new YGDialog (dialogType, colorMode);
}
+void
+YGDialog::openInternal()
+{
+#if 0
+ ensureOnlyOneDefaultButton();
+ QWidget::show();
+ QWidget::raise(); // FIXME: is this really necessary?
+ QWidget::update();
+#endif
+}
+
+
+void
+YGDialog::activate()
+{
+#if 0
+ QWidget::raise();
+ QWidget::update();
+#endif
+}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGDialog.h new/yast2-gtk-2.16.2/src/YGDialog.h
--- old/yast2-gtk-2.16.1/src/YGDialog.h 2008-01-16 14:36:27.000000000 +0100
+++ new/yast2-gtk-2.16.2/src/YGDialog.h 2008-01-31 20:07:18.000000000 +0100
@@ -33,6 +33,9 @@
virtual int preferredWidth() { return 0; }
virtual int preferredHeight() { return 0; }
+ virtual void activate();
+ virtual void openInternal();
+
YGWIDGET_IMPL_CHILD_ADDED (m_containee)
YGWIDGET_IMPL_CHILD_REMOVED (m_containee)
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGDumbTab.cc new/yast2-gtk-2.16.2/src/YGDumbTab.cc
--- old/yast2-gtk-2.16.1/src/YGDumbTab.cc 2008-01-16 14:36:27.000000000 +0100
+++ new/yast2-gtk-2.16.2/src/YGDumbTab.cc 2008-01-27 21:04:06.000000000 +0100
@@ -76,9 +76,7 @@
g_object_set_data (G_OBJECT (page), "yitem", item);
gtk_notebook_append_page (notebook, page, tab_label);
-
- if (!m_last_tab) /*first tab*/
- syncTabPage();
+ selectItem (item, item->selected() || !m_last_tab /*first tab*/);
g_signal_handlers_unblock_by_func (notebook, (gpointer) changed_tab_cb, this);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGFrame.cc new/yast2-gtk-2.16.2/src/YGFrame.cc
--- old/yast2-gtk-2.16.1/src/YGFrame.cc 2008-01-16 14:36:27.000000000 +0100
+++ new/yast2-gtk-2.16.2/src/YGFrame.cc 2008-01-27 21:04:06.000000000 +0100
@@ -51,21 +51,12 @@
virtual ~YGFrame() {}
// YFrame
- virtual void setLabel (const string &_str)
+ virtual void setLabel (const string &str)
{
IMPL
- /* Get rid of mnemonics; makes no sense here. */
- size_t length = _str.length();
- string str;
- str.reserve (length);
- for (size_t i = 0; i < length; i++)
- if (_str[i] != '&')
- str += _str[i];
-
GtkWidget *label = gtk_frame_get_label_widget (GTK_FRAME (getWidget()));
gtk_label_set_text (GTK_LABEL (label), str.c_str());
-
- YFrame::setLabel (_str);
+ YFrame::setLabel (str);
}
YGWIDGET_IMPL_COMMON
@@ -126,8 +117,9 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), value);
}
- virtual void setEnabling (bool enabled)
+ virtual void setEnabled (bool enabled)
{
+
GtkWidget *frame = getWidget();
if (enabled) {
gtk_widget_set_sensitive (frame, TRUE);
@@ -137,6 +129,7 @@
gtk_widget_set_sensitive (frame, FALSE);
YWidget::setChildrenEnabled (false);
}
+ YWidget::setEnabled (enabled);
}
YGWIDGET_IMPL_CHILD_ADDED (m_containee)
@@ -145,7 +138,7 @@
private:
static void toggled_cb (GtkWidget *widget, YGCheckBoxFrame *pThis)
{
- pThis->setEnabling (true);
+ pThis->setEnabled (true);
if (pThis->notify())
YGUI::ui()->sendEvent (new YWidgetEvent (pThis, YEvent::ValueChanged));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGMultiLineEdit.cc new/yast2-gtk-2.16.2/src/YGMultiLineEdit.cc
--- old/yast2-gtk-2.16.1/src/YGMultiLineEdit.cc 2008-01-16 14:36:27.000000000 +0100
+++ new/yast2-gtk-2.16.2/src/YGMultiLineEdit.cc 2008-01-31 20:07:57.000000000 +0100
@@ -216,7 +216,7 @@
static void link_clicked_cb (GtkWidget *widget, const char *url, YGRichText *pThis)
{
- YGUI::ui()->sendEvent (new YMenuEvent (YCPString (url)));
+ YGUI::ui()->sendEvent (new YMenuEvent (url));
}
YGWIDGET_IMPL_COMMON
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGPackageSelector.cc new/yast2-gtk-2.16.2/src/YGPackageSelector.cc
--- old/yast2-gtk-2.16.1/src/YGPackageSelector.cc 2008-01-18 10:33:30.000000000 +0100
+++ new/yast2-gtk-2.16.2/src/YGPackageSelector.cc 2008-01-31 20:08:37.000000000 +0100
@@ -1651,7 +1651,7 @@
if (!strcmp (action, "accept")) {
y2milestone ("Closing PackageSelector with 'accept'");
- YGUI::ui()->sendEvent (new YMenuEvent (YCPSymbol ("accept")));
+ YGUI::ui()->sendEvent (new YMenuEvent ("accept"));
}
else if (!strcmp (action, "cancel")) {
y2milestone ("Closing PackageSelector with 'cancel'");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/ygtkfindentry.c new/yast2-gtk-2.16.2/src/ygtkfindentry.c
--- old/yast2-gtk-2.16.1/src/ygtkfindentry.c 2008-01-16 14:36:27.000000000 +0100
+++ new/yast2-gtk-2.16.2/src/ygtkfindentry.c 2008-01-27 21:04:06.000000000 +0100
@@ -28,7 +28,6 @@
{
if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget)) {
GTK_WIDGET_CLASS (ygtk_ext_entry_parent_class)->map (widget);
-
YGtkExtEntry *entry = YGTK_EXT_ENTRY (widget);
if (entry->left_window)
gdk_window_show (entry->left_window);
@@ -167,11 +166,13 @@
{
GTK_WIDGET_CLASS (ygtk_ext_entry_parent_class)->size_request (widget, req);
+#if 0
YGtkExtEntry *entry = YGTK_EXT_ENTRY (widget);
req->width += ygtk_ext_entry_get_border_window_size (entry,
YGTK_EXT_ENTRY_LEFT_WIN);
req->width += ygtk_ext_entry_get_border_window_size (entry,
YGTK_EXT_ENTRY_RIGHT_WIN);
+#endif
}
static void ygtk_ext_entry_size_allocate (GtkWidget *widget,
@@ -452,16 +453,26 @@
return TRUE;
}
+static gboolean ygtk_find_entry_is_empty (YGtkFindEntry *entry)
+{
+ return *gtk_entry_get_text (GTK_ENTRY (entry)) == '\0';
+}
+
static void ygtk_find_entry_insert_text (GtkEditable *editable,
const gchar *new_text, gint new_text_len, gint *pos)
{
+ YGtkFindEntry *fentry = YGTK_FIND_ENTRY (editable);
+ gboolean empty = ygtk_find_entry_is_empty (fentry);
+
GtkEditableClass *parent_editable_iface = g_type_interface_peek
(ygtk_find_entry_parent_class, GTK_TYPE_EDITABLE);
parent_editable_iface->insert_text (editable, new_text, new_text_len, pos);
- GdkWindow *clear_win = YGTK_EXT_ENTRY (editable)->right_window;
- if (clear_win)
+ GdkWindow *clear_win = YGTK_EXT_ENTRY (fentry)->right_window;
+ if (empty && clear_win) {
gdk_window_show (clear_win);
+ gtk_widget_queue_resize (GTK_WIDGET (editable));
+ }
}
static void ygtk_find_entry_delete_text (GtkEditable *editable, gint start_pos,
@@ -471,9 +482,13 @@
(ygtk_find_entry_parent_class, GTK_TYPE_EDITABLE);
parent_editable_iface->delete_text (editable, start_pos, end_pos);
- GdkWindow *clear_win = YGTK_EXT_ENTRY (editable)->right_window;
- if (clear_win)
+ YGtkFindEntry *fentry = YGTK_FIND_ENTRY (editable);
+ gboolean empty = ygtk_find_entry_is_empty (fentry);
+ GdkWindow *clear_win = YGTK_EXT_ENTRY (fentry)->right_window;
+ if (empty && clear_win) {
gdk_window_hide (clear_win);
+ gtk_widget_queue_resize (GTK_WIDGET (editable));
+ }
}
void ygtk_find_entry_attach_menu (YGtkFindEntry *entry, GtkMenu *menu)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGUI.cc new/yast2-gtk-2.16.2/src/YGUI.cc
--- old/yast2-gtk-2.16.1/src/YGUI.cc 2008-01-16 14:36:27.000000000 +0100
+++ new/yast2-gtk-2.16.2/src/YGUI.cc 2008-01-31 20:06:29.000000000 +0100
@@ -297,13 +297,16 @@
dialog->normalCursor();
}
-YCPValue YGUI::runPkgSelection (YWidget *packageSelector)
+YEvent* YGUI::runPkgSelection (YWidget *packageSelector)
{
y2milestone( "Running package selection..." );
- YCPValue input = YCPVoid();
+ YEvent *event = 0;
try {
- input = evaluateUserInput();
+ do
+ {
+ event = filterInvalidEvents( userInput(0) );
+ } while ( ! event );
} catch (const std::exception &e) {
y2error ("UI::RunPkgSelection() error: %s", e.what());
y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
@@ -312,8 +315,8 @@
y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
}
- y2milestone ("Package selection done - returning %s", input->toString().c_str());
- return input;
+ // y2milestone ("Package selection done - returning %s", input->toString().c_str());
+ return event;
}
void YGUI::makeScreenShot (string filename)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGUI.h new/yast2-gtk-2.16.2/src/YGUI.h
--- old/yast2-gtk-2.16.1/src/YGUI.h 2008-01-16 14:36:27.000000000 +0100
+++ new/yast2-gtk-2.16.2/src/YGUI.h 2008-01-31 20:03:38.000000000 +0100
@@ -85,7 +85,7 @@
virtual void makeScreenShot (string filename);
virtual void beep();
- virtual YCPValue runPkgSelection (YWidget *packageSelector);
+ virtual YEvent * runPkgSelection (YWidget *packageSelector);
void toggleRecordMacro();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGUtils.cc new/yast2-gtk-2.16.2/src/YGUtils.cc
--- old/yast2-gtk-2.16.1/src/YGUtils.cc 2008-01-16 14:36:27.000000000 +0100
+++ new/yast2-gtk-2.16.2/src/YGUtils.cc 2008-01-27 21:04:06.000000000 +0100
@@ -438,6 +438,7 @@
{"Abort", GTK_STOCK_CANCEL },
{"Accept", GTK_STOCK_APPLY },
{"Add", GTK_STOCK_ADD },
+ {"Apply", GTK_STOCK_APPLY },
{"Back", GTK_STOCK_GO_BACK },
{"Cancel", GTK_STOCK_CANCEL },
{"Configure", GTK_STOCK_PREFERENCES },
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/VERSION new/yast2-gtk-2.16.2/VERSION
--- old/yast2-gtk-2.16.1/VERSION 2008-01-16 14:36:51.000000000 +0100
+++ new/yast2-gtk-2.16.2/VERSION 2008-01-31 20:12:09.000000000 +0100
@@ -1 +1 @@
-2.16.1
+2.16.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org