From 98ff71d81f821cb31c5d44e0ec8059396ec1ee5b Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Thu, 30 Apr 1998 03:21:52 +0000 Subject: [PATCH] - Simplified the update_panels routine to only care about the current panel, the old way of using it was an historic relic. - This now works properly with the GNOME edition. - Finished/fixed the implementation of the desktop-remove-icon functionality. - Raster's new multi-ok window. For some reason this is not getting loaded. I am compiling gdb 4.17 now, as it is better for egcs output. Miguel. --- FAQ | 2 +- gnome/ChangeLog | 7 + gnome/Makefile.in | 1 + gnome/gconf.h | 2 + gnome/gdesktop.c | 45 +++- gnome/glayout.c | 22 ++ gnome/gnome.TODO | 326 ++++++++++++++++++++++++ gnome/gscreen.c | 13 +- gnome/multi-ok.png | Bin 0 -> 1655 bytes po/mc.pot | 605 +++++++++++++++++++++++---------------------- src/ChangeLog | 9 + src/achown.c | 2 +- src/chmod.c | 2 +- src/chown.c | 2 +- src/cmd.c | 18 +- src/file.c | 6 +- src/hotlist.c | 2 +- src/listmode.c | 2 +- src/main.c | 16 +- src/main.h | 7 +- 20 files changed, 761 insertions(+), 328 deletions(-) create mode 100644 gnome/multi-ok.png diff --git a/FAQ b/FAQ index b1d8ddf24..df9f119ac 100644 --- a/FAQ +++ b/FAQ @@ -113,7 +113,7 @@ * i386-*-linux1.x, 2.x * alpha-linux-linux2 * sparc-linux-linux2.x - * sparc65-linux-linux2.1 + * sparc64-linux-linux2.1 * mips-sgi-irix5.x, 6.x * mips-dec-ultrix4.3 * rs6000-ibm-aix3.2.5 diff --git a/gnome/ChangeLog b/gnome/ChangeLog index 37beeafca..0f8ebaaf7 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,3 +1,10 @@ +1998-04-29 Miguel de Icaza + + * gdesktop.c: Finish desktop_icon_remove implementation. + + * glayout.c (update_panels): GNOME specific Implementation of the + update_panels routine. + Tue Apr 28 06:52:24 1998 Norbert Warmuth * gcmd.c (gnome_open_terminal): Changed my_system(1,...) to diff --git a/gnome/Makefile.in b/gnome/Makefile.in index 2c1f36344..d4af65d7c 100644 --- a/gnome/Makefile.in +++ b/gnome/Makefile.in @@ -52,6 +52,7 @@ ICONS = \ $(srcdir)/directory-ok.xpm \ $(srcdir)/directory.xpm \ $(srcdir)/multi.xpm \ + $(srcdir)/multi-ok.png \ $(srcdir)/multi-ok.xpm # diff --git a/gnome/gconf.h b/gnome/gconf.h index 969986b87..fdb64503f 100644 --- a/gnome/gconf.h +++ b/gnome/gconf.h @@ -32,6 +32,8 @@ #define PORT_HAS_UPDATE_MARKS 1 #define PORT_HAS_RADIO_TOGGLE 1 #define PORT_DOES_BACKGROUND_EXEC 1 +#define PORT_HAS_UPDATE_PANELS 1 + #define mi_getch() fprintf (stderr, "mi_getch is not implemented in this port\n") #define frontend_run_dlg(x) gtkrundlg_event (x) diff --git a/gnome/gdesktop.c b/gnome/gdesktop.c index 5b48dcb04..4aab7e459 100644 --- a/gnome/gdesktop.c +++ b/gnome/gdesktop.c @@ -789,6 +789,30 @@ desktop_release_desktop_icon_t (desktop_icon_t *di) free (di); } +static int +remove_directory (char *path) +{ + int i; + + if (confirm_delete){ + char *buffer; + + if (know_not_what_am_i_doing) + query_set_sel (1); + buffer = copy_strings (_("Do you want to delete "), path, "?", NULL); + i = query_dialog (_("Delete"), buffer, + D_ERROR, 2, _("&Yes"), _("&No")); + free (buffer); + if (i != 0) + return 0; + } + create_op_win (OP_DELETE, 0); + erase_dir (path); + destroy_op_win (); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); + return 1; +} + /* * Removes an icon from the desktop and kills the ~/desktop file associated with it */ @@ -797,7 +821,26 @@ desktop_icon_remove (desktop_icon_t *di) { desktop_icons = g_list_remove (desktop_icons, di); - mc_unlink (di->pathname); + if (di->dentry == NULL){ + /* launch entry */ + mc_unlink (di->pathname); + } else { + /* a .destop file or a directory */ + /* Remove the .desktop */ + mc_unlink (di->dentry->location); + + if (strcmp (di->dentry->type, "Directory") == 0){ + struct stat s; + + if (mc_lstat (di->dentry->exec, &s) == 0){ + if (S_ISLNK (s.st_mode)) + mc_unlink (di->dentry->exec); + else + if (!remove_directory (di->dentry->exec)) + return; + } + } + } desktop_release_desktop_icon_t (di); } diff --git a/gnome/glayout.c b/gnome/glayout.c index d3941a908..9b023a3e4 100644 --- a/gnome/glayout.c +++ b/gnome/glayout.c @@ -447,4 +447,26 @@ setup_panels (void) load_hint (); } +/* + * GNOME's implementation of the update_panels routine + */ +void +update_panels (int force_update, char *current_file) +{ + int reload_others = !(force_update & UP_ONLY_CURRENT); + GList *p; + + update_one_panel_widget (cpanel, force_update, current_file); + if (reload_others){ + for (p = containers; p; p = p->next){ + PanelContainer *pc = p->data; + + if (p->data == current_panel_ptr) + continue; + + update_one_panel_widget (pc->panel, force_update, UP_KEEPSEL); + } + } + mc_chdir (cpanel->cwd); +} diff --git a/gnome/gnome.TODO b/gnome/gnome.TODO index 56981d410..8752c8e5f 100644 --- a/gnome/gnome.TODO +++ b/gnome/gnome.TODO @@ -140,3 +140,329 @@ OPEN ISSUES: of an empty one? - The text in a lot of text entries disappears as soon as I start typing in them. + +Havoc Pennington comments: + +From hp@pobox.com Mon Apr 27 14:41:01 1998 +Return-Path: +Date: Mon, 27 Apr 1998 14:40:32 -0500 (CDT) +From: Havoc Pennington +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +To: miguel@nuclecu.unam.mx +Subject: gmc wish list stuff +X-Mailer: VM 6.34 under Emacs 19.34.1 + + +Hi Miguel, + +I was playing with gmc and took some notes as ideas came to me. I also +tried to come up with an easier-to-use menu structure, that's at the +end. + +I know a patch would be better but maybe some of these ideas are +useful. :) + +Havoc + +========================================= + +General: +=================== + +When I drag across the list view, it doesn't redraw underneath the drag. + +Tooltips would be nice throughout + +All the dialogs should be GnomeDialogs. + +What if the "Filter" drop down had a "Pattern" option, which caused the +text entry to appear? As it is, some frightening patterns can appear +in that text entry; maybe better off hidden unless the user chooses +"Pattern"? +*.(awk|sed|lex|l|y|sh|idl|pl|py|am|in|f|el|bas|pas|java|sl|p|m4|tcl|pov) +is a good way to scare the newbies. :) + +Maybe it'd work like this: when "Pattern" is chosen, you see the text +entry with contents based on the last active filter; otherwise a label +with the English name of the filter, e.g. "Image files." That way +there's constant feedback on what's being viewed. + +Apparent bug related to this, I have two panels open, and in one of +them choosing a filter from the dropdown doesn't put anything in the +entry. + +It would be neat if a description of the highlighted menu item +appeared in the status bar. I'd like to see that as a GnomeApp feature. + +Another neat thing would be info on the selected file in the status +bar; e.g. the file type, or eventually files might have comments +stored in meta-info. + +I like the idea of hints in the status bar, but many of them don't +seem to apply to the Gnome version of mc. + +Could some of the more confusing menu items (e.g. any that require +shell patterns or typing in commands) be moved to an "Advanced" menu? +Or just made optional? + +Lots of the dialogs have funny looking capital letters to mark +accelerators; should use underlines or something instead. + +Throughout, when asking for a filename (e.g. on copy or move) there +should be a "browse" button to pop up a file selection dialog. + +File menu: +=============== + +"Open Terminal" fails silently because rxvt is in the wrong place; +Should pop up a dialog asking where it is. + +"Mkdir" should be called "New Directory." + +"Rename/Move" should be separate menu items; Rename should result in a +much simpler dialog. + +Maybe call "Select" "Select by Pattern..."? Makes it less surprising when +the dialog comes up. + +I'm thinking all the "Select" stuff belongs on an "Edit" menu. + +History doesn't seem to work in many of the GnomeEntry widgets? + +The move, rename, etc. stuff should be on the Commands menu, maybe? + +Panel menu: +=============== + +Call it the "Window" menu? + +"Display Mode" seems confusing; how about "Detail Level"? + +Dialog is called "Listing Mode," menu item "Display Mode." Should be +consistent. + +It isn't clear what full, brief, long file list means; the stuff in +the entries is cryptic; what's "user mini status"? I think a submenu +would be more appropriate here, something like: + +Detail Level -> Most + Normal + Least + +Then put the more advanced options in a page of a global +"Preferences..." dialog. + +"Sort Order" could be "Sort By" instead, and again a submenu might be +nicer than a dialog. + +e.g. Sort By -> Name + Date/Time + Size + +etc. That way you can rapidly go up to the menu and change it, skipping the +dialog. + +I think the drop-down filter menu and entry are adequate; no reason to have a +"Filter" menu item here too. Just adds clutter. + +"Network Link" says "F1 for details" but F1 does nothing when I press it. + +Commands menu: +================= + +"Find" should be "Find file"? +The Find dialog could be a lot nicer. It should also be a separate find-files +app or a gnome-libs widget, I think. Other apps might want to use it. + +"Hotlist" should be "Bookmarks"? More familiar name. Consistent with +Help Browser. Also, where do the bookmarks show up? Should they be on +a submenu here? Should be consistent with whatever the Help browser +does. + +"Compare panels" and "External panelize" need renaming. It's very +unclear what they do. See my reworked menu structure below for an +idea on "compare panels" using a submenu. + +Maybe "External Panelize" can be configured elsewhere, and then the +menu can have a submenu with only the preconfigured options? + +"Active VFS list"? What does it do? + +It isn't clear to me what the "Commands" have in common. Seems like +most of them belong on the "Panel" menu, or in preferences. + +Options menu: +================ + +Maybe this menu could be removed, and all of its dialogs made into +pages of a single notebook found under "Preferences..." on the File or +Edit menu (whatever the Gnome standard is). + +Failing that, it should be called "Preferences" rather than "Options." + +Desktop menu: +================= + +It would make sense to me if this menu were next to the "Panel" +("Window") menu, since the two are related by opposition. I'd say +these two should be the last two items (except Help). + +Help menu: +============= + +Should be right justified. Maybe a "Gnome Help" option to lauch the +browser pointed at the main Gnome Help Index? + +Popup context menu: +============== + +"Open With" could have a submenu with suggested applications to use. + +There isn't a clear difference between the submenu specific to the +filename, and the main menu. e.g., why are link and symlink on the +submenu, but copy is on the main menu? + +Link and symlink seem like Advanced items to me, but a "Create Link" +item that made a .desktop file (or whatever gets decided on for +meta-info) would be nice. + +Menus Revisited +=============== + +Here's an attempt to work out a complete menu structure from +scratch. It changes things more radically than the above suggestions. +Items are listed in order. + +File -> + New Window + Open Terminal + ------------- + New -> + Directory + Text File + Image + [ ... etc., user configurable. ] + ------------- + Close This Window + Exit File Manager + +Edit -> [Should be consistent with other Gnome apps, right now there's no + standard I don't think?] + Select By Pattern [ An optional "advanced" item ] + Select All + Unselect all + Reverse Selection + ---------------- + File Properties... + ---------------- + Preferences... [ gmc big prefs notebook, maybe on File menu? ] + +Commands -> [ This menu has commands that apply to selected files ] + Open + Open With -> + [ Options that make sense for selected file ] + Custom... [ pops up text entry for command ] + View + View Raw [ An "advanced" command, optionally + not visible ] + ---------- + Copy... [ Copy, move, rename would have simplified dialogs - + Move... just ask where to, use the selection rather + Rename... than asking for a pattern ] + Delete + ---------- [ These two should be optional "advanced" items ] + Move by Pattern... [ The more complex dialog asking for a pattern ] + Copy by Pattern... [ ditto ] + + +Window -> + Find Files... + Detail Level -> Most + Normal + Least + [... etc. make this menu configurable?] + Sort By -> Name + Date/Time + [... etc. make this menu configurable?] + Rescan Directory + ------------------- + Scan FTP Directory... + Scan Network Directory... + ------------------- + Special Listing -> SUID Root + Patching Rejects + [... etc., whatever user has configured.] + ------------------ + Compare To -> + [ Menu item for each other window ] + +Desktop -> + Arrange Icons + Properties... [ launch desktop-properties app ] + [More to come, I'm sure.] + +Help -> + About... + File Manager Manual + Gnome Help + +Popup menu for file foo.bar -> + [ Quick shortcuts should be first; e.g. "Use as Wallpaper", etc. ] + ------------- + foo.bar -> + [ Everything on the "Commands" menu ] + Properties... + + +Rationale: + +File menu has the traditional stuff. Close, Exit, and New. +Edit menu has the standard Gnome edit menu stuff, when that's decided on. + (Preferences... is in either File or Edit, whatever becomes standard). + Has "File Properties..." because that seems consistent with e.g. gtt. +Commands menu has operations on the selected (pre-existing) file. + Would also make sense to have "Edit Properties..." here instead of + "File Properties..." on the edit menu. +Window menu has operations that potentially change what's in the window or + how it's viewed. +Desktop menu has operations on the desktop. +Help menu has help. + +The "Options" menu isn't needed, because it's all in "Preferences..." + +Popup menu has the "Commands" menu as submenu of the file name; seems +intuitive, because "Commands" are operations on the particular file +name. Quick context-sensitive commands like "Use As Wallpaper" are +first because they'll be used most. "Properties..." is also there, since +it may be more convenient here than on the "Edit" menu. + + +Preferences... +=============== + +The Preferences dialog would have the following tabs: + +General: general options, from current Options->Options +Virtual File System: from Options->Virtual FS [advanced config] +Confirmation: from Options->Confirmation +New Menu: what to put on the File->New submenu +Detail Level: listing mode config, including what goes on Window->Detail Level +Sort By: config for the Window->Sort By menu +Bookmarks: config for bookmarks +File Types: config available actions for different file types. Much like + the Netscape preferences for this. [advanced config] + +Probably I'm leaving something out. The "Advanced" tabs could be somehow +marked as advanced (e.g. as in Netscape), or hidden by default. + + + + + + + + + + diff --git a/gnome/gscreen.c b/gnome/gscreen.c index ce9db1ac9..c3baac7af 100644 --- a/gnome/gscreen.c +++ b/gnome/gscreen.c @@ -845,11 +845,12 @@ panel_artificial_drag_start (GtkCList *window, GdkEventMotion *event) } static GtkWidget * -load_transparent_xpm (char *base) +load_transparent_image (char *base) { char *f = concat_dir_and_file (ICONDIR, base); GtkWidget *w; - + + printf ("Loading: %s\n", f); w = make_transparent_window (f); g_free (f); return w; @@ -866,16 +867,16 @@ panel_realized (GtkWidget *file_list, WPanel *panel) GdkPoint hotspot = { 5, 5 }; if (!drag_directory) - drag_directory = load_transparent_xpm ("directory-ok.xpm"); + drag_directory = load_transparent_image ("directory-ok.xpm"); if (!drag_directory_ok) - drag_directory_ok = load_transparent_xpm ("directory.xpm"); + drag_directory_ok = load_transparent_image ("directory.xpm"); if (!drag_multiple) - drag_multiple = load_transparent_xpm ("multi.xpm"); + drag_multiple = load_transparent_image ("multi.xpm"); if (!drag_multiple_ok) - drag_multiple_ok = load_transparent_xpm ("multi-ok.xpm"); + drag_multiple_ok = load_transparent_image ("multi-ok.png"); if (drag_directory && drag_directory_ok) gdk_dnd_set_drag_shape (drag_directory->window, &hotspot, diff --git a/gnome/multi-ok.png b/gnome/multi-ok.png new file mode 100644 index 0000000000000000000000000000000000000000..6a0212941259708966ee1aef23c4a3b3d6d75e32 GIT binary patch literal 1655 zcmV--28j8IP)w1`ZFR2h**4U$0z7$s0s!8XM~+ge*0LWw$+iH>C|1u?;fA|wKXn*<0U z2?#m;urFkj-A(wwbZ4G<&hCAl^Z%chJ?C6eRc_WtL{wEJ-WlU&fXqe8AD>F&Z>u?U;uM2P48CvO2>8>FmT_%hU{pj3^Rr1$^;tb{Yu|J2rd3nh*hN$oI|* z-F*13qg?8}%${B#$d5=yh2lo*9On z*5e)2Z2Sv#JNEG0+Mh9Jb^(P2QxMn8aLBB9*={ojuscnhZZihxa6*P@1F>_l=PE~9 z&QP~w55Ic+AqsDwj@O&TmuLD%R|lF8HL_;ocADGTxpbuur`uxJ?)^-h`7mQ|FXNNu zV>sLvPPfHXy~?2@?Of^;FcRtRfu@g-F>m2o9w}Quets_Bnv_Rs`dHro;L}JTRUNhf z)&9e}zj2!a`pBXp1r*TVy!fy_R(_8HdiwLNs@=PE?;qDFps#FNt_^S3=&BVzQ9$S3 z^BpZKnXhlXxm7#AYEiw~r2)u6Sg{Da^QZM;P(WXPzD)mn;3e%nRj=*MTNKbuHB0r2 z&t6qPm(2TK#QCA?55KR|qeokY5r|m_?!CW~XDfe-X()4x3h-qnV{;l9rjRuzh5EYX zEH2%I|7gUXyHlB=(B>Uo zCWa{(reFs5kc^lhCh0-Yy9=gbS_Wp2q|1|p&zH=tw_M@fozKvG!XLXAh=?v*@&HAJ zw~^^h!XC8Nu!aMNWU#1xt`o3HSaw-1QoV`f=K7d(=Vtup&U3Kk zYy=q#z?0}EJ>?t2!3McKB!h*&qlbzWwE$$MrQmRx5gstD>mdu1@pu?BHkpYzUQVC6 zkM*10LRH03ReA2^?R59{27!&JZVy{8CV&2G69B~ve?-O8Tln{XzQB=S;z%&Dy8_EG zbOoPhW_rlW%NbsX4jw-h7uYlf5fiYub}ew{we9QJwPP)dAA5n%j-LzwCs<*yusn#! zx$b@*D&G)Uid9uaL}$EFLq?)!nA@*gZv|J7_dp*HEch<|jtb^3spjLo>&Tmw6%mTS zeFMY>STwwMICd#M(9#~=ddmnX!2(PSF@x#c&-rs5AOiq&Ug)Op>&sye*c>(t%L#@X z#D%}>Yl=&&qfbO3FWgo5A{lN^l*~7Se?JR%Vj=*ot;hJhwVhx5ax3+9kK*&CknT;y zFl+&f#R7u6*l1|{=g33pM~6=i0ye^OK$!(%GH3P-0ID~<&fEo6Y+PT;gmFG5Po98b zx&sy)E|B1Exbb&hrg-U^VFk$=(wIa&e1AQ`-(or$#oZP@d+>cAD%zz=cn zb0f-cghXTGzEKgdZpMpgC^=WJUOn<#*Z=$V{C{6{A*2xF_C^2z002ovPDHLkV1lHS B8*cyr literal 0 HcmV?d00001 diff --git a/po/mc.pot b/po/mc.pot index a87320a1b..0d38eaf1d 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Date: 1998-04-27 15:18:09-0500\n" +"Date: 1998-04-29 20:43:05-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" @@ -63,7 +63,7 @@ msgid " Save As " msgstr "" #. Warning message with a query to continue or cancel the operation -#: edit/editcmd.c:409 edit/editcmd.c:718 edit/editcmd.c:730 edit/editcmd.c:831 edit/editcmd.c:914 gnome/gdesktop.c:1258 src/ext.c:295 src/help.c:320 src/main.c:683 src/subshell.c:696 src/subshell.c:722 src/utilunix.c:374 src/utilunix.c:378 src/utilunix.c:444 +#: edit/editcmd.c:409 edit/editcmd.c:718 edit/editcmd.c:730 edit/editcmd.c:831 edit/editcmd.c:914 gnome/gdesktop.c:1299 src/ext.c:295 src/help.c:320 src/main.c:685 src/subshell.c:696 src/subshell.c:722 src/utilunix.c:374 src/utilunix.c:378 src/utilunix.c:444 msgid " Warning " msgstr "" @@ -141,7 +141,7 @@ msgstr "" msgid " Save file " msgstr "" -#: edit/editcmd.c:691 edit/editwidget.c:993 src/view.c:1982 +#: edit/editcmd.c:691 edit/editwidget.c:993 src/view.c:1992 msgid "Save" msgstr "" @@ -187,7 +187,7 @@ msgid " Replace " msgstr "" #. Heads the 'Search' dialog box -#: edit/editcmd.c:1115 edit/editcmd.c:1291 edit/editcmd.c:1947 src/view.c:1469 src/view.c:1559 src/view.c:1681 src/view.c:1877 src/view.c:1909 +#: edit/editcmd.c:1115 edit/editcmd.c:1291 edit/editcmd.c:1947 src/view.c:1474 src/view.c:1564 src/view.c:1686 src/view.c:1885 src/view.c:1917 msgid " Search " msgstr "" @@ -305,11 +305,11 @@ msgstr "" msgid "Cancel quit" msgstr "" -#: edit/editcmd.c:1965 gnome/gcmd.c:94 gnome/gdesktop.c:1073 src/cmd.c:241 src/file.c:2116 src/file.c:2469 src/file.c:2549 src/hotlist.c:1027 src/main.c:838 src/screen.c:1983 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410 +#: edit/editcmd.c:1965 gnome/gcmd.c:94 gnome/gdesktop.c:804 gnome/gdesktop.c:1114 src/cmd.c:248 src/file.c:2116 src/file.c:2469 src/file.c:2549 src/hotlist.c:1027 src/main.c:840 src/screen.c:1989 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410 msgid "&Yes" msgstr "" -#: edit/editcmd.c:1965 gnome/gcmd.c:94 gnome/gdesktop.c:1073 src/cmd.c:241 src/file.c:2116 src/file.c:2466 src/file.c:2549 src/hotlist.c:1027 src/main.c:838 src/screen.c:1983 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410 +#: edit/editcmd.c:1965 gnome/gcmd.c:94 gnome/gdesktop.c:804 gnome/gdesktop.c:1114 src/cmd.c:248 src/file.c:2116 src/file.c:2466 src/file.c:2549 src/hotlist.c:1027 src/main.c:840 src/screen.c:1989 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410 msgid "&No" msgstr "" @@ -343,7 +343,7 @@ msgstr "" msgid " Cut to clipboard " msgstr "" -#: edit/editcmd.c:2224 edit/editcmd.c:2226 src/view.c:1850 +#: edit/editcmd.c:2224 edit/editcmd.c:2226 src/view.c:1857 msgid " Goto line " msgstr "" @@ -571,11 +571,11 @@ msgstr "" msgid "&Save mode..." msgstr "" -#: edit/editmenu.c:243 edit/editmenu.c:252 src/main.c:1308 +#: edit/editmenu.c:243 edit/editmenu.c:252 src/main.c:1310 msgid "&Layout..." msgstr "" -#: edit/editmenu.c:262 edit/editmenu.c:271 edit/editmenu.c:388 src/chmod.c:174 src/chown.c:131 src/main.c:1339 +#: edit/editmenu.c:262 edit/editmenu.c:271 edit/editmenu.c:388 src/chmod.c:174 src/chown.c:131 src/main.c:1341 msgid " File " msgstr "" @@ -587,11 +587,11 @@ msgstr "" msgid " Sear/Repl " msgstr "" -#: edit/editmenu.c:265 edit/editmenu.c:274 edit/editmenu.c:438 src/main.c:1340 +#: edit/editmenu.c:265 edit/editmenu.c:274 edit/editmenu.c:438 src/main.c:1342 msgid " Command " msgstr "" -#: edit/editmenu.c:266 edit/editmenu.c:275 src/main.c:1341 +#: edit/editmenu.c:266 edit/editmenu.c:275 src/main.c:1343 msgid " Options " msgstr "" @@ -752,7 +752,7 @@ msgstr "" msgid "Error initialising editor.\n" msgstr "" -#: edit/editwidget.c:992 gnome/glayout.c:358 src/help.c:812 src/main.c:1670 src/screen.c:2194 src/screen.c:2228 src/tree.c:1451 src/view.c:1977 +#: edit/editwidget.c:992 gnome/glayout.c:349 src/help.c:812 src/main.c:1672 src/screen.c:2200 src/screen.c:2234 src/tree.c:1451 src/view.c:1987 msgid "Help" msgstr "" @@ -764,7 +764,7 @@ msgstr "" msgid "Replac" msgstr "" -#: edit/editwidget.c:996 gnome/gdesktop.c:337 gnome/glayout.c:279 src/screen.c:2198 src/screen.c:2232 src/tree.c:1457 +#: edit/editwidget.c:996 gnome/gdesktop.c:337 src/screen.c:2204 src/screen.c:2238 src/tree.c:1457 msgid "Copy" msgstr "" @@ -772,19 +772,19 @@ msgstr "" msgid "Move" msgstr "" -#: edit/editwidget.c:998 gnome/gview.c:291 gnome/gview.c:315 src/view.c:1990 +#: edit/editwidget.c:998 gnome/gview.c:291 gnome/gview.c:315 src/view.c:2000 msgid "Search" msgstr "" -#: edit/editwidget.c:999 gnome/gdesktop.c:970 gnome/glayout.c:282 src/screen.c:2201 src/screen.c:2235 +#: edit/editwidget.c:999 gnome/gdesktop.c:803 gnome/gdesktop.c:1011 src/screen.c:2207 src/screen.c:2241 msgid "Delete" msgstr "" -#: edit/editwidget.c:1001 src/main.c:1672 +#: edit/editwidget.c:1001 src/main.c:1674 msgid "PullDn" msgstr "" -#: edit/editwidget.c:1002 gnome/gview.c:286 src/help.c:824 src/main.c:1673 src/view.c:1979 src/view.c:1999 +#: edit/editwidget.c:1002 gnome/gview.c:286 src/help.c:824 src/main.c:1675 src/view.c:1989 src/view.c:2009 msgid "Quit" msgstr "" @@ -804,7 +804,7 @@ msgid "" "\n" msgstr "" -#: src/achown.c:72 src/boxes.c:139 src/boxes.c:274 src/boxes.c:371 src/boxes.c:458 src/boxes.c:637 src/boxes.c:758 src/boxes.c:800 src/chmod.c:115 src/chown.c:81 src/cmd.c:833 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:410 src/wtools.c:114 src/wtools.c:408 src/wtools.c:581 src/wtools.c:661 +#: src/achown.c:72 src/boxes.c:139 src/boxes.c:274 src/boxes.c:371 src/boxes.c:458 src/boxes.c:637 src/boxes.c:758 src/boxes.c:800 src/chmod.c:115 src/chown.c:81 src/cmd.c:840 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:410 src/wtools.c:114 src/wtools.c:408 src/wtools.c:581 src/wtools.c:661 msgid "&Cancel" msgstr "" @@ -1211,240 +1211,240 @@ msgstr "" msgid " I can't run the Chown command on a tarfs " msgstr "" -#: src/cmd.c:190 +#: src/cmd.c:197 msgid " Can not fetch a local copy of %s " msgstr "" -#: src/cmd.c:240 +#: src/cmd.c:247 msgid " CD " msgstr "" -#: src/cmd.c:240 +#: src/cmd.c:247 msgid "Files tagged, want to cd?" msgstr "" -#: src/cmd.c:278 +#: src/cmd.c:285 msgid " Filtered view " msgstr "" -#: src/cmd.c:278 +#: src/cmd.c:285 msgid " Filter command and arguments:" msgstr "" -#: src/cmd.c:363 +#: src/cmd.c:370 msgid " Mkdir " msgstr "" -#: src/cmd.c:363 +#: src/cmd.c:370 msgid " Enter directory name:" msgstr "" -#: src/cmd.c:418 +#: src/cmd.c:425 msgid " Filter " msgstr "" -#: src/cmd.c:418 +#: src/cmd.c:425 msgid " Set expression for filtering filenames" msgstr "" -#: src/cmd.c:502 +#: src/cmd.c:509 msgid " Select " msgstr "" -#: src/cmd.c:530 src/cmd.c:581 +#: src/cmd.c:537 src/cmd.c:588 msgid " Malformed regular expression " msgstr "" -#: src/cmd.c:554 +#: src/cmd.c:561 msgid " Unselect " msgstr "" -#: src/cmd.c:623 +#: src/cmd.c:630 msgid "Extension file edit" msgstr "" -#: src/cmd.c:624 +#: src/cmd.c:631 msgid " Which extension file you want to edit? " msgstr "" -#: src/cmd.c:625 +#: src/cmd.c:632 msgid "&User" msgstr "" -#: src/cmd.c:625 src/cmd.c:651 +#: src/cmd.c:632 src/cmd.c:658 msgid "&System Wide" msgstr "" -#: src/cmd.c:648 +#: src/cmd.c:655 msgid "Menu file edit" msgstr "" -#: src/cmd.c:649 +#: src/cmd.c:656 msgid " Which menu file will you edit? " msgstr "" -#: src/cmd.c:651 +#: src/cmd.c:658 msgid "&Local" msgstr "" -#: src/cmd.c:651 +#: src/cmd.c:658 msgid "&Home" msgstr "" -#: src/cmd.c:832 +#: src/cmd.c:839 msgid " Compare directories " msgstr "" -#: src/cmd.c:832 +#: src/cmd.c:839 msgid " Select compare method: " msgstr "" -#: src/cmd.c:833 +#: src/cmd.c:840 msgid "&Quick" msgstr "" -#: src/cmd.c:833 +#: src/cmd.c:840 msgid "&Size only" msgstr "" -#: src/cmd.c:833 +#: src/cmd.c:840 msgid "&Thorough" msgstr "" -#: src/cmd.c:843 +#: src/cmd.c:850 msgid " Both panels should be on the listing view mode to use this command " msgstr "" -#: src/cmd.c:857 +#: src/cmd.c:864 msgid " The command history is empty " msgstr "" -#: src/cmd.c:863 +#: src/cmd.c:870 msgid " Command history " msgstr "" -#: src/cmd.c:905 +#: src/cmd.c:912 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " msgstr "" -#: src/cmd.c:942 +#: src/cmd.c:949 msgid "" "Type `exit' to return to the Midnight Commander\n" "\r\n" "\r" msgstr "" -#: src/cmd.c:993 +#: src/cmd.c:1000 msgid "" " Couldn't stat %s \n" " %s " msgstr "" -#: src/cmd.c:1002 src/cmd.c:1004 +#: src/cmd.c:1009 src/cmd.c:1011 msgid " Link " msgstr "" -#: src/cmd.c:1003 src/cmd.c:1108 +#: src/cmd.c:1010 src/cmd.c:1115 msgid " to:" msgstr "" -#: src/cmd.c:1014 +#: src/cmd.c:1021 msgid " link: %s " msgstr "" -#: src/cmd.c:1047 +#: src/cmd.c:1054 msgid " symlink: %s " msgstr "" -#: src/cmd.c:1073 +#: src/cmd.c:1080 msgid " Symlink " msgstr "" -#: src/cmd.c:1073 +#: src/cmd.c:1080 msgid " points to:" msgstr "" -#: src/cmd.c:1078 +#: src/cmd.c:1085 msgid " Edit symlink " msgstr "" -#: src/cmd.c:1084 +#: src/cmd.c:1091 msgid " edit symlink: %s " msgstr "" -#: src/cmd.c:1108 +#: src/cmd.c:1115 msgid " Link symbolically " msgstr "" -#: src/cmd.c:1109 +#: src/cmd.c:1116 msgid " Relative symlink " msgstr "" -#: src/cmd.c:1120 +#: src/cmd.c:1127 msgid " relative symlink: %s " msgstr "" -#: src/cmd.c:1223 +#: src/cmd.c:1230 msgid " Enter machine name (F1 for details): " msgstr "" -#: src/cmd.c:1247 +#: src/cmd.c:1254 msgid " Could not chdir to %s " msgstr "" -#: src/cmd.c:1254 +#: src/cmd.c:1261 msgid " Link to a remote machine " msgstr "" -#: src/cmd.c:1260 +#: src/cmd.c:1267 msgid " FTP to machine " msgstr "" -#: src/cmd.c:1270 +#: src/cmd.c:1277 msgid " Socket source routing setup " msgstr "" -#: src/cmd.c:1271 +#: src/cmd.c:1278 msgid " Enter host name to use as a source routing hop: " msgstr "" -#: src/cmd.c:1278 +#: src/cmd.c:1285 msgid " Host name " msgstr "" -#: src/cmd.c:1278 +#: src/cmd.c:1285 msgid " Error while looking up IP address " msgstr "" -#: src/cmd.c:1289 +#: src/cmd.c:1296 msgid " Undelete files on an ext2 file system " msgstr "" -#: src/cmd.c:1290 +#: src/cmd.c:1297 msgid "" " Enter the file system name where you want to run the\n" " undelete file system on: (F1 for details)" msgstr "" -#: src/cmd.c:1382 +#: src/cmd.c:1389 msgid "Show directory sizes" msgstr "" -#: src/cmd.c:1382 src/panelize.c:459 +#: src/cmd.c:1389 src/panelize.c:459 msgid "Pipe close failed" msgstr "" -#: src/cmd.c:1395 +#: src/cmd.c:1402 msgid "Cannot invoke du command." msgstr "" -#: src/cmd.c:1406 +#: src/cmd.c:1413 msgid " Setup saved to ~/" msgstr "" -#: src/cmd.c:1411 +#: src/cmd.c:1418 msgid " Setup " msgstr "" @@ -1592,7 +1592,7 @@ msgstr "" msgid "Deleting" msgstr "" -#: gnome/glayout.c:353 gnome/gview.c:314 src/file.c:562 +#: gnome/glayout.c:344 gnome/gview.c:314 src/file.c:562 msgid "File" msgstr "" @@ -2031,7 +2031,7 @@ msgstr "" msgid "Content: " msgstr "" -#: src/find.c:158 src/main.c:1204 src/main.c:1225 +#: src/find.c:158 src/main.c:1206 src/main.c:1227 msgid "&Tree" msgstr "" @@ -2055,7 +2055,7 @@ msgstr "" msgid "Finished" msgstr "" -#: src/find.c:526 src/view.c:1469 +#: src/find.c:526 src/view.c:1474 msgid "Searching %s" msgstr "" @@ -2522,7 +2522,7 @@ msgstr "" msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "" -#: src/main.c:684 +#: src/main.c:686 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -2530,131 +2530,131 @@ msgid "" " extra access permissions with the \"su\" command? " msgstr "" -#: src/main.c:759 +#: src/main.c:761 msgid "Press any key to continue..." msgstr "" -#: src/main.c:809 +#: src/main.c:811 msgid " The shell is already running a command " msgstr "" -#: gnome/gcmd.c:92 gnome/gdesktop.c:1071 src/main.c:836 src/screen.c:1981 +#: gnome/gcmd.c:92 gnome/gdesktop.c:1112 src/main.c:838 src/screen.c:1987 msgid " The Midnight Commander " msgstr "" -#: gnome/gcmd.c:93 src/main.c:837 +#: gnome/gcmd.c:93 src/main.c:839 msgid " Do you really want to quit the Midnight Commander? " msgstr "" -#: src/main.c:1201 src/main.c:1222 +#: src/main.c:1203 src/main.c:1224 msgid "&Listing mode..." msgstr "" -#: src/main.c:1202 src/main.c:1223 +#: src/main.c:1204 src/main.c:1225 msgid "&Quick view C-x q" msgstr "" -#: src/main.c:1203 src/main.c:1224 +#: src/main.c:1205 src/main.c:1226 msgid "&Info C-x i" msgstr "" -#: src/main.c:1206 src/main.c:1227 +#: src/main.c:1208 src/main.c:1229 msgid "&Sort order..." msgstr "" -#: src/main.c:1208 src/main.c:1229 +#: src/main.c:1210 src/main.c:1231 msgid "&Filter..." msgstr "" -#: src/main.c:1211 src/main.c:1232 +#: src/main.c:1213 src/main.c:1234 msgid "&Network link..." msgstr "" -#: src/main.c:1212 src/main.c:1233 +#: src/main.c:1214 src/main.c:1235 msgid "FT&P link..." msgstr "" -#: src/main.c:1216 src/main.c:1237 +#: src/main.c:1218 src/main.c:1239 msgid "&Drive... M-d" msgstr "" -#: src/main.c:1218 src/main.c:1239 +#: src/main.c:1220 src/main.c:1241 msgid "&Rescan C-r" msgstr "" -#: src/main.c:1243 +#: src/main.c:1245 msgid "&User menu F2" msgstr "" -#: src/main.c:1244 +#: src/main.c:1246 msgid "&View F3" msgstr "" -#: src/main.c:1245 +#: src/main.c:1247 msgid "&Filtered view M-!" msgstr "" -#: src/main.c:1246 +#: src/main.c:1248 msgid "&Edit F4" msgstr "" -#: src/main.c:1247 +#: src/main.c:1249 msgid "&Copy F5" msgstr "" -#: src/main.c:1248 +#: src/main.c:1250 msgid "c&Hmod C-x c" msgstr "" -#: src/main.c:1250 +#: src/main.c:1252 msgid "&Link C-x l" msgstr "" -#: src/main.c:1251 +#: src/main.c:1253 msgid "&SymLink C-x s" msgstr "" -#: src/main.c:1252 +#: src/main.c:1254 msgid "edit s&Ymlink C-x C-s" msgstr "" -#: src/main.c:1253 +#: src/main.c:1255 msgid "ch&Own C-x o" msgstr "" -#: src/main.c:1254 +#: src/main.c:1256 msgid "&Advanced chown " msgstr "" -#: src/main.c:1256 +#: src/main.c:1258 msgid "&Rename/Move F6" msgstr "" -#: src/main.c:1257 +#: src/main.c:1259 msgid "&Mkdir F7" msgstr "" -#: src/main.c:1258 +#: src/main.c:1260 msgid "&Delete F8" msgstr "" -#: src/main.c:1259 +#: src/main.c:1261 msgid "&Quick cd M-c" msgstr "" -#: src/main.c:1261 +#: src/main.c:1263 msgid "select &Group M-+" msgstr "" -#: src/main.c:1262 +#: src/main.c:1264 msgid "u&Nselect group M-\\" msgstr "" -#: src/main.c:1263 +#: src/main.c:1265 msgid "reverse selec&Tion M-*" msgstr "" -#: src/main.c:1265 +#: src/main.c:1267 msgid "e&Xit F10" msgstr "" @@ -2662,111 +2662,111 @@ msgstr "" #. * as a panel still has some problems, I have not yet finished #. * the WTree widget port, sorry. #. -#: src/main.c:1274 +#: src/main.c:1276 msgid "&Directory tree" msgstr "" -#: src/main.c:1275 +#: src/main.c:1277 msgid "&Find file M-?" msgstr "" -#: src/main.c:1277 +#: src/main.c:1279 msgid "s&Wap panels C-u" msgstr "" -#: src/main.c:1278 +#: src/main.c:1280 msgid "switch &Panels on/off C-o" msgstr "" -#: src/main.c:1280 +#: src/main.c:1282 msgid "&Compare directories C-x d" msgstr "" -#: src/main.c:1281 +#: src/main.c:1283 msgid "e&Xternal panelize C-x !" msgstr "" -#: src/main.c:1283 +#: src/main.c:1285 msgid "show directory s&Izes" msgstr "" -#: src/main.c:1286 +#: src/main.c:1288 msgid "command &History" msgstr "" -#: src/main.c:1287 +#: src/main.c:1289 msgid "di&Rectory hotlist C-\\" msgstr "" -#: src/main.c:1289 +#: src/main.c:1291 msgid "&Active VFS list C-x a" msgstr "" -#: src/main.c:1292 +#: src/main.c:1294 msgid "&Background jobs C-x j" msgstr "" -#: src/main.c:1296 +#: src/main.c:1298 msgid "&Undelete files (ext2fs only)" msgstr "" -#: src/main.c:1299 +#: src/main.c:1301 msgid "&Listing format edit" msgstr "" -#: src/main.c:1301 +#: src/main.c:1303 msgid "&Extension file edit" msgstr "" -#: src/main.c:1302 +#: src/main.c:1304 msgid "&Menu file edit" msgstr "" -#: src/main.c:1307 +#: src/main.c:1309 msgid "&Configuration..." msgstr "" -#: src/main.c:1309 +#: src/main.c:1311 msgid "c&Onfirmation..." msgstr "" -#: src/main.c:1310 +#: src/main.c:1312 msgid "&Display bits..." msgstr "" -#: src/main.c:1312 +#: src/main.c:1314 msgid "learn &Keys..." msgstr "" -#: src/main.c:1315 +#: src/main.c:1317 msgid "&Virtual FS..." msgstr "" -#: src/main.c:1318 +#: src/main.c:1320 msgid "&Save setup" msgstr "" -#: src/main.c:1334 src/main.c:1336 +#: src/main.c:1336 src/main.c:1338 msgid " Left " msgstr "" -#: src/main.c:1336 +#: src/main.c:1338 msgid " Above " msgstr "" -#: src/main.c:1344 src/main.c:1346 +#: src/main.c:1346 src/main.c:1348 msgid " Right " msgstr "" -#: src/main.c:1346 +#: src/main.c:1348 msgid " Below " msgstr "" -#: src/main.c:1407 +#: src/main.c:1409 msgid " Information " msgstr "" -#: src/main.c:1408 +#: src/main.c:1410 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -2774,141 +2774,141 @@ msgid "" " the details. " msgstr "" -#: src/main.c:1671 src/screen.c:2195 src/screen.c:2229 +#: src/main.c:1673 src/screen.c:2201 src/screen.c:2235 msgid "Menu" msgstr "" -#: src/main.c:1885 +#: src/main.c:1887 msgid "Thank you for using GNU Midnight Commander" msgstr "" -#: src/main.c:2231 +#: src/main.c:2233 msgid "with mouse support on xterm%s.\n" msgstr "" -#: src/main.c:2232 +#: src/main.c:2234 msgid " and the Linux console" msgstr "" -#: src/main.c:2323 +#: src/main.c:2325 msgid "The TERM environment variable is unset!\n" msgstr "" -#: src/main.c:2570 +#: src/main.c:2572 msgid "Library directory for the Midnight Commander: %s\n" msgstr "" -#: src/main.c:2575 +#: src/main.c:2577 msgid "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" -#: src/main.c:2638 +#: src/main.c:2640 msgid "[DEVEL-ONLY: Debug the background code]" msgstr "" -#: src/main.c:2641 +#: src/main.c:2643 msgid "Create command file to set default directory upon exit." msgstr "" -#: src/main.c:2643 +#: src/main.c:2645 msgid "Force color mode." msgstr "" -#: src/main.c:2644 +#: src/main.c:2646 msgid "Specify colors (use --help-colors to get a list)." msgstr "" -#: src/main.c:2646 +#: src/main.c:2648 msgid "[DEVEL-ONLY: Debug the subshell." msgstr "" -#: src/main.c:2648 +#: src/main.c:2650 msgid "Startup the internal editor." msgstr "" -#: src/main.c:2649 +#: src/main.c:2651 msgid "Shows this help message." msgstr "" -#: src/main.c:2650 +#: src/main.c:2652 msgid "Help on how to specify colors." msgstr "" -#: src/main.c:2652 +#: src/main.c:2654 msgid "Log ftpfs commands to the file." msgstr "" -#: src/main.c:2654 +#: src/main.c:2656 msgid "Prints out the configured paths." msgstr "" -#: src/main.c:2656 +#: src/main.c:2658 msgid "Force black and white display." msgstr "" -#: src/main.c:2657 +#: src/main.c:2659 msgid "Disable mouse support." msgstr "" -#: src/main.c:2659 +#: src/main.c:2661 msgid "Force the concurrent subshell mode" msgstr "" -#: src/main.c:2660 +#: src/main.c:2662 msgid "Disable the concurrent subshell mode." msgstr "" -#: src/main.c:2661 +#: src/main.c:2663 msgid "Force subshell execution." msgstr "" -#: src/main.c:2663 +#: src/main.c:2665 msgid "At exit, print the last working directory." msgstr "" -#: src/main.c:2664 +#: src/main.c:2666 msgid "Reset softkeys (HP terminals only) to their terminfo/termcap default." msgstr "" -#: src/main.c:2665 +#: src/main.c:2667 msgid "Disables verbose operation (for slow terminals)." msgstr "" -#: src/main.c:2667 +#: src/main.c:2669 msgid "Use simple symbols for line drawing." msgstr "" -#: src/main.c:2672 +#: src/main.c:2674 msgid "Activate support for the TERMCAP variable." msgstr "" -#: src/main.c:2674 +#: src/main.c:2676 msgid "Report versionand configuration options." msgstr "" -#: src/main.c:2675 +#: src/main.c:2677 msgid "Start up into the viewer mode." msgstr "" -#: src/main.c:2676 +#: src/main.c:2678 msgid "Force xterm mouse support and screen save/restore" msgstr "" -#: src/main.c:2745 +#: src/main.c:2747 msgid "[this dir] [other dir]" msgstr "" -#: src/main.c:2986 +#: src/main.c:2988 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" msgstr "" -#: src/main.c:3074 +#: src/main.c:3076 msgid " Notice " msgstr "" -#: src/main.c:3075 +#: src/main.c:3077 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -3037,7 +3037,7 @@ msgstr "" #. SCO_FLAVOR #. SCO_FLAVOR -#: gnome/glayout.c:326 src/panelize.c:197 src/panelize.c:459 +#: src/panelize.c:197 src/panelize.c:459 msgid "External panelize" msgstr "" @@ -3137,27 +3137,27 @@ msgstr "" msgid "" msgstr "" -#: src/screen.c:1289 +#: src/screen.c:1295 msgid "Unknow tag on display format: " msgstr "" -#: gnome/gdesktop.c:1072 src/screen.c:1982 +#: gnome/gdesktop.c:1113 src/screen.c:1988 msgid " Do you really want to execute? " msgstr "" -#: gnome/glayout.c:284 gnome/gscreen.c:369 src/screen.c:2196 src/screen.c:2230 +#: gnome/glayout.c:274 gnome/gscreen.c:369 src/screen.c:2202 src/screen.c:2236 msgid "View" msgstr "" -#: src/screen.c:2197 src/screen.c:2231 src/view.c:1986 +#: src/screen.c:2203 src/screen.c:2237 src/view.c:1996 msgid "Edit" msgstr "" -#: src/screen.c:2199 src/screen.c:2233 src/tree.c:1459 +#: src/screen.c:2205 src/screen.c:2239 src/tree.c:1459 msgid "RenMov" msgstr "" -#: gnome/glayout.c:281 src/screen.c:2200 src/screen.c:2234 src/tree.c:1463 +#: src/screen.c:2206 src/screen.c:2240 src/tree.c:1463 msgid "Mkdir" msgstr "" @@ -3241,7 +3241,7 @@ msgid "" " %s " msgstr "" -#: gnome/glayout.c:301 src/tree.c:1453 +#: gnome/glayout.c:292 src/tree.c:1453 msgid "Rescan" msgstr "" @@ -3347,97 +3347,97 @@ msgstr "" msgid " Can not fetch local copy " msgstr "" -#: src/view.c:703 +#: src/view.c:707 msgid "File: %s" msgstr "" -#: gnome/gview.c:119 src/view.c:708 +#: gnome/gview.c:119 src/view.c:712 msgid "Offset 0x%08x" msgstr "" -#: gnome/gview.c:121 src/view.c:710 +#: gnome/gview.c:121 src/view.c:714 msgid "Col %d" msgstr "" -#: gnome/gview.c:125 src/view.c:714 +#: gnome/gview.c:125 src/view.c:718 msgid "%s bytes" msgstr "" -#: src/view.c:719 +#: src/view.c:723 msgid " [grow]" msgstr "" -#: src/view.c:1559 src/view.c:1681 +#: src/view.c:1564 src/view.c:1686 msgid " Search string not found " msgstr "" -#: src/view.c:1720 +#: src/view.c:1725 msgid " Invalid regular expression " msgstr "" -#: src/view.c:1848 +#: src/view.c:1855 msgid "" " The current line number is %d.\n" " Enter the new line number:" msgstr "" -#: src/view.c:1877 +#: src/view.c:1885 msgid " Enter regexp:" msgstr "" -#: src/view.c:1909 +#: src/view.c:1917 msgid " Enter search string:" msgstr "" -#: src/view.c:1980 +#: src/view.c:1990 msgid "Ascii" msgstr "" -#: gnome/gview.c:308 src/view.c:1980 +#: gnome/gview.c:308 src/view.c:1990 msgid "Hex" msgstr "" -#: src/view.c:1981 +#: src/view.c:1991 msgid "Line" msgstr "" -#: src/view.c:1982 +#: src/view.c:1992 msgid "RxSrch" msgstr "" -#: src/view.c:1985 +#: src/view.c:1995 msgid "EdText" msgstr "" -#: src/view.c:1985 +#: src/view.c:1995 msgid "EdHex" msgstr "" -#: src/view.c:1987 +#: src/view.c:1997 msgid "UnWrap" msgstr "" -#: gnome/gview.c:300 src/view.c:1987 +#: gnome/gview.c:300 src/view.c:1997 msgid "Wrap" msgstr "" -#: src/view.c:1990 +#: src/view.c:2000 msgid "HxSrch" msgstr "" -#: src/view.c:1993 +#: src/view.c:2003 msgid "Raw" msgstr "" -#: src/view.c:1993 +#: src/view.c:2003 msgid "Parse" msgstr "" -#: src/view.c:1997 +#: src/view.c:2007 msgid "Unform" msgstr "" -#: src/view.c:1997 +#: src/view.c:2007 msgid "Format" msgstr "" @@ -3660,255 +3660,282 @@ msgstr "" msgid "Link" msgstr "" -#: gnome/gdesktop.c:963 gnome/gscreen.c:365 +#: gnome/gdesktop.c:802 +msgid "Do you want to delete " +msgstr "" + +#. We connect_object_after to the items so that we can destroy +#. * the menu at the proper time. +#. +#: gnome/gdesktop.c:1004 gnome/gscreen.c:365 msgid "Properties" msgstr "" -#: gnome/gdesktop.c:1082 +#: gnome/gdesktop.c:1123 msgid "Open with..." msgstr "" -#: gnome/gdesktop.c:1083 gnome/gscreen.c:321 +#: gnome/gdesktop.c:1124 gnome/gscreen.c:321 msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:1258 +#: gnome/gdesktop.c:1299 msgid " Could not open %s directory" msgstr "" -#: gnome/glayout.c:276 -msgid "New panel" -msgstr "" - -#: gnome/glayout.c:276 -msgid "Opens a new panel" -msgstr "" - -#: gnome/glayout.c:277 +#: gnome/glayout.c:267 msgid "Open Terminal" msgstr "" -#: gnome/glayout.c:277 +#: gnome/glayout.c:267 msgid "Opens a terminal" msgstr "" -#: gnome/glayout.c:279 +#: gnome/glayout.c:269 gnome/gscreen.c:382 +msgid "Copy..." +msgstr "" + +#: gnome/glayout.c:269 msgid "Copy files" msgstr "" -#: gnome/glayout.c:280 -msgid "Rename/Move" +#: gnome/glayout.c:270 +msgid "Rename/Move..." msgstr "" -#: gnome/glayout.c:280 +#: gnome/glayout.c:270 msgid "Rename or move files" msgstr "" -#: gnome/glayout.c:281 +#: gnome/glayout.c:271 +msgid "New directory..." +msgstr "" + +#: gnome/glayout.c:271 msgid "Creates a new folder" msgstr "" -#: gnome/glayout.c:282 +#: gnome/glayout.c:272 gnome/gscreen.c:384 +msgid "Delete..." +msgstr "" + +#: gnome/glayout.c:272 msgid "Delete files from disk" msgstr "" -#: gnome/glayout.c:284 +#: gnome/glayout.c:274 msgid "View file" msgstr "" -#: gnome/glayout.c:285 +#: gnome/glayout.c:275 msgid "View raw" msgstr "" -#: gnome/glayout.c:285 +#: gnome/glayout.c:275 msgid "View the file without further processing" msgstr "" -#: gnome/glayout.c:287 -msgid "Select group" +#: gnome/glayout.c:277 +msgid "Select group by pattern..." msgstr "" -#: gnome/glayout.c:287 +#: gnome/glayout.c:277 msgid "Selects a group of files" msgstr "" -#: gnome/glayout.c:288 -msgid "Unselect group" +#: gnome/glayout.c:278 +msgid "Unselect group by pattern..." msgstr "" -#: gnome/glayout.c:288 +#: gnome/glayout.c:278 msgid "Un-selects a group of marked files" msgstr "" -#: gnome/glayout.c:289 +#: gnome/glayout.c:279 msgid "Reverse selection" msgstr "" -#: gnome/glayout.c:289 +#: gnome/glayout.c:279 msgid "Reverses the list of tagged files" msgstr "" -#: gnome/glayout.c:291 +#: gnome/glayout.c:281 msgid "Close" msgstr "" -#: gnome/glayout.c:291 +#: gnome/glayout.c:281 msgid "Close this panel" msgstr "" -#: gnome/glayout.c:292 +#: gnome/glayout.c:282 msgid "Exit" msgstr "" -#: gnome/glayout.c:292 +#: gnome/glayout.c:282 msgid "Exit program" msgstr "" -#: gnome/glayout.c:298 +#: gnome/glayout.c:288 +msgid "New window" +msgstr "" + +#: gnome/glayout.c:288 +msgid "Opens a new window" +msgstr "" + +#: gnome/glayout.c:289 msgid "Display mode..." msgstr "" -#: gnome/glayout.c:298 +#: gnome/glayout.c:289 msgid "Set the display mode for the panel" msgstr "" -#: gnome/glayout.c:299 +#: gnome/glayout.c:290 msgid "Sort order..." msgstr "" -#: gnome/glayout.c:299 +#: gnome/glayout.c:290 msgid "Changes the sort order of the files" msgstr "" -#: gnome/glayout.c:300 +#: gnome/glayout.c:291 msgid "Filter..." msgstr "" -#: gnome/glayout.c:300 +#: gnome/glayout.c:291 msgid "Set a filter for the files" msgstr "" -#: gnome/glayout.c:301 +#: gnome/glayout.c:292 msgid "Rescan the directory contents" msgstr "" -#: gnome/glayout.c:304 +#: gnome/glayout.c:295 msgid "Network link..." msgstr "" -#: gnome/glayout.c:304 +#: gnome/glayout.c:295 msgid "Connect to a remote machine" msgstr "" -#: gnome/glayout.c:305 +#: gnome/glayout.c:296 msgid "FTP link..." msgstr "" -#: gnome/glayout.c:305 +#: gnome/glayout.c:296 msgid "Connect to a remote machine with FTP" msgstr "" -#: gnome/glayout.c:311 -msgid "Confirmation" +#: gnome/glayout.c:302 +msgid "Confirmation..." msgstr "" -#: gnome/glayout.c:311 +#: gnome/glayout.c:302 msgid "Confirmation settings" msgstr "" -#: gnome/glayout.c:312 gnome/glayout.c:356 -msgid "Options" +#: gnome/glayout.c:303 +msgid "Options..." msgstr "" -#: gnome/glayout.c:312 +#: gnome/glayout.c:303 msgid "Global option settings" msgstr "" -#: gnome/glayout.c:315 -msgid "Virtual FS" +#: gnome/glayout.c:306 +msgid "Virtual FS..." msgstr "" -#: gnome/glayout.c:315 +#: gnome/glayout.c:306 msgid "Virtual File System settings" msgstr "" -#: gnome/glayout.c:318 +#: gnome/glayout.c:309 msgid "Save setup" msgstr "" -#: gnome/glayout.c:323 -msgid "Find" +#: gnome/glayout.c:314 +msgid "Find..." msgstr "" -#: gnome/glayout.c:323 +#: gnome/glayout.c:314 msgid "Locate files on disk" msgstr "" -#: gnome/glayout.c:324 -msgid "Hotlist" +#: gnome/glayout.c:315 +msgid "Hotlist..." msgstr "" -#: gnome/glayout.c:324 +#: gnome/glayout.c:315 msgid "List of favorite sites" msgstr "" -#: gnome/glayout.c:325 -msgid "Compare panels" +#: gnome/glayout.c:316 +msgid "Compare panels..." msgstr "" -#: gnome/glayout.c:325 +#: gnome/glayout.c:316 msgid "Compare panel contents" msgstr "" -#: gnome/glayout.c:328 -msgid "Active VFS list" +#: gnome/glayout.c:317 +msgid "External panelize..." msgstr "" -#: gnome/glayout.c:328 +#: gnome/glayout.c:319 +msgid "Active VFS list..." +msgstr "" + +#: gnome/glayout.c:319 msgid "List of active virtual file systems" msgstr "" -#: gnome/glayout.c:331 -msgid "Undelete files (ext2fs only)" +#: gnome/glayout.c:322 +msgid "Undelete files (ext2fs only)..." msgstr "" -#: gnome/glayout.c:331 +#: gnome/glayout.c:322 msgid "Recover deleted files" msgstr "" -#: gnome/glayout.c:334 -msgid "Background jobs" +#: gnome/glayout.c:325 +msgid "Background jobs..." msgstr "" -#: gnome/glayout.c:334 +#: gnome/glayout.c:325 msgid "List of background operations" msgstr "" -#: gnome/glayout.c:340 +#: gnome/glayout.c:331 msgid "Arrange icons" msgstr "" -#: gnome/glayout.c:340 +#: gnome/glayout.c:331 msgid "Arranges the icons on the desktop" msgstr "" -#: gnome/glayout.c:346 +#: gnome/glayout.c:337 msgid "About" msgstr "" -#: gnome/glayout.c:346 +#: gnome/glayout.c:337 msgid "Information on this program" msgstr "" -#: gnome/glayout.c:354 -msgid "Panel" +#: gnome/glayout.c:345 +msgid "Window" msgstr "" -#: gnome/glayout.c:355 +#: gnome/glayout.c:346 msgid "Commands" msgstr "" -#: gnome/glayout.c:357 +#: gnome/glayout.c:347 +msgid "Options" +msgstr "" + +#: gnome/glayout.c:348 msgid "Desktop" msgstr "" @@ -4013,18 +4040,10 @@ msgstr "" msgid "Edit symlink..." msgstr "" -#: gnome/gscreen.c:382 -msgid "Copy..." -msgstr "" - #: gnome/gscreen.c:383 msgid "Rename/move.." msgstr "" -#: gnome/gscreen.c:384 -msgid "Delete..." -msgstr "" - #: gnome/gscreen.c:1008 msgid "All files" msgstr "" diff --git a/src/ChangeLog b/src/ChangeLog index 7b15224d3..7b13b1990 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +1998-04-29 Miguel de Icaza + + * main.c (update_panels): Great API simplification. update_panels + only cares about the contents of the current panel, every other + panel keeps the current selection (this was the behaviour + anyways). + + update_panels can be provided in a per-port fashion as well. + Wed Apr 29 03:06:09 1998 Paul Sheer * syntax.c: some optimisations, as well as support for diff --git a/src/achown.c b/src/achown.c index d7467b07b..83f4baaf8 100644 --- a/src/achown.c +++ b/src/achown.c @@ -581,7 +581,7 @@ void chown_advanced_done (void) { free (sf_stat); if (need_update) - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); } diff --git a/src/chmod.c b/src/chmod.c index b338022d2..e66f4a2e6 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -277,7 +277,7 @@ int stat_file (char *filename, struct stat *st) static void chmod_done (void) { if (need_update) - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); } diff --git a/src/chown.c b/src/chown.c index c0f797993..43f8a1141 100644 --- a/src/chown.c +++ b/src/chown.c @@ -213,7 +213,7 @@ static void init_chown (void) void chown_done (void) { if (need_update) - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); } diff --git a/src/cmd.c b/src/cmd.c index 197c9539d..5f571bd1a 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -339,7 +339,7 @@ void copy_cmd (void) { save_cwds_stat (); if (panel_operate (cpanel, OP_COPY, NULL)){ - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); } } @@ -348,7 +348,7 @@ void ren_cmd (void) { save_cwds_stat (); if (panel_operate (cpanel, OP_MOVE, NULL)){ - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); } } @@ -357,7 +357,7 @@ void copymove_cmd_with_default (int copy, char *thedefault) { save_cwds_stat (); if (panel_operate (cpanel, copy ? OP_COPY : OP_MOVE, thedefault)){ - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); } } @@ -374,7 +374,7 @@ void mkdir_cmd (WPanel *panel) save_cwds_stat (); if (my_mkdir (dir, 0777) == 0){ - update_panels (UP_OPTIMIZE, dir, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, dir); repaint_screen (); select_item (cpanel); free (dir); @@ -389,7 +389,7 @@ void delete_cmd (void) save_cwds_stat (); if (panel_operate (cpanel, OP_DELETE, NULL)){ - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); } } @@ -451,7 +451,7 @@ void reread_cmd (void) else flag = UP_ONLY_CURRENT; - update_panels (UP_RELOAD|flag, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_RELOAD|flag, UP_KEEPSEL); repaint_screen (); } @@ -1058,7 +1058,7 @@ do_link (int symbolic_link, char *fname) } } free (dest); - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); } @@ -1090,7 +1090,7 @@ void edit_symlink_cmd (void) if (-1 == mc_symlink (dest, p)) message (1, MSG_ERROR, _(" edit symlink: %s "), unix_error_string (errno)); - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); } free (dest); @@ -1126,7 +1126,7 @@ void other_symlink_cmd (void) if (-1 == mc_symlink (dest, s)) message (1, MSG_ERROR, _(" relative symlink: %s "), unix_error_string (errno)); - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); free (s); } diff --git a/src/file.c b/src/file.c index 2e5c4e140..69028c049 100644 --- a/src/file.c +++ b/src/file.c @@ -2096,13 +2096,13 @@ panel_operate (void *source_panel, int operation, char *thedefault) /* Generate confirmation prompt */ if (!only_one){ - sprintf (cmd_buf, "%s%d %s%s ", op_names [operation], panel->marked, + sprintf (cmd_buf, "%s%d %s%s ", _(op_names [operation]), panel->marked, (panel->marked == panel->dirs_marked) ? _("directories") : (panel->dirs_marked) ? _("files/directories") : _("files"), (operation == OP_DELETE) ? "?" : _(" with source mask:")); } else { source = get_file (panel, &src_stat); - sprintf (cmd_buf,"%s%s \"%s\"%s ", op_names [operation], + sprintf (cmd_buf,"%s%s \"%s\"%s ", _(op_names [operation]), S_ISDIR (src_stat.st_mode) ? _("directory") : _("file"), name_trunc (source, S_ISDIR (src_stat.st_mode) ? 23 : 28), (operation == OP_DELETE) ? "?" : _(" with source mask:")); @@ -2112,7 +2112,7 @@ panel_operate (void *source_panel, int operation, char *thedefault) if (operation == OP_DELETE && confirm_delete){ if (know_not_what_am_i_doing) query_set_sel (1); - i = query_dialog (op_names [operation], cmd_buf, + i = query_dialog (_(op_names [operation]), cmd_buf, D_ERROR, 2, _("&Yes"), _("&No")); if (i != 0) return 0; diff --git a/src/hotlist.c b/src/hotlist.c index d042ea33f..45f0eaad4 100644 --- a/src/hotlist.c +++ b/src/hotlist.c @@ -704,7 +704,7 @@ static void hotlist_done (void) { destroy_dlg (hotlist_dlg); if (0) - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); } diff --git a/src/listmode.c b/src/listmode.c index 5e0366afb..42b469374 100644 --- a/src/listmode.c +++ b/src/listmode.c @@ -230,7 +230,7 @@ static void listmode_done (void) { destroy_dlg (listmode_dlg); if (0) - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); } diff --git a/src/main.c b/src/main.c index 607dd7083..aa92d0799 100644 --- a/src/main.c +++ b/src/main.c @@ -473,6 +473,7 @@ update_one_panel_widget (WPanel *panel, int force_update, char *current_file) free (current_file); } +#ifndef PORT_HAS_UPDATE_PANELS void update_one_panel (int which, int force_update, char *current_file) { @@ -494,14 +495,14 @@ update_one_panel (int which, int force_update, char *current_file) * will not reload the other panel. */ void -update_panels (int force_update, char *current_file, char *other_file) +update_panels (int force_update, char *current_file) { int reload_other = !(force_update & UP_ONLY_CURRENT); WPanel *panel; update_one_panel (get_current_index (), force_update, current_file); if (reload_other) - update_one_panel (get_other_index (), force_update, other_file); + update_one_panel (get_other_index (), force_update, UP_KEEPSEL); if (get_current_type () == view_listing) panel = (WPanel *) get_panel_widget (get_current_index ()); @@ -510,6 +511,7 @@ update_panels (int force_update, char *current_file, char *other_file) mc_chdir (panel->cwd); } +#endif #ifdef WANT_PARSE static void select_by_index (WPanel *panel, int i); @@ -787,7 +789,7 @@ do_execute (const char *shell, const char *command, int flags) } #endif - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); parse_control_file (); #ifndef __os2__ @@ -1417,21 +1419,21 @@ void toggle_mix_all_files (void) { mix_all_files = !mix_all_files; - update_panels (UP_RELOAD, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_RELOAD, UP_KEEPSEL); } void toggle_show_backup (void) { show_backups = !show_backups; - update_panels (UP_RELOAD, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_RELOAD, UP_KEEPSEL); } void toggle_show_hidden (void) { show_dot_files = !show_dot_files; - update_panels (UP_RELOAD, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_RELOAD, UP_KEEPSEL); } void @@ -1661,7 +1663,7 @@ void suspend_cmd (void) { save_cwds_stat (); do_suspend_cmd (); - update_panels (UP_OPTIMIZE, UP_KEEPSEL, UP_KEEPSEL); + update_panels (UP_OPTIMIZE, UP_KEEPSEL); do_refresh (); } diff --git a/src/main.h b/src/main.h index 2d919c337..f4d4ddc0b 100644 --- a/src/main.h +++ b/src/main.h @@ -122,7 +122,7 @@ typedef struct { key_callback fn; } key_map; -void update_panels (int force_update, char *current_file, char *other_file); +void update_panels (int force_update, char *current_file); void create_panels (void); void repaint_screen (void); void outrefresh_screen (void); @@ -179,8 +179,9 @@ extern Dlg_head *midnight_dlg; * has included panel.h */ #ifdef __PANEL_H -void directory_history_add (WPanel *panel, char *s); -int do_panel_cd (WPanel *panel, char *new_dir, enum cd_enum cd_type); +void directory_history_add (WPanel *panel, char *s); +int do_panel_cd (WPanel *panel, char *new_dir, enum cd_enum cd_type); +void update_one_panel_widget (WPanel *panel, int force_update, char *current_file); #endif #endif