summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog19
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac (renamed from configure.in)40
-rw-r--r--help/ChangeLog4
-rw-r--r--help/Makefile.am2
-rw-r--r--src/glade-editor-property.c110
-rw-r--r--src/glade-project-window.c2
7 files changed, 129 insertions, 50 deletions
diff --git a/ChangeLog b/ChangeLog
index f366ee77..f4e4073c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2007-01-17 Tristan Van Berkom <tvb@gnome.org>
+
+ * autogen.sh: renamed configure.in -> configure.ac
+
+2007-01-07 Vincent Geddes <vincent.geddes@gmail.com>
+
+ * configure.in: Quote some macro arguments. Use AS_HELP_STRING
+ to format the messages for AC_ARG_ENABLE macros. Other cleanups
+ and updates.
+
+ * src/glade-editor-property.c: Modified some dialogs for HIG
+ compliance. Mostly about adjusting border widths and spacings,
+ and setting mnemonics. Title for "Edit Text Property" dialog
+ is now a simpler "Edit Text". Title for "Select Flags" dialog
+ is also now a more descriptive "Select Events".
+
+ * src/glade-project-window.c: Set URL for online help to
+ "http://glade.gnome.org/manual/index.html".
+
2007-01-17 Christian Persch <chpe@svn.gnome.org>
* src/glade-accumulators.c:
diff --git a/autogen.sh b/autogen.sh
index c07fd7e2..17eefaad 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
PKG_NAME="glade"
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
&& test -f $srcdir/autogen.sh) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
diff --git a/configure.in b/configure.ac
index f69f1009..dc589526 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,16 +1,18 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT(glade3, 3.1.4,
- http://bugzilla.gnome.org/enter_bug.cgi?product=glade3)
+AC_INIT([glade3], [3.1.4],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=glade3])
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([src/glade.h])
+AC_CONFIG_MACRO_DIR([m4])
+
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
AM_MAINTAINER_MODE
-AC_CONFIG_HEADERS([config.h])
-
-AC_CONFIG_MACRO_DIR([m4])
IT_PROG_INTLTOOL([0.35.0])
@@ -55,7 +57,7 @@ GTK_DOC_CHECK(1.4)
dnl ================================================================
dnl Check for gtk+
dnl ================================================================
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0 libxml-2.0 >= 2.4.0)
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0 libxml-2.0 >= 2.4.0])
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
@@ -63,11 +65,11 @@ dnl ================================================================
dnl Check for optional gnome libs
dnl ================================================================
AC_ARG_ENABLE(gnome,
-[ --disable-gnome disable gnome catalog],
- check_gnome=$enableval, check_gnome=yes)
+ AS_HELP_STRING([--disable-gnome], [disable gnome catalog]),
+ check_gnome=$enableval, check_gnome=yes)
if test x"$check_gnome" = x"yes"; then
- PKG_CHECK_MODULES(GNOME, libbonoboui-2.0 libgnomeui-2.0,
+ PKG_CHECK_MODULES(GNOME, [libbonoboui-2.0 libgnomeui-2.0],
[have_gnome=yes],[have_gnome=no])
AC_SUBST(GNOME_LIBS)
AC_SUBST(GNOME_CFLAGS)
@@ -81,8 +83,8 @@ dnl ================================================================
dnl GNOME User Manual (requires gnome-doc-utils)
dnl ================================================================
AC_ARG_ENABLE(user_manual,
-[ --enable-user-manual Build GNOME user manual],
- enable_user_manual=yes, enable_user_manual=no)
+ AS_HELP_STRING([--enable-user-manual], [build GNOME user manual]),
+ enable_user_manual=yes, enable_user_manual=no)
if test x"$enable_user_manual" = "xyes"; then
GNOME_DOC_INIT
@@ -100,7 +102,7 @@ if test x"$enable_gnome" = "xyes" ; then
AC_PATH_PROG(SK_CONFIG, scrollkeeper-config, no)
if test x"$SK_CONFIG" = "xno"; then
- AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net)
+ AC_MSG_ERROR([Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net])
fi
fi
@@ -108,8 +110,8 @@ dnl ===============================================================
dnl Check for Python
dnl ================================================================
AC_ARG_ENABLE(python,
-[ --disable-python disable python scripting module],
- check_python=$enableval, check_python=yes)
+ AS_HELP_STRING([--disable-python], [disable python scripting module]),
+ check_python=$enableval, check_python=yes)
if test x"$check_python" = x"yes"; then
AC_PATH_PROGS([PYTHON], [python])
@@ -142,9 +144,12 @@ dnl ================================================================
dnl Check for windows
dnl ================================================================
case $host_os in
-*mingw* | pw32* | cygwin*)
- win32=yes
- ;;
+ *mingw* | pw32* | cygwin*)
+ win32=yes
+ ;;
+ *)
+ win32=no
+ ;;
esac
AM_CONDITIONAL(WITH_WIN32, test x"$win32" = "xyes")
@@ -178,4 +183,5 @@ Configuration:
Compiler: ${CC}
GnomeUI Catalog: ${have_gnome}
Python Binding: ${have_python}
+ GNOME User Manual: ${enable_user_manual}
"
diff --git a/help/ChangeLog b/help/ChangeLog
index 3081e115..83b354d2 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-14 Vincent Geddes <vincent.geddes@gmail.com>
+
+ * Makefile.am: added `sv' to DOC_LINGUAS.
+
2006-12-28 Daniel Nylander <po@danielnylander.se>
* sv/sv.po: Added Swedish translation.
diff --git a/help/Makefile.am b/help/Makefile.am
index 72bacfe2..3b95a9e5 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -5,3 +5,5 @@ dist-hook: doc-dist-hook
DOC_MODULE = glade
DOC_INCLUDES = legal.xml
DOC_FIGURES = figures/main-window.png
+
+DOC_LINGUAS = sv
diff --git a/src/glade-editor-property.c b/src/glade-editor-property.c
index 8427017c..069c9c5c 100644
--- a/src/glade-editor-property.c
+++ b/src/glade-editor-property.c
@@ -1110,29 +1110,46 @@ static void
glade_eprop_flags_show_dialog (GtkWidget *button,
GladeEditorProperty *eprop)
{
- GtkWidget *editor;
GtkWidget *dialog;
- GtkWidget *swindow;
- guint response_id ;
+ GtkWidget *view;
+ GtkWidget *label;
+ GtkWidget *vbox;
- editor = gtk_widget_get_toplevel (button);
- dialog = gtk_dialog_new_with_buttons (_("Set Flags"),
- GTK_WINDOW (editor),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
- GTK_RESPONSE_OK,
+ dialog = gtk_dialog_new_with_buttons (_("Select Fields"),
+ GTK_WINDOW (gtk_widget_get_toplevel (button)),
+ GTK_DIALOG_MODAL,
+ GTK_STOCK_CLOSE,
+ GTK_RESPONSE_CLOSE,
NULL);
+
gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 400);
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
+
+ /* HIG spacings */
+ gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2); /* 2 * 5 + 2 = 12 */
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 6);
- swindow = glade_eprop_flags_create_treeview (eprop);
- gtk_container_set_border_width (GTK_CONTAINER (swindow),
- GLADE_GENERIC_BORDER_WIDTH);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
- swindow, TRUE, TRUE, 0);
- response_id = gtk_dialog_run (GTK_DIALOG (dialog));
+ vbox = gtk_vbox_new (FALSE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+
+ view = glade_eprop_flags_create_treeview (eprop);
+
+ label = gtk_label_new_with_mnemonic (_("_Select individual fields:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), gtk_bin_get_child (GTK_BIN (view)));
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), view, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
+
+ gtk_widget_show (label);
+ gtk_widget_show (view);
+ gtk_widget_show (vbox);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
@@ -1434,11 +1451,11 @@ static void
glade_eprop_text_show_i18n_dialog (GtkWidget *entry,
GladeEditorProperty *eprop)
{
- GtkWidget *editor;
GtkWidget *dialog;
GtkWidget *vbox, *hbox;
GtkWidget *label;
GtkWidget *sw;
+ GtkWidget *alignment;
GtkWidget *text_view, *comment_view;
GtkTextBuffer *text_buffer, *comment_buffer;
GtkWidget *translatable_button, *context_button;
@@ -1447,22 +1464,31 @@ glade_eprop_text_show_i18n_dialog (GtkWidget *entry,
gchar *str;
GParamSpec *pspec;
-
- editor = gtk_widget_get_toplevel (entry);
- dialog = gtk_dialog_new_with_buttons (_("Edit Text Property"),
- GTK_WINDOW (editor),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ dialog = gtk_dialog_new_with_buttons (_("Edit Text"),
+ GTK_WINDOW (gtk_widget_get_toplevel (entry)),
+ GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+ gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+ GTK_RESPONSE_OK,
+ GTK_RESPONSE_CANCEL);
+
+ /* HIG spacings */
+ gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2); /* 2 * 5 + 2 = 12 */
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 6);
+
vbox = gtk_vbox_new (FALSE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
gtk_widget_show (vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), GLADE_GENERIC_BORDER_WIDTH);
-
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
/* Text */
@@ -1515,7 +1541,7 @@ glade_eprop_text_show_i18n_dialog (GtkWidget *entry,
glade_util_widget_set_tooltip (translatable_button,
g_param_spec_get_blurb (pspec));
- context_button = gtk_check_button_new_with_mnemonic (_("Has context _prefix"));
+ context_button = gtk_check_button_new_with_mnemonic (_("_Has context prefix"));
gtk_widget_show (context_button);
gtk_box_pack_start (GTK_BOX (hbox), context_button, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (context_button),
@@ -1528,11 +1554,16 @@ glade_eprop_text_show_i18n_dialog (GtkWidget *entry,
glade_util_widget_set_tooltip (context_button,
g_param_spec_get_blurb (pspec));
+ alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 0, 0, 0);
+ gtk_widget_show (alignment);
+
/* Comments. */
label = gtk_label_new_with_mnemonic (_("Co_mments for translators:"));
gtk_widget_show (label);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (alignment), label);
+ gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_show (sw);
@@ -1542,6 +1573,7 @@ glade_eprop_text_show_i18n_dialog (GtkWidget *entry,
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
comment_view = gtk_text_view_new ();
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (comment_view), GTK_WRAP_WORD);
gtk_widget_show (comment_view);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), comment_view);
@@ -2378,26 +2410,38 @@ glade_eprop_object_show_dialog (GtkWidget *dialog_button,
project = glade_widget_get_project (eprop->property->widget);
parent = gtk_widget_get_toplevel (GTK_WIDGET (eprop));
-
dialog = gtk_dialog_new_with_buttons (title,
GTK_WINDOW (parent),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_DIALOG_MODAL,
GTK_STOCK_CLEAR, GLADE_RESPONSE_CLEAR,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
g_free (title);
+
+ gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+ GTK_RESPONSE_OK,
+ GTK_RESPONSE_CANCEL,
+ GLADE_RESPONSE_CLEAR);
+
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+ /* HIG settings */
+ gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2); /* 2 * 5 + 2 = 12 */
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 6);
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), GLADE_GENERIC_BORDER_WIDTH);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
/* Checklist */
- label = gtk_label_new (_("Objects:"));
+ label = gtk_label_new_with_mnemonic (_("O_bjects:"));
gtk_widget_show (label);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
@@ -2420,6 +2464,9 @@ glade_eprop_object_show_dialog (GtkWidget *dialog_button,
gtk_widget_show (tree_view);
gtk_container_add (GTK_CONTAINER (sw), tree_view);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), tree_view);
+
+
/* Run the dialog */
res = gtk_dialog_run (GTK_DIALOG (dialog));
if (res == GTK_RESPONSE_OK)
@@ -2452,6 +2499,7 @@ glade_eprop_object_show_dialog (GtkWidget *dialog_button,
g_value_unset (value);
g_free (value);
}
+
gtk_widget_destroy (dialog);
}
diff --git a/src/glade-project-window.c b/src/glade-project-window.c
index 90eef5af..743948cb 100644
--- a/src/glade-project-window.c
+++ b/src/glade-project-window.c
@@ -42,7 +42,7 @@
#define READONLY_INDICATOR (_("[Read Only]"))
-#define GLADE_URL_USER_MANUAL "http://glade.gnome.org/doc/manual"
+#define GLADE_URL_USER_MANUAL "http://glade.gnome.org/manual/index.html"
#define GLADE_URL_DEVELOPER_MANUAL "http://glade.gnome.org/docs/index.html"
#define GLADE_PROJECT_WINDOW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
View Lorry Controller Status