GNOME.org
 

[glade3] Merge branch 'master' into project-tree-model

commit 125a84002d51788b70eb1b904b4a9e2f1b94033e
Author: Tristan Van Berkom <tvb gnome org>
Date:   Fri May 14 16:31:03 2010 -0400

    Merge branch 'master' into project-tree-model

 ChangeLog           |   24 +++++++++++++-----------
 NEWS                |   35 +++++++++++++++++++++++++++++++++++
 configure.ac        |    8 ++++----
 gladeui/Makefile.am |    2 +-
 4 files changed, 53 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 75a6cf8..322961e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-04-14  Tristan Van Berkom <tvb gnome org>
 
+	* configure.ac, NEWS: Rolling Glade 3.7.1
+
 	* gladeui/glade-widget.c: Added some clarification to the docs of glade_widget_get_children(),
 	  fixed glade_widget_get_children() to not call g_list_append() in a loop.
 
@@ -8,7 +10,7 @@
 	* gladeui/glade-app.c: Allow destruction/recreation of the GladeApp object
 
 	* gladeui/glade-signal-editor.[ch]: Some refactoring to make the signal editor
-	  object itself a dockable widget and remove some cruft api.
+	  object itself a dockable widget and remove some cruft api (bug 618020)
 
 	* gladeui/glade-project.[ch]: Implement GtkTreeModel
 
@@ -41,7 +43,7 @@
 	* src/Makefile.am, src/glade-close-button.[ch]: Using Paolo Borelli's close button code for notebook
 	  tab close buttons.
 
-	* src/glade-window.c: 
+	* src/glade-window.c:
 	  - Added option to disable toolbar in View menu and session data (bug 586194).
 	  - Added option to show notebook tabs for open projects also in the View menu and session data.
 	  - Added option to show/hide statusbar in the View menu and session data.
@@ -49,7 +51,7 @@
 	* gladeui/glade-palette.c: Made "both" mode use text horizontally again, still get alot of unwanted 
 	  ellipsize here.
 
-	* gladeui/glade-project.c: Added the targets-changed signal to refresh views with data about 
+	* gladeui/glade-project.c: Added the targets-changed signal to refresh views with data about
 	  target project versions (notebook tabs).
 
 	* gladeui/glade-base-editor.c: Fixed to unref in ->dispose() and to unset the loaded widget
@@ -89,8 +91,8 @@
 	* gladeui/glade-widget-adaptor.h, gladeui/glade-property-class.h: Added some version checking macros.
 
 	* gladeui/glade-signal.[ch]: Add support warning meta data to signals
-	
-	* gladeui/glade-project.c: 
+
+	* gladeui/glade-project.c:
 	  - Simplify code with new version checking macros
 	  - Do the verify on signals for widgets as well as project warnings
 	    (update the signals a verify time).
@@ -144,8 +146,8 @@
 	to the project.
 
 	* gladeui/glade-xml-utils.h: Added "swapped" attribute definition
-	
-	* gladeui/glade-signal.c: Added "swapped" attribute and read/write from xml, swapped attribute is 
+
+	* gladeui/glade-signal.c: Added "swapped" attribute and read/write from xml, swapped attribute is
 	always saved, if its missing on load and user_data (object) is set, we assume a swapped default.
 
 	* gladeui/glade-signal-editor.c: Allow toggling "swapped" flag of a signal if user data is set.
@@ -154,7 +156,7 @@
 
 2010-03-27  Tristan Van Berkom <tvb gnome org>
 
-	* gladeui/glade-marshallers.list, gladeui/glade-placeholder.c: 
+	* gladeui/glade-marshallers.list, gladeui/glade-placeholder.c:
 	  Make GladePlaceholder a scrollable widget (hypothetically) to avoid runtime warnings.
 
 	* plugins/gtk+/gtk+.xml.in: Disabled "has-separator" of GtkMessageDialog as it ignores the separator
@@ -162,19 +164,19 @@
 
 	* gladeui/glade-project.[ch]: Expose glade_project_get_target_version()
 
-	* plugins/gtk+/glade-gtk.c: 
+	* plugins/gtk+/glade-gtk.c:
 	  - check project target gtk+ version to decide initial state
 	    of GtkEntry::buffer.
 	  - Substitute the old manual evaluation with GPC_VERSION_CHECK()
 	  - Avoid critical warnings when setting GtkColorButton properties to NULL
 	  - Avoid critical warnings when setting GtkComboBoxEntry::text-column < 0
