gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-07-10 12:46:36 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: gryf/wmaker:6afa419b01b932800222e18b88eb12210eadc935
Branches Tags
gryf/wmaker:next gryf/wmaker:master gryf/wmaker:mynext gryf/wmaker:maximize-0.95.7
gryf/wmaker:wmaker-0.96.0 gryf/wmaker:wmaker-0.95.9 gryf/wmaker:wmaker-0.95.8 gryf/wmaker:wmaker-0.95.7 gryf/wmaker:wmaker-0.95.6 gryf/wmaker:wmaker-0.95.5 gryf/wmaker:wmaker-0.95.4 gryf/wmaker:wmaker-0.95.3 gryf/wmaker:wmaker-0.95.2 gryf/wmaker:wmaker-0.95.1 gryf/wmaker:wmaker-0.95.0-crm gryf/wmaker:wmaker-0.94.0-crm gryf/wmaker:wmaker-0.93.0-crm gryf/wmaker:wmaker-0.92.0+ gryf/wmaker:wmaker-0.92.0 gryf/wmaker:wmaker-0.91.0 gryf/wmaker:wmaker-0.90.0 gryf/wmaker:before.removing.legacy.support gryf/wmaker:before-xft2 gryf/wmaker:release-0.80.1 gryf/wmaker:release-0.80.0 gryf/wmaker:release-0.70.0 gryf/wmaker:release-0.65.0 gryf/wmaker:release-0.63.1 gryf/wmaker:release-0.63.0 gryf/wmaker:before.wrlib.deps gryf/wmaker:release-0.62.0 gryf/wmaker:wm-0.20.1
..
compare: gryf/wmaker:maximize-0.95.7
Branches Tags
gryf/wmaker:master gryf/wmaker:mynext gryf/wmaker:next gryf/wmaker:maximize-0.95.7
gryf/wmaker:wmaker-0.96.0 gryf/wmaker:wmaker-0.95.9 gryf/wmaker:wmaker-0.95.8 gryf/wmaker:wmaker-0.95.7 gryf/wmaker:wmaker-0.95.6 gryf/wmaker:wmaker-0.95.5 gryf/wmaker:wmaker-0.95.4 gryf/wmaker:wmaker-0.95.3 gryf/wmaker:wmaker-0.95.2 gryf/wmaker:wmaker-0.95.1 gryf/wmaker:wmaker-0.95.0-crm gryf/wmaker:wmaker-0.94.0-crm gryf/wmaker:wmaker-0.93.0-crm gryf/wmaker:wmaker-0.92.0+ gryf/wmaker:wmaker-0.92.0 gryf/wmaker:wmaker-0.91.0 gryf/wmaker:wmaker-0.90.0 gryf/wmaker:before.removing.legacy.support gryf/wmaker:before-xft2 gryf/wmaker:release-0.80.1 gryf/wmaker:release-0.80.0 gryf/wmaker:release-0.70.0 gryf/wmaker:release-0.65.0 gryf/wmaker:release-0.63.1 gryf/wmaker:release-0.63.0 gryf/wmaker:before.wrlib.deps gryf/wmaker:release-0.62.0 gryf/wmaker:wm-0.20.1

3 Commits
6afa419b01 .. maximize-0.95.7

Author SHA1 Message Date
gryf 02d2d0f2e3 Additional function for checking head 
Added function for checking head of certain location. This function is
used for determinig head bounduary.
 2017-01-16 21:25:17 +01:00
gryf 58561dc08a Fix for unmaximize. 
New way for traverse windows introduced an regression for maximize
toggle from keyboard. Bring the maximize toggle back.
 2017-01-16 21:05:45 +01:00
gryf 54aae6c062 Enabling moving window in cycles. 
WindowMaker have a Maximus feature expanded by ability to resize windows
to half screen (horizontally and vertically). Although, there was no way
to move windows between different heads (while screen is spanned between
different monitors - heads - if there was no xinerama used). This patch
enables possibility for moving windows between states. Assuming we have
a window on first head, maximize left would make the window occupy left
half of the screen. Assuming we have another head right of the first
head, following scenario will be possible:

- maximize right will make window occupy entire free space (just like
  ordinary maximizing will do)
- another maximize right will make window be maximized half right of the
  first screen
- another maximize right will make window be maximized half left on
  second screen
- another maximize right will make window be maximized on second screen
- another maximize right will make window be maximized half right on
  second screen
- another maximize right will make no effect

So it will cycle between half screen/fullscreen making window to travel
from left to right. Same goes for opposite direction.
 2017-01-15 21:07:07 +01:00
