[Pkg-maemo-commits] r74 ./hildon-1/debian: * Merge with trunk branch
Jonny Lamb
jonnylamb at jonnylamb.com
Sun Jul 22 20:25:49 UTC 2007
------------------------------------------------------------
revno: 74
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-1
timestamp: Sun 2007-07-22 21:25:49 +0100
message:
* Merge with trunk branch
added:
examples/hildon-hvolumebar-insensitive-example.c
examples/hildon-hvolumebar-insensitive-map-example.c
modified:
ChangeLog
NEWS
configure.ac
debian/changelog
examples/Makefile.am
src/Makefile.am
src/hildon-bread-crumb-trail.c
src/hildon-caption.c
src/hildon-code-dialog.c
src/hildon-date-editor.c
src/hildon-helper.c
src/hildon-private.c
src/hildon-time-editor.c
src/hildon-time-picker.c
src/hildon-volumebar.c
src/hildon-volumebar.h
src/hildon-window.c
------------------------------------------------------------
revno: 30.1.29
merged: vcs-imports at canonical.com-20070608193429-55h3jfilefqdft8t
committer: tko
timestamp: Fri 2007-06-08 19:34:29 +0000
message:
Remove dysfunctional AC_ARG_ENABLE
2007-06-08 Tommi Komulainen <tommi.komulainen at nokia.com>
* configure.ac: Remove dysfunctional AC_ARG_ENABLE. Pointed out by
Loic Minier.
------------------------------------------------------------
revno: 30.1.30
merged: vcs-imports at canonical.com-20070612130858-dbrsqqcm7olfskj4
committer: xan
timestamp: Tue 2007-06-12 13:08:58 +0000
message:
2007-06-12 Xan Lopez <xan.lopez at nokia.com>
* src/hildon-seekbar.c: add gtkrange.h header
* src/hildon-caption.c: remove unused variable
------------------------------------------------------------
revno: 30.1.31
merged: vcs-imports at canonical.com-20070612131646-v5kzgrdems0vmjw1
committer: mdk
timestamp: Tue 2007-06-12 13:16:46 +0000
message:
Hide the window before performing the destroy. Should make the app closing a little tiny bit more snappy.
------------------------------------------------------------
revno: 30.1.32
merged: vcs-imports at canonical.com-20070612142519-cjear3c64wtyx8tz
committer: xan
timestamp: Tue 2007-06-12 14:25:19 +0000
message:
2007-06-12 Xan Lopez <xan.lopez at nokia.com>
* src/Makefile.am: remove circular dependency in hildon-enum-types.h creation
by splitting the installed headers in generated and non-generated groups. Use
only the non-generated headers to create the hildon-enum-types.h file.
* src/hildon-seekbar.h: gtkscale.h already includes gtkrange.h.
------------------------------------------------------------
revno: 30.1.33
merged: vcs-imports at canonical.com-20070612142616-n8nu5nokoa270p5i
committer: xan
timestamp: Tue 2007-06-12 14:26:16 +0000
message:
Remove empty line.
------------------------------------------------------------
revno: 30.1.34
merged: vcs-imports at canonical.com-20070613083612-h9m47ge2cmkbc7av
committer: mdk
timestamp: Wed 2007-06-13 08:36:12 +0000
message:
Removing the separator from the dialog.
------------------------------------------------------------
revno: 30.1.35
merged: vcs-imports at canonical.com-20070613114736-ar0y0wzcvtiof541
committer: xan
timestamp: Wed 2007-06-13 11:47:36 +0000
message:
2007-06-13 Xan Lopez <xan.lopez at nokia.com>
* src/hildon-bread-crumb-trail.c (hildon_bread_crumb_trail_clear): workaround
http://bugzilla.gnome.org/show_bug.cgi?id=56070 hiding and showing the back
button on after clearing the trail.
------------------------------------------------------------
revno: 30.1.36
merged: vcs-imports at canonical.com-20070614085037-xbvv1sc0s6nbgtuf
committer: xan
timestamp: Thu 2007-06-14 08:50:37 +0000
message:
2007-06-14 Xan Lopez <xan.lopez at nokia.com>
* src/hildon-private.c (hildon_private_composite_focus): make the focus handler
work again.
------------------------------------------------------------
revno: 30.1.37
merged: vcs-imports at canonical.com-20070619120038-u1jmpbt50qke06zu
committer: mdk
timestamp: Tue 2007-06-19 12:00:38 +0000
message:
Adding the hildon_volumebar_set_range_insensitive_message and hildon_volumebar_set_range_insensitive_messagef functions to set insensitive message on the slider of the volumebar. Fixes NB#61129.
------------------------------------------------------------
revno: 30.1.38
merged: vcs-imports at canonical.com-20070625085420-rr8w1fcchd55kxe4
committer: mdk
timestamp: Mon 2007-06-25 08:54:20 +0000
message:
Adding an example that makes a HildonVolumebar insensitive before mapping it.
------------------------------------------------------------
revno: 30.1.39
merged: vcs-imports at canonical.com-20070626121823-5039fytes70c2haj
committer: xan
timestamp: Tue 2007-06-26 12:18:23 +0000
message:
2007-06-26 Xan Lopez <xan at nokia.com>
* src/hildon-date-editor.c: (hildon_date_editor_keypress):
* src/hildon-time-editor.c: (hildon_time_editor_entry_keypress):
Move all focus crazyness to the rc files. This depends on gtk+2.0 >=
2.10.12-osso6 because the move-focus signal needs to be available in
GtkWidget.
------------------------------------------------------------
revno: 30.1.40
merged: vcs-imports at canonical.com-20070626125940-9101whthurz8w3ci
committer: xan
timestamp: Tue 2007-06-26 12:59:40 +0000
message:
Fix email address.
------------------------------------------------------------
revno: 30.1.41
merged: vcs-imports at canonical.com-20070627152543-mvda9lv9l5syksy2
committer: mdk
timestamp: Wed 2007-06-27 15:25:43 +0000
message:
Removing some remaining of --enable-xan.
------------------------------------------------------------
revno: 30.1.42
merged: vcs-imports at canonical.com-20070629141746-lg0c6yw1477jw2rh
committer: mdk
timestamp: Fri 2007-06-29 14:17:46 +0000
message:
[1.0.10-1 release]
------------------------------------------------------------
revno: 30.1.43
merged: vcs-imports at canonical.com-20070629142229-us3njzh2sl0pufv8
committer: mdk
timestamp: Fri 2007-06-29 14:22:29 +0000
message:
Correcting typo.
------------------------------------------------------------
revno: 30.1.44
merged: vcs-imports at canonical.com-20070702070451-47ohaqcm3acz57pb
committer: jobi
timestamp: Mon 2007-07-02 07:04:51 +0000
message:
2007-07-02 Johan Bilien <johan.bilien at nokia.com>
* src/Makefile.am: fixed installation of the header files
------------------------------------------------------------
revno: 30.1.45
merged: vcs-imports at canonical.com-20070702071339-hpridmihf1hx1pen
committer: xan
timestamp: Mon 2007-07-02 07:13:39 +0000
message:
2007-07-02 Xan Lopez <xan.lopez at nokia.com>
[1.0.10-2 release]
* NEWS:
* debian/changelog: Updating.
------------------------------------------------------------
revno: 30.1.46
merged: vcs-imports at canonical.com-20070712120535-7dns7smraqkg65qs
committer: tko
timestamp: Thu 2007-07-12 12:05:35 +0000
message:
Split the contents of map to more appropriate functions
2007-07-12 Tommi Komulainen <tommi.komulainen at nokia.com>
* src/hildon-time-picker.c (hildon_time_picker_class_init,
hildon_time_picker_map, hildon_time_picker_realize,
hildon_time_picker_style_set): Split the contents of map to more
appropriate functions; set window decorations on realize and update
arrows' size requisitions on style-set. Avoids unnecessary resizing.
-------------- next part --------------
=== added file 'examples/hildon-hvolumebar-insensitive-example.c'
--- a/examples/hildon-hvolumebar-insensitive-example.c 1970-01-01 00:00:00 +0000
+++ b/examples/hildon-hvolumebar-insensitive-example.c 2007-06-19 12:00:38 +0000
@@ -0,0 +1,57 @@
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include "hildon.h"
+
+int
+main (int argc,
+ char **args)
+{
+ gtk_init (&argc, &args);
+
+ GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
+
+ HildonHVolumebar *bar_1 = HILDON_HVOLUMEBAR (hildon_hvolumebar_new ());
+ HildonHVolumebar *bar_2 = HILDON_HVOLUMEBAR (hildon_hvolumebar_new ());
+ gtk_widget_set_size_request (GTK_WIDGET (bar_1), 400, -1);
+ gtk_widget_set_size_request (GTK_WIDGET (bar_2), 400, -1);
+
+ hildon_volumebar_set_range_insensitive_message ((GtkWidget *) bar_1, "Can't set volume while muted");
+ hildon_volumebar_set_range_insensitive_messagef ((GtkWidget *) bar_2, "Can't set volume while %s", "muted");
+
+ gtk_box_pack_start (GTK_BOX (dialog->vbox), GTK_WIDGET (bar_1), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (dialog->vbox), GTK_WIDGET (bar_2), FALSE, FALSE, 0);
+ gtk_dialog_add_button (dialog, "Close", GTK_RESPONSE_CLOSE);
+
+ gtk_widget_show_all (GTK_WIDGET (dialog));
+ gtk_dialog_run (dialog);
+
+ return 0;
+}
+
+
=== added file 'examples/hildon-hvolumebar-insensitive-map-example.c'
--- a/examples/hildon-hvolumebar-insensitive-map-example.c 1970-01-01 00:00:00 +0000
+++ b/examples/hildon-hvolumebar-insensitive-map-example.c 2007-06-25 08:54:20 +0000
@@ -0,0 +1,52 @@
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include "hildon.h"
+
+int
+main (int argc,
+ char **args)
+{
+ gtk_init (&argc, &args);
+
+ GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
+
+ HildonHVolumebar *bar = HILDON_HVOLUMEBAR (hildon_hvolumebar_new ());
+ gtk_widget_set_size_request (GTK_WIDGET (bar), 400, -1);
+
+ gtk_widget_set_sensitive (GTK_WIDGET (bar), FALSE);
+ gtk_box_pack_start (GTK_BOX (dialog->vbox), GTK_WIDGET (bar), FALSE, FALSE, 0);
+ gtk_dialog_add_button (dialog, "Close", GTK_RESPONSE_CLOSE);
+
+ gtk_widget_show_all (GTK_WIDGET (dialog));
+ gtk_dialog_run (dialog);
+
+ return 0;
+}
+
+
=== modified file 'ChangeLog'
--- a/ChangeLog 2007-06-07 11:42:15 +0000
+++ b/ChangeLog 2007-07-12 12:05:35 +0000
@@ -1,3 +1,100 @@
+2007-07-12 Tommi Komulainen <tommi.komulainen at nokia.com>
+
+ * src/hildon-time-picker.c (hildon_time_picker_class_init,
+ hildon_time_picker_map, hildon_time_picker_realize,
+ hildon_time_picker_style_set): Split the contents of map to more
+ appropriate functions; set window decorations on realize and update
+ arrows' size requisitions on style-set. Avoids unnecessary resizing.
+
+2007-07-02 Xan Lopez <xan.lopez at nokia.com>
+
+ [1.0.10-2 release]
+
+ * NEWS:
+ * debian/changelog: Updating.
+
+2007-07-02 Johan Bilien <johan.bilien at nokia.com>
+
+ * src/Makefile.am: fixed installation of the header files
+
+2007-06-29 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
+
+ [1.0.10-1 release]
+
+ * NEWS:
+ * configure.ac:
+ * debian/changelog: Updating.
+
+2007-06-27 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
+
+ * configure.ac: Removing some remaining of --enable-xan.
+
+2007-06-26 Xan Lopez <xan.lopez at nokia.com>
+
+ * src/hildon-date-editor.c: (hildon_date_editor_keypress):
+ * src/hildon-time-editor.c: (hildon_time_editor_entry_keypress):
+
+ Move all focus crazyness to the rc files. This depends on gtk+2.0 >=
+ 2.10.12-osso6 because the move-focus signal needs to be available in
+ GtkWidget.
+
+2007-06-25 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
+
+ * examples/Makefile.am:
+ * examples/hildon-hvolumebar-insensitive-map-example.c: Adding an example
+ that makes a HildonVolumebar insensitive before mapping it. Seems to work
+ fine. Prolly NB#61128 is fixed now.
+
+2007-06-19 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
+
+ * src/hildon-volumebar.c:
+ * src/hildon-volumebar.h: Adding the
+ hildon_volumebar_set_range_insensitive_message and
+ hildon_volumebar_set_range_insensitive_messagef functions to set
+ insensitive message on the slider of the volumebar. Fixes NB#61129.
+
+ * examples/Makefile.am:
+ * examples/hildon-hvolumebar-insensitive-example.c: Adding an example to
+ test the new insensitive messsage functionality on HildonVolumebar.
+
+2007-06-14 Xan Lopez <xan.lopez at nokia.com>
+
+ * src/hildon-private.c (hildon_private_composite_focus): make the focus handler
+ work again.
+
+2007-06-13 Xan Lopez <xan.lopez at nokia.com>
+
+ * src/hildon-bread-crumb-trail.c (hildon_bread_crumb_trail_clear): workaround
+ http://bugzilla.gnome.org/show_bug.cgi?id=56070 hiding and showing the back
+ button on after clearing the trail.
+
+2007-06-13 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
+
+ * src/hildon-code-dialog.c: Removing the separator from the dialog.
+
+2007-06-12 Xan Lopez <xan.lopez at nokia.com>
+
+ * src/Makefile.am: remove circular dependency in hildon-enum-types.h creation
+ by splitting the installed headers in generated and non-generated groups. Use
+ only the non-generated headers to create the hildon-enum-types.h file.
+
+ * src/hildon-seekbar.h: gtkscale.h already includes gtkrange.h.
+
+2007-06-12 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
+
+ * src/hildon-window.c: Hide the window before performing the destroy.
+ Should make the app closing a little tiny bit more snappy.
+
+2007-06-12 Xan Lopez <xan.lopez at nokia.com>
+
+ * src/hildon-seekbar.c: add gtkrange.h header
+ * src/hildon-caption.c: remove unused variable
+
+2007-06-08 Tommi Komulainen <tommi.komulainen at nokia.com>
+
+ * configure.ac: Remove dysfunctional AC_ARG_ENABLE. Pointed out by
+ Loic Minier.
+
2007-06-07 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
[1.0.9-1 release]
=== modified file 'NEWS'
--- a/NEWS 2007-06-07 11:42:15 +0000
+++ b/NEWS 2007-07-02 07:13:39 +0000
@@ -1,3 +1,12 @@
+[1.0.10-2 release]
+* Fix header installation
+
+[1.0.10-1 release]
+* Fixing a bit of focus crazyness in the time and date editors
+* Removing the separator from the code dialog
+* Fixing circular dep to enums
+* Hide the HildonWindow before performing the destroy
+
[1.0.9-1 release]
* Breadcrumb align/visibility fixes
* HildonWindow fixes
=== modified file 'configure.ac'
--- a/configure.ac 2007-06-07 11:42:15 +0000
+++ b/configure.ac 2007-06-29 14:17:46 +0000
@@ -1,4 +1,4 @@
-AC_INIT([Hildon gtk widgets], [1.0.9], [michael.kostrzewa at nokia.com], [hildon])
+AC_INIT([Hildon gtk widgets], [1.0.10], [michael.kostrzewa at nokia.com], [hildon])
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
@@ -21,7 +21,7 @@
# increment current, and set revision to 0.
# 5. If any interfaces have been added since the last public release, then increment age.
# 6. If any interfaces have been removed since the last public release, then set age to 0.
-AS_LIBTOOL(HILDON, 9, 0, 9)
+AS_LIBTOOL(HILDON, 10, 0, 10)
AM_INIT_AUTOMAKE
AC_PROG_CC
@@ -114,8 +114,6 @@
AC_MSG_NOTICE(Will not use Maemo GTK+ specific API)
fi
-AC_ARG_ENABLE
-
# build with assertion checks (or not)
AC_ARG_WITH(asserts,
AC_HELP_STRING([--with-asserts], [Build with the assertion checks]),
@@ -148,19 +146,19 @@
[BUILD_WITH_FATAL=no])
# just print out our status
-if test x$BUILD_WITH_XAN = xyes; then
+if test x$BUILD_WITH_FATAL = xyes; then
AC_MSG_NOTICE(Will build with fatal warnings)
- XAN_CFLAGS="-Werror"
+ FATAL_CFLAGS="-Werror"
else
AC_MSG_NOTICE(Will build with non-fatal warnings)
- XAN_CFLAGS=""
+ FATAL_CFLAGS=""
fi
# Check support (c unit test)
PKG_CHECK_MODULES(CHECK, check , [BUILD_TESTS="yes"], [BUILD_TESTS="no"])
AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
-CFLAGS="$CFLAGS ${ASSERT_CFLAGS} -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-format ${XAN_FLAGS}"
+CFLAGS="$CFLAGS ${ASSERT_CFLAGS} -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-format ${FATAL_FLAGS}"
# -Wno-format due to way translation string are done
### enable MAEMO platform extensions
=== modified file 'debian/changelog'
--- a/debian/changelog 2007-06-08 21:44:35 +0000
+++ b/debian/changelog 2007-07-22 20:25:49 +0000
@@ -1,4 +1,4 @@
-libhildon (1.0.9-1.debian-1) UNRELEASED; urgency=low
+libhildon (1.0.10-2.debian-1) UNRELEASED; urgency=low
[ Loic Minier ]
* Set Maintainer to Debian Maemo Maintainer; add myself in Uploaders.
@@ -23,8 +23,29 @@
[ Jonny Lamb ]
* Updated descriptions in control.
-
- -- Jonny Lamb <jonnylamb at jonnylamb.com> Fri, 08 Jun 2007 22:43:55 +0100
+ * Merge with trunk branch.
+
+ -- Jonny Lamb <jonnylamb at jonnylamb.com> Sun, 22 Jul 2007 21:25:21 +0100
+
+libhildon (1.0.10-2) stable; urgency=low
+
+ * Fix header installation.
+
+ -- Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> Mon, 2 Jul 2007 10:09:31 +0300
+
+libhildon (1.0.10-1) stable; urgency=low
+
+ * Fixing a bit of focus crazyness in the time and date editors
+ * Removing the separator from the code dialog
+ * Fixing circular dep to enums
+ * Hide the HildonWindow before performing the destroy
+
+ * Fixes: NB#61129 volumebar info banner in muted state
+ * Fixes: NB#61128 volumebar sensitivy does not change when the widget is not mapped
+ * Fixes: NB#60518 Unable to move the focus from the buttons to date or time editor.
+ * Fixes: NB#60349 Date editor invalidates keyboard number input
+
+ -- Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> Fri, 29 Jun 2007 16:49:58 +0300
libhildon (1.0.9-1) stable; urgency=low
=== modified file 'examples/Makefile.am'
--- a/examples/Makefile.am 2007-05-21 07:58:56 +0000
+++ b/examples/Makefile.am 2007-06-25 08:54:20 +0000
@@ -1,35 +1,37 @@
MAINTAINERCLEANFILES = Makefile.in
if BUILD_EXAMPLES
-noinst_PROGRAMS = hildon-window-example \
- hildon-banner-example \
- hildon-caption-example \
- hildon-weekday-picker-example \
- hildon-sort-dialog-example \
- hildon-controlbar-example \
- hildon-note-example \
- hildon-time-picker-example \
- hildon-color-chooser-example \
- hildon-color-button-example \
- hildon-login-dialog-example \
- hildon-time-editor-example \
- hildon-icon-sizes-example \
- hildon-insensitive-example \
- hildon-get-password-dialog-example \
- hildon-set-password-dialog-example \
- hildon-window-menu-example \
- hildon-window-cmn-menu-example \
- hildon-vvolumebar-example \
- hildon-toolbar-example \
- hildon-code-dialog-example \
- hildon-hvolumebar-example \
- hildon-lookup-example \
- hildon-number-editor-example \
- hildon-scrolled-window-example \
- hildon-color-pop-example \
- hildon-thumb-scrollbar-example \
- hildon-date-editor-example \
- hildon-bread-crumb-trail-example \
+noinst_PROGRAMS = hildon-window-example \
+ hildon-banner-example \
+ hildon-caption-example \
+ hildon-weekday-picker-example \
+ hildon-sort-dialog-example \
+ hildon-controlbar-example \
+ hildon-note-example \
+ hildon-time-picker-example \
+ hildon-color-chooser-example \
+ hildon-color-button-example \
+ hildon-login-dialog-example \
+ hildon-time-editor-example \
+ hildon-icon-sizes-example \
+ hildon-insensitive-example \
+ hildon-get-password-dialog-example \
+ hildon-set-password-dialog-example \
+ hildon-window-menu-example \
+ hildon-window-cmn-menu-example \
+ hildon-vvolumebar-example \
+ hildon-toolbar-example \
+ hildon-code-dialog-example \
+ hildon-hvolumebar-example \
+ hildon-hvolumebar-insensitive-example \
+ hildon-hvolumebar-insensitive-map-example \
+ hildon-lookup-example \
+ hildon-number-editor-example \
+ hildon-scrolled-window-example \
+ hildon-color-pop-example \
+ hildon-thumb-scrollbar-example \
+ hildon-date-editor-example \
+ hildon-bread-crumb-trail-example \
hildon-finger-example
# Hildon window
@@ -112,6 +114,11 @@
hildon_insensitive_example_CFLAGS = $(HILDON_OBJ_CFLAGS)
hildon_insensitive_example_SOURCES = hildon-insensitive-example.c
+# HIldon insensitive map example
+hildon_hvolumebar_insensitive_map_example_LDADD = $(HILDON_OBJ_LIBS)
+hildon_hvolumebar_insensitive_map_example_CFLAGS = $(HILDON_OBJ_CFLAGS)
+hildon_hvolumebar_insensitive_map_example_SOURCES = hildon-hvolumebar-insensitive-map-example.c
+
# HIldon get password dialog example
hildon_get_password_dialog_example_LDADD = $(HILDON_OBJ_LIBS)
hildon_get_password_dialog_example_CFLAGS = $(HILDON_OBJ_CFLAGS)
@@ -142,6 +149,11 @@
hildon_hvolumebar_example_CFLAGS = $(HILDON_OBJ_CFLAGS)
hildon_hvolumebar_example_SOURCES = hildon-hvolumebar-example.c
+# Hildon hvolume bar insensitive example
+hildon_hvolumebar_insensitive_example_LDADD = $(HILDON_OBJ_LIBS)
+hildon_hvolumebar_insensitive_example_CFLAGS = $(HILDON_OBJ_CFLAGS)
+hildon_hvolumebar_insensitive_example_SOURCES = hildon-hvolumebar-insensitive-example.c
+
# Hildon toolbar example
hildon_toolbar_example_LDADD = $(HILDON_OBJ_LIBS)
hildon_toolbar_example_CFLAGS = $(HILDON_OBJ_CFLAGS)
=== modified file 'src/Makefile.am'
--- a/src/Makefile.am 2007-04-25 10:42:46 +0000
+++ b/src/Makefile.am 2007-07-02 07:04:51 +0000
@@ -63,9 +63,13 @@
hildon-bread-crumb.c \
hildon-bread-crumb-widget.c
+libhildon_ at PACKAGE_VERSION_MAJOR@_built_public_headers = \
+ hildon-enum-types.h \
+ hildon-marshalers.h
+
libhildon_ at PACKAGE_VERSION_MAJOR@_includedir = $(includedir)/$(PACKAGE)-$(PACKAGE_VERSION_MAJOR)/$(PACKAGE)
-libhildon_ at PACKAGE_VERSION_MAJOR@_include_HEADERS = hildon-banner.h \
+libhildon_ at PACKAGE_VERSION_MAJOR@_public_headers = hildon-banner.h \
hildon-calendar-popup.h \
hildon-caption.h \
hildon-code-dialog.h \
@@ -75,14 +79,12 @@
hildon-controlbar.h \
hildon-date-editor.h \
hildon-defines.h \
- hildon-enum-types.h \
hildon-find-toolbar.h \
hildon-helper.h \
hildon-font-selection-dialog.h \
hildon-get-password-dialog.h \
hildon-hvolumebar.h \
hildon-login-dialog.h \
- hildon-marshalers.h \
hildon-note.h \
hildon-number-editor.h \
hildon-program.h \
@@ -104,6 +106,9 @@
hildon-bread-crumb-trail.h \
hildon-bread-crumb.h
+libhildon_ at PACKAGE_VERSION_MAJOR@_include_HEADERS = $(libhildon_ at PACKAGE_VERSION_MAJOR@_public_headers) \
+ $(libhildon_ at PACKAGE_VERSION_MAJOR@_built_public_headers)
+
noinst_HEADERS = hildon-banner-private.h \
hildon-calendar-popup-private.h \
hildon-private.h \
@@ -137,7 +142,7 @@
# Don't build the library until we have built the header that it needs:
$(OBJECTS) $(libhildon_$(PACKAGE_VERSION_MAJOR)_la_OBJECTS): hildon-enum-types.h hildon-marshalers.c hildon-marshalers.h
-hildon-enum-types.h: @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS) Makefile
+hildon-enum-types.h: @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_public_headers) Makefile
(cd $(srcdir) && glib-mkenums \
--fhead "#ifndef __HILDON_ENUM_TYPES_H__\n" \
--fhead "#define __HILDON_ENUM_TYPES_H__\n" \
@@ -149,9 +154,9 @@
--fprod "/* Enumerations from \"@filename@\" */\n" \
--vhead "GType @enum_name at _get_type (void);\n#define HILDON_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
--ftail "\nG_END_DECLS\n\n#endif /* __HILDON_ENUM_TYPES_H__ */" \
- $(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS)) > $@
+ $(libhildon_$(PACKAGE_VERSION_MAJOR)_public_headers)) > $@
-hildon-enum-types.c: @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS) Makefile
+hildon-enum-types.c: @REBUILD@ $(libhildon_$(PACKAGE_VERSION_MAJOR)_public_headers) Makefile
(cd $(srcdir) && glib-mkenums \
--fhead "#include \"hildon.h\"\n" \
--fhead "#include <glib-object.h>" \
@@ -159,7 +164,7 @@
--vhead "GType\n at enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G at Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n etype = g_ at type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
- $(libhildon_$(PACKAGE_VERSION_MAJOR)_include_HEADERS)) > $@
+ $(libhildon_$(PACKAGE_VERSION_MAJOR)_public_headers)) > $@
hildon-marshalers.h: hildon-marshalers.list
glib-genmarshal --prefix _hildon_marshal --header hildon-marshalers.list >hildon-marshalers.h
=== modified file 'src/hildon-bread-crumb-trail.c'
--- a/src/hildon-bread-crumb-trail.c 2007-06-04 12:21:35 +0000
+++ b/src/hildon-bread-crumb-trail.c 2007-06-13 11:47:36 +0000
@@ -743,4 +743,13 @@
{
hildon_bread_crumb_trail_pop (bct);
}
+
+ /*
+ Sensitivity hack from hell. We need to do this while
+ http://bugzilla.gnome.org/show_bug.cgi?id=56070 is not
+ fixed to allow repeated clicking on the back button if
+ someone clears and rebuilds the trail when it's clicked
+ */
+ gtk_widget_hide (priv->back_button);
+ gtk_widget_show (priv->back_button);
}
=== modified file 'src/hildon-caption.c'
--- a/src/hildon-caption.c 2007-05-30 12:43:46 +0000
+++ b/src/hildon-caption.c 2007-06-12 13:08:58 +0000
@@ -578,7 +578,6 @@
{
HildonCaptionPrivate *priv = HILDON_CAPTION_GET_PRIVATE (widget);
g_assert (priv);
- GtkWidget *child = GTK_BIN (widget)->child;
priv->is_focused = TRUE;
gtk_widget_grab_focus (GTK_BIN (widget)->child);
=== modified file 'src/hildon-code-dialog.c'
--- a/src/hildon-code-dialog.c 2007-03-29 13:46:43 +0000
+++ b/src/hildon-code-dialog.c 2007-06-13 08:36:12 +0000
@@ -190,6 +190,7 @@
gtk_window_set_title (GTK_WINDOW (dialog), DEVICELOCK_TITLE);
gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
hints.min_width = -1;
hints.min_height = -1;
=== modified file 'src/hildon-date-editor.c'
--- a/src/hildon-date-editor.c 2007-05-28 12:14:09 +0000
+++ b/src/hildon-date-editor.c 2007-06-26 12:18:23 +0000
@@ -1129,46 +1129,21 @@
{
HildonDateEditor *ed;
HildonDateEditorPrivate *priv;
- gint pos;
- gboolean r;
g_assert (HILDON_IS_DATE_EDITOR (data));
g_assert (GTK_IS_ENTRY (widget));
ed = HILDON_DATE_EDITOR (data);
- priv = HILDON_DATE_EDITOR_GET_PRIVATE (ed);
- pos = gtk_editable_get_position (GTK_EDITABLE (widget));
- g_assert (priv);
-
- /* Show error message in case the key pressed is not allowed
- (only digits and control characters are allowed )*/
- if (!g_unichar_isdigit (event->keyval) && ! (event->keyval & 0xF000)) {
- g_signal_emit (ed, date_editor_signals[DATE_ERROR], 0, HILDON_DATE_TIME_ERROR_INVALID_CHAR, &r);
- return TRUE;
- }
switch (event->keyval) {
- case GDK_Left:
- if (pos == 0) {
- (void) gtk_widget_child_focus (GTK_WIDGET (data), GTK_DIR_LEFT);
- return TRUE;
- }
- break;
-
- case GDK_Right:
- if (pos >= g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (widget)), -1)) {
- (void) gtk_widget_child_focus (GTK_WIDGET (data), GTK_DIR_RIGHT);
- return TRUE;
- }
- break;
case GDK_Return:
case GDK_ISO_Enter:
/* Ignore return value, since we want to handle event at all times.
otherwise vkb would popup when the keyrepeat starts. */
- (void) hildon_date_editor_set_calendar_icon_state (ed, TRUE);
+ hildon_date_editor_set_calendar_icon_state (ed, TRUE);
return TRUE;
-
case GDK_Escape:
+ priv = HILDON_DATE_EDITOR_GET_PRIVATE (ed);
priv->skip_validation = TRUE;
break;
default:
=== modified file 'src/hildon-helper.c'
--- a/src/hildon-helper.c 2007-05-09 11:10:26 +0000
+++ b/src/hildon-helper.c 2007-06-19 12:00:38 +0000
@@ -271,7 +271,6 @@
* using a standard @HildonBanner.
*
**/
-
void
hildon_helper_set_insensitive_message (GtkWidget *widget,
const gchar *message)
@@ -304,7 +303,6 @@
* A version of hildon_helper_set_insensitive_message with string formatting.
*
**/
-
void
hildon_helper_set_insensitive_messagef (GtkWidget *widget,
const gchar *format,
=== modified file 'src/hildon-private.c'
--- a/src/hildon-private.c 2007-03-29 13:46:43 +0000
+++ b/src/hildon-private.c 2007-06-14 08:50:37 +0000
@@ -42,46 +42,41 @@
hildon_private_composite_focus (GtkWidget *widget,
GtkDirectionType direction)
{
- GtkWidget *toplevel = NULL;
- GtkWidget *focus_widget = NULL;
-
- /* Get the topmost parent widget */
- toplevel = gtk_widget_get_toplevel (widget);
-
- if (! GTK_IS_WINDOW (toplevel))
- return GTK_WIDGET_CLASS (g_type_class_peek_parent (
- GTK_WIDGET_GET_CLASS (widget)))->focus (widget, direction);
- /* Get focus widget in the topmost parent widget */
- focus_widget = GTK_WINDOW (toplevel)->focus_widget;
-
- if (! GTK_IS_WIDGET (focus_widget))
- return TRUE;
-
- if (! gtk_widget_is_ancestor (focus_widget, widget))
- {
- gtk_widget_grab_focus (widget);
- }
- else
- {
- /* Containers grab_focus grabs the focus to the correct widget */
- switch (direction) {
- case GTK_DIR_UP:
- case GTK_DIR_DOWN:
- if (HILDON_IS_DATE_EDITOR (widget) || HILDON_IS_TIME_EDITOR(widget))
- return FALSE;
- else
- return GTK_WIDGET_CLASS (g_type_class_peek_parent
- (GTK_WIDGET_GET_CLASS(widget)))->focus (widget, direction);
- break;
-
- default:
- return GTK_WIDGET_CLASS (g_type_class_peek_parent
- (GTK_WIDGET_GET_CLASS(widget)))->focus (widget, direction);
- break;
- }
- }
-
- return TRUE;
+ GtkWidget *toplevel = NULL;
+ GtkWidget *focus_widget = NULL;
+ gboolean coming_from_outside = FALSE;
+ GtkDirectionType effective_direction;
+
+ toplevel = gtk_widget_get_toplevel (widget);
+
+ focus_widget = GTK_WINDOW (toplevel)->focus_widget;
+
+ if (focus_widget == NULL || gtk_widget_is_ancestor (focus_widget, widget) == FALSE)
+ {
+ /* When coming from outside we want to give focus to the first
+ item in the widgets */
+ effective_direction = GTK_DIR_TAB_FORWARD;
+ coming_from_outside = TRUE;
+ }
+ else
+ effective_direction = direction;
+
+ switch (direction) {
+ case GTK_DIR_UP:
+ case GTK_DIR_DOWN:
+ case GTK_DIR_TAB_FORWARD:
+ case GTK_DIR_TAB_BACKWARD:
+ if ((HILDON_IS_DATE_EDITOR (widget) || HILDON_IS_TIME_EDITOR(widget)) &&
+ !coming_from_outside)
+ return FALSE;
+ /* fall through */
+ default:
+ return GTK_WIDGET_CLASS (g_type_class_peek_parent
+ (GTK_WIDGET_GET_CLASS(widget)))->focus (widget, effective_direction);
+ }
+
+ g_assert_not_reached ();
+ return TRUE;
}
=== modified file 'src/hildon-time-editor.c'
--- a/src/hildon-time-editor.c 2007-04-02 12:59:44 +0000
+++ b/src/hildon-time-editor.c 2007-06-26 12:18:23 +0000
@@ -224,10 +224,10 @@
hildon_time_editor_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static gboolean
-hildon_time_editor_entry_keypress (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
+static gboolean
+hildon_time_editor_entry_keypress (GtkEntry *entry,
+ GdkEventKey* event,
+ gpointer user_data);
static gboolean
hildon_time_editor_check_locale (HildonTimeEditor *editor);
@@ -1776,76 +1776,22 @@
gtk_widget_size_allocate (priv->sec_label, &alloc);
}
-static gboolean
-hildon_time_editor_entry_keypress (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
+static gboolean
+hildon_time_editor_entry_keypress (GtkEntry *entry,
+ GdkEventKey *event,
+ gpointer data)
{
- HildonTimeEditor *editor;
- HildonTimeEditorPrivate *priv;
- gint cursor_pos;
- gboolean r;
-
- g_assert (GTK_IS_ENTRY (widget));
- g_assert (event != NULL);
- g_assert (HILDON_IS_TIME_EDITOR (data));
-
- editor = HILDON_TIME_EDITOR (data);
- priv = HILDON_TIME_EDITOR_GET_PRIVATE (editor);
- g_assert (priv);
- cursor_pos = gtk_editable_get_position (GTK_EDITABLE (widget));
-
- /* Show error message in case the key pressed is not allowed
- (only digits and control characters are allowed )*/
- if (!g_unichar_isdigit (event->keyval) && ! (event->keyval & 0xF000)) {
- g_signal_emit (editor, time_editor_signals[TIME_ERROR], 0, HILDON_DATE_TIME_ERROR_INVALID_CHAR, &r);
- hildon_banner_show_information (widget, NULL, c_("ckct_ib_illegal_character"));
- return TRUE;
+ switch (event->keyval)
+ {
+ case GDK_Return:
+ case GDK_ISO_Enter:
+ hildon_time_editor_icon_clicked (entry, data);
+ return TRUE;
+ default:
+ return FALSE;
}
- switch (event->keyval)
- {
- case GDK_Return:
- /* Return key popups up time picker dialog. Visually it looks as if
- the time picker icon was clicked. Before opening the time picker
- the fields are first validated and fixed. */
-
- /* hildon_time_editor_validate (editor, FALSE);
- hildon_gtk_button_set_depressed (GTK_BUTTON (priv->iconbutton), TRUE);
- hildon_time_editor_icon_clicked (widget, data);
- hildon_gtk_button_set_depressed (GTK_BUTTON (priv->iconbutton), FALSE);
-
- FIXME The above code used to be here before the consolidation that removed the
- _set_depressed crap. However, I think this code had NO EFFECT anyways, since
- there is no expose event after the _set functions. So I'm just cutting it out.
- Another story would be to actually fix it... */
-
- hildon_time_editor_icon_clicked (widget, data);
- return TRUE;
-
- case GDK_Left:
- /* left arrow pressed in the entry. If we are on first position, try to
- move to the previous field. */
- if (cursor_pos == 0) {
- (void) gtk_widget_child_focus (GTK_WIDGET (editor), GTK_DIR_LEFT);
- return TRUE;
- }
- break;
-
- case GDK_Right:
- /* right arrow pressed in the entry. If we are on last position, try to
- move to the next field. */
- if (cursor_pos >= g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (widget)), -1)) {
- (void) gtk_widget_child_focus (GTK_WIDGET (editor), GTK_DIR_RIGHT);
- return TRUE;
- }
- break;
-
- default:
- break;
- };
-
- return FALSE;
+ g_assert_not_reached ();
}
static void
=== modified file 'src/hildon-time-picker.c'
--- a/src/hildon-time-picker.c 2007-05-24 14:46:00 +0000
+++ b/src/hildon-time-picker.c 2007-07-12 12:05:35 +0000
@@ -168,7 +168,11 @@
gpointer unused);
static void
-hildon_time_picker_map (GtkWidget *widget);
+hildon_time_picker_realize (GtkWidget *widget);
+
+static void
+hildon_time_picker_style_set (GtkWidget *widget,
+ GtkStyle *previous_style);
static void
frame_size_request (GtkWidget *widget,
@@ -233,7 +237,8 @@
gobject_class->finalize = hildon_time_picker_finalize;
gobject_class->get_property = hildon_time_picker_get_property;
gobject_class->set_property = hildon_time_picker_set_property;
- widget_class->map = hildon_time_picker_map;
+ widget_class->realize = hildon_time_picker_realize;
+ widget_class->style_set = hildon_time_picker_style_set;
/**
* HildonTimePicker:minutes:
@@ -534,15 +539,24 @@
}
static void
-hildon_time_picker_map (GtkWidget *widget)
+hildon_time_picker_realize (GtkWidget *widget)
+{
+ GTK_WIDGET_CLASS (parent_class)->realize(widget);
+
+ /* We only want the border for the dialog. */
+ gdk_window_set_decorations (widget->window, GDK_DECOR_BORDER);
+}
+
+static void
+hildon_time_picker_style_set (GtkWidget *widget,
+ GtkStyle *previous_style)
{
guint width, height;
gint i, button;
HildonTimePickerPrivate *priv = HILDON_TIME_PICKER_GET_PRIVATE (widget);
g_assert (priv);
- /* Widget is now mapped. Set border for the dialog. */
- gdk_window_set_decorations (widget->window, GDK_DECOR_BORDER);
+ GTK_WIDGET_CLASS (parent_class)->style_set(widget, previous_style);
/* Update hour/minute up/down buttons sizes from style properties */
gtk_widget_style_get (widget,
@@ -559,8 +573,6 @@
}
}
}
-
- GTK_WIDGET_CLASS (parent_class)->map(widget);
}
/*
=== modified file 'src/hildon-volumebar.c'
--- a/src/hildon-volumebar.c 2007-03-29 13:46:43 +0000
+++ b/src/hildon-volumebar.c 2007-06-19 12:00:38 +0000
@@ -700,3 +700,56 @@
/* FIXME Use numerical val, id */
g_signal_emit_by_name (GTK_WIDGET (self), "level_changed");
}
+
+/**
+ * hildon_volumebar_set_range_insensitive_message:
+ * @widget: A @GtkWidget to assign the banner to
+ * @message: A message to display to the user
+ *
+ * Used to asign an insensitive message to the slider of the given volumebar.
+ * It simply calls hildon_helper_set_insensitive_message on the slider/range of
+ * the volumebar.
+ */
+void
+hildon_volumebar_set_range_insensitive_message (GtkWidget *widget,
+ const gchar *message)
+{
+ g_return_if_fail (HILDON_IS_VOLUMEBAR (widget));
+
+ HildonVolumebarPrivate *priv;
+ priv = HILDON_VOLUMEBAR_GET_PRIVATE (widget);
+
+ hildon_helper_set_insensitive_message ((GtkWidget *) priv->volumebar, message);
+}
+
+/**
+ * hildon_volumebar_set_range_insensitive_messagef:
+ * @widget: A @GtkWidget to assign the banner to
+ * @format : a printf-like format string
+ * @varargs : arguments for the format string
+ *
+ * A helper printf-like variant of hildon_helper_set_insensitive_message.
+ */
+void
+hildon_volumebar_set_range_insensitive_messagef (GtkWidget *widget,
+ const gchar *format,
+ ...)
+{
+ g_return_if_fail (HILDON_IS_VOLUMEBAR (widget));
+
+ HildonVolumebarPrivate *priv;
+ priv = HILDON_VOLUMEBAR_GET_PRIVATE (widget);
+
+ gchar *message;
+ va_list args;
+
+ va_start (args, format);
+ message = g_strdup_vprintf (format, args);
+ va_end (args);
+
+ hildon_helper_set_insensitive_message ((GtkWidget *) priv->volumebar, message);
+
+ g_free (message);
+}
+
+
=== modified file 'src/hildon-volumebar.h'
--- a/src/hildon-volumebar.h 2007-03-29 13:46:43 +0000
+++ b/src/hildon-volumebar.h 2007-06-19 12:00:38 +0000
@@ -27,6 +27,7 @@
#include <gtk/gtkcontainer.h>
#include <gtk/gtkadjustment.h>
+#include "hildon-helper.h"
G_BEGIN_DECLS
@@ -87,6 +88,15 @@
GtkAdjustment*
hildon_volumebar_get_adjustment (HildonVolumebar *self);
+void
+hildon_volumebar_set_range_insensitive_message (GtkWidget *widget,
+ const gchar *message);
+
+void
+hildon_volumebar_set_range_insensitive_messagef (GtkWidget *widget,
+ const gchar *format,
+ ...);
+
G_END_DECLS
#endif /* __HILDON_VOLUMEBAR_H__ */
=== modified file 'src/hildon-window.c'
--- a/src/hildon-window.c 2007-06-07 11:22:48 +0000
+++ b/src/hildon-window.c 2007-06-12 13:16:46 +0000
@@ -770,6 +770,10 @@
HildonWindowPrivate *priv = HILDON_WINDOW_GET_PRIVATE (obj);
GList *menu_list = NULL;
GList *menu_node = NULL;
+
+ gtk_widget_hide ((GtkWidget *) self);
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
g_assert (priv != NULL);
@@ -832,7 +836,6 @@
GTK_OBJECT_CLASS (parent_class)->destroy (obj);
}
-
static void
hildon_window_notify (GObject *gobject,
GParamSpec *param)
More information about the Pkg-maemo-commits
mailing list