Commit 81e2b8dc authored by Michael Meeks's avatar Michael Meeks Committed by Michael Meeks

use new eel_glade_get_file.

2002-07-02  Michael Meeks  <michael@ximian.com>

	* src/nautilus-bookmarks-window.c
	(create_bookmarks_window): use new eel_glade_get_file.

	* configure.in: hack libglade out, we use eel now,
	requires a recent eel.

	* data/browser.xml: add mnemonics

	* src/nautilus-property-browser.c
	(nautilus_property_browser_init): don't shrink the
	description text, un-bold description [ makes it
	look ugly, but hey ].
parent 2adbdf35
2002-07-02 Michael Meeks <michael@ximian.com>
* src/nautilus-bookmarks-window.c
(create_bookmarks_window): use new eel_glade_get_file.
* configure.in: hack libglade out, we use eel now,
requires a recent eel.
* data/browser.xml: add mnemonics
* src/nautilus-property-browser.c
(nautilus_property_browser_init): don't shrink the
description text, un-bold description [ makes it
look ugly, but hey ].
2002-07-02 Michael Meeks <michael@ximian.com>
* src/nautilus-bookmarks-window.c
......
......@@ -18,14 +18,12 @@ GTK_REQUIRED=2
MEDUSA_REQUIRED=0.5.1
RSVG_REQUIRED=1.1.6
XML_REQUIRED=2.4.7
LIBGLADE_REQUIRED=2.0.0
AC_SUBST(EEL_REQUIRED)
AC_SUBST(GNOME_VFS_REQUIRED)
AC_SUBST(MEDUSA_REQUIRED)
AC_SUBST(RSVG_REQUIRED)
AC_SUBST(XML_REQUIRED)
AC_SUBST(LIBGLADE_REQUIRED)
dnl ===========================================================================
......@@ -63,8 +61,7 @@ PKG_CHECK_MODULES(ALL, \
libgnomecanvas-2.0 >= $GNOME_CANVAS_REQUIRED \
libgnomeui-2.0 >= $GNOME_UI_REQUIRED \
librsvg-2.0 >= $RSVG_REQUIRED \
libxml-2.0 >= $XML_REQUIRED \
libglade-2.0 >= $LIBGLADE_REQUIRED)
libxml-2.0 >= $XML_REQUIRED)
dnl ==========================================================================
ALL_LINGUAS="az bg ca cs da de el en_GB es eu fi fr ga gl hu it ja ko lt lv ms nl nn no pl pt pt_BR ro ru sk sl sv ta tr uk vi zh_CN zh_TW"
......@@ -270,7 +267,7 @@ LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES |
AC_SUBST(LIBNAUTILUS_IDL_INCLUDES)
dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires")
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 libglade-2.0 $EXTRA_CORE_MODULES"
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
AC_SUBST(CORE_CFLAGS)
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
......
<?xml version="1.0"?>
<categories>
<category name="patterns" _display_name="Patterns" image="backgrounds.png" columns="5" mode="directory" path="nautilus/patterns" type="property/bgimage" _description="Drag a pattern tile to an object to change it">
<category name="patterns" _display_name="_Patterns" image="backgrounds.png"
columns="5" mode="directory" path="nautilus/patterns" type="property/bgimage"
_description="Drag a pattern tile to an object to change it">
<pattern _display_name="Blue Ridge" filename="blue_ridge"/>
<pattern _display_name="Blue Rough" filename="blue_gray_rough"/>
<pattern _display_name="Blue Type" filename="blue_type"/>
......@@ -34,7 +36,7 @@
<pattern _display_name="White Ribs" filename="white_ribs"/>
</category>
<category name="colors" _display_name="Colors" image="colors.png" columns="5" mode="inline" type="application/x-color" _description="Drag a color to an object to change it to that color">
<category name="colors" _display_name="C_olors" image="colors.png" columns="5" mode="inline" type="application/x-color" _description="Drag a color to an object to change it to that color">
<color _name="Mango">#E0D656</color>
<color _name="Orange">#D2AB50</color>
<color _name="Tangerine">#C6864B</color>
......@@ -67,7 +69,7 @@
<color _name="Black">#000000</color>
</category>
<category name="emblems" _display_name="Emblems" image="emblems.png" columns="6" mode="directory" path="nautilus/emblems" type="property/keyword" _description="Drag an emblem to an object to add it to the object">
<category name="emblems" _display_name="_Emblems" image="emblems.png" columns="6" mode="directory" path="nautilus/emblems" type="property/keyword" _description="Drag an emblem to an object to add it to the object">
<emblem _display_name="Art" filename="art"/>
<emblem _display_name="Camera" filename="camera"/>
<emblem _display_name="Certified" filename="certified"/>
......
......@@ -30,6 +30,7 @@
#include <libnautilus/nautilus-undo.h>
#include <libnautilus-private/nautilus-global-preferences.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-gnome-extensions.h>
#include <libnautilus-private/nautilus-icon-factory.h>
#include <libnautilus-private/nautilus-undo-signal-handlers.h>
#include <gtk/gtkhbbox.h>
......@@ -214,13 +215,16 @@ create_bookmarks_window (NautilusBookmarkList *list, GObject *undo_manager_sourc
bookmarks = list;
gui = glade_xml_new (GLADEDIR "/nautilus-bookmarks-window.glade", NULL, NULL);
gui = eel_glade_get_file (GLADEDIR "/nautilus-bookmarks-window.glade",
NULL, NULL,
"bookmarks_dialog", &window,
"bookmark_tree_view", &bookmark_list_widget,
"bookmark_delete_button", &remove_button,
NULL);
if (!gui) {
g_warning ("Failed to locate " GLADEDIR "/nautilus-bookmarks-window.glade");
return NULL;
}
window = glade_xml_get_widget (gui, "bookmarks_dialog");
set_up_close_accelerator (window);
nautilus_undo_share_undo_manager (G_OBJECT (window), undo_manager_source);
......@@ -319,7 +323,6 @@ create_bookmarks_window (NautilusBookmarkList *list, GObject *undo_manager_sourc
G_CALLBACK (on_text_field_focus_out_event), NULL);
g_signal_connect (uri_field, "activate",
G_CALLBACK (name_or_uri_field_activate), NULL);
remove_button = glade_xml_get_widget (gui, "bookmark_delete_button");
g_signal_connect (remove_button, "clicked",
G_CALLBACK (on_remove_button_clicked), NULL);
......
......@@ -340,7 +340,7 @@ nautilus_property_browser_init (GtkObject *object)
/* add the title label */
property_browser->details->title_label = gtk_label_new ("");
eel_gtk_label_set_scale (GTK_LABEL (property_browser->details->title_label), PANGO_SCALE_X_LARGE);
eel_gtk_label_make_bold (GTK_LABEL (property_browser->details->title_label));
/* eel_gtk_label_make_bold (GTK_LABEL (property_browser->details->title_label)); */
gtk_widget_show(property_browser->details->title_label);
gtk_box_pack_start (GTK_BOX(temp_hbox), property_browser->details->title_label, FALSE, FALSE, 8);
......@@ -348,7 +348,6 @@ nautilus_property_browser_init (GtkObject *object)
/* add the help label */
property_browser->details->help_label = gtk_label_new ("");
gtk_widget_show(property_browser->details->help_label);
eel_gtk_label_set_scale (GTK_LABEL (property_browser->details->help_label), PANGO_SCALE_SMALL);
gtk_box_pack_end (GTK_BOX (temp_hbox), property_browser->details->help_label, FALSE, FALSE, 8);
/* add the bottom box to hold the command buttons */
......@@ -370,7 +369,6 @@ nautilus_property_browser_init (GtkObject *object)
/* create the "help" button */
temp_button = gtk_button_new_from_stock (GTK_STOCK_HELP);
GTK_WIDGET_SET_FLAGS (temp_button, GTK_CAN_DEFAULT);
gtk_widget_show (temp_button);
gtk_box_pack_start (GTK_BOX (property_browser->details->bottom_box), temp_button, FALSE, FALSE, GNOME_PAD_SMALL);
......@@ -502,7 +500,6 @@ nautilus_property_browser_destroy (GtkObject *object)
main_browser = NULL;
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
/* create a new instance */
......@@ -1997,7 +1994,8 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro
eel_background_set_color (background, BROWSER_BACKGROUND_COLOR);
gtk_container_add (GTK_CONTAINER (property_browser->details->content_container), property_browser->details->content_frame);
gtk_widget_show (property_browser->details->content_frame);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (property_browser->details->content_frame), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (property_browser->details->content_frame),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
/* allocate a table to hold the content widgets */
property_browser->details->content_table = eel_image_table_new (TRUE);
......@@ -2148,7 +2146,8 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro
}
if (label_text) {
gtk_label_set_text_with_mnemonic (GTK_LABEL (property_browser->details->title_label), label_text);
gtk_label_set_text_with_mnemonic
(GTK_LABEL (property_browser->details->title_label), label_text);
}
g_free(label_text);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment