From e0c156f31fb5b15b91e6de90f57f6227a55afc88 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Mon, 8 Feb 1999 17:39:31 +0000 Subject: [PATCH] Make use of the new gnome-package icon --- gnome/gutil.c | 4 +- gnome/mc.keys.in.in | 12 +++- icons/Makefile.in | 2 +- new_icons/Makefile.in | 1 + new_icons/gnome-package.png | Bin 0 -> 3099 bytes po/mc.pot | 123 ++++++++++++++++++------------------ 6 files changed, 76 insertions(+), 66 deletions(-) create mode 100644 new_icons/gnome-package.png diff --git a/gnome/gutil.c b/gnome/gutil.c index b17ab3e5e..96aea05ec 100644 --- a/gnome/gutil.c +++ b/gnome/gutil.c @@ -84,8 +84,10 @@ int my_system_get_child_pid (int flags, const char *shell, const char *command, _exit (127); /* Exec error */ } else { int status; + + if (flags & (EXECUTE_WAIT|EXECUTE_TEMPFILE)) + waitpid (*pid, &status, 0); - waitpid (*pid, &status, 0); if (flags & EXECUTE_TEMPFILE) unlink (command); } diff --git a/gnome/mc.keys.in.in b/gnome/mc.keys.in.in index fd0119d4f..5cfd95cee 100644 --- a/gnome/mc.keys.in.in +++ b/gnome/mc.keys.in.in @@ -11,6 +11,12 @@ text/C++: application/x-compressed-tar fm-open=%cd %p#utar fm-view=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf - + icon-filename=@icondir@/gnome-package.png + +application/x-bzip-compressed-tar + fm-open=%cd %p#utar + fm-view=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf - + icon-filename=@icondir@/gnome-package.png application/x-bzip: icon-filename=@icondir@/compressed.xpm @@ -21,6 +27,7 @@ application/x-tar: fm-open=%cd %p#utar fm-view=%view{ascii} tar tvvf %f open.extract.Extract=tar xf %f + icon-filename=@icondir@/gnome-package.png application/x-rpm: fm-open=%cd %p#rpm @@ -34,7 +41,7 @@ application/x-deb: icon-filename=@icondir@/gnome-pack-deb.png application/zip: - icon-filename=@icondir@/zip.xpm + icon-filename=@icondir@/gnome-package.png fm-open=%cd %p#uzip fm-view=%view{ascii} unzip -v %f open.extract.Extract=unzip %f @@ -44,18 +51,21 @@ application/x-zoo: fm-open=%cd %p#uzoo fm-view=%view{ascii} zoo l %f open.extract.Extract=zoo x %f '*' + icon-filename=@icondir@/gnome-package.png application/x-lha: fm-open=%cd %p#ulha fm-view=%view{ascii} lharc l %f open.extract.Extract=lharc x %f '*' open.extractf.Extract (with flags)=I=%{Enter any LHarc flags:}; if test -n "$I"; then lharc x $I %f; fi + icon-filename=@icondir@/gnome-package.png application/x-arj: fm-open=%cd %p#uarj fm-view=%view{ascii} unarj l %f open.extract.Extract=unarj x %f '*' open.extractf.Extract (with flags)=I=%{Enter any Unarj flags:}; if test -n "$I"; then unarj x $I %f; fi + icon-filename=@icondir@/gnome-package.png application/x-unix-archive: fm-open=%cd %p#uar diff --git a/icons/Makefile.in b/icons/Makefile.in index 97a1c5a1b..eb747b135 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -35,7 +35,7 @@ ALLICONS = a.xpm application.xpm binary.xpm bitmap.xpm blackhole.xpm \ # DECENTICONS = \ c.xpm h.xpm calendar.xpm compressed.xpm html.xpm o.xpm \ - sound.xpm makefile.xpm word.xpm zip.xpm tex.xpm cc.xpm man.xpm \ + sound.xpm makefile.xpm word.xpm tex.xpm cc.xpm man.xpm \ postscript.xpm tex.xpm text.xpm trash.xpm all: diff --git a/new_icons/Makefile.in b/new_icons/Makefile.in index 3a1469eba..915401d84 100644 --- a/new_icons/Makefile.in +++ b/new_icons/Makefile.in @@ -42,6 +42,7 @@ ALLICONS = \ gnome-application-x-c-header.png \ gnome-application-x-c-source.png \ gnome-application-x-cc-source.png \ + gnome-package.png \ gnome-core.png all: diff --git a/new_icons/gnome-package.png b/new_icons/gnome-package.png new file mode 100644 index 0000000000000000000000000000000000000000..704139bbcb2da497da74f6cf9ef2472b8032c5e4 GIT binary patch literal 3099 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 pf!eF!-_QU6002ovPDHLkV1nca_Q?PM literal 0 HcmV?d00001 diff --git a/po/mc.pot b/po/mc.pot index 26bbf3dec..009bb7645 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-02-05 17:17-0600\n" +"POT-Creation-Date: 1999-02-07 09:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,20 +148,20 @@ msgstr "" msgid "Command: " msgstr "" -#: gnome/gcmd.c:557 +#: gnome/gcmd.c:574 msgid "Set Filter" msgstr "" -#: gnome/gcmd.c:562 gnome/gcmd.c:603 gnome/gcmd.c:608 gnome/gcmd.c:612 -#: gnome/gscreen.c:2489 +#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629 +#: gnome/gscreen.c:2484 msgid "Show all files" msgstr "" -#: gnome/gcmd.c:569 +#: gnome/gcmd.c:586 msgid "." msgstr "" -#: gnome/gcmd.c:585 +#: gnome/gcmd.c:602 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -169,37 +169,37 @@ msgid "" "*.gif will show just gif images" msgstr "" -#: gnome/gcmd.c:587 +#: gnome/gcmd.c:604 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:644 gnome/gpopup.c:49 +#: gnome/gcmd.c:661 gnome/gpopup.c:49 msgid " Open with..." msgstr "" -#: gnome/gcmd.c:645 gnome/gpopup.c:50 +#: gnome/gcmd.c:662 gnome/gpopup.c:50 msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:347 gnome/gdesktop.c:1500 +#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553 msgid "Warning" msgstr "" -#: gnome/gdesktop.c:348 +#: gnome/gdesktop.c:351 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1466 +#: gnome/gdesktop.c:1519 msgid "Trashcan" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1496 +#: gnome/gdesktop.c:1549 msgid "Home directory" msgstr "" -#: gnome/gdesktop.c:1501 +#: gnome/gdesktop.c:1554 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" @@ -342,35 +342,35 @@ msgstr "" msgid " Done." msgstr "" -#: gnome/gdnd.c:50 +#: gnome/gdnd.c:51 msgid "_Move here" msgstr "" -#: gnome/gdnd.c:51 +#: gnome/gdnd.c:52 msgid "_Copy here" msgstr "" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Link here" msgstr "" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "Cancel drag" msgstr "" #. FIXME: this error message sucks -#: gnome/gdnd.c:190 +#: gnome/gdnd.c:191 #, c-format msgid "" "Could not stat %s\n" "%s" msgstr "" -#: gnome/gicon.c:86 gnome/gtools.c:50 +#: gnome/gicon.c:83 gnome/gtools.c:50 msgid "Error" msgstr "" -#: gnome/gicon.c:86 +#: gnome/gicon.c:83 msgid "Default set of icons not found, check your installation" msgstr "" @@ -594,52 +594,52 @@ msgstr "" msgid "File/New/Directory..." msgstr "" -#: gnome/gpopup.c:215 gnome/gpopup.c:216 +#: gnome/gpopup.c:222 gnome/gpopup.c:223 msgid "Properties" msgstr "" -#: gnome/gpopup.c:218 gnome/gpopup.c:219 +#: gnome/gpopup.c:225 gnome/gpopup.c:226 msgid "Open" msgstr "" -#: gnome/gpopup.c:220 +#: gnome/gpopup.c:227 msgid "Open with" msgstr "" -#: gnome/gpopup.c:221 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316 msgid "View" msgstr "" -#: gnome/gpopup.c:222 +#: gnome/gpopup.c:229 msgid "View unfiltered" msgstr "" -#: gnome/gpopup.c:223 gtkedit/gtkedit.c:1366 src/screen.c:2287 +#: gnome/gpopup.c:230 gtkedit/gtkedit.c:1366 src/screen.c:2287 #: src/screen.c:2317 src/view.c:1968 msgid "Edit" msgstr "" -#: gnome/gpopup.c:225 +#: gnome/gpopup.c:232 msgid "Link..." msgstr "" -#: gnome/gpopup.c:226 +#: gnome/gpopup.c:233 msgid "Symlink..." msgstr "" -#: gnome/gpopup.c:227 +#: gnome/gpopup.c:234 msgid "Edit symlink..." msgstr "" -#: gnome/gpopup.c:234 gnome/gpopup.c:245 +#: gnome/gpopup.c:241 gnome/gpopup.c:252 msgid "Move/rename..." msgstr "" -#: gnome/gpopup.c:235 gnome/gpopup.c:246 +#: gnome/gpopup.c:242 gnome/gpopup.c:253 msgid "Copy..." msgstr "" -#: gnome/gpopup.c:236 gnome/gpopup.c:248 gtkedit/editwidget.c:1067 +#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 #: src/screen.c:2291 src/screen.c:2321 msgid "Delete" msgstr "" @@ -972,7 +972,7 @@ msgstr "" msgid "Go to your home directory" msgstr "" -#: gnome/gscreen.c:2438 +#: gnome/gscreen.c:2429 msgid "Location:" msgstr "" @@ -2572,115 +2572,112 @@ msgid "" msgstr "" #: src/cmd.c:967 -msgid "" -"Type `exit' to return to the Midnight Commander\n" -"\r\n" -"\r" +msgid "Type `exit' to return to the Midnight Commander" msgstr "" -#: src/cmd.c:1020 +#: src/cmd.c:1022 #, c-format msgid "" " Couldn't stat %s \n" " %s " msgstr "" -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1031 src/cmd.c:1033 msgid " Link " msgstr "" -#: src/cmd.c:1030 src/cmd.c:1135 src/file.c:1621 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621 msgid " to:" msgstr "" -#: src/cmd.c:1041 +#: src/cmd.c:1043 #, c-format msgid " link: %s " msgstr "" -#: src/cmd.c:1074 +#: src/cmd.c:1076 #, c-format msgid " symlink: %s " msgstr "" -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " Symlink " msgstr "" -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " points to:" msgstr "" -#: src/cmd.c:1105 +#: src/cmd.c:1107 msgid " Edit symlink " msgstr "" -#: src/cmd.c:1111 +#: src/cmd.c:1113 #, c-format msgid " edit symlink: %s " msgstr "" -#: src/cmd.c:1135 +#: src/cmd.c:1137 msgid " Link symbolically " msgstr "" -#: src/cmd.c:1136 +#: src/cmd.c:1138 msgid " Relative symlink " msgstr "" -#: src/cmd.c:1147 +#: src/cmd.c:1149 #, c-format msgid " relative symlink: %s " msgstr "" -#: src/cmd.c:1250 +#: src/cmd.c:1252 msgid " Enter machine name (F1 for details): " msgstr "" -#: src/cmd.c:1274 +#: src/cmd.c:1276 #, c-format msgid " Could not chdir to %s " msgstr "" -#: src/cmd.c:1281 +#: src/cmd.c:1283 msgid " Link to a remote machine " msgstr "" -#: src/cmd.c:1287 +#: src/cmd.c:1289 msgid " FTP to machine " msgstr "" -#: src/cmd.c:1297 +#: src/cmd.c:1299 msgid " Socket source routing setup " msgstr "" -#: src/cmd.c:1298 +#: src/cmd.c:1300 msgid " Enter host name to use as a source routing hop: " msgstr "" -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Host name " msgstr "" -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Error while looking up IP address " msgstr "" -#: src/cmd.c:1316 +#: src/cmd.c:1318 msgid " Undelete files on an ext2 file system " msgstr "" -#: src/cmd.c:1317 +#: src/cmd.c:1319 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" msgstr "" -#: src/cmd.c:1367 +#: src/cmd.c:1369 msgid " Setup saved to ~/" msgstr "" -#: src/cmd.c:1372 +#: src/cmd.c:1374 msgid " Setup " msgstr "" @@ -4999,7 +4996,7 @@ msgstr "" msgid "Inconsistent tar archive" msgstr "" -#: vfs/tar.c:412 +#: vfs/tar.c:411 #, c-format msgid "" "Hmm,...\n"