change name easy select -> reg select

jun7 · Mar 17, 2016 · cae48aa · cae48aa
1 parent 6718903
commit cae48aa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/ROX-Filer/src/filer.c b/ROX-Filer/src/filer.c
@@ -613,7 +613,7 @@ static void detach(FilerWindow *filer_window)
 {
 	g_return_if_fail(filer_window->directory != NULL);
 
-	if (filer_window->mini_type == MINI_EASY_SELECT)
+	if (filer_window->mini_type == MINI_REG_SELECT)
 		minibuffer_hide(filer_window);
 
 	dir_detach(filer_window->directory,
@@ -1357,7 +1357,7 @@ gint filer_key_press_event(GtkWidget	*widget,
 			else if (!(event->state & modifiers) &&
 						key >= GDK_a && key <= GDK_z)
 			{
-				minibuffer_show(filer_window, MINI_EASY_SELECT, key);
+				minibuffer_show(filer_window, MINI_REG_SELECT, key);
 				return TRUE;
 			}
 			else if ((event->state & modifiers) == GDK_SHIFT_MASK &&
@@ -2853,7 +2853,7 @@ void filer_perform_action(FilerWindow *filer_window, GdkEventButton *event)
 			break;
 	}
 
-	if (filer_window->mini_type == MINI_EASY_SELECT)
+	if (filer_window->mini_type == MINI_REG_SELECT)
 		minibuffer_hide(filer_window);
 }
 

diff --git a/ROX-Filer/src/global.h b/ROX-Filer/src/global.h
@@ -116,7 +116,7 @@ typedef enum {
 	MINI_FILTER,
 	MINI_TEMP_FILTER,
 	MINI_SELECT_BY_NAME,
-	MINI_EASY_SELECT,
+	MINI_REG_SELECT,
 } MiniType;
 
 /* The next three correspond to the styles on the Display submenu: */

diff --git a/ROX-Filer/src/menu.c b/ROX-Filer/src/menu.c
@@ -247,7 +247,7 @@ static GtkItemFactoryEntry filer_menu_def[] = {
 {">" N_("Clear Selection"),	NULL, clear_selection, 0, NULL},
 {">" N_("Invert Selection"),	NULL, invert_selection, 0, NULL},
 {">" N_("Select by Name..."),	"period", mini_buffer, MINI_SELECT_BY_NAME, NULL},
-{">" N_("Easy Select..."),	"asciicircum", mini_buffer, MINI_EASY_SELECT, NULL},
+{">" N_("Reg Select..."),	"asciicircum", mini_buffer, MINI_REG_SELECT, NULL},
 {">" N_("Select If..."),	"<Shift>question", mini_buffer, MINI_SELECT_IF, NULL},
 {N_("Options..."),		NULL, menu_show_options, 0, "<StockItem>", GTK_STOCK_PREFERENCES},
 {N_("New"),			NULL, NULL, 0, "<Branch>"},

diff --git a/ROX-Filer/src/minibuffer.c b/ROX-Filer/src/minibuffer.c
@@ -134,7 +134,7 @@ void minibuffer_show(FilerWindow *filer_window, MiniType mini_type, guint keyval
 			mini_type == MINI_SHELL ? _("Shell:") :
 			mini_type == MINI_SELECT_IF ? _("Select If:") :
 			mini_type == MINI_SELECT_BY_NAME ? _("Select Named:") :
-			mini_type == MINI_EASY_SELECT ? _("Easy Select (reg-i):") :
+			mini_type == MINI_REG_SELECT ? _("Reg Select (i):") :
 			mini_type == MINI_FILTER ? _("Pattern:") :
 			mini_type == MINI_TEMP_FILTER ? _("Temp Filter (reg-i):") :
 			"?");
@@ -167,7 +167,7 @@ void minibuffer_show(FilerWindow *filer_window, MiniType mini_type, guint keyval
 			filer_window->mini_cursor_base = -1;	/* History */
 			view_select_if(filer_window->view, select_if_glob, "*.");
 			break;
-		case MINI_EASY_SELECT:
+		case MINI_REG_SELECT:
 			view_show_cursor(filer_window->view);
 			view_get_cursor(filer_window->view, &cursor);
 			view_set_base(filer_window->view, &cursor);
@@ -315,7 +315,7 @@ static void show_help(FilerWindow *filer_window)
 				_("Enter a shell command to execute. Click "
 				"on a file to add it to the buffer."));
 			break;
-		case MINI_EASY_SELECT:
+		case MINI_REG_SELECT:
 			info_message(
 				_("Enter a file name pattern to select all matching files:\n\n"
 				". means any character\n"
@@ -1130,7 +1130,7 @@ static gint key_press_event(GtkWidget	*widget,
 					return FALSE;
 			}
 			break;
-		case MINI_EASY_SELECT:
+		case MINI_REG_SELECT:
 			switch (event->keyval)
 			{
 			case GDK_Page_Up:
@@ -1290,7 +1290,7 @@ static void changed(GtkEditable *mini, FilerWindow *filer_window)
 				gtk_entry_get_text(
 					GTK_ENTRY(filer_window->minibuffer)));
 			return;
-		case MINI_EASY_SELECT:
+		case MINI_REG_SELECT:
 			view_select_if_reg(filer_window->view,
 					gtk_entry_get_text(
 					      GTK_ENTRY(filer_window->minibuffer)));