From 506094f44aa04f4b96ba298a52b00f107e5a47cd Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Wed, 15 Apr 1998 22:38:36 +0000 Subject: [PATCH] 1 line fix-mig --- Makefile.in | 2 +- gnome/glayout.c | 2 +- gnome/gscreen.c | 9 ++-- lib/mc.ext.in | 20 ++++---- po/POTFILES.in | 3 +- po/mc.pot | 118 +++++++++++++++++++++++++----------------------- src/cmd.c | 2 +- src/panel.h | 3 ++ 8 files changed, 84 insertions(+), 75 deletions(-) diff --git a/Makefile.in b/Makefile.in index b8593285a..a6191046e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -116,7 +116,7 @@ distcopy: cp po/Makefile.in.in ../mc-$(VERSION)/po; cp po/POTFILES.in ../mc-$(VERSION)/po; cp po/*.po ../mc-$(VERSION)/po; - mkdir ../mc-$(VERSION)/intl + -mkdir ../mc-$(VERSION)/intl for I in $(alldirs); do \ cd $$I ; \ $(MAKE) distcopy VERSION=$(VERSION) PACKAGE=mc || exit 1; \ diff --git a/gnome/glayout.c b/gnome/glayout.c index b3e840d0b..4092b404f 100644 --- a/gnome/glayout.c +++ b/gnome/glayout.c @@ -350,7 +350,7 @@ new_panel_at (char *dir) Dlg_head *h = current_panel_ptr->panel->widget.parent; mc_chdir (dir); - panel = create_container (h, "Other"); + panel = create_container (h, dir); add_widget (h, panel); set_new_current_panel (panel); diff --git a/gnome/gscreen.c b/gnome/gscreen.c index f4c96cd99..c5d39b658 100644 --- a/gnome/gscreen.c +++ b/gnome/gscreen.c @@ -74,6 +74,7 @@ show_dir (WPanel *panel) { assign_text (panel->current_dir, panel->cwd); update_input (panel->current_dir, 1); + gtk_window_set_title (GTK_WINDOW (panel->xwindow), panel->cwd); } static void @@ -1278,7 +1279,7 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel) GtkWidget *frame, *cwd, *back, *home, *fwd, *back_p, *fwd_p; GtkWidget *very_top, *display; - very_top = gtk_widget_get_toplevel (GTK_WIDGET (panel->widget.wdata)); + panel->xwindow = gtk_widget_get_toplevel (GTK_WIDGET (panel->widget.wdata)); panel->table = gtk_table_new (2, 1, 0); @@ -1294,8 +1295,8 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel) h->current = h->current->prev; /* buttons */ - back_p = gnome_stock_pixmap_widget_new (very_top, GNOME_STOCK_MENU_BACK); - fwd_p = gnome_stock_pixmap_widget_new (very_top, GNOME_STOCK_MENU_FORWARD); + back_p = gnome_stock_pixmap_widget_new (panel->xwindow, GNOME_STOCK_MENU_BACK); + fwd_p = gnome_stock_pixmap_widget_new (panel->xwindow, GNOME_STOCK_MENU_FORWARD); panel->up_b = gtk_button_new_with_label ("up"); panel->back_b = gtk_button_new (); @@ -1416,3 +1417,5 @@ x_reset_sort_labels (WPanel *panel) { panel_switch_new_display_mode (panel); } + + diff --git a/lib/mc.ext.in b/lib/mc.ext.in index b2fba2c80..c6b720f24 100644 --- a/lib/mc.ext.in +++ b/lib/mc.ext.in @@ -373,37 +373,37 @@ type/PostScript\ text View with GhostView=ghostview %f type/GIF\ image - Open=xv %f + Open=ee %f Icon=gif.xpm Include=image-options type/GIF\ picture - Open=xv %f + Open=ee %f Icon=gif.xpm Include=image-options type/JPEG\ picture - Open=xv %f + Open=ee %f Icon=jpeg.xpm Include=image-options type/TIFF\ file - Open=xv %f + Open=ee %f Icon=tiff.xpm Include=image-options type/PBM - Open=xv %f + Open=ee %f Icon=pbm.xpm Include=image-options type/PGM - Open=xv %f + Open=ee %f Icon=pgm.xpm Include=image-options type/PPM - Open=xv %f + Open=ee %f Icon=ppm.xpm Include=image-options @@ -412,14 +412,14 @@ shell/.xbm Icon=xbm.xpm shell/.xpm - Open=xv %f + Open=ee %f View=sxpm %f Include=image-options Icon=xpm.xpm include/image-options - Set root window to this image=xv -root %f & - Display this file=xv %f & + Set root window to this image=ee -root %f & + Display this file=ee %f & # Sound files shell/.mod diff --git a/po/POTFILES.in b/po/POTFILES.in index c7b4a60da..3b7535c7e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -48,5 +48,4 @@ gnome/gprop.c gnome/gscreen.c gnome/gtools.c gnome/gview.c -gnome/gwidget.c - +gnome/gwidget.c \ No newline at end of file diff --git a/po/mc.pot b/po/mc.pot index 9495c53be..767ea6f99 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Date: 1998-04-15 01:22:02-0500\n" +"Date: 1998-04-15 15:30:40-0500\n" "From: Miguel de Icaza,computo,622-4680 \n" "Content-Type: text/plain; charset=\n" "Xgettext-Options: --default-domain=mc --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" @@ -304,11 +304,11 @@ msgstr "" msgid "Cancel quit" msgstr "" -#: edit/editcmd.c:1961 gnome/gdesktop.c:1023 src/cmd.c:240 src/file.c:2116 src/file.c:2469 src/file.c:2549 src/hotlist.c:887 src/main.c:838 src/screen.c:1976 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:411 +#: edit/editcmd.c:1961 gnome/gdesktop.c:1023 src/cmd.c:240 src/file.c:2116 src/file.c:2469 src/file.c:2549 src/hotlist.c:1027 src/main.c:838 src/screen.c:1976 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:411 msgid "&Yes" msgstr "" -#: edit/editcmd.c:1961 gnome/gdesktop.c:1023 src/cmd.c:240 src/file.c:2116 src/file.c:2466 src/file.c:2549 src/hotlist.c:887 src/main.c:838 src/screen.c:1976 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:411 +#: edit/editcmd.c:1961 gnome/gdesktop.c:1023 src/cmd.c:240 src/file.c:2116 src/file.c:2466 src/file.c:2549 src/hotlist.c:1027 src/main.c:838 src/screen.c:1976 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:411 msgid "&No" msgstr "" @@ -805,7 +805,7 @@ msgid "" "\n" msgstr "" -#: src/achown.c:72 src/boxes.c:138 src/boxes.c:273 src/boxes.c:370 src/boxes.c:457 src/boxes.c:636 src/boxes.c:757 src/boxes.c:799 src/chmod.c:115 src/chown.c:81 src/cmd.c:832 src/file.c:1953 src/find.c:158 src/hotlist.c:140 src/hotlist.c:696 src/hotlist.c:777 src/layout.c:365 src/learn.c:58 src/option.c:143 src/panelize.c:89 src/view.c:411 src/wtools.c:114 src/wtools.c:401 src/wtools.c:574 src/wtools.c:654 +#: src/achown.c:72 src/boxes.c:138 src/boxes.c:273 src/boxes.c:370 src/boxes.c:457 src/boxes.c:636 src/boxes.c:757 src/boxes.c:799 src/chmod.c:115 src/chown.c:81 src/cmd.c:832 src/file.c:1953 src/find.c:158 src/hotlist.c:140 src/hotlist.c:810 src/hotlist.c:903 src/layout.c:365 src/learn.c:58 src/option.c:143 src/panelize.c:89 src/view.c:411 src/wtools.c:114 src/wtools.c:408 src/wtools.c:581 src/wtools.c:661 msgid "&Cancel" msgstr "" @@ -865,7 +865,7 @@ msgid "" " %s " msgstr "" -#: src/achown.c:647 src/achown.c:651 src/chmod.c:329 src/chmod.c:333 src/chown.c:256 src/chown.c:260 src/panelize.c:267 src/user.c:623 +#: src/achown.c:647 src/achown.c:651 src/chmod.c:329 src/chmod.c:333 src/chown.c:256 src/chown.c:260 src/panelize.c:298 src/user.c:623 msgid " Oops... " msgstr "" @@ -927,7 +927,7 @@ msgstr "" msgid "user &Mini status" msgstr "" -#: gnome/gtools.c:129 src/boxes.c:137 src/boxes.c:272 src/boxes.c:372 src/boxes.c:459 src/boxes.c:638 src/boxes.c:758 src/boxes.c:801 src/boxes.c:910 src/file.c:1960 src/find.c:158 src/layout.c:364 src/option.c:142 src/wtools.c:295 src/wtools.c:576 +#: gnome/gtools.c:129 src/boxes.c:137 src/boxes.c:272 src/boxes.c:372 src/boxes.c:459 src/boxes.c:638 src/boxes.c:758 src/boxes.c:801 src/boxes.c:910 src/file.c:1960 src/find.c:158 src/layout.c:364 src/option.c:142 src/wtools.c:302 src/wtools.c:583 msgid "&Ok" msgstr "" @@ -1429,7 +1429,7 @@ msgstr "" msgid "Show directory sizes" msgstr "" -#: src/cmd.c:1379 src/panelize.c:425 +#: src/cmd.c:1379 src/panelize.c:456 msgid "Pipe close failed" msgstr "" @@ -2094,15 +2094,15 @@ msgstr "" msgid "&Move" msgstr "" -#: src/hotlist.c:135 src/hotlist.c:1291 src/panelize.c:91 src/wtools.c:398 +#: src/hotlist.c:135 src/hotlist.c:1431 src/panelize.c:91 src/wtools.c:405 msgid "&Remove" msgstr "" -#: src/hotlist.c:136 src/hotlist.c:700 src/hotlist.c:781 +#: src/hotlist.c:136 src/hotlist.c:814 src/hotlist.c:907 msgid "&Append" msgstr "" -#: src/hotlist.c:137 src/hotlist.c:698 src/hotlist.c:779 +#: src/hotlist.c:137 src/hotlist.c:812 src/hotlist.c:905 msgid "&Insert" msgstr "" @@ -2126,153 +2126,153 @@ msgstr "" msgid "Change &To" msgstr "" -#: src/hotlist.c:201 +#: src/hotlist.c:203 msgid "Subgroup - press ENTER to see list" msgstr "" -#: src/hotlist.c:535 +#: src/hotlist.c:620 msgid "Active VFS directories" msgstr "" -#: src/hotlist.c:535 +#: src/hotlist.c:620 msgid "Directory hotlist" msgstr "" -#: src/hotlist.c:554 +#: src/hotlist.c:639 msgid " Directory path " msgstr "" #. This one holds the displayed pathname -#: src/hotlist.c:557 src/hotlist.c:603 +#: src/hotlist.c:642 src/hotlist.c:689 msgid " Directory label " msgstr "" -#: src/hotlist.c:578 +#: src/hotlist.c:663 msgid "Moving " msgstr "" -#: src/hotlist.c:758 +#: src/hotlist.c:884 msgid "New hotlist entry" msgstr "" -#: src/hotlist.c:758 +#: src/hotlist.c:884 msgid "Directory label" msgstr "" -#: src/hotlist.c:758 +#: src/hotlist.c:884 msgid "Directory path" msgstr "" -#: src/hotlist.c:826 +#: src/hotlist.c:964 msgid " New hotlist group " msgstr "" -#: src/hotlist.c:826 +#: src/hotlist.c:964 msgid "Name of new group" msgstr "" -#: src/hotlist.c:843 +#: src/hotlist.c:979 msgid "Label for \"%s\":" msgstr "" -#: src/hotlist.c:844 +#: src/hotlist.c:984 msgid " Add to hotlist " msgstr "" -#: src/hotlist.c:881 +#: src/hotlist.c:1021 msgid " Remove: " msgstr "" -#: src/hotlist.c:885 +#: src/hotlist.c:1025 msgid "" "\n" " Group not empty.\n" " Remove it?" msgstr "" -#: src/hotlist.c:1229 +#: src/hotlist.c:1369 msgid " Top level group " msgstr "" -#: src/hotlist.c:1245 +#: src/hotlist.c:1385 msgid "Hotlist is now kept in file ~/" msgstr "" -#: src/hotlist.c:1246 +#: src/hotlist.c:1386 msgid "MC will load hotlist from ~/" msgstr "" -#: src/hotlist.c:1247 +#: src/hotlist.c:1387 msgid " and then delete [Hotlist] section there" msgstr "" -#: src/hotlist.c:1248 src/hotlist.c:1267 src/hotlist.c:1290 src/hotlist.c:1315 +#: src/hotlist.c:1388 src/hotlist.c:1407 src/hotlist.c:1430 src/hotlist.c:1455 msgid " Hotlist Load " msgstr "" -#: src/hotlist.c:1264 src/hotlist.c:1312 +#: src/hotlist.c:1404 src/hotlist.c:1452 msgid "MC was unable to write ~/" msgstr "" -#: src/hotlist.c:1265 +#: src/hotlist.c:1405 msgid " file, your old hotlist entries were not deleted" msgstr "" -#: src/hotlist.c:1279 +#: src/hotlist.c:1419 msgid "You have ~/" msgstr "" -#: src/hotlist.c:1279 +#: src/hotlist.c:1419 msgid " file and [Hotlist] section in ~/" msgstr "" -#: src/hotlist.c:1280 +#: src/hotlist.c:1420 msgid "Your ~/" msgstr "" -#: src/hotlist.c:1280 +#: src/hotlist.c:1420 msgid " most probably was created\n" msgstr "" -#: src/hotlist.c:1281 +#: src/hotlist.c:1421 msgid "" "by an earlier development version of MC\n" "and is more actual than ~/" msgstr "" -#: src/hotlist.c:1282 +#: src/hotlist.c:1422 msgid "" " entries\n" "\n" msgstr "" -#: src/hotlist.c:1283 +#: src/hotlist.c:1423 msgid "" "You can choose between\n" "\n" " Remove - remove old hotlist entries from ~/" msgstr "" -#: src/hotlist.c:1285 +#: src/hotlist.c:1425 msgid "" " Keep - keep your old entries; you will be asked\n" " the same question next time\n" " Merge - add old entries to hotlist as group \"Entries from ~/" msgstr "" -#: src/hotlist.c:1291 +#: src/hotlist.c:1431 msgid "&Keep" msgstr "" -#: src/hotlist.c:1291 +#: src/hotlist.c:1431 msgid "&Merge" msgstr "" -#: src/hotlist.c:1303 +#: src/hotlist.c:1443 msgid " Entries from ~/" msgstr "" -#: src/hotlist.c:1313 +#: src/hotlist.c:1453 msgid " file your old hotlist entries were not deleted" msgstr "" @@ -3018,45 +3018,49 @@ msgstr "" msgid "&Add new" msgstr "" -#: src/panelize.c:113 +#: src/panelize.c:102 msgid " External panelize " msgstr "" #. SCO_FLAVOR #. SCO_FLAVOR -#: gnome/glayout.c:240 src/panelize.c:164 src/panelize.c:425 +#: gnome/glayout.c:240 src/panelize.c:194 src/panelize.c:456 msgid "External panelize" msgstr "" -#: src/panelize.c:175 +#: src/panelize.c:205 msgid "Command" msgstr "" -#: src/panelize.c:189 src/panelize.c:244 src/panelize.c:314 src/panelize.c:335 +#: src/panelize.c:219 src/panelize.c:275 src/panelize.c:345 src/panelize.c:366 msgid "Other command" msgstr "" -#: src/panelize.c:229 +#: src/panelize.c:259 msgid " Add to external panelize " msgstr "" -#: src/panelize.c:268 -msgid " I can't run external panalize while logged on a non local directory " +#: src/panelize.c:260 +msgid " Enter command label: " msgstr "" -#: src/panelize.c:317 +#: src/panelize.c:299 +msgid " I can't run external panelize while logged on a non local directory " +msgstr "" + +#: src/panelize.c:348 msgid "Find rejects after patching" msgstr "" -#: src/panelize.c:318 +#: src/panelize.c:349 msgid "Find *.orig after patching" msgstr "" -#: src/panelize.c:319 +#: src/panelize.c:350 msgid "Find SUID and SGID programs" msgstr "" -#: src/panelize.c:370 +#: src/panelize.c:401 msgid "Cannot invoke command." msgstr "" @@ -3619,11 +3623,11 @@ msgstr "" msgid "NumLock on keypad" msgstr "" -#: src/wtools.c:602 +#: src/wtools.c:609 msgid "Password" msgstr "" -#: src/wtools.c:656 +#: src/wtools.c:663 msgid "Ok" msgstr "" diff --git a/src/cmd.c b/src/cmd.c index cd743dc1e..b58131209 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1243,7 +1243,7 @@ static void nice_cd (char *text, char *xtext, char *help, char *prefix, int to_h if (do_panel_cd (MENU_PANEL, cd_path, 0)) directory_history_add (MENU_PANEL, (MENU_PANEL)->cwd); else - message (1, MSG_ERROR, N_(" Could not chdir to %s ", cd_path); + message (1, MSG_ERROR, N_(" Could not chdir to %s "), cd_path); free (cd_path); free (machine); } diff --git a/src/panel.h b/src/panel.h index 4b90dbf0d..9368c49f7 100644 --- a/src/panel.h +++ b/src/panel.h @@ -114,6 +114,9 @@ typedef struct { #ifdef HAVE_GNOME /* These are standard GtkWidgets */ + + void *xwindow; /* The toplevel window */ + void *table; void *list; void *icons;