From b57ee0423345924f1f25343aeef67470e35222e6 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Thu, 21 May 1998 04:16:15 +0000 Subject: [PATCH] Changes: - We now provide both url:ALL and file:ALL drag types. This allows applications that are not vfs-aware (all of them right now :-) to work even if the files dragged are from a remote site. If the files are remote, and the target only accepts file:ALL, a temporary file is created (or files, if multiple files are dragged) and the names of the temporary file names are transfered. - Added ABOUT-NLS file :-) Miguel. --- ABOUT-NLS | 225 ++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.in | 2 +- gnome/ChangeLog | 12 +++ gnome/gscreen.c | 111 ++++++++++++++++++++---- gnome/gwidget.c | 2 +- po/mc.pot | 53 +++++++----- 6 files changed, 363 insertions(+), 42 deletions(-) create mode 100644 ABOUT-NLS diff --git a/ABOUT-NLS b/ABOUT-NLS new file mode 100644 index 000000000..dacb8b18b --- /dev/null +++ b/ABOUT-NLS @@ -0,0 +1,225 @@ +Notes on the Free Translation Project +************************************* + + Free software is going international! The Free Translation Project +is a way to get maintainers of free software, translators, and users all +together, so that will gradually become able to speak many languages. +A few packages already provide translations for their messages. + + If you found this `ABOUT-NLS' file inside a distribution, you may +assume that the distributed package does use GNU `gettext' internally, +itself available at your nearest GNU archive site. But you do *not* +need to install GNU `gettext' prior to configuring, installing or using +this package with messages translated. + + Installers will find here some useful hints. These notes also +explain how users should proceed for getting the programs to use the +available translations. They tell how people wanting to contribute and +work at translations should contact the appropriate team. + + When reporting bugs in the `intl/' directory or bugs which may be +related to internationalization, you should tell about the version of +`gettext' which is used. The information can be found in the +`intl/VERSION' file, in internationalized packages. + +One advise in advance +===================== + + If you want to exploit the full power of internationalization, you +should configure it using + + ./configure --with-included-gettext + +to force usage of internationalizing routines provided within this +package, despite the existence of internationalizing capabilities in the +operating system where this package is being installed. So far, only +the `gettext' implementation in the GNU C library version 2 provides as +many features (such as locale alias or message inheritance) as the +implementation here. It is also not possible to offer this additional +functionality on top of a `catgets' implementation. Future versions of +GNU `gettext' will very likely convey even more functionality. So it +might be a good idea to change to GNU `gettext' as soon as possible. + + So you need not provide this option if you are using GNU libc 2 or +you have installed a recent copy of the GNU gettext package with the +included `libintl'. + +INSTALL Matters +=============== + + Some packages are "localizable" when properly installed; the +programs they contain can be made to speak your own native language. +Most such packages use GNU `gettext'. Other packages have their own +ways to internationalization, predating GNU `gettext'. + + By default, this package will be installed to allow translation of +messages. It will automatically detect whether the system provides +usable `catgets' (if using this is selected by the installer) or +`gettext' functions. If neither is available, the GNU `gettext' own +library will be used. This library is wholly contained within this +package, usually in the `intl/' subdirectory, so prior installation of +the GNU `gettext' package is *not* required. Installers may use +special options at configuration time for changing the default +behaviour. The commands: + + ./configure --with-included-gettext + ./configure --with-catgets + ./configure --disable-nls + +will respectively bypass any pre-existing `catgets' or `gettext' to use +the internationalizing routines provided within this package, enable +the use of the `catgets' functions (if found on the locale system), or +else, *totally* disable translation of messages. + + When you already have GNU `gettext' installed on your system and run +configure without an option for your new package, `configure' will +probably detect the previously built and installed `libintl.a' file and +will decide to use this. This might be not what is desirable. You +should use the more recent version of the GNU `gettext' library. I.e. +if the file `intl/VERSION' shows that the library which comes with this +package is more recent, you should use + + ./configure --with-included-gettext + +to prevent auto-detection. + + By default the configuration process will not test for the `catgets' +function and therefore they will not be used. The reasons are already +given above: the emulation on top of `catgets' cannot provide all the +extensions provided by the GNU `gettext' library. If you nevertheless +want to use the `catgets' functions use + + ./configure --with-catgets + +to enable the test for `catgets' (this causes no harm if `catgets' is +not available on your system). If you really select this option we +would like to hear about the reasons because we cannot think of any +good one ourself. + + Internationalized packages have usually many `po/LL.po' files, where +LL gives an ISO 639 two-letter code identifying the language. Unless +translations have been forbidden at `configure' time by using the +`--disable-nls' switch, all available translations are installed +together with the package. However, the environment variable `LINGUAS' +may be set, prior to configuration, to limit the installed set. +`LINGUAS' should then contain a space separated list of two-letter +codes, stating which languages are allowed. + +Using This Package +================== + + As a user, if your language has been installed for this package, you +only have to set the `LANG' environment variable to the appropriate +ISO 639 `LL' two-letter code prior to using the programs in the +package. For example, let's suppose that you speak German. At the +shell prompt, merely execute `setenv LANG de' (in `csh'), +`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash'). This +can be done from your `.login' or `.profile' file, once and for all. + + An operating system might already offer message localization for +many of its programs, while other programs have been installed locally +with the full capabilities of GNU `gettext'. Just using `gettext' +extended syntax for `LANG' would break proper localization of already +available operating system programs. In this case, users should set +both `LANGUAGE' and `LANG' variables in their environment, as programs +using GNU `gettext' give preference to `LANGUAGE'. For example, some +Swedish users would rather read translations in German than English for +when Swedish is not available. This is easily accomplished by setting +`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'. + +Translating Teams +================= + + For the Free Translation Project to be a success, we need interested +people who like their own language and write it well, and who are also +able to synergize with other translators speaking the same language. +Each translation team has its own mailing list, courtesy of Linux +International. You may reach your translation team at the address +`LL@li.org', replacing LL by the two-letter ISO 639 code for your +language. Language codes are *not* the same as the country codes given +in ISO 3166. The following translation teams exist, as of August 1997: + + Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en', + Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian + `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja', + Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish + `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es', + Swedish `sv', and Turkish `tr'. + +For example, you may reach the Chinese translation team by writing to +`zh@li.org'. + + If you'd like to volunteer to *work* at translating messages, you +should become a member of the translating team for your own language. +The subscribing address is *not* the same as the list itself, it has +`-request' appended. For example, speakers of Swedish can send a +message to `sv-request@li.org', having this message body: + + subscribe + + Keep in mind that team members are expected to participate +*actively* in translations, or at solving translational difficulties, +rather than merely lurking around. If your team does not exist yet and +you want to start one, or if you are unsure about what to do or how to +get started, please write to `translation@iro.umontreal.ca' to reach the +coordinator for all translator teams. + + The English team is special. It works at improving and uniformizing +the terminology in use. Proven linguistic skill are praised more than +programming skill, here. + +Available Packages +================== + + Languages are not equally supported in all packages. The following +matrix shows the current state of internationalization, as of August +1997. The matrix shows, in regard of each package, for which languages +PO files have been submitted to translation coordination. + + Ready PO files cs da de en es fi fr it ja ko nl no pl pt sl sv + .-------------------------------------------------. + bash | [] [] [] | 3 + bison | [] [] [] | 3 + clisp | [] [] [] [] | 4 + cpio | [] [] [] [] [] | 5 + diffutils | [] [] [] [] [] | 5 + enscript | [] [] [] [] [] [] | 6 + fileutils | [] [] [] [] [] [] [] [] [] [] | 10 + findutils | [] [] [] [] [] [] [] [] | 8 + flex | [] [] [] [] | 4 + gcal | [] [] [] [] [] | 5 + gettext | [] [] [] [] [] [] [] [] [] [] | 11 + grep | [] [] [] [] [] [] [] [] [] | 9 + hello | [] [] [] [] [] [] [] [] [] [] | 10 + id-utils | [] [] [] | 3 + indent | [] [] [] [] | 4 + libc | [] [] [] [] [] [] [] | 7 + m4 | [] [] [] [] [] | 5 + make | [] [] [] [] [] [] | 6 + music | [] [] | 2 + ptx | [] [] [] [] [] [] [] [] | 8 + recode | [] [] [] [] [] [] [] [] [] | 9 + sh-utils | [] [] [] [] [] [] [] | 7 + sharutils | [] [] [] [] [] | 5 + tar | [] [] [] [] [] [] [] [] [] [] | 10 + texinfo | [] | 1 + textutils | [] [] [] [] [] [] [] [] [] | 9 + wdiff | [] [] [] [] [] [] [] [] | 8 + `-------------------------------------------------' + 16 languages cs da de en es fi fr it ja ko nl no pl pt sl sv + 27 packages 3 2 24 1 17 1 26 2 1 11 20 9 19 7 7 17 167 + + Some counters in the preceding matrix are higher than the number of +visible blocks let us expect. This is because a few extra PO files are +used for implementing regional variants of languages, or language +dialects. + + For a PO file in the matrix above to be effective, the package to +which it applies should also have been internationalized and +distributed as such by its maintainer. There might be an observable +lag between the mere existence a PO file and its wide availability in a +distribution. + + If August 1997 seems to be old, you may fetch a more recent copy of +this `ABOUT-NLS' file on most GNU archive sites. + diff --git a/Makefile.in b/Makefile.in index 9485e4d0e..8a8b4ed87 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,7 @@ DISTMAIN = configure configure.in NEWS README INSTALL INSTALL.FAST \ Makefile.in FAQ COPYING create_vcs install-sh \ config.h.in mc-aclocal.m4 aclocal.m4 acconfig.h VERSION mcfn_install.in \ Make.common.in README.NT mc.spec Specfile README.QNX \ - README.OS2 VERSION.in NLS mkinstalldirs autogen.sh + README.OS2 VERSION.in NLS mkinstalldirs autogen.sh ABOUT-NLS all: @for dir in @INTLSUB@ ${codedirs} @POSUB@; do \ diff --git a/gnome/ChangeLog b/gnome/ChangeLog index 18588148f..d68641d8c 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,3 +1,15 @@ +1998-05-20 Miguel de Icaza + + * gscreen.c (panel_drag_request): All of the drag_request code is + now shared by both the Icon View and the Listing view; + New drag request type: file:ALL. If the user is looking at a + remote site, and the target application does not have VFS support + it should not list url:ALL but file:ALL as the accepted drop + type. + + This will make copies of the remote files and pass the files to + the application. + 1998-05-20 Federico Mena Quintero * gtrans.c (set_window_text): Pass new justification parameter to diff --git a/gnome/gscreen.c b/gnome/gscreen.c index 04efe9dea..e4054aea1 100644 --- a/gnome/gscreen.c +++ b/gnome/gscreen.c @@ -58,7 +58,7 @@ static GdkImlibImage *icon_view_regular; static GdkImlibImage *icon_view_core; static GdkImlibImage *icon_view_sock; -static char *drag_types [] = { "text/plain", "url:ALL" }; +static char *drag_types [] = { "text/plain", "file:ALL", "url:ALL" }; static char *drop_types [] = { "url:ALL" }; #define ELEMENTS(x) (sizeof (x) / sizeof (x[0])) @@ -887,20 +887,96 @@ panel_build_selected_file_list (WPanel *panel, int *file_list_len) return fullname; } } +/* + * Handler for text/plain and url:ALL drag types + * + * Sets the drag information to the filenames selected on the panel + */ +static void +panel_transfer_file_names (GtkWidget *widget, GdkEventDragRequest *event, WPanel *panel, int *len, char **data) +{ + *data = panel_build_selected_file_list (panel, len); +} +/* + * Handler for file:ALL type (target application only understands local pathnames) + * + * Makes local copies of the files and transfers the filenames. + */ +static void +panel_make_local_copies_and_transfer (GtkWidget *widget, GdkEventDragRequest *event, WPanel *panel, + int *len, char **data) +{ + char *filename, *localname; + int i; + + if (panel->marked){ + char **local_names_array, *p; + int j, total_len; + + /* First assemble all of the filenames */ + local_names_array = malloc (sizeof (char *) * panel->marked); + total_len = j = 0; + for (i = 0; i < panel->count; i++){ + char *filename; + + if (!panel->dir.list [i].f.marked) + continue; + + filename = concat_dir_and_file (panel->cwd, panel->dir.list [i].fname); + localname = mc_getlocalcopy (filename); + total_len += strlen (localname) + 1; + local_names_array [j++] = localname; + free (filename); + } + *len = total_len; + *data = p = malloc (total_len); + for (i = 0; i < j; i++){ + strcpy (p, local_names_array [i]); + g_free (local_names_array [i]); + p += strlen (p) + 1; + } + } else { + filename = concat_dir_and_file (panel->cwd, panel->dir.list [i].fname); + localname = mc_getlocalcopy (filename); + free (filename); + *data = localname; + *len = strlen (localname + 1); + } +} + +static void +panel_drag_request (GtkWidget *widget, GdkEventDragRequest *event, WPanel *panel, int *len, char **data) +{ + *len = 0; + *data = 0; + + if ((strcmp (event->data_type, "text/plain") == 0) || + (strcmp (event->data_type, "url:ALL") == 0)){ + panel_transfer_file_names (widget, event, panel, len, data); + } else if (strcmp (event->data_type, "file:ALL") == 0){ + if (vfs_file_is_local (panel->cwd)) + panel_transfer_file_names (widget, event, panel, len, data); + else + panel_make_local_copies_and_transfer (widget, event, panel, len, data); + } +} + +/* + * Listing mode: drag request handler + */ static void panel_clist_drag_request (GtkWidget *widget, GdkEventDragRequest *event, WPanel *panel) { - void *data; - int len; GdkWindowPrivate *clist_window = (GdkWindowPrivate *) (GTK_WIDGET (widget)->window); GdkWindowPrivate *clist_areaw = (GdkWindowPrivate *) (GTK_CLIST (widget)->clist_window); + char *data; + int len; + panel_drag_request (widget, event, panel, &len, &data); - if ((strcmp (event->data_type, "text/plain") == 0) || - (strcmp (event->data_type, "url:ALL") == 0)){ - data = panel_build_selected_file_list (panel, &len); - + /* Now transfer the DnD information */ + if (len && data){ if (clist_window->dnd_drag_accepted) gdk_window_dnd_data_set ((GdkWindow *)clist_window, (GdkEvent *) event, data, len); else @@ -1158,21 +1234,22 @@ panel_icon_list_artificial_drag_start (GtkObject *obj, GdkEventMotion *event) artificial_drag_start (ilist->ilist_window, event->x, event->y); } +/* + * Icon view drag request handler + */ static void panel_icon_list_drag_request (GtkWidget *widget, GdkEventDragRequest *event, WPanel *panel) { GnomeIconList *ilist = GNOME_ICON_LIST (widget); - void *data; + char *data; int len; - - if (!((strcmp (event->data_type, "text/plain") == 0) || - (strcmp (event->data_type, "url:ALL") == 0))) - return; - - data = panel_build_selected_file_list (panel, &len); - - gdk_window_dnd_data_set (ilist->ilist_window, (GdkEvent *) event, data, len); - free (data); + + panel_drag_request (widget, event, panel, &len, &data); + + if (len && data){ + gdk_window_dnd_data_set (ilist->ilist_window, (GdkEvent *) event, data, len); + free (data); + } } static void diff --git a/gnome/gwidget.c b/gnome/gwidget.c index b25c417e5..cb096311d 100644 --- a/gnome/gwidget.c +++ b/gnome/gwidget.c @@ -323,7 +323,7 @@ x_update_input (WInput *in) if (draw){ gtk_widget_draw (GTK_WIDGET (gnome_entry), NULL); gtk_entry_adjust_scroll (GTK_ENTRY (entry)); - gtk_widget_queue_draw (entry); + gtk_widget_queue_draw (GTK_WIDGET (entry)); } } diff --git a/po/mc.pot b/po/mc.pot index 0d1d1a1b9..f58b63b85 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Date: 1998-05-19 21:39:56-0500\n" +"Date: 1998-05-20 14:56:59-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" @@ -3121,7 +3121,7 @@ msgstr "" msgid "External panelize" msgstr "" -#: src/panelize.c:208 +#: gnome/gprop.c:109 src/panelize.c:208 msgid "Command" msgstr "" @@ -3189,11 +3189,11 @@ msgstr "" msgid "UID" msgstr "" -#: gnome/gprop.c:335 src/screen.c:433 +#: gnome/gprop.c:390 src/screen.c:433 msgid "Owner" msgstr "" -#: gnome/gprop.c:225 gnome/gprop.c:350 src/screen.c:434 +#: gnome/gprop.c:280 gnome/gprop.c:405 src/screen.c:434 msgid "Group" msgstr "" @@ -4010,76 +4010,83 @@ msgstr "" msgid "Desktop" msgstr "" -#: gnome/gprop.c:54 gnome/gprop.c:71 +#: gnome/gprop.c:58 gnome/gprop.c:75 msgid "Filename" msgstr "" -#: gnome/gprop.c:63 +#: gnome/gprop.c:67 msgid "Full name: " msgstr "" -#: gnome/gprop.c:193 +#: gnome/gprop.c:119 +msgid "Command:" +msgstr "" + +#: gnome/gprop.c:129 +msgid "Use terminal" +msgstr "" + +#: gnome/gprop.c:248 msgid "File mode (permissions)" msgstr "" -#: gnome/gprop.c:204 +#: gnome/gprop.c:259 msgid "Current mode: " msgstr "" -#. Headings -#: gnome/gprop.c:217 +#: gnome/gprop.c:272 msgid "Read" msgstr "" -#: gnome/gprop.c:218 +#: gnome/gprop.c:273 msgid "Write" msgstr "" -#: gnome/gprop.c:219 +#: gnome/gprop.c:274 msgid "Exec" msgstr "" -#: gnome/gprop.c:220 +#: gnome/gprop.c:275 msgid "Special" msgstr "" -#: gnome/gprop.c:224 +#: gnome/gprop.c:279 msgid "User" msgstr "" -#: gnome/gprop.c:226 +#: gnome/gprop.c:281 msgid "Other" msgstr "" -#: gnome/gprop.c:230 +#: gnome/gprop.c:285 msgid "Set UID" msgstr "" -#: gnome/gprop.c:231 +#: gnome/gprop.c:286 msgid "Set GID" msgstr "" -#: gnome/gprop.c:232 +#: gnome/gprop.c:287 msgid "Sticky" msgstr "" -#: gnome/gprop.c:266 gnome/gprop.c:292 +#: gnome/gprop.c:321 gnome/gprop.c:347 msgid "" msgstr "" -#: gnome/gprop.c:440 +#: gnome/gprop.c:495 msgid "General" msgstr "" -#: gnome/gprop.c:451 +#: gnome/gprop.c:506 msgid "Title" msgstr "" -#: gnome/gprop.c:467 +#: gnome/gprop.c:522 msgid "Icon" msgstr "" -#: gnome/gprop.c:481 +#: gnome/gprop.c:536 msgid "Select icon" msgstr ""