* dlg.h: Remove all unused flags for create_dlg(). Adjust all

dependencies.
This commit is contained in:
Pavel Roskin 2002-08-19 06:22:32 +00:00
parent 342b4bbd0f
commit 047a7f906e
9 changed files with 19 additions and 19 deletions

View File

@ -1,5 +1,8 @@
2002-08-19 Pavel Roskin <proski@gnu.org>
* dlg.h: Remove all unused flags for create_dlg(). Adjust all
dependencies.
* cmd.c (fishlink_cmd): Implement user interface for FiSH.
* main.c: Add it to the menu.

View File

@ -187,7 +187,7 @@ display_init (int radio_sel, char *init_text,
}
dd = create_dlg (0, 0, DISPLAY_Y, DISPLAY_X, dialog_colors,
display_callback, "[Listing Mode...]", "display",
DLG_CENTER | DLG_GRID);
DLG_CENTER);
x_set_dialog_title (dd, _("Listing mode"));
add_widget (dd,
@ -329,7 +329,7 @@ sort_box (sortfn *sort_fn, int *reverse, int *case_sensitive)
}
dd = create_dlg (0, 0, SORT_Y, SORT_X, dialog_colors, common_dialog_callback,
"[Sort Order...]", "sort", DLG_CENTER | DLG_GRID);
"[Sort Order...]", "sort", DLG_CENTER);
x_set_dialog_title (dd, sort_title);
@ -1003,7 +1003,7 @@ jobs_cmd (void)
jobs_dlg = create_dlg (0, 0, JOBS_Y, JOBS_X, dialog_colors,
common_dialog_callback, "[Background jobs]", "jobs",
DLG_CENTER | DLG_GRID);
DLG_CENTER);
x_set_dialog_title (jobs_dlg, _("Background Jobs"));
bg_list = listbox_new (2, 3, JOBS_X-7, JOBS_Y-9, listbox_nothing, 0, "listbox");
@ -1088,7 +1088,7 @@ vfs_smb_get_authinfo (const char *host, const char *share, const char *domain,
auth_dlg = create_dlg (0, 0, dialog_y, dialog_x, dialog_colors,
common_dialog_callback, "[Smb Authinfo]", "smbauthinfo",
DLG_CENTER | DLG_GRID);
DLG_CENTER);
title = g_strdup_printf (_("Password for \\\\%s\\%s"), host, share);
x_set_dialog_title (auth_dlg, title);

View File

@ -162,13 +162,10 @@ Dlg_head *create_dlg (int y1, int x1, int lines, int cols,
char *help_ctx, char *name, int flags);
/* The flags: */
#define DLG_NO_TOPLEVEL 32 /* GNOME only: Do not create a toplevel window, user provides it */
#define DLG_GNOME_APP 16 /* GNOME only: use a gnome-app for the toplevel window */
#define DLG_NO_TED 8 /* GNOME only: do not manage layout with a GNOME GtkTed widget */
#define DLG_GRID 4 /* Widgets should be created under .widgets */
#define DLG_TRYUP 2 /* Try to move two lines up the dialog */
#define DLG_CENTER 1 /* Center the dialog */
#define DLG_NONE 0 /* No options */
int add_widget (Dlg_head *dest, void *Widget);
int remove_widget (Dlg_head *dest, void *Widget);
int destroy_widget (Widget *w);

View File

@ -203,7 +203,7 @@ find_par_start:
find_dlg = create_dlg (0, 0, FIND_Y, FIND_X, dialog_colors,
common_dialog_callback, "[Find File]", "findfile",
DLG_CENTER | DLG_GRID);
DLG_CENTER);
x_set_dialog_title (find_dlg, _("Find File"));
@ -786,7 +786,7 @@ setup_gui (void)
}
find_dlg = create_dlg (0, 0, FIND2_Y, FIND2_X, dialog_colors,
find_callback, "[Find File]", "mfind", DLG_CENTER | DLG_GRID);
find_callback, "[Find File]", "mfind", DLG_CENTER);
x_set_dialog_title (find_dlg, _("Find file"));

