From 30252eccf89f7fd6c1e17566bcc73a5c74bcffc0 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Tue, 7 Apr 1998 19:08:31 +0000 Subject: [PATCH] Fixes, fixes, fixes, fixes, fixes. Thanks DrMike for the detailed listing of problems. Miguel. --- config.h.in | 3 + configure.in | 9 +- gnome/gconf.h | 2 + gnome/gnome.TODO | 24 +- gnome/gscreen.c | 4 + gnome/gutil.c | 18 +- po/mc.pot | 906 +++++++++++++++++++++++++---------------------- po/ru.po | 30 +- src/ChangeLog | 21 ++ src/boxes.c | 42 +++ src/cmd.c | 2 +- src/layout.c | 135 +++++-- src/option.c | 104 ++++-- src/panel.h | 3 +- src/screen.c | 49 ++- src/slint.c | 1 + src/textconf.h | 1 + src/util.h | 1 + src/utilunix.c | 89 +++-- src/wtools.c | 14 +- tk/tkconf.h | 2 +- xv/xvconf.h | 2 +- 22 files changed, 887 insertions(+), 575 deletions(-) diff --git a/config.h.in b/config.h.in index 3ba5d3894..1c5e449af 100644 --- a/config.h.in +++ b/config.h.in @@ -397,6 +397,9 @@ /* Define if you have the strncasecmp function. */ #undef HAVE_STRNCASECMP +/* Define if you have the sysconf function. */ +#undef HAVE_SYSCONF + /* Define if you have the tcgetattr function. */ #undef HAVE_TCGETATTR diff --git a/configure.in b/configure.in index 8bd789377..d558213fe 100644 --- a/configure.in +++ b/configure.in @@ -9,10 +9,6 @@ VERSION=dummy AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "dummy") -if test x$ALL_LINGUAS = x; then - ALL_LINGUAS="fr es" -fi - dnl This is path where we're looking for headers in addition to /usr/include dnl and whatever cpp defaults to. include_additional_path="/usr/local/include /opt/gnu/include" @@ -86,6 +82,10 @@ if test x$GCC = xyes; then cc_uses_g=no fi fi + +dnl Debug mode is turned ON for now +CCOPTS='-g' + if test "x$CCOPTS" = x; then if test x$GCC = xyes; then if test x$system = xLinux; then @@ -165,6 +165,7 @@ AC_CHECK_FUNCS(strerror statfs getwd strcasecmp strncasecmp) AC_CHECK_FUNCS(strdup memmove pwdauth truncate initgroups putenv) AC_CHECK_FUNCS(memset memcpy tcsetattr tcgetattr cfgetospeed) AC_CHECK_FUNCS(sigaction sigemptyset sigprocmask sigaddset) +AC_CHECK_FUNCS(sysconf) SHADOWLIB= if test x$system = xLinux; then diff --git a/gnome/gconf.h b/gnome/gconf.h index b67ab24b1..3dbc80ea9 100644 --- a/gnome/gconf.h +++ b/gnome/gconf.h @@ -30,3 +30,5 @@ #define mi_getch() fprintf (stderr, "mi_getch is not implemented in this port\n") #define frontend_run_dlg(x) gtkrundlg_event (x) + +void port_shutdown_extra_fds(void); diff --git a/gnome/gnome.TODO b/gnome/gnome.TODO index 334889092..f894274ee 100644 --- a/gnome/gnome.TODO +++ b/gnome/gnome.TODO @@ -65,9 +65,9 @@ General Comments I think the thumb should follow in both cases. This is a gtk comment I'm sure. - - some dialogs only had a single entry box (like the ftp link one), - when you hit return in the entrybox it would be nice if that mapped - to hitting 'Ok' so you wouldnt have to hit Ok manually. +DONE - some dialogs only had a single entry box (like the ftp link one), +DONE when you hit return in the entrybox it would be nice if that mapped +DONE to hitting 'Ok' so you wouldnt have to hit Ok manually. Panel comments @@ -113,14 +113,14 @@ Panel comments folder does the same thing, but in a long file listing its nice to just have a button to do it. - - I got several 'sigpipes' when trying to view a ftpfs file, or - when trying to view RPM tags via the rpmfs. +DONE - I got several 'sigpipes' when trying to view a ftpfs file, or +DONE when trying to view RPM tags via the rpmfs. +DONE +DONE Open a RPM, then got into the INFO pseudo-dir, the VIEW a RPM tag. It +DONE will sigpipe. - Open a RPM, then got into the INFO pseudo-dir, the VIEW a RPM tag. It - will sigpipe. - - - is there a way to click and drag and select all the files you drag - over? Sortof a interactive 'select group' option. +DONE - is there a way to click and drag and select all the files you drag +DONE over? Sortof a interactive 'select group' option. - the internal viewer, in hex mode, seems to shove the ASCII side of the view (the rightmost column) off the side of the window. @@ -133,8 +133,8 @@ Panel comments guessing no association existed - if so it should tell me and let me create an association - - I couldnt view files inside of a RPM which I was browsing via the ftpfs - is this just cause I'm nuts to try? +DONE - I couldnt view files inside of a RPM which I was browsing via the ftpfs +DONE is this just cause I'm nuts to try? - I couldnt get the drag from one panel to another to work reliably - I would drag and get a 'Copy Link Move' window, but I couldn't diff --git a/gnome/gscreen.c b/gnome/gscreen.c index c9453b52e..aa382185c 100644 --- a/gnome/gscreen.c +++ b/gnome/gscreen.c @@ -523,6 +523,8 @@ internal_select_item (GtkWidget *file_list, WPanel *panel, int row) static void panel_file_list_select_row (GtkWidget *file_list, int row, int column, GdkEvent *event, WPanel *panel) { + int current_selection = panel->selected; + if (!event) { internal_select_item (file_list, panel, row); return; @@ -537,6 +539,8 @@ panel_file_list_select_row (GtkWidget *file_list, int row, int column, GdkEvent if (!(event->button.state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK))) break; /* fallback if shift-click is pressed */ + do_file_mark_range (panel, row, current_selection); + break; case 2: do_file_mark (panel, row, !panel->dir.list[row].f.marked); diff --git a/gnome/gutil.c b/gnome/gutil.c index a9fddee3b..379ce36d6 100644 --- a/gnome/gutil.c +++ b/gnome/gutil.c @@ -18,8 +18,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - - #include #include #include @@ -46,6 +44,9 @@ #ifdef HAVE_SYS_SELECT_H # include #endif +#include +#include +#include int my_system (int as_shell_command, const char *shell, const char *command) { @@ -65,10 +66,11 @@ int my_system (int as_shell_command, const char *shell, const char *command) return -1; } if (pid == 0){ + const int top = max_open_files (); sigaction (SIGINT, &save_intr, NULL); sigaction (SIGQUIT, &save_quit, NULL); - for (i = 3; i < 4096; i++) + for (i = 3; i < top; i++) close (i); if (as_shell_command) @@ -127,3 +129,13 @@ exec_direct (char *path, char *argv []) return WEXITSTATUS(status); } + +void +port_shutdown_extra_fds (void) +{ + const int top = max_open_files (); + int f; + + for (f = 0; f < top; f++) + close (f); +} diff --git a/po/mc.pot b/po/mc.pot index ec7f02975..4bea30195 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Date: 1998-03-30 20:29:54-0600\n" +"Date: 1998-04-07 00:09:20-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:407 edit/editcmd.c:714 edit/editcmd.c:726 edit/editcmd.c:827 edit/editcmd.c:910 gnome/gdesktop.c:987 src/ext.c:291 src/help.c:320 src/main.c:674 src/subshell.c:696 src/subshell.c:722 src/utilunix.c:352 src/utilunix.c:356 src/utilunix.c:422 +#: edit/editcmd.c:407 edit/editcmd.c:714 edit/editcmd.c:726 edit/editcmd.c:827 edit/editcmd.c:910 gnome/gdesktop.c:994 src/ext.c:291 src/help.c:320 src/main.c:674 src/subshell.c:696 src/subshell.c:722 src/utilunix.c:372 src/utilunix.c:376 src/utilunix.c:442 msgid " Warning " msgstr "" @@ -304,11 +304,11 @@ msgstr "" msgid "Cancel quit" msgstr "" -#: edit/editcmd.c:1961 gnome/gdesktop.c:812 src/cmd.c:240 src/file.c:2115 src/file.c:2468 src/file.c:2548 src/hotlist.c:887 src/main.c:832 src/screen.c:1967 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:411 +#: edit/editcmd.c:1961 gnome/gdesktop.c:819 src/cmd.c:240 src/file.c:2115 src/file.c:2468 src/file.c:2548 src/hotlist.c:887 src/main.c:832 src/screen.c:1967 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:812 src/cmd.c:240 src/file.c:2115 src/file.c:2465 src/file.c:2548 src/hotlist.c:887 src/main.c:832 src/screen.c:1967 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:411 +#: edit/editcmd.c:1961 gnome/gdesktop.c:819 src/cmd.c:240 src/file.c:2115 src/file.c:2465 src/file.c:2548 src/hotlist.c:887 src/main.c:832 src/screen.c:1967 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:411 msgid "&No" msgstr "" @@ -422,309 +422,308 @@ msgid " Enter line length, 0 for off: " msgstr "" #: edit/editmenu.c:117 edit/editmenu.c:133 -msgid "Open/load... C-o" +msgid "&Open/load... C-o" msgstr "" #: edit/editmenu.c:118 -msgid "New C-n" +msgid "&New C-n" msgstr "" #: edit/editmenu.c:120 edit/editmenu.c:136 -msgid "Save F2" +msgid "&Save F2" msgstr "" #: edit/editmenu.c:121 edit/editmenu.c:137 -msgid "save As... F12" +msgid "save &As... F12" msgstr "" #: edit/editmenu.c:123 edit/editmenu.c:139 -msgid "Insert file... F15" +msgid "&Insert file... F15" msgstr "" #: edit/editmenu.c:124 -msgid "copy to File... C-f" +msgid "copy to &File... C-f" msgstr "" #: edit/editmenu.c:126 edit/editmenu.c:142 -msgid "aBout... " +msgid "a&Bout... " msgstr "" #: edit/editmenu.c:128 edit/editmenu.c:144 -msgid "Quit F10" +msgid "&Quit F10" msgstr "" #: edit/editmenu.c:134 -msgid "New C-x k" +msgid "&New C-x k" msgstr "" #: edit/editmenu.c:140 -msgid "copy to File... " +msgid "copy to &File... " msgstr "" #: edit/editmenu.c:149 edit/editmenu.c:165 -msgid "Toggle Mark F3" +msgid "&Toggle Mark F3" msgstr "" #: edit/editmenu.c:151 edit/editmenu.c:167 -msgid "toggle Ins/overw Ins" +msgid "toggle &Ins/overw Ins" msgstr "" #: edit/editmenu.c:153 edit/editmenu.c:169 -msgid "Copy F5" +msgid "&Copy F5" msgstr "" #: edit/editmenu.c:154 edit/editmenu.c:170 -msgid "Move F6" +msgid "&Move F6" msgstr "" #: edit/editmenu.c:155 edit/editmenu.c:171 -msgid "Delete F8" +msgid "&Delete F8" msgstr "" #: edit/editmenu.c:157 edit/editmenu.c:173 -msgid "Undo C-u" +msgid "&Undo C-u" msgstr "" #: edit/editmenu.c:159 edit/editmenu.c:175 -msgid "Beginning C-PgUp" +msgid "&Beginning C-PgUp" msgstr "" #: edit/editmenu.c:160 edit/editmenu.c:176 -msgid "End C-PgDn" +msgid "&End C-PgDn" msgstr "" #: edit/editmenu.c:181 edit/editmenu.c:188 -msgid "Search... F7" +msgid "&Search... F7" msgstr "" #: edit/editmenu.c:182 edit/editmenu.c:189 -msgid "search Again F17" +msgid "search &Again F17" msgstr "" #: edit/editmenu.c:183 edit/editmenu.c:190 -msgid "Replace... F4" +msgid "&Replace... F4" msgstr "" #: edit/editmenu.c:195 edit/editmenu.c:217 -msgid "Goto line... M-l" +msgid "&Goto line... M-l" msgstr "" #: edit/editmenu.c:197 edit/editmenu.c:219 -msgid "insert Literal... C-q" +msgid "insert &Literal... C-q" msgstr "" #: edit/editmenu.c:199 edit/editmenu.c:221 -msgid "Refresh screen C-l" +msgid "&Refresh screen C-l" msgstr "" #: edit/editmenu.c:201 edit/editmenu.c:223 -msgid "Start record macro C-r" +msgid "&Start record macro C-r" msgstr "" #: edit/editmenu.c:202 edit/editmenu.c:224 -msgid "Finish record macro... C-r" +msgid "&Finish record macro... C-r" msgstr "" #: edit/editmenu.c:203 -msgid "Execute macro... C-a, KEY" +msgid "&Execute macro... C-a, KEY" msgstr "" #: edit/editmenu.c:204 edit/editmenu.c:226 -msgid "Delete macro... " +msgid "delete macr&O... " msgstr "" #: edit/editmenu.c:206 edit/editmenu.c:228 -msgid "insert Date/time " +msgid "insert &Date/time " msgstr "" #: edit/editmenu.c:208 edit/editmenu.c:230 -msgid "Format paragraph M-p" +msgid "format p&Aragraph M-p" msgstr "" #: edit/editmenu.c:209 -msgid "'ispell' Spell Check C-p" +msgid "'ispell' s&Pell check C-p" msgstr "" #: edit/editmenu.c:210 edit/editmenu.c:232 -msgid "Sort... M-t" +msgid "sor&T... M-t" msgstr "" #: edit/editmenu.c:211 edit/editmenu.c:233 -msgid "'indent' C Formatter F19" +msgid "'indent' &C Formatter F19" msgstr "" #: edit/editmenu.c:212 -msgid "Mail... " +msgid "&Mail... " msgstr "" #: edit/editmenu.c:225 -msgid "Execute macro... C-x e, KEY" +msgid "&Execute macro... C-x e, KEY" msgstr "" #: edit/editmenu.c:231 -msgid "'ispell' Spell Check M-$" +msgid "'ispell' s&Pell check M-$" msgstr "" #: edit/editmenu.c:240 edit/editmenu.c:249 -msgid "General... " +msgid "&General... " msgstr "" #: edit/editmenu.c:241 edit/editmenu.c:250 -msgid "Save mode..." +msgid "&Save mode..." msgstr "" -#: edit/editmenu.c:243 edit/editmenu.c:252 src/main.c:1292 -msgid "Layout..." +#: edit/editmenu.c:243 edit/editmenu.c:252 src/main.c:1293 +msgid "&Layout..." msgstr "" -#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: edit/editmenu.c:263 edit/editmenu.c:272 edit/editmenu.c:389 src/chmod.c:174 src/chown.c:131 src/main.c:1323 +#: edit/editmenu.c:262 edit/editmenu.c:271 edit/editmenu.c:388 src/chmod.c:174 src/chown.c:131 src/main.c:1324 msgid " File " msgstr "" -#: edit/editmenu.c:264 edit/editmenu.c:273 edit/editmenu.c:405 +#: edit/editmenu.c:263 edit/editmenu.c:272 edit/editmenu.c:404 msgid " Edit " msgstr "" -#: edit/editmenu.c:265 edit/editmenu.c:274 +#: edit/editmenu.c:264 edit/editmenu.c:273 msgid " Sear/Repl " msgstr "" -#: edit/editmenu.c:266 edit/editmenu.c:275 edit/editmenu.c:439 src/main.c:1324 +#: edit/editmenu.c:265 edit/editmenu.c:274 edit/editmenu.c:438 src/main.c:1325 msgid " Command " msgstr "" -#: edit/editmenu.c:267 edit/editmenu.c:276 src/main.c:1325 +#: edit/editmenu.c:266 edit/editmenu.c:275 src/main.c:1326 msgid " Options " msgstr "" -#: edit/editmenu.c:390 +#: edit/editmenu.c:389 msgid "Open...\tC-o" msgstr "" -#: edit/editmenu.c:391 +#: edit/editmenu.c:390 msgid "New\tC-n" msgstr "" -#: edit/editmenu.c:393 +#: edit/editmenu.c:392 msgid "Save\tF2" msgstr "" -#: edit/editmenu.c:394 +#: edit/editmenu.c:393 msgid "Save as...\tF12" msgstr "" -#: edit/editmenu.c:396 +#: edit/editmenu.c:395 msgid "Insert file...\tF15" msgstr "" -#: edit/editmenu.c:397 +#: edit/editmenu.c:396 msgid "Copy to file...\tC-f" msgstr "" -#: edit/editmenu.c:400 +#. Tool hint +#: edit/editmenu.c:399 msgid "Disk operations" msgstr "" -#: edit/editmenu.c:406 +#: edit/editmenu.c:405 msgid "Toggle mark\tF3" msgstr "" -#: edit/editmenu.c:408 +#: edit/editmenu.c:407 msgid "Toggle insert/overwrite\tIns" msgstr "" -#: edit/editmenu.c:410 +#: edit/editmenu.c:409 msgid "Copy block to cursor\tF5" msgstr "" -#: edit/editmenu.c:411 +#: edit/editmenu.c:410 msgid "Move block to cursor\tF6" msgstr "" -#: edit/editmenu.c:412 +#: edit/editmenu.c:411 msgid "Delete block\tF8/C-Del" msgstr "" -#: edit/editmenu.c:414 +#: edit/editmenu.c:413 msgid "Copy block to clipbrd\tC-Ins" msgstr "" -#: edit/editmenu.c:415 +#: edit/editmenu.c:414 msgid "Cut block to clipbrd\tS-Del" msgstr "" -#: edit/editmenu.c:416 +#: edit/editmenu.c:415 msgid "Paste block from clipbrd\tS-Ins" msgstr "" -#: edit/editmenu.c:417 +#: edit/editmenu.c:416 msgid "Selection history\tM-Ins" msgstr "" -#: edit/editmenu.c:419 +#: edit/editmenu.c:418 msgid "Undo\tC-BackSpace" msgstr "" -#. Tool hint -#: edit/editmenu.c:422 +#: edit/editmenu.c:421 msgid "Manipulating blocks of text" msgstr "" -#: edit/editmenu.c:427 +#: edit/editmenu.c:426 msgid " Srch/Replce " msgstr "" -#: edit/editmenu.c:428 +#: edit/editmenu.c:427 msgid "Search...\tF7" msgstr "" -#: edit/editmenu.c:429 +#: edit/editmenu.c:428 msgid "Search again\tF17" msgstr "" -#: edit/editmenu.c:430 +#: edit/editmenu.c:429 msgid "Replace...\tF4" msgstr "" -#: edit/editmenu.c:431 +#: edit/editmenu.c:430 msgid "Replace again\tF14" msgstr "" -#. Tool hint -#: edit/editmenu.c:434 +#: edit/editmenu.c:433 msgid "Search for and replace text" msgstr "" -#: edit/editmenu.c:440 +#: edit/editmenu.c:439 msgid "Goto line...\tM-l" msgstr "" -#: edit/editmenu.c:442 +#: edit/editmenu.c:441 msgid "Start record macro\tC-r" msgstr "" -#: edit/editmenu.c:443 +#: edit/editmenu.c:442 msgid "Finish record macro...\tC-r" msgstr "" -#: edit/editmenu.c:444 +#: edit/editmenu.c:443 msgid "Execute macro...\tC-a, KEY" msgstr "" -#: edit/editmenu.c:445 +#: edit/editmenu.c:444 msgid "Delete macro...\t" msgstr "" -#: edit/editmenu.c:447 +#: edit/editmenu.c:446 msgid "Insert date/time\tC-d" msgstr "" -#: edit/editmenu.c:448 +#: edit/editmenu.c:447 msgid "Format paragraph\tM-p" msgstr "" -#: edit/editmenu.c:451 +#. Tool hint +#: edit/editmenu.c:450 msgid "Macros and internal commands" msgstr "" @@ -754,7 +753,7 @@ msgstr "" msgid "Error initialising editor.\n" msgstr "" -#: edit/editwidget.c:910 gnome/glayout.c:264 src/help.c:812 src/main.c:1654 src/screen.c:2165 src/screen.c:2199 src/tree.c:1451 src/view.c:1978 +#: edit/editwidget.c:910 gnome/glayout.c:264 src/help.c:812 src/main.c:1655 src/screen.c:2175 src/screen.c:2209 src/tree.c:1451 src/view.c:1978 msgid "Help" msgstr "" @@ -766,7 +765,7 @@ msgstr "" msgid "Replac" msgstr "" -#: edit/editwidget.c:914 gnome/gdesktop.c:184 gnome/glayout.c:193 src/screen.c:2169 src/screen.c:2203 src/tree.c:1457 +#: edit/editwidget.c:914 gnome/gdesktop.c:184 gnome/glayout.c:193 src/screen.c:2179 src/screen.c:2213 src/tree.c:1457 msgid "Copy" msgstr "" @@ -778,15 +777,15 @@ msgstr "" msgid "Search" msgstr "" -#: edit/editwidget.c:917 gnome/gdesktop.c:709 gnome/glayout.c:196 src/screen.c:2172 src/screen.c:2206 +#: edit/editwidget.c:917 gnome/gdesktop.c:716 gnome/glayout.c:196 src/screen.c:2182 src/screen.c:2216 msgid "Delete" msgstr "" -#: edit/editwidget.c:919 src/main.c:1656 +#: edit/editwidget.c:919 src/main.c:1657 msgid "PullDn" msgstr "" -#: edit/editwidget.c:920 gnome/gview.c:255 src/help.c:824 src/main.c:1657 src/view.c:1980 src/view.c:2000 +#: edit/editwidget.c:920 gnome/gview.c:255 src/help.c:824 src/main.c:1658 src/view.c:1980 src/view.c:2000 msgid "Quit" msgstr "" @@ -806,7 +805,7 @@ msgid "" "\n" msgstr "" -#: src/achown.c:72 src/boxes.c:214 src/boxes.c:311 src/boxes.c:352 src/boxes.c:397 src/boxes.c:539 src/boxes.c:660 src/boxes.c:702 src/chmod.c:115 src/chown.c:81 src/cmd.c:827 src/file.c:1953 src/find.c:156 src/hotlist.c:140 src/hotlist.c:696 src/hotlist.c:777 src/layout.c:364 src/learn.c:58 src/option.c:154 src/panelize.c:89 src/view.c:411 src/wtools.c:114 src/wtools.c:401 src/wtools.c:573 src/wtools.c:642 +#: src/achown.c:72 src/boxes.c:138 src/boxes.c:273 src/boxes.c:370 src/boxes.c:457 src/boxes.c:599 src/boxes.c:720 src/boxes.c:762 src/chmod.c:115 src/chown.c:81 src/cmd.c:832 src/file.c:1953 src/find.c:156 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:572 src/wtools.c:652 msgid "&Cancel" msgstr "" @@ -904,167 +903,155 @@ msgid "" " than we can handle. \n" msgstr "" -#: src/boxes.c:69 -msgid "Full file list" -msgstr "" - -#: src/boxes.c:69 -msgid "Brief file list" -msgstr "" - -#: src/boxes.c:69 -msgid "Long file list" -msgstr "" - -#: src/boxes.c:70 -msgid "User:" -msgstr "" - -#: src/boxes.c:84 -msgid "Listing Mode..." -msgstr "" - -#: src/boxes.c:133 +#: src/boxes.c:64 msgid " Listing mode " msgstr "" +#: src/boxes.c:69 +msgid "&Full file list" +msgstr "" + +#: src/boxes.c:69 +msgid "&Brief file list" +msgstr "" + +#: src/boxes.c:69 +msgid "&Long file list" +msgstr "" + +#: src/boxes.c:70 +msgid "&User defined:" +msgstr "" + #: src/boxes.c:136 -msgid "On input lines, use C-v to get a listbox" -msgstr "" - -#: src/boxes.c:138 -msgid "with other formats" -msgstr "" - -#: src/boxes.c:212 -msgid "Listing mode" -msgstr "" - -#: gnome/gtools.c:129 src/boxes.c:218 src/boxes.c:314 src/boxes.c:354 src/boxes.c:399 src/boxes.c:541 src/boxes.c:661 src/boxes.c:704 src/boxes.c:813 src/file.c:1960 src/find.c:160 src/layout.c:370 src/option.c:162 src/wtools.c:295 src/wtools.c:575 -msgid "&Ok" -msgstr "" - -#: src/boxes.c:225 msgid "user &Mini status" msgstr "" -#: src/boxes.c:309 -msgid "Sort order" +#: gnome/gtools.c:129 src/boxes.c:137 src/boxes.c:272 src/boxes.c:372 src/boxes.c:459 src/boxes.c:601 src/boxes.c:721 src/boxes.c:764 src/boxes.c:873 src/file.c:1960 src/find.c:160 src/layout.c:364 src/option.c:142 src/wtools.c:295 src/wtools.c:574 +msgid "&Ok" msgstr "" -#: src/boxes.c:317 -msgid "case sensi&tive" +#: src/boxes.c:185 +msgid "Listing mode" msgstr "" -#: src/boxes.c:319 +#: src/boxes.c:274 msgid "&Reverse" msgstr "" -#: src/boxes.c:357 +#: src/boxes.c:275 +msgid "case sensi&tive" +msgstr "" + +#: src/boxes.c:276 +msgid "Sort order" +msgstr "" + +#: src/boxes.c:375 msgid " confirm &Exit " msgstr "" -#: src/boxes.c:359 +#: src/boxes.c:377 msgid " confirm e&Xecute " msgstr "" -#: src/boxes.c:361 +#: src/boxes.c:379 msgid " confirm o&Verwrite " msgstr "" -#: src/boxes.c:363 +#: src/boxes.c:381 msgid " confirm &Delete " msgstr "" -#: src/boxes.c:369 +#: src/boxes.c:387 msgid " Confirmation " msgstr "" -#: src/boxes.c:394 +#: src/boxes.c:454 msgid "Full 8 bits output" msgstr "" -#: src/boxes.c:394 +#: src/boxes.c:454 msgid "ISO 8859-1" msgstr "" -#: src/boxes.c:394 +#: src/boxes.c:454 msgid "7 bits" msgstr "" -#: src/boxes.c:401 +#: src/boxes.c:461 msgid "F&ull 8 bits input" msgstr "" -#: src/boxes.c:409 +#: src/boxes.c:469 msgid " Display bits " msgstr "" -#: src/boxes.c:536 +#: src/boxes.c:596 msgid "Always to memory" msgstr "" -#: src/boxes.c:536 +#: src/boxes.c:596 msgid "If size less than:" msgstr "" -#: src/boxes.c:546 +#: src/boxes.c:606 msgid "&Always use ftp proxy" msgstr "" -#: src/boxes.c:548 +#: src/boxes.c:608 msgid "sec" msgstr "" -#: src/boxes.c:552 +#: src/boxes.c:612 msgid "ftpfs directory cache timeout:" msgstr "" -#: src/boxes.c:556 +#: src/boxes.c:616 msgid "ftp anonymous password:" msgstr "" -#: src/boxes.c:563 +#: src/boxes.c:623 msgid "Gzipped tar archive extract:" msgstr "" -#: src/boxes.c:569 +#: src/boxes.c:629 msgid "Timeout for freeing VFSs:" msgstr "" -#: src/boxes.c:575 +#: src/boxes.c:635 msgid " Virtual File System Setting " msgstr "" -#: src/boxes.c:722 +#: src/boxes.c:782 msgid "Symbolic link filename:" msgstr "" -#: src/boxes.c:724 +#: src/boxes.c:784 msgid "Existing filename (filename symlink will point to):" msgstr "" -#: src/boxes.c:753 +#: src/boxes.c:813 msgid "Running " msgstr "" -#: src/boxes.c:754 src/find.c:609 +#: src/boxes.c:814 src/find.c:609 msgid "Stopped" msgstr "" -#: src/boxes.c:808 +#: src/boxes.c:868 msgid "Background Jobs" msgstr "" -#: src/boxes.c:815 +#: src/boxes.c:875 msgid "&Kill" msgstr "" -#: src/boxes.c:817 +#: src/boxes.c:877 msgid "&Resume" msgstr "" -#: src/boxes.c:819 src/find.c:669 +#: src/boxes.c:879 src/find.c:669 msgid "&Stop" msgstr "" @@ -1128,7 +1115,7 @@ msgstr "" msgid "&Marked all" msgstr "" -#: src/chmod.c:160 src/dir.c:57 src/screen.c:412 +#: src/chmod.c:160 src/screen.c:412 msgid "Name" msgstr "" @@ -1261,196 +1248,200 @@ msgstr "" msgid " Set expression for filtering filenames" msgstr "" -#: src/cmd.c:496 +#: src/cmd.c:501 msgid " Select " msgstr "" -#: src/cmd.c:524 src/cmd.c:575 +#: src/cmd.c:529 src/cmd.c:580 msgid " Malformed regular expression " msgstr "" -#: src/cmd.c:548 +#: src/cmd.c:553 msgid " Unselect " msgstr "" -#: src/cmd.c:617 src/main.c:1285 +#: src/cmd.c:622 msgid "Extension file edit" msgstr "" -#: src/cmd.c:618 +#: src/cmd.c:623 msgid " Which extension file you want to edit? " msgstr "" -#: src/cmd.c:619 +#: src/cmd.c:624 msgid "&User" msgstr "" -#: src/cmd.c:619 src/cmd.c:645 +#: src/cmd.c:624 src/cmd.c:650 msgid "&System Wide" msgstr "" -#: src/cmd.c:642 src/main.c:1286 +#: src/cmd.c:647 msgid "Menu file edit" msgstr "" -#: src/cmd.c:643 +#: src/cmd.c:648 msgid " Which menu file will you edit? " msgstr "" -#: src/cmd.c:645 +#: src/cmd.c:650 msgid "&Local" msgstr "" -#: src/cmd.c:645 +#: src/cmd.c:650 msgid "&Home" msgstr "" -#: src/cmd.c:826 +#: src/cmd.c:831 msgid " Compare directories " msgstr "" -#: src/cmd.c:826 +#: src/cmd.c:831 msgid " Select compare method: " msgstr "" -#: src/cmd.c:827 +#: src/cmd.c:832 msgid "&Quick" msgstr "" -#: src/cmd.c:827 +#: src/cmd.c:832 msgid "&Size only" msgstr "" -#: src/cmd.c:827 +#: src/cmd.c:832 msgid "&Thorough" msgstr "" -#: src/cmd.c:837 +#: src/cmd.c:842 msgid " Both panels should be on the listing view mode to use this command " msgstr "" -#: src/cmd.c:851 +#: src/cmd.c:856 msgid " The command history is empty " msgstr "" -#: src/cmd.c:857 +#: src/cmd.c:862 msgid " Command history " msgstr "" -#: src/cmd.c:899 +#: src/cmd.c:904 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " msgstr "" -#: src/cmd.c:941 +#: src/cmd.c:946 msgid "" "Type `exit' to return to the Midnight Commander\n" "\r\n" "\r" msgstr "" -#: src/cmd.c:993 +#: src/cmd.c:998 msgid "" " Couldn't stat %s \n" " %s " msgstr "" -#: src/cmd.c:1002 src/cmd.c:1004 +#: src/cmd.c:1007 src/cmd.c:1009 msgid " Link " msgstr "" -#: src/cmd.c:1003 src/cmd.c:1108 +#: src/cmd.c:1008 src/cmd.c:1113 msgid " to:" msgstr "" -#: src/cmd.c:1014 +#: src/cmd.c:1019 msgid " link: %s " msgstr "" -#: src/cmd.c:1047 +#: src/cmd.c:1052 msgid " symlink: %s " msgstr "" -#: src/cmd.c:1073 +#: src/cmd.c:1078 msgid " Symlink " msgstr "" -#: src/cmd.c:1073 +#: src/cmd.c:1078 msgid " points to:" msgstr "" -#: src/cmd.c:1078 +#: src/cmd.c:1083 msgid " Edit symlink " msgstr "" -#: src/cmd.c:1084 +#: src/cmd.c:1089 msgid " edit symlink: %s " msgstr "" -#: src/cmd.c:1108 +#: src/cmd.c:1113 msgid " Link symbolically " msgstr "" -#: src/cmd.c:1109 +#: src/cmd.c:1114 msgid " Relative symlink " msgstr "" -#: src/cmd.c:1120 +#: src/cmd.c:1125 msgid " relative symlink: %s " msgstr "" -#: src/cmd.c:1251 -msgid " Link to a remote machine " +#: src/cmd.c:1228 +msgid " Enter machine name (F1 for details): " msgstr "" #: src/cmd.c:1257 +msgid " Link to a remote machine " +msgstr "" + +#: src/cmd.c:1263 msgid " FTP to machine " msgstr "" -#: src/cmd.c:1267 +#: src/cmd.c:1273 msgid " Socket source routing setup " msgstr "" -#: src/cmd.c:1268 +#: src/cmd.c:1274 msgid " Enter host name to use as a source routing hop: " msgstr "" -#: src/cmd.c:1275 +#: src/cmd.c:1281 msgid " Host name " msgstr "" -#: src/cmd.c:1275 +#: src/cmd.c:1281 msgid " Error while looking up IP address " msgstr "" -#: src/cmd.c:1286 +#: src/cmd.c:1292 msgid " Undelete files on an ext2 file system " msgstr "" -#: src/cmd.c:1287 +#: src/cmd.c:1293 msgid "" " Enter the file system name where you want to run the\n" " undelete file system on: (F1 for details)" msgstr "" -#: src/cmd.c:1379 +#: src/cmd.c:1385 msgid "Show directory sizes" msgstr "" -#: src/cmd.c:1379 src/panelize.c:425 +#: src/cmd.c:1385 src/panelize.c:425 msgid "Pipe close failed" msgstr "" -#: src/cmd.c:1392 +#: src/cmd.c:1398 msgid "Cannot invoke du command." msgstr "" -#: src/cmd.c:1403 +#: src/cmd.c:1409 msgid " Setup saved to ~/" msgstr "" -#: src/cmd.c:1405 +#: src/cmd.c:1411 msgid " Setup " msgstr "" @@ -1471,55 +1462,59 @@ msgid "" msgstr "" #: src/dir.c:56 -msgid "Unsorted" +msgid "&Unsorted" +msgstr "" + +#: src/dir.c:57 +msgid "&Name" msgstr "" #: src/dir.c:58 -msgid "Extension" +msgid "&Extension" msgstr "" #: src/dir.c:59 -msgid "Modify time" +msgid "&Modify time" msgstr "" #: src/dir.c:60 -msgid "Access time" +msgid "&Access time" msgstr "" #: src/dir.c:61 -msgid "Change time" +msgid "&Change time" msgstr "" -#: src/dir.c:62 src/screen.c:413 src/screen.c:416 -msgid "Size" +#: src/dir.c:62 +msgid "&Size" msgstr "" -#: src/dir.c:63 src/screen.c:430 -msgid "Inode" +#: src/dir.c:63 +msgid "&Inode" msgstr "" #: src/dir.c:66 -msgid "Type" +msgid "&Type" msgstr "" #: src/dir.c:67 -msgid "Links" +msgid "&Links" msgstr "" #: src/dir.c:68 -msgid "NGID" +msgid "N&GID" msgstr "" #: src/dir.c:69 -msgid "NUID" +msgid "N&UID" msgstr "" -#: gnome/gprop.c:335 src/dir.c:70 src/screen.c:423 -msgid "Owner" +#: src/dir.c:70 +msgid "&Owner" msgstr "" -#: gnome/gprop.c:225 gnome/gprop.c:350 src/dir.c:71 src/screen.c:424 -msgid "Group" +#: src/dir.c:71 +msgid "&Group" msgstr "" #: src/dir.c:645 @@ -1983,7 +1978,7 @@ msgstr "" msgid "Find File" msgstr "" -#: src/find.c:158 +#: src/find.c:158 src/main.c:1189 src/main.c:1210 msgid "&Tree" msgstr "" @@ -2358,79 +2353,87 @@ msgstr "" msgid "File: None" msgstr "" -#: src/layout.c:162 -msgid "&Xterm hintbar" +#: src/layout.c:153 +msgid "&Vertical" msgstr "" -#: src/layout.c:163 -msgid "h&Intbar visible" +#: src/layout.c:154 +msgid "&Horizontal" msgstr "" #: src/layout.c:164 -msgid "&Keybar visible" +msgid "&Xterm hintbar" msgstr "" #: src/layout.c:165 -msgid "command &Prompt" +msgid "h&Intbar visible" msgstr "" #: src/layout.c:166 -msgid "show &Mini status" +msgid "&Keybar visible" msgstr "" #: src/layout.c:167 -msgid "menu&Bar visible" +msgid "command &Prompt" msgstr "" #: src/layout.c:168 -msgid "&Equal split" +msgid "show &Mini status" msgstr "" #: src/layout.c:169 -msgid "pe&Rmissions" +msgid "menu&Bar visible" msgstr "" #: src/layout.c:170 +msgid "&Equal split" +msgstr "" + +#: src/layout.c:171 +msgid "pe&Rmissions" +msgstr "" + +#: src/layout.c:172 msgid "&File types" msgstr "" -#: src/layout.c:279 -msgid " Layout " -msgstr "" - -#: src/layout.c:281 -msgid " Panel split " -msgstr "" - -#: src/layout.c:283 -msgid " Highlight... " -msgstr "" - -#: src/layout.c:285 src/option.c:129 -msgid " Other options " -msgstr "" - -#: src/layout.c:294 -msgid "output lines" -msgstr "" - -#: src/layout.c:361 -msgid "Layout" -msgstr "" - -#: src/layout.c:367 src/learn.c:59 src/learn.c:177 src/option.c:158 +#: src/layout.c:366 src/learn.c:59 src/learn.c:177 src/option.c:144 msgid "&Save" msgstr "" -#: src/layout.c:388 src/option.c:185 +#: src/layout.c:374 +msgid " Layout " +msgstr "" + +#: src/layout.c:375 +msgid " Panel split " +msgstr "" + +#: src/layout.c:376 +msgid " Highlight... " +msgstr "" + +#: src/layout.c:377 src/option.c:155 +msgid " Other options " +msgstr "" + +#: src/layout.c:378 +msgid "output lines" +msgstr "" + +#: src/layout.c:445 +msgid "Layout" +msgstr "" + +#: src/layout.c:474 src/option.c:240 msgid "Other options" msgstr "" -#: src/layout.c:390 +#: src/layout.c:476 msgid "Highlight..." msgstr "" -#: src/layout.c:392 +#: src/layout.c:478 msgid "Panel split" msgstr "" @@ -2514,7 +2517,7 @@ msgstr "" msgid " The shell is already running a command " msgstr "" -#: gnome/gdesktop.c:810 src/main.c:830 src/screen.c:1965 +#: gnome/gdesktop.c:817 src/main.c:830 src/screen.c:1965 msgid " The Midnight Commander " msgstr "" @@ -2522,219 +2525,227 @@ msgstr "" msgid " Do you really want to quit the Midnight Commander? " msgstr "" -#: src/main.c:1185 src/main.c:1206 -msgid "Listing mode..." -msgstr "" - #: src/main.c:1186 src/main.c:1207 -msgid "Quick view C-x q" +msgid "&Listing mode..." msgstr "" #: src/main.c:1187 src/main.c:1208 -msgid "Info C-x i" +msgid "&Quick view C-x q" msgstr "" #: src/main.c:1188 src/main.c:1209 -msgid "Tree" +msgid "&Info C-x i" msgstr "" -#: gnome/glayout.c:212 src/main.c:1190 src/main.c:1211 -msgid "Sort order..." +#: src/main.c:1191 src/main.c:1212 +msgid "&Sort order..." msgstr "" -#: gnome/glayout.c:213 src/main.c:1192 src/main.c:1213 -msgid "Filter..." +#: src/main.c:1193 src/main.c:1214 +msgid "&Filter..." msgstr "" -#: gnome/glayout.c:217 src/main.c:1195 src/main.c:1216 -msgid "Network link..." +#: src/main.c:1196 src/main.c:1217 +msgid "&Network link..." msgstr "" -#: gnome/glayout.c:218 src/main.c:1196 src/main.c:1217 -msgid "FTP link..." +#: src/main.c:1197 src/main.c:1218 +msgid "FT&P link..." msgstr "" -#: src/main.c:1200 src/main.c:1221 -msgid "Drive... M-d" +#: src/main.c:1201 src/main.c:1222 +msgid "&Drive... M-d" msgstr "" -#: src/main.c:1202 src/main.c:1223 -msgid "Rescan C-r" -msgstr "" - -#: src/main.c:1227 -msgid "User menu F2" +#: src/main.c:1203 src/main.c:1224 +msgid "&Rescan C-r" msgstr "" #: src/main.c:1228 -msgid "View F3" +msgid "&User menu F2" msgstr "" #: src/main.c:1229 -msgid "Filtered view M-!" +msgid "&View F3" msgstr "" #: src/main.c:1230 -msgid "Edit F4" +msgid "&Filtered view M-!" msgstr "" #: src/main.c:1231 -msgid "Copy F5" +msgid "&Edit F4" msgstr "" #: src/main.c:1232 -msgid "Chmod C-x c" +msgid "&Copy F5" msgstr "" -#: src/main.c:1234 -msgid "Link C-x l" +#: src/main.c:1233 +msgid "c&Hmod C-x c" msgstr "" #: src/main.c:1235 -msgid "SymLink C-x s" +msgid "&Link C-x l" msgstr "" #: src/main.c:1236 -msgid "Edit symlink C-x C-s" +msgid "&SymLink C-x s" msgstr "" #: src/main.c:1237 -msgid "Chown C-x o" +msgid "edit s&Ymlink C-x C-s" msgstr "" #: src/main.c:1238 -msgid "Advanced chown " +msgid "ch&Own C-x o" msgstr "" -#: src/main.c:1240 -msgid "Rename/Move F6" +#: src/main.c:1239 +msgid "&Advanced chown " msgstr "" #: src/main.c:1241 -msgid "Mkdir F7" +msgid "&Rename/Move F6" msgstr "" #: src/main.c:1242 -msgid "Delete F8" +msgid "&Mkdir F7" msgstr "" #: src/main.c:1243 -msgid "Quick cd M-c" +msgid "&Delete F8" msgstr "" -#: src/main.c:1245 -msgid "Select group M-+" +#: src/main.c:1244 +msgid "&Quick cd M-c" msgstr "" #: src/main.c:1246 -msgid "Unselect group M-\\" +msgid "select &Group M-+" msgstr "" #: src/main.c:1247 -msgid "Reverse selection M-*" +msgid "u&Nselect group M-\\" msgstr "" -#: src/main.c:1249 -msgid "Quit F10" +#: src/main.c:1248 +msgid "reverse selec&Tion M-*" msgstr "" -#: src/main.c:1258 -msgid "Directory tree" +#: src/main.c:1250 +msgid "e&Xit F10" msgstr "" +#. I know, I'm lazy, but the tree widget when it's not running +#. * as a panel still has some problems, I have not yet finished +#. * the WTree widget port, sorry. +#. #: src/main.c:1259 -msgid "Find file M-?" +msgid "&Directory tree" msgstr "" -#: src/main.c:1261 -msgid "sWap panels C-u" +#: src/main.c:1260 +msgid "&Find file M-?" msgstr "" #: src/main.c:1262 -msgid "switch Panels on/off C-o" +msgid "s&Wap panels C-u" msgstr "" -#: src/main.c:1264 -msgid "Compare directories C-x d" +#: src/main.c:1263 +msgid "switch &Panels on/off C-o" msgstr "" #: src/main.c:1265 -msgid "eXternal panelize C-x !" +msgid "&Compare directories C-x d" msgstr "" -#: src/main.c:1267 -msgid "show directory sIzes" +#: src/main.c:1266 +msgid "e&Xternal panelize C-x !" msgstr "" -#: src/main.c:1270 -msgid "command History" +#: src/main.c:1268 +msgid "show directory s&Izes" msgstr "" #: src/main.c:1271 -msgid "Directory hotlist C-\\" +msgid "command &History" msgstr "" -#: src/main.c:1273 -msgid "Active VFS list C-x a" +#: src/main.c:1272 +msgid "di&Rectory hotlist C-\\" msgstr "" -#: src/main.c:1276 -msgid "Background jobs C-x j" +#: src/main.c:1274 +msgid "&Active VFS list C-x a" msgstr "" -#: gnome/glayout.c:244 src/main.c:1280 -msgid "Undelete files (ext2fs only)" +#: src/main.c:1277 +msgid "&Background jobs C-x j" msgstr "" -#: src/main.c:1283 -msgid "Listing format edit" +#: src/main.c:1281 +msgid "&Undelete files (ext2fs only)" msgstr "" -#: src/main.c:1291 -msgid "Configuration..." +#: src/main.c:1284 +msgid "&Listing format edit" msgstr "" -#: src/main.c:1293 -msgid "cOnfirmation..." +#: src/main.c:1286 +msgid "&Extension file edit" +msgstr "" + +#: src/main.c:1287 +msgid "&Menu file edit" +msgstr "" + +#: src/main.c:1292 +msgid "&Configuration..." msgstr "" #: src/main.c:1294 -msgid "Display bits..." +msgid "c&Onfirmation..." msgstr "" -#: src/main.c:1296 -msgid "learn Keys..." +#: src/main.c:1295 +msgid "&Display bits..." msgstr "" -#: src/main.c:1299 -msgid "Virtual FS..." +#: src/main.c:1297 +msgid "learn &Keys..." msgstr "" -#: gnome/glayout.c:231 src/main.c:1302 -msgid "Save setup" +#: src/main.c:1300 +msgid "&Virtual FS..." msgstr "" -#: src/main.c:1318 src/main.c:1320 +#: src/main.c:1303 +msgid "&Save setup" +msgstr "" + +#: src/main.c:1319 src/main.c:1321 msgid " Left " msgstr "" -#: src/main.c:1320 +#: src/main.c:1321 msgid " Above " msgstr "" -#: src/main.c:1328 src/main.c:1330 +#: src/main.c:1329 src/main.c:1331 msgid " Right " msgstr "" -#: src/main.c:1330 +#: src/main.c:1331 msgid " Below " msgstr "" -#: src/main.c:1391 +#: src/main.c:1392 msgid " Information " msgstr "" -#: src/main.c:1392 +#: src/main.c:1393 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -2742,11 +2753,11 @@ msgid "" " the details. " msgstr "" -#: src/main.c:1655 src/screen.c:2166 src/screen.c:2200 +#: src/main.c:1656 src/screen.c:2176 src/screen.c:2210 msgid "Menu" msgstr "" -#: src/main.c:1874 +#: src/main.c:1870 msgid "Thank you for using GNU Midnight Commander" msgstr "" @@ -2787,115 +2798,115 @@ msgid "" " files have been moved now\n" msgstr "" -#: src/option.c:81 +#: src/option.c:74 msgid "safe de&Lete" msgstr "" -#: src/option.c:82 +#: src/option.c:75 msgid "cd follows lin&Ks" msgstr "" -#: src/option.c:83 +#: src/option.c:76 msgid "advanced cho&Wn" msgstr "" -#: src/option.c:84 +#: src/option.c:77 msgid "l&Ynx-like motion" msgstr "" -#: src/option.c:86 +#: src/option.c:79 msgid "Animation" msgstr "" -#: src/option.c:88 +#: src/option.c:81 msgid "ro&Tating dash" msgstr "" -#: src/option.c:90 +#: src/option.c:83 msgid "co&Mplete: show all" msgstr "" -#: src/option.c:91 +#: src/option.c:84 msgid "&Use internal view" msgstr "" -#: src/option.c:92 +#: src/option.c:85 msgid "use internal ed&It" msgstr "" -#: src/option.c:93 +#: src/option.c:86 msgid "auto m&Enus" msgstr "" -#: src/option.c:94 +#: src/option.c:87 msgid "&Auto save setup" msgstr "" -#: src/option.c:95 +#: src/option.c:88 msgid "shell &Patterns" msgstr "" -#: src/option.c:96 +#: src/option.c:89 msgid "&Verbose operation" msgstr "" -#: src/option.c:97 +#: src/option.c:90 msgid "&Fast dir reload" msgstr "" -#: src/option.c:98 +#: src/option.c:91 msgid "mi&X all files" msgstr "" -#: src/option.c:99 +#: src/option.c:92 msgid "&Drop down menus" msgstr "" -#: src/option.c:100 +#: src/option.c:93 msgid "ma&Rk moves down" msgstr "" -#: src/option.c:101 +#: src/option.c:94 msgid "show &Hidden files" msgstr "" -#: src/option.c:102 +#: src/option.c:95 msgid "show &Backup files" msgstr "" -#: src/option.c:109 -msgid "Never" +#: src/option.c:102 +msgid "&Never" msgstr "" -#: src/option.c:110 -msgid "on dumb Terminals" +#: src/option.c:103 +msgid "on dumb &Terminals" msgstr "" -#: src/option.c:111 -msgid "alwaYs" +#: src/option.c:104 +msgid "alwa&Ys" msgstr "" -#: src/option.c:127 +#: src/option.c:152 msgid " Configure options " msgstr "" -#: src/option.c:131 -msgid " Pause after run... " -msgstr "" - -#: src/option.c:133 +#: src/option.c:153 msgid " Panel options " msgstr "" -#: src/option.c:151 +#: src/option.c:154 +msgid " Pause after run... " +msgstr "" + +#: src/option.c:206 msgid "Configure options" msgstr "" -#: src/option.c:187 +#: src/option.c:242 msgid "Pause after run..." msgstr "" -#: src/option.c:189 +#: src/option.c:244 msgid "Panel options" msgstr "" @@ -2945,6 +2956,10 @@ msgstr "" msgid "Cannot invoke command." msgstr "" +#: src/screen.c:413 src/screen.c:416 +msgid "Size" +msgstr "" + #: src/screen.c:415 msgid "MTime" msgstr "" @@ -2973,6 +2988,14 @@ msgstr "" msgid "UID" msgstr "" +#: gnome/gprop.c:335 src/screen.c:423 +msgid "Owner" +msgstr "" + +#: gnome/gprop.c:225 gnome/gprop.c:350 src/screen.c:424 +msgid "Group" +msgstr "" + #: src/screen.c:425 msgid "ATime" msgstr "" @@ -2981,11 +3004,15 @@ msgstr "" msgid "CTime" msgstr "" +#: src/screen.c:430 +msgid "Inode" +msgstr "" + #: src/screen.c:634 msgid " %s bytes in %d file%s" msgstr "" -#: gnome/gscreen.c:1135 src/screen.c:661 +#: gnome/gscreen.c:1136 src/screen.c:661 msgid "" msgstr "" @@ -2993,23 +3020,23 @@ msgstr "" msgid "Unknow tag on display format: " msgstr "" -#: gnome/gdesktop.c:811 src/screen.c:1966 +#: gnome/gdesktop.c:818 src/screen.c:1966 msgid " Do you really want to execute? " msgstr "" -#: gnome/glayout.c:198 gnome/gscreen.c:348 src/screen.c:2167 src/screen.c:2201 +#: gnome/glayout.c:198 gnome/gscreen.c:349 src/screen.c:2177 src/screen.c:2211 msgid "View" msgstr "" -#: src/screen.c:2168 src/screen.c:2202 src/view.c:1987 +#: src/screen.c:2178 src/screen.c:2212 src/view.c:1987 msgid "Edit" msgstr "" -#: src/screen.c:2170 src/screen.c:2204 src/tree.c:1459 +#: src/screen.c:2180 src/screen.c:2214 src/tree.c:1459 msgid "RenMov" msgstr "" -#: gnome/glayout.c:195 src/screen.c:2171 src/screen.c:2205 src/tree.c:1463 +#: gnome/glayout.c:195 src/screen.c:2181 src/screen.c:2215 src/tree.c:1463 msgid "Mkdir" msgstr "" @@ -3143,11 +3170,11 @@ msgstr "" msgid "name_trunc: too big" msgstr "" -#: src/utilunix.c:352 +#: src/utilunix.c:372 msgid " Pipe failed " msgstr "" -#: src/utilunix.c:356 +#: src/utilunix.c:376 msgid " Dup failed " msgstr "" @@ -3488,11 +3515,11 @@ msgstr "" msgid "NumLock on keypad" msgstr "" -#: src/wtools.c:601 +#: src/wtools.c:600 msgid "Password" msgstr "" -#: src/wtools.c:644 +#: src/wtools.c:654 msgid "Ok" msgstr "" @@ -3513,11 +3540,14 @@ msgstr "" msgid "Link" msgstr "" -#: gnome/gdesktop.c:702 gnome/gscreen.c:344 +#. We connect_object_after to the items so that we can destroy +#. * the menu at the proper time. +#. +#: gnome/gdesktop.c:709 gnome/gscreen.c:345 msgid "Properties" msgstr "" -#: gnome/gdesktop.c:987 +#: gnome/gdesktop.c:994 msgid " Could not open %s directory" msgstr "" @@ -3609,10 +3639,18 @@ msgstr "" msgid "Set the display mode for the panel" msgstr "" +#: gnome/glayout.c:212 +msgid "Sort order..." +msgstr "" + #: gnome/glayout.c:212 msgid "Changes the sort order of the files" msgstr "" +#: gnome/glayout.c:213 +msgid "Filter..." +msgstr "" + #: gnome/glayout.c:213 msgid "Set a filter for the files" msgstr "" @@ -3621,10 +3659,18 @@ msgstr "" msgid "Rescan the directory contents" msgstr "" +#: gnome/glayout.c:217 +msgid "Network link..." +msgstr "" + #: gnome/glayout.c:217 msgid "Connect to a remote machine" msgstr "" +#: gnome/glayout.c:218 +msgid "FTP link..." +msgstr "" + #: gnome/glayout.c:218 msgid "Connect to a remote machine with FTP" msgstr "" @@ -3653,6 +3699,10 @@ msgstr "" msgid "Virtual File System settings" msgstr "" +#: gnome/glayout.c:231 +msgid "Save setup" +msgstr "" + #: gnome/glayout.c:236 msgid "Find" msgstr "" @@ -3685,6 +3735,10 @@ msgstr "" msgid "List of active virtual file systems" msgstr "" +#: gnome/glayout.c:244 +msgid "Undelete files (ext2fs only)" +msgstr "" + #: gnome/glayout.c:244 msgid "Recover deleted files" msgstr "" @@ -3786,127 +3840,127 @@ msgstr "" msgid "Select icon" msgstr "" -#: gnome/gscreen.c:309 +#: gnome/gscreen.c:310 msgid " Open with..." msgstr "" -#: gnome/gscreen.c:310 +#: gnome/gscreen.c:311 msgid "Enter extra arguments:" msgstr "" -#: gnome/gscreen.c:346 +#: gnome/gscreen.c:347 msgid "Open" msgstr "" -#: gnome/gscreen.c:347 +#: gnome/gscreen.c:348 msgid "Open with" msgstr "" -#: gnome/gscreen.c:349 +#: gnome/gscreen.c:350 msgid "View unfiltered" msgstr "" -#: gnome/gscreen.c:351 +#: gnome/gscreen.c:352 msgid "Link..." msgstr "" -#: gnome/gscreen.c:352 +#: gnome/gscreen.c:353 msgid "Symlink..." msgstr "" -#: gnome/gscreen.c:353 +#: gnome/gscreen.c:354 msgid "Edit symlink..." msgstr "" -#: gnome/gscreen.c:361 +#: gnome/gscreen.c:362 msgid "Copy..." msgstr "" -#: gnome/gscreen.c:362 +#: gnome/gscreen.c:363 msgid "Rename/move.." msgstr "" -#: gnome/gscreen.c:363 +#: gnome/gscreen.c:364 msgid "Delete..." msgstr "" -#: gnome/gscreen.c:943 +#: gnome/gscreen.c:944 msgid "All files" msgstr "" -#: gnome/gscreen.c:945 +#: gnome/gscreen.c:946 msgid "Archives and compressed files" msgstr "" -#: gnome/gscreen.c:947 +#: gnome/gscreen.c:948 msgid "RPM/DEB files" msgstr "" -#: gnome/gscreen.c:949 +#: gnome/gscreen.c:950 msgid "Text/Document files" msgstr "" -#: gnome/gscreen.c:951 +#: gnome/gscreen.c:952 msgid "HTML and SGML files" msgstr "" -#: gnome/gscreen.c:953 +#: gnome/gscreen.c:954 msgid "Postscript and PDF files" msgstr "" -#: gnome/gscreen.c:955 +#: gnome/gscreen.c:956 msgid "Spreadsheet files" msgstr "" -#: gnome/gscreen.c:957 +#: gnome/gscreen.c:958 msgid "Image files" msgstr "" -#: gnome/gscreen.c:960 +#: gnome/gscreen.c:961 msgid "Video/animation files" msgstr "" -#: gnome/gscreen.c:962 +#: gnome/gscreen.c:963 msgid "Audio files" msgstr "" -#: gnome/gscreen.c:964 +#: gnome/gscreen.c:965 msgid "C program files" msgstr "" -#: gnome/gscreen.c:966 +#: gnome/gscreen.c:967 msgid "C++ program files" msgstr "" -#: gnome/gscreen.c:968 +#: gnome/gscreen.c:969 msgid "Objective-C program files" msgstr "" -#: gnome/gscreen.c:970 +#: gnome/gscreen.c:971 msgid "Scheme program files" msgstr "" -#: gnome/gscreen.c:972 +#: gnome/gscreen.c:973 msgid "Assembler program files" msgstr "" -#: gnome/gscreen.c:974 +#: gnome/gscreen.c:975 msgid "Misc. program files" msgstr "" -#: gnome/gscreen.c:976 +#: gnome/gscreen.c:977 msgid "Font files" msgstr "" -#: gnome/gscreen.c:1101 +#: gnome/gscreen.c:1102 msgid "Search: " msgstr "" -#: gnome/gscreen.c:1111 +#: gnome/gscreen.c:1112 msgid " %s bytes in %d file%s" msgstr "" -#: gnome/gscreen.c:1181 +#: gnome/gscreen.c:1182 msgid "Filter" msgstr "" diff --git a/po/ru.po b/po/ru.po index a8d19e89b..10b243400 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1998-04-03 08:01+0300\n" +"POT-Creation-Date: 1998-04-06 11:48+0300\n" "PO-Revision-Date: 1998-03-27 11:07+0200\n" "Last-Translator: Alex Tkachenko \n" "Language-Team: LANGUAGE \n" @@ -861,11 +861,11 @@ msgid "" msgstr "" #: src/achown.c:72 src/boxes.c:138 src/boxes.c:273 src/boxes.c:370 -#: src/boxes.c:415 src/boxes.c:557 src/boxes.c:678 src/boxes.c:720 +#: src/boxes.c:457 src/boxes.c:599 src/boxes.c:720 src/boxes.c:762 #: src/chmod.c:115 src/chown.c:81 src/cmd.c:832 src/file.c:1953 src/find.c:156 -#: src/hotlist.c:140 src/hotlist.c:696 src/hotlist.c:777 src/layout.c:377 -#: src/learn.c:58 src/option.c:165 src/panelize.c:89 src/view.c:411 -#: src/wtools.c:114 src/wtools.c:401 src/wtools.c:573 src/wtools.c:642 +#: 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:573 src/wtools.c:653 msgid "&Cancel" msgstr "&" @@ -994,9 +994,9 @@ msgid "user &Mini status" msgstr " &- " #: gnome/gtools.c:129 src/boxes.c:137 src/boxes.c:272 src/boxes.c:372 -#: src/boxes.c:417 src/boxes.c:559 src/boxes.c:679 src/boxes.c:722 -#: src/boxes.c:831 src/file.c:1960 src/find.c:160 src/layout.c:383 -#: src/option.c:173 src/wtools.c:295 src/wtools.c:575 +#: src/boxes.c:459 src/boxes.c:601 src/boxes.c:721 src/boxes.c:764 +#: src/boxes.c:873 src/file.c:1960 src/find.c:160 src/layout.c:364 +#: src/option.c:142 src/wtools.c:295 src/wtools.c:575 msgid "&Ok" msgstr "&" @@ -1312,11 +1312,11 @@ msgstr "" #: src/cmd.c:417 msgid " Filter " -msgstr "" +msgstr " å " #: src/cmd.c:417 msgid " Set expression for filtering filenames" -msgstr "" +msgstr " ׅ҉֊ ҉ " #: src/cmd.c:501 msgid " Select " @@ -1462,13 +1462,17 @@ msgstr "" msgid " relative symlink: %s " msgstr "" +#: src/cmd.c:1228 +msgid " Enter machine name (F1 for details): " +msgstr " ׊ ( F1): " + #: src/cmd.c:1257 msgid " Link to a remote machine " -msgstr "" +msgstr " " #: src/cmd.c:1263 msgid " FTP to machine " -msgstr "" +msgstr " FTP- " #: src/cmd.c:1273 msgid " Socket source routing setup " @@ -3666,7 +3670,7 @@ msgstr "" msgid "Password" msgstr "" -#: src/wtools.c:644 +#: src/wtools.c:655 msgid "Ok" msgstr "" diff --git a/src/ChangeLog b/src/ChangeLog index 7becb6924..ae57ef733 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,24 @@ +1998-04-06 Miguel de Icaza + + * wtools.c (quick_callback): Process DLG_KEY events on X. + + * utilunix.c (max_open_files): new routine; Used to figure out + the number of available file descriptors. + +Sat Apr 4 00:16:49 1998 Alex Tkachenko + + * src/layout.c: changes to layout dialog box i18n + + * src/option.c: changes to configure box i18n + + * src/cmd.c: added N_() macro for machine_str + + * src/wtools.c (real_input_dialog_help): ok/cancel buttons are places + symmetrically spaced relatively to center of the box. It produces + nicer appearance with i18n (IMO :) + + * src/boxes.c (confirm_box): i18n stuff added. + Mon Apr 6 07:48:22 1998 Pavel Roskin * Makefile.in: "make dist" works with bash 1.x again diff --git a/src/boxes.c b/src/boxes.c index 8435173bf..c18bfdc00 100644 --- a/src/boxes.c +++ b/src/boxes.c @@ -389,6 +389,48 @@ static QuickDialog confirmation = void confirm_box () { + +#ifdef ENABLE_NLS + static int i18n_flag = 0; + + if (!i18n_flag) + { + register int i = sizeof(conf_widgets)/sizeof(QuickWidget) - 1; + int l1, maxlen = 0; + while (i--) + { + conf_widgets [i].text = _(conf_widgets [i].text); + l1 = strlen (conf_widgets [i].text) + 3; + if (l1 > maxlen) + maxlen = l1; + } + + /* + * If buttons start on 4/6, checkboxes (with some add'l space) + * must take not more than it. + */ + confirmation.xlen = (maxlen + 5) * 6 / 4; + + /* + * And this for the case when buttons with some space to the right + * do not fit within 2/6 + */ + l1 = strlen (conf_widgets [0].text) + 3; + i = strlen (conf_widgets [1].text) + 5; + if (i > l1) + l1 = i; + + i = (l1 + 3) * 6 / 2; + if (i > confirmation.xlen) + confirmation.xlen = i; + + confirmation.title = _(confirmation.title); + + i18n_flag = confirmation.i18n = 1; + } + +#endif /* ENABLE_NLS */ + my_delete = confirm_delete; my_overwrite = confirm_overwrite; my_execute = confirm_execute; diff --git a/src/cmd.c b/src/cmd.c index 56e8f86e8..9c3b6a9f1 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1225,7 +1225,7 @@ char *get_random_hint (void) #ifdef USE_NETCODE -static char *machine_str = " Enter machine name (F1 for details): "; +static char *machine_str = N_(" Enter machine name (F1 for details): "); static void nice_cd (char *text, char *xtext, char *help, char *prefix, int to_home) { diff --git a/src/layout.c b/src/layout.c index 7e46aa999..aba7e1081 100644 --- a/src/layout.c +++ b/src/layout.c @@ -140,7 +140,6 @@ static int height; #define MINWIDTH 10 #define MINHEIGHT 5 -#define BX 12 #define BY 12 #define B_2LEFT B_USER @@ -174,6 +173,9 @@ static struct { { 0, 0, 0, 0 } }; +static int first_width, second_width; +static char *layout_title, *title1, *title2, *title3, *output_lines_label; + static WButton *bleft_widget, *bright_widget; static void _check_split (void) @@ -272,20 +274,20 @@ static int layout_callback (struct Dlg_head *h, int Id, int Msg) old_output_lines = -1; attrset (COLOR_NORMAL); dlg_erase (h); - draw_box (h, 1, 1, 13, 56); - draw_box (h, 2, 4, 6, 23); - draw_box (h, 2, 29, 10, 25); - draw_box (h, 8, 4, 4, 23); + draw_box (h, 1, 2, h->lines - 2, h->cols - 4); + draw_box (h, 2, 4, 6, first_width); + draw_box (h, 8, 4, 4, first_width); + draw_box (h, 2, 5 + first_width, 10, second_width); attrset (COLOR_HOT_NORMAL); - dlg_move (h, 1, 25); - addstr (_(" Layout ")); + dlg_move (h, 1, (h->cols - strlen(layout_title))/2); + addstr (layout_title); dlg_move (h, 2, 5); - addstr (_(" Panel split ")); + addstr (title1); dlg_move (h, 8, 5); - addstr (_(" Highlight... ")); - dlg_move (h, 2, 30); - addstr (_(" Other options ")); + addstr (title2); + dlg_move (h, 2, 6 + first_width); + addstr (title3); update_split (); dlg_move (h, 6, 13); addch ('='); @@ -293,9 +295,9 @@ static int layout_callback (struct Dlg_head *h, int Id, int Msg) if (old_output_lines != _output_lines){ old_output_lines = _output_lines; attrset (COLOR_NORMAL); - dlg_move (h, 9, 40); - addstr (_("output lines")); - dlg_move (h, 9, 34); + dlg_move (h, 9, 16 + first_width); + addstr (output_lines_label); + dlg_move (h, 9, 10 + first_width); printw ("%02d", _output_lines); } } @@ -342,7 +344,7 @@ static int layout_callback (struct Dlg_head *h, int Id, int Msg) if (old_output_lines != _output_lines){ old_output_lines = _output_lines; attrset (COLOR_NORMAL); - dlg_move (h, 9, 34); + dlg_move (h, 9, 10 + first_width); printw ("%02d", _output_lines); } } @@ -356,49 +358,120 @@ static int layout_callback (struct Dlg_head *h, int Id, int Msg) static void init_layout (void) { - int i = sizeof (s_split_direction) / sizeof(char*) ; static int i18n_layt_flag = 0; + static int b1, b2, b3; + int i = sizeof (s_split_direction) / sizeof(char*) ; + char* ok_button = _("&Ok"); + char* cancel_button = _("&Cancel"); + char* save_button = _("&Save"); if (!i18n_layt_flag) { - while (i--) - { - s_split_direction [i] = _(s_split_direction [i]); - } - i18n_layt_flag = 1; + register int l1; + + first_width = 19; /* length of line with '<' '>' buttons */ + + layout_title = _(" Layout "); + title1 = _(" Panel split "); + title2 = _(" Highlight... "); + title3 = _(" Other options "); + output_lines_label = _("output lines"); + + while (i--) + { + s_split_direction [i] = _(s_split_direction [i]); + l1 = strlen (s_split_direction [i]) + 7; + if (l1 > first_width) + first_width = l1; + } + + for (i = 0; i <= 8; i++) + { + check_options[i].text = _(check_options[i].text); + l1 = strlen (check_options[i].text) + 7; + if (l1 > first_width) + first_width = l1; + } + + l1 = strlen (title1) + 1; + if (l1 > first_width) + first_width = l1; + + l1 = strlen (title2) + 1; + if (l1 > first_width) + first_width = l1; + + + second_width = strlen (title3) + 1; + for (i = 0; i < 6; i++) + { + check_options[i].text = _(check_options[i].text); + l1 = strlen (check_options[i].text) + 7; + if (l1 > second_width) + second_width = l1; + } + if (console_flag) + { + l1 = strlen (output_lines_label) + 13; + if (l1 > second_width) + second_width = l1; + } + + /* + * alex@bcs.zp.ua: + * To be completely correct, one need to check if layout_title + * does not exceed dialog length and total length of 3 buttons + * allows their placement in one row. But assuming this dialog + * is wide enough, I don't include such a tests. + * + * Now the last thing to do - properly space buttons... + */ + l1 = 11 + strlen (ok_button) /* 14 - all brackets and inner space */ + + strlen (save_button) /* notice: it is 3 char less because */ + + strlen (cancel_button); /* of '&' char in button text */ + + i = (first_width + second_width - l1) / 4; + b1 = 5 + i; + b2 = b1 + strlen(ok_button) + i + 6; + b3 = b2 + strlen(save_button) + i + 4; + + i18n_layt_flag = 1; } - layout_dlg = create_dlg (0, 0, 15, 58, dialog_colors, layout_callback, - "[Layout]", "layout", DLG_CENTER | DLG_GRID); + layout_dlg = create_dlg (0, 0, 15, first_width + second_width + 9, + dialog_colors, layout_callback, + "[Layout]", "layout", DLG_CENTER | DLG_GRID); x_set_dialog_title (layout_dlg, _("Layout")); add_widgetl (layout_dlg, - button_new (BY, BX+25, B_CANCEL, NORMAL_BUTTON, _("&Cancel"), 0, 0, "c"), + button_new (BY, b3, B_CANCEL, NORMAL_BUTTON, cancel_button, 0, 0, "c"), XV_WLAY_RIGHTOF); add_widgetl (layout_dlg, - button_new (BY, BX+12, B_EXIT, NORMAL_BUTTON, _("&Save"), 0, 0, "s"), + button_new (BY, b2, B_EXIT, NORMAL_BUTTON, save_button, 0, 0, "s"), XV_WLAY_RIGHTOF); add_widgetl (layout_dlg, - button_new (BY, BX, B_ENTER, DEFPUSH_BUTTON, _("&Ok"), 0, 0, "o"), + button_new (BY, b1, B_ENTER, DEFPUSH_BUTTON, ok_button, 0, 0, "o"), XV_WLAY_CENTERROW); #ifndef HAVE_X if (console_flag){ add_widget (layout_dlg, - button_new (9, 36, B_MINUS, NARROW_BUTTON, "&-", bminus_cback, 0, NULL)); + button_new (9, 12 + first_width, B_MINUS, NARROW_BUTTON, "&-", + bminus_cback, 0, NULL)); add_widget (layout_dlg, - button_new (9, 31, B_PLUS, NARROW_BUTTON, "&+", bplus_cback, 0, NULL)); + button_new (9, 7 + first_width, B_PLUS, NARROW_BUTTON, "&+", + bplus_cback, 0, NULL)); } #endif -#define XTRACT(i) *check_options[i].variable, _(check_options[i].text), check_options[i].tkname +#define XTRACT(i) *check_options[i].variable, check_options[i].text, check_options[i].tkname for (i = 0; i < 6; i++){ - check_options [i].widget = check_new (8 - i, 31, XTRACT(i)); + check_options [i].widget = check_new (8 - i, 7 + first_width, XTRACT(i)); add_widgetl (layout_dlg, check_options [i].widget, XV_WLAY_BELOWCLOSE); } #ifdef HAVE_XVIEW - add_widgetl (layout_dlg, label_new (2, 30, _("Other options"), "oo"), + add_widgetl (layout_dlg, label_new (2, 7 + first_width, _("Other options"), "oo"), XV_WLAY_NEXTCOLUMN); add_widgetl (layout_dlg, label_new (8, 5, _("Highlight..."), "hl"), XV_WLAY_NEXTCOLUMN); diff --git a/src/option.c b/src/option.c index 2ac4b2d54..bb57987e9 100644 --- a/src/option.c +++ b/src/option.c @@ -45,22 +45,12 @@ #define PX 4 #define PY 2 -#define RX 4 -#define RY 11 +#define RX 4 +#define RY 11 -#define CX 4 -#define CY 2 - -#define BX 14 #define BY 16 - -#define OX 33 #define OY 2 -#define TX 35 -#define TY 11 - - static Dlg_head *conf_dlg; static int r_but; @@ -71,6 +61,9 @@ extern int use_internal_edit; int dummy; +static int OX = 33, first_width = 27, second_width = 27; +static char *configure_title, *title1, *title2, *title3; + static struct { char *text; int *variable; @@ -117,20 +110,20 @@ static int configure_callback (struct Dlg_head *h, int Id, int Msg) #ifndef HAVE_X attrset (COLOR_NORMAL); dlg_erase (h); - draw_box (h, 1, 1, 17, 62); - draw_box (h, PY, PX, 8, 27); - draw_box (h, OY, OX, 14, 27); - draw_box (h, RY, RX, 5, 27); + draw_box (h, 1, 2, h->lines - 2, h->cols - 4); + draw_box (h, PY, PX, 8, first_width); + draw_box (h, RY, RX, 5, first_width); + draw_box (h, OY, OX, 14, second_width); attrset (COLOR_HOT_NORMAL); - dlg_move (h, 1, (62 - 20)/2); - addstr (_(" Configure options ")); + dlg_move (h, 1, (h->cols - strlen(configure_title))/2); + addstr (configure_title); dlg_move (h, OY, OX+1); - addstr (_(" Other options ")); + addstr (title3); dlg_move (h, RY, RX+1); - addstr (_(" Pause after run... ")); + addstr (title2); dlg_move (h, PY, PX+1); - addstr (_(" Panel options ")); + addstr (title1); #endif break; @@ -145,35 +138,86 @@ static void init_configure (void) { int i; static int i18n_config_flag = 0; + static int b1, b2, b3; + char* ok_button = _("&Ok"); + char* cancel_button = _("&Cancel"); + char* save_button = _("&Save"); if (!i18n_config_flag) { - i = sizeof(pause_options)/sizeof(char*); + register int l1; + /* Similar code is in layout.c (init_layout()) */ + + configure_title = _(" Configure options "); + title1 = _(" Panel options "); + title2 = _(" Pause after run... "); + title3 = _(" Other options "); + + first_width = strlen (title1) + 1; + for (i = 12; i < 18; i++) + { + check_options[i].text = _(check_options[i].text); + l1 = strlen (check_options[i].text) + 7; + if (l1 > first_width) + first_width = l1; + } + + i = sizeof(pause_options)/sizeof(char*); while (i--) + { pause_options [i] = _(pause_options [i]); + l1 = strlen (pause_options [i]) + 7; + if (l1 > first_width) + first_width = l1; + } + + l1 = strlen (title2) + 1; + if (l1 > first_width) + first_width = l1; + + OX = first_width + 5; + + second_width = strlen (title3) + 1; + for (i = 0; i < 12; i++) + { + check_options[i].text = _(check_options[i].text); + l1 = strlen (check_options[i].text) + 7; + if (l1 > second_width) + second_width = l1; + } + + l1 = 11 + strlen (ok_button) + + strlen (save_button) + + strlen (cancel_button); + + i = (first_width + second_width - l1) / 4; + b1 = 5 + i; + b2 = b1 + strlen(ok_button) + i + 6; + b3 = b2 + strlen(save_button) + i + 4; i18n_config_flag = 1; } - conf_dlg = create_dlg (0, 0, 19, 64, dialog_colors, - configure_callback, "[Options Menu]", - "option", DLG_CENTER | DLG_GRID); + conf_dlg = create_dlg (0, 0, 19, first_width + second_width + 9, + dialog_colors, configure_callback, "[Options Menu]", + "option", DLG_CENTER | DLG_GRID); + x_set_dialog_title (conf_dlg, _("Configure options")); add_widgetl (conf_dlg, - button_new (BY, BX+26, B_CANCEL, NORMAL_BUTTON, _("&Cancel"), 0, 0, "button-cancel"), + button_new (BY, b3, B_CANCEL, NORMAL_BUTTON, cancel_button, 0, 0, "button-cancel"), XV_WLAY_RIGHTOF); add_widgetl (conf_dlg, - button_new (BY, BX+12, B_EXIT, NORMAL_BUTTON, _("&Save"), 0, 0, "button-save"), + button_new (BY, b2, B_EXIT, NORMAL_BUTTON, save_button, 0, 0, "button-save"), XV_WLAY_RIGHTOF); add_widgetl (conf_dlg, - button_new (BY, BX, B_ENTER, DEFPUSH_BUTTON, _("&Ok"), 0, 0, "button-ok"), + button_new (BY, b1, B_ENTER, DEFPUSH_BUTTON, ok_button, 0, 0, "button-ok"), XV_WLAY_CENTERROW); -#define XTRACT(i) *check_options[i].variable, _(check_options[i].text), check_options [i].tk +#define XTRACT(i) *check_options[i].variable, check_options[i].text, check_options [i].tk /* Add all the checkboxes */ for (i = 0; i < 12; i++){ @@ -182,7 +226,7 @@ static void init_configure (void) XV_WLAY_BELOWCLOSE); } - pause_radio = radio_new (RY+1, RX+1, 3, pause_options, 1, "pause-radio"); + pause_radio = radio_new (RY+1, RX+2, 3, pause_options, 1, "pause-radio"); pause_radio->sel = pause_after_run; add_widgetl (conf_dlg, pause_radio, XV_WLAY_BELOWCLOSE); diff --git a/src/panel.h b/src/panel.h index 8d0797c37..1c3d92202 100644 --- a/src/panel.h +++ b/src/panel.h @@ -120,7 +120,7 @@ typedef struct { void *filter_w; /* A WInput* */ void *current_dir; /* A WInput* */ - int estimated_total; + int estimated_total; #endif } WPanel; @@ -226,6 +226,7 @@ void file_mark (WPanel *panel, int index, int val); void do_file_mark (WPanel *panel, int index, int val); int file_compute_color (int attr, file_entry *fe); int file_entry_color (file_entry *fe); +void do_file_mark_range (WPanel *panel, int r1, int r2); /* NOTE: Have to be ifdefed for HAVE_X */ void x_panel_select_item (WPanel *panel, int index, int val); diff --git a/src/screen.c b/src/screen.c index cf16577dc..3b5dbca95 100644 --- a/src/screen.c +++ b/src/screen.c @@ -967,24 +967,24 @@ panel_new (char *panel_name) panel->dir_history = history_get (panel->hist_name); directory_history_add (panel, panel->cwd); - panel->dir.list = (file_entry *) malloc (MIN_FILES * sizeof (file_entry)); - panel->dir.size = MIN_FILES; - panel->active = 0; - panel->filter = 0; - panel->split = 0; - panel->top_file = 0; - panel->selected = 0; - panel->marked = 0; - panel->total = 0; - panel->reverse = 0; - panel->dirty = 1; - panel->searching = 0; - panel->dirs_marked = 0; - panel->is_panelized = 0; - panel->has_dir_sizes = 0; - panel->format = 0; - panel->status_format = 0; - panel->format_modified = 1; + panel->dir.list = (file_entry *) malloc (MIN_FILES * sizeof (file_entry)); + panel->dir.size = MIN_FILES; + panel->active = 0; + panel->filter = 0; + panel->split = 0; + panel->top_file = 0; + panel->selected = 0; + panel->marked = 0; + panel->total = 0; + panel->reverse = 0; + panel->dirty = 1; + panel->searching = 0; + panel->dirs_marked = 0; + panel->is_panelized = 0; + panel->has_dir_sizes = 0; + panel->format = 0; + panel->status_format = 0; + panel->format_modified = 1; panel->panel_name = strdup (panel_name); panel->user_format = strdup (DEFAULT_USER_FORMAT); @@ -1863,6 +1863,19 @@ do_file_mark (WPanel *panel, int idx, int mark) } } +void +do_file_mark_range (WPanel *panel, int r1, int r2) +{ + const int start = min (r1, r2); + const int end = max (r1, r2); + int i, mark; + + mark = !panel->dir.list [start].f.marked; + + for (i = start; i < end; i++) + do_file_mark (panel, i, mark); +} + static void do_mark_file (WPanel *panel, int do_move) { diff --git a/src/slint.c b/src/slint.c index 328bba22d..78d02d0ab 100644 --- a/src/slint.c +++ b/src/slint.c @@ -348,6 +348,7 @@ char *color_terminals [] = { "linux", "xterm-color", "color-xterm", + "dtterm", "xtermc", "ansi", 0 diff --git a/src/textconf.h b/src/textconf.h index a5ed7ffd4..5b46ff959 100644 --- a/src/textconf.h +++ b/src/textconf.h @@ -1,3 +1,4 @@ /* Defines what features are to be includes in the text mode edition */ #define COMPUTE_FORMAT_ALLOCATIONS +#define port_shutdown_extra_fds() diff --git a/src/util.h b/src/util.h index d951e2a8d..ba4a612c5 100644 --- a/src/util.h +++ b/src/util.h @@ -177,6 +177,7 @@ void message_2s (int flags, char *title, char *str1, char *str2); void message_3s (int flags, char *title, char *str1, char *str2, const char *str3); void message_1s1d (int flags, char *title, char *str, int d); void tell_parent (int msg); +int max_open_files (void); #ifdef OS2_NT # define PATH_SEP '\\' diff --git a/src/utilunix.c b/src/utilunix.c index 1df476677..2a2f0003f 100644 --- a/src/utilunix.c +++ b/src/utilunix.c @@ -74,6 +74,26 @@ extern struct mount_entry *mount_list; uid_t current_user_uid; user_in_groups *current_user_gid; +int +max_open_files (void) +{ + static int files; + + if (files) + return files; + +#ifdef HAVE_SYSCONF + files = sysconf (_SC_OPEN_MAX); + if (files != -1) + return files; +#endif +#ifdef OPEN_MAX + return files = OPEN_MAX; +#else + return files = 256; +#endif +} + void init_groups (void) { int i; @@ -436,7 +456,8 @@ int mc_doublepopen (int inhandle, int inlen, pid_t *the_pid, char *command, ...) pid_t pid; #define closepipes() close(pipe0[0]);close(pipe0[1]);close(pipe1[0]);close(pipe1[1]) - +#define is_a_pipe_fd(f) ((pipe0[0] == f) || (pipe0[1] == f) || (pipe1[0] == f) || (pipe1[1] == f)) + pipe (pipe0); pipe (pipe1); ignore.sa_handler = SIG_IGN; sigemptyset (&ignore.sa_mask); @@ -447,10 +468,10 @@ int mc_doublepopen (int inhandle, int inlen, pid_t *the_pid, char *command, ...) sigaction (SIGTSTP, &startup_handler, &save_stop); switch (pid = fork ()) { - case -1: + case -1: closepipes (); return -1; - case 0: + case 0: { sigaction (SIGINT, &save_intr, NULL); sigaction (SIGQUIT, &save_quit, NULL); @@ -458,34 +479,35 @@ int mc_doublepopen (int inhandle, int inlen, pid_t *the_pid, char *command, ...) case -1: closepipes (); exit (1); - case 0: - { + case 0: { #define MAXARGS 16 - int argno; - char *args[MAXARGS]; - va_list ap; - int nulldevice; + int argno; + char *args[MAXARGS]; + va_list ap; + int nulldevice; - nulldevice = open ("/dev/null", O_WRONLY); - close (0); - dup (pipe0 [0]); - close (1); - dup (pipe1 [1]); - close (2); - dup (nulldevice); - close (nulldevice); - closepipes (); - va_start (ap, command); - argno = 0; - while ((args[argno++] = va_arg(ap, char *)) != NULL) - if (argno == (MAXARGS - 1)) { - args[argno] = NULL; - break; - } - va_end (ap); - execvp (command, args); - exit (0); - } + port_shutdown_extra_fds (); + + nulldevice = open ("/dev/null", O_WRONLY); + close (0); + dup (pipe0 [0]); + close (1); + dup (pipe1 [1]); + close (2); + dup (nulldevice); + close (nulldevice); + closepipes (); + va_start (ap, command); + argno = 0; + while ((args[argno++] = va_arg(ap, char *)) != NULL) + if (argno == (MAXARGS - 1)) { + args[argno] = NULL; + break; + } + va_end (ap); + execvp (command, args); + exit (0); + } default: { char buffer [8192]; @@ -508,12 +530,15 @@ int mc_doublepopen (int inhandle, int inlen, pid_t *the_pid, char *command, ...) while (waitpid (pid, &i, 0) < 0) if (errno != EINTR) break; + + port_shutdown_extra_fds (); exit (i); } } - default: - *the_pid = pid; - break; + } + default: + *the_pid = pid; + break; } close (pipe0 [0]); close (pipe0 [1]); diff --git a/src/wtools.c b/src/wtools.c index 3d6f385a1..3ddcfc208 100644 --- a/src/wtools.c +++ b/src/wtools.c @@ -433,14 +433,13 @@ static int quick_callback (struct Dlg_head *h, int id, int Msg) dlg_move (h, 1,((h->cols-strlen (h->data))/2)); addstr (h->data); break; - +#endif case DLG_KEY: if (id == '\n'){ h->ret_value = B_ENTER; dlg_stop (h); break; } -#endif } return 0; } @@ -604,6 +603,17 @@ char *real_input_dialog_help (char *header, char *text, char *help, char *def_te } else { quick_widgets [INPUT_INDEX].value = 0; } + +#ifdef ENABLE_NLS + /* + * An attempt to place buttons symmetrically, based on actual i18n + * length of the string. It looks nicer with i18n (IMO) - alex + */ + quick_widgets [0].relative_x = len/2 + 4; + quick_widgets [1].relative_x = + len/2 - (strlen (_(quick_widgets [1].text)) + 9); + quick_widgets [0].x_divisions = quick_widgets [1].x_divisions = len; +#endif /* ENABLE_NLS */ Quick_input.xlen = len; Quick_input.xpos = -1; diff --git a/tk/tkconf.h b/tk/tkconf.h index 692ff3a59..52d07005b 100644 --- a/tk/tkconf.h +++ b/tk/tkconf.h @@ -14,6 +14,6 @@ #define PORT_HAS_DISPLAY_MINI_INFO 1 #define frontend_run_dlg(x) tkrundlg_event (x) - +#define port_shutdown_extra_fds() /* Other */ #define COMPUTE_FORMAT_ALLOCATIONS diff --git a/xv/xvconf.h b/xv/xvconf.h index dbe797395..823f96b3c 100644 --- a/xv/xvconf.h +++ b/xv/xvconf.h @@ -4,5 +4,5 @@ #define PORT_HAS_FRONTEND_RUN_DLG 1 #define mi_getch() fprintf (stderr, "mi_getch is not implemented\n") #define frontend_run_dlg(x) xvrundlg_event (x) - +#define port_shutdown_extra_fds() #define COMPUTE_FORMAT_ALLOCATIONS