mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 17:39:31 +00:00
add gtk+2.8.9 and eds-feed (galago)
git-svn-id: https://svn.o-hand.com/repos/poky@212 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
@@ -0,0 +1,62 @@
|
|||||||
|
Index: eds-feed-0.3.2/configure.ac
|
||||||
|
===================================================================
|
||||||
|
--- eds-feed-0.3.2.orig/configure.ac 2005-08-28 19:11:39.000000000 +0000
|
||||||
|
+++ eds-feed-0.3.2/configure.ac 2005-12-16 09:22:10.000000000 +0000
|
||||||
|
@@ -65,7 +65,7 @@
|
||||||
|
libxml-2.0)
|
||||||
|
|
||||||
|
# Check which version of eds we're using
|
||||||
|
-PKG_CHECK_MODULES(EDS, libebook-1.2 >= 1.1.4 libedata-book-1.2 >= 1.1.4)
|
||||||
|
+PKG_CHECK_MODULES(EDS, libebook-1.2 >= 1.1.4)
|
||||||
|
|
||||||
|
PACKAGE_CFLAGS="$PACKAGE_CFLAGS $EDS_CFLAGS"
|
||||||
|
PACKAGE_LIBS="$PACKAGE_LIBS $EDS_LIBS"
|
||||||
|
Index: eds-feed-0.3.2/src/main.c
|
||||||
|
===================================================================
|
||||||
|
--- eds-feed-0.3.2.orig/src/main.c 2005-08-21 07:26:02.000000000 +0000
|
||||||
|
+++ eds-feed-0.3.2/src/main.c 2005-12-16 09:24:38.000000000 +0000
|
||||||
|
@@ -20,17 +20,11 @@
|
||||||
|
*/
|
||||||
|
#include <glib.h>
|
||||||
|
#include <libgalago/galago.h>
|
||||||
|
-#include <libedata-book/Evolution-DataServer-Addressbook.h>
|
||||||
|
|
||||||
|
#include <libebook/e-book.h>
|
||||||
|
-#include <libedata-book/e-data-book-factory.h>
|
||||||
|
-#include <bonobo/bonobo-main.h>
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
-#define E_DATA_BOOK_FACTORY_OAF_ID \
|
||||||
|
- "OAFIID:GNOME_Evolution_DataServer_BookFactory"
|
||||||
|
-
|
||||||
|
static EBookView *book_view = NULL;
|
||||||
|
static EBook *book = NULL;
|
||||||
|
static gulong book_view_tag = 0;
|
||||||
|
@@ -157,8 +151,8 @@
|
||||||
|
galago_person_set_photo(person, NULL);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- galago_photo_new(person, (unsigned char *)ephoto->data,
|
||||||
|
- ephoto->length);
|
||||||
|
+// galago_photo_new(person, (unsigned char *)ephoto->data,
|
||||||
|
+// ephoto->length);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -294,15 +288,6 @@
|
||||||
|
|
||||||
|
galago_core_set_exit_with_daemon(TRUE);
|
||||||
|
|
||||||
|
- if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(),
|
||||||
|
- CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
|
||||||
|
- {
|
||||||
|
- fprintf(stderr, "Unable to initialize bonobo.\n");
|
||||||
|
- exit(1);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- bonobo_activate();
|
||||||
|
-
|
||||||
|
setup_book_view();
|
||||||
|
setup_services();
|
||||||
|
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
DESCRIPTION = "Galago linkage to the Evolution Data Server."
|
||||||
|
HOMEPAGE = "http://www.galago-project.org/"
|
||||||
|
LICENSE = "GPL"
|
||||||
|
DEPENDS = "gettext libgalago dbus glib-2.0 eds-dbus"
|
||||||
|
|
||||||
|
SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
|
||||||
|
file://disable-bonobo.patch;patch=1"
|
||||||
|
# file://no-check.patch;patch=1"
|
||||||
|
#EXTRA_OECONF = "--disable-binreloc"
|
||||||
|
|
||||||
|
FILES_${PN} += "${libdir}/galago/eds-feed"
|
||||||
|
|
||||||
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
--- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100
|
||||||
|
+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100
|
||||||
|
@@ -52,21 +52,5 @@
|
||||||
|
|
||||||
|
dist-hook: html
|
||||||
|
cp -Rp $(srcdir)/html $(distdir)
|
||||||
|
-else
|
||||||
|
-html:
|
||||||
|
- echo "***"
|
||||||
|
- echo "*** Warning: Tutorial not built"
|
||||||
|
- echo "***"
|
||||||
|
-
|
||||||
|
-pdf:
|
||||||
|
- echo "***"
|
||||||
|
- echo "*** Warning: Tutorial not built"
|
||||||
|
- echo "***"
|
||||||
|
-
|
||||||
|
-dist-hook:
|
||||||
|
- echo "***"
|
||||||
|
- echo "*** Warning: Tutorial not built"
|
||||||
|
- echo "*** DISTRIBUTION IS INCOMPLETE"
|
||||||
|
- echo "***"
|
||||||
|
endif
|
||||||
|
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100
|
||||||
|
+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100
|
||||||
|
@@ -118,7 +118,7 @@
|
||||||
|
tooltips->tips_data_list = NULL;
|
||||||
|
|
||||||
|
tooltips->delay = DEFAULT_DELAY;
|
||||||
|
- tooltips->enabled = TRUE;
|
||||||
|
+ tooltips->enabled = FALSE;
|
||||||
|
tooltips->timer_tag = 0;
|
||||||
|
tooltips->use_sticky_delay = FALSE;
|
||||||
|
tooltips->last_popdown.tv_sec = -1;
|
||||||
@@ -0,0 +1,264 @@
|
|||||||
|
--- gtk+-2.8.6/gtk/gtkrange.c.orig 2005-12-07 21:13:33 +0100
|
||||||
|
+++ gtk+-2.8.6/gtk/gtkrange.c 2005-12-07 21:21:12 +0100
|
||||||
|
@@ -186,6 +186,7 @@
|
||||||
|
static GtkWidgetClass *parent_class = NULL;
|
||||||
|
static guint signals[LAST_SIGNAL];
|
||||||
|
|
||||||
|
+static GdkAtom recognize_protocols_atom, atom_atom;
|
||||||
|
|
||||||
|
GType
|
||||||
|
gtk_range_get_type (void)
|
||||||
|
@@ -226,6 +227,9 @@
|
||||||
|
object_class = (GtkObjectClass*) class;
|
||||||
|
widget_class = (GtkWidgetClass*) class;
|
||||||
|
|
||||||
|
+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
|
||||||
|
+ atom_atom = gdk_atom_intern ("ATOM", FALSE);
|
||||||
|
+
|
||||||
|
parent_class = g_type_class_peek_parent (class);
|
||||||
|
|
||||||
|
gobject_class->set_property = gtk_range_set_property;
|
||||||
|
@@ -860,6 +864,12 @@
|
||||||
|
&attributes, attributes_mask);
|
||||||
|
gdk_window_set_user_data (range->event_window, range);
|
||||||
|
|
||||||
|
+ gdk_property_change (range->event_window,
|
||||||
|
+ recognize_protocols_atom,
|
||||||
|
+ atom_atom,
|
||||||
|
+ 32, GDK_PROP_MODE_REPLACE,
|
||||||
|
+ NULL, 0);
|
||||||
|
+
|
||||||
|
widget->style = gtk_style_attach (widget->style, widget->window);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1229,7 +1239,7 @@
|
||||||
|
|
||||||
|
/* ignore presses when we're already doing something else. */
|
||||||
|
if (range->layout->grab_location != MOUSE_OUTSIDE)
|
||||||
|
- return FALSE;
|
||||||
|
+ return TRUE;
|
||||||
|
|
||||||
|
range->layout->mouse_x = event->x;
|
||||||
|
range->layout->mouse_y = event->y;
|
||||||
|
@@ -1429,7 +1439,7 @@
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
- return FALSE;
|
||||||
|
+ return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
--- gtk+-2.8.6/gtk/gtkentry.c.orig 2005-09-02 21:51:06 +0200
|
||||||
|
+++ gtk+-2.8.6/gtk/gtkentry.c 2005-12-07 21:21:12 +0100
|
||||||
|
@@ -597,6 +597,15 @@
|
||||||
|
0.0,
|
||||||
|
GTK_PARAM_READWRITE));
|
||||||
|
|
||||||
|
+ gtk_widget_class_install_style_property (widget_class,
|
||||||
|
+ g_param_spec_int ("min_width",
|
||||||
|
+ _("Minimum width"),
|
||||||
|
+ _("Minimum width of the entry field"),
|
||||||
|
+ 0,
|
||||||
|
+ G_MAXINT,
|
||||||
|
+ MIN_ENTRY_WIDTH,
|
||||||
|
+ G_PARAM_READABLE));
|
||||||
|
+
|
||||||
|
signals[POPULATE_POPUP] =
|
||||||
|
g_signal_new ("populate_popup",
|
||||||
|
G_OBJECT_CLASS_TYPE (gobject_class),
|
||||||
|
@@ -1227,7 +1236,7 @@
|
||||||
|
{
|
||||||
|
GtkEntry *entry = GTK_ENTRY (widget);
|
||||||
|
PangoFontMetrics *metrics;
|
||||||
|
- gint xborder, yborder;
|
||||||
|
+ gint xborder, yborder, min_width;
|
||||||
|
PangoContext *context;
|
||||||
|
|
||||||
|
gtk_widget_ensure_style (widget);
|
||||||
|
@@ -1243,9 +1252,11 @@
|
||||||
|
|
||||||
|
xborder += INNER_BORDER;
|
||||||
|
yborder += INNER_BORDER;
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+ gtk_widget_style_get (widget, "min_width", &min_width, NULL);
|
||||||
|
+
|
||||||
|
if (entry->width_chars < 0)
|
||||||
|
- requisition->width = MIN_ENTRY_WIDTH + xborder * 2;
|
||||||
|
+ requisition->width = min_width + xborder * 2;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
|
||||||
|
--- gtk+-2.8.6/gtk/gtkarrow.c.orig 2005-06-21 17:38:39 +0200
|
||||||
|
+++ gtk+-2.8.6/gtk/gtkarrow.c 2005-12-07 21:21:12 +0100
|
||||||
|
@@ -31,7 +31,7 @@
|
||||||
|
#include "gtkintl.h"
|
||||||
|
#include "gtkalias.h"
|
||||||
|
|
||||||
|
-#define MIN_ARROW_SIZE 15
|
||||||
|
+#define MIN_ARROW_SIZE 7
|
||||||
|
|
||||||
|
enum {
|
||||||
|
PROP_0,
|
||||||
|
@@ -55,6 +55,8 @@
|
||||||
|
guint prop_id,
|
||||||
|
GValue *value,
|
||||||
|
GParamSpec *pspec);
|
||||||
|
+static void gtk_arrow_size_request (GtkWidget *arrow,
|
||||||
|
+ GtkRequisition *requisition);
|
||||||
|
|
||||||
|
GType
|
||||||
|
gtk_arrow_get_type (void)
|
||||||
|
@@ -113,6 +115,7 @@
|
||||||
|
GTK_PARAM_READWRITE));
|
||||||
|
|
||||||
|
widget_class->expose_event = gtk_arrow_expose;
|
||||||
|
+ widget_class->size_request = gtk_arrow_size_request;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
@@ -168,13 +171,18 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
+gtk_arrow_size_request (GtkWidget *arrow,
|
||||||
|
+ GtkRequisition *requisition)
|
||||||
|
+{
|
||||||
|
+ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
|
||||||
|
+ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
gtk_arrow_init (GtkArrow *arrow)
|
||||||
|
{
|
||||||
|
GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
|
||||||
|
|
||||||
|
- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
|
||||||
|
- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
|
||||||
|
-
|
||||||
|
arrow->arrow_type = GTK_ARROW_RIGHT;
|
||||||
|
arrow->shadow_type = GTK_SHADOW_OUT;
|
||||||
|
}
|
||||||
|
--- gtk+-2.8.6/gtk/gtkcalendar.c.orig 2005-12-07 21:36:14 +0100
|
||||||
|
+++ gtk+-2.8.6/gtk/gtkcalendar.c 2005-12-07 21:49:21 +0100
|
||||||
|
@@ -692,6 +692,35 @@
|
||||||
|
****************************************/
|
||||||
|
|
||||||
|
static void
|
||||||
|
+calendar_select_day (GtkCalendar *calendar, guint day)
|
||||||
|
+{
|
||||||
|
+ g_return_if_fail (GTK_IS_CALENDAR (calendar));
|
||||||
|
+ g_return_if_fail (day <= 31);
|
||||||
|
+
|
||||||
|
+ /* Deselect the old day */
|
||||||
|
+ if (calendar->selected_day > 0)
|
||||||
|
+ {
|
||||||
|
+ gint selected_day;
|
||||||
|
+
|
||||||
|
+ selected_day = calendar->selected_day;
|
||||||
|
+ calendar->selected_day = 0;
|
||||||
|
+ if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
|
||||||
|
+ calendar_invalidate_day_num (calendar, selected_day);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ calendar->selected_day = day;
|
||||||
|
+
|
||||||
|
+ /* Select the new day */
|
||||||
|
+ if (day != 0)
|
||||||
|
+ {
|
||||||
|
+ if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
|
||||||
|
+ calendar_invalidate_day_num (calendar, day);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ g_object_notify (G_OBJECT (calendar), "day");
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
calendar_set_month_next (GtkCalendar *calendar)
|
||||||
|
{
|
||||||
|
gint month_len;
|
||||||
|
@@ -723,10 +752,10 @@
|
||||||
|
if (month_len < calendar->selected_day)
|
||||||
|
{
|
||||||
|
calendar->selected_day = 0;
|
||||||
|
- gtk_calendar_select_day (calendar, month_len);
|
||||||
|
+ calendar_select_day (calendar, month_len);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
- gtk_calendar_select_day (calendar, calendar->selected_day);
|
||||||
|
+ calendar_select_day (calendar, calendar->selected_day);
|
||||||
|
|
||||||
|
gtk_widget_queue_draw (GTK_WIDGET (calendar));
|
||||||
|
}
|
||||||
|
@@ -752,10 +781,10 @@
|
||||||
|
if (month_len < calendar->selected_day)
|
||||||
|
{
|
||||||
|
calendar->selected_day = 0;
|
||||||
|
- gtk_calendar_select_day (calendar, month_len);
|
||||||
|
+ calendar_select_day (calendar, month_len);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
- gtk_calendar_select_day (calendar, calendar->selected_day);
|
||||||
|
+ calendar_select_day (calendar, calendar->selected_day);
|
||||||
|
|
||||||
|
gtk_widget_queue_draw (GTK_WIDGET (calendar));
|
||||||
|
}
|
||||||
|
@@ -784,10 +813,10 @@
|
||||||
|
if (month_len < calendar->selected_day)
|
||||||
|
{
|
||||||
|
calendar->selected_day = 0;
|
||||||
|
- gtk_calendar_select_day (calendar, month_len);
|
||||||
|
+ calendar_select_day (calendar, month_len);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
- gtk_calendar_select_day (calendar, calendar->selected_day);
|
||||||
|
+ calendar_select_day (calendar, calendar->selected_day);
|
||||||
|
|
||||||
|
gtk_widget_queue_draw (GTK_WIDGET (calendar));
|
||||||
|
}
|
||||||
|
@@ -1088,13 +1117,13 @@
|
||||||
|
if (month_len < calendar->selected_day)
|
||||||
|
{
|
||||||
|
calendar->selected_day = 0;
|
||||||
|
- gtk_calendar_select_day (calendar, month_len);
|
||||||
|
+ calendar_select_day (calendar, month_len);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (calendar->selected_day < 0)
|
||||||
|
calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
|
||||||
|
- gtk_calendar_select_day (calendar, calendar->selected_day);
|
||||||
|
+ calendar_select_day (calendar, calendar->selected_day);
|
||||||
|
}
|
||||||
|
|
||||||
|
gtk_widget_queue_draw (GTK_WIDGET (calendar));
|
||||||
|
@@ -3285,27 +3314,7 @@
|
||||||
|
g_return_if_fail (GTK_IS_CALENDAR (calendar));
|
||||||
|
g_return_if_fail (day <= 31);
|
||||||
|
|
||||||
|
- /* Deselect the old day */
|
||||||
|
- if (calendar->selected_day > 0)
|
||||||
|
- {
|
||||||
|
- gint selected_day;
|
||||||
|
-
|
||||||
|
- selected_day = calendar->selected_day;
|
||||||
|
- calendar->selected_day = 0;
|
||||||
|
- if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
|
||||||
|
- calendar_invalidate_day_num (calendar, selected_day);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- calendar->selected_day = day;
|
||||||
|
-
|
||||||
|
- /* Select the new day */
|
||||||
|
- if (day != 0)
|
||||||
|
- {
|
||||||
|
- if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
|
||||||
|
- calendar_invalidate_day_num (calendar, day);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- g_object_notify (G_OBJECT (calendar), "day");
|
||||||
|
+ calendar_select_day (calendar, day);
|
||||||
|
|
||||||
|
g_signal_emit (calendar,
|
||||||
|
gtk_calendar_signals[DAY_SELECTED_SIGNAL],
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
--- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
|
||||||
|
+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100
|
||||||
|
@@ -1623,6 +1623,7 @@
|
||||||
|
|
||||||
|
/* We have to clear the layout, fonts etc. may have changed */
|
||||||
|
gtk_label_clear_layout (label);
|
||||||
|
+ gtk_widget_queue_resize (GTK_WIDGET (label));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
--- gtk+-2.6.0/configure.in.old 2005-01-01 16:23:45.000000000 +0000
|
||||||
|
+++ gtk+-2.6.0/configure.in 2005-01-01 16:24:03.000000000 +0000
|
||||||
|
@@ -360,7 +360,7 @@
|
||||||
|
AC_MSG_CHECKING([Whether to write dependencies into .pc files])
|
||||||
|
case $enable_explicit_deps in
|
||||||
|
auto)
|
||||||
|
- deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
|
||||||
|
+ deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh`
|
||||||
|
if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
|
||||||
|
enable_explicit_deps=yes
|
||||||
|
else
|
||||||
|
@@ -688,7 +688,7 @@
|
||||||
|
dnl Now we check to see if our libtool supports shared lib deps
|
||||||
|
dnl (in a rather ugly way even)
|
||||||
|
if $dynworks; then
|
||||||
|
- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
|
||||||
|
+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
|
||||||
|
pixbuf_deplibs_check=`$pixbuf_libtool_config | \
|
||||||
|
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
|
||||||
|
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
|
||||||
|
@@ -1512,7 +1512,7 @@
|
||||||
|
#
|
||||||
|
# We are using gmodule-no-export now, but I'm leaving the stripping
|
||||||
|
# code in place for now, since pango and atk still require gmodule.
|
||||||
|
-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||||||
|
+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||||||
|
if test -n "$export_dynamic"; then
|
||||||
|
GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
|
||||||
|
GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
--- gtk+-2.4.4/gtk/gtkmenushell.c.old Thu Aug 26 23:45:28 2004
|
||||||
|
+++ gtk+-2.4.4/gtk/gtkmenushell.c Fri Aug 27 00:13:33 2004
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
#include "gtktearoffmenuitem.h"
|
||||||
|
#include "gtkwindow.h"
|
||||||
|
|
||||||
|
-#define MENU_SHELL_TIMEOUT 500
|
||||||
|
+#define MENU_SHELL_TIMEOUT 2000
|
||||||
|
|
||||||
|
enum {
|
||||||
|
DEACTIVATE,
|
||||||
|
@@ -156,6 +156,7 @@
|
||||||
|
static GtkContainerClass *parent_class = NULL;
|
||||||
|
static guint menu_shell_signals[LAST_SIGNAL] = { 0 };
|
||||||
|
|
||||||
|
+static int last_crossing_time;
|
||||||
|
|
||||||
|
GType
|
||||||
|
gtk_menu_shell_get_type (void)
|
||||||
|
@@ -418,6 +419,7 @@
|
||||||
|
gtk_grab_add (GTK_WIDGET (menu_shell));
|
||||||
|
menu_shell->have_grab = TRUE;
|
||||||
|
menu_shell->active = TRUE;
|
||||||
|
+ last_crossing_time = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -545,6 +547,13 @@
|
||||||
|
menu_shell->activate_time = 0;
|
||||||
|
deactivate = FALSE;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ if (last_crossing_time != 0
|
||||||
|
+ && ((event->time - last_crossing_time) < 500))
|
||||||
|
+ {
|
||||||
|
+ last_crossing_time = 0;
|
||||||
|
+ deactivate = FALSE;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (deactivate)
|
||||||
|
{
|
||||||
|
@@ -597,6 +606,8 @@
|
||||||
|
if (menu_shell->active)
|
||||||
|
{
|
||||||
|
menu_item = gtk_get_event_widget ((GdkEvent*) event);
|
||||||
|
+
|
||||||
|
+ last_crossing_time = event->time;
|
||||||
|
|
||||||
|
if (!menu_item ||
|
||||||
|
(GTK_IS_MENU_ITEM (menu_item) &&
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
--- gtk+-2.8.6/Makefile.am.orig 2005-12-07 21:30:56 +0100
|
||||||
|
+++ gtk+-2.8.6/Makefile.am 2005-12-07 21:31:10 +0100
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
## Makefile.am for GTK+
|
||||||
|
|
||||||
|
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
|
||||||
|
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
|
||||||
|
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
|
||||||
|
|
||||||
|
# require automake 1.4
|
||||||
+151
@@ -0,0 +1,151 @@
|
|||||||
|
diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
|
||||||
|
--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00
|
||||||
|
+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00
|
||||||
|
@@ -576,12 +576,14 @@
|
||||||
|
GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+#ifdef HAVE_XWC
|
||||||
|
else if (font->type == GDK_FONT_FONTSET)
|
||||||
|
{
|
||||||
|
XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
|
||||||
|
XmbDrawString (xdisplay, impl->xid,
|
||||||
|
fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
else
|
||||||
|
g_error("undefined font type\n");
|
||||||
|
}
|
||||||
|
@@ -613,6 +615,7 @@
|
||||||
|
GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
|
||||||
|
g_free (text_8bit);
|
||||||
|
}
|
||||||
|
+#ifdef HAVE_XWC
|
||||||
|
else if (font->type == GDK_FONT_FONTSET)
|
||||||
|
{
|
||||||
|
if (sizeof(GdkWChar) == sizeof(wchar_t))
|
||||||
|
@@ -633,6 +636,7 @@
|
||||||
|
g_free (text_wchar);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
else
|
||||||
|
g_error("undefined font type\n");
|
||||||
|
}
|
||||||
|
diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
|
||||||
|
--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00
|
||||||
|
+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00
|
||||||
|
@@ -525,10 +525,12 @@
|
||||||
|
width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
+#ifdef HAVE_XWC
|
||||||
|
case GDK_FONT_FONTSET:
|
||||||
|
fontset = (XFontSet) private->xfont;
|
||||||
|
width = XmbTextEscapement (fontset, text, text_length);
|
||||||
|
break;
|
||||||
|
+#endif
|
||||||
|
default:
|
||||||
|
width = 0;
|
||||||
|
}
|
||||||
|
@@ -578,6 +580,7 @@
|
||||||
|
width = 0;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
+#ifdef HAVE_XWC
|
||||||
|
case GDK_FONT_FONTSET:
|
||||||
|
if (sizeof(GdkWChar) == sizeof(wchar_t))
|
||||||
|
{
|
||||||
|
@@ -595,6 +598,7 @@
|
||||||
|
g_free (text_wchar);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
+#endif
|
||||||
|
default:
|
||||||
|
width = 0;
|
||||||
|
}
|
||||||
|
@@ -667,6 +671,7 @@
|
||||||
|
if (descent)
|
||||||
|
*descent = overall.descent;
|
||||||
|
break;
|
||||||
|
+#ifdef HAVE_XWC
|
||||||
|
case GDK_FONT_FONTSET:
|
||||||
|
fontset = (XFontSet) private->xfont;
|
||||||
|
XmbTextExtents (fontset, text, text_length, &ink, &logical);
|
||||||
|
@@ -681,6 +686,7 @@
|
||||||
|
if (descent)
|
||||||
|
*descent = ink.y + ink.height;
|
||||||
|
break;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
@@ -753,6 +759,7 @@
|
||||||
|
*descent = overall.descent;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
+#ifdef HAVE_XWC
|
||||||
|
case GDK_FONT_FONTSET:
|
||||||
|
fontset = (XFontSet) private->xfont;
|
||||||
|
|
||||||
|
@@ -780,6 +787,7 @@
|
||||||
|
if (descent)
|
||||||
|
*descent = ink.y + ink.height;
|
||||||
|
break;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
|
||||||
|
--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00
|
||||||
|
+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00
|
||||||
|
@@ -48,6 +48,7 @@
|
||||||
|
void
|
||||||
|
_gdk_x11_initialize_locale (void)
|
||||||
|
{
|
||||||
|
+#ifdef HAVE_XWC
|
||||||
|
wchar_t result;
|
||||||
|
gchar *current_locale;
|
||||||
|
static char *last_locale = NULL;
|
||||||
|
@@ -93,7 +94,8 @@
|
||||||
|
GDK_NOTE (XIM,
|
||||||
|
g_message ("%s multi-byte string functions.",
|
||||||
|
gdk_use_mb ? "Using" : "Not using"));
|
||||||
|
-
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -136,6 +138,7 @@
|
||||||
|
{
|
||||||
|
gchar *mbstr;
|
||||||
|
|
||||||
|
+#ifdef HAVE_XWC
|
||||||
|
if (gdk_use_mb)
|
||||||
|
{
|
||||||
|
GdkDisplay *display = find_a_display ();
|
||||||
|
@@ -178,6 +181,7 @@
|
||||||
|
XFree (tpr.value);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
gint length = 0;
|
||||||
|
gint i;
|
||||||
|
@@ -210,6 +214,7 @@
|
||||||
|
gint
|
||||||
|
gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
|
||||||
|
{
|
||||||
|
+#ifdef HAVE_XWC
|
||||||
|
if (gdk_use_mb)
|
||||||
|
{
|
||||||
|
GdkDisplay *display = find_a_display ();
|
||||||
|
@@ -242,6 +247,7 @@
|
||||||
|
return len_cpy;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
gint i;
|
||||||
|
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
--- gtk+-2.4.4/gtk/gtkrange.c~ 2004-08-23 01:50:22.000000000 +0100
|
||||||
|
+++ gtk+-2.4.4/gtk/gtkrange.c 2004-08-27 15:48:49.000000000 +0100
|
||||||
|
@@ -35,9 +35,9 @@
|
||||||
|
#include "gtkintl.h"
|
||||||
|
#include "gtkscrollbar.h"
|
||||||
|
|
||||||
|
-#define SCROLL_INITIAL_DELAY 250 /* must hold button this long before ... */
|
||||||
|
-#define SCROLL_LATER_DELAY 100 /* ... it starts repeating at this rate */
|
||||||
|
-#define UPDATE_DELAY 300 /* Delay for queued update */
|
||||||
|
+#define SCROLL_INITIAL_DELAY 500 /* must hold button this long before ... */
|
||||||
|
+#define SCROLL_LATER_DELAY 200 /* ... it starts repeating at this rate */
|
||||||
|
+#define UPDATE_DELAY 1000 /* Delay for queued update */
|
||||||
|
|
||||||
|
enum {
|
||||||
|
PROP_0,
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
--- gtk+-2.8.6/gtk/gtkfilesel.c.orig 2005-12-07 21:13:33 +0100
|
||||||
|
+++ gtk+-2.8.6/gtk/gtkfilesel.c 2005-12-07 21:14:56 +0100
|
||||||
|
@@ -2461,6 +2461,33 @@
|
||||||
|
if (fs->last_selected != NULL)
|
||||||
|
g_free (fs->last_selected);
|
||||||
|
|
||||||
|
+ // Single-click directory entry
|
||||||
|
+ if (new_names->len == 1)
|
||||||
|
+ {
|
||||||
|
+ GtkTreeView *tree_view;
|
||||||
|
+ GtkTreeModel *model;
|
||||||
|
+ GtkTreePath *path;
|
||||||
|
+ GtkTreeIter iter;
|
||||||
|
+ gboolean is_file;
|
||||||
|
+
|
||||||
|
+ tree_view = gtk_tree_selection_get_tree_view (selection);
|
||||||
|
+
|
||||||
|
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
|
||||||
|
+ {
|
||||||
|
+ path = gtk_tree_model_get_path (model, &iter);
|
||||||
|
+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
|
||||||
|
+
|
||||||
|
+ if (!is_file)
|
||||||
|
+ {
|
||||||
|
+ gtk_file_selection_dir_activate (tree_view, path,
|
||||||
|
+ gtk_tree_view_get_column (tree_view, DIR_COLUMN),
|
||||||
|
+ user_data);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ gtk_tree_path_free (path);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
fs->last_selected = g_strdup (g_ptr_array_index (new_names, index));
|
||||||
|
filename = get_real_filename (fs->last_selected, FALSE);
|
||||||
|
|
||||||
@@ -0,0 +1,267 @@
|
|||||||
|
diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
|
||||||
|
--- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100
|
||||||
|
+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100
|
||||||
|
@@ -68,6 +68,7 @@
|
||||||
|
#include "gtkprivate.h"
|
||||||
|
#include "gtkscrolledwindow.h"
|
||||||
|
#include "gtkstock.h"
|
||||||
|
+#include "gtksignal.h"
|
||||||
|
#include "gtktreeselection.h"
|
||||||
|
#include "gtktreeview.h"
|
||||||
|
#include "gtkvbox.h"
|
||||||
|
@@ -77,6 +78,7 @@
|
||||||
|
#include "gtkmessagedialog.h"
|
||||||
|
#include "gtkdnd.h"
|
||||||
|
#include "gtkeventbox.h"
|
||||||
|
+#include "gtkimage.h"
|
||||||
|
|
||||||
|
#undef GTK_DISABLE_DEPRECATED
|
||||||
|
#include "gtkoptionmenu.h"
|
||||||
|
@@ -245,7 +247,8 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
enum {
|
||||||
|
- DIR_COLUMN
|
||||||
|
+ DIR_COLUMN,
|
||||||
|
+ ISFILE_COLUMN
|
||||||
|
};
|
||||||
|
|
||||||
|
enum {
|
||||||
|
@@ -400,6 +403,12 @@
|
||||||
|
GtkTreePath *path,
|
||||||
|
GtkTreeViewColumn *column,
|
||||||
|
gpointer user_data);
|
||||||
|
+
|
||||||
|
+static void gtk_file_selection_activate (GtkTreeView *tree_view,
|
||||||
|
+ GtkTreePath *path,
|
||||||
|
+ GtkTreeViewColumn *column,
|
||||||
|
+ gpointer user_data);
|
||||||
|
+
|
||||||
|
static void gtk_file_selection_file_changed (GtkTreeSelection *selection,
|
||||||
|
gpointer user_data);
|
||||||
|
static void gtk_file_selection_dir_activate (GtkTreeView *tree_view,
|
||||||
|
@@ -419,6 +428,7 @@
|
||||||
|
static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data);
|
||||||
|
static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data);
|
||||||
|
static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data);
|
||||||
|
+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style);
|
||||||
|
|
||||||
|
static void free_selected_names (GPtrArray *names);
|
||||||
|
|
||||||
|
@@ -578,6 +588,23 @@
|
||||||
|
G_PARAM_WRITABLE));
|
||||||
|
object_class->destroy = gtk_file_selection_destroy;
|
||||||
|
widget_class->map = gtk_file_selection_map;
|
||||||
|
+ widget_class->style_set = gtk_file_selection_style_set;
|
||||||
|
+
|
||||||
|
+ gtk_widget_class_install_style_property (widget_class,
|
||||||
|
+ g_param_spec_boolean ("show_fileops_default",
|
||||||
|
+ _("Show fileop buttons by default"),
|
||||||
|
+ _("Whether file operation buttons are shown by default"),
|
||||||
|
+ TRUE,
|
||||||
|
+ G_PARAM_READABLE));
|
||||||
|
+
|
||||||
|
+ gtk_widget_class_install_style_property (widget_class,
|
||||||
|
+ g_param_spec_int ("border_width",
|
||||||
|
+ _("Border width"),
|
||||||
|
+ _("Width of border around the main dialog area"),
|
||||||
|
+ 0,
|
||||||
|
+ G_MAXINT,
|
||||||
|
+ 10,
|
||||||
|
+ G_PARAM_READABLE));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void gtk_file_selection_set_property (GObject *object,
|
||||||
|
@@ -649,7 +676,29 @@
|
||||||
|
gtk_widget_grab_default (widget);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+gtk_file_selection_style_set (GtkWidget *filesel,
|
||||||
|
+ GtkStyle *prev_style)
|
||||||
|
+{
|
||||||
|
+ gboolean show_fileops;
|
||||||
|
+ gint border_width;
|
||||||
|
+
|
||||||
|
+ gtk_widget_style_get (filesel,
|
||||||
|
+ "show_fileops_default",
|
||||||
|
+ &show_fileops,
|
||||||
|
+ "border_width",
|
||||||
|
+ &border_width,
|
||||||
|
+ NULL);
|
||||||
|
+
|
||||||
|
+ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width);
|
||||||
|
+
|
||||||
|
+ if (show_fileops)
|
||||||
|
+ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel));
|
||||||
|
+ else
|
||||||
|
+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static void
|
||||||
|
gtk_file_selection_init (GtkFileSelection *filesel)
|
||||||
|
{
|
||||||
|
@@ -674,17 +723,15 @@
|
||||||
|
|
||||||
|
/* The dialog-sized vertical box */
|
||||||
|
filesel->main_vbox = dialog->vbox;
|
||||||
|
- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
|
||||||
|
|
||||||
|
/* The horizontal box containing create, rename etc. buttons */
|
||||||
|
filesel->button_area = gtk_hbutton_box_new ();
|
||||||
|
gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START);
|
||||||
|
- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0);
|
||||||
|
gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area,
|
||||||
|
FALSE, FALSE, 0);
|
||||||
|
gtk_widget_show (filesel->button_area);
|
||||||
|
|
||||||
|
- gtk_file_selection_show_fileop_buttons (filesel);
|
||||||
|
+ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL);
|
||||||
|
|
||||||
|
/* hbox for pulldown menu */
|
||||||
|
pulldown_hbox = gtk_hbox_new (TRUE, 5);
|
||||||
|
@@ -723,25 +770,32 @@
|
||||||
|
|
||||||
|
/* The directories list */
|
||||||
|
|
||||||
|
- model = gtk_list_store_new (1, G_TYPE_STRING);
|
||||||
|
+ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */
|
||||||
|
filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
|
||||||
|
g_object_unref (model);
|
||||||
|
|
||||||
|
- column = gtk_tree_view_column_new_with_attributes (_("Folders"),
|
||||||
|
+ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL,
|
||||||
|
gtk_cell_renderer_text_new (),
|
||||||
|
"text", DIR_COLUMN,
|
||||||
|
NULL);
|
||||||
|
label = gtk_label_new_with_mnemonic (_("Fol_ders"));
|
||||||
|
gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list);
|
||||||
|
gtk_widget_show (label);
|
||||||
|
- gtk_tree_view_column_set_widget (column, label);
|
||||||
|
+
|
||||||
|
+ /* gtk_tree_view_column_set_widget (column, label); */
|
||||||
|
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE);
|
||||||
|
+
|
||||||
|
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
|
||||||
|
gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column);
|
||||||
|
|
||||||
|
gtk_widget_set_size_request (filesel->dir_list,
|
||||||
|
DIR_LIST_WIDTH, DIR_LIST_HEIGHT);
|
||||||
|
g_signal_connect (filesel->dir_list, "row_activated",
|
||||||
|
- G_CALLBACK (gtk_file_selection_dir_activate), filesel);
|
||||||
|
+ G_CALLBACK (gtk_file_selection_activate), filesel);
|
||||||
|
+
|
||||||
|
+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed",
|
||||||
|
+ G_CALLBACK (gtk_file_selection_file_changed), filesel);
|
||||||
|
+
|
||||||
|
|
||||||
|
/* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */
|
||||||
|
|
||||||
|
@@ -758,41 +812,6 @@
|
||||||
|
gtk_widget_show (filesel->dir_list);
|
||||||
|
gtk_widget_show (scrolled_win);
|
||||||
|
|
||||||
|
- /* The files list */
|
||||||
|
- model = gtk_list_store_new (1, G_TYPE_STRING);
|
||||||
|
- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
|
||||||
|
- g_object_unref (model);
|
||||||
|
-
|
||||||
|
- column = gtk_tree_view_column_new_with_attributes (_("Files"),
|
||||||
|
- gtk_cell_renderer_text_new (),
|
||||||
|
- "text", FILE_COLUMN,
|
||||||
|
- NULL);
|
||||||
|
- label = gtk_label_new_with_mnemonic (_("_Files"));
|
||||||
|
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list);
|
||||||
|
- gtk_widget_show (label);
|
||||||
|
- gtk_tree_view_column_set_widget (column, label);
|
||||||
|
- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
|
||||||
|
- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column);
|
||||||
|
-
|
||||||
|
- gtk_widget_set_size_request (filesel->file_list,
|
||||||
|
- FILE_LIST_WIDTH, FILE_LIST_HEIGHT);
|
||||||
|
- g_signal_connect (filesel->file_list, "row_activated",
|
||||||
|
- G_CALLBACK (gtk_file_selection_file_activate), filesel);
|
||||||
|
- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed",
|
||||||
|
- G_CALLBACK (gtk_file_selection_file_changed), filesel);
|
||||||
|
-
|
||||||
|
- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */
|
||||||
|
-
|
||||||
|
- scrolled_win = gtk_scrolled_window_new (NULL, NULL);
|
||||||
|
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN);
|
||||||
|
- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list);
|
||||||
|
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
|
||||||
|
- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
|
||||||
|
- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0);
|
||||||
|
- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win);
|
||||||
|
- gtk_widget_show (filesel->file_list);
|
||||||
|
- gtk_widget_show (scrolled_win);
|
||||||
|
-
|
||||||
|
/* action area for packing buttons into. */
|
||||||
|
filesel->action_area = gtk_hbox_new (TRUE, 0);
|
||||||
|
gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area,
|
||||||
|
@@ -2008,6 +2027,23 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
+gtk_file_selection_activate (GtkTreeView *tree_view,
|
||||||
|
+ GtkTreePath *path,
|
||||||
|
+ GtkTreeViewColumn *column,
|
||||||
|
+ gpointer user_data)
|
||||||
|
+{
|
||||||
|
+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
|
||||||
|
+ GtkTreeIter iter;
|
||||||
|
+ gboolean is_file;
|
||||||
|
+
|
||||||
|
+ gtk_tree_model_get_iter (model, &iter, path);
|
||||||
|
+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
|
||||||
|
+
|
||||||
|
+ if (! is_file)
|
||||||
|
+ gtk_file_selection_dir_activate (tree_view, path, column, user_data);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
gtk_file_selection_file_activate (GtkTreeView *tree_view,
|
||||||
|
GtkTreePath *path,
|
||||||
|
GtkTreeViewColumn *column,
|
||||||
|
@@ -2103,7 +2139,6 @@
|
||||||
|
PossibleCompletion* poss;
|
||||||
|
GtkTreeIter iter;
|
||||||
|
GtkListStore *dir_model;
|
||||||
|
- GtkListStore *file_model;
|
||||||
|
gchar* filename;
|
||||||
|
gchar* rem_path = rel_path;
|
||||||
|
gchar* sel_text;
|
||||||
|
@@ -2125,10 +2160,8 @@
|
||||||
|
g_assert (cmpl_state->reference_dir);
|
||||||
|
|
||||||
|
dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list)));
|
||||||
|
- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list)));
|
||||||
|
|
||||||
|
gtk_list_store_clear (dir_model);
|
||||||
|
- gtk_list_store_clear (file_model);
|
||||||
|
|
||||||
|
/* Set the dir list to include ./ and ../ */
|
||||||
|
gtk_list_store_append (dir_model, &iter);
|
||||||
|
@@ -2150,13 +2183,17 @@
|
||||||
|
strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0)
|
||||||
|
{
|
||||||
|
gtk_list_store_append (dir_model, &iter);
|
||||||
|
- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1);
|
||||||
|
+ gtk_list_store_set (dir_model, &iter,
|
||||||
|
+ DIR_COLUMN, filename,
|
||||||
|
+ ISFILE_COLUMN, FALSE, -1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- gtk_list_store_append (file_model, &iter);
|
||||||
|
- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1);
|
||||||
|
+ gtk_list_store_append (dir_model, &iter);
|
||||||
|
+ gtk_list_store_set (dir_model, &iter,
|
||||||
|
+ DIR_COLUMN, filename,
|
||||||
|
+ ISFILE_COLUMN, TRUE, -1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,128 @@
|
|||||||
|
--- gtk+-2.4.3/gtk/gtkspinbutton.c.old 2004-04-22 14:49:27.000000000 +0100
|
||||||
|
+++ gtk+-2.4.3/gtk/gtkspinbutton.c 2004-06-30 21:48:18.000000000 +0100
|
||||||
|
@@ -733,7 +733,7 @@
|
||||||
|
|
||||||
|
spin = GTK_SPIN_BUTTON (widget);
|
||||||
|
arrow_size = spin_button_get_arrow_size (spin);
|
||||||
|
- panel_width = arrow_size + 2 * widget->style->xthickness;
|
||||||
|
+ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness;
|
||||||
|
|
||||||
|
widget->allocation = *allocation;
|
||||||
|
|
||||||
|
@@ -866,19 +866,16 @@
|
||||||
|
{
|
||||||
|
width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
|
||||||
|
|
||||||
|
+ y = widget->style->ythickness;
|
||||||
|
+ height = widget->requisition.height - (2 * y);
|
||||||
|
+
|
||||||
|
if (arrow_type == GTK_ARROW_UP)
|
||||||
|
{
|
||||||
|
x = 0;
|
||||||
|
- y = 0;
|
||||||
|
-
|
||||||
|
- height = widget->requisition.height / 2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- x = 0;
|
||||||
|
- y = widget->requisition.height / 2;
|
||||||
|
-
|
||||||
|
- height = (widget->requisition.height + 1) / 2;
|
||||||
|
+ x = width;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spin_button_at_limit (spin_button, arrow_type))
|
||||||
|
@@ -908,32 +905,17 @@
|
||||||
|
shadow_type = GTK_SHADOW_OUT;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
gtk_paint_box (widget->style, spin_button->panel,
|
||||||
|
state_type, shadow_type,
|
||||||
|
NULL, widget,
|
||||||
|
- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
|
||||||
|
+ NULL,
|
||||||
|
x, y, width, height);
|
||||||
|
|
||||||
|
height = widget->requisition.height;
|
||||||
|
|
||||||
|
- if (arrow_type == GTK_ARROW_DOWN)
|
||||||
|
- {
|
||||||
|
- y = height / 2;
|
||||||
|
- height = height - y - 2;
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- {
|
||||||
|
- y = 2;
|
||||||
|
- height = height / 2 - 2;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
width -= 3;
|
||||||
|
-
|
||||||
|
- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
|
||||||
|
- x = 2;
|
||||||
|
- else
|
||||||
|
- x = 1;
|
||||||
|
+ height -= 3;
|
||||||
|
|
||||||
|
w = width / 2;
|
||||||
|
w -= w % 2 - 1; /* force odd */
|
||||||
|
@@ -1108,7 +1090,7 @@
|
||||||
|
if (GTK_ENTRY (widget)->editable)
|
||||||
|
gtk_spin_button_update (spin);
|
||||||
|
|
||||||
|
- if (event->y <= widget->requisition.height / 2)
|
||||||
|
+ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness))
|
||||||
|
{
|
||||||
|
if (event->button == 1)
|
||||||
|
start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
|
||||||
|
@@ -1143,44 +1125,11 @@
|
||||||
|
|
||||||
|
arrow_size = spin_button_get_arrow_size (spin);
|
||||||
|
|
||||||
|
- if (event->button == spin->button)
|
||||||
|
- {
|
||||||
|
- int click_child = spin->click_child;
|
||||||
|
+ gtk_spin_button_stop_spinning (spin);
|
||||||
|
|
||||||
|
- gtk_spin_button_stop_spinning (spin);
|
||||||
|
-
|
||||||
|
- if (event->button == 3)
|
||||||
|
- {
|
||||||
|
- if (event->y >= 0 && event->x >= 0 &&
|
||||||
|
- event->y <= widget->requisition.height &&
|
||||||
|
- event->x <= arrow_size + 2 * widget->style->xthickness)
|
||||||
|
- {
|
||||||
|
- if (click_child == GTK_ARROW_UP &&
|
||||||
|
- event->y <= widget->requisition.height / 2)
|
||||||
|
- {
|
||||||
|
- gdouble diff;
|
||||||
|
-
|
||||||
|
- diff = spin->adjustment->upper - spin->adjustment->value;
|
||||||
|
- if (diff > EPSILON)
|
||||||
|
- gtk_spin_button_real_spin (spin, diff);
|
||||||
|
- }
|
||||||
|
- else if (click_child == GTK_ARROW_DOWN &&
|
||||||
|
- event->y > widget->requisition.height / 2)
|
||||||
|
- {
|
||||||
|
- gdouble diff;
|
||||||
|
-
|
||||||
|
- diff = spin->adjustment->value - spin->adjustment->lower;
|
||||||
|
- if (diff > EPSILON)
|
||||||
|
- gtk_spin_button_real_spin (spin, -diff);
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- spin_button_redraw (spin);
|
||||||
|
+ spin_button_redraw (spin);
|
||||||
|
|
||||||
|
- return TRUE;
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
|
||||||
|
+ return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static gint
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
Index: gtktreeview.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/gtk+/gtk/gtktreeview.c,v
|
||||||
|
retrieving revision 1.498
|
||||||
|
diff -u -p -r1.498 gtktreeview.c
|
||||||
|
--- gtk+-2.8.9/gtk/gtktreeview.c.old 22 Oct 2005 21:08:23 -0000 1.498
|
||||||
|
+++ gtk+-2.8.9/gtk/gtktreeview.c 24 Oct 2005 22:30:27 -0000
|
||||||
|
@@ -2098,6 +2098,9 @@ gtk_tree_view_size_allocate (GtkWidget
|
||||||
|
/* now the adjustments and window sizes are in sync, we can sync toprow/dy again */
|
||||||
|
if (tree_view->priv->height <= tree_view->priv->vadjustment->page_size)
|
||||||
|
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0);
|
||||||
|
+ else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height)
|
||||||
|
+ gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment),
|
||||||
|
+ tree_view->priv->height - tree_view->priv->vadjustment->page_size);
|
||||||
|
else if (gtk_tree_row_reference_valid (tree_view->priv->top_row))
|
||||||
|
gtk_tree_view_top_row_to_dy (tree_view);
|
||||||
|
else
|
||||||
|
@ -5031,6 +5034,11 @@ validate_visible_area (GtkTreeView *tree
|
||||||
|
* else than zero. we update top_row to be in sync with dy = 0.
|
||||||
|
*/
|
||||||
|
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0);
|
||||||
|
+ gtk_tree_view_dy_to_top_row (tree_view);
|
||||||
|
+ }
|
||||||
|
+ else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height)
|
||||||
|
+ {
|
||||||
|
+ gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), tree_view->priv->height - tree_view->priv->vadjustment->page_size);
|
||||||
|
gtk_tree_view_dy_to_top_row (tree_view);
|
||||||
|
}
|
||||||
|
else
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
--- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004
|
||||||
|
+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
|
||||||
|
@@ -2827,10 +2827,9 @@
|
||||||
|
{
|
||||||
|
GdkScreenX11 *screen = data;
|
||||||
|
|
||||||
|
- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
|
||||||
|
- return GDK_FILTER_REMOVE;
|
||||||
|
- else
|
||||||
|
- return GDK_FILTER_CONTINUE;
|
||||||
|
+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
|
||||||
|
+
|
||||||
|
+ return GDK_FILTER_CONTINUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
LICENSE = "LGPL"
|
||||||
|
DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
|
||||||
|
set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
|
||||||
|
HOMEPAGE = "http://www.gtk.org"
|
||||||
|
SECTION = "libs"
|
||||||
|
PRIORITY = "optional"
|
||||||
|
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
|
||||||
|
DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo"
|
||||||
|
PR = "r0"
|
||||||
|
|
||||||
|
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
|
||||||
|
file://no-xwc.patch;patch=1 \
|
||||||
|
file://automake-lossage.patch;patch=1 \
|
||||||
|
file://spinbutton.patch;patch=1 \
|
||||||
|
file://hardcoded_libtool.patch;patch=1 \
|
||||||
|
file://disable-tooltips.patch;patch=1 \
|
||||||
|
file://gtklabel-resize-patch;patch=1 \
|
||||||
|
file://treeviewfix.patch;patch=1"
|
||||||
|
# file://menu-deactivate.patch;patch=1 \
|
||||||
|
# file://xsettings.patch;patch=1 \
|
||||||
|
# file://scroll-timings.patch;patch=1 \
|
||||||
|
# file://small-gtkfilesel.patch;patch=1 \
|
||||||
|
# file://migration.patch;patch=1;pnum=0 \
|
||||||
|
# file://no-demos.patch;patch=1 \
|
||||||
|
# file://gtk+-handhelds.patch;patch=1 \
|
||||||
|
# file://single-click.patch;patch=1"
|
||||||
|
|
||||||
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
|
FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
|
||||||
|
${bindir}/gtk-query-immodules-2.0 \
|
||||||
|
${libdir}/lib*.so.* \
|
||||||
|
${datadir}/themes ${sysconfdir} \
|
||||||
|
${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
|
||||||
|
FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
|
||||||
|
|
||||||
|
RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1"
|
||||||
|
|
||||||
|
EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
|
||||||
|
# --disable-cruft
|
||||||
|
|
||||||
|
LIBV = "2.4.0"
|
||||||
|
|
||||||
|
do_stage () {
|
||||||
|
oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
|
||||||
|
oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
|
||||||
|
oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
|
||||||
|
oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
|
||||||
|
|
||||||
|
autotools_stage_includes
|
||||||
|
|
||||||
|
mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
|
||||||
|
install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
|
||||||
|
|
||||||
|
install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install_append () {
|
||||||
|
install -d ${D}${sysconfdir}/gtk-2.0
|
||||||
|
}
|
||||||
|
|
||||||
|
postinst_prologue() {
|
||||||
|
if [ "x$D" != "x" ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
python populate_packages_prepend () {
|
||||||
|
import os.path
|
||||||
|
|
||||||
|
prologue = bb.data.getVar("postinst_prologue", d, 1)
|
||||||
|
|
||||||
|
gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
|
||||||
|
loaders_root = os.path.join(gtk_libdir, 'loaders')
|
||||||
|
immodules_root = os.path.join(gtk_libdir, 'immodules')
|
||||||
|
|
||||||
|
do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
|
||||||
|
do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
|
||||||
|
|
||||||
|
if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
|
||||||
|
bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user