1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-07-10 12:46:36 +02:00

Compare commits

..

183 Commits

Author SHA1 Message Date
Christophe CURIS 6afa419b01 Website: Create script to update the list of man pages in the index
It is a good idea to have an Index web page with the list of the man pages
available, but there is a risk to have it outdated, so there is a script to
take care of this for us.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-06-20 22:28:19 +01:00
Christophe CURIS a2bf67f54c Website: Create script to generate the HTML version of the man pages
When running the 'make website' command, it will call groff to convert the
man pages into HTML and post-process them to get them in the style of the
site, then place them in the Website Git Repository.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-06-20 22:28:19 +01:00
Christophe CURIS 351e05dca9 Configure: Add a maintainer option to prepare generation of HTML for the website
When the new configure option '--with-web-repo' is used, the new target
'make website' becomes available and will generate HTML pages to be placed
in the Homepage Repository.

This patch does not generate any content yet but it prepares the skeleton
to handle everything.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-06-05 23:54:15 +01:00
Christophe CURIS ae78e88eef Repair compilation when Pango support is enabled
It seems there have been changes in the way Pango's header files are
installed in recent versions, probably to allow having multiple versions
together on a system.

Because one public header from WINGs has to include Pango's header, we must
include the search path provided by Pango into our WINGs search path that
are returned by pkg-config (the .pc file).

They are then also added to WindowMaker and WPrefs which use the header but
can't rely on the path from the .pc file which has not been installed yet.

Reported-by: Carlos R. Mafra <crmafra@gmail.com>
Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-29 23:55:10 +01:00
Christophe CURIS f049635fa5 Configure: Rewrite the detection for Pango library
Make use of the standard macro for PKG_CONFIG; the default behaviour is now
to use Pango if present, instead of requiring explicit user request, yet
still not making it mandatory.

The detection code was moved to a macro to keep the configure.ac script
(relatively) small, and consistent with what is done for most other libs.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-29 20:15:09 +01:00
Doug Torrance 4221e30bd2 Convert WPrefs.app/po/README from iso-8859-1 to utf-8 2021-05-25 22:12:23 -04:00
Doug Torrance 71558f4ce3 Convert WindowMaker/README from iso-8859-1 to utf-8 2021-05-25 22:10:15 -04:00
Doug Torrance 4b61081353 Convert po/README from iso-8859-1 to utf-8 2021-05-25 22:05:30 -04:00
Christophe CURIS 4138c57631 Configure: Rewrite the macro for checking Xft2 version
The original macro used over-complicated things, like:
 - useless uses of 'eval',
 - split AC_CACHE_CHECK construct (AC_MSG_CHECKING + AC_CACHE_VAL +
AC_MSG_RESULT)
 - dubious variable name (CPPFLAGS_old, which is not the "old" value but
the "saved" value for a temporary change)
 - variable CPPFLAGS was changed at wrong hierarchy level
 - calculate the integer value for XFT_VERSION in m4 instead generating
shell commands that had to do it on user side
 - indentation was missing

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-22 20:00:41 +01:00
Christophe CURIS 0bbb122b94 Configure: Rewrite detection for Xft2 to properly use PKG_CONFIG macro
The goal is to use standard macros, which make code easier to maintain
(smaller, more consistent). We still keep the legacy "xfg-config" method
because we don't want to drop support for old hardware/software.

A side effect is the change in the name of the variables for the makefile,
but this goes in favour of consistency.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-22 20:00:41 +01:00
Christophe CURIS 0e274dc979 WRaster: Fix incorrect use of macro USE_XSHM in installed header
The header "wraster.h" needs different behaviour depending on whether the
support for X Shared Memory extension was enabled or not; but the related
macro USE_XSHM is defined by WindowMaker's configure. After this header
have been installed, the macro is no more useable.

This patch makes the "wraster.h" a generated file, so it will be different
depending on USE_XSHM, but will not make use of the macro itself.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:50:43 +01:00
Christophe CURIS 4dfb0dd059 WRaster: Create french translation to have at least one
The translation check would complain because it does not find any '.po'
files, so I am providing one translation.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS bcb53700d6 WRaster: Improve error messages to provide useful information to user
The original error messages tended to be a bit sparse, now they try to be
a little bit more helpful, and translatable in user's language.

In xutil.c:122, took opportunity fix a problem because calling 'perror'
after other function which are likely to have changed the errno is likely
to provide a wrong error string.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS e5f7ef23a6 WRaster: Made a few messages translatable
Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 70f89fd9c5 WRaster: Add initialisation for locale support
Because the library does not have an initialisation function, we need to
rely on an automatic called-on-load mechanism, which is provided through
a compiler attribute 'constructor'.

However, as the project aims to still compile on old hard/software, we
include a check in 'configure' to ensure it works, and if not use the
legacy solution.

Note: Because we introduce a new DEFINE, the 'config.h.in' needs to be
regenerated, otherwise you may get a compilation error in wrlib. This is
done by re-running './autogen.sh'

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 19202fd2db WRaster: Create header for i18n helper functions
This patch is just adding a single header, but because it also modifies
all the C files to add the #include, it was made as a patch on its own to
ease review.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS aadd694a6b WRaster: Create structure to make the library translatable
The library did not propose the mechanisms to be translated, this patch is
creating the structure in autoconf/automake and the translation directory
so its messages can be also translated.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS fbec3a728f wmaker: Do not allocate memory for a temporary string for the Window Shortcut menu
When creating the list of possible shortcut for windows to populate the
window menu, a temporary buffer was allocated to hold that string.

As this allocation participates to memory fragmentation, this patch makes
use of storage on the stack instead which is also faster.

