Hello community, here is the log from the commit of package libyui-gtk for openSUSE:Factory checked in at 2013-07-07 22:19:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-gtk (Old) and /work/SRC/openSUSE:Factory/.libyui-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-gtk" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-gtk/libyui-gtk.changes 2013-05-27 09:53:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-gtk.new/libyui-gtk.changes 2013-07-07 22:19:28.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jul 4 17:39:43 CEST 2013 - [email protected] + +- fixed misplaced countries in map (in time zone selection) (bnc #775672) +- Version 2.43.6 + +------------------------------------------------------------------- +Wed Jul 3 12:35:43 CEST 2013 - [email protected] + +- fixed deprecated GtkVBox +- Version 2.43.5 + +------------------------------------------------------------------- Old: ---- libyui-gtk-2.43.4.tar.bz2 New: ---- libyui-gtk-2.43.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-gtk-doc.spec ++++++ --- /var/tmp/diff_new_pack.glry3C/_old 2013-07-07 22:19:28.000000000 +0200 +++ /var/tmp/diff_new_pack.glry3C/_new 2013-07-07 22:19:28.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libyui-gtk (Version 2.43.4) +# spec file for package libyui-gtk-doc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libyui-gtk-doc -Version: 2.43.4 +Version: 2.43.6 Release: 0 -License: LGPL-2.1 or LGPL-3.0 Source: libyui-gtk-%{version}.tar.bz2 -Group: Documentation/HTML BuildArch: noarch +BuildRequires: cmake >= 2.8 BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: graphviz-gnome -BuildRequires: texlive-latex -BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ +BuildRequires: graphviz-gnome BuildRequires: libyui-devel >= 3.0.4 +BuildRequires: texlive-latex - -URL: http://github.com/libyui/ +Url: http://github.com/libyui/ Summary: Libyui-gtk documentation +License: LGPL-2.1 or LGPL-3.0 +Group: Documentation/HTML %description This package contains the Gtk user interface @@ -46,10 +46,8 @@ %prep - %setup -n libyui-gtk-%{version} - %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -65,18 +63,15 @@ make %{?jobs:-j%jobs} docs - %install cd build make install DESTDIR="$RPM_BUILD_ROOT" %fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui-gtk5 - %clean rm -rf "$RPM_BUILD_ROOT" - %files %defattr(-,root,root) %doc %{_docdir}/libyui-gtk5 ++++++ libyui-gtk.spec ++++++ --- /var/tmp/diff_new_pack.glry3C/_old 2013-07-07 22:19:28.000000000 +0200 +++ /var/tmp/diff_new_pack.glry3C/_new 2013-07-07 22:19:28.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libyui-gtk (Version 2.43.4) +# spec file for package libyui-gtk # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,29 +11,28 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + Name: libyui-gtk -Version: 2.43.4 +Version: 2.43.6 Release: 0 -License: LGPL-2.1 or LGPL-3.0 Source: libyui-gtk-%{version}.tar.bz2 -Group: System/Libraries BuildRequires: boost-devel BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ -BuildRequires: pkg-config -BuildRequires: libyui-devel >= 3.0.4 BuildRequires: gtk3-devel +BuildRequires: libyui-devel >= 3.0.4 +BuildRequires: pkg-config Provides: yui_backend - -URL: http://github.com/libyui/ +Url: http://github.com/libyui/ Summary: Libyui - Gtk User Interface +License: LGPL-2.1 or LGPL-3.0 +Group: System/Libraries %description This package contains the Gtk user interface @@ -42,15 +41,14 @@ %package -n libyui-gtk5 -Group: System/Libraries - Requires: libyui5 Provides: libyui-gtk = %{version} Provides: yast2-gtk = %{version} Obsoletes: yast2-gtk < %{version} -URL: http://github.com/libyui/ +Url: http://github.com/libyui/ Summary: Libyui - Gtk User Interface +Group: System/Libraries %description -n libyui-gtk5 This package contains the Gtk user interface @@ -60,15 +58,14 @@ %package devel -Group: Development/Languages/C and C++ - -Requires: libyui-gtk5 = %{version} +Requires: boost-devel Requires: glibc-devel Requires: libstdc++-devel -Requires: boost-devel +Requires: libyui-gtk5 = %{version} -URL: http://github.com/libyui/ +Url: http://github.com/libyui/ Summary: Libyui-gtk header files +Group: Development/Languages/C and C++ %description devel This package contains the Gtk user interface @@ -82,7 +79,6 @@ %prep %setup -q -n libyui-gtk-%{version} - %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -109,7 +105,6 @@ make %{?jobs:-j%jobs} - %install cd build make install DESTDIR="$RPM_BUILD_ROOT" ++++++ libyui-gtk-2.43.4.tar.bz2 -> libyui-gtk-2.43.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/ChangeLog new/libyui-gtk-2.43.6/ChangeLog --- old/libyui-gtk-2.43.4/ChangeLog 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/ChangeLog 2013-07-05 10:16:48.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Jul 4 17:39:43 CEST 2013 - [email protected] + +- fixed misplaced countries in map (in time zone selection) (bnc #775672) +- Version 2.43.6 + +------------------------------------------------------------------- +Wed Jul 3 12:35:43 CEST 2013 - [email protected] + +- fixed deprecated GtkVBox +- Version 2.43.5 + +------------------------------------------------------------------- Thu May 16 13:40:00 UTC 2013 - [email protected] - fixed contradiction between README and COPYING* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/VERSION.cmake new/libyui-gtk-2.43.6/VERSION.cmake --- old/libyui-gtk-2.43.4/VERSION.cmake 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/VERSION.cmake 2013-07-05 10:16:48.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "43" ) -SET( VERSION_PATCH "4" ) +SET( VERSION_PATCH "6" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SHA1}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/YGBarGraph.cc new/libyui-gtk-2.43.6/src/YGBarGraph.cc --- old/libyui-gtk-2.43.4/src/YGBarGraph.cc 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/YGBarGraph.cc 2013-07-05 10:16:48.000000000 +0200 @@ -8,6 +8,8 @@ #include "ygtkbargraph.h" #include "YBarGraph.h" +#include "YGMacros.h" + class YGBarGraph : public YBarGraph, public YGWidget { @@ -70,7 +72,7 @@ const std::string &newPartLabel, const std::string &freeFieldLabel, const std::string &newPartFieldLabel) : YPartitionSplitter (NULL, usedSize, totalFreeSize, newPartSize, minNewPartSize, minFreeSize, usedLabel, freeLabel, newPartLabel, freeFieldLabel, newPartFieldLabel) - , YGWidget (this, parent, GTK_TYPE_VBOX, NULL) + , YGWidget (this, parent, YGTK_VBOX_NEW(0), NULL) { /* Bar graph widget */ GtkWidget *graph = ygtk_bar_graph_new(); @@ -79,7 +81,7 @@ ygtk_bar_graph_setup_entry (m_barGraph, 0, usedLabel.c_str(), usedSize); /* Labels over the slider */ - GtkWidget *labels_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + GtkWidget *labels_box = YGTK_HBOX_NEW(0); gtk_box_set_homogeneous (GTK_BOX (labels_box), FALSE); gtk_box_pack_start (GTK_BOX (labels_box), gtk_label_new (freeFieldLabel.c_str()), FALSE, TRUE, 0); @@ -88,7 +90,7 @@ gtk_label_new (newPartFieldLabel.c_str()), FALSE, TRUE, 0); /* Slider and the spinners */ - GtkWidget *slider_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + GtkWidget *slider_box = YGTK_HBOX_NEW(0); gtk_box_set_homogeneous (GTK_BOX (slider_box), FALSE); m_scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) minFreeSize, maxFreeSize(), 1); gtk_scale_set_draw_value (GTK_SCALE (m_scale), FALSE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/YGDialog.cc new/libyui-gtk-2.43.6/src/YGDialog.cc --- old/libyui-gtk-2.43.4/src/YGDialog.cc 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/YGDialog.cc 2013-07-05 10:16:48.000000000 +0200 @@ -12,6 +12,8 @@ #include <math.h> // easter #include <string.h> #include "ygtkwindow.h" +#include "YGMacros.h" + /* In the main dialog case, it doesn't necessarly have a window of its own. If there is already a main window, it should replace its content -- and when closed, @@ -295,7 +297,7 @@ YGDialog::YGDialog (YDialogType dialogType, YDialogColorMode colorMode) : YDialog (dialogType, colorMode), - YGWidget (this, NULL, GTK_TYPE_HBOX, NULL) + YGWidget (this, NULL, YGTK_HBOX_NEW(0), NULL) { setBorder (0); m_stickyTitle = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/YGDumbTab.cc new/libyui-gtk-2.43.6/src/YGDumbTab.cc --- old/libyui-gtk-2.43.4/src/YGDumbTab.cc 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/YGDumbTab.cc 2013-07-05 10:16:48.000000000 +0200 @@ -10,6 +10,7 @@ #include "YDumbTab.h" #include <gtk/gtk.h> #include "ygtkratiobox.h" +#include "YGMacros.h" class YGDumbTab : public YDumbTab, public YGWidget { @@ -59,7 +60,7 @@ } } if (image) { - tab_label = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + tab_label = YGTK_HBOX_NEW(6); gtk_box_set_homogeneous (GTK_BOX (tab_label), FALSE); gtk_box_pack_start (GTK_BOX (tab_label), image, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (tab_label), label, TRUE, TRUE, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/YGIntField.cc new/libyui-gtk-2.43.6/src/YGIntField.cc --- old/libyui-gtk-2.43.4/src/YGIntField.cc 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/YGIntField.cc 2013-07-05 10:16:48.000000000 +0200 @@ -6,6 +6,7 @@ #include "YGUI.h" #include "YGUtils.h" #include "YGWidget.h" +#include "YGMacros.h" class YGSpinBox : public YGLabeledWidget { @@ -16,7 +17,7 @@ YGSpinBox (YWidget *ywidget, YWidget *parent, const std::string &label, int minValue, int maxValue, int initialValue, bool show_slider) : YGLabeledWidget (ywidget, parent, label, YD_HORIZ, - GTK_TYPE_HBOX, "spacing", 6, NULL) + YGTK_HBOX_NEW(6), "spacing", 6, NULL) { m_spiner = gtk_spin_button_new_with_range (minValue, maxValue, 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/YGMacros.h new/libyui-gtk-2.43.6/src/YGMacros.h --- old/libyui-gtk-2.43.4/src/YGMacros.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-gtk-2.43.6/src/YGMacros.h 2013-07-05 10:16:48.000000000 +0200 @@ -0,0 +1,8 @@ +#ifndef YGMacros_h +#define YGMacros_h + +#define YGTK_VBOX_NEW(arg) gtk_box_new(GTK_ORIENTATION_VERTICAL,arg) +#define YGTK_HBOX_NEW(arg) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,arg) + +#endif /*YGMacros*/ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/YGTreeView.cc new/libyui-gtk-2.43.6/src/YGTreeView.cc --- old/libyui-gtk-2.43.4/src/YGTreeView.cc 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/YGTreeView.cc 2013-07-05 10:16:48.000000000 +0200 @@ -14,6 +14,7 @@ #include "YSelectionWidget.h" #include "YGSelectionStore.h" #include "ygtktreeview.h" +#include "YGMacros.h" #include <string.h> /* A generic widget for table related widgets. */ @@ -112,7 +113,7 @@ bool mainWidget = !yparent || !strcmp (yparent->widgetClass(), "YVBox") || !strcmp (yparent->widgetClass(), "YReplacePoint"); if (mainWidget) { m_count = gtk_label_new ("0"); - GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); + GtkWidget *hbox = YGTK_HBOX_NEW(4); gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); GtkWidget *label = gtk_label_new (_("Total selected:")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/YGUI.cc new/libyui-gtk-2.43.6/src/YGUI.cc --- old/libyui-gtk-2.43.4/src/YGUI.cc 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/YGUI.cc 2013-07-05 10:16:48.000000000 +0200 @@ -94,8 +94,8 @@ // can just keep lying around for ever, and use later, so we have to // intern the domain - that can be allocated (or belong to a transient // plugin's address space). - const char *component = domain ? g_intern_string (domain) : "yast2-gtk"; - YUILog::instance()->log (ylevel, component, "yast2-gtk", 0, "") << message << std::endl; + const char *component = domain ? g_intern_string (domain) : "libyui-gtk"; + YUILog::instance()->log (ylevel, component, "libyui-gtk", 0, "") << message << std::endl; #if 0 // uncomment to put a stop to gdb static int bugStop = 0; if (bugStop-- <= 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/YGUI.h new/libyui-gtk-2.43.6/src/YGUI.h --- old/libyui-gtk-2.43.4/src/YGUI.h 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/YGUI.h 2013-07-05 10:16:48.000000000 +0200 @@ -13,6 +13,7 @@ #include <map> #include <gtk/gtk.h> + /* Comment the following line to disable debug messages */ #define RET(a) { return (a); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/YGWidget.cc new/libyui-gtk-2.43.6/src/YGWidget.cc --- old/libyui-gtk-2.43.4/src/YGWidget.cc 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/YGWidget.cc 2013-07-05 10:16:48.000000000 +0200 @@ -8,6 +8,7 @@ #include "YGWidget.h" #include "YGUtils.h" #include "ygtkratiobox.h" +#include "YGMacros.h" // default widgets border -- may be overlapped with a setBorder(..) #define DEFAULT_BORDER 6 @@ -59,24 +60,33 @@ { va_list args; va_start (args, property_name); - construct (ywidget, yparent, type, property_name, args); + GtkWidget* gtkwidget = GTK_WIDGET (g_object_new_valist (type, property_name, args)); + construct (ywidget, yparent, gtkwidget, property_name, args); va_end (args); } + +YGWidget::YGWidget(YWidget *ywidget, YWidget *yparent, + GtkWidget *gtkwidget, const char *property_name, ...) + : m_ywidget (ywidget) +{ + va_list args; + va_start (args, property_name); + construct (ywidget, yparent, gtkwidget, property_name, args); + va_end (args); +} + + void YGWidget::construct (YWidget *ywidget, YWidget *yparent, - GType type, const char *property_name, va_list args) + GtkWidget *gtkwidget, const char *property_name, va_list args) { - m_widget = GTK_WIDGET (g_object_new_valist (type, property_name, args)); + m_widget = gtkwidget; - if (type == GTK_TYPE_WINDOW || type == GTK_TYPE_MENU) - m_adj_size = m_widget; - else { - m_adj_size = ygtk_adj_size_new(); - g_object_ref_sink (G_OBJECT (m_adj_size)); - gtk_widget_show (m_adj_size); - gtk_container_add (GTK_CONTAINER (m_adj_size), m_widget); - ygtk_adj_size_set_min_cb (YGTK_ADJ_SIZE (m_adj_size), min_size_cb, this); - } + m_adj_size = ygtk_adj_size_new(); + g_object_ref_sink (G_OBJECT (m_adj_size)); + gtk_widget_show (m_adj_size); + gtk_container_add (GTK_CONTAINER (m_adj_size), m_widget); + ygtk_adj_size_set_min_cb (YGTK_ADJ_SIZE (m_adj_size), min_size_cb, this); gtk_widget_show (m_widget); // Split by two so that with another widget it will have full border... @@ -224,10 +234,40 @@ YGLabeledWidget::YGLabeledWidget (YWidget *ywidget, YWidget *parent, const std::string &label_text, YUIDimension label_ori, + GtkWidget *gtkwidget, const char *property_name, ...) + : YGWidget (ywidget, parent, + gtkwidget, "spacing", LABEL_WIDGET_SPACING, NULL) + +{ + // Create the field widget + va_list args; + va_start (args, property_name); + m_field = gtkwidget; + va_end (args); + + // Create the label + m_label = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (m_label), 0.0, 0.5); +/* if (label_ori == YD_HORIZ) + gtk_label_set_line_wrap (GTK_LABEL (m_label), TRUE);*/ + gtk_widget_show (m_label); + gtk_widget_show (m_field); + + setBuddy (m_field); + doSetLabel (label_text); + + // Set the container and show widgets + gtk_box_pack_start (GTK_BOX (m_widget), m_label, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_widget), m_field, TRUE, TRUE, 0); + m_orientation = label_ori; + +} + +YGLabeledWidget::YGLabeledWidget (YWidget *ywidget, YWidget *parent, + const std::string &label_text, YUIDimension label_ori, GType type, const char *property_name, ...) : YGWidget (ywidget, parent, -// label_ori == YD_VERT ? GTK_TYPE_VBOX : GTK_TYPE_HBOX, - GTK_TYPE_VBOX, "spacing", LABEL_WIDGET_SPACING, NULL) + YGTK_VBOX_NEW(0), "spacing", LABEL_WIDGET_SPACING, NULL) { // Create the field widget va_list args; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/YGWidget.h new/libyui-gtk-2.43.6/src/YGWidget.h --- old/libyui-gtk-2.43.4/src/YGWidget.h 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/YGWidget.h 2013-07-05 10:16:48.000000000 +0200 @@ -15,6 +15,10 @@ public: YGWidget (YWidget *ywidget, YWidget *yparent, GType type, const char *property_name, ...); + + YGWidget (YWidget *ywidget, YWidget *yparent, + GtkWidget *gtkwidget, const char *property_name, ...); + virtual ~YGWidget(); // get the YGWidget associated with a YWidget @@ -61,7 +65,8 @@ Signals *m_signals; void construct (YWidget *ywidget, YWidget *yparent, - GType type, const char *property_name, va_list args); + GtkWidget *gtkwidget, const char *property_name, va_list args); + // data GtkWidget *m_widget, *m_adj_size; // associated GtkWidget, and adjustment for borders @@ -120,6 +125,9 @@ YGLabeledWidget(YWidget *ywidget, YWidget *yparent, const std::string &label_text, YUIDimension label_ori, GType type, const char *property_name, ...); + YGLabeledWidget(YWidget *ywidget, YWidget *yparent, + const std::string &label_text, YUIDimension label_ori, + GtkWidget *gtkwidget, const char *property_name, ...); virtual ~YGLabeledWidget () {} virtual inline GtkWidget* getWidget() { return m_field; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/ygtkfieldentry.c new/libyui-gtk-2.43.6/src/ygtkfieldentry.c --- old/libyui-gtk-2.43.4/src/ygtkfieldentry.c 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/ygtkfieldentry.c 2013-07-05 10:16:48.000000000 +0200 @@ -15,7 +15,7 @@ //** YGtkFieldEntry -G_DEFINE_TYPE (YGtkFieldEntry, ygtk_field_entry, GTK_TYPE_HBOX) +G_DEFINE_TYPE (YGtkFieldEntry, ygtk_field_entry, GTK_TYPE_BOX) static void ygtk_field_entry_init (YGtkFieldEntry *entry) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/ygtkmenubutton.c new/libyui-gtk-2.43.6/src/ygtkmenubutton.c --- old/libyui-gtk-2.43.4/src/ygtkmenubutton.c 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/ygtkmenubutton.c 2013-07-05 10:16:48.000000000 +0200 @@ -9,6 +9,7 @@ #include "ygtkmenubutton.h" #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> +#include "YGMacros.h" //** YGtkPopupWindow @@ -242,7 +243,7 @@ { if (!button->label) { GtkWidget *hbox, *arrow; - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); + hbox = YGTK_HBOX_NEW(4); gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN); button->label = gtk_label_new (""); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/ygtksteps.c new/libyui-gtk-2.43.6/src/ygtksteps.c --- old/libyui-gtk-2.43.4/src/ygtksteps.c 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/ygtksteps.c 2013-07-05 10:16:48.000000000 +0200 @@ -19,11 +19,12 @@ #define CURRENT_MARK_ANIMATION_OFFSET 3 #define CURRENT_MARK_FRAMES_NB (CURRENT_MARK_ANIMATION_OFFSET*2) -G_DEFINE_TYPE (YGtkSteps, ygtk_steps, GTK_TYPE_VBOX) +G_DEFINE_TYPE (YGtkSteps, ygtk_steps, GTK_TYPE_BOX) static void ygtk_steps_init (YGtkSteps *steps) { gtk_box_set_spacing (GTK_BOX (steps), 8); + gtk_orientable_set_orientation (GTK_ORIENTABLE (steps), GTK_ORIENTATION_VERTICAL); gtk_container_set_border_width (GTK_CONTAINER (steps), 4); const gchar *check = "\u2714", *current = "\u25b6", *todo = "\u26ab"; @@ -137,8 +138,8 @@ gint ygtk_steps_append (YGtkSteps *steps, const gchar *text) { GtkWidget *label = gtk_label_new (text); - GdkColor black = { 0, 0, 0, 0 }; - gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &black); + GdkRGBA black = { 0.0, 0.0, 0.0, 1.0 }; + gtk_widget_override_color (label, GTK_STATE_NORMAL, &black); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); int mark_width = 10; pango_layout_get_pixel_size (steps->check_mark_layout, &mark_width, NULL); @@ -151,8 +152,8 @@ void ygtk_steps_append_heading (YGtkSteps *steps, const gchar *heading) { GtkWidget *label = gtk_label_new (heading); - GdkColor black = { 0, 0, 0, 0 }; - gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &black); + GdkRGBA black = { 0.0, 0.0, 0.0, 1.0 }; + gtk_widget_override_color (label, GTK_STATE_NORMAL, &black); g_object_set_data (G_OBJECT (label), "is-header", GINT_TO_POINTER (1)); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/ygtktimezonepicker.c new/libyui-gtk-2.43.6/src/ygtktimezonepicker.c --- old/libyui-gtk-2.43.4/src/ygtktimezonepicker.c 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/ygtktimezonepicker.c 2013-07-05 10:16:48.000000000 +0200 @@ -426,10 +426,11 @@ YGtkTimeZonePicker *picker = YGTK_TIME_ZONE_PICKER (widget); int win_width = allocation->width, win_height = allocation->height; + if (picker->closeup) picker->scale = 1; else { - picker->scale = MIN ((double) win_width / picker->map_width, + picker->scale = MAX ((double) win_width / picker->map_width, (double) win_height / picker->map_height); picker->hover_loc = NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.4/src/ygtkwizard.c new/libyui-gtk-2.43.6/src/ygtkwizard.c --- old/libyui-gtk-2.43.4/src/ygtkwizard.c 2013-05-17 11:57:30.000000000 +0200 +++ new/libyui-gtk-2.43.6/src/ygtkwizard.c 2013-07-05 10:16:48.000000000 +0200 @@ -20,6 +20,8 @@ #include "ygtklinklabel.h" #define YGI18N_C #include "YGi18n.h" +#include "YGMacros.h" + // YGUtils bridge extern char *ygutils_mapKBAccel (const char *src); @@ -46,10 +48,10 @@ static void search_entry_changed_cb (GtkEditable *editable, YGtkHelpDialog *dialog) { - static GdkColor red = { 0, 255 << 8, 102 << 8, 102 << 8 }; - static GdkColor white = { 0, 0xffff, 0xffff, 0xffff }; - static GdkColor yellow = { 0, 0xf7f7, 0xf7f7, 0xbdbd }; - static GdkColor black = { 0, 0, 0, 0 }; + static GdkRGBA red = { 1.0, 0.4, 0.4, 1.0 }; + static GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 }; + static GdkRGBA yellow = { 0.9686, 0.9686, 0.7411 }; + static GdkRGBA black = { 0.0, 0.0, 0.0, 1.0 }; GtkWidget *widget = GTK_WIDGET (editable); GtkEntry *entry = GTK_ENTRY (editable); @@ -57,16 +59,16 @@ gboolean found = ygtk_html_wrap_search (dialog->help_text, text); if (found && *text) { - gtk_widget_modify_base (widget, GTK_STATE_NORMAL, &yellow); - gtk_widget_modify_text (widget, GTK_STATE_NORMAL, &black); + gtk_widget_override_background_color (widget, GTK_STATE_NORMAL, &yellow); + gtk_widget_override_color (widget, GTK_STATE_NORMAL, &black); } else if (found) { // revert - gtk_widget_modify_base (widget, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_text (widget, GTK_STATE_NORMAL, NULL); + gtk_widget_override_background_color (widget, GTK_STATE_NORMAL, NULL); + gtk_widget_override_color (widget, GTK_STATE_NORMAL, NULL); } else { - gtk_widget_modify_base (widget, GTK_STATE_NORMAL, &red); - gtk_widget_modify_text (widget, GTK_STATE_NORMAL, &white); + gtk_widget_override_background_color (widget, GTK_STATE_NORMAL, &red); + gtk_widget_override_color (widget, GTK_STATE_NORMAL, &white); gtk_widget_error_bell (widget); } @@ -103,8 +105,8 @@ gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_title (GTK_WINDOW (dialog), _("Help")); - GdkPixbuf *icon = gtk_widget_render_icon ( - GTK_WIDGET (dialog), GTK_STOCK_HELP, GTK_ICON_SIZE_MENU, NULL); + GdkPixbuf *icon = gtk_widget_render_icon_pixbuf ( + GTK_WIDGET (dialog), GTK_STOCK_HELP, GTK_ICON_SIZE_MENU); gtk_window_set_icon (GTK_WINDOW (dialog), icon); g_object_unref (G_OBJECT (icon)); gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 450); @@ -160,7 +162,7 @@ gtk_misc_set_alignment (GTK_MISC (label), 0, .5); gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->search_entry); - bottom_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); + bottom_box = YGTK_HBOX_NEW(2); gtk_box_set_homogeneous (GTK_BOX (bottom_box), FALSE); gtk_box_pack_start (GTK_BOX (bottom_box), label, FALSE, FALSE, 0); @@ -175,11 +177,11 @@ #endif // glue it - dialog->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); + dialog->vbox = YGTK_VBOX_NEW(6); gtk_box_set_homogeneous (GTK_BOX (dialog->vbox), FALSE); #ifdef SET_HELP_HISTORY - GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + GtkWidget *hbox = YGTK_HBOX_NEW(6); gtk_box_set_homogeneous (GTK_BOX (bottom_box), FALSE); gtk_box_pack_start (GTK_BOX (hbox), gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON), FALSE, TRUE, 0); @@ -430,38 +432,38 @@ static void ygtk_wizard_header_init (YGtkWizardHeader *header) { - GdkColor white = { 0, 0xffff, 0xffff, 0xffff }; - gtk_widget_modify_bg (GTK_WIDGET (header), GTK_STATE_NORMAL, &white); + GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 }; + gtk_widget_override_background_color (GTK_WIDGET (header), GTK_STATE_NORMAL, &white); header->title = gtk_label_new (""); gtk_label_set_ellipsize (GTK_LABEL (header->title), PANGO_ELLIPSIZE_END); gtk_misc_set_alignment (GTK_MISC (header->title), 0, 0.5); ygutils_setWidgetFont (header->title, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_X_LARGE); - GdkColor black = { 0, 0, 0, 0 }; // set text to black cause of some style colors - gtk_widget_modify_fg (header->title, GTK_STATE_NORMAL, &black); + GdkRGBA black = { 0.0, 0.0, 0.0, 1.0 }; + gtk_widget_override_color (header->title, GTK_STATE_NORMAL, &black); header->description = ygtk_link_label_new ("", _("more")); g_signal_connect (G_OBJECT (header->description), "link-clicked", G_CALLBACK (description_link_clicked_cb), header); - gtk_widget_modify_fg (header->description, GTK_STATE_NORMAL, &black); + gtk_widget_override_color (header->description, GTK_STATE_NORMAL, &black); header->icon = gtk_image_new(); - GtkWidget *text_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + GtkWidget *text_box = YGTK_VBOX_NEW(0); gtk_box_set_homogeneous (GTK_BOX (text_box), FALSE); gtk_box_pack_start (GTK_BOX (text_box), header->title, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (text_box), header->description, FALSE, TRUE, 0); - GtkWidget *title_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); + GtkWidget *title_box = YGTK_HBOX_NEW(10); gtk_box_set_homogeneous (GTK_BOX (title_box), FALSE); gtk_box_pack_start (GTK_BOX (title_box), header->icon, FALSE, TRUE, 4); gtk_box_pack_start (GTK_BOX (title_box), text_box, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (title_box), 6); - GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + GtkWidget *box = YGTK_VBOX_NEW(0); gtk_box_set_homogeneous (GTK_BOX (box), FALSE); gtk_box_pack_start (GTK_BOX (box), title_box, TRUE, TRUE, 0); @@ -678,7 +680,7 @@ gtk_size_group_set_mode (group, new_mode); } -G_DEFINE_TYPE (YGtkWizard, ygtk_wizard, GTK_TYPE_VBOX) +G_DEFINE_TYPE (YGtkWizard, ygtk_wizard, GTK_TYPE_BOX) static void ygtk_wizard_init (YGtkWizard *wizard) { @@ -689,6 +691,8 @@ wizard->steps_ids = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + gtk_orientable_set_orientation (GTK_ORIENTABLE (wizard), GTK_ORIENTATION_VERTICAL); + //** Title wizard->m_title = ygtk_wizard_header_new(); g_signal_connect (G_OBJECT (wizard->m_title), "more-clicked", @@ -740,7 +744,7 @@ wizard->m_pane = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); gtk_widget_show (wizard->m_pane); - wizard->m_contents_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + wizard->m_contents_box = YGTK_HBOX_NEW(6); gtk_box_set_homogeneous (GTK_BOX (wizard->m_contents_box), FALSE); gtk_box_pack_start (GTK_BOX (wizard->m_contents_box), wizard->m_info_box, FALSE, TRUE, 0); @@ -748,7 +752,7 @@ gtk_widget_show (wizard->m_contents_box); GtkWidget *vbox; - vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); + vbox = YGTK_VBOX_NEW(12); gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); // content's border @@ -765,6 +769,7 @@ gtk_box_pack_start (GTK_BOX (wizard), wizard->m_title, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (wizard), vbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (wizard), wizard->m_status_box, FALSE, TRUE, 0); + } static void ygtk_wizard_realize (GtkWidget *widget) @@ -843,7 +848,7 @@ void ygtk_wizard_set_information_widget (YGtkWizard *wizard, GtkWidget *widget) { - GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); + GtkWidget *hbox = YGTK_HBOX_NEW(2); gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); GtkWidget *sep = gtk_separator_new(GTK_ORIENTATION_VERTICAL); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
