summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/file-manager/fm-directory-view.c49
-rw-r--r--src/nautilus-index-title.c62
-rw-r--r--src/nautilus-sidebar-title.c62
3 files changed, 84 insertions, 89 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 9e8004e8d..210036bc7 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -393,17 +393,23 @@ select_all_cb(GtkMenuItem *item, FMDirectoryView *directory_view)
/* handle the zoom in/out menu items */
static void
-zoom_in_cb(GtkMenuItem *item, FMDirectoryView *directory_view)
+zoom_in_cb (GtkMenuItem *item, FMDirectoryView *directory_view)
{
fm_directory_view_bump_zoom_level (directory_view, 1);
}
static void
-zoom_out_cb(GtkMenuItem *item, FMDirectoryView *directory_view)
+zoom_out_cb (GtkMenuItem *item, FMDirectoryView *directory_view)
{
fm_directory_view_bump_zoom_level (directory_view, -1);
}
+static void
+use_eazel_theme_icons_cb (GtkMenuItem *item, FMDirectoryView *directory_view)
+{
+ /* FIXME: This isn't implemented yet. */
+}
+
static gboolean
display_pending_files (FMDirectoryView *view)
{
@@ -788,36 +794,29 @@ open_in_new_window_cb (GtkMenuItem *item, NautilusFile *file)
fm_directory_view_activate_entry (directory_view, file, TRUE);
}
-
static void
-fm_directory_view_real_append_background_context_menu_items (FMDirectoryView *view,
- GtkMenu *menu)
+add_menu_item (FMDirectoryView *view, GtkMenu *menu, const char *label,
+ void (*activate_handler) (GtkMenuItem *, FMDirectoryView *),
+ gboolean sensitive)
{
GtkWidget *menu_item;
- menu_item = gtk_menu_item_new_with_label ("Select all");
+ menu_item = gtk_menu_item_new_with_label (label);
+ gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
+ GTK_SIGNAL_FUNC (activate_handler), view);
+ gtk_widget_set_sensitive (menu_item, sensitive);
gtk_widget_show (menu_item);
- gtk_signal_connect(GTK_OBJECT (menu_item), "activate",
- GTK_SIGNAL_FUNC (select_all_cb), view);
gtk_menu_append (menu, menu_item);
+}
-
- menu_item = gtk_menu_item_new_with_label ("Zoom in");
- gtk_signal_connect(GTK_OBJECT (menu_item), "activate",
- GTK_SIGNAL_FUNC (zoom_in_cb), view);
-
- gtk_widget_show (menu_item);
- gtk_menu_append (menu, menu_item);
- gtk_widget_set_sensitive (menu_item, fm_directory_view_can_zoom_in (view));
-
- menu_item = gtk_menu_item_new_with_label ("Zoom out");
-
- gtk_signal_connect(GTK_OBJECT (menu_item), "activate",
- GTK_SIGNAL_FUNC (zoom_out_cb), view);
-
- gtk_widget_show (menu_item);
- gtk_menu_append (menu, menu_item);
- gtk_widget_set_sensitive (menu_item, fm_directory_view_can_zoom_out (view));
+static void
+fm_directory_view_real_append_background_context_menu_items (FMDirectoryView *view,
+ GtkMenu *menu)
+{
+ add_menu_item (view, menu, _("Select All"), select_all_cb, TRUE);
+ add_menu_item (view, menu, _("Zoom In"), zoom_in_cb, fm_directory_view_can_zoom_in (view));
+ add_menu_item (view, menu, _("Zoom Out"), zoom_out_cb, fm_directory_view_can_zoom_out (view));
+ add_menu_item (view, menu, _("Use Eazel Theme Icons"), use_eazel_theme_icons_cb, FALSE);
}
static void
diff --git a/src/nautilus-index-title.c b/src/nautilus-index-title.c
index 1fab522e6..b319ef6f2 100644
--- a/src/nautilus-index-title.c
+++ b/src/nautilus-index-title.c
@@ -216,38 +216,36 @@ nautilus_index_title_set_up_label (NautilusIndexTitle *index_title, const char *
/* split the filename into two lines if necessary */
- if (strlen(file_name) >= 16)
- {
- /* find an appropriate split point if we can */
- gint index;
- gint mid_point = strlen(file_name) >> 1;
- gint quarter_point = mid_point >> 1;
- for (index = 0; index < quarter_point; index++)
- {
- gint split_offset = 0;
-
- if (!isalnum(file_name[mid_point + index]))
- split_offset = mid_point + index;
- else if (!isalnum(file_name[mid_point - index]))
- split_offset = mid_point - index;
-
- if (split_offset != 0) {
- char *buffer = (char *) g_malloc(strlen(file_name) + 2);
-
- /* build the new string, with a CR inserted, also remembering them separately for measuring */
-
- memcpy(buffer, file_name, split_offset);
- buffer[split_offset] = '\n';
- strcpy(&buffer[split_offset + 1], &file_name[split_offset]);
-
- /* free up the old string and replace it with the new one with the return inserted */
-
- g_free(file_name);
- file_name = buffer;
- }
- }
- }
-
+ if (strlen(file_name) >= 16) {
+ /* find an appropriate split point if we can */
+ gint index;
+ gint mid_point = strlen(file_name) >> 1;
+ gint quarter_point = mid_point >> 1;
+ for (index = 0; index < quarter_point; index++) {
+ gint split_offset = 0;
+
+ if (!isalnum(file_name[mid_point + index]))
+ split_offset = mid_point + index;
+ else if (!isalnum(file_name[mid_point - index]))
+ split_offset = mid_point - index;
+
+ if (split_offset != 0) {
+ char *buffer = (char *) g_malloc(strlen(file_name) + 2);
+
+ /* build the new string, with a CR inserted, also remembering them separately for measuring */
+
+ memcpy(buffer, file_name, split_offset);
+ buffer[split_offset] = '\n';
+ strcpy(&buffer[split_offset + 1], &file_name[split_offset]);
+
+ /* free up the old string and replace it with the new one with the return inserted */
+
+ g_free(file_name);
+ file_name = buffer;
+ }
+ }
+ }
+
if (index_title->details->title != NULL)
gtk_label_set_text (GTK_LABEL (index_title->details->title), file_name);
else {
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 1fab522e6..b319ef6f2 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -216,38 +216,36 @@ nautilus_index_title_set_up_label (NautilusIndexTitle *index_title, const char *
/* split the filename into two lines if necessary */
- if (strlen(file_name) >= 16)
- {
- /* find an appropriate split point if we can */
- gint index;
- gint mid_point = strlen(file_name) >> 1;
- gint quarter_point = mid_point >> 1;
- for (index = 0; index < quarter_point; index++)
- {
- gint split_offset = 0;
-
- if (!isalnum(file_name[mid_point + index]))
- split_offset = mid_point + index;
- else if (!isalnum(file_name[mid_point - index]))
- split_offset = mid_point - index;
-
- if (split_offset != 0) {
- char *buffer = (char *) g_malloc(strlen(file_name) + 2);
-
- /* build the new string, with a CR inserted, also remembering them separately for measuring */
-
- memcpy(buffer, file_name, split_offset);
- buffer[split_offset] = '\n';
- strcpy(&buffer[split_offset + 1], &file_name[split_offset]);
-
- /* free up the old string and replace it with the new one with the return inserted */
-
- g_free(file_name);
- file_name = buffer;
- }
- }
- }
-
+ if (strlen(file_name) >= 16) {
+ /* find an appropriate split point if we can */
+ gint index;
+ gint mid_point = strlen(file_name) >> 1;
+ gint quarter_point = mid_point >> 1;
+ for (index = 0; index < quarter_point; index++) {
+ gint split_offset = 0;
+
+ if (!isalnum(file_name[mid_point + index]))
+ split_offset = mid_point + index;
+ else if (!isalnum(file_name[mid_point - index]))
+ split_offset = mid_point - index;
+
+ if (split_offset != 0) {
+ char *buffer = (char *) g_malloc(strlen(file_name) + 2);
+
+ /* build the new string, with a CR inserted, also remembering them separately for measuring */
+
+ memcpy(buffer, file_name, split_offset);
+ buffer[split_offset] = '\n';
+ strcpy(&buffer[split_offset + 1], &file_name[split_offset]);
+
+ /* free up the old string and replace it with the new one with the return inserted */
+
+ g_free(file_name);
+ file_name = buffer;
+ }
+ }
+ }
+
if (index_title->details->title != NULL)
gtk_label_set_text (GTK_LABEL (index_title->details->title), file_name);
else {
View Lorry Controller Status