Took opportunity to include the shortcut number (%i) in the string to be
translated, because it is unlikely that adding that number at the end of
the string is right in all languages. Updated french translation because
it is the only one I am confident with.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 944bb49997 wrlib: Add compiler attributes to the API functions
With proper attributes, the compiler is able to do some extra checks on
user side to make code safer and/or better optimised.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 0ac6827a9b wmmenugen: Fix memory leaks when parsing menu in wmconfig format
As reported by Coverity (CID #50181, #50182 and #50183) the strings allocated by parse_wmconfig_line were not freed after use.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS f030ab7664 wmmenugen: Fix memory leaks in XDG menu generation when getting locale-dependant name
As reported by Coverity as CID #50142, #50143, #50144 and #50145, all the
strings allocated by 'parse_locale' were never freed.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 2a8fc1df9a wmmenugen: Fix memory leak when parsing names for menus in XDG format
As reported by Coverity (CID #50146), if the function getLocalizedStringValue
returns without matching the entry, the storage for the entry's locale was
leaked.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 296456f361 wmmenugen: Fix memory leak when parsing categories in an XDG menu
Reported by Coverity (CID #50147)

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS f2cd2c9f03 WRaster: Properly set file's mtime in the cache when loading an image
The library maintains a cache to not reload a file that was previously
loaded. In order to still reload an image in case its file would have
changed in the meantime, the cache saves the file's modification time.

As reported by Coverity (CID #331576) the 'stat' function was not on the
execution path the first time an image is loaded, which means the cache
information is populated with junk data. This could lead to an image not
being reloaded for example.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS d125f80dee WRaster: Stop parsing number in PPM file if invalid syntax is found
When the function 'pm_getuint' is reading a number, it prints an error
message if it encounters a non-digit number, yet it still enters the
processing loop which will cause an invalid number to be calculated.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 8e47ca8e62 WPrefs: Add check for invalid OPEN_MENU/EXEC in PL-Menu to avoid potential crash
As reported by Coverity (CID #50047, #50048), if the proplist is incorrect
and has an OPEN_MENU or (SH)EXEC command without its arguments, we did
dereference a NULL pointer.
Now we simply return the NULL value, appropriate to have the caller of the
function issue a message.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 29cf48b934 WPrefs: Provide fall-back colour in the case of colour name not found
As reported by Coverity (CID #331571), we did not check the return value of
the call to XParseColor. If the function is given a colour name that it
does not know, we would return an uninitialised colour.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 816fa00625 WUtil: Make sure wmalloc/wrealloc won't fail because of the abort handler
As pointed by Coverity (#50074), despite the expected behaviour that
'wmalloc' should never return NULL, it may still happen if an abort handler
set by user (with wsetabort) does not call exit() as expected. In such
case we make sure the NULL pointer dereference does not happen inside
WINGs code because we assume it is a known user choice.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 6ebec0bb9f WUtil: Fix non-closed file handle in WMWritePropListToFile
As reported by Coverity (CID #50129), in case of error during the write
operation, the failure path does include close of the file handle. In
addition to the resource leak, this may be a problem if the application
were to make a second try on the same file.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 7c50721747 WPrefs: Fix memory leak in Expert tab
As reported by Coverity (CID #331553), we leak the allocated string
returned by 'WMGetTextFieldText'

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 4559cbbccc WPrefs: Fix memory leak in the Menu tab
As reported by Coverity (CID #331559), the call to 'wfindfile' replaces
the value for variable 'path' but we did not free its previous content.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS e828e1c074 Fix use-after-free error in wIconStore reported by Coverity
The function always returns the filename where the icon have been saved,
but in the case where the save operation failed we would free the memory
for that file name, yet still return this pointer like if it were valid.

Took opportunity to remove redundant free(path) which is done a couple
lines later, because redundancy is a source of problem for code
maintenance.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 97a9300aa4 Fix memory leak reported by Coverity
As reported in CID #331577, we re-use the variable 'tmp' without freeing
the previously allocated pointer.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS fd56152202 WPrefs: fix memory leak and potential buffer overflow
Coverity pointed that the "text" returned by WMGetTextFieldText was never
freed (CID #331578, because WMSetTextFieldText does its own copy, it does
not take the pointer as-is).

By looking at the code, there is also a potential buffer overflow because
the buffer alloc'd for "value" is sized for the exact number of digits
before increase, but the +delta can make the number use more digits so we
may write past the end of original buffer.
We write to a stack-allocated one, so it does not cost anything and does
not participates to memory fragmentation.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 58862300f9 WINGs: Fix invalid handling of Blue in the HSV conversion in ColorPanel widget
Because of a minor bug, when pure blue was chosen in RGB in the ColorPanel,
the conversion to HSV would mistreat it as white and resets its hue,
leading to possible user annoyance.
2021-05-18 17:49:17 +01:00
Christophe CURIS 1612d2f345 WINGs: increase temporary buffer to silence a gcc warning
The code limits the integer number to 0..359 so we need 4 bytes to store
that, but that require too complex flow processing for compilers to deduce
it.

It does not cost to increase the temporary buffer to the minimum size
requested by GCC, so let's do this, because spurious warnings can
potentially divert us from more important ones.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 920c6d16b1 wraster: Remove duplicate code
Duplicating things makes maintenance error-prone, which is not a good idea.
In case the abort procedure would need an update, it would be easy then
to forget some place, leading to leaks, if not worse.

Beside, goto is not as bad as academics would like people to believe, when
it is used correctly (and this case is one of them).
The name for the label was given an explicit meaning to make code easy to
understand.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS 8aecba27d1 Fix usage of float constant reported by gcc
Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Christophe CURIS fc63d72032 WINGs: Fix incorrect use of macro USE_PANGO in installed header
The header "WINGsP.h" needs different behaviour depending on whether the
support for Pango was enabled or not. But the related macro USE_PANGO is
defined by WindowMaker's configure, and after this header have been
installed the macro is no more valid.

This patch makes the "WINGsP.h" a generated file, so it will be different
depending on USE_PANGO, but will not make use of the macro itself.

As a side effect of being now generated, the include paths in the makefile
have been updated to include build-dir too, because for users doing an
out-of-tree build the generated file (that is used during compilation) is
placed in the build-dir.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2021-05-18 17:49:17 +01:00
Xander eb2a9d97a2 Make dock dots scalable
This patch makes the three dots in the dock change their size when bigger icon size is used.
The logic here is such that the dots are scaled only when a certain icon size is reached;
for instance, the dots will remain unchanged if icon size is less than 128x128 px, and will
be twice as big if it's set to a value from 128x128 to 184x184 px. The get_dot_mult() func
calculates and returns the scale multiplier. In the draw_dot() func, XDrawLine() and
XDrawPoint() were replaced with XFillRectangle() because those funcs do not allow their
result to be scalable. This patch does not require additional icon size values (those bigger
than 96x96 px) to exist, but makes no use without them.
2021-05-07 18:03:19 +01:00
Xander 9abe4165d1 Add icon sizes
The classic WindowMaker allows tile icon size up to 96x96 px. This patch rises this value
to 256x256 px. It also sets the max number of visible items in the corresponding pref list
to 29 (instead of 9), so the new values show up in the list. This patch makes it possible
to use dockapps that allow changing their size to bigger than 64x64 px, see
https://gitlab.com/xander1988/dockapps for more info.
2021-05-07 18:02:03 +01:00
gryf 82ab2d2d06 Correct calculation of usable space for reserved area.
Previous patch has correct the way, how reserved area found in
_NET_WM_STRUT was calculated. Unfortunately, the calculation was not
precise, as for not reserved areas (i.e. values of 0 for one of the
cardinals is set) must be calculated anyway for given head, otherwise
usable area might be too broad.
2021-03-18 16:08:40 +00:00
gryf bbf24d1d39 Correct way for reserved space on multihead environment.
Applications such a panels or docks have ability for reserving space so
that no windows should cover or overlap them. There is (partially)
support for it by checking the _NET_WM_STRUT property, although
calculation for the reserved space was wrong in case of several heads
enabled.

In this patch calculation for reserved area has been corrected.
2021-03-16 20:39:54 +00:00
Helge Kreutzmann 224cb403a7 Tippfehler in de.po von WPrefs (WindowMaker)
per Zufall habe ich einen Tippfehler gefunden
2020-12-07 16:53:16 +00:00
Nick Berendsen 1cd8fea423 Add support for _NET_WM_STATE_FOCUSED
Thanks to Jeremy Sowden for sending the patch to the mailing list.

Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
2020-10-27 15:35:08 +00:00
Diedrich Vorberg a98680cd14 Patch for GetCommandForPid() in osdep_darwin.c
the function mentioned above caused segfaults on MacOS. The attached patch
seems to solve that.

Details: The functions provides an array of string pointers (the argument
vector) pointing to a buffer allocated and referred to by a static local
variable `args`. This buffer was used on each subsequent call. For one
thing this would overwrite old values and for another this caused segfaults.

My new implementation allocates a buffer for the argument vector plus the
actual string data on each call. The caller will wfree() the buffer, but
until then has available an independent copy of the strings.
2020-10-19 20:38:29 +01:00
Alexander Komarov 7d423a3a0f Added Expert option: "Close rootmenu when mouse (left or right) is clicked outside focus.
Common WindowMaker's rootmenu behavior if press right mouse button open menu and close only with same button.
It's uncomfortably, it patch  allows close menu by left or right is clicked outside focus.
Changed func "static WMenu*configureMenu(WScreen *scr, WMPropList *definition)" to non-static forglobal use.
Added new  OPTION_WMAKER for this Expert-option. Changed event.c: for correct work should use initialization
func configureMenu afterwMenuDestroy (this is a feature of the event implementation XEvent).
2020-09-13 16:56:09 +01:00
Alexander Komarov 033d2d9a6f Changed Russian translation 2020-08-11 10:49:13 +01:00
Alexander Komarov 6e2075f3df Double click on titlebar maximize a window to fullscreen 2020-08-10 12:15:01 +01:00
XOR 5d2fd7bf7e WPrefs: Create Turkish translation 2020-06-28 17:54:15 +01:00
Christophe CURIS f6742662ec Tell git to ignore files created during i18n preparation
The 'pot' files are templates generated when we want to update the 'po'
files against latest source code;

the 'mo' files are compiled 'po' files to be installed
2020-06-28 11:33:31 +01:00
Doug Torrance 583f66ec4e Turn off automake's warning messages about using GNU make extensions
We've been using addsuffix in WindowMaker/Makefile.am and may use others
in the future.
2020-06-22 18:07:09 +01:00
gryf cd23e77fd1 Remove Debian related build files.
Keeping Debian related build files should not be the duty of wmaker
development team, but Debian package maintainers.
2020-05-31 17:34:28 +01:00
gryf 230a501d36 Fix typo on defining imagemagick version.
In this patch we will fix an issue during compilation on systems, which
have ImageMagick version 7, and slightly more recent version of
compiler. If we define USE_MAGICK with null value, compilation will fail
on preprocessor check on such defined variable.
2020-04-20 09:03:56 +01:00
Doug Torrance 3022edd060 wrlib: Fix typo in macro containing ImageMagick version
It's USE_MAGICK, not USE_MAGIC.  Also, we wrap the if/else statement
in an ifdef.  This doesn't really affect anything since load_magick.c
won't be compiled if USE_MAGICK is undefined because of an if statement
in the Makefile.  But in the off chance that it is somehow, then we will
try to load a nonexistent version 6 header file since USE_MAGICK will
be interprested as 0 and 0 < 7 is true.
2020-04-19 07:58:28 +01:00
Doug Torrance 1713a88656 debian: Remove ImageMagick patch; an equivalent patch now exists in next
If a user wanted to build a Debian package from the next branch, then
it would fail immediately when quilt tried to apply the patches.
2020-04-19 07:58:28 +01:00
Doug Torrance 00a25db9ea checkpatch.pl: Escape curly braces in regexes
Unescaped curly braces  have been deprecated since Perl 5.26 and are
illegal in Perl 5.30. I copied the relevant lines from the latest kernel
source, so we'll inherit a couple other improvements as well.
2020-04-18 22:27:29 +01:00
Doug Torrance c678580621 debian: Update with version 0.95.9-2 packaging. 2020-04-18 19:49:26 +01:00
Doug Torrance 44bc9cc264 Fix various abs() issues.
The abs() function should take an int as argument, but there were
several instances in the code where it was taking an unsigned int or a
double.  In these case, we took one of the following approaches:

* If the argument was a double, use fabs() instead.
* If the argument was unsigned and was certainly going to be positive
  (i.e,. no subtraction), then drop abs() altogether.
* If the argument was unsigned as result of adding or subtracting signed
  and unsigned ints, then we cast all the unsigned ints to signed ints.
2020-04-18 19:49:26 +01:00
Doug Torrance dfa92906c0 wrlib: Compile with either ImageMagick 6 and 7
We dropped ImageMagick 6 support in 0.95.9.  However, ImageMagick 6 is
still widespread (e.g., ImageMagick 7 has not been packaged in Debian
yet), and upstream plans on maintaining it until at least 2028 [1].

In this patch, we detect the version of the MagickWand library installed
on the user's system and include the appropriate header file when
building wrlib.

Note: I've only tested this with ImageMagick 6, so I'd appreciate
confirmation that it works with ImageMagick 7.

[1] https://github.com/ImageMagick/ImageMagick6/blob/master/NEWS.txt
2020-04-18 19:49:25 +01:00
Doug Torrance 27dc5efd2e debian: Update with version 0.95.9-1 packaging. 2020-04-17 08:20:50 +01:00
Doug Torrance 86659be668 wmlib: Use X flags from configure
We use the AC_PATH_XTRA macro to find all the X library paths during
build, but we weren't actually using the variables it generated for
building wmlib.  Instead, we just hardcoded the linker flag "-lX11",
which may or may not actually work.
2020-04-09 14:54:06 +01:00
Doug Torrance e314f10909 configure: Fix typo in libXmu check.
As the literal string "wm_cv_xext_xmu" will never be equal to "xno",
we always ran the code that was supposed to run when the variable
$wm_cv_xext_xmu was not equal to "no".  In particular, if libXmu
was not found, then we proceeded as if it had been found.
2020-04-09 14:54:06 +01:00
Doug Torrance 54a24ab6f7 Remove trailing whitespace.
Also, the script is a one-liner, stolen from [1]:

ack --print0 -l '[ \t]+$' | xargs -0 -n1 perl -pi -e 's/[ \t]+$//'

[1]
https://stackoverflow.com/questions/149057/how-to-remove-trailing-whitespace-of-all-files-recursively
2020-04-09 14:28:09 +01:00
Doug Torrance a17d131da3 Remove apostrophes from instances of possessive "its".
I noticed one instance of this while looking at the code the other day,
and after a quick grep, realized it happened a *lot*!  One of the many
frustrating things about the English language is that we use apostrophes
to make pretty much everything possessive *except* the pronoun "it".
In that case, we use "its".  "It's" is reserved for the contraction
meaning "it is" or "it has".
2020-04-09 09:05:50 +01:00
David Michael 6320bb6219 configure: Allow changing default search paths
This changes the behavior of the --with-{inc,lib}s-from arguments
to replace the default paths instead of adding to them.  This is
required when cross-compiling in a sysroot, since the default paths
will include files from the host system which can have an
incompatible architecture.
2020-04-06 16:35:53 +01:00
Carlos R. Mafra f9bc310fa6 Window Maker 0.95.9 2020-04-04 11:02:28 +01:00
Carlos R. Mafra 58249c2b9b Update .gitignore file 2020-04-04 10:55:42 +01:00
David Maciejak bb716a4ca1 util: renamed wmiv DEBUG constant name
To prevent compilation warning message saying DEBUG name is already defined
2020-03-28 10:13:11 +00:00
David Maciejak 91f8e21668 WPrefs: fixed malformed TIFF file generating libtiff warnings
The original ergonomic.tiff file samples/pixel property was wrong which was generating the warning message from libtiff
"TIFFReadDirectory: Warning, Sum of Photometric type-related color channels and ExtraSamples doesn't match SamplesPerPixel. Defining non-color channels as ExtraSamples.."
2020-03-28 01:02:56 +00:00
David Maciejak 5f18f60fd2 WPrefs: increased open submenu label size
Give more space for the open submenu label to be displayed properly
2020-03-28 01:02:41 +00:00
David Maciejak a215869067 wrlib: Fixed warning msg using libpng
Call png_set_interlace_handling() to get rid of the warning message "libpng warning: Interlace handling should be turned on when using png_read_image"
2020-03-27 09:00:37 +00:00
David Maciejak 909deea70c bump copyright year in Info Panel
bump copyright year in Info Panel
2020-03-25 10:08:17 +00:00
David Maciejak 984a992d0e Fix typo
Renamed isPointNearBoder() function
2020-03-25 10:05:02 +00:00
nchilingaryan@aua.am e82d86813e Update Armenian translation
I did some part of translatin back in 2008, now I fixed bugs and updated it
so that all the messages are translated.
2020-03-05 10:19:49 +00:00
Jeremy Sowden d9bc96e497 strncpy's third argument should be the length of the dest buffer, not the source. 2019-08-06 11:04:05 +01:00
Jeremy Sowden a7baed6cf7 Fixed expression checking whether flag is set. 2019-08-06 11:04:05 +01:00
Jeremy Sowden a12f0d453a Fixed buffer size. 2019-08-06 11:04:05 +01:00
Jeremy Sowden 41193bdacd Fixed function-pointer compatibility. 2019-08-06 11:04:05 +01:00
Jeremy Sowden a7f8e990db Added explicit fall-through comments to pacify GCC. 2019-08-06 11:04:05 +01:00
Jeremy Sowden b59273f199 Added missing function declaration. 2019-08-06 11:04:05 +01:00
Haroldo be922384ac slight increase in default switch panel icon size to improve border view 2019-07-28 23:05:28 +01:00
Haroldo 31f16b65a3 higher resolution images for switch panel 2019-07-28 20:21:14 +01:00
Haroldo 3665410377 make switchpanel configurable 2019-07-14 17:43:28 +01:00
Jeremy Sowden 4477ae4da4 Prefer TryExec to Exec when generating menu entries from XDG desktop files.
From the comments at the top of wmmenugen_parse_xdg.c:

  Since there is no passing of file name arguments or anything of the
  sort to applications from the menu, execname is determined as follows:

   - If `TryExec' is present, use that;
   - else use `Exec' with any switches stripped

However, Exec used to be preferred.  Changed code to prefer TryExec.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
2019-06-20 22:06:36 +01:00
Jeremy Sowden 9330a021e5 Omit field-code in Exec fields when generating menu-entries from XDG desktop-files.
Exec fields in desktop-files may include field-codes which act as
place-holders for command-line arguments.  Previously the Exec arguments
were being passed through intact.  However, since Window Maker has no
support for expanding the field-codes, we now remove them and preserve
the remaining arguments.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
2019-06-20 22:06:36 +01:00
Jeremy Sowden 41ab926090 Parse Exec fields when generating menu-entries from XDG desktop-files.
Exec fields in desktop-files are subject to escaping.  Unescape them.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
2019-06-20 22:06:36 +01:00
Jeremy Sowden b32ccee5cb Undo XDG string-escaping when generating menu-entries.
In XDG desktop files, string values are subject to escaping.  Undo this
when parsing them.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
2019-06-20 22:06:36 +01:00
Jeremy Sowden 6734646265 Use pointers as parameters instead of pointer-to-pointers.
Some functions expected pointers-to-pointers where pointers would do.
Changed them to use pointers.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
2019-06-20 22:06:36 +01:00
Rodolfo García Peñas (kix) 6a044fe5ae load_jpeg.c Return NULL
The image is NULL, we can return NULL here.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 6dd1498f7c load_jpeg.c Style
This patch is just coding style. Removes some empty lines,...

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 090b761fde load_jpeg.c Removed dead code
This patch removes the code not used. Because the if block
check that buffer[0] is NULL, then, we don't need check it
again inside.

Image is not used yet, so is NULL. We can return NULL.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 49db946aa2 load_jpeg.c Clean code
This patch returns NULL, because the variable image is not used yet.

The patch also removes three lines:

- buffer[0] = NULL;       /* Initialize pointer to avoid spurious free in cleanup code */
  RErrorCode = RERR_BADIMAGEFILE;
  jpeg_destroy_decompress(&cinfo);
  fclose(file);
- if (buffer[0])
-    free(buffer[0]);

buffer is a local variable. The malloc is not used yet. So:

- We set the value to NULL, then check if is null to call free(). So the free()
  call is never used. We can remove the last too lines.
- We don't need set now to NULL, because the variable is empty (the
  initializated (or not) value is not used, and is destroyed as local variable
  when we returns, just one line later.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) a2cc89dd3d load_jpeg.c Removed goto
This patch removes the goto call. I copied the code after the bye: label and
I paste it in the goto-calls.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) de09ac5dad WPrefs.c Removed format-overflow warning
This patch adds some characters to the mbuf buffer, to allow the buffer size and some extra characters.

WPrefs.c: In function ‘loadConfigurations’:
../src/wconfig.h:400:17: warning: ‘%s’ directive writing up to 1023 bytes into a region of size 1018 [-Wformat-overflow=]

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 3dce639aae Appearance.c Removed fallthrough warning
This patch adds some comments to remove the falthrough warning.

Appearance.c: In function ‘renderTexture’:
../WINGs/WINGs/WUtil.h:230:32: warning: this statement may fall through [-Wimplicit-fallthrough=]
 #define wwarning(fmt, args...) __wmessage( __func__, __FILE__, __LINE__, WMESSAGE_TYPE_WARNING, fmt, ## args)
                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Appearance.c:675:4: note: in expansion of macro ‘wwarning’
    wwarning(_("unknown direction in '%s', falling back to diagonal"), type);
    ^~~~~~~~
Appearance.c:676:3: note: here
   case 'D':
   ^~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 00dffbe317 wmiv.c Removed indentation warning
This patch removes the indentation problem. The patch includes a long comment about the change.

wmiv.c: In function ‘main’:
wmiv.c:843:4: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
    if (e.xclient.data.l[0] == delWindow)
    ^~
wmiv.c:845:5: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
     break;
     ^~~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 7759d06851 wmgenmenu.c Removed format-truncation
This patch removes the format-truncation warning. The problem is because buf and comm are arrays with the same size (PATH_MAX). In the snprintf, comm is copied to buf, more some extra characters. The patch reduces the size for the array comm in the extra characters. Without the patch, the comm array is truncated. With the patch, the same characters are copied, without the warning.

wmgenmenu.c: In function ‘find_and_write’:
wmgenmenu.c:436:41: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=]
     snprintf(buf, sizeof(buf), "%s -e %s", terminal ? terminal : "xterm" , comm);
                                         ^
wmgenmenu.c:436:5: note: ‘snprintf’ output 5 or more bytes (assuming 4105) into a destination of size 4104
     snprintf(buf, sizeof(buf), "%s -e %s", terminal ? terminal : "xterm" , comm);
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) bf644338e4 gradient.c Removed implicit-fallthrough warnings
This patch adds the comments to remove the warnings.

gradient.c: In function ‘renderGradientWidth’:
gradient.c:162:10: warning: this statement may fall through [-Wimplicit-fallthrough=]
   *ptr++ = b;
   ~~~~~~~^~~
gradient.c:163:2: note: here
  case 2:
  ^~~~
gradient.c:166:10: warning: this statement may fall through [-Wimplicit-fallthrough=]
   *ptr++ = b;
   ~~~~~~~^~~
gradient.c:167:2: note: here
  case 1:
  ^~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 95561fba08 wtextfield.c: Removed multiple warnings
This patch removes the implicit-fallthrough warnings for GCC7. Just add the FALLTHRU comment.
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) a0b223263e wtext.c Remove warnings
This patch removes the FALLTHRU warnings in wtext.c. Only includes the comments for GCC7.

wtext.c: In function ‘handleActionEvents’:
wtext.c:2508:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
   if (event->xbutton.button == Button2) {
      ^
wtext.c:2547:2: note: here
  case ButtonRelease:
  ^~~~
wtext.c: In function ‘handleTextKeyPress’:
wtext.c:2307:11: warning: this statement may fall through [-Wimplicit-fallthrough=]
   *buffer = '\n';
   ~~~~~~~~^~~~~~
wtext.c:2308:2: note: here
  default:
  ^~~~~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 2555413838 wruler.c Remove format-truncation warning
This patch removes the format-truncation error. The warning is because c has size of 3, but using "%d" is not possible to store the value.

wruler.c: In function ‘paintRuler.part.0’:
wruler.c:184:28: warning: ‘%d’ directive output may be truncated writing between 1 and 10 bytes into a region of size 3 [-Wformat-truncation=]
    snprintf(c, sizeof(c), "%d", ++j);
                            ^~
wruler.c:184:27: note: directive argument in the range [1, 2147483647]
    snprintf(c, sizeof(c), "%d", ++j);
                           ^~~~
wruler.c:184:4: note: ‘snprintf’ output between 2 and 11 bytes into a destination of size 3
    snprintf(c, sizeof(c), "%d", ++j);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

The value "j" is the result of "m < w". w is the result of rPtr->view->size.width - rPtr->margins.left;, and both variables are unsigned int. So the value for w is an unsigned int and m is related to i. m cannot be greater of unsigned int.

	i = j = m = 0;
	w = rPtr->view->size.width - rPtr->margins.left;
	while (m < w) {
		XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer,
			  rPtr->fgGC, rPtr->margins.left + m, 23, rPtr->margins.left + m, marks[i % 8] + 23);
		if (i != 0 && i % 8 == 0) {
			snprintf(c, sizeof(c), "%hu", ++j);
			WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg,
				     rPtr->font, rPtr->margins.left + 2 + m, 26, c, 2);
		}
		m = (++i) * 10;
	}

The printf modifier should be unsigned int.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 3e3f06a7be widgets.c Removes implicit-fallthrough warning
This patch removes this warning:

widgets.c: In function `renderPixmap':
widgets.c:385:8: warning: this statement may fall through [-Wimplicit-fallthrough=]
     if (mask)
        ^
widgets.c:388:4: note: here
    case '.':
    ^~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 1f80c82091 wcolorpanel.c Removed hsbInit warnings
This patch removes these warnings in the hsbInit function.

wcolorpanel.c: In function ‘hsbInit’:
wcolorpanel.c:3456:16: warning: ‘%u’ directive writing between 1 and 5 bytes into a region of size 4 [-Wformat-overflow=]
  sprintf(tmp, "%d", value[0]);
                ^~
wcolorpanel.c:3456:15: note: directive argument in the range [0, 65535]
  sprintf(tmp, "%d", value[0]);
               ^~~~
wcolorpanel.c:3456:2: note: ‘sprintf’ output between 2 and 6 bytes into a destination of size 4
  sprintf(tmp, "%d", value[0]);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

The problem is that the hue variable in the RHSVColor struct. This variable is not an integer, is a shor variable, so using the printf using the "%d" modifier spects an integer. Using a "%hu" prints a unsigned short value.

typedef struct RHSVColor {
    unsigned short hue;	       /* 0-359 */
    unsigned char saturation;      /* 0-255 */
    unsigned char value;	       /* 0-255 */
} RHSVColor;
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) fb5f6c30c0 wcolorpanel.c: Remove warning in rgbIntToChar
This patch removes this warning. The default case should not be used.

wcolorpanel.c: In function ‘rgbIntToChar’:
wcolorpanel.c:2392:2: warning: ‘format’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  sprintf(tmp, format, value[1]);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) 972d85610a wcolorpanel.c Avoid compiler warning
This patch removes this warning. The patch adds a switch case that never should happend.

wcolorpanel.c: In function ‘rgbInit’:
wcolorpanel.c:3403:2: warning: ‘format’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  sprintf(tmp, format, panel->color.rgb.green);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Rodolfo García Peñas (kix) f0f95165e4 WINGs/selection.c Removed compiler warning
This patch removes this warning:

selection.c:265:64: warning: cast between incompatible function types from ‘int (*)(void *)’ to ‘void (*)(void *)’ [-Wcast-function-type]
  wdata = WMCreateDataWithBytesNoCopy((void *) data, len * bpi, (WMFreeDataProc *) XFree);

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
2019-06-20 22:04:31 +01:00
Tim Taenny f895b906a4 Adjusted size of the Legal Information panel
With the changes to the layout, which were introduced in the
previous patch series, and the correction of the default font
size, the Legal Information panel was too small to display the
complete text.
It has been set to a sufficient size.
2019-06-19 18:06:53 +01:00
Tim Taenny 5ab9b7c6be Renamed the ScaleX/Y macros and their local variables
The names of the macros and the local variables that they use
have been changed to make them less "user-space" like.

    ScaleX -> WMScaleX
    ScaleY -> WMScaleY
    fw     -> wmScaleWidth
    fh     -> wmScaleHeight
2019-06-19 18:06:53 +01:00
Tim Taenny 1e490f8233 Adjusted scale factors in ScaleX and ScaleY macros
The scale factors in the macros were based on the assumption that
the default font size was 11. But the actual default font size is
12. This value is specified as DEFAULT_FONT_SIZE in
WINGS/configuration.c.
2019-06-19 18:06:53 +01:00
Tim Taenny ba3df2599d Use fixed font size in original WMCreate*Panel functions
Instead of just assuming that the size of the system font has not
been changed by the user, the WMCreateAlertPanel,
WMCreateInputPanel and WMCreateGenericPanel functions now use a
fixed default font size of 12, so that changing the system font's
size in WPrefs.app does not break the fixed layouts of these panels.
("12" is specified as DEFAULT_FONT_SIZE in WINGS/configuration.c)
2019-06-19 18:06:53 +01:00
Tim Taenny c803218ed1 New functions for the creation of scaled panels (WMCreateScaled*Panel)
To prevent breaking applications depending on the static layout
behavior of the WMCreateAlertPanel and WMCreateInputPanel functions
in WINGs, the scaling functionality has been moved to the new
functions WMCreateScaledAlertPanel and WMCreateScaledInputPanel.

The system dialogs (wMessageDialog, wExitDialog, etc.) now use the
new functions, thus keeping the improved layout introduced in the
previous patches.
2019-06-19 18:06:53 +01:00
Carlos R. Mafra 6c6853ea30 util: add wmiv entry to README 2019-06-15 16:49:34 +01:00
Tim Taenny b48b503eb1 Improved layout of the Info Panel
Instead of relying on static pixel values for position and size of
the widgets, the info panel now scales its widgets based on the
selected system font size.
2019-06-12 23:42:27 +01:00
Tim Taenny 1c8b680e3d Improved layout of the Legal Panel
Instead of relying on static pixel values for position and size of
the widgets, the legal panel now scales its widgets based on the
selected system font size.
2019-06-12 23:42:27 +01:00
Tim Taenny 5eeaf6b890 Improved layout of the Icon Chooser Panel
Instead of relying on static pixel values for position and size of
the widgets, the icon chooser panel now scales its widgets based
on the selected system font size.
2019-06-12 23:42:27 +01:00
Tim Taenny f9236c8d20 Improved layout of the Input Panels
Instead of relying on static pixel values for position and size of
the widgets, the input panels now scale their widgets based on the
selected system font size.
2019-06-12 23:42:27 +01:00
Tim Taenny 26bb94a8e7 Improved layout of the Alert Panels
Instead of relying on static pixel values for position and size of
the widgets, the alert panels now scale their widgets based on the
selected system font size.
2019-06-12 23:42:27 +01:00
Tim Taenny b185d46286 Added ScaleX and ScaleY macros to WINGs
To reduce code duplication the ScaleX and ScaleY macros have been
moved to WUtil.h. Along with the function WMGetScaleBaseFromSystemFont
these macros can be used in all panels to scale the widgets based on
the current system font size instead of giving fixed pixel sizes which
messes up the panels if a larger system font is selected in WPrefs.

Use the macros in the following way:

    instead of   WMResizeWidget(widget, 128, 64);
                 WMMoveWidget(widget, 32, 32);

    use          int fw, fh;
                 WMGetScaleBaseFromSystemFont(scr->wmscreen, &fw, &fh);
                 WMResizeWidget(widget, ScaleX(128), ScaleY(64));
                 WMMoveWidget(widget, ScaleX(32), ScaleY(32));
2019-06-12 23:42:27 +01:00
Tim Taenny 8f29bdc690 Improved layout of the widgets in the DockAppSettingsPanel
Instead of relying on static pixel values for position and size of
the widgets, the DockAppSettingsPanel now scales its widgets based
on the selected system font size.
2019-06-12 23:42:27 +01:00
Christophe CURIS e2cfed3377 Do not stop compilation if library Xmu is not found
We use only 1 function from this library, and it is in a case that should
be rare nowadays: displays with indexed color.
This commit makes it acceptable to compile if the library is missing.
2019-05-04 14:50:48 +01:00
Christophe CURIS 4665972175 Change the way the ChangeLog date is extracted for Texi2txt generated docs
When building into another directory than in the source, the hard-coded
relative path to the changelog will fail finding the file, causing an empty
date in the generated file when '@today' is used.

This patch is making sure the ChangeLog is taken in the source directory to
avoid any problem.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2019-02-22 16:21:00 +00:00
Christophe CURIS 8606ae9a83 WINGs: simplify code
It looks like the original code was expecting the side effect of specifying
a length in the %d to smartly truncate the number, which it does not.
The new code has the same behaviour without extra complexity.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2019-02-22 16:08:36 +00:00
Christophe CURIS 070f0ad8f4 WPrefs: Dead code removal
Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2019-02-22 16:08:36 +00:00
Christophe CURIS 2913ac0f09 Do not allocate memory for a temporary buffer
This kind of things participates in memory fragmentation, so it is
generally a bad practice when an on-stack allocation is enough.
Took opportunity to reduce the buffer size, there's no point in
overallocating memory (the new size being still way too much).

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2019-02-22 16:08:36 +00:00
Christophe CURIS dae63b5e96 WPrefs: Prefer use of 'sizeof' instead of hard-coded values
Hard-coding a value is prone to errors when maintaining the code; using the
builtin C macro 'sizeof' is a much safer choice.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
2019-02-22 16:08:36 +00:00
Doug Torrance 738a78b3e2 Replace GNUSTEP_USER_ROOT environment variable with WMAKER_USER_ROOT
As reported in Debian bug #922284 [1]:

    As evident from the prefix, GNUSTEP_USER_ROOT is a GNUstep variable and
    Window Maker should not set it.  Furthemore, it has been deprecated for
    12 years already.  As of gnustep-make/2.7.0-4 the GNUstep build system
    is configured in strict v2 mode which makes it impossible to compile
    GNUstep software.  In a terminal started from a Window Maker session:

    yavor@aneto:/tmp/gorm.app-1.2.24$ make
    This is gnustep-make 2.7.0. Type 'make print-gnustep-make-help' for help.
    Running in gnustep-make version 2 strict mode.
    rm -f InterfaceBuilder; \
    ln -s GormLib InterfaceBuilder
    /usr/share/GNUstep/Makefiles/config-noarch.make:121: *** GNUSTEP_USER_ROOT
    is obsolete.  Stop.

    It is also impossible to build gnustep-make from pristine upstream
    source:

    yavor@aneto:/tmp$ wget -q
      ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.7.0.tar.gz
    yavor@aneto:/tmp$ tar xzf gnustep-make-2.7.0.tar.gz
    yavor@aneto:/tmp$ cd gnustep-make-2.7.0/
    yavor@aneto:/tmp/gnustep-make-2.7.0$ ./configure
    ...
    yavor@aneto:/tmp/gnustep-make-2.7.0$ make
    config-noarch.make:121: *** GNUSTEP_USER_ROOT is obsolete.  Stop.

    Note that the majority of GNUstep users use Window Maker as their window
    manager and many of them build GNUstep software from source, mostly
    because of the GNUstep Objective-C runtime which depends on Clang
    (Debian packages use GCC and the GCC/GNU runtime).

Our solution is to replace the GNUSTEP_USER_ROOT environment variable with our
own environment variable, WMAKER_USER_ROOT.  This is documented in NEWS.

[1] https://bugs.debian.org/922284
2019-02-17 18:44:33 +00:00
Stig-Ørjan Smelror 1dace5699f Drop support for Imagemagick version < 7
Had to do a few modifications to get WM to build with Imagemagick 7.

Attached is the diff from the latest git checkout.

Cheers,
Stig
2019-02-12 19:14:01 +00:00
Tim Taenny 5a95631091 Added expert option for WrapAppiconsInDock property to WPrefs
In 2013 Daniel added the functionality to wrap icons, which are
attached to the dock, around the screen edges when the dock is
being moved vertically.
This patch adds an expert option to WPrefs.app for setting the
property which enables/disables this feature.

Remark: In my opinion, the default value for that property should
        be changed to NO, as this is also the default behavior in
        NeXTSTEP. It is handy to be able to move all these icons
        out of sight when working with maximized application
        windows.
2019-02-05 21:32:04 +00:00
Tim Taenny 2427200c3e Added feature: automatic scaling of application icons
If the option "Enforce icon margin" is selected, application window
icons will be selected or scaled so that they only use 75% of the
available icon_size.
Even if the feature is not enabled, this change will scale down
large application icons to icon_size, so that icons can be used
that were rejected by the previous implementation of findBestIcon.
(Example: The Qt Creator icon never showed before, because it is
only provided in 128x128 resolution. Now it's visible.)
2019-01-31 17:22:49 +00:00
Tim Taenny d6c1ac3ecf Added icon feature option to WPrefs: Enforce icon margin
The current findBestIcon function usually selects an icon image
that almost completely fills up the (default) 64x64 pixels of an
icon. As Dan noted in the function, the icon images should use only
75% of the available space, which would result in room for the
miniwindow title and better overall aesthetics.

This feature option provides for enabling such an automatic "icon
shrinking" functionality.

Note: This commit only introduces the new option, not the actual
      image shrinking.
2019-01-31 17:22:49 +00:00
Tim Taenny 9b5eaa3d3e Use popup button for animation style instead of option group in WPrefs
To make some room for an additional icon option (yet to be committed)
the options group for selecting the iconification animation is
replaced by a popup button. This allows for adding at least two more
checkboxes in the options and makes adding new animation styles less
painful.
2019-01-31 17:22:49 +00:00
Tim Taenny 2beb5f2c52 Fixed icon loading during Attribute Inspector startup
When opening the "Icon and Initial Workspace" panel of the Attribute
Inspector, the Miniwindow Image and the corresponding text field were
always empty, even if an icon had been selected, applied and saved
before. The file name was not loaded from the database on startup
of the inspector window.

With this change, the icon and the text field are properly set on
startup of the inspector window.
2019-01-30 23:43:23 +00:00
Carlos R. Mafra f1809a7786 wmgenmenu: add a few programs 2019-01-22 22:25:06 +00:00
Gaspar Chilingarov 8b919b0d33 support moving window between heads using keyboard
Window Maker allows to perform practically all operations with windows
using only keyboard. One of the actions so far which required using
mouse was dragging window from one head (monitor) to another.

This patch introduces support for keyboard shortcuts. These shortcuts
move windows in circular fashion (if you have 3 and more monitors).

In case of 2 or 3 monitors arranged horizontally - window will just move
right/left.

In case of 3x3 setup - it is impossible to move window to central
monitor with keyboard.

- preserves window position and size (if display sizes are same)
- otherwise tries to fit window to smaller display
2018-12-16 10:13:50 +00:00
Doug Torrance d13b78bdde configure: Fix pkg-config variable typo.
The variable set by PKG_PROG_PKG_CONFIG which points to the pkg-config
utility is PKG_CONFIG, not PKGCONFIG.  The latter was previously used
when trying to detect the presence of the MagickWand library when Window
Maker was built using --enable-magick.
2018-08-08 08:51:45 +01:00
Gaspar Chilingarov 6668715402 Detect and override illegal window size hints
The problem - when VirtualBox starts virtual machine, window has very
small height (couple of pixels) and it requires some manual fiddling
to resize it to something usable.

See related bugs here:

https://www.virtualbox.org/ticket/14718#comment:19 - small horizontal
line in the middle of the screen is newly opened virtual machine's
window.

https://www.virtualbox.org/ticket/15863

Inspecting with xdebug and xprop reveals that VirtualBox sends wrong hints:

Request(12): ConfigureWindow window=0x0660000a values={x=27 y=559
width=720 height=65512}

Which is interpreted by X server wrongly and shown with xprop as

WM_NORMAL_HINTS(WM_SIZE_HINTS)
:
                user specified location: 27, 559
                user specified size: 720 by -24
                program specified minimum size: 254 by 109
                window gravity: Static

Some part of X11 interprets such large value as signed int and wraps
it to negative value.

The solution will be if program requests such big window - detect it,
ignore requested size and resize it to some reasonable defaults.

Disclaimer - I tested it only on Ubuntu 16.04, but should apply to
another systems as well - see bug reports.
2018-05-21 13:02:22 +01:00
Doug Torrance 100745d356 setstyle: Add support for fpixmap ("fillscale") textures 2018-05-15 19:55:28 +01:00
Doug Torrance 7c89ca2551 menu: Fix broken "Save Theme" option.
This option had been broken for several reasons:
* The getstyle utility does not replace the #usergnusteppath# macro which
  was passed to it by the menu.
* When processing the USER_THEMES_DIR macro, the menu inserts a space
  afterwards, and so the directory and filename were passed to getstyle
  as two separate arguments.
* It used the old, pre-0.50.0 theme format.

By using the -p option to getstyle, we can avoid these issues, as we don't
need to specify the directory *and* it uses the 'new' (since 1999) themepack
format.
2018-05-15 19:43:25 +01:00
Doug Torrance 0c737bc834 Add new Adwaita style to Makefile. 2018-05-15 14:26:51 +01:00
Doug Torrance b3f8d0997b New Adwaita style which approximates the look of the default GTK theme. 2018-05-15 10:13:48 +01:00
Doug Torrance 673ea18020 Update mailing list links to new Google Groups. 2018-05-14 16:51:23 +01:00
Bad Sector c89ec25c80 Fixes missing appicons after restarting Window Maker
Fixes the bug where if the icon image is accidentally set to
nothing or the image file is deleted, the appicon keeps losing
its icon (it resets to the default cube icon) when Window Maker
exits/restarts (depending on how the user cleared the icon this
may persist even after redocking the application if information
about the application window is still in the WM).  One way to
easily see this bug is to open the main window's attributes and
press the Save button (no need to do anything else) as this
clears the icon file (this is a separate bug that needs to be
fixed but it is more of a minor UI bug since clearing the image
should simply reset the icon to the application provided one if
the Ignore client supplied icon is not set).  Another way to
see it is to open the properties box in a docked application
that is not running and clear the image field.  After either of
these two actions are performed, restart Window Maker and see
that the icons are missing.

This patch fixes the above bug by calling save_appicon when the
appicon object is created and the application provided icon is
already available (window maker actually tries to save the icon
at an earlier stage but this is done as a side effect of
"painting" the dock icon - which also saves the icon - but this
is done too early, before ownership information is available).

Note that this bug seems to be a regression introduced from
commit 9c4b19d8aa (or one of the
related commits around the same time, they seem to be a bit too
aggressive in not saving icons).  This patch addresses the
concern in that commit about only saving the icon for docked
applications.
2018-04-18 10:09:38 +01:00
Bad Sector 569fbff07c wmaker: Add new advanced option to ignore decoration changes from clients.
This adds an option (IgnoreDecorationChanges in plist) for windows to
ignore any requests from the clients for changing decorations. Since the
default state for any window pre-request is to have all decorations visible
this basically means that applications cannot hide any of the titlebar,
sizing bar, titlebar buttons, etc and any hint that causes these elements
to be hidden will be followed by a restoration if this option is set.

 This is useful for broken clients (e.g. Steam) and clients that force
subpar client side decorations. It is basically a per-window setting of the
global advanced option to ignore Gtk hints, except that it also applies to
non-Gtk applications.
2018-02-14 08:16:55 +00:00
Bernhard M. Wiedemann 36879de261 texi2txt: Use ChangeLog date instead of build date
in order to make builds reproducible. See
https://reproducible-builds.org/
for why this is good.

This date call works with GNU date and BSD date. Without this patch,
/usr/share/doc/packages/WindowMaker/README.i18n will differ in the
line An alternative solution could use the $SOURCE_DATE_EPOCH
variable defined in
https://reproducible-builds.org/specs/source-date-epoch/

Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
2017-12-24 11:58:20 -02:00
Alwin bfd88e07e6 wmaker: Adding copyright year 2017
The Info Panel didn't show the current year.
2017-09-14 21:08:26 +02:00
Alwin 81b89f6a4c wmaker: Fixing a menu typo
There was a typo in background.menu. Although the menu worked fine, it
caused these errors in the logs:

  wmaker(WMReadPropListFromFile(proplist.c:1543)): error: error reading
    from file '/usr/share/WindowMaker/Backgrounds'
2017-09-14 21:08:26 +02:00
Alwin 6cfc71d40a Translations: Frisian language files for WPrefs and menus updated
Compacting two translations to fit the available space; two new strings.
The menus are now split like the English ones, using appearance.menu.fy
and background.menu.fy. A new comment was added to menu.fy.in.
2017-09-14 21:08:26 +02:00
Alwin ccc676a2bf Translations: Dutch language files for WPrefs and menus updated
Compacting a translation to fit the available space; two new strings.
The menus are now split like the English ones, using appearance.menu.nl
and background.menu.nl. A new comment was added to menu.nl.in.
2017-09-14 21:08:26 +02:00
Doug Torrance 2dbd778ed4 WPrefs: Inform user which menu file is being edited. 2017-08-19 15:59:13 +01:00
Doug Torrance f63635dd17 WPrefs: Save menu back to the file we read it from.
Previously, we saved any modifications back to WMRootMenu, regardless of
the file we read the menu from.
2017-08-19 15:59:13 +01:00
Doug Torrance 97702618de WPrefs: Display warning when attempting to modify a read-only menu file. 2017-08-19 15:59:13 +01:00
Doug Torrance b68a1994c2 debian: Remove patch 54_Debian_wmmacros.diff.
This patch is now unnecessary, as we have removed the SETSTYLE and
LOCAL_*_DIR macros and have added the USER_*_DIR upstream.
2017-08-19 11:14:38 +01:00
Doug Torrance fe459fbab3 menu: Add USER_*_DIR macros.
Inspired by the Debian patch 54_Debian_wmmacros.diff.  These macros are
actually already referenced in appearance.menu and background.menu, but
only Debian installations have taken advantage of them.

We use the new #usergnusteppath# macro to reference the user GNUstep path.
2017-08-19 11:14:38 +01:00
Doug Torrance 5f2dac318c menu: New macro #usergnusteppath# for user GNUstep directory
This macro is used when handling directories with OPEN_MENU, e.g., to list
available image files for setting the workspace background.

When parsing a menu file, we replace any instances of #usergnusteppath#
with either GNUSTEP_USER_ROOT or ~/GNUstep if the former is not set.  In
this way, authors of menu files do not have to worry about whether users
will have this variable set or not.

We also document this feature in WindowMaker/menu.in, which generates the
default English language old-style menu and currently contains the existing
documentation for the Window Maker menu system.
2017-08-19 11:14:38 +01:00
Doug Torrance bfda22ef1a menu: Remove unused LOCAL_*_DIR macros.
We remove the macros LOCAL_THEMES_DIR, LOCAL_STYLES_DIR,
LOCAL_ICON_SETS_DIR, and LOCAL_BACKGROUNDS_DIR.

They were only referenced in the Debian patch 54_Debian_wmmacros.diff, which
set them to /usr/local/share/WindowMaker/{Themes,Styles,etc.}.

In a default installation, THEMES_DIR, STYLES_DIR, etc. coincide exactly
with these paths.  In a Debian installation (which defaults to /usr/share
instead of /usr/local/share), it seems unlikely that a user would have these
files in both locations.
2017-08-19 11:14:38 +01:00
Doug Torrance 46daa76f77 menu: Remove unused SETSTYLE macro. 2017-08-19 11:14:38 +01:00
Doug Torrance 02cc702029 WPrefs: Edit proplist menus referenced by WMRootMenu.
Previously, WPrefs could only be used to edit the menu specified in
WMRootMenu.

In a recent commit, the ability to specify a menu in proplist format defined
in another file which is referenced by WMRootMenu was added.  However, if a
user attempted to edit such a menu in WPrefs, an error dialog appeared.

We add the ability for WPrefs to read such a menu.  After the user makes any
changes, the result is stored in WMRootMenu, and *not* the original file.
2017-08-19 11:14:38 +01:00
Doug Torrance 6f195b18fc WINGs: WMIsPL* functions return False if proplist is null.
Previously, calls to WMIsPLString, WMIsPLData, WMIsPLArray, and
WMIsPLDictionary would result in a segfault if the argument was null.
This could happen, e.g., if we are checking which type of proplist
was just parsed from a file, but the parsing failed.

These functions now return False in this case.
2017-08-19 11:14:38 +01:00
Doug Torrance 101ef6f28e menu: For consistency, use appearance.menu for English-language menus. 2017-08-18 02:14:11 +01:00
Doug Torrance 5a5595f76c menu: Add WPrefs to appearance.menu.
WPrefs appears under the 'Appearances' submenu of both menu and plmenu.
2017-08-18 02:14:11 +01:00
Doug Torrance 1a5abe9d84 menu: Add Bluemarine to solid background color options.
This color was present in menu and plmenu, but not background.menu.
2017-08-18 02:14:11 +01:00
Doug Torrance d364afff02 menu: Write data directory during build instead of with wmaker.inst.
Many of the menu files contain the macro #wmdatadir# as a placeholder for
the data directory containing Window Maker themes, styles, background
pixmaps, etc.  This macro is replaced by the the actual path to the data
directory (by default /usr/local/share/WindowMaker) by the wmaker.inst
script, but only when copying WMRootMenu to the user's home directory.

Instead, we replace the macro during the build.  This way, *every* menu
file has the correct path.

Note that several of the files in question were not previously generated
during build.  These have been renamed with a .in extension.
2017-08-18 02:14:11 +01:00
Doug Torrance 273d17a0be menu: Include all aspect ratio options for background pixmap.
The background menu was missing "centered", "maximized", and "filled".

This closes Debian bug #85591 [1]:
  The current default for the scaled backgrounds menu is to use
  scaling without keeping the aspect ratio.

  This very rarely yields to a usable background.

  Could the default be changed to scaling with keeping the aspect
  ratio ?

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=85591
2017-08-18 02:14:11 +01:00
Doug Torrance d6f754e747 debian: Update with version 0.95.8-2 packaging. 2017-08-15 10:34:03 +01:00
Doug Torrance b07075aed3 wmaker: Allow WMRootMenu to reference menu files in proplist format.
Previously, WMRootMenu could either be a menu file in proplist format
itself, or it could reference another menu file in the old style format.

If WMRootMenu referenced another menu file in proplist format, this file
was parsed assuming it was in the old style format and thus failed, as
observed by Andreas Metzler [1].

In this patch, we first attempt to parse a referenced menu file as if
it were in proplist format.  If this fails, then we fall back on the old
style format.  This has the disadvantage of spamming the terminal with
various parsing errors if the menu file is in the old style format.

[1] https://www.mail-archive.com/wmaker-dev@lists.windowmaker.org/msg07097.html
2017-08-13 10:34:46 +01:00
Doug Torrance ad4545b1d8 debian: Update with version 0.95.8-1 packaging. 2017-07-09 22:26:51 +01:00
Doug Torrance ee36395ddf debian: Update with version 0.95.8-1~exp2 packaging. 2017-07-08 23:18:22 +01:00
Doug Torrance ff865c31f0 wmmenugen: Sort menu entries with no category into 'Other'. 2017-07-07 09:59:29 +01:00
Doug Torrance adc1687f98 wmmenugen: Use 'Other' instead of 'Applications' for unknown categories.
From https://standards.freedesktop.org/menu-spec/latest/apa.html:

 Category-based menus based on the Main Categories listed in this
 specification do not provide a complete ontology for all available
 applications. Category-based menu implementations SHOULD therefore provide
 a "catch-all" submenu for applications that cannot be appropriately placed
 elsewhere.

Emphasis on *submenu*.  By using 'Applications', these menu entries were
sorted into the top level.
2017-07-07 09:59:29 +01:00
Doug Torrance ac0690b324 wmmenugen: Add reserved categories.
From https://standards.freedesktop.org/menu-spec/latest/apas03.html:

Reserved Categories have a desktop-specific meaning that has not been
standardized (yet). Desktop entry files that use a reserved category MUST
also include an appropriate OnlyShowIn= entry to restrict themselves to
those environments that properly support the reserved category as used.
2017-07-07 09:59:29 +01:00
Doug Torrance c261f8ec35 wmmenugen: Add missing 'Science' menu category.
See https://standards.freedesktop.org/menu-spec/latest/apa.html
2017-07-07 09:59:29 +01:00
Christophe CURIS e037ae3684 util: fix parsing of XDG menus with multiple groups
The specification for XDG menu files allows having more than one group and
assumes no constraint on their order. The original code assumed that once
the proper group marker was found, everything after was part of it, causing
misinterpretation of some data, like taking the wrong launch command.

This patch stops the parsing of the menu XDG file when a new group is
found, hence implementing the expected behaviour.

Reported-by: Andreas Metzler <ametzler@bebt.de>
2017-07-03 14:45:26 +01:00
Doug Torrance 83f0b764e6 WINGs: Set widget background pixmaps before realization.
Previously, when WMSetWidgetBackgroundPixmap() was called prior to
WMRealizeWidget(), no background pixmap was actually set.

This is because while the CWBackPixmap bit is correctly set to 1, the
CWBackPixel bit remains set to 1.  When XCreateWindow() is finally
called during realization, the background pixel takes precendence over the
background pixmap.

We fix this by setting CWBackPixel to 0 when setting CWBackPixmap to 1 and
vice versa.
2017-03-22 09:26:24 +00:00
Doug Torrance 3140c09240 wmaker: Consistent configuration options.
The default configuration options are given in two places in the source
code:
  - src/default.c
  - WindowMaker/Defaults/WindowMaker.in

The defaults are initially set in the former, but are then overwritten by
the latter.

Ideally, the default options in these two locations should coincide.
However, there are currently several issues.
- Many of the options are missing from WindowMaker/Defaults/WindowMaker.in
- Many of the options have conflicting defaults between the two locations.
- A number of options given in WindowMaker/Defaults/WindowMaker.in no longer
  exist.

In this patch, we bring the defaults in the two locations in line with one
another.  We have given preference to the defaults in W/D/WindowMaker, as
these are the one users have been used to.

Some of the paths in IconPath and PixmapPath have been removed.  In
particular, the various system pixmap paths (/usr/include/X11/pixmaps,
/usr/share/pixmaps, and /usr/local/share/pixmaps) have been removed in
favor of PIXMAPDIR, which is specified by the user at build.  Also,
/usr/share/icons has been removed from IconPath.  The root of this
directory will contain very few icons, as the icons themselves are located
in subdirectories corresponding to XDG icon themes.

We add a comment to src/defaults.c to remind future developers who
add or remove options to change the default values in both locations.

We also take the opportunity to remove the unused DEF_INFO_TEXT_FONT
macro.
2017-03-22 09:26:24 +00:00
Doug Torrance 8fba9945e0 WPrefs: Properly read system fonts in font configuration panel.
Previously, only the user's WMGLOBAL file would be read to determine the
current WINGs fonts (System Font and Bold System Font) in the Font
Configuration panel.  It is quite possible that this information would
not be in the user's WMGLOBAL file, but instead in the system WMGLOBAL
file.

We instead use the WMDefaultSystemFont and WMBoldDefaultSystemFont
functions to get this information.
2017-03-20 18:06:12 +00:00
Carlos R. Mafra 30cd22859a Merge branch 'master' into next
I forgot to add the wmaker 0.95.8 commit back into the next
branch. Doing it now.
2017-03-20 18:03:24 +00:00
Doug Torrance e13cfcd093 debian: Don't try to install scripts/manpages which have been removed. 2017-03-16 15:26:39 +00:00
Doug Torrance c2a03a3de5 debian: Update with version 0.95.8-1~exp1 packaging. 2017-03-15 16:50:42 +00:00
Doug Torrance db6b50e6c1 doc: Remove manpage for upgrade-windowmaker-defaults script.
This script is only available in the Debian package, is very out of date,
and will be soon be removed.
2017-03-12 00:12:18 +00:00
Doug Torrance fa8121ee61 wmaker/WPrefs: Remove legacy support for deprecated apercus.
Replaced by minipreviews in December 2014.  Over two years have passed.
2017-03-12 00:12:18 +00:00
Doug Torrance f6320d4fa5 configure: Remove deprecated --with-nlsdir option.
Deprecated in December 2014, and over two years have passed.
2017-03-12 00:12:18 +00:00
Doug Torrance cea5f6107c WINGs/wrlib: Remove deprecated get-*-flags scripts.
These have been replaced by pkg-config.  Christophe left a note in January
2015 to remove them, and this time has now passed.
2017-03-12 00:12:18 +00:00
355 changed files with 8093 additions and 8453 deletions
+15
View File
@@ -87,6 +87,7 @@ WINGs/WUtil.pc
wrlib/libwraster.map
WindowMaker/appearance.menu
WindowMaker/menu
WindowMaker/menu.bg
WindowMaker/menu.fi
@@ -105,9 +106,13 @@ WindowMaker/plmenu.fy
WindowMaker/plmenu.ja
WindowMaker/plmenu.ko
WindowMaker/plmenu.nl
WindowMaker/plmenu.pl
WindowMaker/plmenu.ro
WindowMaker/plmenu.sk
WindowMaker/plmenu.zh_CN
WindowMaker/plmenu.zh_TW
WindowMaker/wmmacros
WindowMaker/Defaults/WMRootMenu
WindowMaker/Defaults/WMState
@@ -115,6 +120,16 @@ WindowMaker/Defaults/WMWindowAttributes
WindowMaker/Defaults/WindowMaker
WindowMaker/IconSets/Default.iconset
# These files are generated by the i18n process
/po/WindowMaker.pot
/po/*.mo
/WINGs/po/WINGs.pot
/WINGs/po/*.mo
/WPrefs.app/po/WPrefs.pot
/WPrefs.app/po/*.mo
/util/po/*.pot
/util/po/*.mo
# Some text editors generate backup files
*~
+1 -1
View File
@@ -4,7 +4,7 @@
If you find a bug please fill this form and send it to
wmaker-dev@lists.windowmaker.org Please, USE THIS FORM!!!
wmaker-dev@googlegroups.com Please, USE THIS FORM!!!
0. Before reporting this bug I already:
[ ] read the NEWS, README and INSTALL files
+65 -65
View File
@@ -2810,7 +2810,7 @@ Changes since version 0.92.0:
platforms with a recent pkg-config (debian unstable/sid for one)
- Fixed buggy handling of UTF8 characters in textfields in WINGs.
(Stanislav Maslovski <stanislav.maslovski@gmail.com>)
- Fixed segfault in WPrefs when some font description is missing from the
- Fixed segfault in WPrefs when some font description is missing from the
configuration file (Stanislav Maslovski <stanislav.maslovski@gmail.com>)
- Removed WINGs' dependency on rgb.txt (from X11) and issues with locating it
on the filesystem for different systems/distributions.
@@ -2891,11 +2891,11 @@ Changes since version 0.80.2:
- Removed obsoleted acconfig.h and implemented its functionality using
AC_DEFINE and AC_DEFINE_UNQUOTED as autoconf 2.5x recommends.
This will definitely enforce the need to use autoconf 2.5x
- Added Xft2 support to WINGs, for rendering antialiased fonts with
- Added Xft2 support to WINGs, for rendering antialiased fonts with
transparency. Details in WINGs/ChangeLog.
- Fixed problem with long, preset workspace names (Wanderlei Antonio Cavassin
- Fixed problem with long, preset workspace names (Wanderlei Antonio Cavassin
<cavassin@conectiva.com.br>)
- Added kinput2 bug workaround to stock WMWindowAttributes (Seiichi SATO
- Added kinput2 bug workaround to stock WMWindowAttributes (Seiichi SATO
<sato@cvs-net.co.jp>)
- Added Belarusian translation (Ihar Viarheichyk <iverg@mail.ru>)
- Fixed wrlib not to load braindead images with 0 sized width or height
@@ -2966,7 +2966,7 @@ Changes since version 0.80.2:
- Made maximize behave differently with keyboard/mouse for xinerama
(Peter Zijlstra <a.p.zijlstra@chello.nl>)
- A few leftover xinerama fixes (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Extended the 'strut' to multiple heads
- Extended the 'strut' to multiple heads
(Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Icon placement now takes into account the new xinerama extended 'strut'
(Peter Zijlstra <a.p.zijlstra@chello.nl>)
@@ -3012,7 +3012,7 @@ Changes since version 0.80.2:
by Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Applied patch to enhance the Virtual Desktop behaviour, and to integrate
it with the NetWM code (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Applied a few xinerama and placement fixes (Peter Zijlstra
- Applied a few xinerama and placement fixes (Peter Zijlstra
<a.p.zijlstra@chello.nl>)
- Fixed memory leak in dock code.
- Fixed and enhanced the text wrapping in WINGs.
@@ -3036,7 +3036,7 @@ Changes since version 0.80.2:
- MacOS X style window switching panel (navigate through windows with Alt-Tab
or arrow keys)
- Added support for NET_WM_NAME/NET_WM_ICON_NAME
- Moved out font name conversion code from getstyle/setstyle/convertfonts and
- Moved out font name conversion code from getstyle/setstyle/convertfonts and
made it support fontsets
- Converted all menu and po files to UTF-8
- Updated de.po (Thomas Otto <3.1415926535897932384626433832@gmx.net>)
@@ -3059,8 +3059,8 @@ Changes since version 0.80.0:
WMState.<number> file on multihead system.
- Fixed problem with keyboard shortcuts executed an every screen for
multihead systems.
- Updated traditional chinese translations
- Fixed buglet in non-caching rootmenu option
- Updated traditional chinese translations
- Fixed buglet in non-caching rootmenu option
("John H. Robinson, IV" <jhriv@ucsd.edu>)
- Added Malay translation
- Fixed problem with kcalc not having a miniaturize button.
@@ -3081,7 +3081,7 @@ Changes since version 0.80.0:
- Added Greek (el) language pixmap (Michalis Kabrianis <Michalis@bigfoot.com>)
- Fixes icons being reduced twice when icon size != 64x64
Eduardo Pereira Habkost <ehabkost@conectiva.com.br>
- Fixed a bug that crashed wmaker when selecting the "Start alternate window
- Fixed a bug that crashed wmaker when selecting the "Start alternate window
manager" option in the crashing dialog panel.
- Window Maker will now use the WINDOWMAKER_ALT_WM environment variable (if
it is defined) to overwrite the default hardcoded fallback window manager.
@@ -3090,7 +3090,7 @@ Changes since version 0.80.0:
"Keep on Top" option is active.
- Added ability to browse for files/directories in the WPrefs menu editor.
- Added Czech translations of documentation (Jiri Hnidek <Jiri.Hnidek@vslib.cz>)
- Fixed segfault with incomplete WM_CLASS specifications.
- Fixed segfault with incomplete WM_CLASS specifications.
- Fixed a bug about arranging subviews in a WMBox after removing a subview
and a memleak occuring in the same situation.
- Fixed a bug in wdread
@@ -3102,7 +3102,7 @@ Changes since version 0.80.0:
Changes since version 0.70.0:
.............................
- Disabled window birth animation by default (while it was ok with normal
- Disabled window birth animation by default (while it was ok with normal
windows, it was very annoying with menus editing in WPrefs.app)
- Added ability to shade/unshade a window using the mouse wheel.
- Fixed compilation for systems that required -lintl for WINGs
@@ -3119,7 +3119,7 @@ Changes since version 0.70.0:
saving dock/clip/session information on exit.
- Added an internal strcasecmp() to WINGs (only on systems where's not present)
- Deminiaturizing a window that is also shaded, will perform an unshade too.
(Note that this only applies to deminiaturizing shaded windows. Unhiding
(Note that this only applies to deminiaturizing shaded windows. Unhiding
an application will keep the shaded/unshaded state of windows.)
- Removed compile time option for definable cursors and made them available by
default.
@@ -3127,7 +3127,7 @@ Changes since version 0.70.0:
will unhide the application.
- Added || pipe menu for generating non-cached menus
- Removed the collapse appicons thing.
- Added real appicon sharing (apps of the same kind will have a single shared
- Added real appicon sharing (apps of the same kind will have a single shared
appicon).
- Fixed user and global defaults domain merging to preserve values present in
global but not in user, in sub-dictionaries.
@@ -3158,7 +3158,7 @@ Changes since version 0.65.1:
(Marcelo E. Magallon <marcelo.magallon@bigfoot.com>)
- fixed crash with broken apps that set null WM_CLASS
- fixed crash when with gnome panel and multi-screens, some menu
updates and applied various other patches from
updates and applied various other patches from
(Crutcher Dunnavant <crutcher@redhat.com>)
- po file fixes (Crutcher Dunnavant <crutcher@redhat.com>)
- replaced I18N_MB with I18N in one place in src/wconfig.h.in
@@ -3187,7 +3187,7 @@ Changes since version 0.65.1:
More details about this can be found in WINGs/ChangeLog and WINGs/NEWS.
Say bye, bye libPropList =)
- rewrote all Window Maker code to use the new WINGs based proplist functions.
- fixed a few compilation warnings and a problem caused by an uninitialized
- fixed a few compilation warnings and a problem caused by an uninitialized
variable.
@@ -3229,7 +3229,7 @@ Changes since version 0.64.0:
- use Hermes in wrlib
- removed MOUSE_WS_WHEEL #defines
- fixed bug with multibyte text on libc5 systems (Osamu Ajiki <osam-a@astroarts.co.jp>)
- fixed race conditions on signal handlers
- fixed race conditions on signal handlers
- SIGINT will gently exit, SIGTERM will not be handled
- When Window Maker calls wmsetbg to set the background, it will consider the
value of the DisableDithering option and pass the right switch to wmsetbg.
@@ -3240,7 +3240,7 @@ Changes since version 0.64.0:
desktop level.
- Fixed incorrect parsing of display and screen number from $DISPLAY.
- Organized the inspector panel a bit better.
- Replaced bags with arrays wherever appropriate. This will improve
- Replaced bags with arrays wherever appropriate. This will improve
performance a bit.
- Made the Gnome tasklist skip the windows with the "Skip window list" flag
enabled. (Bastien Nocera <hadess@hadess.net>)
@@ -3258,11 +3258,11 @@ Changes since version 0.64.0:
- Added retain/release mechanism for RImages. RDestroyImage() has become
obsolete. More about this can be found in wrlib/Changelog and wrlib/NEWS.
- Small API change in WINGs to allow images with alpha blending set as the
application icons be shown correctly. More about this in WINGs/Changelog
application icons be shown correctly. More about this in WINGs/Changelog
and WINGs/NEWS.
- Made images with alpha blending be shown correctly in the panels and the
icon chooser.
- The icon image set to be shown in panels ("Logo.WMPanel") will be
- The icon image set to be shown in panels ("Logo.WMPanel") will be
automatically updated if its entry in WMWindowAttributes changes (without
a need to restart as until now).
- Fixed a bug in the icon chooser dialog that made the selected icon look
@@ -3282,7 +3282,7 @@ Changes since version 0.64.0:
Changes since version 0.63.1:
.............................
- fixed messup in get-{wings,wutil,wraster}-flags
- fixed #wmdatadir# substitution in wmaker.inst
- fixed #wmdatadir# substitution in wmaker.inst
(Seiichi SATO <sato@cvs-net.co.jp>)
- Removed spurious focus disabling for GNUstep applications - but retain
code that lets GNUstep apps control their window titlebar.
@@ -3323,7 +3323,7 @@ Changes since version 0.62.1:
- added wmagnify utility
- changed behaviour of control/shift double click on titlebar for maximize
- updated getstyle to account for extendspace options
- fixed weird color bug in jpeg loader
- fixed weird color bug in jpeg loader
(Alban Hertroys <dalroi@wit401310.student.utwente.nl>)
- improved and simplified fonts configuration for multibyte languages
(Tomohiro KUBOTA <kubota@debian.or.jp>)
@@ -3337,7 +3337,7 @@ Changes since version 0.62.1:
- fixed bug with incorrect window placement using automatic placement, while
there were shaded windows on other workspaces
- fixed some buffer overflow issues in WINGs
- fixed bug with WPrefs.app not selecting the menu appearance options after
- fixed bug with WPrefs.app not selecting the menu appearance options after
startup.
- replaced free() with wfree() wherever appropriate
- fixed some memory leaks generated by wstrappend()
@@ -3401,7 +3401,7 @@ Changes since version 0.61.1:
- changed semantics of GNUstep window attribute hints
- added get-wings-flags and get-wutil-flags with the same purpose as
get-wraster-flags, but for compiling and linking with WINGs/WUtil
- fixed bug handling non-string values given to string valued options in
- fixed bug handling non-string values given to string valued options in
defaults.c
- fixed colormap_window crash bug (appears when launching some apps from dock,
or removing apps from gnome panel etc)
@@ -3420,7 +3420,7 @@ Changes since version 0.61.1:
- added Jim Knoble <jmknoble@pobox.com>'s cursor thing patch
- fixed lock of wmaker when clicking on menu multiple times
- made transients appear near their owner
- fixed crash bug with broken java implementations (Miguel Covarrubias
- fixed crash bug with broken java implementations (Miguel Covarrubias
<mcovarr@tigr.org>)
- made Revert on attributes panel apply the reverted changes immediately
to avoid inconsistent internal state
@@ -3438,7 +3438,7 @@ Changes since version 0.61.0:
- fixed OPEN_MENU
- fixed crash when moving a shaded window with keyboard
- fixed problem with window shortcut assignment from the menu
- fixed problem with fonts in WINGs (Masahide -mac- NODA
- fixed problem with fonts in WINGs (Masahide -mac- NODA
<mac@flab.fujitsu.co.jp>)
- fixed multihead bugs (Morten Bøgeskov" <mb@dbc.dk>)
- fixed crashing bug when saving session information.
@@ -3465,7 +3465,7 @@ Changes since version 0.60.0:
- added missing kbd shortcut definitions for window shortcuts
(Michael Smith <mjsmith@spirit.com.au>)
- fixed floppy button layout in filepanel (Matthew Ashton <mrashton@home.com>)
- fixed bug with documentedited close button (Felipe A. Rodriguez
- fixed bug with documentedited close button (Felipe A. Rodriguez
<farz@mindspring.com>)
- fixed some buffer overflows
- fixed some problem with the alpha
@@ -3481,7 +3481,7 @@ Changes since version 0.60.0:
- removed drop shadow for text on title bar code. (TITLE_TEXT_SHADOW)
- text on title bar is now possible to be drawn by plugin. See NEWS.
- WPrefs: added support for button4/5
- fixed scrolling of menus outside screen (Vito Caputo
- fixed scrolling of menus outside screen (Vito Caputo
<swivel@virtual-webworld.com)
- added dialog window for menu commands that can't be executed
- fixed crash when deiconifying windows when icons are disabled
@@ -3511,7 +3511,7 @@ Changes since version 0.53.0:
- fixed crash when changing icon of window without WM_CLASS
- added hysteresys for offscreen menu scrollback
- fixed bug with IgnoreFocusClick
- fixed crash with windows with width == 1 (Alban Hertroys
- fixed crash with windows with width == 1 (Alban Hertroys
<dalroi@wit401310.student.utwente.nl>)
- added SHEXEC command
- fixed resizebarback for SHADOW_RESIZEBAR ( jim knoble jmknoble@pobox.com)
@@ -3631,7 +3631,7 @@ Changes since version 0.51.1:
- fixed bug with window that can get focus if both shaded and hidden.
- maximize for full screen
- fixed problem with frame drawing in non-opaque
- fixed problem with frame drawing in non-opaque
- fixed installation path prob [jmknoble@pobox.com]
- fixed bug moving window when only one window is on screen
- fixed bug with ignored GNUstep attributes
@@ -3727,7 +3727,7 @@ Changes since version 0.50.1:
- fixed wmsetbg
- fixed parsing of WorkspaceSpecificBack
- fixed initial workspace for new windows
- added the workspace button proxy thingy for GNOME
- added the workspace button proxy thingy for GNOME
- added more GNOME compatibility fixes
- fixed bug in %a() macro in root menu
@@ -3901,7 +3901,7 @@ Changes since version 0.19.3:
.............................
- fixed crash when closing windows in autoraise
- fixed a memory leak
- fixed a memory leak
- fixed a crash when closing Lotus Notes
- rewrote colormap code
- incomplete multihead support
@@ -4014,7 +4014,7 @@ Changes since version 0.17.5:
.............................
- fixed handling of signals when the X event queue is empty
- fixed blank window titles
- fixed blank window titles
- made current workspace entry be disabled in Move To window menu command, and
in the Clip's Move To submenu.
- fixed menu width calculation
@@ -4025,7 +4025,7 @@ Changes since version 0.17.5:
- added a hack to make everything work even if NumLock or ScrollLock is on
- added a little more verbosity to error messages
- fixed kluged workspace menu in clip
- removed workspace menu mapped through the microbutton in the clip.
- removed workspace menu mapped through the microbutton in the clip.
- remade clip button layout to be more usable
- fixed bug with keepontop and apps with Motif hints (x11amp)
- changed menu border drawing
@@ -4063,7 +4063,7 @@ Changes since version 0.17.5:
icons
- fixed bug in focusfollowmouse that made windows under the currently
focused window that close, to not get the focus
- if the app is a .app, it will try to find it's icon in the .app
- if the app is a .app, it will try to find its icon in the .app
directory and save it in the WMWindowAttributes, so that the dock can use it.
- drag docklets that select for mouse events to with Alt+drag
@@ -4091,7 +4091,7 @@ Changes since version 0.17.3:
- fixed bug with rootmenu that caused twin menus to be left mapped
- added DontConfirmKill option to remove confirmation panel for Kill
- fixed bug with hide of app with wmaker menu
- changed all NSsomething internal flags for the GNUstep attributes to
- changed all NSsomething internal flags for the GNUstep attributes to
WMsomething
Changes since version 0.17.2:
@@ -4099,7 +4099,7 @@ Changes since version 0.17.2:
- fixed bug in attributes panel with Disable Resizebar
- fixed save in attribs panel with windows other than the client leader
- bug in attribs panel with Revert that made it save attributes with the
- bug in attribs panel with Revert that made it save attributes with the
wrong name
- fixed (by kluging) bugs related to destroying dialog panels in a bad order
- fixed various bug with hide in empty screens
@@ -4206,7 +4206,7 @@ Changes since version 0.16.0:
- Added autoscroll for scrollers in WINGs.
- Optimized WMList and WMBrowser in WINGs.
- Button2 on clip opens workspace menu
- Changed cycling colors of selected icons.
- Changed cycling colors of selected icons.
- Made icon chooser display a better rendering of alpha-channeled icons.
- Sorted list/browser entries.
- Fixed bug in timer code that was causing some timer events to be lost.
@@ -4243,11 +4243,11 @@ Changes since version 0.15.1:
- clicking on the appicon switches to the workspace where the app was last
focused before unhiding
- fixed problem with aspect ratio setting (gr_osview etc.)
- changed some extensions in the default config/data files and removed
- changed some extensions in the default config/data files and removed
Sound.{xpm,tif} because it seem to be copyrighted.
- added icon selection panel
- changed selection indication of icons. Removed SClipColor option
- simplified animation speed options (IconSlideDelay, IconDelayStep,
- simplified animation speed options (IconSlideDelay, IconDelayStep,
MenuScrollDelay, MenuScrollStep etc. etc) to IconSlideSpeed etc.
- removed Start miniaturized/hidden items from Dock/Clip and added them
as attributes
@@ -4319,7 +4319,7 @@ Changes since version 0.15.0:
window is correctly updated if the font size is changed while running.
- Deleted unnecessary redrawing code in moveres.c.
- Many fixes to moveres.c.
- Put all the keys from defaults.c in WindowMaker domain database.
- Put all the keys from defaults.c in WindowMaker domain database.
- Fixed a crashing bug when workspace names were as long (or longer) as
MAX_WORKSPACENAME_WIDTH (16 characters). In this case a right click on a
window title caused WindowMaker to crash.
@@ -4622,7 +4622,7 @@ Changes since version 0.12.1:
Changes since version 0.12.0:
.............................
- now maintained by Matthew Hawkins <matt@mail.goldweb.com.au> while our
- now maintained by Matthew Hawkins <matt@mail.goldweb.com.au> while our
esteemed friend Alfredo is away. Have a great holiday in Japan, mate!
- fixed __DuMmY install problems
- made NextMenuBehaviour and ScrollableMenus run-time configuration options
@@ -4634,7 +4634,7 @@ Changes since version 0.11.1:
- added Launch command in dock menu
- fixed manual window placement
- fixed problem during installation in po/ directory
- changed Command format for dock state
- changed Command format for dock state
- added OffiX DND support for the dock
- added Move To submenu in window commands menu
- right click on root window does not deselect windows (to allow workspace
@@ -4650,7 +4650,7 @@ Changes since version 0.11.1:
Changes since version 0.11.0:
.............................
- fixed bug with menus that caused wmaker to crash
- fixed bug with menus that caused wmaker to crash
- brought program parameter dialog box back
- fixed autoplacement
- changed window matching precedence for WMWindowAttributes (complete, just
@@ -4671,7 +4671,7 @@ Changes since version 0.10.2:
- fixed maximize bug
- added a widget set and new dialog panels
- fixed titlebar update after font change
- renamed back _WINDOWMAKER_COMMAND to _WINDOWMAKER_WM_FUNCTION
- renamed back _WINDOWMAKER_COMMAND to _WINDOWMAKER_WM_FUNCTION
- fixed bug with miniaturization of bad behaved apps (vtcl)
Changes since version 0.10.1:
@@ -4721,7 +4721,7 @@ pipe
- more apps can be docked (ghostview et. al)
- fixed diagonal/horizontal resize detection to be like in NS
- simplified titlebar button code: removed possibility to add more buttons
- fixed window gravity handling (xclock -geometry 100x100-0-0)
- fixed window gravity handling (xclock -geometry 100x100-0-0)
- removed shadeable window attribute, added DontMoveOff
- window resize with Meta-Click3 on window
- fixed bug that caused keyboard locks if a invalid key was used in a shortcut
@@ -4831,20 +4831,20 @@ has quit. (probably the same problem with XFMail and others)
- better handling of long text
- limited windowlist menu width
- fixed arrange icons
- changed geometry display to account for base size if it's not in
- changed geometry display to account for base size if it's not in
the technical drawing style
- meta-dbl-click on appicon does hide others
- meta-dbl-click on appicon does hide others
- changed RaiseOnFocus option with RaiseDelay
- dbl-click on root window or open submenu entry brings the root menu
- dbl-click on root window or open submenu entry brings the root menu
to the cursor.
- removed AllowMenuLowering option and made menu ontopness work like on dock
- changed meta-click on dock with meta-dbl-click, to change ontopness
- moved gradient and image code to a library.
- changed meta-click on dock with meta-dbl-click, to change ontopness
- moved gradient and image code to a library.
- added support for icons with alpha channel
- simplified dithering setup
- many clean ups
- many clean ups
- not-so-good looking gradients for 8bpp
- changed application menu stuff
- changed application menu stuff
- started wmaker client library. Try out test/test.c
@@ -4889,7 +4889,7 @@ Changes since version 0.4.2:
- fixed docking on left side dock
- fixed bug in window command menu
- fixed bug in narrow windows with NEWSTYLE enabled
- fixed Hide Others crash
- fixed Hide Others crash
- I18N fixes
- hopefully stable again
@@ -4934,13 +4934,13 @@ Changes since version 0.3.2:
- application icons (not mini-windows) like I think how it is on NEXTSTEP(tm)
- fixed "slippery" icon movement
- added a Dock (not for GNUstep, as it will have it's own)
- added a Dock (not for GNUstep, as it will have its own)
Changes since version 0.3.1:
............................
- fixed bug that caused window frames to be left after window closure
- submenus are opened to the left/right if it is too close to the right/left
- submenus are opened to the left/right if it is too close to the right/left
edge (not perfect, but better than before)
- remember window state (shade) on restart
- fixed resize bug
@@ -4957,14 +4957,14 @@ Changes since version 0.3.0:
- added diagonal gradients
- ignoreHideOthers window flag
- optimized/fixed window raising and lowering
- fixed menu handling: don't need to click on the menu after
- fixed menu handling: don't need to click on the menu after
it's opened to select items, just drag the pointer
- _GNUSTEP_WM_RESIZE_WINDOW, _GNUSTEP_WM_RESIZED_WINDOW protocols
- application specified titlebar button pixmaps
- transient owners get a different titlebar color when the focus
is in the transient (e.g, in NeXTese: mainWindow is highlighted correctly when
the keyWindow is a panel)
- when transient is closed, it's owner always get the focus
- when transient is closed, its owner always get the focus
- fixed XGrabButton/BadAccess bug
- fixed window_count error (this time I'm 90% sure)
- fixed focusNextWindow through Alt-Tab bug with non-focusable windows
@@ -4985,10 +4985,10 @@ with accidental dbl-clicks on the root menu.
- remade application group code (more stable)
- undid stacking code change from 0.2.0
- fixed bug that caused hangs (not sure)
- fixed bug that caused window_count error and associated crashes
- fixed bug that caused window_count error and associated crashes
- remade application defined menus
- vertical gradient
- I18N support
- I18N support
- fixed multiple window selection bug with windows in other workspaces
- changed workspace numbering
- fixed problem with series of X errors when a window is destroyed
@@ -5026,7 +5026,7 @@ you focus a shaded window
- fixed bug that allowed on top window to be lowered
- disappearing xconsole and other initial-state==IconicState windows fixed
- menus open always inside screen area
- open submenus are moved with their parents
- open submenus are moved with their parents
- keyboard support
- faster menu drawing
- hide for applications that use window_group hint fixed (LyX et al)
@@ -5089,7 +5089,7 @@ Changes since version 0.0.4:
- added cpp preprocessing
- zombie process bug fixed
- interactive and dumb (cascade) window placement
- floating transient windows
- floating transient windows
- disable mapped submenu entry on parent
- added colormap handling stolen from fvwm (temporary)
@@ -5097,10 +5097,10 @@ Changes since version 0.0.4:
Changes since version 0.0.3:
............................
- hide application implemented (just for apps that have the window_group
field of WMHints set or the WM_CLIENT_LEADER property set,
- hide application implemented (just for apps that have the window_group
field of WMHints set or the WM_CLIENT_LEADER property set,
apparently most Xt based apps)
- fixed a crashing bug caused by icons
- fixed a crashing bug caused by icons
- internal change on button pixmap structure and other places
- handling of property changes on mapped windows
- fixed bug in event handling (MapRequest)
+363 -363
View File
File diff suppressed because it is too large Load Diff
+29 -2
View File
@@ -41,11 +41,13 @@ EXTRA_DIST = TODO BUGS BUGFORM FAQ INSTALL \
script/check-cmdline-options-doc.sh \
script/check-translation-sources.sh \
script/check-wmaker-loaddef-callbacks.sh \
script/generate-html-from-man.sh \
script/generate-mapfile-from-header.sh \
script/generate-po-from-template.sh \
script/generate-txt-from-texi.sh \
script/nested-func-to-macro.sh \
script/replace-ac-keywords.sh
script/replace-ac-keywords.sh \
script/replace-generated-content.sh
.PHONY: coverage-reset coverage
@@ -62,6 +64,10 @@ coverage:
genhtml --output-directory @lcov_output_directory@ coverage/coverage.info
endif
################################################################################
# Section for the I18N processing
################################################################################
# make update-lang PO=<lang>
# ==========================
# Update the PO files against the POT file in all the translation sub-directories
@@ -80,13 +86,34 @@ if HAVE_XGETTEXT
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) update-lang || exit $$?); \
done
SUBDIRS_PO = WINGs/po po util/po WPrefs.app/po
SUBDIRS_PO = wrlib/po WINGs/po po util/po WPrefs.app/po
else
@echo "Error: the program 'xgettext' was not found by configure, it is mandatory for this operation" >&2 ; exit 1
endif
.PHONY: update-lang
################################################################################
# Section related to generating HTML content for the website
################################################################################
if WITH_WEB_REPO
SUBDIRS_WEB = doc
website:
@for subdir in $(SUBDIRS_WEB); do \
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) website || exit $$?); \
done
endif
.PHONY: website
################################################################################
# Section for the automated checks
################################################################################
# Create a 'silent-rule' for our make check the same way automake does
AM_V_CHKOPTS = $(am__v_CHKOPTS_$(V))
am__v_CHKOPTS_ = $(am__v_CHKOPTS_$(AM_DEFAULT_VERBOSITY))
+33 -3
View File
@@ -1,6 +1,36 @@
NEWS for veteran Window Maker users
-----------------------------------
-- 0.95.9
Configurable SwitchPanel
------------------------
SwitchPanel is now more configurable: you can configure the switch panel icon
size by setting the "SwitchPanelIconSize" option to your preferred value in
~/GNUstep/Defaults/WindowMaker. The font size used in this panel now is also
sensible to changes in the system font.
New user configuration directory environment variable
-----------------------------------------------------
In previous versions, the GNUstep directory used to store a user's Window Maker
configuration files was specified by the GNUSTEP_USER_ROOT environment variable,
which defaulted to ~/GNUstep. However, this environment variable was deprecated
in gnustep-make v2. Therefore, it has been replaced by the WMAKER_USER_ROOT
environment variable.
libXmu is now an optional dependency
------------------------------------
If the library is not found, compilation work, the only limitation will arise
when trying to install the standard colormap on displays which are not TrueColor.
Please note that if you have the library but not the headers, configure will
still stop; there is no user option to explicitly disable the library use.
-- 0.95.8
Move pointer with maximized windows
@@ -1613,7 +1643,7 @@ raising/lowering there is a time threshold before raising/lowering.
The thresholds can be changed in wconfig.h by changing one or both of
AUTO_LOWER_DELAY and AUTO_RAISE_DELAY (expressed in milliseconds).
For example if you set AUTO_RAISE_DELAY to 0, then the Clip will be raised as
soon as the mouse pointer enters it's area. Setting AUTO_RAISE_DELAY to a very
soon as the mouse pointer enters its area. Setting AUTO_RAISE_DELAY to a very
big value, will make the Clip to practically do not auto raise unless clicked,
but to be automatically lowered after AUTO_LOWER_DELAY (ms) when leaved.
@@ -2542,7 +2572,7 @@ The OPEN_MENU command now supports the following syntax:
// it in current position
OPEN_MENU file.menu
2. Pipe menu handling.
// opens command and uses it's stdout to construct menu.
// opens command and uses its stdout to construct menu.
// Command's output must be a valid menu description.
OPEN_MENU | command
3. Directory handling.
@@ -3145,7 +3175,7 @@ when they are first mapped
titlebar gradients are in a single piece now
the WMDock file was merged into the WMState file. You can insert this
file in WMState and set it's key to Dock. For example, if your WMDock
file in WMState and set its key to Dock. For example, if your WMDock
contains:
{
+5 -5
View File
@@ -129,8 +129,8 @@ HELP ME!!!
==========
There is a mailing list for discussing Window Maker at
wmaker-user@lists.windowmaker.org To subscribe to it, send a message to
wmaker-user-subscribe@lists.windowmaker.org
wmaker-user@googlegroups.com. To subscribe to it, visit
https://groups.google.com/forum/#!forum/wmaker-user
If you got a problem, ask there (after reading the docs, of course). The people
there is more likely to be able to answer your questions than we are. For bug
@@ -178,7 +178,7 @@ Running multiple instances of Window Maker
It is not a good idea to run more than one instance of Window Maker
from the same user (so that wmaker will use the same configuration files) at the
same time. You might get unexpected behavior when Window Maker updates it's
same time. You might get unexpected behavior when Window Maker updates its
configuration files.
If you really desire to do this, try running Window Maker with the command line
@@ -209,7 +209,7 @@ while keeping a nice appearance and good functionality, follow the items bellow:
- remove support for image formats you don't use
- to reduce memory usage, disable the icon cache, by setting the RIMAGE_CACHE
environment variable to 0. If you want to increase performance at the cost of
memory usage, set it's value to a value like the number of different icons you
memory usage, set its value to a value like the number of different icons you
use. Also, disable anti-aliased text support in ~/GNUstep/Defaults/WMGLOBAL.
@@ -311,5 +311,5 @@ project. The name of people who have helped with localization (translation) can
be found in po/README and Window Maker/README
If you have any comments, fixes and bug reports (filled BUGFORMs) send them
to wmaker-dev@lists.windowmaker.org
to wmaker-dev@googlegroups.com
+3 -3
View File
@@ -134,7 +134,7 @@ Sending the patch to the mailing list
Send your patches to:
wmaker-dev@lists.windowmaker.org
wmaker-dev@googlegroups.com
Please do not send patches to any individual developer unless you have a very
good reason to avoid more people being able to comment (and improve) on your
@@ -147,7 +147,7 @@ you, otherwise you may face the problems below. Doing this is really easy:
# (of course, replace smtp.example.com with your ISP's)
git config --global sendemail.smtpserver "smtp.example.com"
git config --global sendemail.validate true
git config sendemail.to "Window Maker Devel <wmaker-dev@lists.windowmaker.org>"
git config sendemail.to "Window Maker Devel <wmaker-dev@googlegroups.com>"
# If you're sending more than 1 patch, you may be interested in having an
# introduction mail for the batch:
@@ -205,7 +205,7 @@ Example .gitconfig
ui = auto
[apply]
whitespace = fix
+15 -15
View File
@@ -63,7 +63,7 @@ Changes since wmaker 0.80.1:
- Fixed small memory leak in the font panel code.
- Fixed call to qsort in WMSortArray.
- Fixed a memleak in the file panel.
- Double/triple-click selection in text widgets
- Double/triple-click selection in text widgets
(Vitaly Ovtchinnikov <ov@rbcmail.ru>)
- Fixed bug in tableview (clicked row callback got incorrect row)
(Carlos Torres <vlaadbrain@operamail.com>)
@@ -102,7 +102,7 @@ Changes since wmaker 0.70.0:
............................
- added an internal strcasecmp() (only on systems where is not present)
- removed some redundant includes of ../src/config.h when wconfig.h is
- removed some redundant includes of ../src/config.h when wconfig.h is
included too
- removed a wsyserror() message when reading a property list from file
(the programmer should decide if to give that message or just ignore).
@@ -117,7 +117,7 @@ Changes since wmaker 0.65.0:
related error when text was selected in a textfiled.
- moved wstrdup(), wstrconcat() and wstrappend() from memory.c to string.c
- added property list handling code making libPropList unnecessary and
obsolete. Backward compatibility is provided through the
obsolete. Backward compatibility is provided through the
WINGs/proplist-compat.h header file which has #defines from old libPropList
function names to new function names with minimal changes. Read this
header file and the NEWS file for more details about this subject.
@@ -197,7 +197,7 @@ changes since wmaker 0.63.1:
changes since wmaker 0.62.1:
............................
- added WRuler widget
- added WText widget (rtf multiline text widget)
- added WText widget (rtf multiline text widget)
Nwanua Elumeze <nwanua@colorado.edu>
- added a new AUTO option for the UseMultiByte option
- added WMRaiseWidget()/WMLowerWidget()
@@ -217,7 +217,7 @@ changes since wmaker 0.62.1:
- added WMGetListSelectedItems()
- added WMSetListAllowMultipleSelection(), WMListAllowsMultipleSelection().
- added WMSetListAllowEmptySelection(), WMListAllowsEmptySelection().
- WMListSelectionDidChangeNotification passes NULL as the notification
- WMListSelectionDidChangeNotification passes NULL as the notification
client data (previously passed the selected item row).
- added WMUnselectListItem(), WMSelectAllListItems(), WMUnselectAllListItems()
- better behavior of wheel mices in WMList. Simple mouse wheel events
@@ -243,8 +243,8 @@ changes since wmaker 0.62.1:
str1 with str2 and returns that in a newly malloc'ed string.
Be sure to rename wstrappend with wstrconcat in your code too, else
hazardous things can happen!
- implemented a new wstrappend() function. wstrappend(dst, src) will append
src to dst modifing dst and returning a pointer to it. No new string is
- implemented a new wstrappend() function. wstrappend(dst, src) will append
src to dst modifing dst and returning a pointer to it. No new string is
generated, except if dst is NULL, in which case its the same as calling
wstrdup(src).
dst can ONLY be NULL or a dynamically allocated string (obtained from a
@@ -334,7 +334,7 @@ changes since wmaker 0.61.1:
item that is beyond the total number of items present in the popup button.
- changed names of functions for SplitView to be consistent. Some contained
SubView while other Subview. Now all have Subview.
- fixed a bug in how input events were posted. Establishing 2 or more input
- fixed a bug in how input events were posted. Establishing 2 or more input
handlers for the same file descriptor, handling different (read/write/except)
events, caused wrong handlers to be called.
- Reimplemented the input and idle handlers with WMBag to avoid a functional
@@ -346,7 +346,7 @@ changes since wmaker 0.61.1:
2. if new_size is 0, call wfree(old), and return NULL.
3. if both old is a valid pointer and new_size>0, call realloc.
- added wstrerror(int errnum) to return the string associated with errnum.
- new wsyserrorwithcode(int error, const char* fmt, ...), similar to
- new wsyserrorwithcode(int error, const char* fmt, ...), similar to
wsyserror(), but printing the message for the specified error code.
- added 3 new classes: WMData, WMHost and WMConnection
- fixed a big memory leak in the color panel code (from Pascal Hofstee).
@@ -357,7 +357,7 @@ changes since wmaker 0.61.0:
- added WMGetTextFieldFont()
- escape key in panels (craig nellist <crn@ozemail.com.au>)
- applied patch with fixes and enhancements to textfield
- applied patch with fixes and enhancements to textfield
(Franck Wolff <wolff@cybercable.fr>)
- changed WMList to use WMBag internally, instead of a linked list
- replaced WMAddSortedListItem() with WMSortListItems()
@@ -437,10 +437,10 @@ changes since wmaker 0.53.0:
The notifications will still work, but using the delegate is preferable
How to convert old code to delegate callbacks:
1 - create a variable (static or dynamic) of the type of the
1 - create a variable (static or dynamic) of the type of the
delegate for the widget type.
2 - Replace the notification observers with the equivalent
delegate callbacks.
2 - Replace the notification observers with the equivalent
delegate callbacks.
3 - Put pointers to the callbacks in the delegate variable.
Take a look in wfilepanel.c to see how it is used there.
@@ -480,7 +480,7 @@ changes since wmaker 0.51.2:
- added WMColorWellDidChangeNotification
- added wfindfileinarray()
- fixed bug in window title setting
- fixed bug in window title setting
(MANOME Tomonori <manome@itlb.te.noda.sut.ac.jp>)
changes since wmaker 0.51.1:
@@ -611,7 +611,7 @@ I don't remember everything, but here it goes:
The same panel will be reused every time you call for it, unless you free it.
- changed semantics of WMCreateFont() so that it returns NULL if the requested
font can't be loaded
- removed WMAddDestroyCallback()
- removed WMAddDestroyCallback()
- fixed bug in WMRemovePopUpButtonItem()
- added function for user specified item height in WMList
- added WMSetPopUpButtonText(). It will set the default text in the button
+1 -1
View File
@@ -8,7 +8,7 @@ noinst_PROGRAMS = fontl puzzle colorpick
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWUtil.la \
@XFTLIBS@ @INTLIBS@ @XLIBS@
@XFT_LIBS@ @INTLIBS@ @XLIBS@
colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+4 -4
View File
@@ -5,26 +5,26 @@ AUTOMAKE_OPTIONS =
# is this a kluge? if so, how should i do it?
includedir = @includedir@/WINGs
include_HEADERS = wtableview.h wtabledelegates.h
include_HEADERS = wtableview.h wtabledelegates.h
lib_LTLIBRARIES = libExtraWINGs.la
noinst_PROGRAMS = test
EXTRA_DIST =
EXTRA_DIST =
libExtraWINGs_la_SOURCES = \
wtableview.c \
wtabledelegates.c \
wtableview.h \
wtabledelegates.h
wtabledelegates.h
AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWUtil.la \
@XFTLIBS@ @INTLIBS@
@XFT_LIBS@ @INTLIBS@
test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
+4 -4
View File
@@ -11,15 +11,15 @@ WMTableColumnDelegate *WTCreateStringDelegate(WMTableView *table);
WMTableColumnDelegate *WTCreatePixmapStringDelegate(WMTableView *parent);
WMTableColumnDelegate *WTCreateStringEditorDelegate(WMTableView *table);
WMTableColumnDelegate *WTCreateEnumSelectorDelegate(WMTableView *table);
void WTSetEnumSelectorOptions(WMTableColumnDelegate *delegate,
char **options, int count);
WMTableColumnDelegate *WTCreateBooleanSwitchDelegate(WMTableView *parent);
#ifdef __cplusplus
}
#endif
#endif
+8 -9
View File
@@ -8,19 +8,17 @@ DIST_SUBDIRS = $(SUBDIRS) Tests Examples Extras
libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@
libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
dist_bin_SCRIPTS = get-wings-flags get-wutil-flags
lib_LTLIBRARIES = libWUtil.la libWINGs.la
LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@
libWUtil_la_LIBADD = @LIBBSD@
EXTRA_DIST = BUGS make-rgb Examples Extras Tests
# wbutton.c
# wbutton.c
libWINGs_la_SOURCES = \
configuration.c \
dragcommon.c \
@@ -89,11 +87,12 @@ libWUtil_la_SOURCES = \
wutil.c
AM_CFLAGS =
AM_CFLAGS = @PANGO_CFLAGS@
AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
-I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
@XFTFLAGS@ @HEADER_SEARCH_PATH@
-I$(top_srcdir)/WINGs/WINGs -I$(top_builddir)/WINGs/WINGs \
-I$(top_builddir)/wrlib -I$(top_srcdir)/src \
@XFT_CFLAGS@ @HEADER_SEARCH_PATH@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WINGs.pc WUtil.pc
@@ -107,8 +106,8 @@ WINGs.pc: Makefile
@echo 'Version: $(VERSION)' >> $@
@echo 'Requires: wrlib WUtil' >> $@
@echo 'Libs: $(lib_search_path) -lWINGs' >> $@
@echo 'Libs.private: $(XFTLIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
@echo 'Cflags: $(inc_search_path)' >> $@
@echo 'Libs.private: $(XFT_LIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
@echo 'Cflags: $(inc_search_path) @PANGO_CFLAGS@' >> $@
WUtil.pc: Makefile
@echo "Generating $@"
+4 -4
View File
@@ -388,13 +388,13 @@ Property lists handling code
----------------------------
Code to handle property lists was added to WINGs. It is more robust
than the libPropList code, mostly because some conflicting concepts
than the libPropList code, mostly because some conflicting concepts
borrowed from UserDefaults (which libPropList use) are no longer used in
the WINGs property lists code. These borrowed concepts conflicted with the
retain/release mechanism of property lists and could lead in certain cases
to segmentation faults when executing libPropList based code. But the worse
part was that these libPropList problems were practically unsolvable without
removing one of those conflicting concepts and without a complete redesign.
removing one of those conflicting concepts and without a complete redesign.
The new WINGs property lists code is also better integrated with the other
data types from WINGs and is actively maintained.
@@ -469,10 +469,10 @@ All WM...IconImage() functions operate on RImages
and will also convert the RImage to a WMPixmap with a threshold of 128
and will use that pixmap for the appicon image. If that doesn't satisfy
you, you can make a call to WMSetApplicationIconPixmap() on your own to
set whatever WMPixmap you see fit for the appicon.
set whatever WMPixmap you see fit for the appicon.
- WMSetApplicationIconPixmap() will set the WMPixmap to be used for the
appicon and for the panels
appicon and for the panels
If you use only one of the above functions, the corresponding image/pixmap
+12 -12
View File
@@ -3,35 +3,35 @@
by
Alfredo Kengi Kojima
Alfredo Kengi Kojima
kojima@windowmaker.info
WINGs is a small widget set with the N*XTSTEP look and feel. It's API
is inspired in OpenStep and it's implementation borrows some ideas
WINGs is a small widget set with the N*XTSTEP look and feel. Its API
is inspired in OpenStep and its implementation borrows some ideas
from Tk. It has a reasonable set of widgets, sufficient for building
small applications (like a CDPlayer or hacking something like rxvt). It
also has other functions that are usefull for applications, like a
User Defaults alike configuration manager and a notification system.
The library is limited and it's design is a little sloppy,
so it's not intended to build large or complex applications, like
The library is limited and its design is a little sloppy,
so it's not intended to build large or complex applications, like
anything more complex than a CDPlayer. GNUstep should be used for such
applications.
Since WINGs is written in C and is sort of low-level it is small
and faster than say, Motif or even Athena. Knowing Xlib will help you to
workaround some of it's limitations, although you'll probably be able to
and faster than say, Motif or even Athena. Knowing Xlib will help you to
workaround some of its limitations, although you'll probably be able to
write something like a trivial tic-tac-toe game without knowing much Xlib.
Some of it's functions are designed to support the Window Maker window
manager (see http://windowmaker.info) In fact, it's primary role is to
Some of its functions are designed to support the Window Maker window
manager (see http://windowmaker.info) In fact, its primary role is to
support Window Maker. All other uses of it are just an added bonus.
It will help you to understand the API if you read the ApplicationKit
reference manual, distributed as a PDF by Apple. The function names,
structs and most of the intrinsics are very close to OpenStep classes.
structs and most of the intrinsics are very close to OpenStep classes.
Internationalization:
@@ -66,7 +66,7 @@ Widgets provided by WINGs:
- input box
- file panel
- color panel
- alert panel
- alert panel
- font panel
If you think you can code the following, please do. They are needed by
+4 -4
View File
@@ -2,14 +2,14 @@
AUTOMAKE_OPTIONS =
noinst_PROGRAMS = wtest wmquery wmfile testmywidget
noinst_PROGRAMS = wtest wmquery wmfile testmywidget
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWUtil.la \
@XFTLIBS@ @INTLIBS@ @XLIBS@
@XFT_LIBS@ @INTLIBS@ @XLIBS@
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
@@ -17,4 +17,4 @@ wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFT_CFLAGS@ @HEADER_SEARCH_PATH@
+4 -4
View File
@@ -8,16 +8,16 @@ ftp.windowmaker.info</u></font><Br>
</center>
<b><i>Window Maker</b>
<Img src=upbtn.xpm></i>is the GNU window manager
<Img src=upbtn.xpm></i>is the GNU window manager
for the X Window System. It was
designed to emulate the look and feel of part of the NEXTSTEP(tm) GUI. Its
supposed to be relatively fast and small, feature rich, easy to configure and
supposed to be relatively fast and small, feature rich, easy to configure and
easy to use, with a simple and elegant appearance borrowed from NEXTSTEP(tm).
<p>
<b>Window Maker</b> was designed keeping integration with GNUstep in
<b>Window Maker</b> was designed keeping integration with GNUstep in
mind and is the
"official" window manager for it. It is also part of the GNU project
(<u>www.gnu.org</u>)
(<u>www.gnu.org</u>)
<p>
<b>What is <i>GNUstep?</i></b><p>
+11 -1
View File
@@ -5,4 +5,14 @@ AUTOMAKE_OPTIONS =
# is this a kluge? if so, how should i do it?
includedir = @includedir@/WINGs
include_HEADERS = WINGs.h WUtil.h WINGsP.h
BUILT_SOURCES = WINGsP.h
CLEANFILES = WINGsP.h
include_HEADERS = WINGs.h WUtil.h
nodist_include_HEADERS = WINGsP.h
EXTRA_DIST = WINGsP.h.in
WINGsP.h: WINGsP.h.in $(top_builddir)/config.h
$(AM_V_GEN)$(top_srcdir)/script/replace-ac-keywords.sh \
--header "$(top_builddir)/config.h" \
--filter "USE_PANGO" \
-o $@ $<
+9
View File
@@ -795,6 +795,8 @@ char* WMGetFontName(WMFont *font);
unsigned int WMFontHeight(WMFont *font);
void WMGetScaleBaseFromSystemFont(WMScreen *scrPtr, int *alphabetWidth, int *fontHeight);
void WMSetWidgetDefaultFont(WMScreen *scr, WMFont *font);
void WMSetWidgetDefaultBoldFont(WMScreen *scr, WMFont *font);
@@ -1839,10 +1841,17 @@ WMAlertPanel* WMCreateAlertPanel(WMScreen *app, WMWindow *owner, const char *tit
const char *msg, const char *defaultButton,
const char *alternateButton, const char *otherButton);
WMAlertPanel* WMCreateScaledAlertPanel(WMScreen *app, WMWindow *owner, const char *title,
const char *msg, const char *defaultButton,
const char *alternateButton, const char *otherButton);
WMInputPanel* WMCreateInputPanel(WMScreen *app, WMWindow *owner, const char *title,
const char *msg, const char *defaultText, const char *okButton,
const char *cancelButton);
WMInputPanel* WMCreateScaledInputPanel(WMScreen *app, WMWindow *owner, const char *title,
const char *msg, const char *defaultText, const char *okButton,
const char *cancelButton);
WMGenericPanel* WMCreateGenericPanel(WMScreen *scrPtr, WMWindow *owner,
const char *title, const char *defaultButton,
@@ -5,9 +5,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#ifdef USE_PANGO
#include <pango/pango.h>
#endif
@USE_PANGO@#include <pango/pango.h>
#include <WINGs/WINGs.h>
@@ -254,7 +252,7 @@ typedef struct W_Screen {
Atom wmIconDragOffsetAtom;
Atom wmStateAtom; /* WM_STATE */
Atom utf8String;
Atom netwmName;
@@ -459,9 +457,7 @@ typedef struct W_Font {
short refCount;
char *name;
#ifdef USE_PANGO
PangoLayout *layout;
#endif
@USE_PANGO@ PangoLayout *layout;
} W_Font;
#define W_FONTID(f) (f)->font->fid
+10
View File
@@ -193,6 +193,16 @@ typedef void WMNotificationObserverAction(void *observerData,
sizeof(array) / sizeof(array[0]); \
})
/* These macros can be used to adjust the location and size pixel values in
* the panel layouts so that they match the configured size of the system
* font (useful with high DPI screens, where you have to increase this size).
* The macros require two local variables to be set:
* wmScaleWidth: the width of the alphabet in the current system font
* wmScaleHeight: the height of the current system font
* Use the WMGetScaleBaseFromSystemFont function to set these values.
*/
#define WMScaleX(value) ((int)((double)value / 177.0 * (double)wmScaleWidth + 0.5))
#define WMScaleY(value) ((int)((double)value / 15.0 * (double)wmScaleHeight + 0.5))
/* ---[ WINGs/memory.c ]-------------------------------------------------- */
-33
View File
@@ -1,33 +0,0 @@
#!/bin/sh
# [Christophe CURIS, 2015/01/31]
# This script is now reporting itself as deprecated (this should have been done
# a long time ago), so it should be kept for at least 2 years from now in order
# to allow users to update their scripts, and then removed.
if test $# -eq 0; then
echo "Error: $0 is deprecated, please use 'pkg-config WINGs ...'" >&2
exit 1
fi
while test $# -gt 0; do
case $1 in
--cflags)
echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --cflags'" >&2
pkg-config WINGs --cflags
;;
--ldflags|--lflags)
echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --libs'" >&2
pkg-config WINGs --libs-only-L
;;
--libs)
echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --libs'" >&2
pkg-config WINGs --libs
;;
*)
echo "Error: $0 is deprecated, please use 'pkg-config WINGs ...'" >&2
exit 1
;;
esac
shift
done
-33
View File
@@ -1,33 +0,0 @@
#!/bin/sh
# [Christophe CURIS, 2015/01/31]
# This script is now reporting itself as deprecated (this should have been done
# a long time ago), so it should be kept for at least 2 years from now in order
# to allow users to update their scripts, and then removed.
if test $# -eq 0; then
echo "Error: $0 is deprecated, please use 'pkg-config WUtil ...'" >&2
exit 1
fi
while test $# -gt 0; do
case $1 in
--cflags)
echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --cflags'" >&2
pkg-config WUtil --cflags
;;
--ldflags|--lflags)
echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --libs'" >&2
pkg-config WUtil --libs-only-L
;;
--libs)
echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --libs'" >&2
pkg-config WUtil --libs
;;
*)
echo "Error: $0 is deprecated, please use 'pkg-config WUtil ...'" >&2
exit 1
;;
esac
shift
done
+2 -1
View File
@@ -107,7 +107,8 @@ void *wmalloc(size_t size)
}
}
}
memset(tmp, 0, size);
if (tmp != NULL)
memset(tmp, 0, size);
return tmp;
}
+1 -1
View File
@@ -71,7 +71,7 @@ POTFILES += \
SUFFIXES = .po .mo
.po.mo:
.po.mo:
$(AM_V_GEN)$(MSGFMT) -c -o $@ $<
+2 -2
View File
@@ -3,10 +3,10 @@
#
# Initial translation
# Gudio Scholz <guido.scholz@bayernline.de>
#
#
# Adapted to versions 0.80 ff.
# Torsten Marek <shlomme@gmx.net>
#
#
msgid ""
msgstr ""
+2 -2
View File
@@ -388,8 +388,8 @@ msgid "Could not create component %s"
msgstr "Koe komponint %s net oanmeitsje"
#: ../../WINGs/userdefaults.c:72
msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
msgstr "fariabele GNUSTEP_USER_ROOT, definiearre mei ûnjildich paad, net brûkt"
msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
msgstr "fariabele WMAKER_USER_ROOT, definiearre mei ûnjildich paad, net brûkt"
#. something happened with the file. just overwrite it
#: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225
+2 -2
View File
@@ -197,8 +197,8 @@ msgid "Could not create component %s"
msgstr "Nem sikerült létrehozni a %s elemet"
#: ../../../wmaker-crm/WINGs/userdefaults.c:65
msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
msgstr "A GNUSTEP_USER_ROOT változó be van állítva, de rossz értékre. Nem használom"
msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
msgstr "A WMAKER_USER_ROOT változó be van állítva, de rossz értékre. Nem használom"
#. something happened with the file. just overwrite it
#: ../../../wmaker-crm/WINGs/userdefaults.c:196
+2 -2
View File
@@ -389,9 +389,9 @@ msgid "Could not create component %s"
msgstr "Kon component %s niet aanmaken"
#: ../../WINGs/userdefaults.c:72
msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
msgstr ""
"variabele GNUSTEP_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt"
"variabele WMAKER_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt"
#. something happened with the file. just overwrite it
#: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225
+21 -8
View File
@@ -1253,22 +1253,34 @@ int WMGetPropListItemCount(WMPropList * plist)
Bool WMIsPLString(WMPropList * plist)
{
return (plist->type == WPLString);
if (plist)
return (plist->type == WPLString);
else
return False;
}
Bool WMIsPLData(WMPropList * plist)
{
return (plist->type == WPLData);
if (plist)
return (plist->type == WPLData);
else
return False;
}
Bool WMIsPLArray(WMPropList * plist)
{
return (plist->type == WPLArray);
if (plist)
return (plist->type == WPLArray);
else
return False;
}
Bool WMIsPLDictionary(WMPropList * plist)
{
return (plist->type == WPLDictionary);
if (plist)
return (plist->type == WPLDictionary);
else
return False;
}
Bool WMIsPropListEqualTo(WMPropList * plist, WMPropList * other)
@@ -1683,6 +1695,7 @@ Bool WMWritePropListToFile(WMPropList * plist, const char *path)
if (fprintf(theFile, "%s\n", desc) != strlen(desc) + 1) {
werror(_("writing to file: %s failed"), thePath);
wfree(desc);
fclose(theFile);
goto failure;
}
@@ -1719,7 +1732,7 @@ Bool WMWritePropListToFile(WMPropList * plist, const char *path)
* file, and the last component is stripped off. the rest is the
* the hierarchy to be created.
*
* refuses to create anything outside $GNUSTEP_USER_ROOT
* refuses to create anything outside $WMAKER_USER_ROOT
*
* returns 1 on success, 0 on failure
*/
@@ -1730,7 +1743,7 @@ int wmkdirhier(const char *path)
size_t p, plen;
struct stat st;
/* Only create directories under $GNUSTEP_USER_ROOT */
/* Only create directories under $WMAKER_USER_ROOT */
if ((t = wusergnusteppath()) == NULL)
return 0;
if (strncmp(path, t, strlen(t)) != 0)
@@ -1811,7 +1824,7 @@ static int wrmdirhier_fn(const char *path, const struct stat *st,
/*
* remove a directory hierarchy
*
* refuses to remove anything outside $GNUSTEP_USER_ROOT
* refuses to remove anything outside $WMAKER_USER_ROOT
*
* returns 1 on success, 0 on failure
*
@@ -1825,7 +1838,7 @@ int wrmdirhier(const char *path)
int error;
const char *t;
/* Only remove directories under $GNUSTEP_USER_ROOT */
/* Only remove directories under $WMAKER_USER_ROOT */
if ((t = wusergnusteppath()) == NULL)
return EPERM;
if (strncmp(path, t, strlen(t)) != 0)
+1 -1
View File
@@ -261,7 +261,7 @@ static WMData *getSelectionData(Display * dpy, Window win, Atom where)
bpi = bits / 8;
wdata = WMCreateDataWithBytesNoCopy(data, len * bpi, (WMFreeDataProc *) XFree);
wdata = WMCreateDataWithBytesNoCopy(data, len * bpi, (void *) XFree);
WMSetDataFormat(wdata, bits);
return wdata;
+3 -3
View File
@@ -59,9 +59,9 @@ const char *wusergnusteppath()
return path;
#ifdef HAVE_SECURE_GETENV
gspath = secure_getenv("GNUSTEP_USER_ROOT");
gspath = secure_getenv("WMAKER_USER_ROOT");
#else
gspath = getenv("GNUSTEP_USER_ROOT");
gspath = getenv("WMAKER_USER_ROOT");
#endif
if (gspath) {
gspath = wexpandpath(gspath);
@@ -69,7 +69,7 @@ const char *wusergnusteppath()
path = gspath;
return path;
}
wwarning(_("variable GNUSTEP_USER_ROOT defined with invalid path, not used"));
wwarning(_("variable WMAKER_USER_ROOT defined with invalid path, not used"));
}
h = wgethomedir();
+2 -2
View File
@@ -140,7 +140,7 @@ char *WMPathForResourceOfType(const char *resource, const char *ext)
* Paths are searched in this order:
* - resourcePath/ext
* - dirname(argv[0])/ext
* - GNUSTEP_USER_ROOT/Applications/ApplicationName.app/ext
* - WMAKER_USER_ROOT/Applications/ApplicationName.app/ext
* - ~/GNUstep/Applications/ApplicationName.app/ext
* - GNUSTEP_LOCAL_ROOT/Applications/ApplicationName.app/ext
* - /usr/local/GNUstep/Applications/ApplicationName.app/ext
@@ -175,7 +175,7 @@ char *WMPathForResourceOfType(const char *resource, const char *ext)
if (snprintf(appdir, slen, "Applications/%s.app", WMApplication.applicationName) >= slen)
goto out;
path = checkFile(getenv("GNUSTEP_USER_ROOT"), appdir, ext, resource);
path = checkFile(getenv("WMAKER_USER_ROOT"), appdir, ext, resource);
if (path)
goto out;
+18 -9
View File
@@ -2385,6 +2385,8 @@ void rgbIntToChar(W_ColorPanel *panel, int *value)
case RGBhex:
format = "%0X";
break;
default:
format = "";
}
sprintf(tmp, format, value[0]);
@@ -2643,7 +2645,7 @@ static void hsbTextFieldCallback(void *observerData, WMNotification * notificati
{
CPColor cpColor;
int value[3];
char tmp[4];
char tmp[12]; /* We only 4 bytes needed, but compilers cannot know that */
int n;
W_ColorPanel *panel = (W_ColorPanel *) observerData;
@@ -3396,6 +3398,9 @@ static void rgbInit(W_ColorPanel * panel)
case RGBhex:
format = "%0X";
break;
default:
/* Avoid compiler warning */
format = "";
}
sprintf(tmp, format, panel->color.rgb.red);
@@ -3448,7 +3453,7 @@ static void hsbInit(W_ColorPanel * panel)
WMSetSliderValue(panel->hsbSaturationS, value[1]);
WMSetSliderValue(panel->hsbBrightnessS, value[2]);
sprintf(tmp, "%d", value[0]);
sprintf(tmp, "%hu", value[0]);
WMSetTextFieldText(panel->hsbHueT, tmp);
sprintf(tmp, "%d", value[1]);
WMSetTextFieldText(panel->hsbSaturationT, tmp);
@@ -3499,13 +3504,17 @@ static void convertCPColor(CPColor * color)
old_hue = color->hsv.hue;
RRGBtoHSV(&(color->rgb), &(color->hsv));
/* In black the hue is undefined, and may change by conversion
* Same for white. */
if (((color->rgb.red == 0) &&
(color->rgb.green == 0) &&
(color->rgb.blue == 0)) ||
((color->rgb.red == 0) && (color->rgb.green == 0) && (color->rgb.blue == 255))
)
/*
* For pure grey colors, the Hue is generally calculated
* as 0, but in reality the Hue does not matter.
*
* But in an interactive GUI it is interresting to remember
* the previous Hue because if user moves away from perfect
* grey then he could be interrested in finding back his
* previous tint
*/
if ((color->rgb.red == color->rgb.green) &&
(color->rgb.red == color->rgb.blue) )
color->hsv.hue = old_hue;
break;
case cpHSV:
+10
View File
@@ -237,6 +237,16 @@ char *WMGetFontName(WMFont * font)
return font->name;
}
void WMGetScaleBaseFromSystemFont(WMScreen *scrPtr, int *alphabetWidth, int *fontHeight)
{
WMFont *font;
font = WMDefaultSystemFont(scrPtr);
*alphabetWidth = WMWidthOfString(font, "abcdefghijklmnopqrstuvwxyz", 26);
*fontHeight = WMFontHeight(font);
WMReleaseFont(font);
}
WMFont *WMDefaultSystemFont(WMScreen * scrPtr)
{
return WMRetainFont(scrPtr->normalFont);
+2 -1
View File
@@ -385,6 +385,7 @@ static void renderPixmap(W_Screen * screen, Pixmap d, Pixmap mask, char **data,
if (mask)
XDrawPoint(screen->display, mask, screen->monoGC, x, y);
/* FALLTHRU */
case '.':
case 'l':
XDrawPoint(screen->display, d, lightGC, x, y);
@@ -944,7 +945,7 @@ void WMSetFocusToWidget(WMWidget * widget)
/*
* WMRealizeWidget-
* Realizes the widget and all it's children.
* Realizes the widget and all its children.
*
*/
void WMRealizeWidget(WMWidget * w)
+287 -7
View File
@@ -89,10 +89,12 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
const char *alternateButton, const char *otherButton)
{
WMAlertPanel *panel;
WMFont *defaultFont;
int dw = 0, aw = 0, ow = 0, w;
WMBox *hbox;
WMPixmap *icon;
defaultFont = WMSystemFontOfSize(scrPtr, 12);
panel = wmalloc(sizeof(WMAlertPanel));
if (owner) {
@@ -160,6 +162,7 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
WMFontHeight(scrPtr->normalFont) * 4, 0, 5);
WMSetLabelText(panel->mLbl, msg);
WMSetLabelTextAlignment(panel->mLbl, WACenter);
WMSetLabelFont(panel->mLbl, defaultFont);
}
panel->hbox = WMCreateBox(panel->vbox);
@@ -170,13 +173,13 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
/* create buttons */
if (otherButton)
ow = WMWidthOfString(scrPtr->normalFont, otherButton, strlen(otherButton));
ow = WMWidthOfString(defaultFont, otherButton, strlen(otherButton));
if (alternateButton)
aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton));
aw = WMWidthOfString(defaultFont, alternateButton, strlen(alternateButton));
if (defaultButton)
dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton));
dw = WMWidthOfString(defaultFont, defaultButton, strlen(defaultButton));
dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
@@ -206,18 +209,187 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
WMSetButtonImagePosition(panel->defBtn, WIPRight);
WMSetButtonFont(panel->defBtn, defaultFont);
}
if (alternateButton) {
panel->altBtn = WMCreateCommandButton(panel->hbox);
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->altBtn), False, True, aw, 0, 5);
WMSetButtonAction(panel->altBtn, alertPanelOnClick, panel);
WMSetButtonText(panel->altBtn, alternateButton);
WMSetButtonFont(panel->altBtn, defaultFont);
}
if (otherButton) {
panel->othBtn = WMCreateCommandButton(panel->hbox);
WMSetButtonAction(panel->othBtn, alertPanelOnClick, panel);
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->othBtn), False, True, ow, 0, 5);
WMSetButtonText(panel->othBtn, otherButton);
WMSetButtonFont(panel->othBtn, defaultFont);
}
WMMapSubwidgets(panel->hbox);
WMCreateEventHandler(W_VIEW(panel->win), KeyPressMask, handleKeyPress, panel);
WMRealizeWidget(panel->win);
WMMapSubwidgets(panel->win);
WMReleaseFont(defaultFont);
return panel;
}
WMAlertPanel *WMCreateScaledAlertPanel(WMScreen * scrPtr, WMWindow * owner,
const char *title, const char *msg, const char *defaultButton,
const char *alternateButton, const char *otherButton)
{
WMAlertPanel *panel;
int dw = 0, aw = 0, ow = 0, w;
WMBox *hbox;
WMPixmap *icon;
int wmScaleWidth, wmScaleHeight;
int pwidth, pheight;
panel = wmalloc(sizeof(WMAlertPanel));
if (owner) {
panel->win = WMCreatePanelWithStyleForWindow(owner, "alertPanel", WMTitledWindowMask);
} else {
panel->win = WMCreateWindowWithStyle(scrPtr, "alertPanel", WMTitledWindowMask);
}
/* calculate and set the panel's size */
WMGetScaleBaseFromSystemFont(scrPtr, &wmScaleWidth, &wmScaleHeight);
pwidth = WMScaleX(400);
pheight = WMScaleY(5) /* upper margin */
+ 64 /* icon size */
+ WMScaleY(5) /* space between icon and divider line */
+ 2 /* divider line */
+ WMScaleY(5); /* space between divider line and message */
if (msg)
pheight += WMFontHeight(scrPtr->normalFont) * 4 + WMScaleY(5);
pheight += WMScaleY(44);
WMResizeWidget(panel->win, pwidth, pheight);
WMSetWindowInitialPosition(panel->win,
(scrPtr->rootView->size.width - pwidth) / 2,
(scrPtr->rootView->size.height - pheight) / 2);
WMSetWindowTitle(panel->win, "");
panel->vbox = WMCreateBox(panel->win);
WMSetViewExpandsToParent(WMWidgetView(panel->vbox), 0, 0, 0, 0);
WMSetBoxHorizontal(panel->vbox, False);
WMMapWidget(panel->vbox);
hbox = WMCreateBox(panel->vbox);
WMSetBoxBorderWidth(hbox, WMScaleX(5));
WMSetBoxHorizontal(hbox, True);
WMMapWidget(hbox);
WMAddBoxSubview(panel->vbox, WMWidgetView(hbox), False, True, 64 + 2 * WMScaleY(5), 0, WMScaleY(5));
panel->iLbl = WMCreateLabel(hbox);
WMSetLabelImagePosition(panel->iLbl, WIPImageOnly);
WMMapWidget(panel->iLbl);
WMAddBoxSubview(hbox, WMWidgetView(panel->iLbl), False, True, 64, 0, 10);
icon = WMCreateApplicationIconBlendedPixmap(scrPtr, (RColor *) NULL);
if (icon) {
WMSetLabelImage(panel->iLbl, icon);
WMReleasePixmap(icon);
} else {
WMSetLabelImage(panel->iLbl, scrPtr->applicationIconPixmap);
}
if (title) {
WMFont *largeFont;
largeFont = WMBoldSystemFontOfSize(scrPtr, 24);
panel->tLbl = WMCreateLabel(hbox);
WMMapWidget(panel->tLbl);
WMAddBoxSubview(hbox, WMWidgetView(panel->tLbl), True, True, 64, 0, 0);
WMSetLabelText(panel->tLbl, title);
WMSetLabelTextAlignment(panel->tLbl, WALeft);
WMSetLabelFont(panel->tLbl, largeFont);
WMReleaseFont(largeFont);
}
/* create divider line */
panel->line = WMCreateFrame(panel->win);
WMMapWidget(panel->line);
WMAddBoxSubview(panel->vbox, WMWidgetView(panel->line), False, True, 2, 2, WMScaleY(5));
WMSetFrameRelief(panel->line, WRGroove);
if (msg) {
panel->mLbl = WMCreateLabel(panel->vbox);
WMSetLabelWraps(panel->mLbl, True);
WMMapWidget(panel->mLbl);
WMAddBoxSubview(panel->vbox, WMWidgetView(panel->mLbl), True, True,
WMFontHeight(scrPtr->normalFont) * 4, 0, WMScaleY(5));
WMSetLabelText(panel->mLbl, msg);
WMSetLabelTextAlignment(panel->mLbl, WACenter);
}
panel->hbox = WMCreateBox(panel->vbox);
WMSetBoxBorderWidth(panel->hbox, WMScaleX(10));
WMSetBoxHorizontal(panel->hbox, True);
WMMapWidget(panel->hbox);
WMAddBoxSubview(panel->vbox, WMWidgetView(panel->hbox), False, True, WMScaleY(44), 0, 0);
/* create buttons */
if (otherButton)
ow = WMWidthOfString(scrPtr->normalFont, otherButton, strlen(otherButton));
if (alternateButton)
aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton));
if (defaultButton)
dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton));
dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
aw += WMScaleX(30);
ow += WMScaleX(30);
dw += WMScaleX(30);
w = WMAX(dw, WMAX(aw, ow));
if ((w + WMScaleX(10)) * 3 < pwidth) {
aw = w;
ow = w;
dw = w;
} else {
int t;
t = pwidth - 4 * WMScaleX(10) - aw - ow - dw;
aw += t / 3;
ow += t / 3;
dw += t / 3;
}
if (defaultButton) {
panel->defBtn = WMCreateCommandButton(panel->hbox);
WMResizeWidget(panel->defBtn, dw, WMScaleY(24));
WMSetButtonAction(panel->defBtn, alertPanelOnClick, panel);
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->defBtn), False, True, dw, 0, 0);
WMSetButtonText(panel->defBtn, defaultButton);
WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
WMSetButtonImagePosition(panel->defBtn, WIPRight);
}
if (alternateButton) {
panel->altBtn = WMCreateCommandButton(panel->hbox);
WMResizeWidget(panel->altBtn, aw, WMScaleY(24));
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->altBtn), False, True, aw, 0, WMScaleX(5));
WMSetButtonAction(panel->altBtn, alertPanelOnClick, panel);
WMSetButtonText(panel->altBtn, alternateButton);
}
if (otherButton) {
panel->othBtn = WMCreateCommandButton(panel->hbox);
WMResizeWidget(panel->othBtn, ow, WMScaleY(24));
WMSetButtonAction(panel->othBtn, alertPanelOnClick, panel);
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->othBtn), False, True, ow, 0, WMScaleX(5));
WMSetButtonText(panel->othBtn, otherButton);
}
WMMapSubwidgets(panel->hbox);
@@ -338,8 +510,10 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
const char *defaultText, const char *okButton, const char *cancelButton)
{
WMInputPanel *panel;
WMFont *defaultFont;
int x, dw = 0, aw = 0, w;
defaultFont = WMSystemFontOfSize(scrPtr, 12);
panel = wmalloc(sizeof(WMInputPanel));
if (owner)
@@ -371,21 +545,23 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
WMResizeWidget(panel->mLbl, 320 - 40, WMFontHeight(scrPtr->normalFont) * 2);
WMSetLabelText(panel->mLbl, msg);
WMSetLabelTextAlignment(panel->mLbl, WALeft);
WMSetLabelFont(panel->mLbl, defaultFont);
}
panel->text = WMCreateTextField(panel->win);
WMMoveWidget(panel->text, 20, 85);
WMResizeWidget(panel->text, 320 - 40, WMWidgetHeight(panel->text));
WMSetTextFieldText(panel->text, defaultText);
WMSetTextFieldFont(panel->text, defaultFont);
WMAddNotificationObserver(endedEditingObserver, panel, WMTextDidEndEditingNotification, panel->text);
/* create buttons */
if (cancelButton)
aw = WMWidthOfString(scrPtr->normalFont, cancelButton, strlen(cancelButton));
aw = WMWidthOfString(defaultFont, cancelButton, strlen(cancelButton));
if (okButton)
dw = WMWidthOfString(scrPtr->normalFont, okButton, strlen(okButton));
dw = WMWidthOfString(defaultFont, okButton, strlen(okButton));
w = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
if (aw > w)
@@ -406,6 +582,7 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
WMSetButtonImagePosition(panel->defBtn, WIPRight);
WMSetButtonFont(panel->defBtn, defaultFont);
}
if (cancelButton) {
x -= w + 10;
@@ -415,6 +592,104 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
WMMoveWidget(panel->altBtn, x, 124);
WMResizeWidget(panel->altBtn, w, 24);
WMSetButtonText(panel->altBtn, cancelButton);
WMSetButtonFont(panel->altBtn, defaultFont);
}
WMCreateEventHandler(W_VIEW(panel->win), KeyPressMask, handleKeyPress2, panel);
WMRealizeWidget(panel->win);
WMMapSubwidgets(panel->win);
WMSetFocusToWidget(panel->text);
WMReleaseFont(defaultFont);
return panel;
}
WMInputPanel *WMCreateScaledInputPanel(WMScreen * scrPtr, WMWindow * owner, const char *title, const char *msg,
const char *defaultText, const char *okButton, const char *cancelButton)
{
WMInputPanel *panel;
int x, dw = 0, aw = 0, w;
int wmScaleWidth, wmScaleHeight;
panel = wmalloc(sizeof(WMInputPanel));
if (owner)
panel->win = WMCreatePanelWithStyleForWindow(owner, "inputPanel", WMTitledWindowMask);
else
panel->win = WMCreateWindowWithStyle(scrPtr, "inputPanel", WMTitledWindowMask);
WMSetWindowTitle(panel->win, "");
WMGetScaleBaseFromSystemFont(scrPtr, &wmScaleWidth, &wmScaleHeight);
WMResizeWidget(panel->win, WMScaleX(320), WMScaleY(160));
if (title) {
WMFont *largeFont;
largeFont = WMBoldSystemFontOfSize(scrPtr, WMScaleY(24));
panel->tLbl = WMCreateLabel(panel->win);
WMMoveWidget(panel->tLbl, WMScaleX(20), WMScaleY(16));
WMResizeWidget(panel->tLbl, WMScaleX(320) - 2 * WMScaleX(20), WMFontHeight(largeFont) + WMScaleY(4));
WMSetLabelText(panel->tLbl, title);
WMSetLabelTextAlignment(panel->tLbl, WALeft);
WMSetLabelFont(panel->tLbl, largeFont);
WMReleaseFont(largeFont);
}
if (msg) {
panel->mLbl = WMCreateLabel(panel->win);
WMMoveWidget(panel->mLbl, WMScaleX(20), WMScaleY(50));
WMResizeWidget(panel->mLbl, WMScaleX(320) - 2 * WMScaleX(20), WMFontHeight(scrPtr->normalFont) * 2);
WMSetLabelText(panel->mLbl, msg);
WMSetLabelTextAlignment(panel->mLbl, WALeft);
}
panel->text = WMCreateTextField(panel->win);
WMMoveWidget(panel->text, WMScaleX(20), WMScaleY(85));
WMResizeWidget(panel->text, WMScaleX(320) - 2 * WMScaleX(20), WMScaleY(20));
WMSetTextFieldText(panel->text, defaultText);
WMAddNotificationObserver(endedEditingObserver, panel, WMTextDidEndEditingNotification, panel->text);
/* create buttons */
if (cancelButton)
aw = WMWidthOfString(scrPtr->normalFont, cancelButton, strlen(cancelButton));
if (okButton)
dw = WMWidthOfString(scrPtr->normalFont, okButton, strlen(okButton));
w = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
if (aw > w)
w = aw;
w += WMScaleX(30);
x = WMScaleX(310);
if (okButton) {
x -= w + WMScaleX(10);
panel->defBtn = WMCreateCustomButton(panel->win, WBBPushInMask
| WBBPushChangeMask | WBBPushLightMask);
WMSetButtonAction(panel->defBtn, inputBoxOnClick, panel);
WMMoveWidget(panel->defBtn, x, WMScaleY(124));
WMResizeWidget(panel->defBtn, w, WMScaleY(24));
WMSetButtonText(panel->defBtn, okButton);
WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
WMSetButtonImagePosition(panel->defBtn, WIPRight);
}
if (cancelButton) {
x -= w + WMScaleX(10);
panel->altBtn = WMCreateCommandButton(panel->win);
WMSetButtonAction(panel->altBtn, inputBoxOnClick, panel);
WMMoveWidget(panel->altBtn, x, WMScaleY(124));
WMResizeWidget(panel->altBtn, w, WMScaleY(24));
WMSetButtonText(panel->altBtn, cancelButton);
}
WMCreateEventHandler(W_VIEW(panel->win), KeyPressMask, handleKeyPress2, panel);
@@ -457,10 +732,12 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
const char *title, const char *defaultButton, const char *alternateButton)
{
WMGenericPanel *panel;
WMFont *defaultFont;
int dw = 0, aw = 0, w;
WMBox *hbox;
WMPixmap *icon;
defaultFont = WMSystemFontOfSize(scrPtr, 12);
panel = wmalloc(sizeof(WMGenericPanel));
if (owner) {
@@ -533,10 +810,10 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
/* create buttons */
if (defaultButton)
dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton));
dw = WMWidthOfString(defaultFont, defaultButton, strlen(defaultButton));
if (alternateButton)
aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton));
aw = WMWidthOfString(defaultFont, alternateButton, strlen(alternateButton));
dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
@@ -561,6 +838,7 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
WMSetButtonImagePosition(panel->defBtn, WIPRight);
WMSetButtonFont(panel->defBtn, defaultFont);
}
WMMapSubwidgets(hbox);
@@ -570,5 +848,7 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
WMRealizeWidget(panel->win);
WMMapSubwidgets(panel->win);
WMReleaseFont(defaultFont);
return panel;
}
+1 -4
View File
@@ -181,10 +181,7 @@ static void drawRulerOnPixmap(Ruler * rPtr)
XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->fgGC, rPtr->margins.left + m, 23, rPtr->margins.left + m, marks[i % 8] + 23);
if (i != 0 && i % 8 == 0) {
if (j < 10)
snprintf(c, 3, "%d", ++j);
else
snprintf(c, 3, "%2d", ++j);
snprintf(c, sizeof(c), "%hu", ++j);
WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg,
rPtr->font, rPtr->margins.left + 2 + m, 26, c, 2);
}
+2
View File
@@ -2305,6 +2305,7 @@ static void handleTextKeyPress(Text * tPtr, XEvent * event)
case XK_Return:
*buffer = '\n';
/* FALLTHRU */
default:
if (*buffer != 0 && !control_pressed) {
insertTextInteractively(tPtr, buffer, strlen(buffer));
@@ -2544,6 +2545,7 @@ static void handleActionEvents(XEvent * event, void *data)
break;
}
/* FALLTHRU */
case ButtonRelease:
if (tPtr->flags.pointerGrabbed) {
tPtr->flags.pointerGrabbed = False;
+14
View File
@@ -965,6 +965,7 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
switch (ksym) {
case XK_Tab:
#ifdef XK_ISO_Left_Tab
/* FALLTHRU */
case XK_ISO_Left_Tab:
#endif
if (!controled) {
@@ -1001,8 +1002,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
break;
#ifdef XK_KP_Enter
/* FALLTHRU */
case XK_KP_Enter:
#endif
/* FALLTHRU */
case XK_Return:
if (!modified) {
data = (void *)WMReturnTextMovement;
@@ -1019,8 +1022,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
controled = False;
#ifdef XK_KP_Left
/* FALLTHRU */
case XK_KP_Left:
#endif
/* FALLTHRU */
case XK_Left:
if (tPtr->cursorPosition > 0) {
int i;
@@ -1058,8 +1063,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
controled = False;
#ifdef XK_KP_Right
/* FALLTHRU */
case XK_KP_Right:
#endif
/* FALLTHRU */
case XK_Right:
if (tPtr->cursorPosition < tPtr->textLen) {
int i;
@@ -1095,8 +1102,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
controled = False;
#ifdef XK_KP_Home
/* FALLTHRU */
case XK_KP_Home:
#endif
/* FALLTHRU */
case XK_Home:
if (!controled) {
if (tPtr->cursorPosition > 0) {
@@ -1122,8 +1131,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
controled = False;
#ifdef XK_KP_End
/* FALLTHRU */
case XK_KP_End:
#endif
/* FALLTHRU */
case XK_End:
if (!controled) {
if (tPtr->cursorPosition < tPtr->textLen) {
@@ -1149,6 +1160,7 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
else
modified = False;
/* FALLTHRU */
case XK_BackSpace:
if (!modified) {
if (tPtr->selection.count) {
@@ -1177,8 +1189,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
modified = False;
#ifdef XK_KP_Delete
/* FALLTHRU */
case XK_KP_Delete:
#endif
/* FALLTHRU */
case XK_Delete:
if (!modified) {
if (tPtr->selection.count) {
+2
View File
@@ -490,6 +490,7 @@ void W_SetViewBackgroundColor(W_View * view, WMColor * color)
view->backColor = WMRetainColor(color);
view->attribFlags |= CWBackPixel;
view->attribFlags &= ~CWBackPixmap;
view->attribs.background_pixel = W_PIXEL(color);
if (view->flags.realized) {
XSetWindowBackground(view->screen->display, view->window, W_PIXEL(color));
@@ -504,6 +505,7 @@ void W_SetViewBackgroundPixmap(W_View *view, WMPixmap *pix)
view->backImage = WMRetainPixmap(pix);
view->attribFlags |= CWBackPixmap;
view->attribFlags &= ~CWBackPixel;
view->attribs.background_pixmap = pix->pixmap;
if (view->flags.realized) {
XSetWindowBackgroundPixmap(view->screen->display, view->window, pix->pixmap);
+15 -6
View File
@@ -446,12 +446,18 @@ static void str2rcolor(RContext * rc, const char *name, RColor * color)
{
XColor xcolor;
XParseColor(rc->dpy, rc->cmap, name, &xcolor);
color->alpha = 255;
color->red = xcolor.red >> 8;
color->green = xcolor.green >> 8;
color->blue = xcolor.blue >> 8;
if (XParseColor(rc->dpy, rc->cmap, name, &xcolor) != 0) {
color->alpha = 255;
color->red = xcolor.red >> 8;
color->green = xcolor.green >> 8;
color->blue = xcolor.blue >> 8;
} else {
/* Color Name was not found - Return white instead */
color->alpha = 255;
color->red = 255;
color->green = 255;
color->blue = 255;
}
}
static void dumpRImage(const char *path, RImage * image)
@@ -611,6 +617,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int
break;
default:
wwarning(_("unknown direction in '%s', falling back to diagonal"), type);
/* FALLTHRU */
case 'D':
style = RDiagonalGradient;
break;
@@ -637,6 +644,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int
break;
default:
wwarning(_("unknown direction in '%s', falling back to diagonal"), type);
/* FALLTHRU */
case 'D':
style = RDiagonalGradient;
break;
@@ -671,6 +679,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int
break;
default:
wwarning(_("unknown direction in '%s', falling back to diagonal"), type);
/* FALLTHRU */
case 'D':
style = RDiagonalGradient;
break;
+2 -2
View File
@@ -68,7 +68,7 @@ typedef struct _Panel {
WMButton *autoDelayB[wlengthof_nocheck(auto_delay)][wlengthof_nocheck(autoDelayPresetValues)];
WMTextField *autoDelayT[wlengthof_nocheck(auto_delay)];
WMLabel *autoDelayMsL[wlengthof_nocheck(auto_delay)];
WMFrame *dockF;
WMButton *docksB[wlengthof_nocheck(dock_config)];
} _Panel;
@@ -267,7 +267,7 @@ static void createPanel(Panel *p)
WMSetBalloonTextForView(_(dock_config[i].balloon_text), WMWidgetView(panel->docksB[i]));
WMSetButtonAction(panel->docksB[i], pushDockButton, panel);
}
WMMapSubwidgets(panel->dockF);
if (xis)
+15 -4
View File
@@ -110,7 +110,16 @@ static const struct {
/* default: */ False, OPTION_WMAKER, "PointerWithHalfMaxWindows" },
{ N_("Open dialogs in the same workspace as their owners."),
/* default: */ False, OPTION_WMAKER, "OpenTransientOnOwnerWorkspace" }
/* default: */ False, OPTION_WMAKER, "OpenTransientOnOwnerWorkspace" },
{ N_("Wrap dock-attached icons around the screen edges."),
/* default: */ True, OPTION_WMAKER, "WrapAppiconsInDock" },
{ N_("Double click on titlebar maximize a window to full screen."),
/* default: */ False, OPTION_WMAKER, "DbClickFullScreen" },
{ N_("Close rootmenu when mouse (left or right) is clicked outside focus."),
/* default: */ False, OPTION_WMAKER, "CloseRootMenuByLeftOrRightMouseClick" }
};
@@ -137,15 +146,16 @@ typedef struct _Panel {
static void changeIntTextfield(void *data, int delta)
{
WMTextField *textfield;
char *text;
char *text, buffer[12];
int value;
textfield = (WMTextField *)data;
text = WMGetTextFieldText(textfield);
value = atoi(text);
wfree(text);
value += delta;
sprintf(text, "%d", value);
WMSetTextFieldText(textfield, text);
sprintf(buffer, "%d", value);
WMSetTextFieldText(textfield, buffer);
}
static void downButtonCallback(WMWidget *self, void *data)
@@ -305,6 +315,7 @@ static void storeDefaults(_Panel *panel)
text = WMGetTextFieldText(panel->textfield[i]);
value = atoi(text);
wfree(text);
SetIntegerForKey(value, expert_options[i].op_name);
break;
+13 -16
View File
@@ -1,9 +1,9 @@
/* FontSimple.c- simplified font configuration panel
*
*
* WPrefs - Window Maker Preferences Program
*
*
* Copyright (c) 1998-2004 Alfredo K. Kojima
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -22,6 +22,7 @@
#include "WPrefs.h"
#include <unistd.h>
#include <fontconfig/fontconfig.h>
#include <math.h>
/* workaround for older fontconfig, that doesn't define these constants */
#ifndef FC_WEIGHT_NORMAL
@@ -521,7 +522,7 @@ static void selectedOption(WMWidget * w, void *data)
WMListItem *item = WMGetListItem(panel->sizeL, i);
int distance;
distance = abs(size - atoi(item->text));
distance = fabs(size - atoi(item->text));
if (i == 0 || distance < closest) {
closest = distance;
@@ -569,6 +570,9 @@ static void showData(_Panel * panel)
{
int i;
WMMenuItem *item;
WMScreen *scr;
scr = WMWidgetScreen(panel->parent);
for (i = 0; i < WMGetPopUpButtonNumberOfItems(panel->optionP); i++) {
char *ofont, *font;
@@ -579,19 +583,12 @@ static void showData(_Panel * panel)
if (ofont)
wfree(ofont);
if (strcmp(fontOptions[i].option, "SystemFont") == 0 ||
strcmp(fontOptions[i].option, "BoldSystemFont") == 0) {
char *path;
WMUserDefaults *defaults;
path = wdefaultspathfordomain("WMGLOBAL");
defaults = WMGetDefaultsFromPath(path);
wfree(path);
font = WMGetUDStringForKey(defaults,
fontOptions[i].option);
} else {
if (strcmp(fontOptions[i].option, "SystemFont") == 0)
font = WMGetFontName(WMDefaultSystemFont(scr));
else if (strcmp(fontOptions[i].option, "BoldSystemFont") == 0)
font = WMGetFontName(WMDefaultBoldSystemFont(scr));
else
font = GetStringForKey(fontOptions[i].option);
}
if (font)
font = wstrdup(font);
WMSetMenuItemRepresentedObject(item, font);
+33 -61
View File
@@ -60,8 +60,6 @@ typedef struct _Panel {
CallbackRec callbacks;
Bool have_legacy_apercu;
WMWidget *parent;
WMFrame *posF;
@@ -75,12 +73,13 @@ typedef struct _Panel {
WMButton *posB[wlengthof_nocheck(icon_position_dbvalue)];
WMFrame *animF;
WMButton *animB[wlengthof_nocheck(icon_animation)];
WMPopUpButton *animP;
WMFrame *optF;
WMButton *arrB;
WMButton *omnB;
WMButton *sclB;
WMButton *marginB;
struct {
WMFrame *frame;
@@ -175,6 +174,7 @@ static void showData(_Panel * panel)
WMSetButtonSelected(panel->arrB, GetBoolForKey("AutoArrangeIcons"));
WMSetButtonSelected(panel->omnB, GetBoolForKey("StickyIcons"));
WMSetButtonSelected(panel->sclB, GetBoolForKey("SingleClickLaunch"));
WMSetButtonSelected(panel->marginB, GetBoolForKey("EnforceIconMargin"));
str = GetStringForKey("IconPosition");
if (str != NULL) {
@@ -195,20 +195,12 @@ static void showData(_Panel * panel)
if (i < 0)
i = 0;
else if (i > 9)
i = 9;
else if (i > 29)
i = 29;
WMSetPopUpButtonSelectedItem(panel->sizeP, i);
/* Mini-Previews for Icons */
/*
* Backward Compatibility:
* These settings changed names after 0.95.6, so to avoid breaking user's
* config we still support the old names, and silently convert them to the
* new settings
* This hack should be kept for at least 2 years, that means >= 2017.
*/
panel->have_legacy_apercu = False;
str = GetStringForKey("MiniwindowPreviewBalloons");
if (str != NULL) {
/* New names found, use them in priority */
@@ -220,25 +212,6 @@ static void showData(_Panel * panel)
} else {
i = minipreview_minimum_size;
}
} else {
/* No new names, try the legacy names */
b = GetBoolForKey("MiniwindowApercuBalloons");
if (b) {
panel->have_legacy_apercu = True;
i = GetIntegerForKey("ApercuSize");
/*
* In the beginning, the option was coded as a multiple of the icon
* size; then it was converted to pixel size
*/
if (i < 24)
i *= GetIntegerForKey("IconSize");
if (i <= minipreview_minimum_size)
i = minipreview_minimum_size + 1; /* +1 to not display as "off" */
} else {
i = minipreview_minimum_size;
}
}
WMSetSliderValue(panel->minipreview.slider, i);
minipreview_slider_changed(panel->minipreview.slider, panel);
@@ -248,7 +221,7 @@ static void showData(_Panel * panel)
if (str != NULL) {
for (i = 0; i < wlengthof(icon_animation); i++) {
if (strcasecmp(str, icon_animation[i].db_value) == 0) {
WMPerformButtonClick(panel->animB[i]);
WMSetPopUpButtonSelectedItem(panel->animP, i);
goto found_animation_value;
}
}
@@ -256,7 +229,7 @@ static void showData(_Panel * panel)
str, icon_animation[0].db_value);
}
/* If we're here, no valid value have been found so we fall-back to the default */
WMPerformButtonClick(panel->animB[0]);
WMSetPopUpButtonSelectedItem(panel->animP, 0);
found_animation_value:
;
}
@@ -366,7 +339,7 @@ static void createPanel(Panel * p)
panel->sizeP = WMCreatePopUpButton(panel->sizeF);
WMResizeWidget(panel->sizeP, 80, 20);
WMMoveWidget(panel->sizeP, 10, 19);
for (i = 24; i <= 96; i += 8) {
for (i = 24; i <= 256; i += 8) {
sprintf(buf, "%ix%i", i, i);
WMAddPopUpButtonItem(panel->sizeP, buf);
}
@@ -399,50 +372,57 @@ static void createPanel(Panel * p)
/***************** Animation ****************/
panel->animF = WMCreateFrame(panel->box);
WMResizeWidget(panel->animF, 215, 110);
WMResizeWidget(panel->animF, 215, 52);
WMMoveWidget(panel->animF, 292, 6);
WMSetFrameTitle(panel->animF, _("Iconification Animation"));
for (i = 0; i < wlengthof(icon_animation); i++) {
panel->animB[i] = WMCreateRadioButton(panel->animF);
WMResizeWidget(panel->animB[i], 192, 20);
WMMoveWidget(panel->animB[i], 12, 16 + i * 22);
if (i > 0)
WMGroupButtons(panel->animB[0], panel->animB[i]);
WMSetButtonText(panel->animB[i], _(icon_animation[i].label));
}
panel->animP = WMCreatePopUpButton(panel->animF);
WMResizeWidget(panel->animP, 195, 20);
WMMoveWidget(panel->animP, 10, 19);
for (i = 0; i < wlengthof(icon_animation); i++)
WMAddPopUpButtonItem(panel->animP, _(icon_animation[i].label));
WMMapSubwidgets(panel->animF);
/***************** Options ****************/
panel->optF = WMCreateFrame(panel->box);
WMResizeWidget(panel->optF, 215, 90);
WMMoveWidget(panel->optF, 292, 130);
WMResizeWidget(panel->optF, 215, 148);
WMMoveWidget(panel->optF, 292, 72);
/* WMSetFrameTitle(panel->optF, _("Icon Display")); */
starty = 8 + 14; /* the last term centers the checkboxes within the panel; subtract 13 for a new option */
panel->arrB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->arrB, 198, 26);
WMMoveWidget(panel->arrB, 12, 8);
WMMoveWidget(panel->arrB, 12, starty);
starty += 26;
WMSetButtonText(panel->arrB, _("Auto-arrange icons"));
WMSetBalloonTextForView(_("Keep icons and miniwindows arranged all the time."), WMWidgetView(panel->arrB));
panel->omnB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->omnB, 198, 26);
WMMoveWidget(panel->omnB, 12, 34);
WMMoveWidget(panel->omnB, 12, starty);
starty += 26;
WMSetButtonText(panel->omnB, _("Omnipresent miniwindows"));
WMSetBalloonTextForView(_("Make miniwindows be present in all workspaces."), WMWidgetView(panel->omnB));
panel->sclB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->sclB, 198, 26);
WMMoveWidget(panel->sclB, 12, 60);
WMMoveWidget(panel->sclB, 12, starty);
starty += 26;
WMSetButtonText(panel->sclB, _("Single click activation"));
WMSetBalloonTextForView(_("Launch applications and restore windows with a single click."), WMWidgetView(panel->sclB));
panel->marginB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->marginB, 198, 26);
WMMoveWidget(panel->marginB, 12, starty);
starty += 26;
WMSetButtonText(panel->marginB, _("Enforce icon margin"));
WMSetBalloonTextForView(_("Make sure that the icon image does not protrude into the icon frame."), WMWidgetView(panel->marginB));
WMMapSubwidgets(panel->optF);
WMRealizeWidget(panel->box);
@@ -458,6 +438,7 @@ static void storeData(_Panel * panel)
SetBoolForKey(WMGetButtonSelected(panel->arrB), "AutoArrangeIcons");
SetBoolForKey(WMGetButtonSelected(panel->omnB), "StickyIcons");
SetBoolForKey(WMGetButtonSelected(panel->sclB), "SingleClickLaunch");
SetBoolForKey(WMGetButtonSelected(panel->marginB), "EnforceIconMargin");
SetIntegerForKey(WMGetPopUpButtonSelectedItem(panel->sizeP) * 8 + 24, "IconSize");
@@ -478,17 +459,8 @@ static void storeData(_Panel * panel)
}
SetIntegerForKey(i, "MiniPreviewSize");
}
if (panel->have_legacy_apercu) {
RemoveObjectForKey("MiniwindowApercuBalloons");
RemoveObjectForKey("ApercuSize");
}
for (i = 0; i < wlengthof(icon_animation); i++) {
if (WMGetButtonSelected(panel->animB[i])) {
SetStringForKey(icon_animation[i].db_value, "IconificationStyle");
break;
}
}
SetStringForKey(icon_animation[WMGetPopUpButtonSelectedItem(panel->animP)].db_value, "IconificationStyle");
}
Panel *InitIcons(WMWidget *parent)
+4
View File
@@ -148,6 +148,10 @@ static const struct {
{ "WindowShortcut9Key", N_("Shortcut for window 9") },
{ "WindowShortcut10Key", N_("Shortcut for window 10") },
/* Head Selection */
{ "MoveTo12to6Head", N_("Move to right/bottom/left/top head") },
{ "MoveTo6to12Head", N_("Move to left/top/right/bottom head") },
/* Misc. */
{ "WindowRelaunchKey", N_("Launch new instance of application") },
{ "ScreenSwitchKey", N_("Switch to Next Screen/Monitor") },
+4 -3
View File
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS =
wpexecbindir = @wprefs_bindir@
wpexecbin_PROGRAMS = WPrefs
wpexecbin_PROGRAMS = WPrefs
wpdatadir = @wprefs_datadir@
@@ -45,10 +45,11 @@ WPrefs_SOURCES = \
# KeyboardSettings.c \
# Themes.c
AM_CFLAGS =
AM_CFLAGS = @PANGO_CFLAGS@
AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
-I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
-I$(top_builddir)/wrlib -I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \
@HEADER_SEARCH_PATH@
WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+66 -9
View File
@@ -22,6 +22,7 @@
#include "WPrefs.h"
#include <assert.h>
#include <ctype.h>
#include <unistd.h>
#include <X11/keysym.h>
#include <X11/cursorfont.h>
@@ -613,7 +614,7 @@ static void createPanel(_Panel * p)
WMAddNotificationObserver(dataChanged, panel, WMTextDidChangeNotification, panel->pathT);
label = WMCreateLabel(panel->pathF);
WMResizeWidget(label, width - 20, 80);
WMResizeWidget(label, width - 20, 90);
WMMoveWidget(label, 10, 50);
WMSetLabelText(label, _("Enter the path for a file containing a menu\n"
"or a list of directories with the programs you\n"
@@ -913,6 +914,11 @@ static ItemData *parseCommand(WMPropList * item)
data->type = ExecInfo;
if (parameter == NULL) {
wfree(data);
return NULL;
}
data->param.exec.command = wstrdup(parameter);
if (shortcut)
data->param.exec.shortcut = wstrdup(shortcut);
@@ -925,6 +931,12 @@ static ItemData *parseCommand(WMPropList * item)
* |pipe
*/
p = parameter;
if (p == NULL) {
wfree(data);
return NULL;
}
while (isspace(*p) && *p)
p++;
if (*p == '|') {
@@ -1435,12 +1447,12 @@ static WEditMenu *buildSubmenu(_Panel * panel, WMPropList * pl)
WSetEditMenuItemImage(item, panel->markerPix[data->type]);
WSetEditMenuItemData(item, data, (WMCallback *) freeItemData);
} else {
char *buf = wmalloc(1024);
snprintf(buf, 1024, _("Invalid menu command \"%s\" with label \"%s\" cleared"),
char buf[256];
snprintf(buf, sizeof(buf), _("Invalid menu command \"%s\" with label \"%s\" cleared"),
WMGetFromPLString(WMGetFromPLArray(pi, 1)),
WMGetFromPLString(WMGetFromPLArray(pi, 0)));
WMRunAlertPanel(scr, panel->parent, _("Warning"), buf, _("OK"), NULL, NULL);
wfree(buf);
}
}
@@ -1482,7 +1494,8 @@ static WMPropList *getDefaultMenu(_Panel * panel)
static void showData(_Panel * panel)
{
const char *gspath;
char *menuPath;
char *menuPath, *labelText;
char buf[1024];
WMPropList *pmenu;
gspath = wusergnusteppath();
@@ -1493,6 +1506,45 @@ static void showData(_Panel * panel)
pmenu = WMReadPropListFromFile(menuPath);
/* check if WMRootMenu references another file, and if so,
if that file is in proplist format */
while (WMIsPLString(pmenu)) {
char *path = NULL;
path = wexpandpath(WMGetFromPLString(pmenu));
if (access(path, F_OK) < 0) {
char *old_path = path;
path = wfindfile(DEF_CONFIG_PATHS, path);
wfree(old_path);
}
/* TODO: if needed, concatenate locale suffix to path.
See getLocalizedMenuFile() in src/rootmenu.c. */
if (!path)
break;
if (access(path, W_OK) < 0) {
snprintf(buf, sizeof(buf),
_("The menu file \"%s\" referenced by "
"WMRootMenu is read-only.\n"
"You cannot use WPrefs to modify it."),
path);
WMRunAlertPanel(WMWidgetScreen(panel->parent),
panel->parent,
_("Warning"), buf,
_("OK"), NULL, NULL);
panel->dontSave = True;
wfree(path);
return;
}
pmenu = WMReadPropListFromFile(path);
menuPath = path;
}
if (!pmenu || !WMIsPLArray(pmenu)) {
int res;
@@ -1517,6 +1569,14 @@ static void showData(_Panel * panel)
panel->menuPath = menuPath;
snprintf(buf, sizeof(buf),
_("\n\nWhen saved, the menu will be written to the file\n\"%s\"."),
menuPath);
labelText = WMGetLabelText(panel->sections[NoInfo][0]);
labelText = wstrconcat(labelText, buf);
WMSetLabelText(panel->sections[NoInfo][0], labelText);
wfree(labelText);
buildMenuFromPL(panel, pmenu);
WMReleasePropList(pmenu);
@@ -1557,15 +1617,12 @@ static WMPropList *processData(const char *title, ItemData * data)
case ExecInfo:
if (data->param.exec.command == NULL)
goto return_null;
#if 1
if (strpbrk(data->param.exec.command, "&$*|><?`=;")) {
s1 = "SHEXEC";
} else {
s1 = "EXEC";
}
#else
s1 = "SHEXEC";
#endif
if (notblank(data->param.exec.shortcut)) {
WMAddToPLArray(item, pscut);
+16 -16
View File
@@ -3,12 +3,12 @@
==========
The WindowMaker Prerefences Application
WPrefs.app is the preferences "editor" for the WindowMaker window
WPrefs.app is the preferences "editor" for the WindowMaker window
manager. It can be used to set most of the preference options of WindowMaker
and define it's applications menu. It also can change some settings
that do not belong to WindowMaker.
and define its applications menu. It also can change some settings
that do not belong to WindowMaker.
Although WPrefs.app is designed to be easy to use, you should read the
user guide to be fully aware of all available options and other features
@@ -16,7 +16,7 @@ of WindowMaker that are not related to configuration.
To run WPrefs, do not put it in your search path. Instead, run it
with the full path, like /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
Then, dock it's application icon. The dock will automatically detect it's
Then, dock its application icon. The dock will automatically detect its
icon and use it.
If you change configuration often, you might want to leave WPrefs
@@ -26,7 +26,7 @@ option in the attributes panel for the WPrefs window. Of course, it will
use some memory, but by leaving it hidden it'll probably be swapped out and
stay there until you unhide it.
WPrefs is still under development. Some of the configuration options are
WPrefs is still under development. Some of the configuration options are
not yet configurable from WPrefs, notably the appearance related options.
It might contain bugs that can corrupt your configuration files, so backup
the contents of the ~/GNUstep/Defaults directory before using it.
@@ -37,19 +37,19 @@ License
-------
Like Window Maker, WPrefs is distributed with through the General Public
License (as stated in the file COPYING).
License (as stated in the file COPYING).
Notes
-----
The mouse speed configuration is saved as a call for xset in
The mouse speed configuration is saved as a call for xset in
~/G/D/L/W/autostart. WindowMaker calls this file when it is started.
If you don't want or can't use the menu definition section, do not
open it's section (or if you do open it, do not Save), or WPrefs will
open its section (or if you do open it, do not Save), or WPrefs will
overwrite your ~/G/D/WMRootMenu file.
Only options that have different values than what is found in the
Only options that have different values than what is found in the
system-wide configuration file is saved.
WPrefs only supports property list menus. If you have a plain text file
@@ -68,13 +68,13 @@ WPrefs will be built automatically and installed with the rest of WindowMaker.
Customized Installation
-----------------------
By default, WPrefs.app will be installed in the GNUstep applications directory,
which is /usr/local/GNUstep/Applications. If you want to install it somewhere
By default, WPrefs.app will be installed in the GNUstep applications directory,
which is /usr/local/GNUstep/Applications. If you want to install it somewhere
else, like in /some_weird_path/Applications, set the GNUSTEP_LOCAL_ROOT
environment variable to some_weird_path before running configure for
WindowMaker. You can also configure Window Maker supplying the --with-gnustepdir
option to configure, like ./configure --with-gnustepdir=/usr/GNUstep/Applications
If you change your mind after installing, you can move the .app directory
If you change your mind after installing, you can move the .app directory
to one of the following GNUstep/Applications directories:
/usr/GNUstep/Applications
@@ -93,7 +93,7 @@ Credits
-------
User interface design, programming and a few icons:
Alfredo K. Kojima <kojima@windowmaker.info>
Alfredo K. Kojima <kojima@windowmaker.info>
Additional programming:
James Thompson <jamest@math.ksu.edu>
@@ -108,7 +108,7 @@ Icon and image artwork:
WindowMaker
-----------
If for some weird reason you end up with this preferences program and
If for some weird reason you end up with this preferences program and
don't have Window Maker yet, you can get more information about it at
http://windowmaker.info and download it at ftp://ftp.windowmaker.info
@@ -116,6 +116,6 @@ http://windowmaker.info and download it at ftp://ftp.windowmaker.info
Contact
-------
Send comments and bug reports to kojima@windowmaker.info
Send comments and bug reports to kojima@windowmaker.info
Use the WindowMaker BUGFORM to report bugs.
+1 -1
View File
@@ -602,7 +602,7 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
char *path;
FILE *file;
char buffer[1024];
char mbuf[1024];
char mbuf[1069]; /* Size of buffer and extra characters for the sprintfs */
int v1, v2, v3;
path = wdefaultspathfordomain("WindowMaker");
-16
View File
@@ -66,19 +66,6 @@ static void print_help(const char *progname)
puts(_(" --help print this message and exit"));
}
#if 0
static RETSIGTYPE handleDeadChild(int sig)
{
pid_t pid;
int status;
pid = waitpid(-1, &status, WNOHANG);
if (pid > 0) {
DeadChildren[DeadChildrenCount++] = pid;
}
}
#endif
void AddDeadChildHandler(pid_t pid, void (*handler) (void *), void *data)
{
int i;
@@ -164,9 +151,6 @@ int main(int argc, char **argv)
wfatal(_("could not open display %s"), XDisplayName(display_name));
exit(0);
}
#if 0
XSynchronize(dpy, 1);
#endif
scr = WMCreateScreen(dpy, DefaultScreen(dpy));
if (!scr) {
wfatal(_("could not initialize application"));
+2 -2
View File
@@ -5,7 +5,7 @@ CATALOGS = @WPREFSMOFILES@
CLEANFILES = $(DOMAIN).pot $(CATALOGS)
EXTRA_DIST = bg.po ca.po cs.po de.po es.po et.po fi.po fr.po fy.po hr.po hu.po \
it.po ja.po ko.po nl.po pt.po ru.po sk.po uk.po zh_CN.po zh_TW.po
it.po ja.po ko.po nl.po pt.po ru.po sk.po tr.po uk.po zh_CN.po zh_TW.po
POTFILES = \
$(top_srcdir)/WPrefs.app/Appearance.c \
@@ -37,7 +37,7 @@ POTFILES = \
SUFFIXES = .po .mo
.po.mo:
.po.mo:
$(AM_V_GEN)$(MSGFMT) -c -o $@ $<
+2 -2
View File
@@ -1,7 +1,7 @@
File Language Current Maintainer
------------------------------------------------------------------------------
pt.po Portuguese Eliphas Levy Theodoro <eliphas@conectiva.com.br>
hr.po Croatian Toni Biliæ <tbilic@oliver.efos.hr>
hr.po Croatian Toni Biliæ <tbilic@oliver.efos.hr>
fr.po French Bastien NOCERA <hadess@writeme.com>
Hadess <hadess@infonie.fr>
Antoine Hulin <antoine@origan.fdn.org>
@@ -23,6 +23,6 @@ bg.po Bulgarian Slavei Karadjov <slaff@exco.net>
Anton Zinoviev <zinoviev@debian.org>
sk.po Slovak Jan 'judas' Tomka <judas@linux.sk>
et.po Estonian Ivar Smolin <okul@linux.ee>
ca.po Catalan Ernest Adrogué <eadrogue@gmx.net>
ca.po Catalan Ernest Adrogué <eadrogue@gmx.net>
nl.po Dutch Alwin <translations@ziggo.nl>
fy.po Frisian Alwin <translations@ziggo.nl>
+1 -1
View File
@@ -819,7 +819,7 @@ msgstr "Clip in den Vor-/Hintergrund"
#: ../../WPrefs.app/KeyboardShortcuts.c:518
msgid "Toggle keyboard language"
msgstr "Tastatursbelegung ändern"
msgstr "Tastaturbelegung ändern"
#: ../../WPrefs.app/KeyboardShortcuts.c:532
msgid "Shortcut"
+1 -1
View File
@@ -1671,7 +1671,7 @@ msgstr "Keela tiitliriba"
msgid ""
"Remove the titlebar of this window.\n"
"To access the window commands menu of a window\n"
"without it's titlebar, press Control+Esc (or the\n"
"without its titlebar, press Control+Esc (or the\n"
"equivalent shortcut, if you changed the default\n"
"settings)."
msgstr ""
+1 -1
View File
@@ -1,4 +1,4 @@
# French Message file for WPrefs.app
# French Message file for WPrefs.app
#
# Update History:
# Antoine Hulin <antoine.hulin@origan.fdn.org>
+164 -145
View File
@@ -1,14 +1,14 @@
# Translation into Western Frisian for Window Maker
# Copyright (C) 2015-2016 Window Maker Developers Team
# Copyright (C) 2015-2017 Window Maker Developers Team
# This file is distributed under the same license as the windowmaker package.
# Original by Alwin <translations@ziggo.nl>, 2015.
#
msgid ""
msgstr ""
"Project-Id-Version: wmaker-0.95.7+\n"
"Project-Id-Version: wmaker-0.95.8+\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-10 10:56+0100\n"
"PO-Revision-Date: 2017-03-10 00:00+0000\n"
"POT-Creation-Date: 2017-09-14 19:36+0200\n"
"PO-Revision-Date: 2017-09-14 00:00+0000\n"
"Last-Translator: Alwin <translations@ziggo.nl>\n"
"Language-Team: Western Frisian\n"
"Language: fy\n"
@@ -664,8 +664,8 @@ msgstr "ferkearde opsjewearde %s foar opsje FocusMode. Brûkt standert Manual"
msgid "bad option value %s for option ColormapMode. Using default Auto"
msgstr "ferkearde opsjewearde %s foar opsje ColormapMode. Brûkt standert Auto"
#: ../../WPrefs.app/Focus.c:154 ../../WPrefs.app/Icons.c:162
#: ../../WPrefs.app/Icons.c:396 ../../WPrefs.app/Preferences.c:120
#: ../../WPrefs.app/Focus.c:154 ../../WPrefs.app/Icons.c:160
#: ../../WPrefs.app/Icons.c:367 ../../WPrefs.app/Preferences.c:120
#: ../../WPrefs.app/WindowHandling.c:140 ../../WPrefs.app/WindowHandling.c:159
#, c-format
msgid "OFF"
@@ -765,27 +765,27 @@ msgstr "Systeemletter"
msgid "Bold System Font"
msgstr "Systeemletter, fet"
#: ../../WPrefs.app/FontSimple.c:664
#: ../../WPrefs.app/FontSimple.c:660
msgid "Sample Text"
msgstr "Foarbyld"
#: ../../WPrefs.app/FontSimple.c:681
#: ../../WPrefs.app/FontSimple.c:677
msgid "Family"
msgstr "Famylje"
#: ../../WPrefs.app/FontSimple.c:707
#: ../../WPrefs.app/FontSimple.c:703
msgid "Style"
msgstr "Styl"
#: ../../WPrefs.app/FontSimple.c:710
#: ../../WPrefs.app/FontSimple.c:706
msgid "Size"
msgstr "Grutte"
#: ../../WPrefs.app/FontSimple.c:742
#: ../../WPrefs.app/FontSimple.c:738
msgid "Font Configuration"
msgstr "Lettertypekonfiguraasje"
#: ../../WPrefs.app/FontSimple.c:744
#: ../../WPrefs.app/FontSimple.c:740
msgid "Configure fonts for Window Maker titlebars, menus etc."
msgstr ""
"Stel lettertypen yn foar Window Maker-titelbalken,\n"
@@ -808,36 +808,36 @@ msgstr "3D wintelje"
msgid "None"
msgstr "Gjin"
#: ../../WPrefs.app/Icons.c:186 ../../WPrefs.app/Preferences.c:145
#: ../../WPrefs.app/Icons.c:184 ../../WPrefs.app/Preferences.c:145
#: ../../WPrefs.app/Preferences.c:159
#, c-format
msgid "bad value \"%s\" for option %s, using default \"%s\""
msgstr "ferkearde wearde \"%s\" foar opsje %s, brûkt standert \"%s\""
#: ../../WPrefs.app/Icons.c:255
#: ../../WPrefs.app/Icons.c:226
#, c-format
msgid "animation style \"%s\" is unknown, resetting to \"%s\""
msgstr "animaasjestyl \"%s\" is ûnbekend, weromset op \"%s\""
#: ../../WPrefs.app/Icons.c:282
#: ../../WPrefs.app/Icons.c:253
msgid "Icon Positioning"
msgstr "Ikoanpleatsing"
#: ../../WPrefs.app/Icons.c:361
#: ../../WPrefs.app/Icons.c:332
msgid "Icon Size"
msgstr "Ikoangrutte"
#: ../../WPrefs.app/Icons.c:363
#: ../../WPrefs.app/Icons.c:334
msgid "The size of the dock/application icon and miniwindows"
msgstr ""
"De ôfmjittingen fan it dok-/programma-ikoan\n"
"en minyfinsters"
#: ../../WPrefs.app/Icons.c:380
#: ../../WPrefs.app/Icons.c:351
msgid "Mini-Previews for Icons"
msgstr "Miniatueren foar ikoanen"
#: ../../WPrefs.app/Icons.c:382
#: ../../WPrefs.app/Icons.c:353
msgid ""
"The Mini-Preview provides a small view of the content of the\n"
"window when the mouse is placed over the icon."
@@ -845,41 +845,41 @@ msgstr ""
"De miniatuer biedt in lytse blik op 'e ynhâld fan it\n"
"finster, as de mûs op it ikoan pleatst wurdt."
#: ../../WPrefs.app/Icons.c:404
#: ../../WPrefs.app/Icons.c:375
msgid "Iconification Animation"
msgstr "Ikoanifisearringsanimaasje"
#: ../../WPrefs.app/Icons.c:428
#: ../../WPrefs.app/Icons.c:399
msgid "Auto-arrange icons"
msgstr "Ikoanen fansels skikke"
#: ../../WPrefs.app/Icons.c:430
#: ../../WPrefs.app/Icons.c:401
msgid "Keep icons and miniwindows arranged all the time."
msgstr "Hâld ikoanen en minyfinsters altiten skikt."
#: ../../WPrefs.app/Icons.c:435
#: ../../WPrefs.app/Icons.c:406
msgid "Omnipresent miniwindows"
msgstr "Rûnombywêzige minyfinsters"
#: ../../WPrefs.app/Icons.c:437
#: ../../WPrefs.app/Icons.c:408
msgid "Make miniwindows be present in all workspaces."
msgstr "Meitsje minyfinsters oanwêzich yn alle wurkromten."
#: ../../WPrefs.app/Icons.c:442
#: ../../WPrefs.app/Icons.c:413
msgid "Single click activation"
msgstr "Inkeldkliksaktivearring"
#: ../../WPrefs.app/Icons.c:444
#: ../../WPrefs.app/Icons.c:415
msgid "Launch applications and restore windows with a single click."
msgstr ""
"Start programma's op, en werstel finsters mei\n"
"in inkelde klik."
#: ../../WPrefs.app/Icons.c:500
#: ../../WPrefs.app/Icons.c:467
msgid "Icon Preferences"
msgstr "Ikoanfoarkarren"
#: ../../WPrefs.app/Icons.c:502
#: ../../WPrefs.app/Icons.c:469
msgid ""
"Icon/Miniwindow handling options. Icon positioning\n"
"area, sizes of icons, miniaturization animation style."
@@ -1210,7 +1210,7 @@ msgstr "Ferheegje/ferleegje Klip"
msgid "Toggle keyboard language"
msgstr "Wikselje toetseboerdtaal"
#: ../../WPrefs.app/KeyboardShortcuts.c:375 ../../WPrefs.app/Menu.c:274
#: ../../WPrefs.app/KeyboardShortcuts.c:375 ../../WPrefs.app/Menu.c:275
#: ../../WPrefs.app/TexturePanel.c:1425
msgid "Cancel"
msgstr "Annulearje"
@@ -1222,8 +1222,8 @@ msgstr ""
"stopjen."
#: ../../WPrefs.app/KeyboardShortcuts.c:396
#: ../../WPrefs.app/KeyboardShortcuts.c:566 ../../WPrefs.app/Menu.c:284
#: ../../WPrefs.app/Menu.c:732
#: ../../WPrefs.app/KeyboardShortcuts.c:566 ../../WPrefs.app/Menu.c:285
#: ../../WPrefs.app/Menu.c:733
msgid "Capture"
msgstr "Opnimme"
@@ -1240,7 +1240,7 @@ msgstr "Aksjes"
msgid "Shortcut"
msgstr "Fluchtoets"
#: ../../WPrefs.app/KeyboardShortcuts.c:560 ../../WPrefs.app/Menu.c:738
#: ../../WPrefs.app/KeyboardShortcuts.c:560 ../../WPrefs.app/Menu.c:739
msgid "Clear"
msgstr "Wiskje"
@@ -1256,188 +1256,188 @@ msgstr ""
"Wizigje de fluchtoetsen foar aksjes, sa as fan\n"
"wurkromte wikseljen en menu's iepenjen."
#: ../../WPrefs.app/Menu.c:250
#: ../../WPrefs.app/Menu.c:251
msgid "Select Program"
msgstr "Kies programma"
#: ../../WPrefs.app/Menu.c:412
#: ../../WPrefs.app/Menu.c:413
msgid "New Items"
msgstr "Nije ûnderdielen"
#: ../../WPrefs.app/Menu.c:413
#: ../../WPrefs.app/Menu.c:414
msgid "Sample Commands"
msgstr "Foarbyldkommando's"
#: ../../WPrefs.app/Menu.c:414
#: ../../WPrefs.app/Menu.c:415
msgid "Sample Submenus"
msgstr "Foarbyldmenu's"
#: ../../WPrefs.app/Menu.c:426
#: ../../WPrefs.app/Menu.c:427
msgid "Run Program"
msgstr "Programma útfiere"
#: ../../WPrefs.app/Menu.c:427
#: ../../WPrefs.app/Menu.c:428
msgid "Internal Command"
msgstr "Yntern kommando"
#: ../../WPrefs.app/Menu.c:428
#: ../../WPrefs.app/Menu.c:429
msgid "Submenu"
msgstr "Submenu"
#: ../../WPrefs.app/Menu.c:429
#: ../../WPrefs.app/Menu.c:430
msgid "External Submenu"
msgstr "Ekstern submenu"
#: ../../WPrefs.app/Menu.c:430
#: ../../WPrefs.app/Menu.c:431
msgid "Generated Submenu"
msgstr "Oanmakke submenu"
#: ../../WPrefs.app/Menu.c:431
#: ../../WPrefs.app/Menu.c:432
msgid "Generated PL Menu"
msgstr "Oanmakke PL-menu"
#: ../../WPrefs.app/Menu.c:432
#: ../../WPrefs.app/Menu.c:433
msgid "Directory Contents"
msgstr "Mapynhâld"
#: ../../WPrefs.app/Menu.c:433
#: ../../WPrefs.app/Menu.c:434
msgid "Workspace Menu"
msgstr "Wurkromtenmenu"
#: ../../WPrefs.app/Menu.c:434 ../../WPrefs.app/MouseSettings.c:58
#: ../../WPrefs.app/Menu.c:435 ../../WPrefs.app/MouseSettings.c:58
msgid "Window List Menu"
msgstr "Finsterlistmenu"
#: ../../WPrefs.app/Menu.c:453
#: ../../WPrefs.app/Menu.c:454
msgid "XTerm"
msgstr ""
#: ../../WPrefs.app/Menu.c:456
#: ../../WPrefs.app/Menu.c:457
msgid "rxvt"
msgstr ""
#: ../../WPrefs.app/Menu.c:459
#: ../../WPrefs.app/Menu.c:460
msgid "ETerm"
msgstr ""
#: ../../WPrefs.app/Menu.c:462
#: ../../WPrefs.app/Menu.c:463
msgid "Run..."
msgstr "Utfiere..."
#: ../../WPrefs.app/Menu.c:463
#: ../../WPrefs.app/Menu.c:464
#, c-format
msgid "%A(Run,Type command to run)"
msgstr "%A(Utfiere,Typ út te fieren kommando)"
#: ../../WPrefs.app/Menu.c:465
#: ../../WPrefs.app/Menu.c:466
msgid "Firefox"
msgstr ""
#: ../../WPrefs.app/Menu.c:468
#: ../../WPrefs.app/Menu.c:469
msgid "gimp"
msgstr ""
#: ../../WPrefs.app/Menu.c:471
#: ../../WPrefs.app/Menu.c:472
msgid "epic"
msgstr ""
#: ../../WPrefs.app/Menu.c:474
#: ../../WPrefs.app/Menu.c:475
msgid "ee"
msgstr ""
#: ../../WPrefs.app/Menu.c:477
#: ../../WPrefs.app/Menu.c:478
msgid "xv"
msgstr ""
#: ../../WPrefs.app/Menu.c:480
#: ../../WPrefs.app/Menu.c:481
msgid "Evince"
msgstr ""
#: ../../WPrefs.app/Menu.c:483
#: ../../WPrefs.app/Menu.c:484
msgid "ghostview"
msgstr ""
#: ../../WPrefs.app/Menu.c:486 ../../WPrefs.app/Menu.c:757
#: ../../WPrefs.app/Menu.c:487 ../../WPrefs.app/Menu.c:758
msgid "Exit Window Maker"
msgstr "Window Maker ôfslute"
#: ../../WPrefs.app/Menu.c:508
#: ../../WPrefs.app/Menu.c:509
msgid "Debian Menu"
msgstr "Debian-menu"
#: ../../WPrefs.app/Menu.c:511
#: ../../WPrefs.app/Menu.c:512
msgid "RedHat Menu"
msgstr "RedHat-menu"
#: ../../WPrefs.app/Menu.c:514
#: ../../WPrefs.app/Menu.c:515
msgid "Menu Conectiva"
msgstr "Conectiva-menu"
#: ../../WPrefs.app/Menu.c:517
#: ../../WPrefs.app/Menu.c:518
msgid "Themes"
msgstr "Tema's"
#: ../../WPrefs.app/Menu.c:523
#: ../../WPrefs.app/Menu.c:524
msgid "Bg Images (scale)"
msgstr "Eftergrûn (skaal)"
#: ../../WPrefs.app/Menu.c:529
#: ../../WPrefs.app/Menu.c:530
msgid "Bg Images (tile)"
msgstr "Eftergrûn (tegel)"
#: ../../WPrefs.app/Menu.c:535
#: ../../WPrefs.app/Menu.c:536
msgid "Assorted XTerms"
msgstr "Alderhande XTerms"
#: ../../WPrefs.app/Menu.c:537
#: ../../WPrefs.app/Menu.c:538
msgid "XTerm Yellow on Blue"
msgstr "XTerm giel op blau"
#: ../../WPrefs.app/Menu.c:540
#: ../../WPrefs.app/Menu.c:541
msgid "XTerm White on Black"
msgstr "XTerm wyt op swart"
#: ../../WPrefs.app/Menu.c:543
#: ../../WPrefs.app/Menu.c:544
msgid "XTerm Black on White"
msgstr "XTerm swart op wyt"
#: ../../WPrefs.app/Menu.c:546
#: ../../WPrefs.app/Menu.c:547
msgid "XTerm Black on Beige"
msgstr "XTerm swart op bêzje"
#: ../../WPrefs.app/Menu.c:549
#: ../../WPrefs.app/Menu.c:550
msgid "XTerm White on Green"
msgstr "XTerm wyt op grien"
#: ../../WPrefs.app/Menu.c:552
#: ../../WPrefs.app/Menu.c:553
msgid "XTerm White on Olive"
msgstr "XTerm wyt op oliifgrien"
#: ../../WPrefs.app/Menu.c:555
#: ../../WPrefs.app/Menu.c:556
msgid "XTerm Blue on Blue"
msgstr "XTerm blau op blau"
#: ../../WPrefs.app/Menu.c:558
#: ../../WPrefs.app/Menu.c:559
msgid "XTerm BIG FONTS"
msgstr "XTerm GRUTTE LETTERS"
#: ../../WPrefs.app/Menu.c:579
#: ../../WPrefs.app/Menu.c:580
msgid "Program to Run"
msgstr "Ut te fieren programma"
#: ../../WPrefs.app/Menu.c:589
#: ../../WPrefs.app/Menu.c:590
msgid "Browse"
msgstr "Blêdzje"
#: ../../WPrefs.app/Menu.c:598
#: ../../WPrefs.app/Menu.c:599
msgid "Run the program inside a Xterm"
msgstr "Fier it programma út yn in XTerm"
#: ../../WPrefs.app/Menu.c:607
#: ../../WPrefs.app/Menu.c:608
msgid "Path for Menu"
msgstr "Paad nei menu"
#: ../../WPrefs.app/Menu.c:618
#: ../../WPrefs.app/Menu.c:619
msgid ""
"Enter the path for a file containing a menu\n"
"or a list of directories with the programs you\n"
@@ -1453,11 +1453,11 @@ msgstr ""
"of\n"
"/usr/bin ~/xbin"
#: ../../WPrefs.app/Menu.c:630 ../../WPrefs.app/Menu.c:655
#: ../../WPrefs.app/Menu.c:631 ../../WPrefs.app/Menu.c:656
msgid "Command"
msgstr "Kommando"
#: ../../WPrefs.app/Menu.c:641
#: ../../WPrefs.app/Menu.c:642
msgid ""
"Enter a command that outputs a menu\n"
"definition to stdout when invoked."
@@ -1465,7 +1465,7 @@ msgstr ""
"Fier in kommando yn, dat by oanroppen\n"
"in útwurke menu jout nei 'stdout'."
#: ../../WPrefs.app/Menu.c:646 ../../WPrefs.app/Menu.c:671
#: ../../WPrefs.app/Menu.c:647 ../../WPrefs.app/Menu.c:672
msgid ""
"Cache menu contents after opening for\n"
"the first time"
@@ -1473,7 +1473,7 @@ msgstr ""
"Bewarje menuynhâld nei de earste kear\n"
"iepenjen"
#: ../../WPrefs.app/Menu.c:666
#: ../../WPrefs.app/Menu.c:667
msgid ""
"Enter a command that outputs a proplist menu\n"
"definition to stdout when invoked."
@@ -1482,11 +1482,11 @@ msgstr ""
"in útwurke 'property list'-menu jout\n"
"nei 'stdout'."
#: ../../WPrefs.app/Menu.c:680
#: ../../WPrefs.app/Menu.c:681
msgid "Command to Open Files"
msgstr "Kommando om bestannen te iepenjen"
#: ../../WPrefs.app/Menu.c:691
#: ../../WPrefs.app/Menu.c:692
msgid ""
"Enter the command you want to use to open the\n"
"files in the directories listed below."
@@ -1494,71 +1494,71 @@ msgstr ""
"Fier it te brûken kommando yn, om 'e\n"
"bestannen yn ûndersteande mappen te iepenjen."
#: ../../WPrefs.app/Menu.c:699
#: ../../WPrefs.app/Menu.c:700
msgid "Directories with Files"
msgstr "Mappen mei bestannen"
#: ../../WPrefs.app/Menu.c:710
#: ../../WPrefs.app/Menu.c:711
msgid "Strip extensions from file names"
msgstr "Ekstinsjes fan bestânsnammen ôf helje"
#: ../../WPrefs.app/Menu.c:721
#: ../../WPrefs.app/Menu.c:722
msgid "Keyboard Shortcut"
msgstr "Fluchtoets"
#: ../../WPrefs.app/Menu.c:753
#: ../../WPrefs.app/Menu.c:754
msgid "Arrange Icons"
msgstr "Ikoanen skikke"
#: ../../WPrefs.app/Menu.c:754
#: ../../WPrefs.app/Menu.c:755
msgid "Hide All Windows Except For The Focused One"
msgstr "Alle finsters ferbergje, útsein dy't fokus hat"
#: ../../WPrefs.app/Menu.c:755
#: ../../WPrefs.app/Menu.c:756
msgid "Show All Windows"
msgstr "Alle finsters toane"
#: ../../WPrefs.app/Menu.c:758
#: ../../WPrefs.app/Menu.c:759
msgid "Exit X Session"
msgstr "X-sesje ôfslute"
#: ../../WPrefs.app/Menu.c:759
#: ../../WPrefs.app/Menu.c:760
msgid "Restart Window Maker"
msgstr "Window Maker werstarte"
#: ../../WPrefs.app/Menu.c:760
#: ../../WPrefs.app/Menu.c:761
msgid "Start Another Window Manager : ("
msgstr "Oare finsterbehearder starte : ("
#: ../../WPrefs.app/Menu.c:762
#: ../../WPrefs.app/Menu.c:763
msgid "Save Current Session"
msgstr "Hjoeddeiske sesje bewarje"
#: ../../WPrefs.app/Menu.c:763
#: ../../WPrefs.app/Menu.c:764
msgid "Clear Saved Session"
msgstr "Bewarre sesje wiskje"
#: ../../WPrefs.app/Menu.c:764
#: ../../WPrefs.app/Menu.c:765
msgid "Refresh Screen"
msgstr "Skerm fernije"
#: ../../WPrefs.app/Menu.c:765
#: ../../WPrefs.app/Menu.c:766
msgid "Open Info Panel"
msgstr "Ynfopaniel iepenje"
#: ../../WPrefs.app/Menu.c:766
#: ../../WPrefs.app/Menu.c:767
msgid "Open Copyright Panel"
msgstr "Auteursrjochtenpaniel iepenje"
#: ../../WPrefs.app/Menu.c:771
#: ../../WPrefs.app/Menu.c:772
msgid "Window Manager to Start"
msgstr "Te starten finsterbehearder"
#: ../../WPrefs.app/Menu.c:784
#: ../../WPrefs.app/Menu.c:785
msgid "Do not confirm action."
msgstr "Aksje net befêstigje."
#: ../../WPrefs.app/Menu.c:791
#: ../../WPrefs.app/Menu.c:792
msgid ""
"Instructions:\n"
"\n"
@@ -1571,60 +1571,57 @@ msgid ""
msgstr ""
"Ynstruksjes:\n"
"\n"
"- Fersleep ûnderdielen fan lofts nei it menu, om\n"
" nije yngongen ta te foegjen.\n"
"- Fersleep ûnderdielen út it menu, om se te ferwiderjen.\n"
"- Fersleep ûnderdielen binnen it menu, om har plak te\n"
" feroarjen.\n"
"- Fersleep ûnderdielen mei Control yndrukt, om se te\n"
" kopiearjen.\n"
"- Dûbeldklik op in menuyngong, om 'e beneaming te\n"
" wizigjen.\n"
"- Klik op in menuyngong, om relatearre ynformaasje te\n"
" wizigjen."
"Fersleep ûnderdielen...\n"
" ...fan lofts nei it menu, om nije yngongen ta te foegjen.\n"
" ...út it menu, om se te ferwiderjen.\n"
" ...binnen it menu, om har plak te feroarjen.\n"
" ...mei Control yndrukt, om se te kopiearjen.\n"
"(Dûbeld)klik op in menuyngong, om...\n"
" ...de beneaming te wizigjen.\n"
" ...relatearre ynformaasje te wizigjen."
#: ../../WPrefs.app/Menu.c:1030
#: ../../WPrefs.app/Menu.c:1031
#, c-format
msgid "unknown command '%s' in menu"
msgstr "ûnbekend kommando '%s' yn menu"
#: ../../WPrefs.app/Menu.c:1054
#: ../../WPrefs.app/Menu.c:1055
msgid ": Execute Program"
msgstr ": start programma"
#: ../../WPrefs.app/Menu.c:1058
#: ../../WPrefs.app/Menu.c:1059
msgid ": Perform Internal Command"
msgstr ": fier yntern kommando út"
#: ../../WPrefs.app/Menu.c:1062
#: ../../WPrefs.app/Menu.c:1063
msgid ": Open a Submenu"
msgstr ": iepenje in submenu"
#: ../../WPrefs.app/Menu.c:1066
#: ../../WPrefs.app/Menu.c:1067
msgid ": Program Generated Submenu"
msgstr ": submenu út programma"
#: ../../WPrefs.app/Menu.c:1070
#: ../../WPrefs.app/Menu.c:1071
msgid ": Program Generated Proplist Submenu"
msgstr ": PropList-submenu út programma"
#: ../../WPrefs.app/Menu.c:1074
#: ../../WPrefs.app/Menu.c:1075
msgid ": Directory Contents Menu"
msgstr ": menu mei mapynhâld"
#: ../../WPrefs.app/Menu.c:1078
#: ../../WPrefs.app/Menu.c:1079
msgid ": Open Workspaces Submenu"
msgstr ": iepenje wurkromtensubmenu"
#: ../../WPrefs.app/Menu.c:1082
#: ../../WPrefs.app/Menu.c:1083
msgid ": Open Window List Submenu"
msgstr ": iepenje finsterlistsubmenu"
#: ../../WPrefs.app/Menu.c:1298
#: ../../WPrefs.app/Menu.c:1299
msgid "Remove Submenu"
msgstr "Submenu ferwiderje"
#: ../../WPrefs.app/Menu.c:1299
#: ../../WPrefs.app/Menu.c:1300
msgid ""
"Removing this item will destroy all items inside\n"
"the submenu. Do you really want to do that?"
@@ -1632,45 +1629,45 @@ msgstr ""
"Dit ûnderdiel ferwiderjen, sil alle yngongen yn it\n"
"submenu ferneatigje. Wolle jo dat echt dwaan?"
#: ../../WPrefs.app/Menu.c:1301
#: ../../WPrefs.app/Menu.c:1302
msgid "Yes"
msgstr "Ja"
#: ../../WPrefs.app/Menu.c:1301
#: ../../WPrefs.app/Menu.c:1302
msgid "No"
msgstr "Nee"
#: ../../WPrefs.app/Menu.c:1301
#: ../../WPrefs.app/Menu.c:1302
msgid "Yes, don't ask again"
msgstr "Ja, freegje net wer"
#: ../../WPrefs.app/Menu.c:1439
#: ../../WPrefs.app/Menu.c:1440
#, c-format
msgid "Invalid menu command \"%s\" with label \"%s\" cleared"
msgstr "Unjildich menukommando \"%s\" mei label \"%s\" leech"
#: ../../WPrefs.app/Menu.c:1442 ../../WPrefs.app/Menu.c:1500
#: ../../WPrefs.app/WPrefs.c:668
#: ../../WPrefs.app/Menu.c:1443 ../../WPrefs.app/Menu.c:1522
#: ../../WPrefs.app/Menu.c:1537 ../../WPrefs.app/WPrefs.c:668
msgid "Warning"
msgstr "Warskôging"
#: ../../WPrefs.app/Menu.c:1442 ../../WPrefs.app/Menu.c:1475
#: ../../WPrefs.app/MouseSettings.c:156 ../../WPrefs.app/MouseSettings.c:176
#: ../../WPrefs.app/TexturePanel.c:585 ../../WPrefs.app/TexturePanel.c:663
#: ../../WPrefs.app/TexturePanel.c:1419 ../../WPrefs.app/WPrefs.c:617
#: ../../WPrefs.app/WPrefs.c:621 ../../WPrefs.app/WPrefs.c:641
#: ../../WPrefs.app/WPrefs.c:653 ../../WPrefs.app/WPrefs.c:659
#: ../../WPrefs.app/WPrefs.c:668 ../../WPrefs.app/WPrefs.c:699
#: ../../WPrefs.app/WPrefs.c:703
#: ../../WPrefs.app/Menu.c:1443 ../../WPrefs.app/Menu.c:1476
#: ../../WPrefs.app/Menu.c:1523 ../../WPrefs.app/MouseSettings.c:156
#: ../../WPrefs.app/MouseSettings.c:176 ../../WPrefs.app/TexturePanel.c:585
#: ../../WPrefs.app/TexturePanel.c:663 ../../WPrefs.app/TexturePanel.c:1419
#: ../../WPrefs.app/WPrefs.c:617 ../../WPrefs.app/WPrefs.c:621
#: ../../WPrefs.app/WPrefs.c:641 ../../WPrefs.app/WPrefs.c:653
#: ../../WPrefs.app/WPrefs.c:659 ../../WPrefs.app/WPrefs.c:668
#: ../../WPrefs.app/WPrefs.c:699 ../../WPrefs.app/WPrefs.c:703
msgid "OK"
msgstr "OK"
#: ../../WPrefs.app/Menu.c:1471
#: ../../WPrefs.app/Menu.c:1472
#, c-format
msgid "Could not open default menu from '%s'"
msgstr "Koe standertmenu net iepenje út '%s'"
#: ../../WPrefs.app/Menu.c:1475 ../../WPrefs.app/MouseSettings.c:154
#: ../../WPrefs.app/Menu.c:1476 ../../WPrefs.app/MouseSettings.c:154
#: ../../WPrefs.app/MouseSettings.c:173 ../../WPrefs.app/TexturePanel.c:585
#: ../../WPrefs.app/TexturePanel.c:661 ../../WPrefs.app/WPrefs.c:617
#: ../../WPrefs.app/WPrefs.c:621 ../../WPrefs.app/WPrefs.c:638
@@ -1679,7 +1676,16 @@ msgstr "Koe standertmenu net iepenje út '%s'"
msgid "Error"
msgstr "Flater"
#: ../../WPrefs.app/Menu.c:1501
#: ../../WPrefs.app/Menu.c:1516
#, c-format
msgid ""
"The menu file \"%s\" referenced by WMRootMenu is read-only.\n"
"You cannot use WPrefs to modify it."
msgstr ""
"Menubestân \"%s\" ferwiisd troch WMRootMenu is allinnich-lêze.\n"
"Jo kinne WPrefs net brûke om it te wizigjen."
#: ../../WPrefs.app/Menu.c:1538
msgid ""
"The menu file format currently in use is not supported\n"
"by this tool. Do you want to discard the current menu\n"
@@ -1689,19 +1695,32 @@ msgstr ""
"troch dit helpmiddel. Wolle jo it hjoeddeiske menu fersmite,\n"
"om dit helpmiddel te brûken?"
#: ../../WPrefs.app/Menu.c:1504
#: ../../WPrefs.app/Menu.c:1541
msgid "Yes, Discard and Update"
msgstr "Ja, fersmiet en wurkje by"
msgstr "Ja, fersmiet, wurkje by"
#: ../../WPrefs.app/Menu.c:1504
#: ../../WPrefs.app/Menu.c:1541
msgid "No, Keep Current Menu"
msgstr "Nee, behâld hjoeddeisk menu"
#: ../../WPrefs.app/Menu.c:1750
#: ../../WPrefs.app/Menu.c:1558
#, c-format
msgid ""
"\n"
"\n"
"When saved, the menu will be written to the file\n"
"\"%s\"."
msgstr ""
"\n"
"\n"
"By bewarjen wurdt it menu skreaun nei it bestân\n"
"\"%s\"."
#: ../../WPrefs.app/Menu.c:1795
msgid "Applications Menu Definition"
msgstr "Programmamenu fêststelle"
#: ../../WPrefs.app/Menu.c:1752
#: ../../WPrefs.app/Menu.c:1797
msgid "Edit the menu for launching applications."
msgstr "Bewurkje it menu foar programma's opstarten."
+26 -26
View File
@@ -1168,88 +1168,88 @@ msgid "could not initialize application"
msgstr "ne mogu inicijalizirati aplikaciju"
# msgid "could not extract version information from WindowMaker"
# msgstr "ne mogu izvuči informaciju o verziji WindowMaker-a"
#
#
# msgid "Could not load WindowMaker domain (%s) from defaults database."
# msgstr "Ne mogu učitati WindowMaker domenu (%s) iz početne baze."
#
#
# msgid "Version %s for WindowMaker %s"
# msgstr "Verzija %s za WindowMaker %s"
#
#
# msgid "Could not extract version from WindowMaker. Make sure it is correctly installed."
# msgstr "Ne mogu izvuči verziju WindowMakera. Provjerite da je ispravno instaliran."
#
#
# msgid ""
# "Programming/Design: Alfredo K. Kojima\n"
# "Artwork: Marco van Hylckama Vlieg"
# msgstr ""
# "Programiranje/Dizajn: Alfredo K. Kojima\n"
# "Artwork: Marco van Hylckama Vlieg"
#
#
# msgid "WindowMaker domain (%s) is corrupted!"
# msgstr "WindowMaker domena (%s) je oštećena!"
#
#
# msgid "WindowMaker %i.%i.%i, which is installed in your system, is not fully supported by this version of WPrefs."
# msgstr "WindowMaker %i.%i.%i, koji je instaliran na vašem sistemu, nije potpuno podržan ovom verzijom WPrefs-a."
#
#
# msgid "WindowMaker Preferences"
# msgstr "Postavke WindowMaker-a"
#
#
# msgid "Make sure WindowMaker is in your search path."
# msgstr "Provjerite da je WindowMaker u vašoj search stazi."
#
#
# msgid "...do not resize over dock"
# msgstr "ne pokrivati dock"
#
#
# msgid ""
# "WPrefs only supports WindowMaker 0.18.0 or newer.\n"
# "The version installed is %i.%i.%i\n"
# msgstr ""
# "WPrefs podržava samo WindowMaker 0.18.0 ili noviji.\n"
# "Instalirana je verzija %i.%i.%i\n"
#
#
# msgid "Could not load global WindowMaker domain (%s)."
# msgstr "Ne mogu učitati globlanu WindowMaker domenu (%s)."
#
#
# msgid "Loading WindowMaker configuration files..."
# msgstr "Učitavam WindowMaker konfiguracijske datoteke..."
#
#
# msgid "Aplications Menu Definition"
# msgstr "Definiranje izbornika Aplikacije"
#
#
# msgid "The command supplied must generate and output a valid menu definition to stdout. This definition should be in the plain text menu file format, described in the menu files included with WindowMaker, probably at ~/GNUstep/Library/WindowMaker/menu"
# msgstr "Ponuđena naredba mora generirati i ispisati važeću definicuju izbornika na stdout. Ova bi definicja trebala biti u čistom tekst menu formatu koji je opisan u menu datotekama iz distribucije, vjerojatno u ~/GNUstep/Library/WindowMaker/menu"
#
#
# msgid ""
# "bad speed value for option %s.\n"
# "Using default Medium"
# msgstr ""
# "kriva vrijednost za brzinu za opciju %s.\n"
# "Koristm Medium"
#
#
# msgid "The format of the current menu file (%s) is not supported by WPrefs. A new menu will be created."
# msgstr "Format trenutne datoteke izbornika (%s) nije podržan od strane WPrefs-a. Kreirat ću novi izbornik."
#
#
# msgid "Omnipresent miniwindows"
# msgstr "SvugdjePrisutni mini prozori"
#
#
# msgid "Error extracting version from WindowMaker. Make sure it is correctly installed."
# msgstr "Greška pri izvlačenju verzije WindowMakera. Provjerite da je ispravno instaliran."
#
#
# msgid "Auto-arrange icons"
# msgstr "Auto-pospremanje ikona"
#
#
# msgid "Open submenus to the left if they don't fit inside the screen."
# msgstr "Otvoriti podizbornike na lijevo ako ne stanu unutar ekrana."
#
#
# msgid "Use SaveUnders in icons, menus and other objects"
# msgstr "Koristi SnimiIspod u ikonama, izbornicima i drugim objektima"
#
# msgid "Type the path for the directory. You can type more than one path by separating them with spaces."
#
# msgid "Type the path for the directory. You can type more than one path by separating them with spaces."
# msgstr "Upišite stazu za direktorij. Možete upisati više od jedne staze odvajajući ih razmacima."
#
#
# msgid "invalid data in option WindowPlacementOrigin. Using default (0,0)"
# msgstr "krivi podaci u opciji WindowPlacementOrigin. Koristim (0,0)"
#
#
# msgid "Icon Size"
# msgstr "Veličina ikone"
#
#
+163 -144
View File
@@ -1,14 +1,14 @@
# New translation into Dutch for Window Maker
# Copyright (C) 2014-2016 Window Maker Developers Team
# Copyright (C) 2014-2017 Window Maker Developers Team
# This file is distributed under the same license as the windowmaker package.
# Original by Alwin <translations@ziggo.nl>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: wmaker-0.95.7+\n"
"Project-Id-Version: wmaker-0.95.8+\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-10 10:56+0100\n"
"PO-Revision-Date: 2017-03-10 00:00+0000\n"
"POT-Creation-Date: 2017-09-14 19:36+0200\n"
"PO-Revision-Date: 2017-09-14 00:00+0000\n"
"Last-Translator: Alwin <translations@ziggo.nl>\n"
"Language-Team: Dutch\n"
"Language: nl\n"
@@ -667,8 +667,8 @@ msgid "bad option value %s for option ColormapMode. Using default Auto"
msgstr ""
"verkeerde optiewaarde %s voor optie ColormapMode. Gebruikt standaard Auto"
#: ../../WPrefs.app/Focus.c:154 ../../WPrefs.app/Icons.c:162
#: ../../WPrefs.app/Icons.c:396 ../../WPrefs.app/Preferences.c:120
#: ../../WPrefs.app/Focus.c:154 ../../WPrefs.app/Icons.c:160
#: ../../WPrefs.app/Icons.c:367 ../../WPrefs.app/Preferences.c:120
#: ../../WPrefs.app/WindowHandling.c:140 ../../WPrefs.app/WindowHandling.c:159
#, c-format
msgid "OFF"
@@ -768,27 +768,27 @@ msgstr "Systeemletter"
msgid "Bold System Font"
msgstr "Systeemletter, vet"
#: ../../WPrefs.app/FontSimple.c:664
#: ../../WPrefs.app/FontSimple.c:660
msgid "Sample Text"
msgstr "Voorbeeld"
#: ../../WPrefs.app/FontSimple.c:681
#: ../../WPrefs.app/FontSimple.c:677
msgid "Family"
msgstr "Familie"
#: ../../WPrefs.app/FontSimple.c:707
#: ../../WPrefs.app/FontSimple.c:703
msgid "Style"
msgstr "Stijl"
#: ../../WPrefs.app/FontSimple.c:710
#: ../../WPrefs.app/FontSimple.c:706
msgid "Size"
msgstr "Grootte"
#: ../../WPrefs.app/FontSimple.c:742
#: ../../WPrefs.app/FontSimple.c:738
msgid "Font Configuration"
msgstr "Lettertypenconfiguratie"
#: ../../WPrefs.app/FontSimple.c:744
#: ../../WPrefs.app/FontSimple.c:740
msgid "Configure fonts for Window Maker titlebars, menus etc."
msgstr ""
"Stel lettertypen in voor Window Maker-titelbalken,\n"
@@ -811,36 +811,36 @@ msgstr "3D wentelen"
msgid "None"
msgstr "Geen"
#: ../../WPrefs.app/Icons.c:186 ../../WPrefs.app/Preferences.c:145
#: ../../WPrefs.app/Icons.c:184 ../../WPrefs.app/Preferences.c:145
#: ../../WPrefs.app/Preferences.c:159
#, c-format
msgid "bad value \"%s\" for option %s, using default \"%s\""
msgstr "verkeerde waarde \"%s\" voor optie %s, gebruikt standaard \"%s\""
#: ../../WPrefs.app/Icons.c:255
#: ../../WPrefs.app/Icons.c:226
#, c-format
msgid "animation style \"%s\" is unknown, resetting to \"%s\""
msgstr "animatiestijl \"%s\" is onbekend, teruggezet op \"%s\""
#: ../../WPrefs.app/Icons.c:282
#: ../../WPrefs.app/Icons.c:253
msgid "Icon Positioning"
msgstr "Icoonplaatsing"
#: ../../WPrefs.app/Icons.c:361
#: ../../WPrefs.app/Icons.c:332
msgid "Icon Size"
msgstr "Icoongrootte"
#: ../../WPrefs.app/Icons.c:363
#: ../../WPrefs.app/Icons.c:334
msgid "The size of the dock/application icon and miniwindows"
msgstr ""
"De afmetingen van 't dok-/programma-icoon\n"
"en minivensters"
#: ../../WPrefs.app/Icons.c:380
#: ../../WPrefs.app/Icons.c:351
msgid "Mini-Previews for Icons"
msgstr "Miniaturen voor iconen"
#: ../../WPrefs.app/Icons.c:382
#: ../../WPrefs.app/Icons.c:353
msgid ""
"The Mini-Preview provides a small view of the content of the\n"
"window when the mouse is placed over the icon."
@@ -848,41 +848,41 @@ msgstr ""
"De miniatuur biedt 'n kleine blik op de inhoud van 't\n"
"venster, als de muis op 't icoon wordt geplaatst."
#: ../../WPrefs.app/Icons.c:404
#: ../../WPrefs.app/Icons.c:375
msgid "Iconification Animation"
msgstr "Iconificeringsanimatie"
#: ../../WPrefs.app/Icons.c:428
#: ../../WPrefs.app/Icons.c:399
msgid "Auto-arrange icons"
msgstr "Iconen vanzelf schikken"
#: ../../WPrefs.app/Icons.c:430
#: ../../WPrefs.app/Icons.c:401
msgid "Keep icons and miniwindows arranged all the time."
msgstr "Houd iconen en minivensters altijd geschikt."
#: ../../WPrefs.app/Icons.c:435
#: ../../WPrefs.app/Icons.c:406
msgid "Omnipresent miniwindows"
msgstr "Alomtegenwoordige minivensters"
#: ../../WPrefs.app/Icons.c:437
#: ../../WPrefs.app/Icons.c:408
msgid "Make miniwindows be present in all workspaces."
msgstr "Maak minivensters aanwezig in alle werkruimten."
#: ../../WPrefs.app/Icons.c:442
#: ../../WPrefs.app/Icons.c:413
msgid "Single click activation"
msgstr "Enkelkliksactivering"
#: ../../WPrefs.app/Icons.c:444
#: ../../WPrefs.app/Icons.c:415
msgid "Launch applications and restore windows with a single click."
msgstr ""
"Start programma's op, en herstel vensters met\n"
"'n enkele klik."
#: ../../WPrefs.app/Icons.c:500
#: ../../WPrefs.app/Icons.c:467
msgid "Icon Preferences"
msgstr "Icoonvoorkeuren"
#: ../../WPrefs.app/Icons.c:502
#: ../../WPrefs.app/Icons.c:469
msgid ""
"Icon/Miniwindow handling options. Icon positioning\n"
"area, sizes of icons, miniaturization animation style."
@@ -1213,7 +1213,7 @@ msgstr "Verhoog/verlaag Clip"
msgid "Toggle keyboard language"
msgstr "Wissel toetsenbordtaal"
#: ../../WPrefs.app/KeyboardShortcuts.c:375 ../../WPrefs.app/Menu.c:274
#: ../../WPrefs.app/KeyboardShortcuts.c:375 ../../WPrefs.app/Menu.c:275
#: ../../WPrefs.app/TexturePanel.c:1425
msgid "Cancel"
msgstr "Annuleren"
@@ -1224,8 +1224,8 @@ msgstr ""
"Druk op de verlangde sneltoets(en), of klik Annuleren om opnemen te stoppen."
#: ../../WPrefs.app/KeyboardShortcuts.c:396
#: ../../WPrefs.app/KeyboardShortcuts.c:566 ../../WPrefs.app/Menu.c:284
#: ../../WPrefs.app/Menu.c:732
#: ../../WPrefs.app/KeyboardShortcuts.c:566 ../../WPrefs.app/Menu.c:285
#: ../../WPrefs.app/Menu.c:733
msgid "Capture"
msgstr "Opnemen"
@@ -1242,7 +1242,7 @@ msgstr "Acties"
msgid "Shortcut"
msgstr "Sneltoets"
#: ../../WPrefs.app/KeyboardShortcuts.c:560 ../../WPrefs.app/Menu.c:738
#: ../../WPrefs.app/KeyboardShortcuts.c:560 ../../WPrefs.app/Menu.c:739
msgid "Clear"
msgstr "Wissen"
@@ -1258,188 +1258,188 @@ msgstr ""
"Wijzig de sneltoetsen voor acties, zoals van\n"
"werkruimte wisselen en menu's openen."
#: ../../WPrefs.app/Menu.c:250
#: ../../WPrefs.app/Menu.c:251
msgid "Select Program"
msgstr "Kies programma"
#: ../../WPrefs.app/Menu.c:412
#: ../../WPrefs.app/Menu.c:413
msgid "New Items"
msgstr "Nieuwe onderdelen"
#: ../../WPrefs.app/Menu.c:413
#: ../../WPrefs.app/Menu.c:414
msgid "Sample Commands"
msgstr "Voorbeeldcommando's"
#: ../../WPrefs.app/Menu.c:414
#: ../../WPrefs.app/Menu.c:415
msgid "Sample Submenus"
msgstr "Voorbeeldmenu's"
#: ../../WPrefs.app/Menu.c:426
#: ../../WPrefs.app/Menu.c:427
msgid "Run Program"
msgstr "Programma uitvoeren"
#: ../../WPrefs.app/Menu.c:427
#: ../../WPrefs.app/Menu.c:428
msgid "Internal Command"
msgstr "Intern commando"
#: ../../WPrefs.app/Menu.c:428
#: ../../WPrefs.app/Menu.c:429
msgid "Submenu"
msgstr "Submenu"
#: ../../WPrefs.app/Menu.c:429
#: ../../WPrefs.app/Menu.c:430
msgid "External Submenu"
msgstr "Extern submenu"
#: ../../WPrefs.app/Menu.c:430
#: ../../WPrefs.app/Menu.c:431
msgid "Generated Submenu"
msgstr "Aangemaakt submenu"
#: ../../WPrefs.app/Menu.c:431
#: ../../WPrefs.app/Menu.c:432
msgid "Generated PL Menu"
msgstr "Aangemaakt PL-menu"
#: ../../WPrefs.app/Menu.c:432
#: ../../WPrefs.app/Menu.c:433
msgid "Directory Contents"
msgstr "Mapinhoud"
#: ../../WPrefs.app/Menu.c:433
#: ../../WPrefs.app/Menu.c:434
msgid "Workspace Menu"
msgstr "Werkruimtenmenu"
#: ../../WPrefs.app/Menu.c:434 ../../WPrefs.app/MouseSettings.c:58
#: ../../WPrefs.app/Menu.c:435 ../../WPrefs.app/MouseSettings.c:58
msgid "Window List Menu"
msgstr "Vensterlijstmenu"
#: ../../WPrefs.app/Menu.c:453
#: ../../WPrefs.app/Menu.c:454
msgid "XTerm"
msgstr ""
#: ../../WPrefs.app/Menu.c:456
#: ../../WPrefs.app/Menu.c:457
msgid "rxvt"
msgstr ""
#: ../../WPrefs.app/Menu.c:459
#: ../../WPrefs.app/Menu.c:460
msgid "ETerm"
msgstr ""
#: ../../WPrefs.app/Menu.c:462
#: ../../WPrefs.app/Menu.c:463
msgid "Run..."
msgstr "Uitvoeren..."
#: ../../WPrefs.app/Menu.c:463
#: ../../WPrefs.app/Menu.c:464
#, c-format
msgid "%A(Run,Type command to run)"
msgstr "%A(Uitvoeren,Typ uit te voeren commando)"
#: ../../WPrefs.app/Menu.c:465
#: ../../WPrefs.app/Menu.c:466
msgid "Firefox"
msgstr ""
#: ../../WPrefs.app/Menu.c:468
#: ../../WPrefs.app/Menu.c:469
msgid "gimp"
msgstr ""
#: ../../WPrefs.app/Menu.c:471
#: ../../WPrefs.app/Menu.c:472
msgid "epic"
msgstr ""
#: ../../WPrefs.app/Menu.c:474
#: ../../WPrefs.app/Menu.c:475
msgid "ee"
msgstr ""
#: ../../WPrefs.app/Menu.c:477
#: ../../WPrefs.app/Menu.c:478
msgid "xv"
msgstr ""
#: ../../WPrefs.app/Menu.c:480
#: ../../WPrefs.app/Menu.c:481
msgid "Evince"
msgstr ""
#: ../../WPrefs.app/Menu.c:483
#: ../../WPrefs.app/Menu.c:484
msgid "ghostview"
msgstr ""
#: ../../WPrefs.app/Menu.c:486 ../../WPrefs.app/Menu.c:757
#: ../../WPrefs.app/Menu.c:487 ../../WPrefs.app/Menu.c:758
msgid "Exit Window Maker"
msgstr "Window Maker afsluiten"
#: ../../WPrefs.app/Menu.c:508
#: ../../WPrefs.app/Menu.c:509
msgid "Debian Menu"
msgstr "Debian-menu"
#: ../../WPrefs.app/Menu.c:511
#: ../../WPrefs.app/Menu.c:512
msgid "RedHat Menu"
msgstr "RedHat-menu"
#: ../../WPrefs.app/Menu.c:514
#: ../../WPrefs.app/Menu.c:515
msgid "Menu Conectiva"
msgstr "Conectiva-menu"
#: ../../WPrefs.app/Menu.c:517
#: ../../WPrefs.app/Menu.c:518
msgid "Themes"
msgstr "Thema's"
#: ../../WPrefs.app/Menu.c:523
#: ../../WPrefs.app/Menu.c:524
msgid "Bg Images (scale)"
msgstr "Achtergr. (schaal)"
#: ../../WPrefs.app/Menu.c:529
#: ../../WPrefs.app/Menu.c:530
msgid "Bg Images (tile)"
msgstr "Achtergr. (tegel)"
#: ../../WPrefs.app/Menu.c:535
#: ../../WPrefs.app/Menu.c:536
msgid "Assorted XTerms"
msgstr "Allerlei XTerms"
#: ../../WPrefs.app/Menu.c:537
#: ../../WPrefs.app/Menu.c:538
msgid "XTerm Yellow on Blue"
msgstr "XTerm geel op blauw"
#: ../../WPrefs.app/Menu.c:540
#: ../../WPrefs.app/Menu.c:541
msgid "XTerm White on Black"
msgstr "XTerm wit op zwart"
#: ../../WPrefs.app/Menu.c:543
#: ../../WPrefs.app/Menu.c:544
msgid "XTerm Black on White"
msgstr "XTerm zwart op wit"
#: ../../WPrefs.app/Menu.c:546
#: ../../WPrefs.app/Menu.c:547
msgid "XTerm Black on Beige"
msgstr "XTerm zwart op beige"
#: ../../WPrefs.app/Menu.c:549
#: ../../WPrefs.app/Menu.c:550
msgid "XTerm White on Green"
msgstr "XTerm wit op groen"
#: ../../WPrefs.app/Menu.c:552
#: ../../WPrefs.app/Menu.c:553
msgid "XTerm White on Olive"
msgstr "XTerm wit op olijfgroen"
#: ../../WPrefs.app/Menu.c:555
#: ../../WPrefs.app/Menu.c:556
msgid "XTerm Blue on Blue"
msgstr "XTerm blauw op blauw"
#: ../../WPrefs.app/Menu.c:558
#: ../../WPrefs.app/Menu.c:559
msgid "XTerm BIG FONTS"
msgstr "XTerm GROTE LETTERS"
#: ../../WPrefs.app/Menu.c:579
#: ../../WPrefs.app/Menu.c:580
msgid "Program to Run"
msgstr "Uit te voeren programma"
#: ../../WPrefs.app/Menu.c:589
#: ../../WPrefs.app/Menu.c:590
msgid "Browse"
msgstr "Bladeren"
#: ../../WPrefs.app/Menu.c:598
#: ../../WPrefs.app/Menu.c:599
msgid "Run the program inside a Xterm"
msgstr "Voer 't programma uit in 'n XTerm"
#: ../../WPrefs.app/Menu.c:607
#: ../../WPrefs.app/Menu.c:608
msgid "Path for Menu"
msgstr "Pad naar menu"
#: ../../WPrefs.app/Menu.c:618
#: ../../WPrefs.app/Menu.c:619
msgid ""
"Enter the path for a file containing a menu\n"
"or a list of directories with the programs you\n"
@@ -1455,11 +1455,11 @@ msgstr ""
"of\n"
"/usr/bin ~/xbin"
#: ../../WPrefs.app/Menu.c:630 ../../WPrefs.app/Menu.c:655
#: ../../WPrefs.app/Menu.c:631 ../../WPrefs.app/Menu.c:656
msgid "Command"
msgstr "Commando"
#: ../../WPrefs.app/Menu.c:641
#: ../../WPrefs.app/Menu.c:642
msgid ""
"Enter a command that outputs a menu\n"
"definition to stdout when invoked."
@@ -1467,7 +1467,7 @@ msgstr ""
"Voer 'n commando in, dat bij aanroepen\n"
"'n uitgewerkt menu geeft naar 'stdout'."
#: ../../WPrefs.app/Menu.c:646 ../../WPrefs.app/Menu.c:671
#: ../../WPrefs.app/Menu.c:647 ../../WPrefs.app/Menu.c:672
msgid ""
"Cache menu contents after opening for\n"
"the first time"
@@ -1475,7 +1475,7 @@ msgstr ""
"Bewaar menu-inhoud na de eerste keer\n"
"openen"
#: ../../WPrefs.app/Menu.c:666
#: ../../WPrefs.app/Menu.c:667
msgid ""
"Enter a command that outputs a proplist menu\n"
"definition to stdout when invoked."
@@ -1484,11 +1484,11 @@ msgstr ""
"'n uitgewerkt 'property list'-menu geeft\n"
"naar 'stdout'."
#: ../../WPrefs.app/Menu.c:680
#: ../../WPrefs.app/Menu.c:681
msgid "Command to Open Files"
msgstr "Commando om bestanden te openen"
#: ../../WPrefs.app/Menu.c:691
#: ../../WPrefs.app/Menu.c:692
msgid ""
"Enter the command you want to use to open the\n"
"files in the directories listed below."
@@ -1496,71 +1496,71 @@ msgstr ""
"Voer 't te gebruiken commando in, om de\n"
"bestanden in onderstaande mappen te openen."
#: ../../WPrefs.app/Menu.c:699
#: ../../WPrefs.app/Menu.c:700
msgid "Directories with Files"
msgstr "Mappen met bestanden"
#: ../../WPrefs.app/Menu.c:710
#: ../../WPrefs.app/Menu.c:711
msgid "Strip extensions from file names"
msgstr "Extensies van bestandsnamen af halen"
#: ../../WPrefs.app/Menu.c:721
#: ../../WPrefs.app/Menu.c:722
msgid "Keyboard Shortcut"
msgstr "Sneltoets"
#: ../../WPrefs.app/Menu.c:753
#: ../../WPrefs.app/Menu.c:754
msgid "Arrange Icons"
msgstr "Iconen schikken"
#: ../../WPrefs.app/Menu.c:754
#: ../../WPrefs.app/Menu.c:755
msgid "Hide All Windows Except For The Focused One"
msgstr "Alle vensters verbergen, behalve die focus heeft"
#: ../../WPrefs.app/Menu.c:755
#: ../../WPrefs.app/Menu.c:756
msgid "Show All Windows"
msgstr "Alle vensters tonen"
#: ../../WPrefs.app/Menu.c:758
#: ../../WPrefs.app/Menu.c:759
msgid "Exit X Session"
msgstr "X-sessie afsluiten"
#: ../../WPrefs.app/Menu.c:759
#: ../../WPrefs.app/Menu.c:760
msgid "Restart Window Maker"
msgstr "Window Maker herstarten"
#: ../../WPrefs.app/Menu.c:760
#: ../../WPrefs.app/Menu.c:761
msgid "Start Another Window Manager : ("
msgstr "Andere vensterbeheerder starten : ("
#: ../../WPrefs.app/Menu.c:762
#: ../../WPrefs.app/Menu.c:763
msgid "Save Current Session"
msgstr "Huidige sessie opslaan"
#: ../../WPrefs.app/Menu.c:763
#: ../../WPrefs.app/Menu.c:764
msgid "Clear Saved Session"
msgstr "Opgeslagen sessie wissen"
#: ../../WPrefs.app/Menu.c:764
#: ../../WPrefs.app/Menu.c:765
msgid "Refresh Screen"
msgstr "Scherm vernieuwen"
#: ../../WPrefs.app/Menu.c:765
#: ../../WPrefs.app/Menu.c:766
msgid "Open Info Panel"
msgstr "Infopaneel openen"
#: ../../WPrefs.app/Menu.c:766
#: ../../WPrefs.app/Menu.c:767
msgid "Open Copyright Panel"
msgstr "Auteursrechtenpaneel openen"
#: ../../WPrefs.app/Menu.c:771
#: ../../WPrefs.app/Menu.c:772
msgid "Window Manager to Start"
msgstr "Te starten vensterbeheerder"
#: ../../WPrefs.app/Menu.c:784
#: ../../WPrefs.app/Menu.c:785
msgid "Do not confirm action."
msgstr "Actie niet bevestigen."
#: ../../WPrefs.app/Menu.c:791
#: ../../WPrefs.app/Menu.c:792
msgid ""
"Instructions:\n"
"\n"
@@ -1573,60 +1573,57 @@ msgid ""
msgstr ""
"Instructies:\n"
"\n"
"- Versleep onderdelen van links naar 't menu, om\n"
" nieuwe ingangen toe te voegen.\n"
"- Versleep onderdelen uit 't menu, om ze te verwijderen.\n"
"- Versleep onderdelen binnen 't menu, om hun plaats te\n"
" veranderen.\n"
"- Versleep onderdelen met Control ingedrukt, om ze te\n"
" kopiëren.\n"
"- Dubbelklik op 'n menu-ingang, om de benaming te\n"
" wijzigen.\n"
"- Klik op 'n menu-ingang, om gerelateerde informatie te\n"
" wijzigen."
"Versleep onderdelen...\n"
" ...van links naar 't menu, om ingangen toe te voegen.\n"
" ...uit 't menu, om ze te verwijderen.\n"
" ...binnen 't menu, om hun plaats te veranderen.\n"
" ...met Control ingedrukt, om ze te kopiëren.\n"
"(Dubbel)klik op 'n menu-ingang, om...\n"
" ...de benaming te wijzigen.\n"
" ...gerelateerde informatie te wijzigen."
#: ../../WPrefs.app/Menu.c:1030
#: ../../WPrefs.app/Menu.c:1031
#, c-format
msgid "unknown command '%s' in menu"
msgstr "onbekend commando '%s' in menu"
#: ../../WPrefs.app/Menu.c:1054
#: ../../WPrefs.app/Menu.c:1055
msgid ": Execute Program"
msgstr ": start programma"
#: ../../WPrefs.app/Menu.c:1058
#: ../../WPrefs.app/Menu.c:1059
msgid ": Perform Internal Command"
msgstr ": voer intern commando uit"
#: ../../WPrefs.app/Menu.c:1062
#: ../../WPrefs.app/Menu.c:1063
msgid ": Open a Submenu"
msgstr ": open 'n submenu"
#: ../../WPrefs.app/Menu.c:1066
#: ../../WPrefs.app/Menu.c:1067
msgid ": Program Generated Submenu"
msgstr ": submenu uit programma"
#: ../../WPrefs.app/Menu.c:1070
#: ../../WPrefs.app/Menu.c:1071
msgid ": Program Generated Proplist Submenu"
msgstr ": PropList-submenu uit programma"
#: ../../WPrefs.app/Menu.c:1074
#: ../../WPrefs.app/Menu.c:1075
msgid ": Directory Contents Menu"
msgstr ": menu met mapinhoud"
#: ../../WPrefs.app/Menu.c:1078
#: ../../WPrefs.app/Menu.c:1079
msgid ": Open Workspaces Submenu"
msgstr ": open werkruimtensubmenu"
#: ../../WPrefs.app/Menu.c:1082
#: ../../WPrefs.app/Menu.c:1083
msgid ": Open Window List Submenu"
msgstr ": open vensterlijstsubmenu"
#: ../../WPrefs.app/Menu.c:1298
#: ../../WPrefs.app/Menu.c:1299
msgid "Remove Submenu"
msgstr "Submenu verwijderen"
#: ../../WPrefs.app/Menu.c:1299
#: ../../WPrefs.app/Menu.c:1300
msgid ""
"Removing this item will destroy all items inside\n"
"the submenu. Do you really want to do that?"
@@ -1634,45 +1631,45 @@ msgstr ""
"Dit onderdeel verwijderen, zal alle ingangen in 't\n"
"submenu vernietigen. Wilt u dat echt doen?"
#: ../../WPrefs.app/Menu.c:1301
#: ../../WPrefs.app/Menu.c:1302
msgid "Yes"
msgstr "Ja"
#: ../../WPrefs.app/Menu.c:1301
#: ../../WPrefs.app/Menu.c:1302
msgid "No"
msgstr "Nee"
#: ../../WPrefs.app/Menu.c:1301
#: ../../WPrefs.app/Menu.c:1302
msgid "Yes, don't ask again"
msgstr "Ja, vraag niet weer"
#: ../../WPrefs.app/Menu.c:1439
#: ../../WPrefs.app/Menu.c:1440
#, c-format
msgid "Invalid menu command \"%s\" with label \"%s\" cleared"
msgstr "Ongeldig menucommando \"%s\" met label \"%s\" leeg"
#: ../../WPrefs.app/Menu.c:1442 ../../WPrefs.app/Menu.c:1500
#: ../../WPrefs.app/WPrefs.c:668
#: ../../WPrefs.app/Menu.c:1443 ../../WPrefs.app/Menu.c:1522
#: ../../WPrefs.app/Menu.c:1537 ../../WPrefs.app/WPrefs.c:668
msgid "Warning"
msgstr "Waarschuwing"
#: ../../WPrefs.app/Menu.c:1442 ../../WPrefs.app/Menu.c:1475
#: ../../WPrefs.app/MouseSettings.c:156 ../../WPrefs.app/MouseSettings.c:176
#: ../../WPrefs.app/TexturePanel.c:585 ../../WPrefs.app/TexturePanel.c:663
#: ../../WPrefs.app/TexturePanel.c:1419 ../../WPrefs.app/WPrefs.c:617
#: ../../WPrefs.app/WPrefs.c:621 ../../WPrefs.app/WPrefs.c:641
#: ../../WPrefs.app/WPrefs.c:653 ../../WPrefs.app/WPrefs.c:659
#: ../../WPrefs.app/WPrefs.c:668 ../../WPrefs.app/WPrefs.c:699
#: ../../WPrefs.app/WPrefs.c:703
#: ../../WPrefs.app/Menu.c:1443 ../../WPrefs.app/Menu.c:1476
#: ../../WPrefs.app/Menu.c:1523 ../../WPrefs.app/MouseSettings.c:156
#: ../../WPrefs.app/MouseSettings.c:176 ../../WPrefs.app/TexturePanel.c:585
#: ../../WPrefs.app/TexturePanel.c:663 ../../WPrefs.app/TexturePanel.c:1419
#: ../../WPrefs.app/WPrefs.c:617 ../../WPrefs.app/WPrefs.c:621
#: ../../WPrefs.app/WPrefs.c:641 ../../WPrefs.app/WPrefs.c:653
#: ../../WPrefs.app/WPrefs.c:659 ../../WPrefs.app/WPrefs.c:668
#: ../../WPrefs.app/WPrefs.c:699 ../../WPrefs.app/WPrefs.c:703
msgid "OK"
msgstr "OK"
#: ../../WPrefs.app/Menu.c:1471
#: ../../WPrefs.app/Menu.c:1472
#, c-format
msgid "Could not open default menu from '%s'"
msgstr "Kon standaardmenu niet openen uit '%s'"
#: ../../WPrefs.app/Menu.c:1475 ../../WPrefs.app/MouseSettings.c:154
#: ../../WPrefs.app/Menu.c:1476 ../../WPrefs.app/MouseSettings.c:154
#: ../../WPrefs.app/MouseSettings.c:173 ../../WPrefs.app/TexturePanel.c:585
#: ../../WPrefs.app/TexturePanel.c:661 ../../WPrefs.app/WPrefs.c:617
#: ../../WPrefs.app/WPrefs.c:621 ../../WPrefs.app/WPrefs.c:638
@@ -1681,7 +1678,16 @@ msgstr "Kon standaardmenu niet openen uit '%s'"
msgid "Error"
msgstr "Fout"
#: ../../WPrefs.app/Menu.c:1501
#: ../../WPrefs.app/Menu.c:1516
#, c-format
msgid ""
"The menu file \"%s\" referenced by WMRootMenu is read-only.\n"
"You cannot use WPrefs to modify it."
msgstr ""
"Menubestand \"%s\" verwezen door WMRootMenu is alleen-lezen.\n"
"U kunt WPrefs niet gebruiken om 't te wijzigen."
#: ../../WPrefs.app/Menu.c:1538
msgid ""
"The menu file format currently in use is not supported\n"
"by this tool. Do you want to discard the current menu\n"
@@ -1691,19 +1697,32 @@ msgstr ""
"door dit hulpmiddel. Wilt u 't huidige menu verwerpen,\n"
"om dit hulpmiddel te gebruiken?"
#: ../../WPrefs.app/Menu.c:1504
#: ../../WPrefs.app/Menu.c:1541
msgid "Yes, Discard and Update"
msgstr "Ja, verwerp en werk bij"
#: ../../WPrefs.app/Menu.c:1504
#: ../../WPrefs.app/Menu.c:1541
msgid "No, Keep Current Menu"
msgstr "Nee, behoud huidig menu"
#: ../../WPrefs.app/Menu.c:1750
#: ../../WPrefs.app/Menu.c:1558
#, c-format
msgid ""
"\n"
"\n"
"When saved, the menu will be written to the file\n"
"\"%s\"."
msgstr ""
"\n"
"\n"
"Bij opslaan wordt 't menu geschreven naar 't bestand\n"
"\"%s\"."
#: ../../WPrefs.app/Menu.c:1795
msgid "Applications Menu Definition"
msgstr "Programmamenu bepalen"
#: ../../WPrefs.app/Menu.c:1752
#: ../../WPrefs.app/Menu.c:1797
msgid "Edit the menu for launching applications."
msgstr "Bewerk 't menu voor programma's opstarten."
+1 -1
View File
@@ -1,5 +1,5 @@
#
# Mensagens do WPrefs.app traduzidas p/ Português
# Mensagens do WPrefs.app traduzidas p/ Português
#
# Update History:
# Alfredo K. Kojima
+69 -18
View File
@@ -380,45 +380,71 @@ msgstr ""
"параметров и количества цветов для резервирования за\n"
"Window Maker'ом при работе с 8bit'ным цветом (8bpp)."
#: ../../WPrefs.app/Expert.c:75
msgid ""
"Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."
msgstr ""
"Запретить миниокна (иконки для минимизированных окон). Для использования с "
"KDE/GNOME."
#: ../../WPrefs.app/Expert.c:44
msgid "Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."
msgstr "Запретить миниокна иконки для минимизированных окон. Для использования с KDE/GNOME."
#: ../../WPrefs.app/Expert.c:76
#: ../../WPrefs.app/Expert.c:47
msgid "Ignore decoration hints for GTK applications."
msgstr "Игнорировать декорацию окон для GTK приложений."
#: ../../WPrefs.app/Expert.c:53
msgid "Do not set non-WindowMaker specific parameters (do not use xset)."
msgstr ""
"Не устанавливать параметры, не относящиеся непосредственно к\n"
"Window Maker'у (не использовать xset)."
#: ../../WPrefs.app/Expert.c:77
#: ../../WPrefs.app/Expert.c:56
msgid "Automatically save session when exiting Window Maker."
msgstr "Автоматически сохранять сессию при выходе из Window Maker'а."
#: ../../WPrefs.app/Expert.c:78
#: ../../WPrefs.app/Expert.c:59
msgid "Use SaveUnder in window frames, icons, menus and other objects."
msgstr "Использовать SaveUnder для окон, иконок, меню и других объектов."
#: ../../WPrefs.app/Expert.c:79
msgid "Use Windoze style cycling."
msgstr "Переключение окон в стиле Windows"
#: ../../WPrefs.app/Expert.c:80
#: ../../WPrefs.app/Expert.c:62
msgid "Disable confirmation panel for the Kill command."
msgstr "Запретить диалог подтверждения для команды `Убить'."
# awn: FIXME: что это вообще значит?
#: ../../WPrefs.app/Expert.c:81
msgid "Disable selection animation for selected icons."
msgstr "Запретить анимацию выбора для выбранных иконок."
#: ../../WPrefs.app/Expert.c:115
msgid "Show switch panel when cycling windows."
msgstr "Показывать панель переключения окон."
#: ../../WPrefs.app/Expert.c:68
msgid "Smooth font edges (needs restart)."
msgstr "Cглаживание шрифтов (требуется перезагрузка)."
#: ../../WPrefs.app/Expert.c:80
msgid "Show workspace title on Clip."
msgstr "Показывать имя рабочего места на скрепке."
#: ../../WPrefs.app/Expert.c:83
msgid "Highlight the icon of the application when it has the focus."
msgstr "Подсвечивание иконок при нажатии (в фокусе)."
#: ../../WPrefs.app/Expert.c:91
msgid "Maximize (snap) a window to edge or corner by dragging."
msgstr "Прилипания окон по краям и углам."
#: ../../WPrefs.app/Expert.c:100
msgid "Snapping a window to the top maximizes it to the full screen."
msgstr "Распахнуть окно при перетаскивании к верхнему краю."
#: ../../WPrefs.app/Expert.c:118
msgid "Double click on titlebar maximize a window to full screen."
msgstr "Распахнуть окно двойным щелчком."
#: ../../WPrefs.app/Expert.c:121
msgid "Close rootmenu when mouse (left or right) is clicked outside focus."
msgstr "Закрывать меню приложений правым или левым щелчком мыши вне фокуса."
#: ../../WPrefs.app/Expert.c:328
msgid "Expert User Preferences"
msgstr "Установки для опытного пользователя"
#: ../../WPrefs.app/Expert.c:117
#: ../../WPrefs.app/Expert.c:330
msgid ""
"Options for people who know what they're doing...\n"
"Also have some other misc. options."
@@ -623,6 +649,11 @@ msgstr ""
"Параметры обработки иконок и миниокон. Размещение иконок,\n"
"размер иконок, в каком стиле анимировать сворачивание."
#: ../../WPrefs.app/Icons.c:414
msgid "Single click activation"
msgstr "Одинарный щелчок мыши"
#: ../../WPrefs.app/imagebrowser.c:95
msgid "View"
msgstr ""
@@ -1901,6 +1932,10 @@ msgstr ""
msgid "Resist"
msgstr "Упираться"
#: ../../WPrefs.app/WindowHandling.c:406
msgid "Opaque Move/Resize"
msgstr "Перемещ/Измен.разм."
#: ../../WPrefs.app/WindowHandling.c:407
msgid "Attract"
msgstr "Притягиваться"
@@ -1923,6 +1958,22 @@ msgstr ""
"Как обращаться с окнами. Начальное расположение окон.\n"
"Сопротивляемость границ. Сплошное/каркасное перемещение, и т.п."
#: ../../WPrefs.app/WindowHandling.c:474
msgid "by keyboard"
msgstr "c помощ.клав."
#: ../../WPrefs.app/WindowHandling.c:490
msgid "...do not cover:"
msgstr "не перекрывать:"
#: ../../WPrefs.app/WindowHandling.c:497
msgid "Icons"
msgstr "Иконок"
#: ../../WPrefs.app/WindowHandling.c:502
msgid "The dock"
msgstr "Дока"
#: ../../WPrefs.app/Workspace.c:176
msgid "Workspace Navigation"
msgstr "Навигация по рабочим пространствам"
+2627
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -73,5 +73,5 @@ dist_tiffdata_DATA = \
windowfocus.tiff \
workspace.tiff \
workspacename.tiff \
xis.tiff
xis.tiff
endif
Binary file not shown.
+1 -1
View File
@@ -72,5 +72,5 @@ dist_xpmdata_DATA = \
windowfocus.xpm \
workspace.xpm \
workspacename.xpm \
xis.xpm
xis.xpm
endif
+1 -1
View File
@@ -1,6 +1,6 @@
defsdatadir = $(pkgdatadir)/Backgrounds
defsdata_DATA = BlueImage.jpeg
defsdata_DATA = BlueImage.jpeg
EXTRA_DIST = $(defsdata_DATA)
+2 -1
View File
@@ -12,7 +12,8 @@ WMWindowAttributes: $(srcdir)/WMWindowAttributes.in
chmod 644 WMWindowAttributes
WindowMaker: $(srcdir)/WindowMaker.in
$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
-e "s:#pixmapdir#:$(pixmapdir):" $(srcdir)/WindowMaker.in \
> WindowMaker ; \
chmod 644 WindowMaker
+249 -137
View File
@@ -1,139 +1,251 @@
{
SmoothWorkspaceBack = NO;
PopupSwitchMenu = NO;
MenuStyle = normal;
DisableMiniwindows = NO;
DisableWorkspacePager = NO;
OpenTransientOnOwnerWorkspace = NO;
EdgeResistance = 30;
WorkspaceBorderSize = 0;
WorkspaceBorder = None;
IconificationStyle = Zoom;
IconPath = (
"~/GNUstep/Library/Icons",
"#pkgdatadir#/Icons",
"#pkgdatadir#/Pixmaps",
"/usr/include/X11/pixmaps",
"~/GNUstep/Library/WindowMaker/Pixmaps",
"~/GNUstep/Library/WindowMaker/CachedPixmaps",
"/usr/share/icons",
"/usr/local/share/pixmaps",
"/usr/share/pixmaps"
);
PixmapPath = (
"~/GNUstep/Library/WindowMaker/Pixmaps",
"~/GNUstep/Library/WindowMaker/Backgrounds",
"~/GNUstep/Library/WindowMaker/CachedPixmaps",
"#pkgdatadir#/Pixmaps",
"#pkgdatadir#/Backgrounds",
"/usr/include/X11/pixmaps",
"/usr/local/share/pixmaps",
"/usr/share/pixmaps"
);
WindowTitleBalloons = YES;
IconSize = 64;
FocusMode = manual;
DisableWSMouseActions = NO;
MouseLeftButtonAction = SelectWindows;
MouseMiddleButtonAction = OpenWindowListMenu;
MouseRightButtonAction = OpenApplicationsMenu;
MouseWheelAction = None;
ColormapSize = 4;
DisableDithering = NO;
ModifierKey = Mod1;
NewStyle = "new";
DisableDock = NO;
DisableClip = NO;
DisableDrawers = NO;
Superfluous = YES;
StickyIcons = NO;
SaveSessionOnExit = NO;
ColormapMode = auto;
RaiseDelay = 0;
AutoFocus = YES;
WindowPlacement = auto;
WindowPlaceOrigin = (64, 0);
UseSaveUnders = NO;
DisableSound = NO;
DisableAnimations = NO;
DontLinkWorkspaces = YES;
AutoArrangeIcons = NO;
AdvanceToNewWorkspace = NO;
CycleWorkspaces = NO;
ResizeDisplay = center;
MoveDisplay = floating;
OpaqueMove = YES;
IconPosition = "blh";
WrapMenus = NO;
ScrollableMenus = YES;
MenuScrollSpeed = fast;
IconSlideSpeed = fast;
ShadeSpeed = fast;
DoubleClickTime = 250;
AlignSubmenus = NO;
NoWindowOverIcons = NO;
IgnoreFocusClick = NO;
CloseKey = None;
MaximizeKey = None;
VMaximizeKey = None;
RaiseLowerKey = None;
DontConfirmKill = NO;
ShadeKey = None;
NextWorkspaceKey = "Mod1+Control+Right";
PrevWorkspaceKey = "Mod1+Control+Left";
RootMenuKey = F12;
WindowListKey = F11;
WindowMenuKey = "Control+Escape";
RaiseKey = "Mod1+Up";
LowerKey = "Mod1+Down";
FocusNextKey = "Mod1+Tab";
FocusPrevKey = "Mod1+Shift+Tab";
Workspace1Key = "Mod1+1";
Workspace2Key = "Mod1+2";
Workspace3Key = "Mod1+3";
Workspace4Key = "Mod1+4";
Workspace5Key = "Mod1+5";
Workspace6Key = "Mod1+6";
Workspace7Key = "Mod1+7";
Workspace8Key = "Mod1+8";
Workspace9Key = "Mod1+9";
Workspace10Key = "Mod1+0";
HideKey = "Mod1+H";
SelectKey = None;
MiniaturizeKey = "Mod1+M";
NextWorkspaceLayerKey = None;
PrevWorkspaceLayerKey = None;
ConstrainWindowSize = NO;
DockRaiseLowerKey = None;
ClipRaiseLowerKey = None;
TitleJustify = center;
WindowTitleFont = "Sans:bold:pixelsize=12";
MenuTitleFont = "Sans:bold:pixelsize=12";
MenuTextFont = "Sans:pixelsize=12";
IconTitleFont = "Sans:pixelsize=9";
ClipTitleFont = "Sans:bold:pixelsize=10";
LargeDisplayFont = "Sans:pixelsize=24";
HighlightColor = white;
HighlightTextColor = black;
ClipTitleColor = black;
CClipTitleColor = "rgb:61/61/61";
FTitleColor = white;
PTitleColor = white;
UTitleColor = black;
MenuTitleColor = white;
MenuTextColor = black;
MenuDisabledColor = gray50;
WorkspaceBack = (solid, "rgb:50/50/75");
MenuTextColor = black;
FTitleBack = (solid, black);
UTitleBack = (solid, "rgb:aa/aa/aa");
ResizebarBack = (solid, "rgb:aa/aa/aa");
PTitleBack = (solid, gray40);
MenuTitleBack = (solid, black);
MenuTextBack = (solid, "rgb:aa/aa/aa");
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
ClipAutocollapseDelay = 1000;
ClipAutolowerDelay = 1000;
ClipAutoexpandDelay = 600;
ClipAutoraiseDelay = 600;
ColormapSize = 4;
DisableDithering = NO;
IconSize = 64;
ModifierKey = Mod1;
FocusMode = manual;
NewStyle = new;
DisableDock = NO;
DisableClip = NO;
DisableDrawers = NO;
ClipMergedInDock = NO;
DisableMiniwindows = NO;
EnableWorkspacePager = NO;
IconPosition = blh;
IconificationStyle = Zoom;
DisableWSMouseActions = NO;
MouseLeftButtonAction = SelectWindows;
MouseMiddleButtonAction = OpenWindowListMenu;
MouseRightButtonAction = OpenApplicationsMenu;
MouseBackwardButtonAction = None;
MouseForwardButtonAction = None;
MouseWheelAction = None;
MouseWheelTiltAction = None;
PixmapPath = (
"~/GNUstep/Library/WindowMaker/Pixmaps",
"~/GNUstep/Library/WindowMaker/Backgrounds",
"~/GNUstep/Library/WindowMaker/CachedPixmaps",
"~/pixmaps",
"#pkgdatadir#/Pixmaps",
"#pkgdatadir#/Backgrounds",
"#pixmapdir#"
);
IconPath = (
"~/GNUstep/Library/Icons",
"~/GNUstep/Library/WindowMaker/Pixmaps",
"~/GNUstep/Library/WindowMaker/CachedPixmaps",
"~/pixmaps",
"#pkgdatadir#/Icons",
"#pkgdatadir#/Pixmaps",
"#pixmapdir#"
);
ColormapMode = auto;
AutoFocus = YES;
RaiseDelay = 0;
CirculateRaise = NO;
Superfluous = YES;
AdvanceToNewWorkspace = NO;
CycleWorkspaces = NO;
WorkspaceNameDisplayPosition = center;
WorkspaceBorder = None;
WorkspaceBorderSize = 0;
StickyIcons = NO;
SaveSessionOnExit = NO;
WrapMenus = NO;
ScrollableMenus = YES;
MenuScrollSpeed = fast;
IconSlideSpeed = fast;
ShadeSpeed = fast;
BounceAppIconsWhenUrgent = YES;
RaiseAppIconsWhenBouncing = NO;
DoNotMakeAppIconsBounce = NO;
DoubleClickTime = 250;
ClipAutoraiseDelay = 600;
ClipAutolowerDelay = 1000;
ClipAutoexpandDelay = 600;
ClipAutocollapseDelay = 1000;
WrapAppiconsInDock = YES;
AlignSubmenus = NO;
ViKeyMenus = NO;
OpenTransientOnOwnerWorkspace = NO;
WindowPlacement = auto;
IgnoreFocusClick = NO;
UseSaveUnders = NO;
OpaqueMove = YES;
OpaqueResize = NO;
OpaqueMoveResizeKeyboard = NO;
DisableAnimations = NO;
DontLinkWorkspaces = YES;
WindowSnapping = NO;
SnapEdgeDetect = 1;
SnapCornerDetect = 10;
SnapToTopMaximizesFullscreen = NO;
DragMaximizedWindow = Move;
MoveHalfMaximizedWindowsBetweenScreens = NO;
AlternativeHalfMaximized = NO;
PointerWithHalfMaxWindows = NO;
HighlightActiveApp = YES;
AutoArrangeIcons = NO;
NoWindowOverDock = NO;
NoWindowOverIcons = NO;
WindowPlaceOrigin = (64, 0);
ResizeDisplay = center;
MoveDisplay = floating;
DontConfirmKill = NO;
WindowTitleBalloons = YES;
MiniwindowTitleBalloons = NO;
MiniwindowPreviewBalloons = NO;
AppIconBalloons = NO;
HelpBalloons = NO;
EdgeResistance = 30;
ResizeIncrement = 0;
Attraction = NO;
DisableBlinking = NO;
SingleClickLaunch = NO;
StrictWindozeCycle = YES;
SwitchPanelOnlyOpen = NO;
MiniPreviewSize = 128;
IgnoreGtkHints = NO;
MenuStyle = normal;
WidgetColor = (solid, gray);
WorkspaceSpecificBack = ();
WorkspaceBack = (solid, "rgb:50/50/75");
SmoothWorkspaceBack = NO;
IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
TitleJustify = center;
WindowTitleFont = "Sans:bold:pixelsize=12";
WindowTitleExtendSpace = 0;
WindowTitleMinHeight = 0;
WindowTitleMaxHeight = 0x7fffffff;
MenuTitleExtendSpace = 0;
MenuTitleMinHeight = 0;
MenuTitleMaxHeight = 0x7fffffff;
MenuTextExtendSpace = 0;
MenuTitleFont = "Sans:bold:pixelsize=12";
MenuTextFont = "Sans:pixelsize=12";
IconTitleFont = "Sans:pixelsize=9";
ClipTitleFont = "Sans:bold:pixelsize=10";
ShowClipTitle = YES;
LargeDisplayFont = "Sans:pixelsize=24";
HighlightColor = white;
HighlightTextColor = black;
ClipTitleColor = black;
CClipTitleColor = "rgb:61/61/61";
FTitleColor = white;
PTitleColor = white;
UTitleColor = black;
FTitleBack = (solid, black);
PTitleBack = (solid, gray40);
UTitleBack = (solid, "rgb:aa/aa/aa");
ResizebarBack = (solid, "rgb:aa/aa/aa");
MenuTitleColor = white;
MenuTextColor = black;
MenuDisabledColor = gray50;
MenuTitleBack = (solid, black);
MenuTextBack = (solid, "rgb:aa/aa/aa");
IconTitleColor = white;
IconTitleBack = black;
SwitchPanelImages = (swtile.png, swback.png, 30, 40);
ModifierKeyLabels = ("Shift+", "Control+", "Mod1+", "Mod2+", "Mod3+", "Mod4+", "Mod5+");
FrameBorderWidth = 1;
FrameBorderColor = black;
FrameFocusedBorderColor = black;
FrameSelectedBorderColor = white;
WorkspaceMapBack = (solid, black);
RootMenuKey = F12;
WindowListKey = F11;
WindowMenuKey = "Control+Escape";
DockRaiseLowerKey = None;
ClipRaiseLowerKey = None;
MiniaturizeKey = "Mod1+M";
MinimizeAllKey = None;
HideKey = "Mod1+H";
HideOthersKey = None;
MoveResizeKey = None;
CloseKey = None;
MaximizeKey = None;
VMaximizeKey = None;
HMaximizeKey = None;
LHMaximizeKey = None;
RHMaximizeKey = None;
THMaximizeKey = None;
BHMaximizeKey = None;
LTCMaximizeKey = None;
RTCMaximizeKey = None;
LBCMaximizeKey = None;
RBCMaximizeKey = None;
MaximusKey = None;
KeepOnTopKey = None;
KeepAtBottomKey = None;
OmnipresentKey = None;
RaiseKey = "Mod1+Up";
LowerKey = "Mod1+Down";
RaiseLowerKey = None;
ShadeKey = None;
SelectKey = None;
WorkspaceMapKey = None;
FocusNextKey = "Mod1+Tab";
FocusPrevKey = "Mod1+Shift+Tab";
GroupNextKey = None;
GroupPrevKey = None;
NextWorkspaceKey = "Mod1+Control+Right";
PrevWorkspaceKey = "Mod1+Control+Left";
LastWorkspaceKey = None;
NextWorkspaceLayerKey = None;
PrevWorkspaceLayerKey = None;
Workspace1Key = "Mod1+1";
Workspace2Key = "Mod1+2";
Workspace3Key = "Mod1+3";
Workspace4Key = "Mod1+4";
Workspace5Key = "Mod1+5";
Workspace6Key = "Mod1+6";
Workspace7Key = "Mod1+7";
Workspace8Key = "Mod1+8";
Workspace9Key = "Mod1+9";
Workspace10Key = "Mod1+0";
MoveToWorkspace1Key = None;
MoveToWorkspace2Key = None;
MoveToWorkspace3Key = None;
MoveToWorkspace4Key = None;
MoveToWorkspace5Key = None;
MoveToWorkspace6Key = None;
MoveToWorkspace7Key = None;
MoveToWorkspace8Key = None;
MoveToWorkspace9Key = None;
MoveToWorkspace10Key = None;
MoveToNextWorkspaceKey = None;
MoveToPrevWorkspaceKey = None;
MoveToLastWorkspaceKey = None;
MoveToNextWorkspaceLayerKey = None;
MoveToPrevWorkspaceLayerKey = None;
WindowShortcut1Key = None;
WindowShortcut2Key = None;
WindowShortcut3Key = None;
WindowShortcut4Key = None;
WindowShortcut5Key = None;
WindowShortcut6Key = None;
WindowShortcut7Key = None;
WindowShortcut8Key = None;
WindowShortcut9Key = None;
WindowShortcut10Key = None;
WindowRelaunchKey = None;
ScreenSwitchKey = None;
RunKey = None;
NormalCursor = (builtin, left_ptr);
ArrowCursor = (builtin, top_left_arrow);
MoveCursor = (builtin, fleur);
ResizeCursor = (builtin, sizing);
TopLeftResizeCursor = (builtin, top_left_corner);
TopRightResizeCursor = (builtin, top_right_corner);
BottomLeftResizeCursor = (builtin, bottom_left_corner);
BottomRightResizeCursor = (builtin, bottom_right_corner);
VerticalResizeCursor = (builtin, sb_v_double_arrow);
HorizontalResizeCursor = (builtin, sb_h_double_arrow);
WaitCursor = (builtin, watch);
QuestionCursor = (builtin, question_arrow);
TextCursor = (builtin, xterm);
SelectCursor = (builtin, cross);
DialogHistoryLines = 500;
CycleActiveHeadOnly = NO;
CycleIgnoreMinimized = NO;
}
+1 -1
View File
@@ -3,7 +3,7 @@ defsdatadir = $(pkgdatadir)/IconSets
defsdata_DATA = Default.iconset
EXTRA_DIST =
EXTRA_DIST =
CLEANFILES = Default.iconset
+1 -1
View File
@@ -74,5 +74,5 @@ defsdata_DATA = \
xv.xpm
EXTRA_DIST = $(defsdata_DATA)
EXTRA_DIST = $(defsdata_DATA)
+13 -9
View File
@@ -4,8 +4,11 @@ prefsdatadir = $(pkgdatadir)
wpexecbindir = @wprefs_bindir@
# menus which need generated to have correct path to WPrefs
# menus which need generated to have correct path to WPrefs or data directory
GENERATED_MENUS =\
appearance.menu\
appearance.menu.fy\
appearance.menu.nl\
menu\
menu.bg\
menu.fi\
@@ -24,11 +27,14 @@ GENERATED_MENUS =\
plmenu.ja\
plmenu.ko\
plmenu.nl\
plmenu.pl\
plmenu.ro\
plmenu.sk\
plmenu.zh_TW
plmenu.zh_CN\
plmenu.zh_TW\
wmmacros
# menus which do not mention WPrefs
# menus which do not mention WPrefs or data directory
NONGENERATED_MENUS =\
menu.ca\
menu.cz\
@@ -54,18 +60,16 @@ NONGENERATED_MENUS =\
plmenu.de\
plmenu.fr\
plmenu.hr\
plmenu.it\
plmenu.pl\
plmenu.zh_CN
plmenu.it
dist_prefsdata_DATA =\
appearance.menu\
autostart.sh\
background.menu\
background.menu.fy\
background.menu.nl\
exitscript.sh\
README\
README.themes\
wmmacros\
$(NONGENERATED_MENUS)
nodist_prefsdata_DATA = $(GENERATED_MENUS)
@@ -76,4 +80,4 @@ CLEANFILES = $(GENERATED_MENUS)
$(GENERATED_MENUS):
$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" \
$(srcdir)/$@.in > $@
-e "s:#wmdatadir#:$(pkgdatadir):" $(srcdir)/$@.in > $@
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

+6 -6
View File
@@ -17,10 +17,10 @@ in double quotes ("). Ex: "~/GNUstep/Library/WindowMaker/menu"
Instructions for editing the plain text menus can be found in the menu
file itself, kindly translated to your tongue for your convenience, by
the translation contributors.
the translation contributors.
There is a script to convert plain text menus to property list menus
in the utils directory, named wm-oldmenu2new.
in the utils directory, named wm-oldmenu2new.
If you are unsure to wich format to use, stick with the plain text menus
as they are more flexible. If for some psychological reason you are
@@ -32,11 +32,11 @@ Localized menu file translators:
File Language Maintainer
------------------------------------------------------------------------------
menu.ja Japanese MANOME Tomonori <manome@itlb.te.noda.sut.ac.jp>
menu.ja Japanese MANOME Tomonori <manome@itlb.te.noda.sut.ac.jp>
ABE Shige <sabe@ibm.net>
menu.pt Portuguese Alfredo K. Kojima <kojima@inf.ufrgs.br>
menu.de German Carsten Schaar <nhadcasc@fs-maphy.uni-hannover.de>
menu.cz Czech David ©auer <xsauer@hwlab.felk.cvut.cz>
menu.cz Czech David ©auer <xsauer@hwlab.felk.cvut.cz>
menu.ko Korean Chae-Yong Chong <cychong@metro.telecom.samsung.co.kr>
Byeong-Chan Kim <redhands@linux.sarang.net>
menu.gl Galician Xose Vazquez <xose@arrakis.es>
@@ -44,7 +44,7 @@ menu.fr French ObiTuarY <obituary@freshmeat.net>
menu.it Italian Roberto Checozzo <croberto@aerre.it>
menu.ru Russian August S.Sigov <freedomain@actor.ru>
menu.es Spanish Rodrigo Hornos Prados <tnetrhp@ctv.es>
José Luis Rivas López <jrivas@ares.ipf.uvigo.es>
José Luis Rivas López <jrivas@ares.ipf.uvigo.es>
menu.he Hebrew Please send me your name/email if you wrote this
We unfortunately lost that info :(
menu.tr Turkish F. Kagan Gurkaynak <kgf@wpi.edu>
@@ -56,7 +56,7 @@ menu.dk Danish John M. Lockard <jlockard@math.lsa.umich.edu>
Jacob Sparre Andersen <sparre@cats.nbi.dk>
menu.sl Slovene Alen Salamun <snowman@hal9000.medinet.si>
menu.hu Hungarian Csanaki Csaba <prew@mail.matav.hu>
menu.ca Català Carles Amig<F3> dj_fr3nd@hotmail.com
menu.ca Català Carles Amig<F3> dj_fr3nd@hotmail.com
menu.zh_TW.Big5 Chinese Li Wei Jih <lwj83@cs.ccu.edu.tw>
menu.zh_CN Chinese Wang Jian <wangjian2@asiainfo.com>
menu.pl Polish Maciej Friedel <tytus@tytus.itma.pwr.wroc.pl>
+5 -5
View File
@@ -5,21 +5,21 @@ Themes For Window Maker
=======================
Note: the information contained in this file is only valid for themes
in the .themed (for theme directory) format, supported in
in the .themed (for theme directory) format, supported in
Window Maker 0.20.4 or newer.
How To Install a Theme Pack
===========================
To install a theme, unpack your theme into your WindowMaker directory
To install a theme, unpack your theme into your WindowMaker directory
(the same as old-style themes), usually ~/GNUstep/Library/WindowMaker
cd ~/GNUstep/Library/WindowMaker
gzip -dc "xyztheme.tar.gz" | tar xvf -
You can also do this in your system-wide WindowMaker directory (usually
/usr/local/share/WindowMaker) to have the themes be available to all
/usr/local/share/WindowMaker) to have the themes be available to all
your users. This will probably need to be done with root access.
@@ -46,10 +46,10 @@ getstyle -p ~/GNUstep/Library/WindowMaker/Themes/MyTheme
This will create a theme pack (a new directory in either the current
directory or a directory you specify) named MyTheme.themed, containing
everything it requires, including all pixmap files. In this example,
the new theme pack would be made in your themes directory and be
the new theme pack would be made in your themes directory and be
immediately available in your Themes menu.
Additionally, you can put a text file named MyTheme.lsm in the MyTheme.themed
Additionally, you can put a text file named MyTheme.lsm in the MyTheme.themed
directory. This file can contain info like copyrights, credits or whatever.
To distribute your theme, just make a .tar.gz of the .themed directory.
+35
View File
@@ -0,0 +1,35 @@
{
CClipTitleColor = "#8b8e8e";
ClipTitleColor = "#2e3436";
ClipTitleFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=13";
FrameBorderColor = "#b6b6b3";
FrameFocusedBorderColor = "#b6b6b3";
FrameSelectedBorderColor = "#ffffff";
FTitleBack = (solid, "#e8e8e7");
FTitleColor = "#2e3436";
HighlightColor = "#4a90d9";
HighlightTextColor = "#ffffff";
IconBack = (solid, "#e8e8e7");
IconTitleBack = "#e8e8e7";
IconTitleColor = "#2e3436";
IconTitleFont = "Cantarell:slant=0:weight=80:width=100:pixelsize=9";
LargeDisplayFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=24";
MenuDisabledColor = "#8b8e8e";
MenuStyle = flat;
MenuTextBack = (solid, "#ffffff");
MenuTextColor = "#2e3436";
MenuTextExtendSpace = 0;
MenuTextFont = "Cantarell:slant=0:weight=80:width=100:pixelsize=13";
MenuTitleBack = (solid, "#e8e8e7");
MenuTitleColor = "#2e3436";
MenuTitleExtendSpace = 0;
MenuTitleFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=13";
PTitleBack = (solid, "#e8e8e7");
PTitleColor = "#8b8e8e";
ResizebarBack = (solid, "#e8e8e7");
TitleJustify = center;
UTitleBack = (solid, "#e8e8e7");
UTitleColor = "#8b8e8e";
WindowTitleExtendSpace = 0;
WindowTitleFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=13";
}
+1
View File
@@ -2,6 +2,7 @@
prefsdatadir = $(pkgdatadir)/Styles
prefsdata_DATA =\
Adwaita.style\
Autumn.style\
Black.style\
BlackTexture.style\
-11
View File
@@ -1,11 +0,0 @@
#include "wmmacros"
Appearance MENU
"Background" OPEN_MENU background.menu
"Styles" OPEN_MENU -noext LOCAL_STYLES_DIR STYLES_DIR USER_STYLES_DIR WITH setstyle
"Themes" OPEN_MENU -noext LOCAL_THEMES_DIR THEMES_DIR USER_THEMES_DIR WITH setstyle
"Icon Sets" OPEN_MENU -noext LOCAL_ICON_SETS_DIR ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
"Save IconSet" EXEC geticonset USER_ICON_SETS_DIR/"%a(IconSet name)"
"Save Theme" EXEC getstyle -t USER_THEMES_DIR/"%a(Theme name)"
Appearance END
+12
View File
@@ -0,0 +1,12 @@
#include "wmmacros"
Uterlik MENU
"Eftergrûn" OPEN_MENU background.menu.fy
"Stilen" OPEN_MENU -noext STYLES_DIR USER_STYLES_DIR WITH setstyle
"Tema's" OPEN_MENU -noext THEMES_DIR USER_THEMES_DIR WITH setstyle
"Ikoanesets" OPEN_MENU -noext ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
"Ikoaneset bewarje" EXEC geticonset USER_ICON_SETS_DIR/"%a(Ikoanesetnamme)"
"Tema bewarje" EXEC getstyle -p "%a(Temanamme)"
"Foarkarrehelpmiddel" EXEC #wprefs#
Uterlik END
+12
View File
@@ -0,0 +1,12 @@
#include "wmmacros"
Appearance MENU
"Background" OPEN_MENU background.menu
"Styles" OPEN_MENU -noext STYLES_DIR USER_STYLES_DIR WITH setstyle
"Themes" OPEN_MENU -noext THEMES_DIR USER_THEMES_DIR WITH setstyle
"Icon Sets" OPEN_MENU -noext ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
"Save IconSet" EXEC geticonset USER_ICON_SETS_DIR/"%a(IconSet name)"
"Save Theme" EXEC getstyle -p "%a(Theme name)"
"Preferences Utility" EXEC #wprefs#
Appearance END
+12
View File
@@ -0,0 +1,12 @@
#include "wmmacros"
Uiterlijk MENU
"Achtergrond" OPEN_MENU background.menu.nl
"Stijlen" OPEN_MENU -noext STYLES_DIR USER_STYLES_DIR WITH setstyle
"Thema's" OPEN_MENU -noext THEMES_DIR USER_THEMES_DIR WITH setstyle
"Iconensets" OPEN_MENU -noext ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
"Iconenset opslaan" EXEC geticonset USER_ICON_SETS_DIR/"%a(Iconensetnaam)"
"Thema opslaan" EXEC getstyle -p "%a(Themanaam)"
"Voorkeurenhulpmiddel" EXEC #wprefs#
Uiterlijk END
+7 -3
View File
@@ -5,6 +5,7 @@
"Black" WS_BACK '(solid, black)'
"Blue" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
"Bluemarine" WS_BACK '(solid, "#224477")'
"Deep Blue" WS_BACK '(solid, "#180090")'
"Purple" WS_BACK '(solid, "#554466")'
"Wheat" WS_BACK '(solid, "wheat4")'
@@ -22,7 +23,10 @@
"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
"Gradient" END
"Images" MENU
"Tiled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
"Scaled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
"Image" END
"Tiled" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
"Scaled" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
"Centered" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
"Maximized" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -a
"Filled" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -f
"Images" END
"Background" END
+32
View File
@@ -0,0 +1,32 @@
#include "wmmacros"
"Eftergrûn" MENU
"Effen" MENU
"Swart" WS_BACK '(solid, black)'
"Blau" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
"Marineblau" WS_BACK '(solid, "#224477")'
"Djipblau" WS_BACK '(solid, "#180090")'
"Poarper" WS_BACK '(solid, "#554466")'
"Weet" WS_BACK '(solid, "wheat4")'
"Donkergriis" WS_BACK '(solid, "#333340")'
"Wynread" WS_BACK '(solid, "#400020")'
"Effen" END
"Kleurferrin" MENU
"Sinneûndergong" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
"Loft" WS_BACK '(vgradient, blue4, white)'
"Blautinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
"Poarpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
"Weettinten" WS_BACK '(vgradient, "#a09060", "#302010")'
"Griistinten" WS_BACK '(vgradient, "#636380", "#131318")'
"Wynreadtinten" WS_BACK '(vgradient, "#600040", "#180010")'
"Kleurferrin" END
"Ofbyldingen" MENU
"Tegele" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
"Skaald" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
"Sintrearre" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
"Maksimalisearre" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -a
"Opfolle" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -f
"Ofbyldingen" END
"Eftergrûn" END
+32
View File
@@ -0,0 +1,32 @@
#include "wmmacros"
"Achtergrond" MENU
"Effen" MENU
"Zwart" WS_BACK '(solid, black)'
"Blauw" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
"Marineblauw" WS_BACK '(solid, "#224477")'
"Diepblauw" WS_BACK '(solid, "#180090")'
"Purper" WS_BACK '(solid, "#554466")'
"Tarwe" WS_BACK '(solid, "wheat4")'
"Donkergrijs" WS_BACK '(solid, "#333340")'
"Wijnrood" WS_BACK '(solid, "#400020")'
"Effen" END
"Kleurverloop" MENU
"Zonsondergang" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
"Lucht" WS_BACK '(vgradient, blue4, white)'
"Blauwtinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
"Purpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
"Tarwetinten" WS_BACK '(vgradient, "#a09060", "#302010")'
"Grijstinten" WS_BACK '(vgradient, "#636380", "#131318")'
"Wijnroodtinten" WS_BACK '(vgradient, "#600040", "#180010")'
"Kleurverloop" END
"Afbeeldingen" MENU
"Getegeld" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
"Geschaald" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
"Gecentreerd" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
"Gemaximaliseerd" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -a
"Opgevuld" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -f
"Afbeeldingen" END
"Achtergrond" END
+11 -11
View File
@@ -18,11 +18,11 @@
* No es pot especificar una combinació de tecles per a un MENU o un
* OPEN_MENU
*
* <Comanda> pot ser un d'aquests comandes:
* <Comanda> pot ser un d'aquests comandes:
* MENU - Comença la definició d'un submenú
* END - Acaba la definició d'un submenú
* OPEN_MENU - Obre el contingut d'un menú desde un fitxer, una
* canonada (pipe), o desde el contingut de un(s)
* canonada (pipe), o desde el contingut de un(s)
* directori(s) i eventualment pot precedir-li algun
* comanda
* WORKSPACE_MENU - Afageix el menú de operacions del escriptori. Tan
@@ -38,16 +38,16 @@
* HIDE_OTHERS - Oculta totes les finestres de l'escriptori excepte la
* actual (o la darrera que ha estat activa)
* SAVE_SESSION - Guarda l'estat actual de l'escriptori, que inclou
* totes les aplicacions en execució, la seva geometria, la
* posició en pantalla, l'escriptori en que estaven, el dock
* o el clip desde on van ser executades, i si estaven
* totes les aplicacions en execució, la seva geometria, la
* posició en pantalla, l'escriptori en que estaven, el dock
* o el clip desde on van ser executades, i si estaven
* minimitzades, ocultes o plegades. També guarda l'escriptori
* que és usat en aquest moment. Tot això serà restaurat el
* que és usat en aquest moment. Tot això serà restaurat el
* pròxim cop que s'arrenqui Window Maker fins que es faci un
* altre SAVE_SESSION o CLEAR_SESSION. Si SaveSessionOnExit =
* Yes; el fitxer de domini de Window Maker, llavors la sessió
* es guardarà cada cop que es surt de Window Maker,
* sobreescribint qualsevol SAVE_SESSION o CLEAR_SESSION
* es guardarà cada cop que es surt de Window Maker,
* sobreescribint qualsevol SAVE_SESSION o CLEAR_SESSION
* (veure avall)
* CLEAR_SESSION - Borra qualsevol sessió guardada anteriorment. No té
* cap efecte si SaveSessionOnExit és verdader
@@ -115,7 +115,7 @@
"Llista de Processos" EXEC xterm -e top
"Manual d'instruccions" EXEC xman
"Informació" END
"XTerm" EXEC xterm -sb
"XTerm" EXEC xterm -sb
"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
"Escriptoris" WORKSPACE_MENU
"Aplicacions" MENU
@@ -128,7 +128,7 @@
"X File Manager" EXEC xfm
"OffiX Files" EXEC files
"LyX" EXEC lyx
"Netscape" EXEC netscape
"Netscape" EXEC netscape
"Ghostview" EXEC ghostview %a(Enter file to view)
"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)
"TkDesk" EXEC tkdesk
@@ -136,7 +136,7 @@
"Editors" MENU
"XFte" EXEC xfte
"XEmacs" SHEXEC xemacs || emacs
"XJed" EXEC xjed
"XJed" EXEC xjed
"NEdit" EXEC nedit
"Xedit" EXEC xedit
"VI" EXEC xterm -e vi
+5 -5
View File
@@ -9,7 +9,7 @@
// <Titulek> je jakýkoli řetěz znaků. Pokud obsahuje mezery musí být
// uzavřen do uvozovek (")
//
// <Příkaz> může být jeden z následujících:
// <Příkaz> může být jeden z následujících:
// MENU - definice nové (sub)menu
// END - konec definice nového menu
// EXEC <program> - provede se program
@@ -24,18 +24,18 @@
// bylo naposledy zaměřeno)
//
// <Parameters> je program, který bude proveden.
//
// Každý příkaz MENU musí mít odpovídající END.
//
// Každý příkaz MENU musí mít odpovídající END.
// následující text je česky, kódován ISO8859-2.
#include <wmmacros>
"Hlavní menu" MENU
"Správce oken" MENU
"Správce oken" MENU
"Editace menu" SHEXEC xterm -T 'Editace menu' -e joe $HOME/GNUstep/Library/WindowMaker/menu
"Správce oken" END
"Info" MENU
"Info Panel..." INFO_PANEL
"Legal" LEGAL_PANEL
"Legal" LEGAL_PANEL
// "Xosview" EXEC xosview
"Top" EXEC xterm -e top
"Manuál" EXEC xman
+7 -7
View File
@@ -7,13 +7,13 @@
*
* <Titel> er en tekst som anvendes som titel i menuen. Teksten
* skal omgives med " hvis den indeholder mellemrum.
*
*
* SHORTCUT angiver en genvej for menuobjektet. <Genvej> har samme
* syntaks som genvejene i filen $HOME/GNUStep/Defaults/WindowMaker.
*
* Man kan ikke angive en genvej for kommandoerne MENU og OPEN_MENU.
*
* <Kommando> kan være et af følgende:
*
* <Kommando> kan være et af følgende:
* MENU - starter (under)menu definition.
* END - afslutter (under)menu definition.
* OPEN_MENU - åbner en menu fra en fil, pipe eller indholdet af
@@ -109,8 +109,8 @@
"Manualer" EXEC xman
"Info" END
"Kør..." SHEXEC "%a(Kør,Indtast kommando der skal udføres:)"
"XTerm" EXEC xterm -sb
"Rxvt" EXEC rxvt -bg black -fg white
"XTerm" EXEC xterm -sb
"Rxvt" EXEC rxvt -bg black -fg white
"Arbejdsborde" WORKSPACE_MENU
"Applikationer" MENU
"Grafik" MENU
@@ -122,7 +122,7 @@
"X Filhåndtering" EXEC xfm
"OffiX Files" EXEC files
"LyX" EXEC lyx
"Netscape" EXEC netscape
"Netscape" EXEC netscape
"Ghostview" EXEC ghostview %a(GhostView,Indtast filnavn)
"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)
"TkDesk" EXEC tkdesk
@@ -130,7 +130,7 @@
"Tekstbehandling" MENU
"XFte" EXEC xfte
"Emacs" SHEXEC xemacs || emacs
"XJed" EXEC xjed
"XJed" EXEC xjed
"NEdit" EXEC nedit
"Xedit" EXEC xedit
"VI" EXEC xterm -e vi
+1 -1
View File
@@ -8,7 +8,7 @@
// <Title> ist ein Text, der als Titel benutzt werden soll. Falls er
// Leerzeichen enthält, muss er von " umgeben sein.
//
// <Command> eine der folgenden gültigen Anweisungen:
// <Command> eine der folgenden gültigen Anweisungen:
// MENU - beginnt (Unter)menüdefinition
// END - beendet (Unter)menüdefinition
// EXEC <program> - führt ein externes Programm aus
+16 -16
View File
@@ -8,14 +8,14 @@
* <Title> είναι η ονομασία του προγράμματος ή εντολής. Αν είναι περισσότερες
* από μία λέξεις πρέπει να εμπεριέχονται μεταξύ εισαγωγικών π.χ:
* "Το Πρόγραμμα"
*
*
* SHORTCUT είναι ο συνδυασμός πλήκτρων για το συγκεκριμένο πρόγραμμα π.χ:
* "Meta+1". Άλλα παραδείγματα θα δείτε στο αχρείο:
* $HOME/GNUstep/Defaults/WindowMaker
*
* Δεν μπορεί να δηλωθεί ένα shortcut για MENU και για OPEN_MENU εντολή.
*
* <Command> μία από τις εντολές:
*
* <Command> μία από τις εντολές:
* MENU - το σημείο που ξεκινά ένα υπομενού
* END - το σημείο που τελειώνει ένα υπομενού
* OPEN_MENU - ανοίγει ένα μενού από ένα αρχείο, pipe ή τα περιεχόμενα ενός
@@ -26,7 +26,7 @@
* SHEXEC <command> - εκτέλεση εντολής κέλυφους (όπως gimp > /dev/null)
* EXIT - έξοδος από τον Διαχειριστή Παραθύρων
* RESTART [<window manager>] - επανεκκινεί τον Window Maker ή ξεκινάει
* ένας άλλος window manager
* ένας άλλος window manager
* REFRESH - ανανεώνει την προβολή της Επιφάνειας στην οθόνη
* ARRANGE_ICONS - τακτοποίηση των εικονιδίων στην Επιφάνεια
* SHUTDOWN - τερματίζει βίαια όλους τους clients
@@ -34,7 +34,7 @@
* SHOW_ALL - εμφανίζει όλα τα "κρυμμένα" παράθυρα στην Επιφάνεια
* HIDE_OTHERS - "κρύβει" όλα τα παράθυρα στην Επιφάνεια, εκτός από
* αυτό που είναι "ενεργό" (ή το τελευταίο που ήταν "ενεργό")
* SAVE_SESSION - αποθηκεύει την εκάστοτε "κατάσταση" της Επιφάνειας, το
* SAVE_SESSION - αποθηκεύει την εκάστοτε "κατάσταση" της Επιφάνειας, το
* οποίο σημαίνει, όλα τα προγράμματα που εκτελούνται εκείνη τη
* στιγμή με όλες τους τις ιδιότητες (γεωμετρία, θέση στην
* οθόνη, επιφάνεια εργασίας στην οποία έχουν εκτελεστεί, Dock ή
@@ -48,31 +48,31 @@
* "SaveSessionOnExit = Yes;", τότε όλα τα παραπάνω γίνονται
* αυτόματα με κάθε έξοδο του χρήστη από τον Window Maker,
* ακυρώνοντας ουσιαστικά κάθε προηγούμενη χρήση τως εντολών
* SAVE_SESSION ή CLEAR_SESSION (βλέπε παρακάτω).
* CLEAR_SESSION - σβήνει όλες τις πληροφορίες που έχουν αποθηκευθεί
* σύμφωνα με τα παραπάνω. Δεν θα έχει όμως κανένα αποτέλεσμα
* SAVE_SESSION ή CLEAR_SESSION (βλέπε παρακάτω).
* CLEAR_SESSION - σβήνει όλες τις πληροφορίες που έχουν αποθηκευθεί
* σύμφωνα με τα παραπάνω. Δεν θα έχει όμως κανένα αποτέλεσμα
* αν η εντολή SaveSessionOnExit=Yes.
* INFO - Πληροφορίες σχετικά με τον Window Maker
*
* OPEN_MENU σύνταξη:
* 1. Χειρισμός ενός αρχείου-μενού.
* // ανοίγει το "αρχείο.μενού" το οποίο περιέχει ένα έγκυρο αρχείο-μενού
* // ανοίγει το "αρχείο.μενού" το οποίο περιέχει ένα έγκυρο αρχείο-μενού
* // καιτο εισάγει στην εκάστοτε θέση
* OPEN_MENU αρχείο.μενού
* 2. Χειρισμός ενός Pipe μενού.
* // τρέχει μια εντολή και χρησιμοποιεί την stdout αυτής για την κατασκευή
* // του μενού. Το αποτέλεσμα της εντολής πρέπει να έχει έγκυρη σύνταξη
* // για χρήση ως μενού. Το κενό διάστημα μεταξύ "|" και "εντολής" είναι
* // του μενού. Το αποτέλεσμα της εντολής πρέπει να έχει έγκυρη σύνταξη
* // για χρήση ως μενού. Το κενό διάστημα μεταξύ "|" και "εντολής" είναι
* // προεραιτικό.
* OPEN_MENU | εντολή
* 3. Χειρισμός ενός καταλόγου.
* // Ανοίγει έναν ή περισσότερους καταλόγους και κατασκευάζει ένα μενού με
* // όλους τους υποκαταλόγους και τα εκτελέσιμα αρχεία σε αυτούς
* // όλους τους υποκαταλόγους και τα εκτελέσιμα αρχεία σε αυτούς
* // κατανεμημένα αλφαβητικά.
* OPEN_MENU /κάποιος/κατάλογος [/κάποιος/άλλος/κατάλογος ...]
* 4. Χειρισμός ενός καταλόγου με κάποια εντολή.
* // Ανοίγει έναν ή περισσότερους καταλόγους και κατασκευάζει ένα μενού με
* // όλους τους υποκαταλόγους και τα αναγνώσιμα αρχεία σε αυτούς
* // όλους τους υποκαταλόγους και τα αναγνώσιμα αρχεία σε αυτούς
* // κατανεμημένα αλφαβητικά, τα οποία μπορούν να εκτελεστούν με μία
* // εντολή.
* OPEN_MENU /κάποιος/κατάλογος [/κάποιος/άλλος/κατάλογος ...] WITH εντολή -παράμετροι
@@ -124,7 +124,7 @@
"Βοήθεια" EXEC xman
"Πληροφορίες" END
"Εκτέλεση..." SHEXEC %a(Εκτέλεση,Γράψε την εντολή προς εκτέλεση:)
"XTerm" EXEC xterm -sb
"XTerm" EXEC xterm -sb
"Rxvt" EXEC rxvt -bg black -fg white -fn grfixed
"Επιφάνειες" WORKSPACE_MENU
"Προγράμματα" MENU
@@ -137,7 +137,7 @@
"X File Manager" EXEC xfm
"OffiX Files" EXEC files
"LyX" EXEC lyx
"Netscape" EXEC netscape
"Netscape" EXEC netscape
"Ghostview" EXEC ghostview %a(Αρχείο προς ανάγνωση)
"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Γράψε το PDF προς προβολή)
"TkDesk" EXEC tkdesk
@@ -145,7 +145,7 @@
"Κειμενογράφοι" MENU
"XFte" EXEC xfte
"XEmacs" SHEXEC xemacs || emacs
"XJed" EXEC xjed
"XJed" EXEC xjed
"NEdit" EXEC nedit
"Xedit" EXEC xedit
"VI" EXEC xterm -e vi
+10 -10
View File
@@ -8,7 +8,7 @@
//
// <Título> cadena de texto usada como el título.Tiene que estar entre ""
//
// <Comando> un comando de los siguientes :
// <Comando> un comando de los siguientes :
// MENU - comienza la definición del (sub)menu.
// END - termina la definición del (sub)menu.
// EXEC <programa> - ejecuta un programa externo
@@ -23,12 +23,12 @@
// excepto la que tiene el foco (o la ultima que haya recibido el foco)
//
// <Parametros> es el programa a ejecutar.
//
//
// ** Opciones para a linea de comando EXEC :
// %s - se sustituye por la corriente seleción. Si la selección no es posible ,
// el comando es cancelado
// %w - se sustituye con la corrente ID de la ventana selecionada . Si no hay
// ventanas selecionadas , no se devuolve nada.
// %w - se sustituye con la corrente ID de la ventana selecionada . Si no hay
// ventanas selecionadas , no se devuolve nada.
//
// Se puede anular carácteres especiales (como % e ") con el caracter \ :
// ejemplo: xterm -T "\"Terminal X\""
@@ -54,14 +54,14 @@
"Emuladores ..." END
"Aplicaciones ..." MENU
"Graficos ..." MENU
"Gimp" EXEC gimp
"XV" EXEC xv
"XPaint" EXEC xpaint
"XFig" EXEC xfig
"Graficos ..." END
"Editores ..." MENU
"XEmacs" SHEXEC xemacs || emacs
"XJed" EXEC xjed
@@ -69,13 +69,13 @@
"Xedit" EXEC xedit
"VI" EXEC xterm -e vi
"Editores ..." END
"Multimedia ..." MENU
"Xmcd" SHEXEC xmcd 2> /dev/null
"Xplaycd" EXEC xplaycd
"Xmixer" EXEC xmixer
"Multimedia ..." END
"Utilidades ..." MENU
"Calculadora" EXEC xcalc
"Selector de fuente" EXEC xfontsel
@@ -85,7 +85,7 @@
"ASClock" EXEC asclock -shape
"Portapapeles" EXEC xclipboard
"Utilidades ..." END
"X File Manager" EXEC xfm
"OffiX Files" EXEC files
"LyX" EXEC lyx
@@ -123,7 +123,7 @@
"Configurar Area de Trabajo ..." END
"Areas de Trabajo ..." WORKSPACE_MENU
#if (UID==0) // o ve root ou usuarios con UID=0
"Sistema" MENU
// Panel de control
+10 -10
View File
@@ -7,20 +7,20 @@
*
* <Title> is any string to be used as title. Must be enclosed with " if it
* has spaces
*
*
* SHORTCUT specifies a shortcut for that item. <Shortcut> has the
* same syntax of the shortcuts key options in the
* same syntax of the shortcuts key options in the
* $HOME/GNUstep/Defaults/WindowMaker file, such as RootMenuKey or MiniaturizeKey.
*
* You can't specify a shortcut for a MENU or OPEN_MENU entry.
*
* <Command> one of the valid commands:
*
* <Command> one of the valid commands:
* MENU - starts (sub)menu definition
* END - end (sub)menu definition
* OPEN_MENU - opens a menu from a file, pipe or directory(ies) contents
* and eventually precede each with a command.
* WORKSPACE_MENU - adds a submenu for workspace operations. Only one
* workspace_menu is allowed.
* workspace_menu is allowed.
* EXEC <program> - executes an external program
* SHEXEC <command> - executes a shell command (like gimp > /dev/null)
* EXIT - exits the window manager
@@ -53,7 +53,7 @@
* // it in current position
* OPEN_MENU file.menu
* 2. Pipe menu handling.
* // opens command and uses it's stdout to construct menu.
* // opens command and uses its stdout to construct menu.
* // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional.
* OPEN_MENU | command
@@ -79,7 +79,7 @@
* optional prompt and do substitution with what you typed
* %w - substitute with XID for the current focused window
* %W - substitute with the number of the current workspace
*
*
* You can override special characters (as % and ") with the \ character:
* ex: xterm -T "\"Hello World\""
*
@@ -114,7 +114,7 @@
"Ohjeselain" EXEC xman
"Tietoja" END
"Käynnistä..." SHEXEC %a(Käynnistä,Kirjoita suoritettava komento:)
"XTerm" EXEC xterm -sb
"XTerm" EXEC xterm -sb
"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
"Työtilat" WORKSPACE_MENU
"Sovellukset" MENU
@@ -127,7 +127,7 @@
"X Tiedostonhallinta" EXEC xfm
"OffiX Tiedostot" EXEC files
"LyX" EXEC lyx
"Netscape" EXEC netscape
"Netscape" EXEC netscape
"Ghostview" EXEC ghostview %a(GhostView,Kirjoita näytettävän tiedoston nimi:)
"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Kirjoita näytettävän PDF-tiedoston nimi)
"TkDesk" EXEC tkdesk
@@ -135,7 +135,7 @@
"Editorit" MENU
"XFte" EXEC xfte
"XEmacs" SHEXEC xemacs || emacs
"XJed" EXEC xjed
"XJed" EXEC xjed
"NEdit" EXEC nedit
"Xedit" EXEC xedit
"VI" EXEC xterm -e vi
+5 -5
View File
@@ -1,6 +1,6 @@
/*
* Définition du menu de fond pour WindowMaker
*
*
* La syntaxe est:
*
* <Titre> [SHORTCUT <Raccourci>] <Commande> <Paramètres>
@@ -47,7 +47,7 @@
*
* SHOW_ALL Montre toutes les fenêtres sur le bureau
*
* HIDE_OTHERS Cache toutes les fenêtres sur le
* HIDE_OTHERS Cache toutes les fenêtres sur le
* bureau qui sont en arrière plan
*
* SAVE_SESSION Sauve la l'état courant du bureau, cela
@@ -74,7 +74,7 @@
* antérieure. Ceci n'aura aucun effet si
* "SaveSessionOnExit" est égal à "Yes".
*
* INFO_PANEL Affiche le panneau d'informations sur
* INFO_PANEL Affiche le panneau d'informations sur
* WindowMaker.
*
* LEGAL_PANEL Affiche le panneau d'informations sur
@@ -201,14 +201,14 @@
"XKill" EXEC xkill
"Sélections" EXEC xclipboard
"Utilitaires" END
"Sélection" MENU
"Copier" SHEXEC echo '%s' | wxcopy
"Envoyer à" EXEC xterm -name mail -T "Pine" -e pine %s
"Naviguer" EXEC netscape %s
"Rechercher dans le manuel" SHEXEC MANUAL_SEARCH(%s)
"Sélection" END
"Bureau" MENU
"Cacher les autres fenêtres" HIDE_OTHERS
"Montrer toutes les fenêtres" SHOW_ALL
+18 -43
View File
@@ -5,22 +5,22 @@
*
* <Titel> [SHORTCUT <Fluchtoets>] <Kommando> <Parameters>
*
* <Titel> is elke tekenrige te brûken as titel. Moat tusken " stean as it
* <Titel> is elke tekenrige te brûken as titel. Moat tusken " stean at it
* spaasjes hat.
*
*
* SHORTCUT jout in fluchtoets op foar dy yngong. <Fluchtoets> hat
* deselde opmaak as de fluchtoetsopsjes yn it
* $HOME/GNUstep/Defaults/WindowMaker bestân, sa as RootMenuKey of MiniaturizeKey.
*
* Jo kinne gjin fluchtoets opjaan foar in MENU- of OPEN_MENU-ûnderdiel.
*
* <Kommando> ien fan 'e jildige kommando's:
*
* <Kommando> ien fan 'e jildige kommando's:
* MENU - begjint (sub)menubepaling
* END - beëiniget (sub)menubepaling
* OPEN_MENU - iepenet in menu út in bestân, 'pipe' of map(pen)ynhâld,
* en giet eventueel elk foarôf mei in kommando.
* WORKSPACE_MENU - foeget in submenu foar wurkromtehannelingen ta. Mar ien
* workspace_menu is tastien.
* workspace_menu is tastien.
* EXEC <programma> - fiert in ekstern programma út
* SHEXEC <kommando> - fiert in 'shell'-kommando út (sa as gimp > /dev/null)
* EXIT - slút de finsterbehearder ôf
@@ -39,12 +39,12 @@
* miniaturisearre, oprôle of ferburgen). Bewaret teffens de aktuele
* wurkromte fan 'e brûker. Alles sil wersteld wurde by elke
* start fan windowmaker, oant in oare SAVE_SESSION of
* CLEAR_SESSION brûkt wurdt. As SaveSessionOnExit = Yes; yn
* CLEAR_SESSION brûkt wurdt. At SaveSessionOnExit = Yes; yn
* it WindowMaker-domeinbestân, dan wurdt bewarjen automatysk
* dien by elke windowmaker-ôfsluting, en wurdt in
* SAVE_SESSION of CLEAR_SESSION oerskreaun (sjoch hjirnei).
* CLEAR_SESSION - wisket in earder bewarre sesje. Dit sil gjin
* effekt hawwe as SaveSessionOnExit is True.
* effekt hawwe at SaveSessionOnExit is True.
* INFO - toant it Ynfopaniel
*
* OPEN_MENU-opmaak:
@@ -56,7 +56,7 @@
* // iepenet kommando en brûkt syn 'stdout' om in menu oan te meitsjen.
* // Kommando-output moat in jildige menubeskriuwing wêze.
* // De romte tusken '|' en it kommando sels is opsjoneel.
* // Brûk '||' yn plak fan '|' as jo it menu altiten bywurkje wolle
* // Brûk '||' yn plak fan '|' at jo it menu altiten bywurkje wolle
* // by iepenjen. Dat soe traach wurkje kinne.
* OPEN_MENU | kommando
* OPEN_MENU || kommando
@@ -74,6 +74,11 @@
* -noext lit alles fan 'e lêste punt yn 'e
* bestânsnamme ôf wei
*
* // Brûk #usergnusteppath# as tydlike oantsjutting foar it paad nei de
* // brûkers-GNUstep-map. Window Maker sil dy ferfange mei de wearde
* // fan WMAKER_USER_ROOT, at dizze omjouwingsfariabele ynsteld is, of
* // oars "~/GNUstep"
*
* <Parameters> is it út te fieren programma.
*
* ** Kommandorigelopsjes yn EXEC:
@@ -82,7 +87,7 @@
* opsjonele oanwizing, en wurdt ferfongen troch wat jo yntype
* %w - wurdt ferfongen troch XID foar it aktuele fokust finster
* %W - wurdt ferfongen troch it nûmer fan 'e aktuele wurkromte
*
*
* Jo kinne spesjale karakters (sa as % en ") útskeakelje mei it \-teken:
* fb.: xterm -T "\"Hallo Wrâld\""
*
@@ -117,7 +122,7 @@
"Hantliedingblêder" EXEC xman
"Ynfo" END
"Utfiere..." SHEXEC %a(Utfiere,Typ út te fieren kommando:)
"XTerm" EXEC xterm -sb
"XTerm" EXEC xterm -sb
"Mozilla Firefox" EXEC firefox
"Wurkromten" WORKSPACE_MENU
"Programma's" MENU
@@ -132,12 +137,12 @@
"Rekkenblêd" EXEC oocalc
"Draw" EXEC oodraw
"Impress" EXEC ooimpress
"OpenOffice.org" END
"OpenOffice.org" END
"Tekstbewurkers" MENU
"XEmacs" EXEC xemacs
"Emacs" EXEC emacs
"XJed" EXEC xjed
"XJed" EXEC xjed
"VI" EXEC xterm -e vi
"GVIM" EXEC gvim
"NEdit" EXEC nedit
@@ -179,37 +184,7 @@
"Beskoattelje" EXEC xlock -allowroot -usefirst
"Kommando's" END
"Uterlik" MENU
"Tema's" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
"Stilen" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
"Ikoanesets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
"Eftergrûn" MENU
"Effen" MENU
"Swart" WS_BACK '(solid, black)'
"Blau" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
"Marineblau" WS_BACK '(solid, "#224477")'
"Poarper" WS_BACK '(solid, "#554466")'
"Weet" WS_BACK '(solid, "wheat4")'
"Donkergriis" WS_BACK '(solid, "#333340")'
"Wynread" WS_BACK '(solid, "#400020")'
"Effen" END
"Kleurferrin" MENU
"Sinneûndergong" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
"Loft" WS_BACK '(vgradient, blue4, white)'
"Blautinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
"Poarpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
"Weettinten" WS_BACK '(vgradient, "#a09060", "#302010")'
"Griistinten" WS_BACK '(vgradient, "#636380", "#131318")'
"Wynreadtinten" WS_BACK '(vgradient, "#600040", "#180010")'
"Kleurferrin" END
"Ofbyldingen" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
"Eftergrûn" END
"Tema bewarje" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Temanamme,Fier bestânsnamme yn:)"
"Ikoaneset bewarje" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikoanesetnamme,Fier bestânsnamme yn:)"
"Foarkarrehelpmiddel" EXEC #wprefs#
"Uterlik" END
"Uterlik" OPEN_MENU "appearance.menu.fy"
"Sesje" MENU
"Sesje bewarje" SAVE_SESSION
+8 -8
View File
@@ -8,7 +8,7 @@
// <Título> cadea de texto usada como o título.Ten que estar pecha entre ""
//
//
// <Comando> un comando dos seguintes :
// <Comando> un comando dos seguintes :
// MENU - escomenza a definición do (sub)menú.
// END - remata a definición do (sub)menu.
// EXEC <programa> - executa un programa externo
@@ -19,19 +19,19 @@
// REFRESH - refresca o ecritorio
// ARRANGE_ICONS - ordena os iconos do escritorio
// SHUTDOWN - asasina tódalas aplicacións (e fecha a sesión das X)
// WORKSPACE_MENU - engade un submenú para as operacións da
// WORKSPACE_MENU - engade un submenú para as operacións da
// area de traballo
// SHOW_ALL - mostra tódalas fiestras na área de traballo
// HIDE_OTHERS - oculta tódalas fiestras da area de traballo,
// excepto a que ten o foco (ou a ultima que haxa recibido o foco)
//
// <Parametros> é o programa a executar.
//
//
// ** Opcións para a liña de comando EXEC :
// %s - sustituese pola corrente seleción. Se a selección non é posible ,
// o comando é cancelado
// %w - sustituese coa corrente ID da fiestra selecionada . Se non hay
// xanelas selecionadas , non se devolve nada.
// %w - sustituese coa corrente ID da fiestra selecionada . Se non hay
// xanelas selecionadas , non se devolve nada.
//
// Pódese anular carácteres especiais (como % e ") co caracter \ :
// exemplo: xterm -T "\"Boas mundo\""
@@ -50,7 +50,7 @@
"Manual" EXEC xman
"Información" END
"Emulador Terminal" EXEC rxvt -ls -fg white -bg black -fn vga
"XJed" EXEC xjed
"XJed" EXEC xjed
"Areas de Traballo" WORKSPACE_MENU
"Aplicacións" MENU
"Gráficos" MENU
@@ -62,7 +62,7 @@
"X File Manager" EXEC xfm
"OffiX Files" EXEC files
"LyX" EXEC lyx
"Netscape" EXEC netscape
"Netscape" EXEC netscape
"Ghostview" EXEC ghostview
"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread
"TkDesk" EXEC tkdesk
@@ -116,7 +116,7 @@
"Fechar" EXEC xlock -allowroot -usefirst
"Grabar Area de traballo" EXEC SAVE_WORKSPACE
"Area Traballo" END
"Sair" MENU
"Reinicializar" RESTART
"Iniciar AfterStep" RESTART afterstep
+5 -5
View File
@@ -8,7 +8,7 @@
* <Title> is any string to be used as title. Must be enclosed with " if it
* has spaces
*
* <Command> one of the valid commands:
* <Command> one of the valid commands:
* MENU - starts (sub)menu definition
* OPEN_MENU - opens a menu from a file, pipe or directory(ies) contents
* and eventually precede each with a command.
@@ -45,7 +45,7 @@
* // it in current position
* OPEN_MENU file.menu
* 2. Pipe menu handling.
* // opens command and uses it's stdout to construct menu.
* // opens command and uses its stdout to construct menu.
* // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional.
* OPEN_MENU | command
@@ -101,7 +101,7 @@
"Process List" EXEC xterm -e top
"Manual Browser" EXEC xman
"עדימ" END
"XTerm" EXEC xterm -sb
"XTerm" EXEC xterm -sb
"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
"הדובע יבחרמ" WORKSPACE_MENU
"םימושי" MENU
@@ -114,7 +114,7 @@
"X File Manager" EXEC xfm
"OffiX Files" EXEC files
"LyX" EXEC lyx
"פייקסטנ" EXEC netscape
"פייקסטנ" EXEC netscape
"Ghostview" EXEC ghostview %a(Enter file to view)
"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)
"TkDesk" EXEC tkdesk
@@ -122,7 +122,7 @@
"םיכרוע" MENU
"XFte" EXEC xfte
"XEmacs" SHEXEC xemacs || emacs
"XJed" EXEC xjed
"XJed" EXEC xjed
"NEdit" EXEC nedit
"Xedit" EXEC xedit
"VI" EXEC xterm -e vi
+5 -5
View File
@@ -8,7 +8,7 @@
* <Title> is any string to be used as title. Must be enclosed with " if it
* has spaces
*
* <Command> one of the valid commands:
* <Command> one of the valid commands:
* MENU - starts (sub)menu definition
* OPEN_MENU - opens a menu from a file, pipe or directory(ies) contents
* and eventually precede each with a command.
@@ -45,7 +45,7 @@
* // it in current position
* OPEN_MENU file.menu
* 2. Pipe menu handling.
* // opens command and uses it's stdout to construct menu.
* // opens command and uses its stdout to construct menu.
* // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional.
* OPEN_MENU | command
@@ -102,7 +102,7 @@
"Lista procesa" EXEC xterm -e top
"Pretraživač manuala" EXEC xman
"Informacije" END
"XTerm u boji" EXEC nxterm -sb
"XTerm u boji" EXEC nxterm -sb
"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
"Xisp" EXEX xisp
"Radni prostori" WORKSPACE_MENU
@@ -116,7 +116,7 @@
"X File Manager" EXEC xfm
"OffiX Files" EXEC files
"LyX" EXEC lyx
"Netscape" EXEC netscape
"Netscape" EXEC netscape
"Ghostview" EXEC ghostview %a(Enter file to view)
"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)
"TkDesk" EXEC tkdesk
@@ -124,7 +124,7 @@
"Editori" MENU
"XFte" EXEC xfte
"XEmacs" SHEXEC xemacs || emacs
"XJed" EXEC xjed
"XJed" EXEC xjed
"NEdit" EXEC nedit
"Xedit" EXEC xedit
"VI" EXEC xterm -e vi
+7 -7
View File
@@ -3,7 +3,7 @@
* Verzio: 0.61
*
* Horvath Szabolcs <horvathsz@penguinpowered.com> - 2000. junius
* A 0.20.3-s verziohoz keszult forditast
* A 0.20.3-s verziohoz keszult forditast
* Prew (Csanaki Csaba <prew@mail.matav.hu>) keszitette. Koszonet erte!
*
* Szintakszis:
@@ -12,14 +12,14 @@
*
* <Title> egy szoveg, amelyet cimkent kell hasznalni. Ha tartalmaz space-t,
* akkor idezojelbe ("... ...") kell tenni.
*
*
* SHORTCUT meghataroz egy shortcut-ot adott programokra. <Shortcut>-nak
* ugyanolyan megadasi szintakszisa van a
* $HOME/GNUstep/Defaults/WindowMaker file-ban, mint a RootMenuKey
* vagy a MiniaturizeKey.
*
* Nem lehet letrehozni shortcut-ot MENU vagy OPEN_MENU bejegyzesben.
*
*
* <Parancs> az itt kovetkezo utasitasok valamelyike:
* MENU - kezdi a/az (al)menudefiniciot
* END - befejezi a/az (al)menudefiniciot
@@ -104,7 +104,7 @@
* "Style" OPEN_MENU style.menu
* "Teszt" END
*/
#include "wmmacros"
"Alkalmazások" MENU
@@ -117,7 +117,7 @@
"Kézikönyv böngésző" EXEC xman
"Infó" END
"Futtatás..." SHEXEC %a(Futtatás,Írd be a futtatni kívánt programot:)
"X Terminál" EXEC xterm -sb
"X Terminál" EXEC xterm -sb
"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
"Gnome terminál" EXEC gnome-terminal --background black --foreground white --font -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
"Munkafelületek" WORKSPACE_MENU
@@ -131,7 +131,7 @@
"X File Manager" EXEC xfm
"OffiX Files" EXEC files
"LyX" EXEC lyx
"Netscape" EXEC netscape
"Netscape" EXEC netscape
"Ghostview" EXEC ghostview %a(GhostView,Kérem a fájl nevét)
"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Kérem a PDF fájl nevét)
"TkDesk" EXEC tkdesk
@@ -139,7 +139,7 @@
"Szerkesztők" MENU
"XFte" EXEC xfte
"XEmacs" SHEXEC xemacs || emacs
"XJed" EXEC xjed
"XJed" EXEC xjed
"NEdit" EXEC nedit
"Xedit" EXEC xedit
"VI" EXEC xterm -e vi
+15 -40
View File
@@ -7,20 +7,20 @@
*
* <Title> is any string to be used as title. Must be enclosed with " if it
* has spaces
*
*
* SHORTCUT specifies a shortcut for that item. <Shortcut> has the
* same syntax of the shortcuts key options in the
* same syntax of the shortcuts key options in the
* $HOME/GNUstep/Defaults/WindowMaker file, such as RootMenuKey or MiniaturizeKey.
*
* You can't specify a shortcut for a MENU or OPEN_MENU entry.
*
* <Command> one of the valid commands:
*
* <Command> one of the valid commands:
* MENU - starts (sub)menu definition
* END - end (sub)menu definition
* OPEN_MENU - opens a menu from a file, pipe or directory(ies) contents
* and eventually precede each with a command.
* WORKSPACE_MENU - adds a submenu for workspace operations. Only one
* workspace_menu is allowed.
* workspace_menu is allowed.
* EXEC <program> - executes an external program
* SHEXEC <command> - executes a shell command (like gimp > /dev/null)
* EXIT - exits the window manager
@@ -74,6 +74,11 @@
* -noext strip whatever is after the last dot in the
* file name
*
* // Use #usergnusteppath# as a placeholder for the path to the user
* // GNUstep directory. Window Maker will replace this with the value
* // of WMAKER_USER_ROOT, if this environment variable is set, or
* // "~/GNUstep" otherwise
*
* <Parameters> is the program to execute.
*
* ** Options for command line in EXEC:
@@ -82,7 +87,7 @@
* optional prompt and do substitution with what you typed
* %w - substitute with XID for the current focused window
* %W - substitute with the number of the current workspace
*
*
* You can override special characters (as % and ") with the \ character:
* ex: xterm -T "\"Hello World\""
*
@@ -117,7 +122,7 @@
"Manual Browser" EXEC xman
"Info" END
"Run..." SHEXEC %a(Run,Type command to run:)
"XTerm" EXEC xterm -sb
"XTerm" EXEC xterm -sb
"Mozilla Firefox" EXEC firefox
"Workspaces" WORKSPACE_MENU
"Applications" MENU
@@ -132,12 +137,12 @@
"Spreadsheet" EXEC oocalc
"Draw" EXEC oodraw
"Impress" EXEC ooimpress
"OpenOffice.org" END
"OpenOffice.org" END
"Editors" MENU
"XEmacs" EXEC xemacs
"Emacs" EXEC emacs
"XJed" EXEC xjed
"XJed" EXEC xjed
"VI" EXEC xterm -e vi
"GVIM" EXEC gvim
"NEdit" EXEC nedit
@@ -179,37 +184,7 @@
"Lock" EXEC xlock -allowroot -usefirst
"Commands" END
"Appearance" MENU
"Themes" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
"Styles" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
"Icon Sets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
"Background" MENU
"Solid" MENU
"Black" WS_BACK '(solid, black)'
"Blue" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
"Bluemarine" WS_BACK '(solid, "#224477")'
"Purple" WS_BACK '(solid, "#554466")'
"Wheat" WS_BACK '(solid, "wheat4")'
"Dark Gray" WS_BACK '(solid, "#333340")'
"Wine" WS_BACK '(solid, "#400020")'
"Solid" END
"Gradient" MENU
"Sunset" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
"Sky" WS_BACK '(vgradient, blue4, white)'
"Blue Shades" WS_BACK '(vgradient, "#7080a5", "#101020")'
"Indigo Shades" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
"Purple Shades" WS_BACK '(vgradient, "#654c66", "#151426")'
"Wheat Shades" WS_BACK '(vgradient, "#a09060", "#302010")'
"Grey Shades" WS_BACK '(vgradient, "#636380", "#131318")'
"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
"Gradient" END
"Images" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
"Background" END
"Save Theme" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
"Save IconSet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
"Preferences Utility" EXEC #wprefs#
"Appearance" END
"Appearance" OPEN_MENU "appearance.menu"
"Session" MENU
"Save Session" SAVE_SESSION

Some files were not shown because too many files have changed in this diff Show More