summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wehner <martin.wehner@gmail.com>2006-01-31 00:30:11 +0000
committerMartin Wehner <mwehner@src.gnome.org>2006-01-31 00:30:11 +0000
commit18969c307f9b8dbc202961f86b61f2cef40aab4d (patch)
tree8a522c34e66d6ef381ae52c002b94d982b10b18f
parent2e3313789db733fdcf611f82116a117e6d72ef08 (diff)
downloadnautilus-18969c307f9b8dbc202961f86b61f2cef40aab4d.tar.gz
Add the option to always use the location bar to the preferences dialog.
2006-01-31 Martin Wehner <martin.wehner@gmail.com> * src/nautilus-file-management-properties.c: (nautilus_file_management_properties_dialog_setup): * src/nautilus-file-management-properties.glade: Add the option to always use the location bar to the preferences dialog. Closes #328659. Patch from Justin Fitzsimmons <jfitzsimmons@gmail.com>
-rw-r--r--ChangeLog9
-rw-r--r--src/nautilus-file-management-properties.c4
-rw-r--r--src/nautilus-file-management-properties.glade19
3 files changed, 32 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fd6e59466..a64fc9106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2006-01-31 Martin Wehner <martin.wehner@gmail.com>
+ * src/nautilus-file-management-properties.c:
+ (nautilus_file_management_properties_dialog_setup):
+ * src/nautilus-file-management-properties.glade:
+ Add the option to always use the location bar to the
+ preferences dialog. Closes #328659.
+ Patch from Justin Fitzsimmons <jfitzsimmons@gmail.com>
+
+2006-01-31 Martin Wehner <martin.wehner@gmail.com>
+
* libnautilus-private/nautilus-view.h:
* libnautilus-private/nautilus-view.c: (nautilus_view_grab_focus):
Add new grab_focus method.
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index a2f0cba3b..da5dc38d0 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -67,6 +67,7 @@
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_COMPACT_LAYOUT_WIDGET "compact_layout_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET "labels_beside_icons_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET "always_use_browser_checkbutton"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_LOCATION_ENTRY_WIDGET "always_use_location_entry_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET "trash_confirm_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_DELETE_WIDGET "trash_delete_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_OPEN_NEW_WINDOW_WIDGET "new_window_checkbutton"
@@ -549,6 +550,9 @@ nautilus_file_management_properties_dialog_setup (GladeXML *xml_dialog, GtkWindo
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET,
NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER);
eel_preferences_glade_connect_bool (xml_dialog,
+ NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_LOCATION_ENTRY_WIDGET,
+ NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY);
+ eel_preferences_glade_connect_bool (xml_dialog,
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET,
NAUTILUS_PREFERENCES_CONFIRM_TRASH);
eel_preferences_glade_connect_bool (xml_dialog,
diff --git a/src/nautilus-file-management-properties.glade b/src/nautilus-file-management-properties.glade
index 7e13b5678..3173d8fbf 100644
--- a/src/nautilus-file-management-properties.glade
+++ b/src/nautilus-file-management-properties.glade
@@ -805,6 +805,25 @@ By Emblems</property>
<property name="fill">False</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="always_use_location_entry_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Always use _text-entry location bar</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>