View File

@ -582,7 +582,7 @@ static void init_hotlist (int list_type)
hotlist_callback,
list_type == LIST_VFSLIST ? "[vfshot]" : "[Hotlist]",
list_type == LIST_VFSLIST ? "vfshot" : "hotlist",
DLG_CENTER|DLG_GRID);
DLG_CENTER);
x_set_dialog_title (hotlist_dlg,
list_type == LIST_VFSLIST ? _("Active VFS directories") : _("Directory hotlist"));
@ -634,7 +634,7 @@ static void init_movelist (int list_type, struct hotlist *item)
movelist_dlg = create_dlg (0, 0, LINES-6, movelist_cols, dialog_colors,
hotlist_callback, "[Hotlist]",
"movelist",
DLG_CENTER|DLG_GRID);
DLG_CENTER);
x_set_dialog_title (movelist_dlg, hdr);
g_free (hdr);

View File

@ -442,7 +442,7 @@ static void init_layout (void)
layout_dlg = create_dlg (0, 0, 15, first_width + second_width + 9,
dialog_colors, layout_callback,
"[Layout]", "layout", DLG_CENTER | DLG_GRID);
"[Layout]", "layout", DLG_CENTER);
x_set_dialog_title (layout_dlg, _("Layout"));

View File

@ -194,7 +194,7 @@ static void init_configure (void)
conf_dlg = create_dlg (0, 0, 20, first_width + second_width + 9,
dialog_colors, configure_callback, "[Configuration]",
"option", DLG_CENTER | DLG_GRID);
"option", DLG_CENTER);
x_set_dialog_title (conf_dlg, _("Configure options"));

View File

@ -175,7 +175,7 @@ static void init_panelize (void)
panelize_dlg = create_dlg (0, 0, 22, panelize_cols, dialog_colors,
panelize_callback, "[External panelize]", "panelize",
DLG_CENTER|DLG_GRID);
DLG_CENTER);
x_set_dialog_title (panelize_dlg, _("External panelize"));
#define XTRACT(i) BY+panelize_but[i].y, BX+panelize_but[i].x, panelize_but[i].ret_cmd, panelize_but[i].flags, panelize_but[i].text, 0, 0, panelize_but[i].tkname

View File

@ -118,7 +118,7 @@ Listbox *create_listbox_window (int cols, int lines, char *title, char *help)
/* Create components */
listbox->dlg = create_dlg (ypos, xpos, lines+6, cols+4, dialog_colors,
listbox_callback, help, "listbox", DLG_CENTER|DLG_GRID);
listbox_callback, help, "listbox", DLG_CENTER);
x_set_dialog_title (listbox->dlg, title);
listbox->list = listbox_new (2, 2, cols, lines, listbox_finish, 0, "li");
@ -334,7 +334,7 @@ Chooser *new_chooser (int lines, int cols, char *help, int flags)
c =g_new (Chooser, 1);
c->dialog = create_dlg (0, 0, lines, cols, dialog_colors, common_dialog_callback,
help, "chooser", DLG_CENTER | DLG_GRID);
help, "chooser", DLG_CENTER);
c->dialog->lines = lines;
c->dialog->cols = cols;
@ -417,11 +417,11 @@ int quick_dialog_skip (QuickDialog *qd, int nskip)
if (qd->xpos == -1)
dd = create_dlg (0, 0, qd->ylen, qd->xlen, dialog_colors, quick_callback,
qd->help, qd->class, DLG_CENTER | DLG_TRYUP | DLG_GRID);
qd->help, qd->class, DLG_CENTER | DLG_TRYUP);
else
dd = create_dlg (qd->ypos, qd->xpos, qd->ylen, qd->xlen, dialog_colors,
quick_callback,
qd->help, qd->class, DLG_GRID);
qd->help, qd->class, DLG_NONE);
x_set_dialog_title (dd, qd->title);