-	  - Check for type compatibility before setting cell renderer attributes 
+	  - Check for type compatibility before setting cell renderer attributes
 	  - Clear cell renderer attributes before setting liststore column types and resync them after
 	    (Avoids cricital warnings where the underlying data types changed and dont match the properties
 	    of the renderers)
 	  - Fill in the gaps in model data while loading some columns with non serializable types
 	    (fixes severe bug: model data was loaded with missing columns of data).
-	
+
 	* gladeui/glade-property-class.h: Created convenience macro GPC_VERSION_CHECK
 
 	* gladeui/glade-utils.c: Allow loading of libraries installed in optional non-system prefixes;
diff --git a/NEWS b/NEWS
index f461571..933ba08 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,40 @@
 
 ===========
+Glade 3.7.1
+===========
+	- Changed "Close without saving" acelerator key from 'c' to 'w', (Aaron Brown, bug 612538)
+	- Save Glade files with UTF-8 encoding (Christian Persch, bug 596205)
+	- Save maximized window state of all windows in session data (Marco Diego Aurélio Mesquita, bug 607670)
+	- use g_timeout_add_seconds() (Javier Jardón, bug 581255)
+	- Fixed signal name serialization in GtkBuilder format to use '-' instead of '_' (bug 600031)
+	- Disable orientation properties completely and disregard them wherever they cause breakage
+	  (Federico Mena Quintero, bug 594231)
+	- Now print a summery of all missing icons at startup instead of a warning for each missing icon
+	- Fixed some remaining crashers introduced by recent GSEAL patches
+	- Integrated GtkToolPalette as the internal implementation of Glade's palette (bug 613956).
+	- Added tooltip to palette (bug 558983)
+	- Revamped internal treeview support, less warnings and better refresh of workspace when
+	  editing cell renderer attributes and liststores.
+	- Glade now loads/saves the "swapped" <signal> attribute.
+	- Signal editor revamped to now:
+	   o show documentation links
+	   o show warning icons for version mismatches
+	   o edit "swapped" attribute
+	   o edit the user-data object using an object selection dialog.
+	   o now the signal editor is a proper widget-class (Johannes Schmid, bug 618020)
+	- Disallow adding of non-scrollable widgets to scrolled windows (now an informative
+	  popup comes up instead).
+	- Fixed hangs in menu/treeview editors (Marco Diego Aurélio Mesquita, bug 609612)
+	- Changed the old glade-cell-renderer-button for a new activatable pixbuf renderer
+	  glade-cell-renderer-icon.[ch].
+	- Added support to add GtkActions to GtkActionGroups
+	- Added support to edit the <accelerator> for an action when in a group.
+	- Added notebook tabs to the Glade frontend with informative labels (per open project).
+	- Stop showing preferences dialog at startup time (bug 574095)
+	- GladeProject now implements GtkTreeModel and GladeInspector view saves lots of code (Johannes Schmid)
+	- Allow destruction of GladeApp object (Johannes Schmid, bug 618468).
+
+===========
 Glade 3.7.0
 ===========
 	- Fixed loading state of assigned GtkTreeModels of GtkCellRendererCombo objects (bug 566928).
diff --git a/configure.ac b/configure.ac
index 5ea0994..25c4f0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.52)
 
 m4_define(glade_major_version, 3)
 m4_define(glade_minor_version, 7)
-m4_define(glade_micro_version, 0)
+m4_define(glade_micro_version, 1)
 m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
 
 AC_INIT([glade3], [glade_version],
@@ -52,8 +52,8 @@ AM_PROG_LIBTOOL
 # If any interfaces have been added since the last public release, then increment GLADE_AGE.
 # If any interfaces have been removed since the last public release, then set GLADE_AGE to 0.
 # Reference: http://www.gnu.org/software/libtool/manual.html#Versioning
-GLADE_REVISION=3
-GLADE_CURRENT=9
+GLADE_REVISION=0
+GLADE_CURRENT=10
 GLADE_AGE=0
 GLADE_CURRENT_MINUS_AGE=`expr $GLADE_CURRENT - $GLADE_AGE`
 AC_SUBST(GLADE_REVISION)
@@ -121,7 +121,7 @@ GTK_DOC_CHECK(1.9)
 dnl ================================================================
 dnl Check for gtk+
 dnl ================================================================
-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.19.5 gthread-2.0 libxml-2.0 >= 2.4.0])
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.20 gthread-2.0 libxml-2.0 >= 2.4.0])
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index 3a33a48..490d835 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -115,7 +115,7 @@ libgladeuiinclude_HEADERS = \
 	glade-displayable-values.h \
 	glade-editable.h \
 	glade-editor-table.h \
-	glade-cell-renderer-icon.c
+	glade-cell-renderer-icon.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]