390 changed files with 10326 additions and 10522 deletions
Expand all files Collapse all files
.gitignore
-39
View File
@@ -87,50 +87,11 @@ WINGs/WUtil.pc
wrlib/libwraster.map
WindowMaker/appearance.menu
WindowMaker/menu
WindowMaker/menu.bg
WindowMaker/menu.fi
WindowMaker/menu.fy
WindowMaker/menu.hu
WindowMaker/menu.ko
WindowMaker/menu.nl
WindowMaker/menu.ro
WindowMaker/menu.sk
WindowMaker/menu.zh_TW
WindowMaker/plmenu
WindowMaker/plmenu.bg
WindowMaker/plmenu.es
WindowMaker/plmenu.fi
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
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
*~
.pc
BUGFORM
+1 -1
View File
@@ -4,7 +4,7 @@
If you find a bug please fill this form and send it to
wmaker-dev@googlegroups.com Please, USE THIS FORM!!!
wmaker-dev@lists.windowmaker.org Please, USE THIS FORM!!!
0. Before reporting this bug I already:
[ ] read the NEWS, README and INSTALL files
ChangeLog
+3 -140
View File
@@ -1,95 +1,3 @@
Changes since version 0.95.7:
.............................
- Build on Ubuntu 14.04
(Johann Haarhoff <johann@haarhoff.org.za>)
- Window Maker 0.95.7 Debian files
- create_appicon_from_dock checks if no_appicon flag is set
- New applications do not create Cached Icon
- Remove unused argument in save_appicon
- Avoid recreate Cached icon moving between docks
- Avoid create again a docked application cache icon
- save the icon filename instead the full path
- Remove cache icon when detached
- usermenu.c Avoid compiler warnings
- Enable usermenu
(Rodolfo García Peñas (kix) <kix@kix.es>)
- wmaker: fixed infinite loop in switching within group
(Satya Mishra <qufgmx@gmail.com>)
- wmaker: Print error dialog when attempting to delete an in-use workspace.
(Doug Torrance <dtorrance@piedmont.edu>)
- debian: Ignore missing documentation for --runstatedir.
- debian: Use dh_autoreconf.
- debian: Simplify debian/rules.
- debian: Fix typo occured. (Thanks, lintian.)
- debian: wmaker manpage moved from 1x to 1.
(Andreas Metzler <ametzler@bebt.de>)
- debian: Add wmiv to wmaker package.
- debian: Add version 0.95.6-1.2 entry to changelog.
- debian: Update with final version of 0.95.7-1 packaging.
- wmaker: Maintain sorting of windows by workspace in switch menu.
- debian: Update with version 0.95.7-2 packaging.
- wmaker: Update copyright years in info panel.
- wmaker: Remove prototype for unused get_right_position_on_screen function.
- wmaker: Fix typos (used codespell).
- wmaker: Add option for window snap to top edge to maximize to full screen.
- wmaker: Use window placement settings on other workspaces.
- wmaker: Add keyboard shortcuts for keeping window on top or at bottom.
- wmaker: Display keyboard shortcuts for remaining options in window menu.
- wmaker: Fix whitespace in menu.h; passes checkpatch.pl inspection.
- wmaker: Implement basic menu shading.
(Doug Torrance <dtorrance@piedmont.edu>)
- Translations: Dutch language files updated
- Translations: Frisian language files updated
(Alwin <translations@ziggo.nl>)
- wmlib: Add pkg-config file.
- wmlib: Remove install-exec-local target.
- WPrefs: Code formatting in TexturePanel.c; minimizes checkpatch.pl warnings.
- WPrefs: Add support for fpixmap ("fillscale") texture.
- check-doc: Ignore runstatedir in check-cmdline-options-doc.sh
- check-doc: Ignore with-aix-soname in check-cmdline-options-doc.sh
- debian: Remove 56_ignore_runstatedir.diff.
- debian: Update with version 0.95.7-3 packaging.
- debian: Update with version 0.95.7-4 packaging.
- debian: Update with version 0.95.7-5 packaging.
- debian: Update with version 0.95.7-6 packaging.
- wmmenugen: Fix segfault; argv[argc] doesn't exist.
(Doug Torrance <dtorrance@piedmont.edu>)
- getstyle: fix wcopy_file paths
(Alexandru Lazar <alazar@startmail.com>)
- wmaker: fix stacking order of dock and fullscreen
- wmaker: allow alt+tabbed windows over fullscreen
(Bjørn Mork <bjorn@mork.no>)
- WPrefs: Update path for Debian menu
- Use wprefs_bindir output variable to set WPrefs path in menus.
- Remove WindowMaker/mkMakefile script.
- Don't try and add removed file mkMakefile to distribution tarball.
- Look for plmenu in build directory when creating WMRootMenu.
- debian: Update with version 0.95.7-7 packaging.
- configure: Use PKG_PROG_PKG_CONFIG macro to allow cross building.
(Doug Torrance <dtorrance@piedmont.edu>)
- Trivial cleanup: Removed unused defines.
(Roman Dobosz <gryf73@gmail.com>)
- Added 'head' parameter to wMaximizeWindow
- Added wGetHeadRelativeToCurrentHead function
- Added option for ability to move half-maximized between heads.
- Added possibility for half-maximized windows to move across the screens.
- Fixed wrong (re)stored dimensions for unmaximized window.
(gryf <gryf73@gmail.com>)
- Bugfix for moving windows between heads.
- New option for enabling alternative half-maximized window movement.
- Alternative way for traversing half-maximized windows.
- New option for moving mouse pointer along with half-maximized windows.
- Implementation for moving mouse pointer within the maximized window.
- Refactoring handleMaximize() function
- Removed trailing whitespaces from readme files.
- Fixed couple of compilator warning and removed unused macros.
(Roman Dobosz <gryf73@gmail.com>)
- wmaker: Do not place icons under the dock
(Cyrus Rahman <crahman@gmail.com>)
- debian: Update with version 0.95.7-8 packaging.
(Doug Torrance <dtorrance@piedmont.edu>)
Changes since version 0.95.6:
.............................
@@ -488,51 +396,6 @@ Changes since version 0.95.6:
- debian: Import version 0.95.6-1.
- debian: Import version 0.95.6-1.1.
(Doug Torrance <dtorrance@monmouthcollege.edu>)
- Import of (partly outdated) Ukrainian translations.
(Martin Dietze <mdietze@gmail.com>)
- Add folder with fedora .spec file
(Alexey I. Froloff <raorn@raorn.name>)
- make: Add Ukrainian translation files to EXTRA_DIST.
- wmiv: Add long command line options --help and --version.
- wmiv: Improve help text.
- doc: Add manpage for wmiv.
(Doug Torrance <dtorrance@monmouthcollege.edu>)
- wmaker: replaced old email address with the official one
- WINGs: Updated news with the API changes that occured between 0.95.6 and
0.95.7
- WINGs: ran spell checker on the NEWS file
- WINGs: fix non-portable int conversion for printf in font panel size handling
- WRaster: fix unused variable warning when XShm extention is not enabled
(Christophe CURIS <christophe.curis@free.fr>)
- New translation into Frisian for Window Maker
(Alwin <translations@ziggo.nl>)
- wrlib: fixed gcc version needed for deprecated attribute support
- Configure: increased the version of Automake requested
(Christophe CURIS <christophe.curis@free.fr>)
- configure: Fix output of libdir directory in summary
(Josip Deanovic <djosip+news@linuxpages.net>)
- wmaker: fix detection of legacy Apercu configuration keywords
- WPrefs: fix conversion of old "Apercu" setting to the new keywords
(Christophe CURIS <christophe.curis@free.fr>)
- wmaker: Allow window snapping and linked workspaces simultaneously.
- wmaker: Allow configuration of window snapping detect distances.
- WPrefs: Add ability to set integer values in Expert panel
- WPrefs: Add snap edge and corner detect to Expert panel.
(Doug Torrance <dtorrance@monmouthcollege.edu>)
- Translations: Dutch updates for WPrefs
- Translations: Frisian updates for WPrefs
(Alwin <translations@ziggo.nl>)
- configure: fixed incorrect variable name that prevented --disable-xdnd to
work
(Rodolfo García Peñas (kix) <kix@kix.es>)
- Revert "wmaker: fix clearing of window attribute that was not saved properly"
- Disable pager by default
(Carlos R. Mafra <crmafra@gmail.com>)
- Allow using keypad Enter to commit move/resize
- Allow using numpad Enter key in dialogs for confirmation
(Amadeusz Sławiński <amade@asmblr.net>)
- Window Maker 0.95.7
(Carlos R. Mafra <crmafra@gmail.com>)
Changes since version 0.95.5:
@@ -4063,7 +3926,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 its icon in the .app
- if the app is a .app, it will try to find it's 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
@@ -4934,7 +4797,7 @@ 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 its own)
- added a Dock (not for GNUstep, as it will have it's own)
Changes since version 0.3.1:
............................
@@ -4964,7 +4827,7 @@ it's opened to select items, just drag the pointer
- 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, its owner always get the focus
- when transient is closed, it's 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
FAQ
+3 -3
View File
@@ -333,7 +333,7 @@ Window Maker distribution.
The author Anthony Quinn <southgat@frontiernet.net> has released a
version that works with Window Maker >= 0.15.x. It is available from
its home page at http://www.frontiernet.net/~southgat/wmsound/
it's home page at http://www.frontiernet.net/~southgat/wmsound/
or on Largo's site at http://wm.current.nu/files.html#wmsound
for your convenience.
@@ -352,7 +352,7 @@ GNOME application they have no title bar" below.
To use it with CDE, read the answer for "How do I switch
CDE's window manager to use Window Maker?"
To use it with KDE, read its documentation to get rid of kwm (and possibly
To use it with KDE, read it's documentation to get rid of kwm (and possibly
kpanel) and replace it with wmaker. Then, start WPrefs.app, go to "Mouse
Preferences" and set the "Disable mouse actions" check box. You will
need to restart Window Maker to make this change take effect. The
@@ -1283,7 +1283,7 @@ WM_NORMAL_HINTS(WM_SIZE_HINTS):
user specified size: 400 by 300
program specified minimum size: 400 by 300
Now, when scilab opens its window, Window Maker nicely does exactly what it
Now, when scilab opens it's window, Window Maker nicely does exactly what it
is told, that is, map the window at position 136679205, 1074468360 which
obviously falls outside the screen no matter how big is your monitor ;)
Makefile.am
+4 -33
View File
@@ -21,8 +21,8 @@ config-paths.h: Makefile
@echo '/* where shared data is stored */' >> $@
@echo '#define PKGDATADIR "$(datadir)/WindowMaker"' >> $@
@echo '' >> $@
@echo '/* where the global defaults are stored */' >> $@
@echo '#define DEFSDATADIR "$(defsdatadir)"' >> $@
@echo '/* where the configuration is stored */' >> $@
@echo '#define SYSCONFDIR "$(sysconfdir)"' >> $@
ACLOCAL_AMFLAGS = -I m4
@@ -41,13 +41,11 @@ 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-generated-content.sh
script/replace-ac-keywords.sh
.PHONY: coverage-reset coverage
@@ -64,10 +62,6 @@ 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
@@ -86,34 +80,13 @@ if HAVE_XGETTEXT
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) update-lang || exit $$?); \
done
SUBDIRS_PO = wrlib/po WINGs/po po util/po WPrefs.app/po
SUBDIRS_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))
@@ -133,8 +106,6 @@ configure-documentation:
--ignore-prg 'enable-shared,enable-static # should be in INSTALL' \
--ignore-prg 'disable-option-checking,enable-fast-install # should be in INSTALL' \
--ignore-prg 'disable-libtool-lock,with-pic,with-gnu-ld,with-sysroot # for libtool' \
--ignore-prg 'runstatedir #new in autoconf 2.70, backported in Debian' \
--ignore-prg 'with-aix-soname #new in libtool 2.4.4' \
--ignore-prg 'with-x # no use, it would not work without X'
.PHONY: configure-documentation
NEWS
+4 -258
View File
@@ -1,261 +1,7 @@
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
-----------------------------------
Implementation for moving mouse pointer within the maximized window.
Mouse pointer can be now moved together with window if keyboard was used for
arrange maximized windows on screen. This feature can be turned on in WPrefs.app
in Expert tab by selecting "Move mouse pointer with half maximized windows.", or
setting "PointerWithHalfMaxWindows" to "Yes" on ~/GNUstep/Defaults/WindowMaker
file.
Alternative way for traverse half-maximized windows
---------------------------------------------------
For now, there could be three possible state of the window while using
half-maximized feature. Unmaximized window have its state saved during that
process, which was use to unmaximize it. For example, if there is a window,
which is maximized on the half left side of the screen, and while requesting
left-half-maximized, it become unmaximized with size and dimension restored to
original state.
By setting "AlternativeHalfMaximized" option to "Yes"
~/GNUstep/Defaults/WindowMaker config file (or by using WPrefs.app and option
"Alternative transitions between states for half maximized windows."), there
would be slightly different change in window "traverse". Given layout depicted
below:
┌┬────────────────────┬┐
├┘ ┌───────┐ ├┤
│ ├───────┤ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ └───────┘ └┤
├┬┐ │
└┴┴────────────────────┘
Window can be moved using keyboard shortcut right-half-maximize:
┌┬─────────┬──────────┬┐
├┘ ├──────────┼┤
│ │ ├┤
│ │ ├┤
│ │ ├┤
│ │ ├┤
├┬┐ └──────────┘│
└┴┴────────────────────┘
Further invoking right-half-maximize will do nothing. Note, that window always
can be unmaximzied using appropriate keyboard shortcut or by selecting
"Unmaximize" from window menu.
Going to opposite direction by invoking left-half-maximize, will make the window
maximized in both, vertical and horizontal directions:
┌─────────────────────┬┐
├─────────────────────┼┤
│ ├┤
│ ├┤
│ ├┤
│ ├┤
├┬┬───────────────────┘│
└┴┴────────────────────┘
Further invoking left-half-maximize, will make the window maximized in half left
side od the screen:
┌──────────┬──────────┬┐
├──────────┤ ├┤
│ │ ├┤
│ │ ├┤
│ │ ├┤
│ │ └┤
├┬┬────────┘ │
└┴┴────────────────────┘
And again, further invoking left-half-maximize, will do nothing in this mode.
This change affects all possible half-maximized window state also quarters.
Issuing bottom-left-corner will take lower left quarter of the screen (nothing
is new so far):
┌┬────────────────────┬┐
├┘ ├┤
│ ├┤
├──────────┐ ├┤
├──────────┤ ├┤
│ │ └┤
├┬┬────────┘ │
└┴┴────────────────────┘
Issuing bottom-right-corner again will change window state to bottom half
maximized:
┌┬────────────────────┬┐
├┘ ├┤
│ ├┤
├─────────────────────┼┤
├─────────────────────┼┤
│ ├┤
├┬┬───────────────────┘│
└┴┴────────────────────┘
Invoking bottom-right-corner again:
┌┬────────────────────┬┐
├┘ ├┤
│ ├┤
│ ┌──────────┼┤
│ ├──────────┼┤
│ │ ├┤
├┬┐ └──────────┘│
└┴┴────────────────────┘
Issuing bottom-right-corner again will have no effect.
Move half-maximized windows between the screens
-----------------------------------------------
New option was introduced to allow change of behaviour of half-maximize windows
in multiple displays environment. In such environment it is more natural that
half maximized windows would travel from one screen to another. Now it is
possible to make that happen by setting an option
"MoveHalfMaximizedWindowsBetweenScreens" to "Yes" in
~/GNUstep/Defaults/WindowMaker config file, or by checking "Allow move
half-maximized windows between multiple screens." in 'Expert User Preferences"
tab in WPrefs.app.
For example, given there are two screens in layout where one display is on the
left and second display is on the right with window on first screen:
┌┬────────────────┬─────────────────┬┐
├┘ ┌───────┐ │ ├┤
│ ├───────┤ │ ├┤
│ │ │ │ ├┤
│ │ │ │ ├┤
│ └───────┘ │ └┤
├┬┐ ├┬┬┐ │
└┴┴───────────────┴┴┴┴───────────────┘
It can be right-half-maximized (using previously defined key combination), so it
become:
┌┬───────┬────────┬─────────────────┬┐
├┘ ├────────┤ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ └┤
├┬┐ └────────┼┬┬┐ │
└┴┴───────────────┴┴┴┴───────────────┘
In this example there is an assumption that WindowMaker is configured, that
maximized windows wont cover mini icons nor dock.
Without setting new option to true, issuing another right-half-maximize will
restore window dimensions and position to the original state (like on the first
figure). With new option set to true it will move window to second screen like:
┌┬────────────────┬────────┬────────┬┐
├┘ ├────────┤ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ └┤
├┬┐ ├┬┬┬─────┘ │
└┴┴───────────────┴┴┴┴───────────────┘
Another activation of right-half-maxmimize:
┌┬────────────────┬────────┬────────┬┐
├┘ │ ├────────┼┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ │ │ ├┤
├┬┐ ├┬┬┐ └────────┘│
└┴┴───────────────┴┴┴┴───────────────┘
And final activation of right-half-maxmimize:
┌┬────────────────┬───────┬─────────┬┐
├┘ ├───────┤ ├┤
│ │ │ ├┤
│ │ │ ├┤
│ ├───────┘ ├┤
│ │ └┤
├┬┐ ├┬┬┐ │
└┴┴───────────────┴┴┴┴───────────────┘
Where window is restored its size (but not position, since it it on different
head now). Moving window in directions like left-half-maximize,
top-half-maximize and bottom-half-maximize will behave in similar way depending
on the layout of displays.
Note, that only windows that are half-maximized vertically or horizontally can
be moved to another screen due to the fact, that direction of movement of
quarter-maximized windows is ambiguous. As for vertical/horizontal-maximize,
since doesn't move the window but only stretch it vertically/horizontally this
feature also doesn't apply.
Snapping a window to the top
----------------------------
You can now choose whether snapping a window to the top edge of the screen
maximizes it to the top half (the previous and default behavior) or to the
full screen by setting "SnapToTopMaximizesFullscreen" to "NO" or "YES",
respectively. This setting can also be changed by unchecking or checking
"Snapping a window to the top maximizes it to the full screen" in the
"Expert User Preferences" tab in WPrefs.app.
Global defaults directory configuration
---------------------------------------
You can now configure the global defaults directory, where the system
WindowMaker, WMRootMenu, etc. files are stored, by running
./configure --with-defsdatadir=/path/to/defaults
at build time. The previous method, which only partially worked, involved
defining the GLOBAL_DEFAULTS_SUBDIR macro. This is no longer available.
Note that the default location is ${sysconfdir}/WindowMaker.
-- 0.95.7
Window snapping
@@ -1643,7 +1389,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 its area. Setting AUTO_RAISE_DELAY to a very
soon as the mouse pointer enters it's 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.
@@ -2572,7 +2318,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 its stdout to construct menu.
// opens command and uses it's stdout to construct menu.
// Command's output must be a valid menu description.
OPEN_MENU | command
3. Directory handling.
@@ -3175,7 +2921,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 its key to Dock. For example, if your WMDock
file in WMState and set it's key to Dock. For example, if your WMDock
contains:
{
README
+5 -5
View File
@@ -129,8 +129,8 @@ HELP ME!!!
==========
There is a mailing list for discussing Window Maker at
wmaker-user@googlegroups.com. To subscribe to it, visit
https://groups.google.com/forum/#!forum/wmaker-user
wmaker-user@lists.windowmaker.org To subscribe to it, send a message to
wmaker-user-subscribe@lists.windowmaker.org
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 its
same time. You might get unexpected behavior when Window Maker updates it's
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 its value to a value like the number of different icons you
memory usage, set it's 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@googlegroups.com
to wmaker-dev@lists.windowmaker.org
The-perfect-Window-Maker-patch.txt
+2 -2
View File
@@ -134,7 +134,7 @@ Sending the patch to the mailing list
Send your patches to:
wmaker-dev@googlegroups.com
wmaker-dev@lists.windowmaker.org
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@googlegroups.com>"
git config sendemail.to "Window Maker Devel <wmaker-dev@lists.windowmaker.org>"
# If you're sending more than 1 patch, you may be interested in having an
# introduction mail for the batch:
WINGs/Examples/Makefile.am
+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 \
@XFT_LIBS@ @INTLIBS@ @XLIBS@
@XFTLIBS@ @INTLIBS@ @XLIBS@
colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
WINGs/Extras/Makefile.am
+1 -1
View File
@@ -25,6 +25,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWUtil.la \
@XFT_LIBS@ @INTLIBS@
@XFTLIBS@ @INTLIBS@
test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
WINGs/Makefile.am
+8 -7
View File
@@ -8,11 +8,13 @@ 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@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@
libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
libWUtil_la_LIBADD = @LIBBSD@
EXTRA_DIST = BUGS make-rgb Examples Extras Tests
@@ -87,12 +89,11 @@ libWUtil_la_SOURCES = \
wutil.c
AM_CFLAGS = @PANGO_CFLAGS@
AM_CFLAGS =
AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
-I$(top_srcdir)/WINGs/WINGs -I$(top_builddir)/WINGs/WINGs \
-I$(top_builddir)/wrlib -I$(top_srcdir)/src \
@XFT_CFLAGS@ @HEADER_SEARCH_PATH@
-I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
@XFTFLAGS@ @HEADER_SEARCH_PATH@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WINGs.pc WUtil.pc
@@ -106,8 +107,8 @@ WINGs.pc: Makefile
@echo 'Version: $(VERSION)' >> $@
@echo 'Requires: wrlib WUtil' >> $@
@echo 'Libs: $(lib_search_path) -lWINGs' >> $@
@echo 'Libs.private: $(XFT_LIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
@echo 'Cflags: $(inc_search_path) @PANGO_CFLAGS@' >> $@
@echo 'Libs.private: $(XFTLIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
@echo 'Cflags: $(inc_search_path)' >> $@
WUtil.pc: Makefile
@echo "Generating $@"
WINGs/README
+6 -6
View File
@@ -8,25 +8,25 @@
kojima@windowmaker.info
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
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
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 its design is a little sloppy,
The library is limited and it's 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 its limitations, although you'll probably be able to
workaround some of it's limitations, although you'll probably be able to
write something like a trivial tic-tac-toe game without knowing much Xlib.
Some of its functions are designed to support the Window Maker window
manager (see http://windowmaker.info) In fact, its primary role is to
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
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
WINGs/Tests/Makefile.am
+2 -2
View File
@@ -6,7 +6,7 @@ noinst_PROGRAMS = wtest wmquery wmfile testmywidget
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWUtil.la \
@XFT_LIBS@ @INTLIBS@ @XLIBS@
@XFTLIBS@ @INTLIBS@ @XLIBS@
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
@@ -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\" @XFT_CFLAGS@ @HEADER_SEARCH_PATH@
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
WINGs/WINGs/Makefile.am
+1 -11
View File
@@ -5,14 +5,4 @@ AUTOMAKE_OPTIONS =
# is this a kluge? if so, how should i do it?
includedir = @includedir@/WINGs
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 $@ $<
include_HEADERS = WINGs.h WUtil.h WINGsP.h
WINGs/WINGs/WINGs.h
-9
View File
@@ -795,8 +795,6 @@ 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);
@@ -1841,17 +1839,10 @@ 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,
WINGs/WINGs/WINGsP.h.in → WINGs/WINGs/WINGsP.h
+6 -2
View File
@@ -5,7 +5,9 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@USE_PANGO@#include <pango/pango.h>
#ifdef USE_PANGO
#include <pango/pango.h>
#endif
#include <WINGs/WINGs.h>
@@ -457,7 +459,9 @@ typedef struct W_Font {
short refCount;
char *name;
@USE_PANGO@ PangoLayout *layout;
#ifdef USE_PANGO
PangoLayout *layout;
#endif
} W_Font;
#define W_FONTID(f) (f)->font->fid
WINGs/WINGs/WUtil.h
-10
View File
@@ -193,16 +193,6 @@ 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 ]-------------------------------------------------- */
WINGs/get-wings-flags
Executable
+33
View File
@@ -0,0 +1,33 @@
#!/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
WINGs/get-wutil-flags
Executable
+33
View File
@@ -0,0 +1,33 @@
#!/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
WINGs/memory.c
+1 -2
View File
@@ -107,8 +107,7 @@ void *wmalloc(size_t size)
}
}
}
if (tmp != NULL)
memset(tmp, 0, size);
memset(tmp, 0, size);
return tmp;
}
WINGs/po/fy.po
+72 -33
View File
@@ -1,14 +1,14 @@
# Translation into Western Frisian for Window Maker
# Copyright (C) 2015-2016 Window Maker Developers Team
# Copyright (C) 2015 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.6+\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-21 16:19+0100\n"
"PO-Revision-Date: 2016-01-21 00:00+0000\n"
"POT-Creation-Date: 2015-06-14 16:10+0200\n"
"PO-Revision-Date: 2015-06-14 00:00+0000\n"
"Last-Translator: Alwin <translations@ziggo.nl>\n"
"Language-Team: Western Frisian\n"
"Language: fy\n"
@@ -99,7 +99,7 @@ msgstr "foartidich bestânsein, ferwachte in nije rigel nei '\\'"
#, c-format
msgid "reached end of file while searching '*/' for comment started at line %d"
msgstr ""
"bestânsein berikt by sykjen nei '*/' foar kommentaar begûnen op rigel %d"
"bestânsein berikt by sykje nei '*/' foar kommentaar begûnen op rigel %d"
#: ../../WINGs/menuparser.c:344
msgid "missing closing double-quote before end-of-line"
@@ -111,7 +111,7 @@ msgstr "ûntbrekkend slutend inkeld oanhelteken foar rigelein"
#: ../../WINGs/menuparser.c:380
msgid "too many nested macro expansions, breaking loop"
msgstr "te folle neske makro-útwurkingen, syklus ôfbrutsen"
msgstr "te folle neste makro-útwurkingen, syklus ôfbrutsen"
#: ../../WINGs/menuparser.c:439
#, c-format
@@ -140,7 +140,7 @@ msgstr "ûntbrekkende slutende '%c' yn bestânsnammeopjefte"
#: ../../WINGs/menuparser.c:503
msgid "too many nested #include's"
msgstr "te folle neske #include's"
msgstr "te folle neste #include's"
#: ../../WINGs/menuparser.c:568
#, c-format
@@ -150,11 +150,11 @@ msgstr "koe bestân \"%s\" net fine foar #include"
#: ../../WINGs/menuparser.c:589
#, c-format
msgid "missing macro name argument to #%s"
msgstr "ûntbrekkend makronamme-argumint by #%s"
msgstr "ûntbrekkend makronammeargumint by #%s"
#: ../../WINGs/menuparser.c:600
msgid "too many nested #if sequences"
msgstr "te folle neske #if-rigen"
msgstr "te folle neste #if-rigen"
#: ../../WINGs/menuparser.c:626 ../../WINGs/menuparser.c:643
#, c-format
@@ -168,7 +168,7 @@ msgstr "gjin makronamme fûn foar #define"
#: ../../WINGs/menuparser_macros.c:187
#, c-format
msgid "premature end of file while reading arg-list for macro \"%s\""
msgstr "foartidich bestânsein by ynlêzen arg.-list foar makro \"%s\""
msgstr "foartidich bestânsein by ynlêze arg.-list foar makro \"%s\""
#: ../../WINGs/menuparser_macros.c:194
#, c-format
@@ -196,7 +196,7 @@ msgstr ""
#: ../../WINGs/menuparser_macros.c:253
#, c-format
msgid "macro \"%s\" already defined, ignoring redefinition"
msgstr "makro \"%s\" al definiearre, negearret werdefiniearjen"
msgstr "makro \"%s\" al definiearre, negearret werdefiniearje"
#: ../../WINGs/menuparser_macros.c:346
#, c-format
@@ -225,7 +225,7 @@ msgstr "te folle arguminten foar makro \"%s\", ferwachte allinnich %d"
#: ../../WINGs/menuparser_macros.c:530
#, c-format
msgid "premature end of line while searching for arguments to macro \"%s\""
msgstr "foartidich rigelein by sykjen nei arguminten by makro \"%s\""
msgstr "foartidich rigelein by sykje nei arguminten by makro \"%s\""
#: ../../WINGs/menuparser_macros.c:536
#, c-format
@@ -345,7 +345,7 @@ msgstr "koe grutte foar bestân '%s' net krije"
#: ../../WINGs/proplist.c:1531
#, c-format
msgid "error reading from file '%s'"
msgstr "flater by ynlêzen bestân '%s'"
msgstr "flater by ynlêze bestân '%s'"
#: ../../WINGs/proplist.c:1578
#, c-format
@@ -355,32 +355,32 @@ msgstr "%s:koe menubestân net iepenje"
#: ../../WINGs/proplist.c:1660
#, c-format
msgid "mkstemp (%s) failed"
msgstr "oanmeitsjen unyk tydlik bestân (%s) mislearre"
msgstr "oanmeitsje unyk tydlik bestân (%s) mislearre"
#: ../../WINGs/proplist.c:1670
#, c-format
msgid "mktemp (%s) failed"
msgstr "oanmeitsjen tydlik bestân (%s) mislearre"
msgstr "oanmeitsje tydlik bestân (%s) mislearre"
#: ../../WINGs/proplist.c:1677
#, c-format
msgid "open (%s) failed"
msgstr "iepenjen (%s) mislearre"
msgstr "iepenje (%s) mislearre"
#: ../../WINGs/proplist.c:1684
#, c-format
msgid "writing to file: %s failed"
msgstr "skriuwen nei bestân: %s mislearre"
msgstr "skriuwe nei bestân: %s mislearre"
#: ../../WINGs/proplist.c:1693
#, c-format
msgid "fclose (%s) failed"
msgstr "ôfsluten stream (%s) mislearre"
msgstr "ôfslute stream (%s) mislearre"
#: ../../WINGs/proplist.c:1701
#, c-format
msgid "rename ('%s' to '%s') failed"
msgstr "omneamen ('%s' nei '%s') mislearre"
msgstr "omneame ('%s' nei '%s') mislearre"
#: ../../WINGs/proplist.c:1772
#, c-format
@@ -388,14 +388,14 @@ msgid "Could not create component %s"
msgstr "Koe komponint %s net oanmeitsje"
#: ../../WINGs/userdefaults.c:72
msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
msgstr "fariabele WMAKER_USER_ROOT, definiearre mei ûnjildich paad, net brûkt"
msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
msgstr "fariabele GNUSTEP_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
#, c-format
msgid "cannot read domain from file '%s' when syncing"
msgstr "kin domeinbestân '%s' net ynlêze by syngronisearjen"
msgstr "kin domeinbestân '%s' net ynlêze by syngronisearje"
#: ../../WINGs/dragcommon.c:60
#, c-format
@@ -414,11 +414,11 @@ msgstr "net-stipe ferzje %i foar XDND-berjocht by binnen gean"
#: ../../WINGs/dragsource.c:163
msgid "XDND selection lost during drag operation..."
msgstr "XDND-seleksje ferlern ûnder fersleephanneling..."
msgstr "XDND-seleksje ferlern by fersleephanneling..."
#: ../../WINGs/dragsource.c:758
msgid "could not get XDND version for target of drop"
msgstr "koe XDND-ferzje net krije foar doel fan ferslepen"
msgstr "koe XDND-ferzje net krije foar doel fan ferslepe"
#: ../../WINGs/dragsource.c:774
msgid "could not get ownership of XDND selection"
@@ -456,7 +456,7 @@ msgstr "Kleuren"
#: ../../WINGs/wcolorpanel.c:568 ../../WINGs/wcolorpanel.c:2720
msgid "Brightness"
msgstr "Helderens"
msgstr "Helderheid"
#: ../../WINGs/wcolorpanel.c:570 ../../WINGs/wcolorpanel.c:644
#: ../../WINGs/wcolorpanel.c:675 ../../WINGs/wcolorpanel.c:706
@@ -558,7 +558,7 @@ msgstr "Nij..."
msgid ""
"Color Panel: Could not create directory %s needed to store configurations"
msgstr ""
"Kleurepaniel: Koe map %s, nedich om ynstellingen te bewarjen, net oanmeitsje"
"Kleurepaniel: Koe map %s, nedich om ynstellingen te bewarje, net oanmeitsje"
#. Delete the file, it doesn't belong here
#: ../../WINGs/wcolorpanel.c:1176 ../../WINGs/wcolorpanel.c:3073
@@ -568,7 +568,7 @@ msgstr "Bestânsflater"
#: ../../WINGs/wcolorpanel.c:1177
msgid "Could not create ColorPanel configuration directory"
msgstr "Koe ynstellingemap Kleurepaniel net oanmeitsje"
msgstr "Koe ynstellingenmap Kleurepaniel net oanmeitsje"
#: ../../WINGs/wcolorpanel.c:1178 ../../WINGs/wcolorpanel.c:3074
#: ../../WINGs/wcolorpanel.c:3079 ../../WINGs/wcolorpanel.c:3104
@@ -593,7 +593,7 @@ msgstr "Fersêding"
#: ../../WINGs/wcolorpanel.c:2788
msgid "Hue"
msgstr "Tint"
msgstr "Tinte"
#: ../../WINGs/wcolorpanel.c:3012
msgid "Open Palette"
@@ -610,7 +610,7 @@ msgstr "kin bestân %s net ferwiderje"
#: ../../WINGs/wcolorpanel.c:3078
msgid "Couldn't remove file from Configuration Directory !"
msgstr "Koe bestân net ferwiderje út ynstellingemap!"
msgstr "Koe bestân net ferwiderje út ynstellingenmap!"
#: ../../WINGs/wcolorpanel.c:3103
msgid "Rename"
@@ -737,12 +737,12 @@ msgstr "Bestân"
#: ../../WINGs/wfilepanel.c:719
#, c-format
msgid "Removing %s failed: %s"
msgstr "Ferwiderjen %s mislearre: %s"
msgstr "Ferwiderje %s mislearre: %s"
#: ../../WINGs/wfilepanel.c:751
#, c-format
msgid "An error occurred browsing '%s'."
msgstr "Der trede in flater op by blêdzjen troch '%s'."
msgstr "Der trede in flater op by blêdzje troch '%s'."
#: ../../WINGs/wfilepanel.c:754
#, c-format
@@ -799,7 +799,7 @@ msgstr "Koe biblioteek 'lettertype ynstelle' net inisjalisearje\n"
#: ../../WINGs/widgets.c:446
#, c-format
msgid "WINGs: could not load widget images file: %s"
msgstr "WINGs: Koe ôfbyldingebestân bestjoeringseleminten net lade: %s"
msgstr "WINGs: Koe ôfbyldingenbestân bestjoeringseleminten net lade: %s"
#: ../../WINGs/widgets.c:542
#, c-format
@@ -824,7 +824,7 @@ msgstr "0 inch"
#: ../../WINGs/wtextfield.c:494
msgid "only left alignment is supported in textfields"
msgstr "allinnich lofts rjochtsjen wurdt stipe yn tekstfjilden"
msgstr "allinnich lofts rjochtsje wurdt stipe yn tekstfjilden"
#: ../../WINGs/wwindow.c:160
msgid "window title conversion error... using STRING encoding"
@@ -833,3 +833,42 @@ msgstr "finstertitelomsettingsflater... brûkt STRING-kodearring"
#: ../../WINGs/wwindow.c:181
msgid "icon title conversion error... using STRING encoding"
msgstr "ikoantitelomsettingsflater... brûkt STRING-kodearring"
# Keep next entries for wmaker-0.95.6
msgid "Could not open input file \"%s\""
msgstr "Koe ynfierbestân \"%s\" net iepenje"
msgid "Could not create target file \"%s\""
msgstr "Koe doelbestân \"%s\" net oanmeitsje"
msgid "An error occured browsing '%s'."
msgstr "Der trede in flater op by blêdzje troch '%s'."
msgid ""
"invalid characted '%c' in arg-list for macro \"%s\" while expecting "
"parameter name"
msgstr ""
"ûnjildich letterteken '%c' yn arg.-list foar makro \"%s\", ferwachte "
"parameternamme"
msgid ""
"invalid characted '%c' in arg-list for macro \"%s\" while expecting ',' "
"or ')'"
msgstr ""
"ûnjildich letterteken '%c' yn arg.-list foar makro \"%s\", ferwachte ',' "
"of ')'"
msgid "unknow directive '#%s'"
msgstr "ûnbekende oanwizing '#%s'"
msgid "found #%s but have no matching #if"
msgstr "#%s fûn, mar hat gjin bybehearrende #if"
msgid "too many nested includes"
msgstr "te folle neste #include's"
msgid "could not find file \"%s\" for include"
msgstr "koe bestân \"%s\" net fine foar #include"
msgid "too many nested macro expansion, breaking loop"
msgstr "te folle neste makro-útwurkingen, syklus ôfbrutsen"
WINGs/po/hu.po
+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 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"
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"
#. something happened with the file. just overwrite it
#: ../../../wmaker-crm/WINGs/userdefaults.c:196
WINGs/po/nl.po
+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 WMAKER_USER_ROOT defined with invalid path, not used"
msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
msgstr ""
"variabele WMAKER_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt"
"variabele GNUSTEP_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt"
#. something happened with the file. just overwrite it
#: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225
WINGs/proplist.c
+8 -21
View File
@@ -1253,34 +1253,22 @@ int WMGetPropListItemCount(WMPropList * plist)
Bool WMIsPLString(WMPropList * plist)
{
if (plist)
return (plist->type == WPLString);
else
return False;
return (plist->type == WPLString);
}
Bool WMIsPLData(WMPropList * plist)
{
if (plist)
return (plist->type == WPLData);
else
return False;
return (plist->type == WPLData);
}
Bool WMIsPLArray(WMPropList * plist)
{
if (plist)
return (plist->type == WPLArray);
else
return False;
return (plist->type == WPLArray);
}
Bool WMIsPLDictionary(WMPropList * plist)
{
if (plist)
return (plist->type == WPLDictionary);
else
return False;
return (plist->type == WPLDictionary);
}
Bool WMIsPropListEqualTo(WMPropList * plist, WMPropList * other)
@@ -1695,7 +1683,6 @@ 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;
}
@@ -1732,7 +1719,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 $WMAKER_USER_ROOT
* refuses to create anything outside $GNUSTEP_USER_ROOT
*
* returns 1 on success, 0 on failure
*/
@@ -1743,7 +1730,7 @@ int wmkdirhier(const char *path)
size_t p, plen;
struct stat st;
/* Only create directories under $WMAKER_USER_ROOT */
/* Only create directories under $GNUSTEP_USER_ROOT */
if ((t = wusergnusteppath()) == NULL)
return 0;
if (strncmp(path, t, strlen(t)) != 0)
@@ -1824,7 +1811,7 @@ static int wrmdirhier_fn(const char *path, const struct stat *st,
/*
* remove a directory hierarchy
*
* refuses to remove anything outside $WMAKER_USER_ROOT
* refuses to remove anything outside $GNUSTEP_USER_ROOT
*
* returns 1 on success, 0 on failure
*
@@ -1838,7 +1825,7 @@ int wrmdirhier(const char *path)
int error;
const char *t;
/* Only remove directories under $WMAKER_USER_ROOT */
/* Only remove directories under $GNUSTEP_USER_ROOT */
if ((t = wusergnusteppath()) == NULL)
return EPERM;
if (strncmp(path, t, strlen(t)) != 0)
WINGs/selection.c
+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, (void *) XFree);
wdata = WMCreateDataWithBytesNoCopy(data, len * bpi, (WMFreeDataProc *) XFree);
WMSetDataFormat(wdata, bits);
return wdata;
WINGs/userdefaults.c
+8 -5
View File
@@ -59,9 +59,9 @@ const char *wusergnusteppath()
return path;
#ifdef HAVE_SECURE_GETENV
gspath = secure_getenv("WMAKER_USER_ROOT");
gspath = secure_getenv("GNUSTEP_USER_ROOT");
#else
gspath = getenv("WMAKER_USER_ROOT");
gspath = getenv("GNUSTEP_USER_ROOT");
#endif
if (gspath) {
gspath = wexpandpath(gspath);
@@ -69,7 +69,7 @@ const char *wusergnusteppath()
path = gspath;
return path;
}
wwarning(_("variable WMAKER_USER_ROOT defined with invalid path, not used"));
wwarning(_("variable GNUSTEP_USER_ROOT defined with invalid path, not used"));
}
h = wgethomedir();
@@ -103,14 +103,17 @@ char *wdefaultspathfordomain(const char *domain)
}
/* XXX: doesn't quite belong to *user*defaults.c */
#ifndef GLOBAL_DEFAULTS_SUBDIR
#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
#endif
char *wglobaldefaultspathfordomain(const char *domain)
{
char *t = NULL;
size_t len;
len = strlen(DEFSDATADIR) + strlen(domain) + 2;
len = strlen( SYSCONFDIR ) + strlen( GLOBAL_DEFAULTS_SUBDIR ) + strlen(domain) + 3;
t = wmalloc(len);
snprintf(t, len, "%s/%s", DEFSDATADIR, domain);
snprintf(t, len, "%s/%s/%s", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR, domain);
return t;
}
WINGs/wapplication.c
+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
* - WMAKER_USER_ROOT/Applications/ApplicationName.app/ext
* - GNUSTEP_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("WMAKER_USER_ROOT"), appdir, ext, resource);
path = checkFile(getenv("GNUSTEP_USER_ROOT"), appdir, ext, resource);
if (path)
goto out;
WINGs/wcolorpanel.c
+12 -18
View File
@@ -67,6 +67,9 @@ static unsigned char Cursor_bits[] = {
0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x70
};
/* Cursor shape-mask */
#define Cursor_shape_width 32
#define Cursor_shape_height 32
static unsigned char Cursor_shape_bits[] = {
0x00, 0x7e, 0x00, 0x00, 0xc0, 0x81, 0x03, 0x00, 0x20, 0x00, 0x04, 0x00, 0x10, 0x00, 0x08,
0x00, 0x08, 0x00, 0x10, 0x00, 0x04, 0x00, 0x20, 0x00, 0x02, 0x00, 0x40, 0x00, 0x02, 0x00,
@@ -2385,8 +2388,6 @@ void rgbIntToChar(W_ColorPanel *panel, int *value)
case RGBhex:
format = "%0X";
break;
default:
format = "";
}
sprintf(tmp, format, value[0]);
@@ -2645,7 +2646,7 @@ static void hsbTextFieldCallback(void *observerData, WMNotification * notificati
{
CPColor cpColor;
int value[3];
char tmp[12]; /* We only 4 bytes needed, but compilers cannot know that */
char tmp[4];
int n;
W_ColorPanel *panel = (W_ColorPanel *) observerData;
@@ -3398,9 +3399,6 @@ static void rgbInit(W_ColorPanel * panel)
case RGBhex:
format = "%0X";
break;
default:
/* Avoid compiler warning */
format = "";
}
sprintf(tmp, format, panel->color.rgb.red);
@@ -3453,7 +3451,7 @@ static void hsbInit(W_ColorPanel * panel)
WMSetSliderValue(panel->hsbSaturationS, value[1]);
WMSetSliderValue(panel->hsbBrightnessS, value[2]);
sprintf(tmp, "%hu", value[0]);
sprintf(tmp, "%d", value[0]);
WMSetTextFieldText(panel->hsbHueT, tmp);
sprintf(tmp, "%d", value[1]);
WMSetTextFieldText(panel->hsbSaturationT, tmp);
@@ -3504,17 +3502,13 @@ static void convertCPColor(CPColor * color)
old_hue = color->hsv.hue;
RRGBtoHSV(&(color->rgb), &(color->hsv));
/*
* 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) )
/* 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))
)
color->hsv.hue = old_hue;
break;
case cpHSV:
WINGs/wfont.c
-10
View File
@@ -237,16 +237,6 @@ 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);
WINGs/wfontpanel.c
+2 -2
View File
@@ -700,7 +700,7 @@ static void typefaceClick(WMWidget * w, void *data)
WM_ITERATE_ARRAY(face->sizes, size, i) {
if (size != NULL) {
int size_int = (intptr_t) size;
int size_int = (int) size;
sprintf(buffer, "%i", size_int);
@@ -802,7 +802,7 @@ static void setFontPanelFontName(FontPanel * panel, const char *family, const ch
char buffer[32];
if (vsize != NULL) {
int size_int = (intptr_t) vsize;
int size_int = (int) vsize;
sprintf(buffer, "%i", size_int);
WINGs/widgets.c
+1 -2
View File
@@ -385,7 +385,6 @@ 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);
@@ -945,7 +944,7 @@ void WMSetFocusToWidget(WMWidget * widget)
/*
* WMRealizeWidget-
* Realizes the widget and all its children.
* Realizes the widget and all it's children.
*
*/
void WMRealizeWidget(WMWidget * w)
WINGs/wpanel.c
+7 -287
View File
@@ -89,12 +89,10 @@ 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) {
@@ -162,7 +160,6 @@ 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);
@@ -173,13 +170,13 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
/* create buttons */
if (otherButton)
ow = WMWidthOfString(defaultFont, otherButton, strlen(otherButton));
ow = WMWidthOfString(scrPtr->normalFont, otherButton, strlen(otherButton));
if (alternateButton)
aw = WMWidthOfString(defaultFont, alternateButton, strlen(alternateButton));
aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton));
if (defaultButton)
dw = WMWidthOfString(defaultFont, defaultButton, strlen(defaultButton));
dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton));
dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
@@ -209,187 +206,18 @@ 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);
@@ -510,10 +338,8 @@ 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)
@@ -545,23 +371,21 @@ 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(defaultFont, cancelButton, strlen(cancelButton));
aw = WMWidthOfString(scrPtr->normalFont, cancelButton, strlen(cancelButton));
if (okButton)
dw = WMWidthOfString(defaultFont, okButton, strlen(okButton));
dw = WMWidthOfString(scrPtr->normalFont, okButton, strlen(okButton));
w = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
if (aw > w)
@@ -582,7 +406,6 @@ 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;
@@ -592,104 +415,6 @@ 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);
@@ -732,12 +457,10 @@ 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) {
@@ -810,10 +533,10 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
/* create buttons */
if (defaultButton)
dw = WMWidthOfString(defaultFont, defaultButton, strlen(defaultButton));
dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton));
if (alternateButton)
aw = WMWidthOfString(defaultFont, alternateButton, strlen(alternateButton));
aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton));
dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
@@ -838,7 +561,6 @@ 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);
@@ -848,7 +570,5 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
WMRealizeWidget(panel->win);
WMMapSubwidgets(panel->win);
WMReleaseFont(defaultFont);
return panel;
}
WINGs/wruler.c
+4 -1
View File
@@ -181,7 +181,10 @@ 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) {
snprintf(c, sizeof(c), "%hu", ++j);
if (j < 10)
snprintf(c, 3, "%d", ++j);
else
snprintf(c, 3, "%2d", ++j);
WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg,
rPtr->font, rPtr->margins.left + 2 + m, 26, c, 2);
}
WINGs/wsplitview.c
+3
View File
@@ -41,6 +41,9 @@ typedef struct W_SplitView {
/* TODO: rewrite --Dan */
#define _GetSubviewsCount() WMGetArrayItemCount(sPtr->subviews)
#define _AddPSubviewStruct(P) \
(WMAddToArray(sPtr->subviews,((void*)P)))
#define _GetPSubviewStructAt(i) \
((W_SplitViewSubview*)WMGetFromArray(sPtr->subviews,(i)))
WINGs/wtext.c
-2
View File
@@ -2305,7 +2305,6 @@ static void handleTextKeyPress(Text * tPtr, XEvent * event)
case XK_Return:
*buffer = '\n';
/* FALLTHRU */
default:
if (*buffer != 0 && !control_pressed) {
insertTextInteractively(tPtr, buffer, strlen(buffer));
@@ -2545,7 +2544,6 @@ static void handleActionEvents(XEvent * event, void *data)
break;
}
/* FALLTHRU */
case ButtonRelease:
if (tPtr->flags.pointerGrabbed) {
tPtr->flags.pointerGrabbed = False;
WINGs/wtextfield.c
-14
View File
@@ -965,7 +965,6 @@ 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) {
@@ -1002,10 +1001,8 @@ 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;
@@ -1022,10 +1019,8 @@ 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;
@@ -1063,10 +1058,8 @@ 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;
@@ -1102,10 +1095,8 @@ 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) {
@@ -1131,10 +1122,8 @@ 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) {
@@ -1160,7 +1149,6 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
else
modified = False;
/* FALLTHRU */
case XK_BackSpace:
if (!modified) {
if (tPtr->selection.count) {
@@ -1189,10 +1177,8 @@ 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) {
WINGs/wview.c
-2
View File
@@ -490,7 +490,6 @@ 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));
@@ -505,7 +504,6 @@ 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);
WPrefs.app/Appearance.c
+6 -15
View File
@@ -446,18 +446,12 @@ static void str2rcolor(RContext * rc, const char *name, RColor * color)
{
XColor xcolor;
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;
}
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;
}
static void dumpRImage(const char *path, RImage * image)
@@ -617,7 +611,6 @@ 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;
@@ -644,7 +637,6 @@ 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;
@@ -679,7 +671,6 @@ 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;
WPrefs.app/Expert.c
+4 -27
View File
@@ -97,29 +97,8 @@ static const struct {
{ N_("Distance from corner to begin window snap."),
/* default: */ 10, OPTION_WMAKER_INT, "SnapCornerDetect" },
{ N_("Snapping a window to the top maximizes it to the full screen."),
/* default: */ False, OPTION_WMAKER, "SnapToTopMaximizesFullscreen" },
{ N_("Allow move half-maximized windows between multiple screens."),
/* default: */ False, OPTION_WMAKER, "MoveHalfMaximizedWindowsBetweenScreens" },
{ N_("Alternative transitions between states for half maximized windows."),
/* default: */ False, OPTION_WMAKER, "AlternativeHalfMaximized" },
{ N_("Move mouse pointer with half maximized windows."),
/* default: */ False, OPTION_WMAKER, "PointerWithHalfMaxWindows" },
{ N_("Open dialogs in the same workspace as their owners."),
/* 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" }
/* default: */ False, OPTION_WMAKER, "OpenTransientOnOwnerWorkspace" }
};
@@ -146,16 +125,15 @@ typedef struct _Panel {
static void changeIntTextfield(void *data, int delta)
{
WMTextField *textfield;
char *text, buffer[12];
char *text;
int value;
textfield = (WMTextField *)data;
text = WMGetTextFieldText(textfield);
value = atoi(text);
wfree(text);
value += delta;
sprintf(buffer, "%d", value);
WMSetTextFieldText(textfield, buffer);
sprintf(text, "%d", value);
WMSetTextFieldText(textfield, text);
}
static void downButtonCallback(WMWidget *self, void *data)
@@ -315,7 +293,6 @@ static void storeDefaults(_Panel *panel)
text = WMGetTextFieldText(panel->textfield[i]);
value = atoi(text);
wfree(text);
SetIntegerForKey(value, expert_options[i].op_name);
break;
WPrefs.app/FontSimple.c
+13 -10
View File
@@ -22,7 +22,6 @@
#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
@@ -522,7 +521,7 @@ static void selectedOption(WMWidget * w, void *data)
WMListItem *item = WMGetListItem(panel->sizeL, i);
int distance;
distance = fabs(size - atoi(item->text));
distance = abs(size - atoi(item->text));
if (i == 0 || distance < closest) {
closest = distance;
@@ -570,9 +569,6 @@ 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;
@@ -583,12 +579,19 @@ static void showData(_Panel * panel)
if (ofont)
wfree(ofont);
if (strcmp(fontOptions[i].option, "SystemFont") == 0)
font = WMGetFontName(WMDefaultSystemFont(scr));
else if (strcmp(fontOptions[i].option, "BoldSystemFont") == 0)
font = WMGetFontName(WMDefaultBoldSystemFont(scr));
else
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 {
font = GetStringForKey(fontOptions[i].option);
}
if (font)
font = wstrdup(font);
WMSetMenuItemRepresentedObject(item, font);
WPrefs.app/Icons.c
+61 -33
View File
@@ -60,6 +60,8 @@ typedef struct _Panel {
CallbackRec callbacks;
Bool have_legacy_apercu;
WMWidget *parent;
WMFrame *posF;
@@ -73,13 +75,12 @@ typedef struct _Panel {
WMButton *posB[wlengthof_nocheck(icon_position_dbvalue)];
WMFrame *animF;
WMPopUpButton *animP;
WMButton *animB[wlengthof_nocheck(icon_animation)];
WMFrame *optF;
WMButton *arrB;
WMButton *omnB;
WMButton *sclB;
WMButton *marginB;
struct {
WMFrame *frame;
@@ -174,7 +175,6 @@ 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,12 +195,20 @@ static void showData(_Panel * panel)
if (i < 0)
i = 0;
else if (i > 29)
i = 29;
else if (i > 9)
i = 9;
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 */
@@ -212,6 +220,25 @@ 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);
@@ -221,7 +248,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) {
WMSetPopUpButtonSelectedItem(panel->animP, i);
WMPerformButtonClick(panel->animB[i]);
goto found_animation_value;
}
}
@@ -229,7 +256,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 */
WMSetPopUpButtonSelectedItem(panel->animP, 0);
WMPerformButtonClick(panel->animB[0]);
found_animation_value:
;
}
@@ -339,7 +366,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 <= 256; i += 8) {
for (i = 24; i <= 96; i += 8) {
sprintf(buf, "%ix%i", i, i);
WMAddPopUpButtonItem(panel->sizeP, buf);
}
@@ -372,57 +399,50 @@ static void createPanel(Panel * p)
/***************** Animation ****************/
panel->animF = WMCreateFrame(panel->box);
WMResizeWidget(panel->animF, 215, 52);
WMResizeWidget(panel->animF, 215, 110);
WMMoveWidget(panel->animF, 292, 6);
WMSetFrameTitle(panel->animF, _("Iconification Animation"));
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));
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));
}
WMMapSubwidgets(panel->animF);
/***************** Options ****************/
panel->optF = WMCreateFrame(panel->box);
WMResizeWidget(panel->optF, 215, 148);
WMMoveWidget(panel->optF, 292, 72);
WMResizeWidget(panel->optF, 215, 90);
WMMoveWidget(panel->optF, 292, 130);
/* 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, starty);
starty += 26;
WMMoveWidget(panel->arrB, 12, 8);
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, starty);
starty += 26;
WMMoveWidget(panel->omnB, 12, 34);
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, starty);
starty += 26;
WMMoveWidget(panel->sclB, 12, 60);
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);
@@ -438,7 +458,6 @@ 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");
@@ -459,8 +478,17 @@ static void storeData(_Panel * panel)
}
SetIntegerForKey(i, "MiniPreviewSize");
}
if (panel->have_legacy_apercu) {
RemoveObjectForKey("MiniwindowApercuBalloons");
RemoveObjectForKey("ApercuSize");
}
SetStringForKey(icon_animation[WMGetPopUpButtonSelectedItem(panel->animP)].db_value, "IconificationStyle");
for (i = 0; i < wlengthof(icon_animation); i++) {
if (WMGetButtonSelected(panel->animB[i])) {
SetStringForKey(icon_animation[i].db_value, "IconificationStyle");
break;
}
}
}
Panel *InitIcons(WMWidget *parent)
WPrefs.app/KeyboardShortcuts.c
-6
View File
@@ -89,8 +89,6 @@ static const struct {
{ "LBCMaximizeKey", N_("Maximize active window left bottom corner") },
{ "RBCMaximizeKey", N_("Maximize active window right bottom corner") },
{ "MaximusKey", N_("Maximus: Tiled maximization ") },
{ "KeepOnTopKey", N_("Toggle window on top status") },
{ "KeepAtBottomKey",N_("Toggle window at bottom status") },
{ "OmnipresentKey", N_("Toggle window omnipresent status") },
{ "RaiseKey", N_("Raise active window") },
{ "LowerKey", N_("Lower active window") },
@@ -148,10 +146,6 @@ 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") },
WPrefs.app/Makefile.am
+2 -3
View File
@@ -45,11 +45,10 @@ WPrefs_SOURCES = \
# KeyboardSettings.c \
# Themes.c
AM_CFLAGS = @PANGO_CFLAGS@
AM_CFLAGS =
AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
-I$(top_builddir)/wrlib -I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \
@HEADER_SEARCH_PATH@
-I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
WPrefs.app/Menu.c
+10 -67
View File
@@ -22,7 +22,6 @@
#include "WPrefs.h"
#include <assert.h>
#include <ctype.h>
#include <unistd.h>
#include <X11/keysym.h>
#include <X11/cursorfont.h>
@@ -507,7 +506,7 @@ static void createPanel(_Panel * p)
WMSetScrollViewContentView(sview, WMWidgetView(pad));
data = putNewItem(panel, pad, ExternalInfo, _("Debian Menu"));
data->param.pipe.command = "/etc/GNUstep/Defaults/menu.hook";
data->param.pipe.command = "/etc/X11/WindowMaker/menu.hook";
data = putNewItem(panel, pad, PipeInfo, _("RedHat Menu"));
data->param.pipe.command = "wmconfig --output wmaker";
@@ -614,7 +613,7 @@ static void createPanel(_Panel * p)
WMAddNotificationObserver(dataChanged, panel, WMTextDidChangeNotification, panel->pathT);
label = WMCreateLabel(panel->pathF);
WMResizeWidget(label, width - 20, 90);
WMResizeWidget(label, width - 20, 80);
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"
@@ -914,11 +913,6 @@ 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);
@@ -931,12 +925,6 @@ static ItemData *parseCommand(WMPropList * item)
* |pipe
*/
p = parameter;
if (p == NULL) {
wfree(data);
return NULL;
}
while (isspace(*p) && *p)
p++;
if (*p == '|') {
@@ -1447,12 +1435,12 @@ static WEditMenu *buildSubmenu(_Panel * panel, WMPropList * pl)
WSetEditMenuItemImage(item, panel->markerPix[data->type]);
WSetEditMenuItemData(item, data, (WMCallback *) freeItemData);
} else {
char buf[256];
snprintf(buf, sizeof(buf), _("Invalid menu command \"%s\" with label \"%s\" cleared"),
char *buf = wmalloc(1024);
snprintf(buf, 1024, _("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);
}
}
@@ -1494,8 +1482,7 @@ static WMPropList *getDefaultMenu(_Panel * panel)
static void showData(_Panel * panel)
{
const char *gspath;
char *menuPath, *labelText;
char buf[1024];
char *menuPath;
WMPropList *pmenu;
gspath = wusergnusteppath();
@@ -1506,45 +1493,6 @@ 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;
@@ -1569,14 +1517,6 @@ 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);
@@ -1617,12 +1557,15 @@ 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);
WPrefs.app/README
+3 -3
View File
@@ -7,7 +7,7 @@
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 its applications menu. It also can change some settings
and define it's 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
@@ -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 its application icon. The dock will automatically detect its
Then, dock it's application icon. The dock will automatically detect it's
icon and use it.
If you change configuration often, you might want to leave WPrefs
@@ -46,7 +46,7 @@ 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 its section (or if you do open it, do not Save), or WPrefs will
open it's 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
WPrefs.app/TexturePanel.c
+80 -80
View File
@@ -117,21 +117,16 @@ typedef struct _TexturePanel {
} _TexturePanel;
enum {
TYPE_SOLID,
TYPE_GRADIENT,
TYPE_SGRADIENT,
TYPE_TGRADIENT,
TYPE_PIXMAP
};
#define TYPE_SOLID 0
#define TYPE_GRADIENT 1
#define TYPE_SGRADIENT 2
#define TYPE_TGRADIENT 3
#define TYPE_PIXMAP 4
enum {
PTYPE_TILE,
PTYPE_SCALE,
PTYPE_CENTER,
PTYPE_MAXIMIZE,
PTYPE_FILL
};
#define PTYPE_TILE 0
#define PTYPE_SCALE 1
#define PTYPE_CENTER 2
#define PTYPE_MAXIMIZE 3
/*
*--------------------------------------------------------------------------
@@ -141,7 +136,7 @@ enum {
/************/
static void updateGradButtons(TexturePanel *panel)
static void updateGradButtons(TexturePanel * panel)
{
RImage *image;
WMPixmap *pixmap;
@@ -185,7 +180,7 @@ static void updateGradButtons(TexturePanel *panel)
}
}
static void updateTGradImage(TexturePanel *panel)
static void updateTGradImage(TexturePanel * panel)
{
RImage *image, *gradient;
WMPixmap *pixmap;
@@ -206,17 +201,19 @@ static void updateTGradImage(TexturePanel *panel)
to.green = WMGreenComponentOfColor(color) >> 8;
to.blue = WMBlueComponentOfColor(color) >> 8;
if (panel->image->width < 141 || panel->image->height < 91)
if (panel->image->width < 141 || panel->image->height < 91) {
image = RMakeTiledImage(panel->image, 141, 91);
else
} else {
image = RCloneImage(panel->image);
}
if (WMGetButtonSelected(panel->dirhB))
if (WMGetButtonSelected(panel->dirhB)) {
gradient = RRenderGradient(image->width, image->height, &from, &to, RHorizontalGradient);
else if (WMGetButtonSelected(panel->dirvB))
} else if (WMGetButtonSelected(panel->dirvB)) {
gradient = RRenderGradient(image->width, image->height, &from, &to, RVerticalGradient);
else
} else {
gradient = RRenderGradient(image->width, image->height, &from, &to, RDiagonalGradient);
}
RCombineImagesWithOpaqueness(image, gradient, WMGetSliderValue(panel->topaS));
RReleaseImage(gradient);
@@ -228,7 +225,7 @@ static void updateTGradImage(TexturePanel *panel)
RReleaseImage(image);
}
static void updateSGradButtons(TexturePanel *panel)
static void updateSGradButtons(TexturePanel * panel)
{
RImage *image;
WMPixmap *pixmap;
@@ -267,7 +264,7 @@ static void updateSGradButtons(TexturePanel *panel)
/*********** Gradient ************/
static void updateSVSlider(WMSlider *sPtr, Bool saturation, WMFont *font, RHSVColor *hsv)
static void updateSVSlider(WMSlider * sPtr, Bool saturation, WMFont * font, RHSVColor * hsv)
{
RImage *image;
WMPixmap *pixmap;
@@ -315,7 +312,7 @@ static void updateSVSlider(WMSlider *sPtr, Bool saturation, WMFont *font, RHSVCo
WMReleasePixmap(pixmap);
}
static void updateHueSlider(WMSlider *sPtr, WMFont *font, RHSVColor *hsv)
static void updateHueSlider(WMSlider * sPtr, WMFont * font, RHSVColor * hsv)
{
RColor *colors[8];
RImage *image;
@@ -356,7 +353,7 @@ static void updateHueSlider(WMSlider *sPtr, WMFont *font, RHSVColor *hsv)
wfree(colors[i]);
}
static void sliderChangeCallback(WMWidget *w, void *data)
static void sliderChangeCallback(WMWidget * w, void *data)
{
TexturePanel *panel = (TexturePanel *) data;
RHSVColor hsv;
@@ -420,8 +417,9 @@ static void sliderChangeCallback(WMWidget *w, void *data)
}
colors[i] = NULL;
if (panel->gimage != None)
if (panel->gimage != None) {
XFreePixmap(WMScreenDisplay(scr), panel->gimage);
}
image = RRenderMultiGradient(30, i * WMGetListItemHeight(panel->gcolL), colors, RVerticalGradient);
RConvertImage(WMScreenRContext(scr), image, &panel->gimage);
@@ -434,7 +432,7 @@ static void sliderChangeCallback(WMWidget *w, void *data)
updateGradButtons(panel);
}
static void paintGradListItem(WMList *lPtr, int index, Drawable d, char *text, int state, WMRect *rect)
static void paintGradListItem(WMList * lPtr, int index, Drawable d, char *text, int state, WMRect * rect)
{
TexturePanel *panel = (TexturePanel *) WMGetHangedData(lPtr);
WMScreen *scr = WMWidgetScreen(lPtr);
@@ -467,7 +465,7 @@ static void paintGradListItem(WMList *lPtr, int index, Drawable d, char *text, i
WMReleaseColor(gray);
}
static void gradAddCallback(WMWidget *w, void *data)
static void gradAddCallback(WMWidget * w, void *data)
{
TexturePanel *panel = (TexturePanel *) data;
WMListItem *item;
@@ -491,7 +489,7 @@ static void gradAddCallback(WMWidget *w, void *data)
WMSetButtonEnabled(panel->okB, WMGetListNumberOfRows(panel->gcolL) > 1);
}
static void gradClickCallback(WMWidget *w, void *data)
static void gradClickCallback(WMWidget * w, void *data)
{
TexturePanel *panel = (TexturePanel *) data;
WMListItem *item;
@@ -513,7 +511,7 @@ static void gradClickCallback(WMWidget *w, void *data)
sliderChangeCallback(panel->gsatS, panel);
}
static void gradDeleteCallback(WMWidget *w, void *data)
static void gradDeleteCallback(WMWidget * w, void *data)
{
TexturePanel *panel = (TexturePanel *) data;
WMListItem *item;
@@ -547,7 +545,7 @@ static void gradDeleteCallback(WMWidget *w, void *data)
/*************** Simple Gradient ***************/
static void colorWellObserver(void *self, WMNotification *n)
static void colorWellObserver(void *self, WMNotification * n)
{
/* Parameter not used, but tell the compiler that it is ok */
(void) n;
@@ -555,7 +553,7 @@ static void colorWellObserver(void *self, WMNotification *n)
updateSGradButtons(self);
}
static void opaqChangeCallback(WMWidget *w, void *data)
static void opaqChangeCallback(WMWidget * w, void *data)
{
TexturePanel *panel = (TexturePanel *) data;
@@ -567,7 +565,7 @@ static void opaqChangeCallback(WMWidget *w, void *data)
/****************** Image ******************/
static void updateImage(TexturePanel *panel, const char *path)
static void updateImage(TexturePanel * panel, const char *path)
{
WMScreen *scr = WMWidgetScreen(panel->win);
RImage *image;
@@ -615,12 +613,12 @@ static void updateImage(TexturePanel *panel, const char *path)
}
}
static void browseImageCallback(WMWidget *w, void *data)
static void browseImageCallback(WMWidget * w, void *data)
{
TexturePanel *panel = (TexturePanel *) data;
WMOpenPanel *opanel;
WMScreen *scr = WMWidgetScreen(w);
static char *ipath;
static char *ipath = NULL;
opanel = WMGetOpenPanel(scr);
WMSetFilePanelCanChooseDirectories(opanel, False);
@@ -672,17 +670,18 @@ static void browseImageCallback(WMWidget *w, void *data)
}
}
static void buttonCallback(WMWidget *w, void *data)
static void buttonCallback(WMWidget * w, void *data)
{
TexturePanel *panel = (TexturePanel *) data;
if (w == panel->okB)
if (w == panel->okB) {
(*panel->okAction) (panel->okData);
else
} else {
(*panel->cancelAction) (panel->cancelData);
}
}
static void changeTypeCallback(WMWidget *w, void *data)
static void changeTypeCallback(WMWidget * w, void *data)
{
TexturePanel *panel = (TexturePanel *) data;
int newType;
@@ -732,7 +731,7 @@ static void changeTypeCallback(WMWidget *w, void *data)
* Public functions
*--------------------------------------------------------------------------
*/
void ShowTexturePanel(TexturePanel *panel)
void ShowTexturePanel(TexturePanel * panel)
{
Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win));
Screen *scr = DefaultScreenOfDisplay(dpy);
@@ -743,24 +742,24 @@ void ShowTexturePanel(TexturePanel *panel)
WMMapWidget(panel->win);
}
void HideTexturePanel(TexturePanel *panel)
void HideTexturePanel(TexturePanel * panel)
{
WMUnmapWidget(panel->win);
}
void SetTexturePanelOkAction(TexturePanel *panel, WMCallback *action, void *clientData)
void SetTexturePanelOkAction(TexturePanel * panel, WMCallback * action, void *clientData)
{
panel->okAction = action;
panel->okData = clientData;
}
void SetTexturePanelCancelAction(TexturePanel *panel, WMCallback *action, void *clientData)
void SetTexturePanelCancelAction(TexturePanel * panel, WMCallback * action, void *clientData)
{
panel->cancelAction = action;
panel->cancelData = clientData;
}
void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *texture)
void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList * texture)
{
WMScreen *scr = WMWidgetScreen(panel->win);
char *str, *type;
@@ -776,8 +775,9 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
return;
p = WMGetFromPLArray(texture, 0);
if (!p)
if (!p) {
goto bad_texture;
}
type = WMGetFromPLString(p);
/*............................................... */
@@ -786,10 +786,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_SOLID);
p = WMGetFromPLArray(texture, 1);
if (!p)
if (!p) {
str = "black";
else
} else {
str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->defcW, color);
@@ -802,10 +803,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_SGRADIENT);
p = WMGetFromPLArray(texture, 1);
if (!p)
if (!p) {
str = "black";
else
} else {
str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->tcol1W, color);
@@ -813,10 +815,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
WMReleaseColor(color);
p = WMGetFromPLArray(texture, 2);
if (!p)
if (!p) {
str = "black";
else
} else {
str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->tcol2W, color);
@@ -843,10 +846,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
WMSetSliderValue(panel->topaS, i);
p = WMGetFromPLArray(texture, 3);
if (!p)
if (!p) {
str = "black";
else
} else {
str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->tcol1W, color);
@@ -854,10 +858,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
WMReleaseColor(color);
p = WMGetFromPLArray(texture, 4);
if (!p)
if (!p) {
str = "black";
else
} else {
str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->tcol2W, color);
@@ -868,9 +873,9 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
if (panel->imageFile)
wfree(panel->imageFile);
panel->imageFile = wfindfileinarray(panel->pathList,
WMGetFromPLString(WMGetFromPLArray(texture, 1)));
if (panel->imageFile != NULL) {
if ((panel->imageFile = wfindfileinarray(panel->pathList,
WMGetFromPLString(WMGetFromPLArray(texture, 1)))) !=
NULL) {
panel->image = RLoadImage(WMScreenRContext(scr), panel->imageFile, 0);
updateTGradImage(panel);
@@ -894,10 +899,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_GRADIENT);
p = WMGetFromPLArray(texture, 1);
if (!p)
if (!p) {
str = "black";
else
} else {
str = WMGetFromPLString(p);
}
color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->defcW, color);
@@ -909,10 +915,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
XColor xcolor;
p = WMGetFromPLArray(texture, i);
if (!p)
if (!p) {
str = "black";
else
} else {
str = WMGetFromPLString(p);
}
XParseColor(WMScreenDisplay(scr), WMScreenRContext(scr)->cmap, str, &xcolor);
@@ -946,9 +953,6 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
case 'M':
WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_MAXIMIZE);
break;
case 'F':
WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_FILL);
break;
default:
case 'T':
WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_TILE);
@@ -997,13 +1001,13 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
}
char *GetTexturePanelTextureName(TexturePanel *panel)
char *GetTexturePanelTextureName(TexturePanel * panel)
{
return WMGetTextFieldText(panel->nameT);
}
WMPropList *GetTexturePanelTexture(TexturePanel *panel)
WMPropList *GetTexturePanelTexture(TexturePanel * panel)
{
WMPropList *prop = NULL;
WMColor *color;
@@ -1034,10 +1038,6 @@ WMPropList *GetTexturePanelTexture(TexturePanel *panel)
prop = WMCreatePLArray(WMCreatePLString("mpixmap"),
WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
break;
case PTYPE_FILL:
prop = WMCreatePLArray(WMCreatePLString("fpixmap"),
WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
break;
case PTYPE_CENTER:
prop = WMCreatePLArray(WMCreatePLString("cpixmap"),
WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
@@ -1104,12 +1104,13 @@ WMPropList *GetTexturePanelTexture(TexturePanel *panel)
color = WMGetColorWellColor(panel->defcW);
str = WMGetColorRGBDescription(color);
if (WMGetButtonSelected(panel->dirdB))
if (WMGetButtonSelected(panel->dirdB)) {
prop = WMCreatePLArray(WMCreatePLString("mdgradient"), WMCreatePLString(str), NULL);
else if (WMGetButtonSelected(panel->dirvB))
} else if (WMGetButtonSelected(panel->dirvB)) {
prop = WMCreatePLArray(WMCreatePLString("mvgradient"), WMCreatePLString(str), NULL);
else
} else {
prop = WMCreatePLArray(WMCreatePLString("mhgradient"), WMCreatePLString(str), NULL);
}
wfree(str);
for (i = 0; i < WMGetListNumberOfRows(panel->gcolL); i++) {
@@ -1130,12 +1131,12 @@ WMPropList *GetTexturePanelTexture(TexturePanel *panel)
return prop;
}
void SetTexturePanelPixmapPath(TexturePanel *panel, WMPropList *array)
void SetTexturePanelPixmapPath(TexturePanel * panel, WMPropList * array)
{
panel->pathList = array;
}
TexturePanel *CreateTexturePanel(WMWindow *keyWindow)
TexturePanel *CreateTexturePanel(WMWindow * keyWindow)
/*CreateTexturePanel(WMScreen *scr)*/
{
TexturePanel *panel;
@@ -1406,7 +1407,6 @@ TexturePanel *CreateTexturePanel(WMWindow *keyWindow)
WMAddPopUpButtonItem(panel->arrP, _("Scale"));
WMAddPopUpButtonItem(panel->arrP, _("Center"));
WMAddPopUpButtonItem(panel->arrP, _("Maximize"));
WMAddPopUpButtonItem(panel->arrP, _("Fill"));
WMSetPopUpButtonSelectedItem(panel->arrP, 0);
WMMapSubwidgets(panel->imageF);
@@ -1475,7 +1475,7 @@ TexturePanel *CreateTexturePanel(WMWindow *keyWindow)
char *ProgName = "test";
void testOKButton(WMWidget *self, void *data)
void testOKButton(WMWidget * self, void *data)
{
char *test;
Display *dpy;
@@ -1504,13 +1504,13 @@ void testOKButton(WMWidget *self, void *data)
}
void testCancelButton(WMWidget *self, void *data)
void testCancelButton(WMWidget * self, void *data)
{
wwarning("Exiting test....");
exit(0);
}
void wAbort(void)
void wAbort()
{
exit(1);
}
WPrefs.app/WPrefs.c
+1 -1
View File
@@ -602,7 +602,7 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
char *path;
FILE *file;
char buffer[1024];
char mbuf[1069]; /* Size of buffer and extra characters for the sprintfs */
char mbuf[1024];
int v1, v2, v3;
path = wdefaultspathfordomain("WindowMaker");
WPrefs.app/main.c
+16
View File
@@ -66,6 +66,19 @@ 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;
@@ -151,6 +164,9 @@ 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"));
WPrefs.app/po/Makefile.am
+1 -1
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 tr.po uk.po zh_CN.po zh_TW.po
it.po ja.po ko.po nl.po pt.po ru.po sk.po uk.po zh_CN.po zh_TW.po
POTFILES = \
$(top_srcdir)/WPrefs.app/Appearance.c \
WPrefs.app/po/README
+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>
WPrefs.app/po/de.po
+1 -1
View File
@@ -819,7 +819,7 @@ msgstr "Clip in den Vor-/Hintergrund"
#: ../../WPrefs.app/KeyboardShortcuts.c:518
msgid "Toggle keyboard language"
msgstr "Tastaturbelegung ändern"
msgstr "Tastatursbelegung ändern"
#: ../../WPrefs.app/KeyboardShortcuts.c:532
msgid "Shortcut"
WPrefs.app/po/et.po
+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 its titlebar, press Control+Esc (or the\n"
"without it's titlebar, press Control+Esc (or the\n"
"equivalent shortcut, if you changed the default\n"
"settings)."
msgstr ""
WPrefs.app/po/fy.po
+442 -410
View File
File diff suppressed because it is too large Load Diff
WPrefs.app/po/nl.po
+330 -296
View File
File diff suppressed because it is too large Load Diff
WPrefs.app/po/ru.po
+18 -69
View File
@@ -380,71 +380,45 @@ msgstr ""
"параметров и количества цветов для резервирования за\n"
"Window Maker'ом при работе с 8bit'ным цветом (8bpp)."
#: ../../WPrefs.app/Expert.c:44
msgid "Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."
msgstr "Запретить миниокна иконки для минимизированных окон. Для использования с KDE/GNOME."
#: ../../WPrefs.app/Expert.c:75
msgid ""
"Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."
msgstr ""
"Запретить миниокна (иконки для минимизированных окон). Для использования с "
"KDE/GNOME."
#: ../../WPrefs.app/Expert.c:47
msgid "Ignore decoration hints for GTK applications."
msgstr "Игнорировать декорацию окон для GTK приложений."
#: ../../WPrefs.app/Expert.c:53
#: ../../WPrefs.app/Expert.c:76
msgid "Do not set non-WindowMaker specific parameters (do not use xset)."
msgstr ""
"Не устанавливать параметры, не относящиеся непосредственно к\n"
"Window Maker'у (не использовать xset)."
#: ../../WPrefs.app/Expert.c:56
#: ../../WPrefs.app/Expert.c:77
msgid "Automatically save session when exiting Window Maker."
msgstr "Автоматически сохранять сессию при выходе из Window Maker'а."
#: ../../WPrefs.app/Expert.c:59
#: ../../WPrefs.app/Expert.c:78
msgid "Use SaveUnder in window frames, icons, menus and other objects."
msgstr "Использовать SaveUnder для окон, иконок, меню и других объектов."
#: ../../WPrefs.app/Expert.c:62
#: ../../WPrefs.app/Expert.c:79
msgid "Use Windoze style cycling."
msgstr "Переключение окон в стиле Windows"
#: ../../WPrefs.app/Expert.c:80
msgid "Disable confirmation panel for the Kill command."
msgstr "Запретить диалог подтверждения для команды `Убить'."
# awn: FIXME: что это вообще значит?
#: ../../WPrefs.app/Expert.c:81
msgid "Disable selection animation for selected icons."
msgstr "Запретить анимацию выбора для выбранных иконок."
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
#: ../../WPrefs.app/Expert.c:115
msgid "Expert User Preferences"
msgstr "Установки для опытного пользователя"
#: ../../WPrefs.app/Expert.c:330
#: ../../WPrefs.app/Expert.c:117
msgid ""
"Options for people who know what they're doing...\n"
"Also have some other misc. options."
@@ -649,11 +623,6 @@ msgstr ""
"Параметры обработки иконок и миниокон. Размещение иконок,\n"
"размер иконок, в каком стиле анимировать сворачивание."
#: ../../WPrefs.app/Icons.c:414
msgid "Single click activation"
msgstr "Одинарный щелчок мыши"
#: ../../WPrefs.app/imagebrowser.c:95
msgid "View"
msgstr ""
@@ -1932,10 +1901,6 @@ msgstr ""
msgid "Resist"
msgstr "Упираться"
#: ../../WPrefs.app/WindowHandling.c:406
msgid "Opaque Move/Resize"
msgstr "Перемещ/Измен.разм."
#: ../../WPrefs.app/WindowHandling.c:407
msgid "Attract"
msgstr "Притягиваться"
@@ -1958,22 +1923,6 @@ 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 "Навигация по рабочим пространствам"
WPrefs.app/po/tr.po
-2627
View File
File diff suppressed because it is too large Load Diff
WPrefs.app/tiff/ergonomic.tiff
BIN
View File
Binary file not shown.
WindowMaker/Defaults/Makefile.am
+6 -4
View File
@@ -1,3 +1,6 @@
defsdatadir = $(sysconfdir)/WindowMaker
defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
wpexecbindir = @wprefs_bindir@
@@ -12,8 +15,7 @@ WMWindowAttributes: $(srcdir)/WMWindowAttributes.in
chmod 644 WMWindowAttributes
WindowMaker: $(srcdir)/WindowMaker.in
$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
-e "s:#pixmapdir#:$(pixmapdir):" $(srcdir)/WindowMaker.in \
$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
> WindowMaker ; \
chmod 644 WindowMaker
@@ -21,5 +23,5 @@ WMState: $(srcdir)/WMState.in
$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in > WMState ; \
chmod 644 WMState
WMRootMenu: ./../plmenu
$(AM_V_GEN)cp -f ./../plmenu WMRootMenu
WMRootMenu: $(srcdir)/../plmenu
$(AM_V_GEN)cp -f $(srcdir)/../plmenu WMRootMenu
WindowMaker/Defaults/WindowMaker.in
+137 -249
View File
@@ -1,251 +1,139 @@
{
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;
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;
}
WindowMaker/Makefile.am
+32 -51
View File
@@ -1,29 +1,52 @@
SUBDIRS = Backgrounds . Defaults IconSets Icons Pixmaps Styles Themes
SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes
prefsdatadir = $(pkgdatadir)
wpexecbindir = @wprefs_bindir@
# menus which need generated to have correct path to WPrefs or data directory
GENERATED_MENUS =\
prefsdata_DATA =\
appearance.menu\
appearance.menu.fy\
appearance.menu.nl\
autostart.sh\
background.menu\
exitscript.sh\
menu\
menu.bg\
menu.ca\
menu.cz\
menu.da\
menu.de\
menu.el\
menu.es\
menu.fi\
menu.fr\
menu.fy\
menu.gl\
menu.he\
menu.hr\
menu.hu\
menu.it\
menu.ja\
menu.ko\
menu.nl\
menu.no\
menu.pl\
menu.pt\
menu.ro\
menu.ru\
menu.se\
menu.sk\
menu.sl\
menu.tr\
menu.zh_CN\
menu.zh_TW\
plmenu\
plmenu.bg\
plmenu.da\
plmenu.de\
plmenu.es\
plmenu.fi\
plmenu.fr\
plmenu.fy\
plmenu.hr\
plmenu.it\
plmenu.ja\
plmenu.ko\
plmenu.nl\
@@ -32,52 +55,10 @@ GENERATED_MENUS =\
plmenu.sk\
plmenu.zh_CN\
plmenu.zh_TW\
wmmacros
# menus which do not mention WPrefs or data directory
NONGENERATED_MENUS =\
menu.ca\
menu.cz\
menu.da\
menu.de\
menu.el\
menu.es\
menu.fr\
menu.gl\
menu.he\
menu.hr\
menu.it\
menu.ja\
menu.no\
menu.pl\
menu.pt\
menu.ru\
menu.se\
menu.sl\
menu.tr\
menu.zh_CN\
plmenu.da\
plmenu.de\
plmenu.fr\
plmenu.hr\
plmenu.it
dist_prefsdata_DATA =\
autostart.sh\
background.menu\
background.menu.fy\
background.menu.nl\
exitscript.sh\
README\
README.themes\
$(NONGENERATED_MENUS)
wmmacros
nodist_prefsdata_DATA = $(GENERATED_MENUS)
EXTRA_DIST = $(prefsdata_DATA) mkMakefile
EXTRA_DIST = $(addsuffix .in, $(GENERATED_MENUS))
CLEANFILES = $(GENERATED_MENUS)
$(GENERATED_MENUS):
$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" \
-e "s:#wmdatadir#:$(pkgdatadir):" $(srcdir)/$@.in > $@
WindowMaker/Pixmaps/swback.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

WindowMaker/Pixmaps/swback2.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

WindowMaker/Pixmaps/swtile.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

WindowMaker/README
+3 -3
View File
@@ -36,7 +36,7 @@ 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>
WindowMaker/Styles/Adwaita.style
-35
View File
@@ -1,35 +0,0 @@
{
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";
}
WindowMaker/Styles/Makefile.am
-1
View File
@@ -2,7 +2,6 @@
prefsdatadir = $(pkgdatadir)/Styles
prefsdata_DATA =\
Adwaita.style\
Autumn.style\
Black.style\
BlackTexture.style\
WindowMaker/appearance.menu
+11
View File
@@ -0,0 +1,11 @@
#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
WindowMaker/appearance.menu.fy.in
-12
View File
@@ -1,12 +0,0 @@
#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
WindowMaker/appearance.menu.in
-12
View File
@@ -1,12 +0,0 @@
#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
WindowMaker/appearance.menu.nl.in
-12
View File
@@ -1,12 +0,0 @@
#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
WindowMaker/background.menu
+3 -7
View File
@@ -5,7 +5,6 @@
"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")'
@@ -23,10 +22,7 @@
"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
"Gradient" END
"Images" MENU
"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
"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
"Background" END
WindowMaker/background.menu.fy
-32
View File
@@ -1,32 +0,0 @@
#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
WindowMaker/background.menu.nl
-32
View File
@@ -1,32 +0,0 @@
#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
WindowMaker/menu.in → WindowMaker/menu
+31 -6
View File
@@ -74,11 +74,6 @@
* -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:
@@ -184,7 +179,37 @@
"Lock" EXEC xlock -allowroot -usefirst
"Commands" END
"Appearance" OPEN_MENU "appearance.menu"
"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 /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"Appearance" END
"Session" MENU
"Save Session" SAVE_SESSION
WindowMaker/menu.bg.in → WindowMaker/menu.bg
+1 -1
View File
@@ -209,7 +209,7 @@
"Фон" END
"Запази темата" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
"Запази колекцията иконки" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
"Пособие за настройки" EXEC #wprefs#
"Пособие за настройки" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"Изглед" END
"Изход" MENU
WindowMaker/menu.fi.in → WindowMaker/menu.fi
+2 -2
View File
@@ -53,7 +53,7 @@
* // it in current position
* OPEN_MENU file.menu
* 2. Pipe menu handling.
* // opens command and uses its stdout to construct menu.
* // opens command and uses it's stdout to construct menu.
* // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional.
* OPEN_MENU | command
@@ -202,7 +202,7 @@
"Taustat" END
"Tallenna teema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Teeman nimi,Kirjoita teematiedoston nimi:)"
"Tallenna kuvakkeet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Kuvakesetin nimi,Kirjoita tiedostonnimi:)"
"Asetukset" EXEC #wprefs#
"Asetukset" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"Ulkonäkö" END
"Lopeta" MENU
WindowMaker/menu.fy
+224
View File
@@ -0,0 +1,224 @@
/*
* Hoofdmenu-uitwerking voor WindowMaker
*
* Opmaak is:
*
* <Titel> [SHORTCUT <Sneltoets>] <Commando> <Parameters>
*
* <Titel> is elke tekenreeks te gebruiken als titel. Moet tussen " staan als het
* spaties heeft.
*
* SHORTCUT geeft een sneltoets op voor die ingang. <Sneltoets> heeft
* dezelfde opmaak als de sneltoetsopties in het
* $HOME/GNUstep/Defaults/WindowMaker bestand, zoals RootMenuKey of MiniaturizeKey.
*
* U kunt geen sneltoets opgeven voor een MENU- of OPEN_MENU-onderdeel.
*
* <Commando> een van de geldige commando's:
* MENU - begint (sub)menubepaling
* END - beëindigt (sub)menubepaling
* OPEN_MENU - opent een menu uit een bestand, 'pipe' of map(pen)inhoud,
* en gaat eventueel elk vooraf met een commando.
* WORKSPACE_MENU - voegt een submenu voor werkruimtehandelingen toe. Slechts één
* workspace_menu is toegestaan.
* EXEC <programma> - voert een extern programma uit
* SHEXEC <commando> - voert een 'shell'-commando uit (zoals gimp > /dev/null)
* EXIT - sluit de vensterbeheerder af
* RESTART [<vensterbeheerder>] - herstart WindowMaker, of start een andere
* vensterbeheerder
* REFRESH - vernieuwt het bureaublad
* ARRANGE_ICONS - herschikt de iconen in de werkruimte
* SHUTDOWN - doodt alle cliënten (en sluit de X Window-sessie af)
* SHOW_ALL - plaatst alle vensters in de werkruimte terug
* HIDE_OTHERS - verbergt alle vensters in de werkruimte, behalve die
* focus heeft (of de laatste die focus had)
* SAVE_SESSION - slaat de huidige staat van het bureaublad op, inbegrepen
* alle lopende programma's, al hun 'hints' (afmetingen,
* positie op het scherm, werkruimte waarin ze leven, Dok
* of Clip van waaruit ze werden opgestart, en indien
* geminiaturiseerd, opgerold of verborgen). Slaat tevens de actuele
* werkruimte van de gebruiker op. Alles zal worden hersteld bij elke
* start van windowmaker, tot een andere SAVE_SESSION of
* CLEAR_SESSION wordt gebruikt. Als SaveSessionOnExit = Yes; in
* het WindowMaker-domeinbestand, dan wordt opslaan automatisch
* gedaan bij elke windowmaker-afsluiting, en wordt een
* SAVE_SESSION of CLEAR_SESSION overschreven (zie hierna).
* CLEAR_SESSION - wist een eerder opgeslagen sessie. Dit zal geen
* effect hebben als SaveSessionOnExit is True.
* INFO - toont het Infopaneel
*
* OPEN_MENU-opmaak:
* 1. Menuafhandeling uit bestand.
* // opent bestand.menu, dat een geldig menubestand moet bevatten, en voegt
* // het in op de huidige plaats
* OPEN_MENU bestand.menu
* 2. Menuafhandeling uit pipe.
* // opent commando en gebruikt zeen 'stdout' om een menu aan te maken.
* // Commando-output moet een geldige menubeschrijving zijn.
* // De ruimte tussen '|' en het commando zelf is optioneel.
* // Gebruik '||' in plaats van '|' als u het menu altijd wilt bijwerken
* // bij openen. Dat zou traag kunnen werken.
* OPEN_MENU | commando
* OPEN_MENU || commando
* 3. Mapafhandeling.
* // Opent een of meer mappen en maakt een menu aan, met daarin alle
* // submappen en uitvoerbare bestanden alfabetisch
* // gesorteerd.
* OPEN_MENU /een/map [/een/andere/map ...]
* 4. Mapafhandeling met commando.
* // Opent een of meer mappen en maakt een menu aan, met daarin alle
* // submappen en leesbare bestanden alfabetisch gesorteerd,
* // elk van hen voorafgegaan met commando.
* OPEN_MENU [opties] /een/map [/een/andere/map ...] WITH commando -opties
* Opties:
* -noext haal alles vanaf de laatste punt in de
* bestandsnaam eraf
*
* <Parameters> is het uit te voeren programma.
*
* ** Commandoregelopties in EXEC:
* %s - wordt vervangen door de actuele selectie
* %a(titel[,aanwijzing]) - opent een invoerveld met de opgegeven titel en de
* optionele aanwijzing, en wordt vervangen door wat u intypt
* %w - wordt vervangen door XID voor het actuele gefocust venster
* %W - wordt vervangen door het nummer van de actuele werkruimte
*
* U kunt speciale karakters (zoals % en ") uitschakelen met het \-teken:
* vb.: xterm -T "\"Hallo Wereld\""
*
* U kunt ook ontsnappingstekens gebruiken, zoals \n
*
* Elke MENU-declaratie moet één gekoppelde END-declaratie op het eind hebben.
*
* Voorbeeld:
*
* "Test" MENU
* "XTerm" EXEC xterm
* // maakt een submenu met de inhoud van /usr/openwin/bin aan
* "XView-progr" OPEN_MENU "/usr/openwin/bin"
* // enige X11-programma's in verschillende mappen
* "X11-progr" OPEN_MENU /usr/X11/bin $HOME/bin/X11
* // enige achtergrondafbeeldingen instellen
* "Achtergrond" OPEN_MENU -noext $HOME/afbeeldingen /usr/share/images WITH wmsetbg -u -t
* // voegt het style.menu in met dit onderdeel
* "Stijl" OPEN_MENU style.menu
* "Test" END
*/
#include "wmmacros"
"Programma's" MENU
"Ynfo" MENU
"Ynfopaniel" INFO_PANEL
"Juridyske ynfo" LEGAL_PANEL
"Systeemconsole" EXEC xconsole
"Systeembelêsting" SHEXEC xosview || xload
"Proseslist" EXEC xterm -e top
"Hantliedingbrowser" EXEC xman
"Ynfo" END
"Utfiere..." SHEXEC %a(Utfiere,Typ út te fiere kommando:)
"XTerm" EXEC xterm -sb
"Mozilla Firefox" EXEC firefox
"Wurkromten" WORKSPACE_MENU
"Programma's" MENU
"Gimp" SHEXEC gimp >/dev/null
"Ghostview" EXEC ghostview %a(GhostView,Fier te besjen bestân yn)
"Xpdf" EXEC xpdf %a(Xpdf,Fier te besjen PDF yn)
"Abiword" EXEC abiword
"Dia" EXEC dia
"OpenOffice.org" MENU
"OpenOffice.org" EXEC ooffice
"Writer" EXEC oowriter
"Rekkenblêd" EXEC oocalc
"Draw" EXEC oodraw
"Impress" EXEC ooimpress
"OpenOffice.org" END
"Tekstbewurkers" MENU
"XEmacs" EXEC xemacs
"Emacs" EXEC emacs
"XJed" EXEC xjed
"VI" EXEC xterm -e vi
"GVIM" EXEC gvim
"NEdit" EXEC nedit
"Xedit" EXEC xedit
"Tekstbewurkers" END
"Multymedia" MENU
"XMMS" MENU
"XMMS" EXEC xmms
"XMMS ôfspylje/poazje" EXEC xmms -t
"XMMS stopje" EXEC xmms -s
"XMMS" END
"Xine fideospeler" EXEC xine
"MPlayer" EXEC mplayer
"Multymedia" END
"Programma's" END
"Helpmiddels" MENU
"Rekkenmasine" EXEC xcalc
"Finstereigenskippen" SHEXEC xprop | xmessage -center -title 'xprop' -file -
"Lettertypekiezer" EXEC xfontsel
"Fergrutsje" EXEC wmagnify
"Kleurekaart" EXEC xcmap
"X-programma deadzje" EXEC xkill
"Helpmiddels" END
"Seleksje" MENU
"Kopiearje" SHEXEC echo '%s' | wxcopy
"E-maile nei" EXEC xterm -name mail -T "Pine" -e pine %s
"Navigearje" EXEC netscape %s
"Sykje yn hantlieding" SHEXEC MANUAL_SEARCH(%s)
"Seleksje" END
"Kommando's" MENU
"Oare ferbergje" HIDE_OTHERS
"Alles toane" SHOW_ALL
"Ikoanen skikke" ARRANGE_ICONS
"Fernije" REFRESH
"Ofskoattelje" 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
"Ikoanensets" 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:)"
"Iconenset bewarje" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikoanensetnamme,Fier bestânsnamme yn:)"
"Foarkarrenhelpmiddel" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"Uterlik" END
"Sesje" MENU
"Sesje bewarje" SAVE_SESSION
"Sesje wiskje" CLEAR_SESSION
"Window Maker werstarte" RESTART
"BlackBox starte" RESTART blackbox
"IceWM starte" RESTART icewm
"Ofslute" EXIT
"Sesje" END
"Programma's" END
WindowMaker/menu.fy.in
-199
View File
@@ -1,199 +0,0 @@
/*
* Haadmenu-útwurking foar WindowMaker
*
* Opmaak is:
*
* <Titel> [SHORTCUT <Fluchtoets>] <Kommando> <Parameters>
*
* <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:
* 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.
* 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
* RESTART [<finsterbehearder>] - werstart WindowMaker, of start in oare
* finsterbehearder
* REFRESH - fernijt it buroblêd
* ARRANGE_ICONS - werskikt de ikoanen yn 'e wurkromte
* SHUTDOWN - deadet alle kliïnten (en slút de X Window-sesje ôf)
* SHOW_ALL - pleatst alle finsters yn 'e wurkromte werom
* HIDE_OTHERS - ferberget alle finsters yn 'e wurkromte, útsein dy't
* fokus hat (of de lêste dy't fokus hie)
* SAVE_SESSION - bewaret de hjoeddeiske steat fan it buroblêd, ynsletten
* alle rinnende programma's, al har 'hints' (ôfmjittingen,
* posysje op it skerm, wurkromte dêr't se yn libje, Dok
* of Klip fan wêrút se opstart waarden, en wannear
* 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. 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 at SaveSessionOnExit is True.
* INFO - toant it Ynfopaniel
*
* OPEN_MENU-opmaak:
* 1. Menu-ôfhanneling út bestân.
* // iepenet bestân.menu, dat in jildich menubestân befetsje moat, en foeget
* // it yn op 'e hjoeddeiske plak
* OPEN_MENU bestân.menu
* 2. Menu-ôfhanneling út pipe.
* // 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 '|' at jo it menu altiten bywurkje wolle
* // by iepenjen. Dat soe traach wurkje kinne.
* OPEN_MENU | kommando
* OPEN_MENU || kommando
* 3. Mapôfhanneling.
* // Iepenet ien of mear mappen en makket in menu oan, mei dêryn alle
* // submappen en útfierbere bestannen alfabetysk
* // sortearre.
* OPEN_MENU /in/map [/in/oare/map ...]
* 4. Mapôfhanneling mei kommando.
* // Iepenet ien of mear mappen en makket in menu oan, mei dêryn alle
* // submappen en lêsbere bestannen alfabetysk sortearre,
* // elk fan har foarôfgien mei kommando.
* OPEN_MENU [opsjes] /in/map [/in/oare/map ...] WITH kommando -opsjes
* Opsjes:
* -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:
* %s - wurdt ferfongen troch de aktuele seleksje
* %a(titel[,oanwizing]) - iepenet in ynfierfjild mei de opjûne titel en de
* 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\""
*
* Jo kinne ek ûntsnappingstekens brûke, sa as \n
*
* Elke MENU-deklaraasje moat ien keppele END-deklaraasje op it ein hawwe.
*
* Foarbyld:
*
* "Test" MENU
* "XTerm" EXEC xterm
* // makket in submenu mei de ynhâld fan /usr/openwin/bin oan
* "XView-progr" OPEN_MENU "/usr/openwin/bin"
* // wat X11-programma's yn ferskate mappen
* "X11-progr" OPEN_MENU /usr/X11/bin $HOME/bin/X11
* // wat eftergrûnôfbyldingen ynstelle
* "Eftergrûn" OPEN_MENU -noext $HOME/ôfbyldingen /usr/share/images WITH wmsetbg -u -t
* // foeget it style.menu yn mei dit ûnderdiel
* "Styl" OPEN_MENU style.menu
* "Test" END
*/
#include "wmmacros"
"Programma's" MENU
"Ynfo" MENU
"Ynfopaniel" INFO_PANEL
"Juridyske ynfo" LEGAL_PANEL
"Systeemconsole" EXEC xconsole
"Systeembelêsting" SHEXEC xosview || xload
"Proseslist" EXEC xterm -e top
"Hantliedingblêder" EXEC xman
"Ynfo" END
"Utfiere..." SHEXEC %a(Utfiere,Typ út te fieren kommando:)
"XTerm" EXEC xterm -sb
"Mozilla Firefox" EXEC firefox
"Wurkromten" WORKSPACE_MENU
"Programma's" MENU
"Gimp" SHEXEC gimp >/dev/null
"Ghostview" EXEC ghostview %a(GhostView,Fier te besjen bestân yn)
"Xpdf" EXEC xpdf %a(Xpdf,Fier te besjen PDF yn)
"Abiword" EXEC abiword
"Dia" EXEC dia
"OpenOffice.org" MENU
"OpenOffice.org" EXEC ooffice
"Writer" EXEC oowriter
"Rekkenblêd" EXEC oocalc
"Draw" EXEC oodraw
"Impress" EXEC ooimpress
"OpenOffice.org" END
"Tekstbewurkers" MENU
"XEmacs" EXEC xemacs
"Emacs" EXEC emacs
"XJed" EXEC xjed
"VI" EXEC xterm -e vi
"GVIM" EXEC gvim
"NEdit" EXEC nedit
"Xedit" EXEC xedit
"Tekstbewurkers" END
"Multymedia" MENU
"XMMS" MENU
"XMMS" EXEC xmms
"XMMS ôfspylje/skoftsje" EXEC xmms -t
"XMMS stopje" EXEC xmms -s
"XMMS" END
"Xine fideospiler" EXEC xine
"MPlayer" EXEC mplayer
"Multymedia" END
"Programma's" END
"Helpmiddels" MENU
"Rekkenmasine" EXEC xcalc
"Finstereigenskippen" SHEXEC xprop | xmessage -center -title 'xprop' -file -
"Lettertypekiezer" EXEC xfontsel
"Fergrutsje" EXEC wmagnify
"Kleurekaart" EXEC xcmap
"X-programma deadzje" EXEC xkill
"Helpmiddels" END
"Seleksje" MENU
"Kopiearje" SHEXEC echo '%s' | wxcopy
"E-maile nei" EXEC xterm -name mail -T "Pine" -e pine %s
"Navigearje" EXEC netscape %s
"Sykje yn hantlieding" SHEXEC MANUAL_SEARCH(%s)
"Seleksje" END
"Kommando's" MENU
"Oare ferbergje" HIDE_OTHERS
"Alles toane" SHOW_ALL
"Ikoanen skikke" ARRANGE_ICONS
"Fernije" REFRESH
"Beskoattelje" EXEC xlock -allowroot -usefirst
"Kommando's" END
"Uterlik" OPEN_MENU "appearance.menu.fy"
"Sesje" MENU
"Sesje bewarje" SAVE_SESSION
"Sesje wiskje" CLEAR_SESSION
"Window Maker werstarte" RESTART
"BlackBox starte" RESTART blackbox
"IceWM starte" RESTART icewm
"Ofslute" EXIT
"Sesje" END
"Programma's" END
WindowMaker/menu.he
+1 -1
View File
@@ -45,7 +45,7 @@
* // it in current position
* OPEN_MENU file.menu
* 2. Pipe menu handling.
* // opens command and uses its stdout to construct menu.
* // opens command and uses it's stdout to construct menu.
* // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional.
* OPEN_MENU | command
WindowMaker/menu.hr
+1 -1
View File
@@ -45,7 +45,7 @@
* // it in current position
* OPEN_MENU file.menu
* 2. Pipe menu handling.
* // opens command and uses its stdout to construct menu.
* // opens command and uses it's stdout to construct menu.
* // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional.
* OPEN_MENU | command
WindowMaker/menu.hu.in → WindowMaker/menu.hu
+1 -1
View File
@@ -204,7 +204,7 @@
"Háttér" END
"Téma mentése" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Téma neve,Add meg a téma fájl nevét:)"
"Ikonbeállítások mentése" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonbeállítások mentése,Add meg a fájl nevét:)"
"Konfiguráló program" EXEC #wprefs#
"Konfiguráló program" EXEC /usr/bin/WPrefs
"Megjelenés" END
"Kilépés" MENU
WindowMaker/menu.ko.in → WindowMaker/menu.ko
+1 -1
View File
@@ -163,7 +163,7 @@
"세션 지움" CLEAR_SESSION
"창 관 리" END
"작업환경" MENU
"설 정" SHEXEC #wprefs# || wmakerconf
"설 정" SHEXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf
"테 마" OPEN_MENU -noext THEMES_DIR ~/GNUstep/Library/WindowMaker/Themes WITH setstyle
"테마저장" EXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(테마 이름,파일 이름을 입력하세요:)"
"아이콘셋" OPEN_MENU -noext ICON_SETS_DIR ~/GNUstep/Library/WindowMaker/IconSets WITH seticons
WindowMaker/menu.nl.in → WindowMaker/menu.nl
+34 -9
View File
@@ -53,7 +53,7 @@
* // het in op de huidige plaats
* OPEN_MENU bestand.menu
* 2. Menuafhandeling uit pipe.
* // opent commando en gebruikt zijn 'stdout' om een menu aan te maken.
* // opent commando en gebruikt zeen 'stdout' om een menu aan te maken.
* // Commando-output moet een geldige menubeschrijving zijn.
* // De ruimte tussen '|' en het commando zelf is optioneel.
* // Gebruik '||' in plaats van '|' als u het menu altijd wilt bijwerken
@@ -71,13 +71,8 @@
* // elk van hen voorafgegaan met commando.
* OPEN_MENU [opties] /een/map [/een/andere/map ...] WITH commando -opties
* Opties:
* -noext laat alles vanaf de laatste punt in de
* bestandsnaam weg
*
* // Gebruik #usergnusteppath# als tijdelijke aanduiding voor het pad naar de
* // gebruikers-GNUstep-map. Window Maker zal die vervangen met de waarde
* // van WMAKER_USER_ROOT, als deze omgevingsvariabele is ingesteld, of
* // anders "~/GNUstep"
* -noext haal alles vanaf de laatste punt in de
* bestandsnaam eraf
*
* <Parameters> is het uit te voeren programma.
*
@@ -184,7 +179,37 @@
"Vergrendelen" EXEC xlock -allowroot -usefirst
"Commando's" END
"Uiterlijk" OPEN_MENU "appearance.menu.nl"
"Uiterlijk" MENU
"Thema's" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
"Stijlen" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
"Iconensets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
"Achtergrond" MENU
"Effen" MENU
"Zwart" WS_BACK '(solid, black)'
"Blauw" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")'
"Marineblauw" WS_BACK '(solid, "#224477")'
"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" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
"Achtergrond" END
"Thema opslaan" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Themanaam,Voer bestandsnaam in:)"
"Iconenset opslaan" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Iconensetnaam,Voer bestandsnaam in:)"
"Voorkeurenhulpmiddel" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"Uiterlijk" END
"Sessie" MENU
"Sessie opslaan" SAVE_SESSION
WindowMaker/menu.ro.in → WindowMaker/menu.ro
+2 -2
View File
@@ -53,7 +53,7 @@
* // it in current position
* OPEN_MENU file.menu
* 2. Pipe menu handling.
* // opens command and uses its stdout to construct menu.
* // opens command and uses it's stdout to construct menu.
* // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional.
* OPEN_MENU | command
@@ -202,7 +202,7 @@
"Fundal" END
"Salvează Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
"Salvează Setul de Iconiţe" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
"Utilitar de Configurare" EXEC #wprefs#
"Utilitar de Configurare" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"Configurare" END
"Ieşire" MENU
WindowMaker/menu.sk.in → WindowMaker/menu.sk
+1 -1
View File
@@ -216,7 +216,7 @@
"Pozadie" END
"Uložiť tému" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Meno témy,Zadajte názov súboru:)"
"Uložiť sadu ikon" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Meno sady ikon,Zadajte názov súboru:)"
"Konfiguračný nástroj" EXEC #wprefs#
"Konfiguračný nástroj" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"Vzhľad" END
"Koniec" MENU
WindowMaker/menu.sl
+1 -1
View File
@@ -53,7 +53,7 @@
* // it in current position
* OPEN_MENU file.menu
* 2. Pipe menu handling.
* // opens command and uses its stdout to construct menu.
* // opens command and uses it's stdout to construct menu.
* // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional.
* OPEN_MENU | command
WindowMaker/menu.zh_CN
+1 -1
View File
@@ -53,7 +53,7 @@
* // it in current position
* OPEN_MENU file.menu
* 2. Pipe menu handling.
* // opens command and uses its stdout to construct menu.
* // opens command and uses it's stdout to construct menu.
* // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional.
* OPEN_MENU | command
WindowMaker/menu.zh_TW.in → WindowMaker/menu.zh_TW
+2 -2
View File
@@ -52,7 +52,7 @@
* // it in current position
* OPEN_MENU file.menu
* 2. Pipe menu handling.
* // opens command and uses its stdout to construct menu.
* // opens command and uses it's stdout to construct menu.
* // Command's output must be a valid menu description.
* // The space between '|' and command itself is optional.
* OPEN_MENU | command
@@ -199,7 +199,7 @@
"背景" END
"儲存主題" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(主題名稱)"
"儲存圖示集" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(圖示集名稱)"
"偏好設定公用程式" EXEC #wprefs#
"偏好設定公用程式" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"外觀" END
"離開" MENU
WindowMaker/mkMakefile
Executable
+63
View File
@@ -0,0 +1,63 @@
#!/bin/sh
#
# Creates a Makefile.am file containing all the stuff to install
# wmaker data
#
DIRS="Backgrounds Defaults IconSets Icons Pixmaps Styles Themes"
FILE=Makefile.am
spit() {
echo -n "$*" >> $FILE
}
spitln() {
echo "$*" >> $FILE
}
rm -f $FILE
spitln SUBDIRS = $DIRS
spitln
spitln prefsdatadir = '$(pkgdatadir)'
spitln
EXCEPT="Makefile.am Makefile.in Makefile mkMakefile $FILE"
spit prefsdata_DATA =
FILES=`ls -1|grep -v \~`
FILES=`echo $FILES`
for f in $FILES; do
ok=1
for i in $EXCEPT; do
if test "$i" = "$f"; then
ok=0
break
fi
done
if [ -f $f -a $ok = 1 ]; then
spitln \\
spit " $f"
fi
done
spitln
spitln
spitln EXTRA_DIST = '$(prefsdata_DATA)' mkMakefile
spitln
spitln
WindowMaker/plmenu
+106
View File
@@ -0,0 +1,106 @@
("Applications",
("Info",
("Info Panel", INFO_PANEL),
("Legal", LEGAL_PANEL),
("System Console", EXEC, "xconsole"),
("System Load", SHEXEC, "xosview || xload"),
("Process List", EXEC, "xterm -e top"),
("Manual Browser", EXEC, "xman")
),
("Run...", SHEXEC, "%a(Run,Type command to run:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Workspaces", WORKSPACE_MENU),
("Applications",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Spreadsheet", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Editors",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multimedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS play/pause", EXEC, "xmms -t"),
("XMMS stop", EXEC, "xmms -s")
),
("Xine video player", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Utils",
("Calculator", EXEC, "xcalc"),
("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Font Chooser", EXEC, "xfontsel"),
("Magnify", EXEC, "wmagnify"),
("Colormap", EXEC, "xcmap"),
("Kill X Application", EXEC, "xkill")
),
("Selection",
("Copy", SHEXEC, "echo '%s' | wxcopy"),
("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigate", EXEC, "mozilla %s"),
("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
),
("Commands",
("Hide Others", HIDE_OTHERS),
("Show All", SHOW_ALL),
("Arrange Icons", ARRANGE_ICONS),
("Refresh", REFRESH),
("Lock", EXEC, "xlock -allowroot -usefirst")
),
("Appearance",
("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
("Background",
("Solid",
("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
("Blue", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
),
("Gradient",
("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
("Blue Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
("Wheat Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
("Grey Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
("Wine Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
),
("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
),
("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
),
("Session",
("Save Session", SAVE_SESSION),
("Clear Session", CLEAR_SESSION),
("Restart Window Maker", RESTART),
("Start BlackBox", RESTART, blackbox),
("Start IceWM", RESTART, icewm),
("Exit", EXIT)
)
)
WindowMaker/plmenu.bg.in → WindowMaker/plmenu.bg
+1 -1
View File
@@ -94,7 +94,7 @@
),
("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
("Пособие за настройки", EXEC, "#wprefs#")
("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
),
("Изход",
("Рестартиране", RESTART),
WindowMaker/plmenu.es.in → WindowMaker/plmenu.es
+1 -1
View File
@@ -94,7 +94,7 @@
),
("Guardar tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Guardar iconos", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
("Preferencias", EXEC, "#wprefs#")
("Preferencias", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
),
("Salir",
("Reiniciar", RESTART),
WindowMaker/plmenu.fi.in → WindowMaker/plmenu.fi
+1 -1
View File
@@ -357,7 +357,7 @@
(
"Asetukset",
EXEC,
"#wprefs#"
"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs"
)
),
(
WindowMaker/plmenu.fy
+106
View File
@@ -0,0 +1,106 @@
("Programma's",
("Ynfo",
("Ynfopaniel", INFO_PANEL),
("Juridyske ynfo", LEGAL_PANEL),
("Systeemconsole", EXEC, "xconsole"),
("Systeembelêsting", SHEXEC, "xosview || xload"),
("Proseslist", EXEC, "xterm -e top"),
("Hantliedingbrowser", EXEC, "xman")
),
("Utfiere...", SHEXEC, "%a(Utfiere,Typ út te fiere kommando:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Wurkromten", WORKSPACE_MENU),
("Programma's",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Fier te besjen bestân yn)"),
("Xpdf", EXEC, "xpdf %a(Fier te besjen PDF yn)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Rekkenblêd", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Tekstbewurkers",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multymedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS ôfspylje/poazje", EXEC, "xmms -t"),
("XMMS stopje", EXEC, "xmms -s")
),
("Xine fideospeler", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Helpmiddels",
("Rekkenmasine", EXEC, "xcalc"),
("Finstereigenskippen", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Lettertypekiezer", EXEC, "xfontsel"),
("Fergrutsje", EXEC, "wmagnify"),
("Kleurekaart", EXEC, "xcmap"),
("X-programma deadzje", EXEC, "xkill")
),
("Seleksje",
("Kopiearje", SHEXEC, "echo '%s' | wxcopy"),
("E-maile nei", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigearje", EXEC, "mozilla %s"),
("Sykje yn hantlieding", EXEC, "MANUAL_SEARCH(%s)")
),
("Kommando's",
("Oare ferbergje", HIDE_OTHERS),
("Alles toane", SHOW_ALL),
("Ikoanen skikke", ARRANGE_ICONS),
("Fernije", REFRESH),
("Ofskoattelje", EXEC, "xlock -allowroot -usefirst")
),
("Uterlik",
("Tema's", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
("Stilen", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
("Ikoanensets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
("Eftergrûn",
("Effen",
("Swart", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
("Blau", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
("Marineblau", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
("Poarper", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
("Weet", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
("Donkergriis", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
("Wynread", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
),
("Kleurferrin",
("Sinneûndergong", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
("Loft", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
("Blautinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
("Indigotinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
("Poarpertinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
("Weettinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
("Griistinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
("Wynreadtinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
),
("Ofbyldingen", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
),
("Tema bewarje", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Temanamme)\""),
("Ikoanenset bewarje", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikoanensetnamme)\""),
("Foarkarrenhelpmiddel", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
),
("Sesje",
("Sesje bewarje", SAVE_SESSION),
("Sesje wiskje", CLEAR_SESSION),
("Window Maker werstarte", RESTART),
("BlackBox starte", RESTART, blackbox),
("IceWM starte", RESTART, icewm),
("Ofslute", EXIT)
)
)
WindowMaker/plmenu.fy.in
-76
View File
@@ -1,76 +0,0 @@
("Programma's",
("Ynfo",
("Ynfopaniel", INFO_PANEL),
("Juridyske ynfo", LEGAL_PANEL),
("Systeemconsole", EXEC, "xconsole"),
("Systeembelêsting", SHEXEC, "xosview || xload"),
("Proseslist", EXEC, "xterm -e top"),
("Hantliedingblêder", EXEC, "xman")
),
("Utfiere...", SHEXEC, "%a(Utfiere,Typ út te fieren kommando:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Wurkromten", WORKSPACE_MENU),
("Programma's",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Fier te besjen bestân yn)"),
("Xpdf", EXEC, "xpdf %a(Fier te besjen PDF yn)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Rekkenblêd", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Tekstbewurkers",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multymedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS ôfspylje/skoftsje", EXEC, "xmms -t"),
("XMMS stopje", EXEC, "xmms -s")
),
("Xine fideospiler", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Helpmiddels",
("Rekkenmasine", EXEC, "xcalc"),
("Finstereigenskippen", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Lettertypekiezer", EXEC, "xfontsel"),
("Fergrutsje", EXEC, "wmagnify"),
("Kleurekaart", EXEC, "xcmap"),
("X-programma deadzje", EXEC, "xkill")
),
("Seleksje",
("Kopiearje", SHEXEC, "echo '%s' | wxcopy"),
("E-maile nei", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigearje", EXEC, "mozilla %s"),
("Sykje yn hantlieding", EXEC, "MANUAL_SEARCH(%s)")
),
("Kommando's",
("Oare ferbergje", HIDE_OTHERS),
("Alles toane", SHOW_ALL),
("Ikoanen skikke", ARRANGE_ICONS),
("Fernije", REFRESH),
("Beskoattelje", EXEC, "xlock -allowroot -usefirst")
),
("Uterlik", OPEN_MENU, "appearance.menu.fy"),
("Sesje",
("Sesje bewarje", SAVE_SESSION),
("Sesje wiskje", CLEAR_SESSION),
("Window Maker werstarte", RESTART),
("BlackBox starte", RESTART, blackbox),
("IceWM starte", RESTART, icewm),
("Ofslute", EXIT)
)
)
WindowMaker/plmenu.in
-76
View File
@@ -1,76 +0,0 @@
("Applications",
("Info",
("Info Panel", INFO_PANEL),
("Legal", LEGAL_PANEL),
("System Console", EXEC, "xconsole"),
("System Load", SHEXEC, "xosview || xload"),
("Process List", EXEC, "xterm -e top"),
("Manual Browser", EXEC, "xman")
),
("Run...", SHEXEC, "%a(Run,Type command to run:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Workspaces", WORKSPACE_MENU),
("Applications",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Spreadsheet", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Editors",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multimedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS play/pause", EXEC, "xmms -t"),
("XMMS stop", EXEC, "xmms -s")
),
("Xine video player", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Utils",
("Calculator", EXEC, "xcalc"),
("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Font Chooser", EXEC, "xfontsel"),
("Magnify", EXEC, "wmagnify"),
("Colormap", EXEC, "xcmap"),
("Kill X Application", EXEC, "xkill")
),
("Selection",
("Copy", SHEXEC, "echo '%s' | wxcopy"),
("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigate", EXEC, "mozilla %s"),
("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
),
("Commands",
("Hide Others", HIDE_OTHERS),
("Show All", SHOW_ALL),
("Arrange Icons", ARRANGE_ICONS),
("Refresh", REFRESH),
("Lock", EXEC, "xlock -allowroot -usefirst")
),
("Appearance", OPEN_MENU, "appearance.menu"),
("Session",
("Save Session", SAVE_SESSION),
("Clear Session", CLEAR_SESSION),
("Restart Window Maker", RESTART),
("Start BlackBox", RESTART, blackbox),
("Start IceWM", RESTART, icewm),
("Exit", EXIT)
)
)
WindowMaker/plmenu.ja.in → WindowMaker/plmenu.ja
+1 -1
View File
@@ -94,7 +94,7 @@
),
("設定をテーマとしてセーブ", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("現在のアイコンセットをセーブ", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
("設定ユーティリティ", EXEC, "#wprefs#")
("設定ユーティリティ", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
),
("終了",
("再起動", RESTART),
WindowMaker/plmenu.ko.in → WindowMaker/plmenu.ko
+1 -1
View File
@@ -63,7 +63,7 @@
),
("작업공간", WORKSPACE_MENU),
("작업환경",
("설 정", SHEXEC, "#wprefs# || wmakerconf"),
("설 정", SHEXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf"),
("테 마", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
("테마저장", EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(테마 이름,파일 이름을 입력하세요:)\""),
("스 타 일", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
WindowMaker/plmenu.nl
+106
View File
@@ -0,0 +1,106 @@
("Programma's",
("Info",
("Infopaneel", INFO_PANEL),
("Juridische info", LEGAL_PANEL),
("Systeemconsole", EXEC, "xconsole"),
("Systeembelasting", SHEXEC, "xosview || xload"),
("Proceslijst", EXEC, "xterm -e top"),
("Handleidingbrowser", EXEC, "xman")
),
("Uitvoeren...", SHEXEC, "%a(Uitvoeren,Typ uit te voeren commando:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Werkruimten", WORKSPACE_MENU),
("Programma's",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Voer te bekijken bestand in)"),
("Xpdf", EXEC, "xpdf %a(Voer te bekijken PDF in)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Rekenblad", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Tekstbewerkers",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multimedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS afspelen/pauzeren", EXEC, "xmms -t"),
("XMMS stoppen", EXEC, "xmms -s")
),
("Xine videospeler", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Hulpmiddelen",
("Rekenmachine", EXEC, "xcalc"),
("Venstereigenschappen", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Lettertypekiezer", EXEC, "xfontsel"),
("Vergroten", EXEC, "wmagnify"),
("Kleurenkaart", EXEC, "xcmap"),
("X-programma doden", EXEC, "xkill")
),
("Selectie",
("Kopiëren", SHEXEC, "echo '%s' | wxcopy"),
("E-mailen naar", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigeren", EXEC, "mozilla %s"),
("Zoeken in handleiding", EXEC, "MANUAL_SEARCH(%s)")
),
("Commando's",
("Andere verbergen", HIDE_OTHERS),
("Alles tonen", SHOW_ALL),
("Iconen schikken", ARRANGE_ICONS),
("Vernieuwen", REFRESH),
("Vergrendelen", EXEC, "xlock -allowroot -usefirst")
),
("Uiterlijk",
("Thema's", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
("Stijlen", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
("Iconensets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
("Achtergrond",
("Effen",
("Zwart", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
("Blauw", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
("Marineblauw", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
("Purper", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
("Tarwe", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
("Donkergrijs", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
("Wijnrood", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
),
("Kleurverloop",
("Zonsondergang", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
("Lucht", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
("Blauwtinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
("Indigotinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
("Purpertinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
("Tarwetinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
("Grijstinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
("Wijnroodtinten", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
),
("Afbeeldingen", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
),
("Thema opslaan", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Themanaam)\""),
("Iconenset opslaan", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconensetnaam)\""),
("Voorkeurenhulpmiddel", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
),
("Sessie",
("Sessie opslaan", SAVE_SESSION),
("Sessie wissen", CLEAR_SESSION),
("Window Maker herstarten", RESTART),
("BlackBox starten", RESTART, blackbox),
("IceWM starten", RESTART, icewm),
("Afsluiten", EXIT)
)
)
WindowMaker/plmenu.nl.in
-76
View File
@@ -1,76 +0,0 @@
("Programma's",
("Info",
("Infopaneel", INFO_PANEL),
("Juridische info", LEGAL_PANEL),
("Systeemconsole", EXEC, "xconsole"),
("Systeembelasting", SHEXEC, "xosview || xload"),
("Proceslijst", EXEC, "xterm -e top"),
("Handleidingbrowser", EXEC, "xman")
),
("Uitvoeren...", SHEXEC, "%a(Uitvoeren,Typ uit te voeren commando:)"),
("XTerm", EXEC, "xterm -sb"),
("Mozilla Firefox", EXEC, "firefox"),
("Werkruimten", WORKSPACE_MENU),
("Programma's",
("Gimp", SHEXEC, "gimp >/dev/null"),
("Ghostview", EXEC, "ghostview %a(Voer te bekijken bestand in)"),
("Xpdf", EXEC, "xpdf %a(Voer te bekijken PDF in)"),
("Abiword", EXEC, "abiword"),
("Dia", EXEC, "dia"),
("OpenOffice.org",
("OpenOffice.org", EXEC, "ooffice"),
("Writer", EXEC, "oowriter"),
("Rekenblad", EXEC, "oocalc"),
("Draw", EXEC, "oodraw"),
("Impress", EXEC, "ooimpress")
),
("Tekstbewerkers",
("XEmacs", EXEC, "xemacs"),
("Emacs", EXEC, "emacs"),
("XJed", EXEC, "xjed"),
("VI", EXEC, "xterm -e vi"),
("GVIM", EXEC, "gvim"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit")
),
("Multimedia",
("XMMS",
("XMMS", EXEC, "xmms"),
("XMMS afspelen/pauzeren", EXEC, "xmms -t"),
("XMMS stoppen", EXEC, "xmms -s")
),
("Xine videospeler", EXEC, "xine"),
("MPlayer", EXEC, "mplayer")
)
),
("Hulpmiddelen",
("Rekenmachine", EXEC, "xcalc"),
("Venstereigenschappen", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
("Lettertypekiezer", EXEC, "xfontsel"),
("Vergroten", EXEC, "wmagnify"),
("Kleurenkaart", EXEC, "xcmap"),
("X-programma doden", EXEC, "xkill")
),
("Selectie",
("Kopiëren", SHEXEC, "echo '%s' | wxcopy"),
("E-mailen naar", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Navigeren", EXEC, "mozilla %s"),
("Zoeken in handleiding", EXEC, "MANUAL_SEARCH(%s)")
),
("Commando's",
("Andere verbergen", HIDE_OTHERS),
("Alles tonen", SHOW_ALL),
("Iconen schikken", ARRANGE_ICONS),
("Vernieuwen", REFRESH),
("Vergrendelen", EXEC, "xlock -allowroot -usefirst")
),
("Uiterlijk", OPEN_MENU, "appearance.menu.nl"),
("Sessie",
("Sessie opslaan", SAVE_SESSION),
("Sessie wissen", CLEAR_SESSION),
("Window Maker herstarten", RESTART),
("BlackBox starten", RESTART, blackbox),
("IceWM starten", RESTART, icewm),
("Afsluiten", EXIT)
)
)

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