Merge lp:~dbusmenu-team/libdbusmenu/ubuntu into lp:~ubuntu-desktop/libdbusmenu/ubuntu
- ubuntu
- Merge into ubuntu
Proposed by
Ted Gould
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Pending | ||
Review via email: mp+28996@code.launchpad.net |
Commit message
Description of the change
0.3.4
To post a comment you must log in.
- 82. By Sebastien Bacher
-
releasing version 0.3.4-0ubuntu1
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'configure' | |||
2 | --- configure 2010-06-24 14:27:00 +0000 | |||
3 | +++ configure 2010-07-01 14:04:28 +0000 | |||
4 | @@ -1,6 +1,6 @@ | |||
5 | 1 | #! /bin/sh | 1 | #! /bin/sh |
6 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
8 | 3 | # Generated by GNU Autoconf 2.65 for libdbusmenu 0.3.3. | 3 | # Generated by GNU Autoconf 2.65 for libdbusmenu 0.3.4. |
9 | 4 | # | 4 | # |
10 | 5 | # Report bugs to <ted@canonical.com>. | 5 | # Report bugs to <ted@canonical.com>. |
11 | 6 | # | 6 | # |
12 | @@ -703,8 +703,8 @@ | |||
13 | 703 | # Identity of this package. | 703 | # Identity of this package. |
14 | 704 | PACKAGE_NAME='libdbusmenu' | 704 | PACKAGE_NAME='libdbusmenu' |
15 | 705 | PACKAGE_TARNAME='libdbusmenu' | 705 | PACKAGE_TARNAME='libdbusmenu' |
18 | 706 | PACKAGE_VERSION='0.3.3' | 706 | PACKAGE_VERSION='0.3.4' |
19 | 707 | PACKAGE_STRING='libdbusmenu 0.3.3' | 707 | PACKAGE_STRING='libdbusmenu 0.3.4' |
20 | 708 | PACKAGE_BUGREPORT='ted@canonical.com' | 708 | PACKAGE_BUGREPORT='ted@canonical.com' |
21 | 709 | PACKAGE_URL='' | 709 | PACKAGE_URL='' |
22 | 710 | 710 | ||
23 | @@ -1524,7 +1524,7 @@ | |||
24 | 1524 | # Omit some internal or obsolete options to make the list less imposing. | 1524 | # Omit some internal or obsolete options to make the list less imposing. |
25 | 1525 | # This message is too long to be a string in the A/UX 3.1 sh. | 1525 | # This message is too long to be a string in the A/UX 3.1 sh. |
26 | 1526 | cat <<_ACEOF | 1526 | cat <<_ACEOF |
28 | 1527 | \`configure' configures libdbusmenu 0.3.3 to adapt to many kinds of systems. | 1527 | \`configure' configures libdbusmenu 0.3.4 to adapt to many kinds of systems. |
29 | 1528 | 1528 | ||
30 | 1529 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1529 | Usage: $0 [OPTION]... [VAR=VALUE]... |
31 | 1530 | 1530 | ||
32 | @@ -1594,7 +1594,7 @@ | |||
33 | 1594 | 1594 | ||
34 | 1595 | if test -n "$ac_init_help"; then | 1595 | if test -n "$ac_init_help"; then |
35 | 1596 | case $ac_init_help in | 1596 | case $ac_init_help in |
37 | 1597 | short | recursive ) echo "Configuration of libdbusmenu 0.3.3:";; | 1597 | short | recursive ) echo "Configuration of libdbusmenu 0.3.4:";; |
38 | 1598 | esac | 1598 | esac |
39 | 1599 | cat <<\_ACEOF | 1599 | cat <<\_ACEOF |
40 | 1600 | 1600 | ||
41 | @@ -1724,7 +1724,7 @@ | |||
42 | 1724 | test -n "$ac_init_help" && exit $ac_status | 1724 | test -n "$ac_init_help" && exit $ac_status |
43 | 1725 | if $ac_init_version; then | 1725 | if $ac_init_version; then |
44 | 1726 | cat <<\_ACEOF | 1726 | cat <<\_ACEOF |
46 | 1727 | libdbusmenu configure 0.3.3 | 1727 | libdbusmenu configure 0.3.4 |
47 | 1728 | generated by GNU Autoconf 2.65 | 1728 | generated by GNU Autoconf 2.65 |
48 | 1729 | 1729 | ||
49 | 1730 | Copyright (C) 2009 Free Software Foundation, Inc. | 1730 | Copyright (C) 2009 Free Software Foundation, Inc. |
50 | @@ -2097,7 +2097,7 @@ | |||
51 | 2097 | This file contains any messages produced by compilers while | 2097 | This file contains any messages produced by compilers while |
52 | 2098 | running configure, to aid debugging if configure makes a mistake. | 2098 | running configure, to aid debugging if configure makes a mistake. |
53 | 2099 | 2099 | ||
55 | 2100 | It was created by libdbusmenu $as_me 0.3.3, which was | 2100 | It was created by libdbusmenu $as_me 0.3.4, which was |
56 | 2101 | generated by GNU Autoconf 2.65. Invocation command line was | 2101 | generated by GNU Autoconf 2.65. Invocation command line was |
57 | 2102 | 2102 | ||
58 | 2103 | $ $0 $@ | 2103 | $ $0 $@ |
59 | @@ -2911,7 +2911,7 @@ | |||
60 | 2911 | 2911 | ||
61 | 2912 | # Define the identity of the package. | 2912 | # Define the identity of the package. |
62 | 2913 | PACKAGE=libdbusmenu | 2913 | PACKAGE=libdbusmenu |
64 | 2914 | VERSION=0.3.3 | 2914 | VERSION=0.3.4 |
65 | 2915 | 2915 | ||
66 | 2916 | 2916 | ||
67 | 2917 | # Some tools Automake needs. | 2917 | # Some tools Automake needs. |
68 | @@ -12684,6 +12684,7 @@ | |||
69 | 12684 | ########################### | 12684 | ########################### |
70 | 12685 | 12685 | ||
71 | 12686 | JSON_GLIB_REQUIRED_VERSION=0.6.0 | 12686 | JSON_GLIB_REQUIRED_VERSION=0.6.0 |
72 | 12687 | GIO_UNIX_REQUIRED_VERSION=2.24 | ||
73 | 12687 | 12688 | ||
74 | 12688 | 12689 | ||
75 | 12689 | pkg_failed=no | 12690 | pkg_failed=no |
76 | @@ -12695,12 +12696,15 @@ | |||
77 | 12695 | pkg_cv_DBUSMENUTESTS_CFLAGS="$DBUSMENUTESTS_CFLAGS" | 12696 | pkg_cv_DBUSMENUTESTS_CFLAGS="$DBUSMENUTESTS_CFLAGS" |
78 | 12696 | else | 12697 | else |
79 | 12697 | if test -n "$PKG_CONFIG" && \ | 12698 | if test -n "$PKG_CONFIG" && \ |
82 | 12698 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION\""; } >&5 | 12699 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION |
83 | 12699 | ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION") 2>&5 | 12700 | gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 |
84 | 12701 | ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION | ||
85 | 12702 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5 | ||
86 | 12700 | ac_status=$? | 12703 | ac_status=$? |
87 | 12701 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 12704 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
88 | 12702 | test $ac_status = 0; }; then | 12705 | test $ac_status = 0; }; then |
90 | 12703 | pkg_cv_DBUSMENUTESTS_CFLAGS=`$PKG_CONFIG --cflags "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION" 2>/dev/null` | 12706 | pkg_cv_DBUSMENUTESTS_CFLAGS=`$PKG_CONFIG --cflags "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION |
91 | 12707 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null` | ||
92 | 12704 | else | 12708 | else |
93 | 12705 | pkg_failed=yes | 12709 | pkg_failed=yes |
94 | 12706 | fi | 12710 | fi |
95 | @@ -12713,12 +12717,15 @@ | |||
96 | 12713 | pkg_cv_DBUSMENUTESTS_LIBS="$DBUSMENUTESTS_LIBS" | 12717 | pkg_cv_DBUSMENUTESTS_LIBS="$DBUSMENUTESTS_LIBS" |
97 | 12714 | else | 12718 | else |
98 | 12715 | if test -n "$PKG_CONFIG" && \ | 12719 | if test -n "$PKG_CONFIG" && \ |
101 | 12716 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION\""; } >&5 | 12720 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION |
102 | 12717 | ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION") 2>&5 | 12721 | gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 |
103 | 12722 | ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION | ||
104 | 12723 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5 | ||
105 | 12718 | ac_status=$? | 12724 | ac_status=$? |
106 | 12719 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 12725 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
107 | 12720 | test $ac_status = 0; }; then | 12726 | test $ac_status = 0; }; then |
109 | 12721 | pkg_cv_DBUSMENUTESTS_LIBS=`$PKG_CONFIG --libs "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION" 2>/dev/null` | 12727 | pkg_cv_DBUSMENUTESTS_LIBS=`$PKG_CONFIG --libs "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION |
110 | 12728 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null` | ||
111 | 12722 | else | 12729 | else |
112 | 12723 | pkg_failed=yes | 12730 | pkg_failed=yes |
113 | 12724 | fi | 12731 | fi |
114 | @@ -12737,14 +12744,17 @@ | |||
115 | 12737 | _pkg_short_errors_supported=no | 12744 | _pkg_short_errors_supported=no |
116 | 12738 | fi | 12745 | fi |
117 | 12739 | if test $_pkg_short_errors_supported = yes; then | 12746 | if test $_pkg_short_errors_supported = yes; then |
119 | 12740 | DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION"` | 12747 | DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION |
120 | 12748 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION"` | ||
121 | 12741 | else | 12749 | else |
123 | 12742 | DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION"` | 12750 | DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION |
124 | 12751 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION"` | ||
125 | 12743 | fi | 12752 | fi |
126 | 12744 | # Put the nasty error message in config.log where it belongs | 12753 | # Put the nasty error message in config.log where it belongs |
127 | 12745 | echo "$DBUSMENUTESTS_PKG_ERRORS" >&5 | 12754 | echo "$DBUSMENUTESTS_PKG_ERRORS" >&5 |
128 | 12746 | 12755 | ||
130 | 12747 | as_fn_error "Package requirements (json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION) were not met: | 12756 | as_fn_error "Package requirements (json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION |
131 | 12757 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) were not met: | ||
132 | 12748 | 12758 | ||
133 | 12749 | $DBUSMENUTESTS_PKG_ERRORS | 12759 | $DBUSMENUTESTS_PKG_ERRORS |
134 | 12750 | 12760 | ||
135 | @@ -12927,7 +12937,7 @@ | |||
136 | 12927 | ########################### | 12937 | ########################### |
137 | 12928 | 12938 | ||
138 | 12929 | LIBDBUSMENU_CURRENT=1 | 12939 | LIBDBUSMENU_CURRENT=1 |
140 | 12930 | LIBDBUSMENU_REVISION=8 | 12940 | LIBDBUSMENU_REVISION=9 |
141 | 12931 | LIBDBUSMENU_AGE=0 | 12941 | LIBDBUSMENU_AGE=0 |
142 | 12932 | 12942 | ||
143 | 12933 | 12943 | ||
144 | @@ -13673,7 +13683,7 @@ | |||
145 | 13673 | # Files | 13683 | # Files |
146 | 13674 | ########################### | 13684 | ########################### |
147 | 13675 | 13685 | ||
149 | 13676 | ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk.pc tools/Makefile tools/testapp/Makefile tests/Makefile docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile docs/libdbusmenu-glib/reference/version.xml docs/libdbusmenu-gtk/Makefile docs/libdbusmenu-gtk/reference/Makefile docs/libdbusmenu-gtk/reference/version.xml" | 13686 | ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk.pc tools/Makefile tools/testapp/Makefile tests/Makefile tests/dbusmenu-jsonloader.pc docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile docs/libdbusmenu-glib/reference/version.xml docs/libdbusmenu-gtk/Makefile docs/libdbusmenu-gtk/reference/Makefile docs/libdbusmenu-gtk/reference/version.xml" |
150 | 13677 | 13687 | ||
151 | 13678 | cat >confcache <<\_ACEOF | 13688 | cat >confcache <<\_ACEOF |
152 | 13679 | # This file is a shell script that caches the results of configure | 13689 | # This file is a shell script that caches the results of configure |
153 | @@ -14240,7 +14250,7 @@ | |||
154 | 14240 | # report actual input values of CONFIG_FILES etc. instead of their | 14250 | # report actual input values of CONFIG_FILES etc. instead of their |
155 | 14241 | # values after options handling. | 14251 | # values after options handling. |
156 | 14242 | ac_log=" | 14252 | ac_log=" |
158 | 14243 | This file was extended by libdbusmenu $as_me 0.3.3, which was | 14253 | This file was extended by libdbusmenu $as_me 0.3.4, which was |
159 | 14244 | generated by GNU Autoconf 2.65. Invocation command line was | 14254 | generated by GNU Autoconf 2.65. Invocation command line was |
160 | 14245 | 14255 | ||
161 | 14246 | CONFIG_FILES = $CONFIG_FILES | 14256 | CONFIG_FILES = $CONFIG_FILES |
162 | @@ -14306,7 +14316,7 @@ | |||
163 | 14306 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 14316 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
164 | 14307 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 14317 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
165 | 14308 | ac_cs_version="\\ | 14318 | ac_cs_version="\\ |
167 | 14309 | libdbusmenu config.status 0.3.3 | 14319 | libdbusmenu config.status 0.3.4 |
168 | 14310 | configured by $0, generated by GNU Autoconf 2.65, | 14320 | configured by $0, generated by GNU Autoconf 2.65, |
169 | 14311 | with options \\"\$ac_cs_config\\" | 14321 | with options \\"\$ac_cs_config\\" |
170 | 14312 | 14322 | ||
171 | @@ -14698,6 +14708,7 @@ | |||
172 | 14698 | "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; | 14708 | "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; |
173 | 14699 | "tools/testapp/Makefile") CONFIG_FILES="$CONFIG_FILES tools/testapp/Makefile" ;; | 14709 | "tools/testapp/Makefile") CONFIG_FILES="$CONFIG_FILES tools/testapp/Makefile" ;; |
174 | 14700 | "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; | 14710 | "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; |
175 | 14711 | "tests/dbusmenu-jsonloader.pc") CONFIG_FILES="$CONFIG_FILES tests/dbusmenu-jsonloader.pc" ;; | ||
176 | 14701 | "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; | 14712 | "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; |
177 | 14702 | "docs/libdbusmenu-glib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/Makefile" ;; | 14713 | "docs/libdbusmenu-glib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/Makefile" ;; |
178 | 14703 | "docs/libdbusmenu-glib/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/reference/Makefile" ;; | 14714 | "docs/libdbusmenu-glib/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/reference/Makefile" ;; |
179 | 14704 | 14715 | ||
180 | === modified file 'configure.ac' | |||
181 | --- configure.ac 2010-06-24 14:27:00 +0000 | |||
182 | +++ configure.ac 2010-07-01 14:04:28 +0000 | |||
183 | @@ -1,11 +1,11 @@ | |||
184 | 1 | 1 | ||
186 | 2 | AC_INIT(libdbusmenu, 0.3.3, ted@canonical.com) | 2 | AC_INIT(libdbusmenu, 0.3.4, ted@canonical.com) |
187 | 3 | AC_COPYRIGHT([Copyright 2009,2010 Canonical]) | 3 | AC_COPYRIGHT([Copyright 2009,2010 Canonical]) |
188 | 4 | 4 | ||
189 | 5 | AC_PREREQ(2.62) | 5 | AC_PREREQ(2.62) |
190 | 6 | 6 | ||
191 | 7 | AM_CONFIG_HEADER(config.h) | 7 | AM_CONFIG_HEADER(config.h) |
193 | 8 | AM_INIT_AUTOMAKE(libdbusmenu, 0.3.3, [-Wno-portability]) | 8 | AM_INIT_AUTOMAKE(libdbusmenu, 0.3.4, [-Wno-portability]) |
194 | 9 | 9 | ||
195 | 10 | AM_MAINTAINER_MODE | 10 | AM_MAINTAINER_MODE |
196 | 11 | 11 | ||
197 | @@ -62,8 +62,10 @@ | |||
198 | 62 | ########################### | 62 | ########################### |
199 | 63 | 63 | ||
200 | 64 | JSON_GLIB_REQUIRED_VERSION=0.6.0 | 64 | JSON_GLIB_REQUIRED_VERSION=0.6.0 |
201 | 65 | GIO_UNIX_REQUIRED_VERSION=2.24 | ||
202 | 65 | 66 | ||
204 | 66 | PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION) | 67 | PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION |
205 | 68 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) | ||
206 | 67 | 69 | ||
207 | 68 | AC_SUBST(DBUSMENUTESTS_CFLAGS) | 70 | AC_SUBST(DBUSMENUTESTS_CFLAGS) |
208 | 69 | AC_SUBST(DBUSMENUTESTS_LIBS) | 71 | AC_SUBST(DBUSMENUTESTS_LIBS) |
209 | @@ -85,7 +87,7 @@ | |||
210 | 85 | ########################### | 87 | ########################### |
211 | 86 | 88 | ||
212 | 87 | LIBDBUSMENU_CURRENT=1 | 89 | LIBDBUSMENU_CURRENT=1 |
214 | 88 | LIBDBUSMENU_REVISION=8 | 90 | LIBDBUSMENU_REVISION=9 |
215 | 89 | LIBDBUSMENU_AGE=0 | 91 | LIBDBUSMENU_AGE=0 |
216 | 90 | 92 | ||
217 | 91 | AC_SUBST(LIBDBUSMENU_CURRENT) | 93 | AC_SUBST(LIBDBUSMENU_CURRENT) |
218 | @@ -126,6 +128,7 @@ | |||
219 | 126 | tools/Makefile | 128 | tools/Makefile |
220 | 127 | tools/testapp/Makefile | 129 | tools/testapp/Makefile |
221 | 128 | tests/Makefile | 130 | tests/Makefile |
222 | 131 | tests/dbusmenu-jsonloader.pc | ||
223 | 129 | docs/Makefile | 132 | docs/Makefile |
224 | 130 | docs/libdbusmenu-glib/Makefile | 133 | docs/libdbusmenu-glib/Makefile |
225 | 131 | docs/libdbusmenu-glib/reference/Makefile | 134 | docs/libdbusmenu-glib/reference/Makefile |
226 | 132 | 135 | ||
227 | === modified file 'debian/changelog' | |||
228 | --- debian/changelog 2010-06-24 16:18:44 +0000 | |||
229 | +++ debian/changelog 2010-07-01 14:04:28 +0000 | |||
230 | @@ -1,3 +1,14 @@ | |||
231 | 1 | libdbusmenu (0.3.4-0ubuntu1~ppa1) lucid; urgency=low | ||
232 | 2 | |||
233 | 3 | * New upstream release. | ||
234 | 4 | * Block building submenus on separators (LP: #598620) | ||
235 | 5 | * Adding more through JSON support for testing | ||
236 | 6 | * Fixing up value handling in dbusmenu-dumper | ||
237 | 7 | * debian/control, debian/libdbusmenu-jsonloader*install: Adding | ||
238 | 8 | two binary packages for the jsonloader test library. | ||
239 | 9 | |||
240 | 10 | -- Ted Gould <ted@ubuntu.com> Thu, 01 Jul 2010 09:00:16 -0500 | ||
241 | 11 | |||
242 | 1 | libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low | 12 | libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low |
243 | 2 | 13 | ||
244 | 3 | * New upstream release. | 14 | * New upstream release. |
245 | 4 | 15 | ||
246 | === modified file 'debian/control' | |||
247 | --- debian/control 2010-06-16 15:39:20 +0000 | |||
248 | +++ debian/control 2010-07-01 14:04:28 +0000 | |||
249 | @@ -149,3 +149,32 @@ | |||
250 | 149 | . | 149 | . |
251 | 150 | This package contains developer documentation for libdbusmenu-gtk. | 150 | This package contains developer documentation for libdbusmenu-gtk. |
252 | 151 | 151 | ||
253 | 152 | Package: libdbusmenu-jsonloader1 | ||
254 | 153 | Section: libs | ||
255 | 154 | Architecture: any | ||
256 | 155 | Depends: ${shlibs:Depends}, | ||
257 | 156 | ${misc:Depends} | ||
258 | 157 | Description: library for passing menus over DBus - Test lib | ||
259 | 158 | libdbusmenu passes a menu structure across DBus so that a program can | ||
260 | 159 | create a menu simply without worrying about how it is displayed on the | ||
261 | 160 | other side of the bus. | ||
262 | 161 | . | ||
263 | 162 | This package contains shared libraries to be by test suites in applications | ||
264 | 163 | or libraries using dbusmenu. | ||
265 | 164 | |||
266 | 165 | Package: libdbusmenu-jsonloader-dev | ||
267 | 166 | Section: libdevel | ||
268 | 167 | Architecture: any | ||
269 | 168 | Depends: ${shlibs:Depends}, | ||
270 | 169 | ${misc:Depends}, | ||
271 | 170 | libdbus-glib-1-dev (>= 0.76), | ||
272 | 171 | libdbusmenu-glib-dev (= ${binary:Version}), | ||
273 | 172 | libjson-glib-dev | ||
274 | 173 | Description: library for passing menus over DBus - Test lib | ||
275 | 174 | libdbusmenu passes a menu structure across DBus so that a program can | ||
276 | 175 | create a menu simply without worrying about how it is displayed on the | ||
277 | 176 | other side of the bus. | ||
278 | 177 | . | ||
279 | 178 | This package contains files that are needed to build test suites in applications | ||
280 | 179 | or libraries using dbusmenu. | ||
281 | 180 | |||
282 | 152 | 181 | ||
283 | === added file 'debian/libdbusmenu-jsonloader-dev.install' | |||
284 | --- debian/libdbusmenu-jsonloader-dev.install 1970-01-01 00:00:00 +0000 | |||
285 | +++ debian/libdbusmenu-jsonloader-dev.install 2010-07-01 14:04:28 +0000 | |||
286 | @@ -0,0 +1,4 @@ | |||
287 | 1 | debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-jsonloader/* | ||
288 | 2 | debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader.pc | ||
289 | 3 | debian/tmp/usr/lib/libdbusmenu-jsonloader.a | ||
290 | 4 | debian/tmp/usr/lib/libdbusmenu-jsonloader.so | ||
291 | 0 | 5 | ||
292 | === added file 'debian/libdbusmenu-jsonloader1.install' | |||
293 | --- debian/libdbusmenu-jsonloader1.install 1970-01-01 00:00:00 +0000 | |||
294 | +++ debian/libdbusmenu-jsonloader1.install 2010-07-01 14:04:28 +0000 | |||
295 | @@ -0,0 +1,1 @@ | |||
296 | 1 | debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* | ||
297 | 0 | 2 | ||
298 | === modified file 'docs/libdbusmenu-glib/reference/html/ch01.html' | |||
299 | --- docs/libdbusmenu-glib/reference/html/ch01.html 2010-06-10 17:33:17 +0000 | |||
300 | +++ docs/libdbusmenu-glib/reference/html/ch01.html 2010-07-01 14:04:28 +0000 | |||
301 | @@ -21,7 +21,7 @@ | |||
302 | 21 | </tr></table> | 21 | </tr></table> |
303 | 22 | <div class="chapter" title="API"> | 22 | <div class="chapter" title="API"> |
304 | 23 | <div class="titlepage"><div><div><h2 class="title"> | 23 | <div class="titlepage"><div><div><h2 class="title"> |
306 | 24 | <a name="id339465"></a>API</h2></div></div></div> | 24 | <a name="id390460"></a>API</h2></div></div></div> |
307 | 25 | <div class="toc"><dl> | 25 | <div class="toc"><dl> |
308 | 26 | <dt> | 26 | <dt> |
309 | 27 | <span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span> | 27 | <span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span> |
310 | 28 | 28 | ||
311 | === modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html' | |||
312 | --- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html 2010-06-24 14:27:00 +0000 | |||
313 | +++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html 2010-07-01 14:04:28 +0000 | |||
314 | @@ -455,6 +455,7 @@ | |||
315 | 455 | <td><p><span class="term"><em class="parameter"><code>id</code></em>Â :</span></p></td> | 455 | <td><p><span class="term"><em class="parameter"><code>id</code></em>Â :</span></p></td> |
316 | 456 | <td> | 456 | <td> |
317 | 457 | <em class="parameter"><code>gpointer</code></em> user_data: | 457 | <em class="parameter"><code>gpointer</code></em> user_data: |
318 | 458 | <em class="parameter"><code>gpointer</code></em> user_data: | ||
319 | 458 | </td> | 459 | </td> |
320 | 459 | </tr> | 460 | </tr> |
321 | 460 | <tr> | 461 | <tr> |
322 | 461 | 462 | ||
323 | === modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html' | |||
324 | --- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2010-06-24 14:21:02 +0000 | |||
325 | +++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2010-07-01 14:04:28 +0000 | |||
326 | @@ -287,7 +287,7 @@ | |||
327 | 287 | <hr> | 287 | <hr> |
328 | 288 | <div class="refsect2" title="DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY"> | 288 | <div class="refsect2" title="DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY"> |
329 | 289 | <a name="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</h3> | 289 | <a name="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</h3> |
331 | 290 | <pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "child-display" | 290 | <pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "children-display" |
332 | 291 | </pre> | 291 | </pre> |
333 | 292 | <p> | 292 | <p> |
334 | 293 | </p> | 293 | </p> |
335 | 294 | 294 | ||
336 | === modified file 'docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml' | |||
337 | --- docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml 2010-06-10 17:33:17 +0000 | |||
338 | +++ docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml 2010-07-01 14:04:28 +0000 | |||
339 | @@ -9,13 +9,11 @@ | |||
340 | 9 | 9 | ||
341 | 10 | </para> | 10 | </para> |
342 | 11 | 11 | ||
343 | 12 | |||
344 | 13 | <!-- ##### SECTION See_Also ##### --> | 12 | <!-- ##### SECTION See_Also ##### --> |
345 | 14 | <para> | 13 | <para> |
346 | 15 | 14 | ||
347 | 16 | </para> | 15 | </para> |
348 | 17 | 16 | ||
349 | 18 | |||
350 | 19 | <!-- ##### SECTION Stability_Level ##### --> | 17 | <!-- ##### SECTION Stability_Level ##### --> |
351 | 20 | 18 | ||
352 | 21 | 19 | ||
353 | 22 | 20 | ||
354 | === modified file 'docs/libdbusmenu-glib/reference/tmpl/client.sgml' | |||
355 | --- docs/libdbusmenu-glib/reference/tmpl/client.sgml 2010-06-10 17:33:17 +0000 | |||
356 | +++ docs/libdbusmenu-glib/reference/tmpl/client.sgml 2010-07-01 14:04:28 +0000 | |||
357 | @@ -9,13 +9,11 @@ | |||
358 | 9 | 9 | ||
359 | 10 | </para> | 10 | </para> |
360 | 11 | 11 | ||
361 | 12 | |||
362 | 13 | <!-- ##### SECTION See_Also ##### --> | 12 | <!-- ##### SECTION See_Also ##### --> |
363 | 14 | <para> | 13 | <para> |
364 | 15 | 14 | ||
365 | 16 | </para> | 15 | </para> |
366 | 17 | 16 | ||
367 | 18 | |||
368 | 19 | <!-- ##### SECTION Stability_Level ##### --> | 17 | <!-- ##### SECTION Stability_Level ##### --> |
369 | 20 | 18 | ||
370 | 21 | 19 | ||
371 | @@ -159,6 +157,7 @@ | |||
372 | 159 | 157 | ||
373 | 160 | @client: | 158 | @client: |
374 | 161 | @id: | 159 | @id: |
375 | 160 | @gpointer user_data: | ||
376 | 162 | @gpointer user_data: | 161 | @gpointer user_data: |
377 | 163 | @cb_data: | 162 | @cb_data: |
378 | 164 | 163 | ||
379 | 165 | 164 | ||
380 | === modified file 'docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml' | |||
381 | --- docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml 2010-06-10 17:33:17 +0000 | |||
382 | +++ docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml 2010-07-01 14:04:28 +0000 | |||
383 | @@ -9,13 +9,11 @@ | |||
384 | 9 | 9 | ||
385 | 10 | </para> | 10 | </para> |
386 | 11 | 11 | ||
387 | 12 | |||
388 | 13 | <!-- ##### SECTION See_Also ##### --> | 12 | <!-- ##### SECTION See_Also ##### --> |
389 | 14 | <para> | 13 | <para> |
390 | 15 | 14 | ||
391 | 16 | </para> | 15 | </para> |
392 | 17 | 16 | ||
393 | 18 | |||
394 | 19 | <!-- ##### SECTION Stability_Level ##### --> | 17 | <!-- ##### SECTION Stability_Level ##### --> |
395 | 20 | 18 | ||
396 | 21 | 19 | ||
397 | 22 | 20 | ||
398 | === modified file 'docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml' | |||
399 | --- docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml 2010-06-10 17:33:17 +0000 | |||
400 | +++ docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml 2010-07-01 14:04:28 +0000 | |||
401 | @@ -9,13 +9,11 @@ | |||
402 | 9 | 9 | ||
403 | 10 | </para> | 10 | </para> |
404 | 11 | 11 | ||
405 | 12 | |||
406 | 13 | <!-- ##### SECTION See_Also ##### --> | 12 | <!-- ##### SECTION See_Also ##### --> |
407 | 14 | <para> | 13 | <para> |
408 | 15 | 14 | ||
409 | 16 | </para> | 15 | </para> |
410 | 17 | 16 | ||
411 | 18 | |||
412 | 19 | <!-- ##### SECTION Stability_Level ##### --> | 17 | <!-- ##### SECTION Stability_Level ##### --> |
413 | 20 | 18 | ||
414 | 21 | 19 | ||
415 | @@ -507,6 +505,7 @@ | |||
416 | 507 | </para> | 505 | </para> |
417 | 508 | 506 | ||
418 | 509 | @mi: | 507 | @mi: |
419 | 508 | @DbusmenuMenuitem * mi, gpointer data: | ||
420 | 510 | @DbusmenuMenuitem * mi, gpointer data: | 509 | @DbusmenuMenuitem * mi, gpointer data: |
421 | 511 | @data: | 510 | @data: |
422 | 512 | 511 | ||
423 | 513 | 512 | ||
424 | === modified file 'docs/libdbusmenu-glib/reference/tmpl/server.sgml' | |||
425 | --- docs/libdbusmenu-glib/reference/tmpl/server.sgml 2010-06-10 17:33:17 +0000 | |||
426 | +++ docs/libdbusmenu-glib/reference/tmpl/server.sgml 2010-07-01 14:04:28 +0000 | |||
427 | @@ -9,13 +9,11 @@ | |||
428 | 9 | 9 | ||
429 | 10 | </para> | 10 | </para> |
430 | 11 | 11 | ||
431 | 12 | |||
432 | 13 | <!-- ##### SECTION See_Also ##### --> | 12 | <!-- ##### SECTION See_Also ##### --> |
433 | 14 | <para> | 13 | <para> |
434 | 15 | 14 | ||
435 | 16 | </para> | 15 | </para> |
436 | 17 | 16 | ||
437 | 18 | |||
438 | 19 | <!-- ##### SECTION Stability_Level ##### --> | 17 | <!-- ##### SECTION Stability_Level ##### --> |
439 | 20 | 18 | ||
440 | 21 | 19 | ||
441 | 22 | 20 | ||
442 | === modified file 'docs/libdbusmenu-glib/reference/version.xml' | |||
443 | --- docs/libdbusmenu-glib/reference/version.xml 2010-06-24 14:27:00 +0000 | |||
444 | +++ docs/libdbusmenu-glib/reference/version.xml 2010-07-01 14:04:28 +0000 | |||
445 | @@ -1,1 +1,1 @@ | |||
447 | 1 | 0.3.3 | 1 | 0.3.4 |
448 | 2 | 2 | ||
449 | === modified file 'docs/libdbusmenu-glib/reference/xml/client.xml' | |||
450 | --- docs/libdbusmenu-glib/reference/xml/client.xml 2010-06-10 17:33:17 +0000 | |||
451 | +++ docs/libdbusmenu-glib/reference/xml/client.xml 2010-07-01 14:04:28 +0000 | |||
452 | @@ -342,6 +342,7 @@ | |||
453 | 342 | <varlistentry><term><parameter>id</parameter> :</term> | 342 | <varlistentry><term><parameter>id</parameter> :</term> |
454 | 343 | <listitem><simpara> | 343 | <listitem><simpara> |
455 | 344 | <parameter>gpointer</parameter> user_data: | 344 | <parameter>gpointer</parameter> user_data: |
456 | 345 | <parameter>gpointer</parameter> user_data: | ||
457 | 345 | </simpara></listitem></varlistentry> | 346 | </simpara></listitem></varlistentry> |
458 | 346 | <varlistentry><term><parameter>cb_data</parameter> :</term> | 347 | <varlistentry><term><parameter>cb_data</parameter> :</term> |
459 | 347 | <listitem><simpara> | 348 | <listitem><simpara> |
460 | 348 | 349 | ||
461 | === modified file 'docs/libdbusmenu-glib/reference/xml/menuitem.xml' | |||
462 | --- docs/libdbusmenu-glib/reference/xml/menuitem.xml 2010-06-10 17:33:17 +0000 | |||
463 | +++ docs/libdbusmenu-glib/reference/xml/menuitem.xml 2010-07-01 14:04:28 +0000 | |||
464 | @@ -257,7 +257,7 @@ | |||
465 | 257 | <refsect2 id="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS" role="macro"> | 257 | <refsect2 id="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS" role="macro"> |
466 | 258 | <title>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</title> | 258 | <title>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</title> |
467 | 259 | <indexterm zone="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS"><primary>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</primary></indexterm> | 259 | <indexterm zone="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS"><primary>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</primary></indexterm> |
469 | 260 | <programlisting>#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "child-display" | 260 | <programlisting>#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "children-display" |
470 | 261 | </programlisting> | 261 | </programlisting> |
471 | 262 | <para> | 262 | <para> |
472 | 263 | </para></refsect2> | 263 | </para></refsect2> |
473 | 264 | 264 | ||
474 | === modified file 'docs/libdbusmenu-gtk/reference/html/ch01.html' | |||
475 | --- docs/libdbusmenu-gtk/reference/html/ch01.html 2010-06-10 17:33:17 +0000 | |||
476 | +++ docs/libdbusmenu-gtk/reference/html/ch01.html 2010-07-01 14:04:28 +0000 | |||
477 | @@ -21,7 +21,7 @@ | |||
478 | 21 | </tr></table> | 21 | </tr></table> |
479 | 22 | <div class="chapter" title="API"> | 22 | <div class="chapter" title="API"> |
480 | 23 | <div class="titlepage"><div><div><h2 class="title"> | 23 | <div class="titlepage"><div><div><h2 class="title"> |
482 | 24 | <a name="id422170"></a>API</h2></div></div></div> | 24 | <a name="id512726"></a>API</h2></div></div></div> |
483 | 25 | <div class="toc"><dl> | 25 | <div class="toc"><dl> |
484 | 26 | <dt> | 26 | <dt> |
485 | 27 | <span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"></span> | 27 | <span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"></span> |
486 | 28 | 28 | ||
487 | === modified file 'docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html' | |||
488 | --- docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html 2010-06-24 14:27:00 +0000 | |||
489 | +++ docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html 2010-07-01 14:04:28 +0000 | |||
490 | @@ -43,14 +43,14 @@ | |||
491 | 43 | <span class="returnvalue">DbusmenuGtkClient</span> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-new" title="dbusmenu_gtkclient_new ()">dbusmenu_gtkclient_new</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>, | 43 | <span class="returnvalue">DbusmenuGtkClient</span> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-new" title="dbusmenu_gtkclient_new ()">dbusmenu_gtkclient_new</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>, |
492 | 44 | <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>); | 44 | <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>); |
493 | 45 | <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get" title="dbusmenu_gtkclient_menuitem_get ()">dbusmenu_gtkclient_menuitem_get</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, | 45 | <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get" title="dbusmenu_gtkclient_menuitem_get ()">dbusmenu_gtkclient_menuitem_get</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, |
495 | 46 | <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>); | 46 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>); |
496 | 47 | <a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get-submenu" title="dbusmenu_gtkclient_menuitem_get_submenu ()">dbusmenu_gtkclient_menuitem_get_submenu</a> | 47 | <a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get-submenu" title="dbusmenu_gtkclient_menuitem_get_submenu ()">dbusmenu_gtkclient_menuitem_get_submenu</a> |
497 | 48 | (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, | 48 | (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, |
499 | 49 | <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>); | 49 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>); |
500 | 50 | <span class="returnvalue">void</span> <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-newitem-base" title="dbusmenu_gtkclient_newitem_base ()">dbusmenu_gtkclient_newitem_base</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, | 50 | <span class="returnvalue">void</span> <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-newitem-base" title="dbusmenu_gtkclient_newitem_base ()">dbusmenu_gtkclient_newitem_base</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, |
502 | 51 | <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>, | 51 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>, |
503 | 52 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>, | 52 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>, |
505 | 53 | <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *parent</code></em>); | 53 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>); |
506 | 54 | </pre> | 54 | </pre> |
507 | 55 | </div> | 55 | </div> |
508 | 56 | <div class="refsect1" title="Description"> | 56 | <div class="refsect1" title="Description"> |
509 | @@ -95,7 +95,7 @@ | |||
510 | 95 | <col align="left" valign="top"> | 95 | <col align="left" valign="top"> |
511 | 96 | <tbody> | 96 | <tbody> |
512 | 97 | <tr> | 97 | <tr> |
514 | 98 | <td><p><span class="term"><span class="type">DbusmenuClientClass</span>Â <em class="structfield"><code><a name="DbusmenuGtkClientClass.parent-class"></a>parent_class</code></em>;</span></p></td> | 98 | <td><p><span class="term"><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientClass"><span class="type">DbusmenuClientClass</span></a>Â <em class="structfield"><code><a name="DbusmenuGtkClientClass.parent-class"></a>parent_class</code></em>;</span></p></td> |
515 | 99 | <td> | 99 | <td> |
516 | 100 | <span class="type">GtkMenuClass</span> | 100 | <span class="type">GtkMenuClass</span> |
517 | 101 | </td> | 101 | </td> |
518 | @@ -134,15 +134,15 @@ | |||
519 | 134 | <pre class="programlisting"><span class="returnvalue">DbusmenuGtkClient</span> * dbusmenu_gtkclient_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>, | 134 | <pre class="programlisting"><span class="returnvalue">DbusmenuGtkClient</span> * dbusmenu_gtkclient_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>, |
520 | 135 | <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>);</pre> | 135 | <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>);</pre> |
521 | 136 | <p> | 136 | <p> |
524 | 137 | Creates a new <span class="type">DbusmenuGtkClient</span> object and creates a <span class="type">DbusmenuClient</span> | 137 | Creates a new <span class="type">DbusmenuGtkClient</span> object and creates a <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DbusmenuClient"><span class="type">DbusmenuClient</span></a> |
525 | 138 | that connects across DBus to a <span class="type">DbusmenuServer</span>. | 138 | that connects across DBus to a <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a>. |
526 | 139 | </p> | 139 | </p> |
527 | 140 | <div class="variablelist"><table border="0"> | 140 | <div class="variablelist"><table border="0"> |
528 | 141 | <col align="left" valign="top"> | 141 | <col align="left" valign="top"> |
529 | 142 | <tbody> | 142 | <tbody> |
530 | 143 | <tr> | 143 | <tr> |
531 | 144 | <td><p><span class="term"><em class="parameter"><code>dbus_name</code></em>Â :</span></p></td> | 144 | <td><p><span class="term"><em class="parameter"><code>dbus_name</code></em>Â :</span></p></td> |
533 | 145 | <td>Name of the <span class="type">DbusmenuServer</span> on DBus | 145 | <td>Name of the <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a> on DBus |
534 | 146 | </td> | 146 | </td> |
535 | 147 | </tr> | 147 | </tr> |
536 | 148 | <tr> | 148 | <tr> |
537 | @@ -162,10 +162,10 @@ | |||
538 | 162 | <div class="refsect2" title="dbusmenu_gtkclient_menuitem_get ()"> | 162 | <div class="refsect2" title="dbusmenu_gtkclient_menuitem_get ()"> |
539 | 163 | <a name="dbusmenu-gtkclient-menuitem-get"></a><h3>dbusmenu_gtkclient_menuitem_get ()</h3> | 163 | <a name="dbusmenu-gtkclient-menuitem-get"></a><h3>dbusmenu_gtkclient_menuitem_get ()</h3> |
540 | 164 | <pre class="programlisting"><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> * dbusmenu_gtkclient_menuitem_get (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, | 164 | <pre class="programlisting"><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> * dbusmenu_gtkclient_menuitem_get (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, |
542 | 165 | <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>);</pre> | 165 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);</pre> |
543 | 166 | <p> | 166 | <p> |
544 | 167 | This grabs the <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> that is associated with the | 167 | This grabs the <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> that is associated with the |
546 | 168 | <span class="type">DbusmenuMenuitem</span>. | 168 | <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>. |
547 | 169 | </p> | 169 | </p> |
548 | 170 | <div class="variablelist"><table border="0"> | 170 | <div class="variablelist"><table border="0"> |
549 | 171 | <col align="left" valign="top"> | 171 | <col align="left" valign="top"> |
550 | @@ -178,7 +178,7 @@ | |||
551 | 178 | <tr> | 178 | <tr> |
552 | 179 | <td><p><span class="term"><em class="parameter"><code>item</code></em>Â :</span></p></td> | 179 | <td><p><span class="term"><em class="parameter"><code>item</code></em>Â :</span></p></td> |
553 | 180 | <td> | 180 | <td> |
555 | 181 | <span class="type">DbusmenuMenuitem</span> to get associated <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> on. | 181 | <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to get associated <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> on. |
556 | 182 | </td> | 182 | </td> |
557 | 183 | </tr> | 183 | </tr> |
558 | 184 | <tr> | 184 | <tr> |
559 | @@ -194,7 +194,7 @@ | |||
560 | 194 | <a name="dbusmenu-gtkclient-menuitem-get-submenu"></a><h3>dbusmenu_gtkclient_menuitem_get_submenu ()</h3> | 194 | <a name="dbusmenu-gtkclient-menuitem-get-submenu"></a><h3>dbusmenu_gtkclient_menuitem_get_submenu ()</h3> |
561 | 195 | <pre class="programlisting"><a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * dbusmenu_gtkclient_menuitem_get_submenu | 195 | <pre class="programlisting"><a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * dbusmenu_gtkclient_menuitem_get_submenu |
562 | 196 | (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, | 196 | (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, |
564 | 197 | <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>);</pre> | 197 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);</pre> |
565 | 198 | <p> | 198 | <p> |
566 | 199 | This grabs the submenu associated with the menuitem. | 199 | This grabs the submenu associated with the menuitem. |
567 | 200 | </p> | 200 | </p> |
568 | @@ -209,7 +209,7 @@ | |||
569 | 209 | <tr> | 209 | <tr> |
570 | 210 | <td><p><span class="term"><em class="parameter"><code>item</code></em>Â :</span></p></td> | 210 | <td><p><span class="term"><em class="parameter"><code>item</code></em>Â :</span></p></td> |
571 | 211 | <td> | 211 | <td> |
573 | 212 | <span class="type">DbusmenuMenuitem</span> to get associated <a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> on. | 212 | <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to get associated <a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> on. |
574 | 213 | </td> | 213 | </td> |
575 | 214 | </tr> | 214 | </tr> |
576 | 215 | <tr> | 215 | <tr> |
577 | @@ -224,9 +224,9 @@ | |||
578 | 224 | <div class="refsect2" title="dbusmenu_gtkclient_newitem_base ()"> | 224 | <div class="refsect2" title="dbusmenu_gtkclient_newitem_base ()"> |
579 | 225 | <a name="dbusmenu-gtkclient-newitem-base"></a><h3>dbusmenu_gtkclient_newitem_base ()</h3> | 225 | <a name="dbusmenu-gtkclient-newitem-base"></a><h3>dbusmenu_gtkclient_newitem_base ()</h3> |
580 | 226 | <pre class="programlisting"><span class="returnvalue">void</span> dbusmenu_gtkclient_newitem_base (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, | 226 | <pre class="programlisting"><span class="returnvalue">void</span> dbusmenu_gtkclient_newitem_base (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>, |
582 | 227 | <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>, | 227 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>, |
583 | 228 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>, | 228 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>, |
585 | 229 | <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *parent</code></em>);</pre> | 229 | <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);</pre> |
586 | 230 | <p> | 230 | <p> |
587 | 231 | This function provides some of the basic connectivity for being in | 231 | This function provides some of the basic connectivity for being in |
588 | 232 | the GTK world. Things like visibility and sensitivity of the item are | 232 | the GTK world. Things like visibility and sensitivity of the item are |
589 | @@ -236,7 +236,7 @@ | |||
590 | 236 | </p> | 236 | </p> |
591 | 237 | <p> | 237 | <p> |
592 | 238 | This also handles passing the "activate" signal back to the | 238 | This also handles passing the "activate" signal back to the |
594 | 239 | <span class="type">DbusmenuMenuitem</span> side of thing. | 239 | <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> side of thing. |
595 | 240 | </p> | 240 | </p> |
596 | 241 | <div class="variablelist"><table border="0"> | 241 | <div class="variablelist"><table border="0"> |
597 | 242 | <col align="left" valign="top"> | 242 | <col align="left" valign="top"> |
598 | @@ -248,7 +248,7 @@ | |||
599 | 248 | </tr> | 248 | </tr> |
600 | 249 | <tr> | 249 | <tr> |
601 | 250 | <td><p><span class="term"><em class="parameter"><code>item</code></em>Â :</span></p></td> | 250 | <td><p><span class="term"><em class="parameter"><code>item</code></em>Â :</span></p></td> |
603 | 251 | <td>The <span class="type">DbusmenuMenuitem</span> to attach the GTK-isms to | 251 | <td>The <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to attach the GTK-isms to |
604 | 252 | </td> | 252 | </td> |
605 | 253 | </tr> | 253 | </tr> |
606 | 254 | <tr> | 254 | <tr> |
607 | @@ -258,7 +258,7 @@ | |||
608 | 258 | </tr> | 258 | </tr> |
609 | 259 | <tr> | 259 | <tr> |
610 | 260 | <td><p><span class="term"><em class="parameter"><code>parent</code></em>Â :</span></p></td> | 260 | <td><p><span class="term"><em class="parameter"><code>parent</code></em>Â :</span></p></td> |
612 | 261 | <td>The parent <span class="type">DbusmenuMenuitem</span> | 261 | <td>The parent <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> |
613 | 262 | </td> | 262 | </td> |
614 | 263 | </tr> | 263 | </tr> |
615 | 264 | </tbody> | 264 | </tbody> |
616 | 265 | 265 | ||
617 | === modified file 'docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html' | |||
618 | --- docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html 2010-06-24 14:27:00 +0000 | |||
619 | +++ docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html 2010-07-01 14:04:28 +0000 | |||
620 | @@ -109,15 +109,15 @@ | |||
621 | 109 | <pre class="programlisting"><span class="returnvalue">DbusmenuGtkMenu</span> * dbusmenu_gtkmenu_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>, | 109 | <pre class="programlisting"><span class="returnvalue">DbusmenuGtkMenu</span> * dbusmenu_gtkmenu_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>, |
622 | 110 | <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>);</pre> | 110 | <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>);</pre> |
623 | 111 | <p> | 111 | <p> |
626 | 112 | Creates a new <span class="type">DbusmenuGtkMenu</span> object and creates a <span class="type">DbusmenuClient</span> | 112 | Creates a new <span class="type">DbusmenuGtkMenu</span> object and creates a <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DbusmenuClient"><span class="type">DbusmenuClient</span></a> |
627 | 113 | that connects across DBus to a <span class="type">DbusmenuServer</span>. | 113 | that connects across DBus to a <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a>. |
628 | 114 | </p> | 114 | </p> |
629 | 115 | <div class="variablelist"><table border="0"> | 115 | <div class="variablelist"><table border="0"> |
630 | 116 | <col align="left" valign="top"> | 116 | <col align="left" valign="top"> |
631 | 117 | <tbody> | 117 | <tbody> |
632 | 118 | <tr> | 118 | <tr> |
633 | 119 | <td><p><span class="term"><em class="parameter"><code>dbus_name</code></em>Â :</span></p></td> | 119 | <td><p><span class="term"><em class="parameter"><code>dbus_name</code></em>Â :</span></p></td> |
635 | 120 | <td>Name of the <span class="type">DbusmenuServer</span> on DBus | 120 | <td>Name of the <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a> on DBus |
636 | 121 | </td> | 121 | </td> |
637 | 122 | </tr> | 122 | </tr> |
638 | 123 | <tr> | 123 | <tr> |
639 | 124 | 124 | ||
640 | === modified file 'docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html' | |||
641 | --- docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html 2010-06-24 14:27:00 +0000 | |||
642 | +++ docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html 2010-07-01 14:04:28 +0000 | |||
643 | @@ -38,11 +38,11 @@ | |||
644 | 38 | <div class="refsynopsisdiv" title="Synopsis"> | 38 | <div class="refsynopsisdiv" title="Synopsis"> |
645 | 39 | <a name="libdbusmenu-gtk-menuitem.synopsis"></a><h2>Synopsis</h2> | 39 | <a name="libdbusmenu-gtk-menuitem.synopsis"></a><h2>Synopsis</h2> |
646 | 40 | <pre class="synopsis"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-set-image" title="dbusmenu_menuitem_property_set_image ()">dbusmenu_menuitem_property_set_image</a> | 40 | <pre class="synopsis"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-set-image" title="dbusmenu_menuitem_property_set_image ()">dbusmenu_menuitem_property_set_image</a> |
648 | 41 | (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>, | 41 | (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *menuitem</code></em>, |
649 | 42 | <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>, | 42 | <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>, |
650 | 43 | <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> *data</code></em>); | 43 | <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> *data</code></em>); |
651 | 44 | <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="returnvalue">GdkPixbuf</span></a> * <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-get-image" title="dbusmenu_menuitem_property_get_image ()">dbusmenu_menuitem_property_get_image</a> | 44 | <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="returnvalue">GdkPixbuf</span></a> * <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-get-image" title="dbusmenu_menuitem_property_get_image ()">dbusmenu_menuitem_property_get_image</a> |
653 | 45 | (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>, | 45 | (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *menuitem</code></em>, |
654 | 46 | <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>); | 46 | <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>); |
655 | 47 | </pre> | 47 | </pre> |
656 | 48 | </div> | 48 | </div> |
657 | @@ -56,20 +56,20 @@ | |||
658 | 56 | <div class="refsect2" title="dbusmenu_menuitem_property_set_image ()"> | 56 | <div class="refsect2" title="dbusmenu_menuitem_property_set_image ()"> |
659 | 57 | <a name="dbusmenu-menuitem-property-set-image"></a><h3>dbusmenu_menuitem_property_set_image ()</h3> | 57 | <a name="dbusmenu-menuitem-property-set-image"></a><h3>dbusmenu_menuitem_property_set_image ()</h3> |
660 | 58 | <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbusmenu_menuitem_property_set_image | 58 | <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbusmenu_menuitem_property_set_image |
662 | 59 | (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>, | 59 | (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *menuitem</code></em>, |
663 | 60 | <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>, | 60 | <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>, |
664 | 61 | <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> *data</code></em>);</pre> | 61 | <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> *data</code></em>);</pre> |
665 | 62 | <p> | 62 | <p> |
666 | 63 | This function takes the pixbuf that is stored in <em class="parameter"><code>data</code></em> and | 63 | This function takes the pixbuf that is stored in <em class="parameter"><code>data</code></em> and |
667 | 64 | turns it into a base64 encoded PNG so that it can be placed | 64 | turns it into a base64 encoded PNG so that it can be placed |
669 | 65 | onto a standard <span class="type">DbusmenuMenuitem</span> property. | 65 | onto a standard <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> property. |
670 | 66 | </p> | 66 | </p> |
671 | 67 | <div class="variablelist"><table border="0"> | 67 | <div class="variablelist"><table border="0"> |
672 | 68 | <col align="left" valign="top"> | 68 | <col align="left" valign="top"> |
673 | 69 | <tbody> | 69 | <tbody> |
674 | 70 | <tr> | 70 | <tr> |
675 | 71 | <td><p><span class="term"><em class="parameter"><code>menuitem</code></em>Â :</span></p></td> | 71 | <td><p><span class="term"><em class="parameter"><code>menuitem</code></em>Â :</span></p></td> |
677 | 72 | <td>The <span class="type">DbusmenuMenuitem</span> to set the property on. | 72 | <td>The <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to set the property on. |
678 | 73 | </td> | 73 | </td> |
679 | 74 | </tr> | 74 | </tr> |
680 | 75 | <tr> | 75 | <tr> |
681 | @@ -95,7 +95,7 @@ | |||
682 | 95 | <div class="refsect2" title="dbusmenu_menuitem_property_get_image ()"> | 95 | <div class="refsect2" title="dbusmenu_menuitem_property_get_image ()"> |
683 | 96 | <a name="dbusmenu-menuitem-property-get-image"></a><h3>dbusmenu_menuitem_property_get_image ()</h3> | 96 | <a name="dbusmenu-menuitem-property-get-image"></a><h3>dbusmenu_menuitem_property_get_image ()</h3> |
684 | 97 | <pre class="programlisting"><a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="returnvalue">GdkPixbuf</span></a> * dbusmenu_menuitem_property_get_image | 97 | <pre class="programlisting"><a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="returnvalue">GdkPixbuf</span></a> * dbusmenu_menuitem_property_get_image |
686 | 98 | (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>, | 98 | (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *menuitem</code></em>, |
687 | 99 | <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre> | 99 | <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>);</pre> |
688 | 100 | <p> | 100 | <p> |
689 | 101 | This function looks on the menu item for a property by the | 101 | This function looks on the menu item for a property by the |
690 | 102 | 102 | ||
691 | === modified file 'docs/libdbusmenu-gtk/reference/tmpl/client.sgml' | |||
692 | --- docs/libdbusmenu-gtk/reference/tmpl/client.sgml 2010-06-10 17:33:17 +0000 | |||
693 | +++ docs/libdbusmenu-gtk/reference/tmpl/client.sgml 2010-07-01 14:04:28 +0000 | |||
694 | @@ -9,13 +9,11 @@ | |||
695 | 9 | 9 | ||
696 | 10 | </para> | 10 | </para> |
697 | 11 | 11 | ||
698 | 12 | |||
699 | 13 | <!-- ##### SECTION See_Also ##### --> | 12 | <!-- ##### SECTION See_Also ##### --> |
700 | 14 | <para> | 13 | <para> |
701 | 15 | 14 | ||
702 | 16 | </para> | 15 | </para> |
703 | 17 | 16 | ||
704 | 18 | |||
705 | 19 | <!-- ##### SECTION Stability_Level ##### --> | 17 | <!-- ##### SECTION Stability_Level ##### --> |
706 | 20 | 18 | ||
707 | 21 | 19 | ||
708 | 22 | 20 | ||
709 | === modified file 'docs/libdbusmenu-gtk/reference/tmpl/genericmenuitem.sgml' | |||
710 | --- docs/libdbusmenu-gtk/reference/tmpl/genericmenuitem.sgml 2010-06-10 17:33:17 +0000 | |||
711 | +++ docs/libdbusmenu-gtk/reference/tmpl/genericmenuitem.sgml 2010-07-01 14:04:28 +0000 | |||
712 | @@ -9,13 +9,11 @@ | |||
713 | 9 | 9 | ||
714 | 10 | </para> | 10 | </para> |
715 | 11 | 11 | ||
716 | 12 | |||
717 | 13 | <!-- ##### SECTION See_Also ##### --> | 12 | <!-- ##### SECTION See_Also ##### --> |
718 | 14 | <para> | 13 | <para> |
719 | 15 | 14 | ||
720 | 16 | </para> | 15 | </para> |
721 | 17 | 16 | ||
722 | 18 | |||
723 | 19 | <!-- ##### SECTION Stability_Level ##### --> | 17 | <!-- ##### SECTION Stability_Level ##### --> |
724 | 20 | 18 | ||
725 | 21 | 19 | ||
726 | 22 | 20 | ||
727 | === modified file 'docs/libdbusmenu-gtk/reference/tmpl/menu.sgml' | |||
728 | --- docs/libdbusmenu-gtk/reference/tmpl/menu.sgml 2010-06-10 17:33:17 +0000 | |||
729 | +++ docs/libdbusmenu-gtk/reference/tmpl/menu.sgml 2010-07-01 14:04:28 +0000 | |||
730 | @@ -9,13 +9,11 @@ | |||
731 | 9 | 9 | ||
732 | 10 | </para> | 10 | </para> |
733 | 11 | 11 | ||
734 | 12 | |||
735 | 13 | <!-- ##### SECTION See_Also ##### --> | 12 | <!-- ##### SECTION See_Also ##### --> |
736 | 14 | <para> | 13 | <para> |
737 | 15 | 14 | ||
738 | 16 | </para> | 15 | </para> |
739 | 17 | 16 | ||
740 | 18 | |||
741 | 19 | <!-- ##### SECTION Stability_Level ##### --> | 17 | <!-- ##### SECTION Stability_Level ##### --> |
742 | 20 | 18 | ||
743 | 21 | 19 | ||
744 | 22 | 20 | ||
745 | === modified file 'docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml' | |||
746 | --- docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml 2010-06-10 17:33:17 +0000 | |||
747 | +++ docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml 2010-07-01 14:04:28 +0000 | |||
748 | @@ -9,13 +9,11 @@ | |||
749 | 9 | 9 | ||
750 | 10 | </para> | 10 | </para> |
751 | 11 | 11 | ||
752 | 12 | |||
753 | 13 | <!-- ##### SECTION See_Also ##### --> | 12 | <!-- ##### SECTION See_Also ##### --> |
754 | 14 | <para> | 13 | <para> |
755 | 15 | 14 | ||
756 | 16 | </para> | 15 | </para> |
757 | 17 | 16 | ||
758 | 18 | |||
759 | 19 | <!-- ##### SECTION Stability_Level ##### --> | 17 | <!-- ##### SECTION Stability_Level ##### --> |
760 | 20 | 18 | ||
761 | 21 | 19 | ||
762 | 22 | 20 | ||
763 | === modified file 'docs/libdbusmenu-gtk/reference/version.xml' | |||
764 | --- docs/libdbusmenu-gtk/reference/version.xml 2010-06-24 14:27:00 +0000 | |||
765 | +++ docs/libdbusmenu-gtk/reference/version.xml 2010-07-01 14:04:28 +0000 | |||
766 | @@ -1,1 +1,1 @@ | |||
768 | 1 | 0.3.3 | 1 | 0.3.4 |
769 | 2 | 2 | ||
770 | === modified file 'libdbusmenu-gtk/client.c' | |||
771 | --- libdbusmenu-gtk/client.c 2010-06-22 21:29:08 +0000 | |||
772 | +++ libdbusmenu-gtk/client.c 2010-07-01 14:04:28 +0000 | |||
773 | @@ -503,6 +503,7 @@ | |||
774 | 503 | #endif | 503 | #endif |
775 | 504 | 504 | ||
776 | 505 | if (dbusmenu_menuitem_get_root(mi)) { return; } | 505 | if (dbusmenu_menuitem_get_root(mi)) { return; } |
777 | 506 | if (g_strcmp0(dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_TYPE), DBUSMENU_CLIENT_TYPES_SEPARATOR) == 0) { return; } | ||
778 | 506 | 507 | ||
779 | 507 | gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu); | 508 | gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu); |
780 | 508 | GtkMenu * menu = GTK_MENU(ann_menu); | 509 | GtkMenu * menu = GTK_MENU(ann_menu); |
781 | 509 | 510 | ||
782 | === modified file 'tests/Makefile.am' | |||
783 | --- tests/Makefile.am 2010-06-21 19:47:08 +0000 | |||
784 | +++ tests/Makefile.am 2010-07-01 14:04:28 +0000 | |||
785 | @@ -1,14 +1,17 @@ | |||
786 | 1 | 1 | ||
787 | 2 | DBUS_RUNNER=dbus-test-runner | 2 | DBUS_RUNNER=dbus-test-runner |
788 | 3 | 3 | ||
789 | 4 | CLEANFILES= | ||
790 | 5 | |||
791 | 4 | TESTS = \ | 6 | TESTS = \ |
792 | 5 | test-glib-objects-test \ | 7 | test-glib-objects-test \ |
793 | 6 | test-glib-layout \ | 8 | test-glib-layout \ |
794 | 7 | test-glib-properties \ | 9 | test-glib-properties \ |
795 | 8 | test-glib-proxy \ | 10 | test-glib-proxy \ |
796 | 9 | test-glib-simple-items \ | 11 | test-glib-simple-items \ |
797 | 12 | test-glib-submenu \ | ||
798 | 13 | test-json \ | ||
799 | 10 | test-gtk-objects-test \ | 14 | test-gtk-objects-test \ |
800 | 11 | test-glib-submenu \ | ||
801 | 12 | test-gtk-label \ | 15 | test-gtk-label \ |
802 | 13 | test-gtk-shortcut \ | 16 | test-gtk-shortcut \ |
803 | 14 | test-gtk-reorder | 17 | test-gtk-reorder |
804 | @@ -31,11 +34,50 @@ | |||
805 | 31 | test-gtk-shortcut-client \ | 34 | test-gtk-shortcut-client \ |
806 | 32 | test-gtk-shortcut-server \ | 35 | test-gtk-shortcut-server \ |
807 | 33 | test-glib-simple-items \ | 36 | test-glib-simple-items \ |
809 | 34 | test-gtk-reorder-server | 37 | test-gtk-reorder-server \ |
810 | 38 | test-json-client \ | ||
811 | 39 | test-json-server | ||
812 | 35 | 40 | ||
813 | 36 | XVFB_RUN=". $(srcdir)/run-xvfb.sh" | 41 | XVFB_RUN=". $(srcdir)/run-xvfb.sh" |
814 | 37 | 42 | ||
815 | 38 | ###################### | 43 | ###################### |
816 | 44 | # JSON Loader lib | ||
817 | 45 | ###################### | ||
818 | 46 | |||
819 | 47 | lib_LTLIBRARIES = libdbusmenu-jsonloader.la | ||
820 | 48 | |||
821 | 49 | libdbusmenu_jsonloaderincludedir=$(includedir)/libdbusmenu-0.1/libdbusmenu-jsonloader/ | ||
822 | 50 | |||
823 | 51 | libdbusmenu_jsonloaderinclude_HEADERS = \ | ||
824 | 52 | json-loader.h | ||
825 | 53 | |||
826 | 54 | libdbusmenu_jsonloader_la_SOURCES = \ | ||
827 | 55 | json-loader.h \ | ||
828 | 56 | json-loader.c | ||
829 | 57 | |||
830 | 58 | libdbusmenu_jsonloader_la_LDFLAGS = \ | ||
831 | 59 | -version-info $(LIBDBUSMENU_CURRENT):$(LIBDBUSMENU_REVISION):$(LIBDBUSMENU_AGE) \ | ||
832 | 60 | -no-undefined \ | ||
833 | 61 | -export-symbols-regex "^[^_].*" | ||
834 | 62 | |||
835 | 63 | libdbusmenu_jsonloader_la_CFLAGS = \ | ||
836 | 64 | $(DBUSMENUGLIB_CFLAGS) \ | ||
837 | 65 | $(DBUSMENUTESTS_CFLAGS) \ | ||
838 | 66 | -I $(srcdir)/.. \ | ||
839 | 67 | -Wall \ | ||
840 | 68 | -Werror \ | ||
841 | 69 | -DG_DISABLE_DEPRECATED \ | ||
842 | 70 | -DG_LOG_DOMAIN="\"LIBDBUSMENU-JSONLOADER\"" | ||
843 | 71 | |||
844 | 72 | libdbusmenu_jsonloader_la_LIBADD = \ | ||
845 | 73 | ../libdbusmenu-glib/libdbusmenu-glib.la \ | ||
846 | 74 | $(DBUSMENUGLIB_LIBS) \ | ||
847 | 75 | $(DBUSMENUTESTS_LIBS) | ||
848 | 76 | |||
849 | 77 | pkgconfig_DATA = dbusmenu-jsonloader.pc | ||
850 | 78 | pkgconfigdir = $(libdir)/pkgconfig | ||
851 | 79 | |||
852 | 80 | ###################### | ||
853 | 39 | # Test GLib server | 81 | # Test GLib server |
854 | 40 | ###################### | 82 | ###################### |
855 | 41 | 83 | ||
856 | @@ -84,6 +126,47 @@ | |||
857 | 84 | $(DBUSMENUGLIB_LIBS) | 126 | $(DBUSMENUGLIB_LIBS) |
858 | 85 | 127 | ||
859 | 86 | ###################### | 128 | ###################### |
860 | 129 | # Test JSON | ||
861 | 130 | ###################### | ||
862 | 131 | |||
863 | 132 | test-json: test-json-client test-json-server Makefile.am | ||
864 | 133 | @echo "#!/bin/bash" > $@ | ||
865 | 134 | @echo $(XVFB_RUN) >> $@ | ||
866 | 135 | @echo $(DBUS_RUNNER) --task ./test-json-client --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --ignore-return --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@ | ||
867 | 136 | @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@ | ||
868 | 137 | @chmod +x $@ | ||
869 | 138 | |||
870 | 139 | CLEANFILES += test-json-01.output.json | ||
871 | 140 | |||
872 | 141 | test_json_server_SOURCES = \ | ||
873 | 142 | test-json-server.c | ||
874 | 143 | |||
875 | 144 | test_json_server_CFLAGS = \ | ||
876 | 145 | -I $(srcdir)/.. \ | ||
877 | 146 | -I $(srcdir) \ | ||
878 | 147 | $(DBUSMENUGLIB_CFLAGS) \ | ||
879 | 148 | $(DBUSMENUTESTS_CFLAGS) \ | ||
880 | 149 | -Wall -Werror | ||
881 | 150 | |||
882 | 151 | test_json_server_LDADD = \ | ||
883 | 152 | ../libdbusmenu-glib/libdbusmenu-glib.la \ | ||
884 | 153 | libdbusmenu-jsonloader.la \ | ||
885 | 154 | $(DBUSMENUTESTS_LIBS) \ | ||
886 | 155 | $(DBUSMENUGLIB_LIBS) | ||
887 | 156 | |||
888 | 157 | test_json_client_SOURCES = \ | ||
889 | 158 | test-json-client.c | ||
890 | 159 | |||
891 | 160 | test_json_client_CFLAGS = \ | ||
892 | 161 | -I $(srcdir)/.. \ | ||
893 | 162 | $(DBUSMENUGLIB_CFLAGS) -Wall -Werror | ||
894 | 163 | |||
895 | 164 | test_json_client_LDADD = \ | ||
896 | 165 | ../libdbusmenu-glib/libdbusmenu-glib.la \ | ||
897 | 166 | $(DBUSMENUTESTS_LIBS) \ | ||
898 | 167 | $(DBUSMENUGLIB_LIBS) | ||
899 | 168 | |||
900 | 169 | ###################### | ||
901 | 87 | # Test Glib Submenu | 170 | # Test Glib Submenu |
902 | 88 | ###################### | 171 | ###################### |
903 | 89 | 172 | ||
904 | @@ -286,6 +369,7 @@ | |||
905 | 286 | test_gtk_label_server_LDADD = \ | 369 | test_gtk_label_server_LDADD = \ |
906 | 287 | ../libdbusmenu-glib/libdbusmenu-glib.la \ | 370 | ../libdbusmenu-glib/libdbusmenu-glib.la \ |
907 | 288 | ../libdbusmenu-gtk/libdbusmenu-gtk.la \ | 371 | ../libdbusmenu-gtk/libdbusmenu-gtk.la \ |
908 | 372 | libdbusmenu-jsonloader.la \ | ||
909 | 289 | $(DBUSMENUGTK_LIBS) \ | 373 | $(DBUSMENUGTK_LIBS) \ |
910 | 290 | $(DBUSMENUTESTS_LIBS) | 374 | $(DBUSMENUTESTS_LIBS) |
911 | 291 | 375 | ||
912 | @@ -421,9 +505,10 @@ | |||
913 | 421 | dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \ | 505 | dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \ |
914 | 422 | dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \ | 506 | dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \ |
915 | 423 | dbusmenu-gtk/mago_tests/data/static.json \ | 507 | dbusmenu-gtk/mago_tests/data/static.json \ |
917 | 424 | dbusmenu-gtk/mago_tests/data/test-gtk-label.json | 508 | dbusmenu-gtk/mago_tests/data/test-gtk-label.json \ |
918 | 509 | test-json-01.json | ||
919 | 425 | 510 | ||
921 | 426 | CLEANFILES = \ | 511 | CLEANFILES += \ |
922 | 427 | dbusmenu-gtk/mago_tests/dbusmenu.pyc | 512 | dbusmenu-gtk/mago_tests/dbusmenu.pyc |
923 | 428 | 513 | ||
924 | 429 | distclean-local: | 514 | distclean-local: |
925 | 430 | 515 | ||
926 | === modified file 'tests/Makefile.in' | |||
927 | --- tests/Makefile.in 2010-06-24 14:27:00 +0000 | |||
928 | +++ tests/Makefile.in 2010-07-01 14:04:28 +0000 | |||
929 | @@ -15,6 +15,8 @@ | |||
930 | 15 | 15 | ||
931 | 16 | @SET_MAKE@ | 16 | @SET_MAKE@ |
932 | 17 | 17 | ||
933 | 18 | |||
934 | 19 | |||
935 | 18 | VPATH = @srcdir@ | 20 | VPATH = @srcdir@ |
936 | 19 | pkgdatadir = $(datadir)/@PACKAGE@ | 21 | pkgdatadir = $(datadir)/@PACKAGE@ |
937 | 20 | pkgincludedir = $(includedir)/@PACKAGE@ | 22 | pkgincludedir = $(includedir)/@PACKAGE@ |
938 | @@ -36,8 +38,8 @@ | |||
939 | 36 | host_triplet = @host@ | 38 | host_triplet = @host@ |
940 | 37 | TESTS = test-glib-objects-test test-glib-layout test-glib-properties \ | 39 | TESTS = test-glib-objects-test test-glib-layout test-glib-properties \ |
941 | 38 | test-glib-proxy test-glib-simple-items$(EXEEXT) \ | 40 | test-glib-proxy test-glib-simple-items$(EXEEXT) \ |
944 | 39 | test-gtk-objects-test test-glib-submenu test-gtk-label \ | 41 | test-glib-submenu test-json test-gtk-objects-test \ |
945 | 40 | test-gtk-shortcut test-gtk-reorder | 42 | test-gtk-label test-gtk-shortcut test-gtk-reorder |
946 | 41 | check_PROGRAMS = glib-server-nomenu$(EXEEXT) \ | 43 | check_PROGRAMS = glib-server-nomenu$(EXEEXT) \ |
947 | 42 | test-glib-objects$(EXEEXT) test-glib-layout-client$(EXEEXT) \ | 44 | test-glib-objects$(EXEEXT) test-glib-layout-client$(EXEEXT) \ |
948 | 43 | test-glib-layout-server$(EXEEXT) \ | 45 | test-glib-layout-server$(EXEEXT) \ |
949 | @@ -51,26 +53,65 @@ | |||
950 | 51 | test-gtk-shortcut-client$(EXEEXT) \ | 53 | test-gtk-shortcut-client$(EXEEXT) \ |
951 | 52 | test-gtk-shortcut-server$(EXEEXT) \ | 54 | test-gtk-shortcut-server$(EXEEXT) \ |
952 | 53 | test-glib-simple-items$(EXEEXT) \ | 55 | test-glib-simple-items$(EXEEXT) \ |
954 | 54 | test-gtk-reorder-server$(EXEEXT) | 56 | test-gtk-reorder-server$(EXEEXT) test-json-client$(EXEEXT) \ |
955 | 57 | test-json-server$(EXEEXT) | ||
956 | 55 | subdir = tests | 58 | subdir = tests |
958 | 56 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 59 | DIST_COMMON = $(libdbusmenu_jsonloaderinclude_HEADERS) \ |
959 | 60 | $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | ||
960 | 61 | $(srcdir)/dbusmenu-jsonloader.pc.in | ||
961 | 57 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 62 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
962 | 58 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 63 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
963 | 59 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 64 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
964 | 60 | $(ACLOCAL_M4) | 65 | $(ACLOCAL_M4) |
965 | 61 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 66 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
966 | 62 | CONFIG_HEADER = $(top_builddir)/config.h | 67 | CONFIG_HEADER = $(top_builddir)/config.h |
968 | 63 | CONFIG_CLEAN_FILES = | 68 | CONFIG_CLEAN_FILES = dbusmenu-jsonloader.pc |
969 | 64 | CONFIG_CLEAN_VPATH_FILES = | 69 | CONFIG_CLEAN_VPATH_FILES = |
970 | 70 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
971 | 71 | am__vpath_adj = case $$p in \ | ||
972 | 72 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
973 | 73 | *) f=$$p;; \ | ||
974 | 74 | esac; | ||
975 | 75 | am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | ||
976 | 76 | am__install_max = 40 | ||
977 | 77 | am__nobase_strip_setup = \ | ||
978 | 78 | srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | ||
979 | 79 | am__nobase_strip = \ | ||
980 | 80 | for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | ||
981 | 81 | am__nobase_list = $(am__nobase_strip_setup); \ | ||
982 | 82 | for p in $$list; do echo "$$p $$p"; done | \ | ||
983 | 83 | sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | ||
984 | 84 | $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | ||
985 | 85 | if (++n[$$2] == $(am__install_max)) \ | ||
986 | 86 | { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | ||
987 | 87 | END { for (dir in files) print dir, files[dir] }' | ||
988 | 88 | am__base_list = \ | ||
989 | 89 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
990 | 90 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
991 | 91 | am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(examplesdir)" \ | ||
992 | 92 | "$(DESTDIR)$(jsondir)" "$(DESTDIR)$(pkgconfigdir)" \ | ||
993 | 93 | "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)" | ||
994 | 94 | LTLIBRARIES = $(lib_LTLIBRARIES) | ||
995 | 95 | am__DEPENDENCIES_1 = | ||
996 | 96 | libdbusmenu_jsonloader_la_DEPENDENCIES = \ | ||
997 | 97 | ../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1) \ | ||
998 | 98 | $(am__DEPENDENCIES_1) | ||
999 | 99 | am_libdbusmenu_jsonloader_la_OBJECTS = \ | ||
1000 | 100 | libdbusmenu_jsonloader_la-json-loader.lo | ||
1001 | 101 | libdbusmenu_jsonloader_la_OBJECTS = \ | ||
1002 | 102 | $(am_libdbusmenu_jsonloader_la_OBJECTS) | ||
1003 | 103 | AM_V_lt = $(am__v_lt_$(V)) | ||
1004 | 104 | am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
1005 | 105 | am__v_lt_0 = --silent | ||
1006 | 106 | libdbusmenu_jsonloader_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | ||
1007 | 107 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | ||
1008 | 108 | $(libdbusmenu_jsonloader_la_CFLAGS) $(CFLAGS) \ | ||
1009 | 109 | $(libdbusmenu_jsonloader_la_LDFLAGS) $(LDFLAGS) -o $@ | ||
1010 | 65 | am_glib_server_nomenu_OBJECTS = \ | 110 | am_glib_server_nomenu_OBJECTS = \ |
1011 | 66 | glib_server_nomenu-glib-server-nomenu.$(OBJEXT) | 111 | glib_server_nomenu-glib-server-nomenu.$(OBJEXT) |
1012 | 67 | glib_server_nomenu_OBJECTS = $(am_glib_server_nomenu_OBJECTS) | 112 | glib_server_nomenu_OBJECTS = $(am_glib_server_nomenu_OBJECTS) |
1013 | 68 | am__DEPENDENCIES_1 = | ||
1014 | 69 | glib_server_nomenu_DEPENDENCIES = \ | 113 | glib_server_nomenu_DEPENDENCIES = \ |
1015 | 70 | ../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1) | 114 | ../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1) |
1016 | 71 | AM_V_lt = $(am__v_lt_$(V)) | ||
1017 | 72 | am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
1018 | 73 | am__v_lt_0 = --silent | ||
1019 | 74 | glib_server_nomenu_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | 115 | glib_server_nomenu_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
1020 | 75 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | 116 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
1021 | 76 | $(glib_server_nomenu_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | 117 | $(glib_server_nomenu_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
1022 | @@ -194,7 +235,8 @@ | |||
1023 | 194 | test_gtk_label_server_OBJECTS = $(am_test_gtk_label_server_OBJECTS) | 235 | test_gtk_label_server_OBJECTS = $(am_test_gtk_label_server_OBJECTS) |
1024 | 195 | test_gtk_label_server_DEPENDENCIES = \ | 236 | test_gtk_label_server_DEPENDENCIES = \ |
1025 | 196 | ../libdbusmenu-glib/libdbusmenu-glib.la \ | 237 | ../libdbusmenu-glib/libdbusmenu-glib.la \ |
1027 | 197 | ../libdbusmenu-gtk/libdbusmenu-gtk.la $(am__DEPENDENCIES_1) \ | 238 | ../libdbusmenu-gtk/libdbusmenu-gtk.la \ |
1028 | 239 | libdbusmenu-jsonloader.la $(am__DEPENDENCIES_1) \ | ||
1029 | 198 | $(am__DEPENDENCIES_1) | 240 | $(am__DEPENDENCIES_1) |
1030 | 199 | test_gtk_label_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | 241 | test_gtk_label_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
1031 | 200 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | 242 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
1032 | @@ -247,6 +289,27 @@ | |||
1033 | 247 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | 289 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
1034 | 248 | $(test_gtk_shortcut_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | 290 | $(test_gtk_shortcut_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
1035 | 249 | $(LDFLAGS) -o $@ | 291 | $(LDFLAGS) -o $@ |
1036 | 292 | am_test_json_client_OBJECTS = \ | ||
1037 | 293 | test_json_client-test-json-client.$(OBJEXT) | ||
1038 | 294 | test_json_client_OBJECTS = $(am_test_json_client_OBJECTS) | ||
1039 | 295 | test_json_client_DEPENDENCIES = \ | ||
1040 | 296 | ../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1) \ | ||
1041 | 297 | $(am__DEPENDENCIES_1) | ||
1042 | 298 | test_json_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | ||
1043 | 299 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | ||
1044 | 300 | $(test_json_client_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ | ||
1045 | 301 | -o $@ | ||
1046 | 302 | am_test_json_server_OBJECTS = \ | ||
1047 | 303 | test_json_server-test-json-server.$(OBJEXT) | ||
1048 | 304 | test_json_server_OBJECTS = $(am_test_json_server_OBJECTS) | ||
1049 | 305 | test_json_server_DEPENDENCIES = \ | ||
1050 | 306 | ../libdbusmenu-glib/libdbusmenu-glib.la \ | ||
1051 | 307 | libdbusmenu-jsonloader.la $(am__DEPENDENCIES_1) \ | ||
1052 | 308 | $(am__DEPENDENCIES_1) | ||
1053 | 309 | test_json_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | ||
1054 | 310 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | ||
1055 | 311 | $(test_json_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ | ||
1056 | 312 | -o $@ | ||
1057 | 250 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | 313 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
1058 | 251 | depcomp = $(SHELL) $(top_srcdir)/depcomp | 314 | depcomp = $(SHELL) $(top_srcdir)/depcomp |
1059 | 252 | am__depfiles_maybe = depfiles | 315 | am__depfiles_maybe = depfiles |
1060 | @@ -273,63 +336,46 @@ | |||
1061 | 273 | AM_V_GEN = $(am__v_GEN_$(V)) | 336 | AM_V_GEN = $(am__v_GEN_$(V)) |
1062 | 274 | am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | 337 | am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
1063 | 275 | am__v_GEN_0 = @echo " GEN " $@; | 338 | am__v_GEN_0 = @echo " GEN " $@; |
1121 | 276 | SOURCES = $(glib_server_nomenu_SOURCES) \ | 339 | SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \ |
1122 | 277 | $(test_glib_layout_client_SOURCES) \ | 340 | $(glib_server_nomenu_SOURCES) \ |
1123 | 278 | $(test_glib_layout_server_SOURCES) \ | 341 | $(test_glib_layout_client_SOURCES) \ |
1124 | 279 | $(test_glib_objects_SOURCES) \ | 342 | $(test_glib_layout_server_SOURCES) \ |
1125 | 280 | $(test_glib_properties_client_SOURCES) \ | 343 | $(test_glib_objects_SOURCES) \ |
1126 | 281 | $(test_glib_properties_server_SOURCES) \ | 344 | $(test_glib_properties_client_SOURCES) \ |
1127 | 282 | $(test_glib_proxy_client_SOURCES) \ | 345 | $(test_glib_properties_server_SOURCES) \ |
1128 | 283 | $(test_glib_proxy_proxy_SOURCES) \ | 346 | $(test_glib_proxy_client_SOURCES) \ |
1129 | 284 | $(test_glib_proxy_server_SOURCES) \ | 347 | $(test_glib_proxy_proxy_SOURCES) \ |
1130 | 285 | $(test_glib_simple_items_SOURCES) \ | 348 | $(test_glib_proxy_server_SOURCES) \ |
1131 | 286 | $(test_glib_submenu_client_SOURCES) \ | 349 | $(test_glib_simple_items_SOURCES) \ |
1132 | 287 | $(test_glib_submenu_server_SOURCES) \ | 350 | $(test_glib_submenu_client_SOURCES) \ |
1133 | 288 | $(test_gtk_label_client_SOURCES) \ | 351 | $(test_glib_submenu_server_SOURCES) \ |
1134 | 289 | $(test_gtk_label_server_SOURCES) $(test_gtk_objects_SOURCES) \ | 352 | $(test_gtk_label_client_SOURCES) \ |
1135 | 290 | $(test_gtk_reorder_server_SOURCES) \ | 353 | $(test_gtk_label_server_SOURCES) $(test_gtk_objects_SOURCES) \ |
1136 | 291 | $(test_gtk_shortcut_client_SOURCES) \ | 354 | $(test_gtk_reorder_server_SOURCES) \ |
1137 | 292 | $(test_gtk_shortcut_server_SOURCES) | 355 | $(test_gtk_shortcut_client_SOURCES) \ |
1138 | 293 | DIST_SOURCES = $(glib_server_nomenu_SOURCES) \ | 356 | $(test_gtk_shortcut_server_SOURCES) \ |
1139 | 294 | $(test_glib_layout_client_SOURCES) \ | 357 | $(test_json_client_SOURCES) $(test_json_server_SOURCES) |
1140 | 295 | $(test_glib_layout_server_SOURCES) \ | 358 | DIST_SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \ |
1141 | 296 | $(test_glib_objects_SOURCES) \ | 359 | $(glib_server_nomenu_SOURCES) \ |
1142 | 297 | $(test_glib_properties_client_SOURCES) \ | 360 | $(test_glib_layout_client_SOURCES) \ |
1143 | 298 | $(test_glib_properties_server_SOURCES) \ | 361 | $(test_glib_layout_server_SOURCES) \ |
1144 | 299 | $(test_glib_proxy_client_SOURCES) \ | 362 | $(test_glib_objects_SOURCES) \ |
1145 | 300 | $(test_glib_proxy_proxy_SOURCES) \ | 363 | $(test_glib_properties_client_SOURCES) \ |
1146 | 301 | $(test_glib_proxy_server_SOURCES) \ | 364 | $(test_glib_properties_server_SOURCES) \ |
1147 | 302 | $(test_glib_simple_items_SOURCES) \ | 365 | $(test_glib_proxy_client_SOURCES) \ |
1148 | 303 | $(test_glib_submenu_client_SOURCES) \ | 366 | $(test_glib_proxy_proxy_SOURCES) \ |
1149 | 304 | $(test_glib_submenu_server_SOURCES) \ | 367 | $(test_glib_proxy_server_SOURCES) \ |
1150 | 305 | $(test_gtk_label_client_SOURCES) \ | 368 | $(test_glib_simple_items_SOURCES) \ |
1151 | 306 | $(test_gtk_label_server_SOURCES) $(test_gtk_objects_SOURCES) \ | 369 | $(test_glib_submenu_client_SOURCES) \ |
1152 | 307 | $(test_gtk_reorder_server_SOURCES) \ | 370 | $(test_glib_submenu_server_SOURCES) \ |
1153 | 308 | $(test_gtk_shortcut_client_SOURCES) \ | 371 | $(test_gtk_label_client_SOURCES) \ |
1154 | 309 | $(test_gtk_shortcut_server_SOURCES) | 372 | $(test_gtk_label_server_SOURCES) $(test_gtk_objects_SOURCES) \ |
1155 | 310 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | 373 | $(test_gtk_reorder_server_SOURCES) \ |
1156 | 311 | am__vpath_adj = case $$p in \ | 374 | $(test_gtk_shortcut_client_SOURCES) \ |
1157 | 312 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | 375 | $(test_gtk_shortcut_server_SOURCES) \ |
1158 | 313 | *) f=$$p;; \ | 376 | $(test_json_client_SOURCES) $(test_json_server_SOURCES) |
1159 | 314 | esac; | 377 | DATA = $(examples_DATA) $(json_DATA) $(pkgconfig_DATA) |
1160 | 315 | am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | 378 | HEADERS = $(libdbusmenu_jsonloaderinclude_HEADERS) |
1104 | 316 | am__install_max = 40 | ||
1105 | 317 | am__nobase_strip_setup = \ | ||
1106 | 318 | srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | ||
1107 | 319 | am__nobase_strip = \ | ||
1108 | 320 | for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | ||
1109 | 321 | am__nobase_list = $(am__nobase_strip_setup); \ | ||
1110 | 322 | for p in $$list; do echo "$$p $$p"; done | \ | ||
1111 | 323 | sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | ||
1112 | 324 | $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | ||
1113 | 325 | if (++n[$$2] == $(am__install_max)) \ | ||
1114 | 326 | { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | ||
1115 | 327 | END { for (dir in files) print dir, files[dir] }' | ||
1116 | 328 | am__base_list = \ | ||
1117 | 329 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
1118 | 330 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
1119 | 331 | am__installdirs = "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(jsondir)" | ||
1120 | 332 | DATA = $(examples_DATA) $(json_DATA) | ||
1161 | 333 | ETAGS = etags | 379 | ETAGS = etags |
1162 | 334 | CTAGS = ctags | 380 | CTAGS = ctags |
1163 | 335 | am__tty_colors = \ | 381 | am__tty_colors = \ |
1164 | @@ -499,9 +545,45 @@ | |||
1165 | 499 | top_builddir = @top_builddir@ | 545 | top_builddir = @top_builddir@ |
1166 | 500 | top_srcdir = @top_srcdir@ | 546 | top_srcdir = @top_srcdir@ |
1167 | 501 | DBUS_RUNNER = dbus-test-runner | 547 | DBUS_RUNNER = dbus-test-runner |
1168 | 548 | CLEANFILES = test-json-01.output.json \ | ||
1169 | 549 | dbusmenu-gtk/mago_tests/dbusmenu.pyc | ||
1170 | 502 | XVFB_RUN = ". $(srcdir)/run-xvfb.sh" | 550 | XVFB_RUN = ". $(srcdir)/run-xvfb.sh" |
1171 | 503 | 551 | ||
1172 | 504 | ###################### | 552 | ###################### |
1173 | 553 | # JSON Loader lib | ||
1174 | 554 | ###################### | ||
1175 | 555 | lib_LTLIBRARIES = libdbusmenu-jsonloader.la | ||
1176 | 556 | libdbusmenu_jsonloaderincludedir = $(includedir)/libdbusmenu-0.1/libdbusmenu-jsonloader/ | ||
1177 | 557 | libdbusmenu_jsonloaderinclude_HEADERS = \ | ||
1178 | 558 | json-loader.h | ||
1179 | 559 | |||
1180 | 560 | libdbusmenu_jsonloader_la_SOURCES = \ | ||
1181 | 561 | json-loader.h \ | ||
1182 | 562 | json-loader.c | ||
1183 | 563 | |||
1184 | 564 | libdbusmenu_jsonloader_la_LDFLAGS = \ | ||
1185 | 565 | -version-info $(LIBDBUSMENU_CURRENT):$(LIBDBUSMENU_REVISION):$(LIBDBUSMENU_AGE) \ | ||
1186 | 566 | -no-undefined \ | ||
1187 | 567 | -export-symbols-regex "^[^_].*" | ||
1188 | 568 | |||
1189 | 569 | libdbusmenu_jsonloader_la_CFLAGS = \ | ||
1190 | 570 | $(DBUSMENUGLIB_CFLAGS) \ | ||
1191 | 571 | $(DBUSMENUTESTS_CFLAGS) \ | ||
1192 | 572 | -I $(srcdir)/.. \ | ||
1193 | 573 | -Wall \ | ||
1194 | 574 | -Werror \ | ||
1195 | 575 | -DG_DISABLE_DEPRECATED \ | ||
1196 | 576 | -DG_LOG_DOMAIN="\"LIBDBUSMENU-JSONLOADER\"" | ||
1197 | 577 | |||
1198 | 578 | libdbusmenu_jsonloader_la_LIBADD = \ | ||
1199 | 579 | ../libdbusmenu-glib/libdbusmenu-glib.la \ | ||
1200 | 580 | $(DBUSMENUGLIB_LIBS) \ | ||
1201 | 581 | $(DBUSMENUTESTS_LIBS) | ||
1202 | 582 | |||
1203 | 583 | pkgconfig_DATA = dbusmenu-jsonloader.pc | ||
1204 | 584 | pkgconfigdir = $(libdir)/pkgconfig | ||
1205 | 585 | |||
1206 | 586 | ###################### | ||
1207 | 505 | # Test GLib server | 587 | # Test GLib server |
1208 | 506 | ###################### | 588 | ###################### |
1209 | 507 | glib_server_nomenu_SOURCES = \ | 589 | glib_server_nomenu_SOURCES = \ |
1210 | @@ -539,6 +621,34 @@ | |||
1211 | 539 | ../libdbusmenu-glib/libdbusmenu-glib.la \ | 621 | ../libdbusmenu-glib/libdbusmenu-glib.la \ |
1212 | 540 | $(DBUSMENUGLIB_LIBS) | 622 | $(DBUSMENUGLIB_LIBS) |
1213 | 541 | 623 | ||
1214 | 624 | test_json_server_SOURCES = \ | ||
1215 | 625 | test-json-server.c | ||
1216 | 626 | |||
1217 | 627 | test_json_server_CFLAGS = \ | ||
1218 | 628 | -I $(srcdir)/.. \ | ||
1219 | 629 | -I $(srcdir) \ | ||
1220 | 630 | $(DBUSMENUGLIB_CFLAGS) \ | ||
1221 | 631 | $(DBUSMENUTESTS_CFLAGS) \ | ||
1222 | 632 | -Wall -Werror | ||
1223 | 633 | |||
1224 | 634 | test_json_server_LDADD = \ | ||
1225 | 635 | ../libdbusmenu-glib/libdbusmenu-glib.la \ | ||
1226 | 636 | libdbusmenu-jsonloader.la \ | ||
1227 | 637 | $(DBUSMENUTESTS_LIBS) \ | ||
1228 | 638 | $(DBUSMENUGLIB_LIBS) | ||
1229 | 639 | |||
1230 | 640 | test_json_client_SOURCES = \ | ||
1231 | 641 | test-json-client.c | ||
1232 | 642 | |||
1233 | 643 | test_json_client_CFLAGS = \ | ||
1234 | 644 | -I $(srcdir)/.. \ | ||
1235 | 645 | $(DBUSMENUGLIB_CFLAGS) -Wall -Werror | ||
1236 | 646 | |||
1237 | 647 | test_json_client_LDADD = \ | ||
1238 | 648 | ../libdbusmenu-glib/libdbusmenu-glib.la \ | ||
1239 | 649 | $(DBUSMENUTESTS_LIBS) \ | ||
1240 | 650 | $(DBUSMENUGLIB_LIBS) | ||
1241 | 651 | |||
1242 | 542 | test_glib_submenu_server_SOURCES = \ | 652 | test_glib_submenu_server_SOURCES = \ |
1243 | 543 | test-glib-submenu.h \ | 653 | test-glib-submenu.h \ |
1244 | 544 | test-glib-submenu-server.c | 654 | test-glib-submenu-server.c |
1245 | @@ -687,6 +797,7 @@ | |||
1246 | 687 | test_gtk_label_server_LDADD = \ | 797 | test_gtk_label_server_LDADD = \ |
1247 | 688 | ../libdbusmenu-glib/libdbusmenu-glib.la \ | 798 | ../libdbusmenu-glib/libdbusmenu-glib.la \ |
1248 | 689 | ../libdbusmenu-gtk/libdbusmenu-gtk.la \ | 799 | ../libdbusmenu-gtk/libdbusmenu-gtk.la \ |
1249 | 800 | libdbusmenu-jsonloader.la \ | ||
1250 | 690 | $(DBUSMENUGTK_LIBS) \ | 801 | $(DBUSMENUGTK_LIBS) \ |
1251 | 691 | $(DBUSMENUTESTS_LIBS) | 802 | $(DBUSMENUTESTS_LIBS) |
1252 | 692 | 803 | ||
1253 | @@ -785,10 +896,8 @@ | |||
1254 | 785 | dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \ | 896 | dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \ |
1255 | 786 | dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \ | 897 | dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \ |
1256 | 787 | dbusmenu-gtk/mago_tests/data/static.json \ | 898 | dbusmenu-gtk/mago_tests/data/static.json \ |
1261 | 788 | dbusmenu-gtk/mago_tests/data/test-gtk-label.json | 899 | dbusmenu-gtk/mago_tests/data/test-gtk-label.json \ |
1262 | 789 | 900 | test-json-01.json | |
1259 | 790 | CLEANFILES = \ | ||
1260 | 791 | dbusmenu-gtk/mago_tests/dbusmenu.pyc | ||
1263 | 792 | 901 | ||
1264 | 793 | DISTCLEANFILES = \ | 902 | DISTCLEANFILES = \ |
1265 | 794 | $(TESTS) \ | 903 | $(TESTS) \ |
1266 | @@ -829,6 +938,41 @@ | |||
1267 | 829 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | 938 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
1268 | 830 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | 939 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
1269 | 831 | $(am__aclocal_m4_deps): | 940 | $(am__aclocal_m4_deps): |
1270 | 941 | dbusmenu-jsonloader.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-jsonloader.pc.in | ||
1271 | 942 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ | ||
1272 | 943 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) | ||
1273 | 944 | @$(NORMAL_INSTALL) | ||
1274 | 945 | test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" | ||
1275 | 946 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ | ||
1276 | 947 | list2=; for p in $$list; do \ | ||
1277 | 948 | if test -f $$p; then \ | ||
1278 | 949 | list2="$$list2 $$p"; \ | ||
1279 | 950 | else :; fi; \ | ||
1280 | 951 | done; \ | ||
1281 | 952 | test -z "$$list2" || { \ | ||
1282 | 953 | echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ | ||
1283 | 954 | $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ | ||
1284 | 955 | } | ||
1285 | 956 | |||
1286 | 957 | uninstall-libLTLIBRARIES: | ||
1287 | 958 | @$(NORMAL_UNINSTALL) | ||
1288 | 959 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ | ||
1289 | 960 | for p in $$list; do \ | ||
1290 | 961 | $(am__strip_dir) \ | ||
1291 | 962 | echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ | ||
1292 | 963 | $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ | ||
1293 | 964 | done | ||
1294 | 965 | |||
1295 | 966 | clean-libLTLIBRARIES: | ||
1296 | 967 | -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) | ||
1297 | 968 | @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | ||
1298 | 969 | dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ | ||
1299 | 970 | test "$$dir" != "$$p" || dir=.; \ | ||
1300 | 971 | echo "rm -f \"$${dir}/so_locations\""; \ | ||
1301 | 972 | rm -f "$${dir}/so_locations"; \ | ||
1302 | 973 | done | ||
1303 | 974 | libdbusmenu-jsonloader.la: $(libdbusmenu_jsonloader_la_OBJECTS) $(libdbusmenu_jsonloader_la_DEPENDENCIES) | ||
1304 | 975 | $(AM_V_CCLD)$(libdbusmenu_jsonloader_la_LINK) -rpath $(libdir) $(libdbusmenu_jsonloader_la_OBJECTS) $(libdbusmenu_jsonloader_la_LIBADD) $(LIBS) | ||
1305 | 832 | 976 | ||
1306 | 833 | clean-checkPROGRAMS: | 977 | clean-checkPROGRAMS: |
1307 | 834 | @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ | 978 | @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ |
1308 | @@ -892,6 +1036,12 @@ | |||
1309 | 892 | test-gtk-shortcut-server$(EXEEXT): $(test_gtk_shortcut_server_OBJECTS) $(test_gtk_shortcut_server_DEPENDENCIES) | 1036 | test-gtk-shortcut-server$(EXEEXT): $(test_gtk_shortcut_server_OBJECTS) $(test_gtk_shortcut_server_DEPENDENCIES) |
1310 | 893 | @rm -f test-gtk-shortcut-server$(EXEEXT) | 1037 | @rm -f test-gtk-shortcut-server$(EXEEXT) |
1311 | 894 | $(AM_V_CCLD)$(test_gtk_shortcut_server_LINK) $(test_gtk_shortcut_server_OBJECTS) $(test_gtk_shortcut_server_LDADD) $(LIBS) | 1038 | $(AM_V_CCLD)$(test_gtk_shortcut_server_LINK) $(test_gtk_shortcut_server_OBJECTS) $(test_gtk_shortcut_server_LDADD) $(LIBS) |
1312 | 1039 | test-json-client$(EXEEXT): $(test_json_client_OBJECTS) $(test_json_client_DEPENDENCIES) | ||
1313 | 1040 | @rm -f test-json-client$(EXEEXT) | ||
1314 | 1041 | $(AM_V_CCLD)$(test_json_client_LINK) $(test_json_client_OBJECTS) $(test_json_client_LDADD) $(LIBS) | ||
1315 | 1042 | test-json-server$(EXEEXT): $(test_json_server_OBJECTS) $(test_json_server_DEPENDENCIES) | ||
1316 | 1043 | @rm -f test-json-server$(EXEEXT) | ||
1317 | 1044 | $(AM_V_CCLD)$(test_json_server_LINK) $(test_json_server_OBJECTS) $(test_json_server_LDADD) $(LIBS) | ||
1318 | 895 | 1045 | ||
1319 | 896 | mostlyclean-compile: | 1046 | mostlyclean-compile: |
1320 | 897 | -rm -f *.$(OBJEXT) | 1047 | -rm -f *.$(OBJEXT) |
1321 | @@ -900,6 +1050,7 @@ | |||
1322 | 900 | -rm -f *.tab.c | 1050 | -rm -f *.tab.c |
1323 | 901 | 1051 | ||
1324 | 902 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po@am__quote@ | 1052 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po@am__quote@ |
1325 | 1053 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Plo@am__quote@ | ||
1326 | 903 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Po@am__quote@ | 1054 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Po@am__quote@ |
1327 | 904 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_server-test-glib-layout-server.Po@am__quote@ | 1055 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_server-test-glib-layout-server.Po@am__quote@ |
1328 | 905 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_objects-test-glib-objects.Po@am__quote@ | 1056 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_objects-test-glib-objects.Po@am__quote@ |
1329 | @@ -917,6 +1068,8 @@ | |||
1330 | 917 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_reorder_server-test-gtk-reorder-server.Po@am__quote@ | 1068 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_reorder_server-test-gtk-reorder-server.Po@am__quote@ |
1331 | 918 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_shortcut_client-test-gtk-shortcut-client.Po@am__quote@ | 1069 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_shortcut_client-test-gtk-shortcut-client.Po@am__quote@ |
1332 | 919 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_shortcut_server-test-gtk-shortcut-server.Po@am__quote@ | 1070 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_shortcut_server-test-gtk-shortcut-server.Po@am__quote@ |
1333 | 1071 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_json_client-test-json-client.Po@am__quote@ | ||
1334 | 1072 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_json_server-test-json-server.Po@am__quote@ | ||
1335 | 920 | 1073 | ||
1336 | 921 | .c.o: | 1074 | .c.o: |
1337 | 922 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | 1075 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
1338 | @@ -942,6 +1095,14 @@ | |||
1339 | 942 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 1095 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1340 | 943 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | 1096 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< |
1341 | 944 | 1097 | ||
1342 | 1098 | libdbusmenu_jsonloader_la-json-loader.lo: json-loader.c | ||
1343 | 1099 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_jsonloader_la_CFLAGS) $(CFLAGS) -MT libdbusmenu_jsonloader_la-json-loader.lo -MD -MP -MF $(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Tpo -c -o libdbusmenu_jsonloader_la-json-loader.lo `test -f 'json-loader.c' || echo '$(srcdir)/'`json-loader.c | ||
1344 | 1100 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Tpo $(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Plo | ||
1345 | 1101 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
1346 | 1102 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='json-loader.c' object='libdbusmenu_jsonloader_la-json-loader.lo' libtool=yes @AMDEPBACKSLASH@ | ||
1347 | 1103 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
1348 | 1104 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_jsonloader_la_CFLAGS) $(CFLAGS) -c -o libdbusmenu_jsonloader_la-json-loader.lo `test -f 'json-loader.c' || echo '$(srcdir)/'`json-loader.c | ||
1349 | 1105 | |||
1350 | 945 | glib_server_nomenu-glib-server-nomenu.o: glib-server-nomenu.c | 1106 | glib_server_nomenu-glib-server-nomenu.o: glib-server-nomenu.c |
1351 | 946 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_server_nomenu_CFLAGS) $(CFLAGS) -MT glib_server_nomenu-glib-server-nomenu.o -MD -MP -MF $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Tpo -c -o glib_server_nomenu-glib-server-nomenu.o `test -f 'glib-server-nomenu.c' || echo '$(srcdir)/'`glib-server-nomenu.c | 1107 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_server_nomenu_CFLAGS) $(CFLAGS) -MT glib_server_nomenu-glib-server-nomenu.o -MD -MP -MF $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Tpo -c -o glib_server_nomenu-glib-server-nomenu.o `test -f 'glib-server-nomenu.c' || echo '$(srcdir)/'`glib-server-nomenu.c |
1352 | 947 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Tpo $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po | 1108 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Tpo $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po |
1353 | @@ -1230,6 +1391,38 @@ | |||
1354 | 1230 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 1391 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1355 | 1231 | @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtk_shortcut_server_CFLAGS) $(CFLAGS) -c -o test_gtk_shortcut_server-test-gtk-shortcut-server.obj `if test -f 'test-gtk-shortcut-server.c'; then $(CYGPATH_W) 'test-gtk-shortcut-server.c'; else $(CYGPATH_W) '$(srcdir)/test-gtk-shortcut-server.c'; fi` | 1392 | @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtk_shortcut_server_CFLAGS) $(CFLAGS) -c -o test_gtk_shortcut_server-test-gtk-shortcut-server.obj `if test -f 'test-gtk-shortcut-server.c'; then $(CYGPATH_W) 'test-gtk-shortcut-server.c'; else $(CYGPATH_W) '$(srcdir)/test-gtk-shortcut-server.c'; fi` |
1356 | 1232 | 1393 | ||
1357 | 1394 | test_json_client-test-json-client.o: test-json-client.c | ||
1358 | 1395 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -MT test_json_client-test-json-client.o -MD -MP -MF $(DEPDIR)/test_json_client-test-json-client.Tpo -c -o test_json_client-test-json-client.o `test -f 'test-json-client.c' || echo '$(srcdir)/'`test-json-client.c | ||
1359 | 1396 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_json_client-test-json-client.Tpo $(DEPDIR)/test_json_client-test-json-client.Po | ||
1360 | 1397 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
1361 | 1398 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-json-client.c' object='test_json_client-test-json-client.o' libtool=no @AMDEPBACKSLASH@ | ||
1362 | 1399 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
1363 | 1400 | @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -c -o test_json_client-test-json-client.o `test -f 'test-json-client.c' || echo '$(srcdir)/'`test-json-client.c | ||
1364 | 1401 | |||
1365 | 1402 | test_json_client-test-json-client.obj: test-json-client.c | ||
1366 | 1403 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -MT test_json_client-test-json-client.obj -MD -MP -MF $(DEPDIR)/test_json_client-test-json-client.Tpo -c -o test_json_client-test-json-client.obj `if test -f 'test-json-client.c'; then $(CYGPATH_W) 'test-json-client.c'; else $(CYGPATH_W) '$(srcdir)/test-json-client.c'; fi` | ||
1367 | 1404 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_json_client-test-json-client.Tpo $(DEPDIR)/test_json_client-test-json-client.Po | ||
1368 | 1405 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
1369 | 1406 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-json-client.c' object='test_json_client-test-json-client.obj' libtool=no @AMDEPBACKSLASH@ | ||
1370 | 1407 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
1371 | 1408 | @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -c -o test_json_client-test-json-client.obj `if test -f 'test-json-client.c'; then $(CYGPATH_W) 'test-json-client.c'; else $(CYGPATH_W) '$(srcdir)/test-json-client.c'; fi` | ||
1372 | 1409 | |||
1373 | 1410 | test_json_server-test-json-server.o: test-json-server.c | ||
1374 | 1411 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -MT test_json_server-test-json-server.o -MD -MP -MF $(DEPDIR)/test_json_server-test-json-server.Tpo -c -o test_json_server-test-json-server.o `test -f 'test-json-server.c' || echo '$(srcdir)/'`test-json-server.c | ||
1375 | 1412 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_json_server-test-json-server.Tpo $(DEPDIR)/test_json_server-test-json-server.Po | ||
1376 | 1413 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
1377 | 1414 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-json-server.c' object='test_json_server-test-json-server.o' libtool=no @AMDEPBACKSLASH@ | ||
1378 | 1415 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
1379 | 1416 | @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -c -o test_json_server-test-json-server.o `test -f 'test-json-server.c' || echo '$(srcdir)/'`test-json-server.c | ||
1380 | 1417 | |||
1381 | 1418 | test_json_server-test-json-server.obj: test-json-server.c | ||
1382 | 1419 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -MT test_json_server-test-json-server.obj -MD -MP -MF $(DEPDIR)/test_json_server-test-json-server.Tpo -c -o test_json_server-test-json-server.obj `if test -f 'test-json-server.c'; then $(CYGPATH_W) 'test-json-server.c'; else $(CYGPATH_W) '$(srcdir)/test-json-server.c'; fi` | ||
1383 | 1420 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_json_server-test-json-server.Tpo $(DEPDIR)/test_json_server-test-json-server.Po | ||
1384 | 1421 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
1385 | 1422 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-json-server.c' object='test_json_server-test-json-server.obj' libtool=no @AMDEPBACKSLASH@ | ||
1386 | 1423 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
1387 | 1424 | @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -c -o test_json_server-test-json-server.obj `if test -f 'test-json-server.c'; then $(CYGPATH_W) 'test-json-server.c'; else $(CYGPATH_W) '$(srcdir)/test-json-server.c'; fi` | ||
1388 | 1425 | |||
1389 | 1233 | mostlyclean-libtool: | 1426 | mostlyclean-libtool: |
1390 | 1234 | -rm -f *.lo | 1427 | -rm -f *.lo |
1391 | 1235 | 1428 | ||
1392 | @@ -1275,6 +1468,46 @@ | |||
1393 | 1275 | test -n "$$files" || exit 0; \ | 1468 | test -n "$$files" || exit 0; \ |
1394 | 1276 | echo " ( cd '$(DESTDIR)$(jsondir)' && rm -f" $$files ")"; \ | 1469 | echo " ( cd '$(DESTDIR)$(jsondir)' && rm -f" $$files ")"; \ |
1395 | 1277 | cd "$(DESTDIR)$(jsondir)" && rm -f $$files | 1470 | cd "$(DESTDIR)$(jsondir)" && rm -f $$files |
1396 | 1471 | install-pkgconfigDATA: $(pkgconfig_DATA) | ||
1397 | 1472 | @$(NORMAL_INSTALL) | ||
1398 | 1473 | test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" | ||
1399 | 1474 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ | ||
1400 | 1475 | for p in $$list; do \ | ||
1401 | 1476 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
1402 | 1477 | echo "$$d$$p"; \ | ||
1403 | 1478 | done | $(am__base_list) | \ | ||
1404 | 1479 | while read files; do \ | ||
1405 | 1480 | echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ | ||
1406 | 1481 | $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ | ||
1407 | 1482 | done | ||
1408 | 1483 | |||
1409 | 1484 | uninstall-pkgconfigDATA: | ||
1410 | 1485 | @$(NORMAL_UNINSTALL) | ||
1411 | 1486 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ | ||
1412 | 1487 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | ||
1413 | 1488 | test -n "$$files" || exit 0; \ | ||
1414 | 1489 | echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ | ||
1415 | 1490 | cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files | ||
1416 | 1491 | install-libdbusmenu_jsonloaderincludeHEADERS: $(libdbusmenu_jsonloaderinclude_HEADERS) | ||
1417 | 1492 | @$(NORMAL_INSTALL) | ||
1418 | 1493 | test -z "$(libdbusmenu_jsonloaderincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)" | ||
1419 | 1494 | @list='$(libdbusmenu_jsonloaderinclude_HEADERS)'; test -n "$(libdbusmenu_jsonloaderincludedir)" || list=; \ | ||
1420 | 1495 | for p in $$list; do \ | ||
1421 | 1496 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
1422 | 1497 | echo "$$d$$p"; \ | ||
1423 | 1498 | done | $(am__base_list) | \ | ||
1424 | 1499 | while read files; do \ | ||
1425 | 1500 | echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)'"; \ | ||
1426 | 1501 | $(INSTALL_HEADER) $$files "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)" || exit $$?; \ | ||
1427 | 1502 | done | ||
1428 | 1503 | |||
1429 | 1504 | uninstall-libdbusmenu_jsonloaderincludeHEADERS: | ||
1430 | 1505 | @$(NORMAL_UNINSTALL) | ||
1431 | 1506 | @list='$(libdbusmenu_jsonloaderinclude_HEADERS)'; test -n "$(libdbusmenu_jsonloaderincludedir)" || list=; \ | ||
1432 | 1507 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | ||
1433 | 1508 | test -n "$$files" || exit 0; \ | ||
1434 | 1509 | echo " ( cd '$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)' && rm -f" $$files ")"; \ | ||
1435 | 1510 | cd "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)" && rm -f $$files | ||
1436 | 1278 | 1511 | ||
1437 | 1279 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | 1512 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
1438 | 1280 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | 1513 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
1439 | @@ -1454,9 +1687,9 @@ | |||
1440 | 1454 | $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) | 1687 | $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) |
1441 | 1455 | $(MAKE) $(AM_MAKEFLAGS) check-TESTS | 1688 | $(MAKE) $(AM_MAKEFLAGS) check-TESTS |
1442 | 1456 | check: check-am | 1689 | check: check-am |
1444 | 1457 | all-am: Makefile $(DATA) | 1690 | all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) |
1445 | 1458 | installdirs: | 1691 | installdirs: |
1447 | 1459 | for dir in "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(jsondir)"; do \ | 1692 | for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(jsondir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)"; do \ |
1448 | 1460 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | 1693 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
1449 | 1461 | done | 1694 | done |
1450 | 1462 | install: install-am | 1695 | install: install-am |
1451 | @@ -1488,8 +1721,8 @@ | |||
1452 | 1488 | @echo "it deletes files that may require special tools to rebuild." | 1721 | @echo "it deletes files that may require special tools to rebuild." |
1453 | 1489 | clean: clean-am | 1722 | clean: clean-am |
1454 | 1490 | 1723 | ||
1457 | 1491 | clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ | 1724 | clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ |
1458 | 1492 | mostlyclean-am | 1725 | clean-libtool mostlyclean-am |
1459 | 1493 | 1726 | ||
1460 | 1494 | distclean: distclean-am | 1727 | distclean: distclean-am |
1461 | 1495 | -rm -rf ./$(DEPDIR) | 1728 | -rm -rf ./$(DEPDIR) |
1462 | @@ -1509,13 +1742,15 @@ | |||
1463 | 1509 | 1742 | ||
1464 | 1510 | info-am: | 1743 | info-am: |
1465 | 1511 | 1744 | ||
1467 | 1512 | install-data-am: install-examplesDATA install-jsonDATA | 1745 | install-data-am: install-examplesDATA install-jsonDATA \ |
1468 | 1746 | install-libdbusmenu_jsonloaderincludeHEADERS \ | ||
1469 | 1747 | install-pkgconfigDATA | ||
1470 | 1513 | 1748 | ||
1471 | 1514 | install-dvi: install-dvi-am | 1749 | install-dvi: install-dvi-am |
1472 | 1515 | 1750 | ||
1473 | 1516 | install-dvi-am: | 1751 | install-dvi-am: |
1474 | 1517 | 1752 | ||
1476 | 1518 | install-exec-am: | 1753 | install-exec-am: install-libLTLIBRARIES |
1477 | 1519 | 1754 | ||
1478 | 1520 | install-html: install-html-am | 1755 | install-html: install-html-am |
1479 | 1521 | 1756 | ||
1480 | @@ -1555,24 +1790,32 @@ | |||
1481 | 1555 | 1790 | ||
1482 | 1556 | ps-am: | 1791 | ps-am: |
1483 | 1557 | 1792 | ||
1485 | 1558 | uninstall-am: uninstall-examplesDATA uninstall-jsonDATA | 1793 | uninstall-am: uninstall-examplesDATA uninstall-jsonDATA \ |
1486 | 1794 | uninstall-libLTLIBRARIES \ | ||
1487 | 1795 | uninstall-libdbusmenu_jsonloaderincludeHEADERS \ | ||
1488 | 1796 | uninstall-pkgconfigDATA | ||
1489 | 1559 | 1797 | ||
1490 | 1560 | .MAKE: check-am install-am install-strip | 1798 | .MAKE: check-am install-am install-strip |
1491 | 1561 | 1799 | ||
1492 | 1562 | .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ | 1800 | .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ |
1501 | 1563 | clean-checkPROGRAMS clean-generic clean-libtool ctags \ | 1801 | clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ |
1502 | 1564 | distclean distclean-compile distclean-generic \ | 1802 | clean-libtool ctags distclean distclean-compile \ |
1503 | 1565 | distclean-libtool distclean-local distclean-tags distdir dvi \ | 1803 | distclean-generic distclean-libtool distclean-local \ |
1504 | 1566 | dvi-am html html-am info info-am install install-am \ | 1804 | distclean-tags distdir dvi dvi-am html html-am info info-am \ |
1505 | 1567 | install-data install-data-am install-dvi install-dvi-am \ | 1805 | install install-am install-data install-data-am install-dvi \ |
1506 | 1568 | install-examplesDATA install-exec install-exec-am install-html \ | 1806 | install-dvi-am install-examplesDATA install-exec \ |
1507 | 1569 | install-html-am install-info install-info-am install-jsonDATA \ | 1807 | install-exec-am install-html install-html-am install-info \ |
1508 | 1570 | install-man install-pdf install-pdf-am install-ps \ | 1808 | install-info-am install-jsonDATA install-libLTLIBRARIES \ |
1509 | 1809 | install-libdbusmenu_jsonloaderincludeHEADERS install-man \ | ||
1510 | 1810 | install-pdf install-pdf-am install-pkgconfigDATA install-ps \ | ||
1511 | 1571 | install-ps-am install-strip installcheck installcheck-am \ | 1811 | install-ps-am install-strip installcheck installcheck-am \ |
1512 | 1572 | installdirs maintainer-clean maintainer-clean-generic \ | 1812 | installdirs maintainer-clean maintainer-clean-generic \ |
1513 | 1573 | mostlyclean mostlyclean-compile mostlyclean-generic \ | 1813 | mostlyclean mostlyclean-compile mostlyclean-generic \ |
1514 | 1574 | mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ | 1814 | mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ |
1516 | 1575 | uninstall-am uninstall-examplesDATA uninstall-jsonDATA | 1815 | uninstall-am uninstall-examplesDATA uninstall-jsonDATA \ |
1517 | 1816 | uninstall-libLTLIBRARIES \ | ||
1518 | 1817 | uninstall-libdbusmenu_jsonloaderincludeHEADERS \ | ||
1519 | 1818 | uninstall-pkgconfigDATA | ||
1520 | 1576 | 1819 | ||
1521 | 1577 | 1820 | ||
1522 | 1578 | ###################### | 1821 | ###################### |
1523 | @@ -1585,6 +1828,17 @@ | |||
1524 | 1585 | @chmod +x $@ | 1828 | @chmod +x $@ |
1525 | 1586 | 1829 | ||
1526 | 1587 | ###################### | 1830 | ###################### |
1527 | 1831 | # Test JSON | ||
1528 | 1832 | ###################### | ||
1529 | 1833 | |||
1530 | 1834 | test-json: test-json-client test-json-server Makefile.am | ||
1531 | 1835 | @echo "#!/bin/bash" > $@ | ||
1532 | 1836 | @echo $(XVFB_RUN) >> $@ | ||
1533 | 1837 | @echo $(DBUS_RUNNER) --task ./test-json-client --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --ignore-return --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@ | ||
1534 | 1838 | @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@ | ||
1535 | 1839 | @chmod +x $@ | ||
1536 | 1840 | |||
1537 | 1841 | ###################### | ||
1538 | 1588 | # Test Glib Submenu | 1842 | # Test Glib Submenu |
1539 | 1589 | ###################### | 1843 | ###################### |
1540 | 1590 | 1844 | ||
1541 | 1591 | 1845 | ||
1542 | === added file 'tests/dbusmenu-jsonloader.pc.in' | |||
1543 | --- tests/dbusmenu-jsonloader.pc.in 1970-01-01 00:00:00 +0000 | |||
1544 | +++ tests/dbusmenu-jsonloader.pc.in 2010-07-01 14:04:28 +0000 | |||
1545 | @@ -0,0 +1,14 @@ | |||
1546 | 1 | prefix=@prefix@ | ||
1547 | 2 | exec_prefix=@exec_prefix@ | ||
1548 | 3 | libdir=@libdir@ | ||
1549 | 4 | bindir=@bindir@ | ||
1550 | 5 | includedir=@includedir@ | ||
1551 | 6 | |||
1552 | 7 | Cflags: -I${includedir}/libdbusmenu-0.1 | ||
1553 | 8 | Requires: dbus-glib-1,dbusmenu-glib,json-glib-1.0 | ||
1554 | 9 | Libs: -L${libdir} -ldbusmenu-jsonloader | ||
1555 | 10 | |||
1556 | 11 | Name: libdbusmenu-jsonloader | ||
1557 | 12 | Description: A small library to load JSON descriptions of menus. Mostly for testing. | ||
1558 | 13 | Version: @VERSION@ | ||
1559 | 14 | |||
1560 | 0 | 15 | ||
1561 | === added file 'tests/json-loader.c' | |||
1562 | --- tests/json-loader.c 1970-01-01 00:00:00 +0000 | |||
1563 | +++ tests/json-loader.c 2010-07-01 14:04:28 +0000 | |||
1564 | @@ -0,0 +1,220 @@ | |||
1565 | 1 | /* | ||
1566 | 2 | A loader to turn JSON into dbusmenu menuitems | ||
1567 | 3 | |||
1568 | 4 | Copyright 2010 Canonical Ltd. | ||
1569 | 5 | |||
1570 | 6 | Authors: | ||
1571 | 7 | Ted Gould <ted@canonical.com> | ||
1572 | 8 | |||
1573 | 9 | This program is free software: you can redistribute it and/or modify it | ||
1574 | 10 | under the terms of the GNU General Public License version 3, as published | ||
1575 | 11 | by the Free Software Foundation. | ||
1576 | 12 | |||
1577 | 13 | This program is distributed in the hope that it will be useful, but | ||
1578 | 14 | WITHOUT ANY WARRANTY; without even the implied warranties of | ||
1579 | 15 | MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
1580 | 16 | PURPOSE. See the GNU General Public License for more details. | ||
1581 | 17 | |||
1582 | 18 | You should have received a copy of the GNU General Public License along | ||
1583 | 19 | with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1584 | 20 | */ | ||
1585 | 21 | |||
1586 | 22 | #include "json-loader.h" | ||
1587 | 23 | #include <dbus/dbus-gtype-specialized.h> | ||
1588 | 24 | |||
1589 | 25 | static GValue * | ||
1590 | 26 | node2value (JsonNode * node) | ||
1591 | 27 | { | ||
1592 | 28 | if (node == NULL) { | ||
1593 | 29 | return NULL; | ||
1594 | 30 | } | ||
1595 | 31 | |||
1596 | 32 | GValue * value = g_new0(GValue, 1); | ||
1597 | 33 | |||
1598 | 34 | if (JSON_NODE_TYPE(node) == JSON_NODE_VALUE) { | ||
1599 | 35 | json_node_get_value(node, value); | ||
1600 | 36 | return value; | ||
1601 | 37 | } | ||
1602 | 38 | |||
1603 | 39 | if (JSON_NODE_TYPE(node) == JSON_NODE_ARRAY) { | ||
1604 | 40 | JsonArray * array = json_node_get_array(node); | ||
1605 | 41 | JsonNode * first = json_array_get_element(array, 0); | ||
1606 | 42 | |||
1607 | 43 | if (JSON_NODE_TYPE(first) == JSON_NODE_VALUE) { | ||
1608 | 44 | GValue subvalue = {0}; | ||
1609 | 45 | json_node_get_value(first, &subvalue); | ||
1610 | 46 | |||
1611 | 47 | if (G_VALUE_TYPE(&subvalue) == G_TYPE_STRING) { | ||
1612 | 48 | GArray * garray = g_array_sized_new(TRUE, TRUE, sizeof(gchar *), json_array_get_length(array)); | ||
1613 | 49 | g_value_init(value, G_TYPE_STRV); | ||
1614 | 50 | g_value_take_boxed(value, garray->data); | ||
1615 | 51 | |||
1616 | 52 | int i; | ||
1617 | 53 | for (i = 0; i < json_array_get_length(array); i++) { | ||
1618 | 54 | const gchar * str = json_node_get_string(json_array_get_element(array, i)); | ||
1619 | 55 | gchar * dupstr = g_strdup(str); | ||
1620 | 56 | g_array_append_val(garray, dupstr); | ||
1621 | 57 | } | ||
1622 | 58 | |||
1623 | 59 | g_array_free(garray, FALSE); | ||
1624 | 60 | } else { | ||
1625 | 61 | GValueArray * varray = g_value_array_new(json_array_get_length(array)); | ||
1626 | 62 | g_value_init(value, G_TYPE_VALUE_ARRAY); | ||
1627 | 63 | g_value_take_boxed(value, varray); | ||
1628 | 64 | |||
1629 | 65 | g_value_array_append(varray, &subvalue); | ||
1630 | 66 | g_value_unset(&subvalue); | ||
1631 | 67 | |||
1632 | 68 | int i; | ||
1633 | 69 | for (i = 1; i < json_array_get_length(array); i++) { | ||
1634 | 70 | json_node_get_value(first, &subvalue); | ||
1635 | 71 | g_value_array_append(varray, &subvalue); | ||
1636 | 72 | g_value_unset(&subvalue); | ||
1637 | 73 | } | ||
1638 | 74 | } | ||
1639 | 75 | |||
1640 | 76 | } else { | ||
1641 | 77 | GValue * subvalue = node2value(first); | ||
1642 | 78 | GType type = dbus_g_type_get_collection("GPtrArray", G_VALUE_TYPE(subvalue)); | ||
1643 | 79 | gpointer * wrapper = dbus_g_type_specialized_construct(type); | ||
1644 | 80 | |||
1645 | 81 | g_value_init(value, type); | ||
1646 | 82 | g_value_take_boxed(value, wrapper); | ||
1647 | 83 | |||
1648 | 84 | DBusGTypeSpecializedAppendContext ctx; | ||
1649 | 85 | dbus_g_type_specialized_init_append(value, &ctx); | ||
1650 | 86 | |||
1651 | 87 | dbus_g_type_specialized_collection_append(&ctx, subvalue); | ||
1652 | 88 | int i; | ||
1653 | 89 | for (i = 1; i < json_array_get_length(array); i++) { | ||
1654 | 90 | GValue * subvalue = node2value(node); | ||
1655 | 91 | dbus_g_type_specialized_collection_append(&ctx, subvalue); | ||
1656 | 92 | } | ||
1657 | 93 | |||
1658 | 94 | dbus_g_type_specialized_collection_end_append(&ctx); | ||
1659 | 95 | } | ||
1660 | 96 | } | ||
1661 | 97 | |||
1662 | 98 | if (JSON_NODE_TYPE(node) == JSON_NODE_OBJECT) { | ||
1663 | 99 | JsonObject * obj = json_node_get_object(node); | ||
1664 | 100 | |||
1665 | 101 | GType type = dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE); | ||
1666 | 102 | GHashTable * hash = (GHashTable *)dbus_g_type_specialized_construct(type); | ||
1667 | 103 | |||
1668 | 104 | g_value_init(value, type); | ||
1669 | 105 | g_value_take_boxed(value, hash); | ||
1670 | 106 | |||
1671 | 107 | DBusGTypeSpecializedAppendContext ctx; | ||
1672 | 108 | dbus_g_type_specialized_init_append(value, &ctx); | ||
1673 | 109 | |||
1674 | 110 | GList * members = NULL; | ||
1675 | 111 | for (members = json_object_get_members(obj); members != NULL; members = g_list_next(members)) { | ||
1676 | 112 | const gchar * member = members->data; | ||
1677 | 113 | |||
1678 | 114 | JsonNode * lnode = json_object_get_member(obj, member); | ||
1679 | 115 | GValue * value = node2value(lnode); | ||
1680 | 116 | |||
1681 | 117 | if (value != NULL) { | ||
1682 | 118 | GValue name = {0}; | ||
1683 | 119 | g_value_init(&name, G_TYPE_STRING); | ||
1684 | 120 | g_value_set_static_string(&name, member); | ||
1685 | 121 | |||
1686 | 122 | dbus_g_type_specialized_map_append(&ctx, &name, value); | ||
1687 | 123 | |||
1688 | 124 | g_value_unset(&name); | ||
1689 | 125 | g_value_unset(value); | ||
1690 | 126 | g_free(value); | ||
1691 | 127 | } | ||
1692 | 128 | } | ||
1693 | 129 | } | ||
1694 | 130 | |||
1695 | 131 | return value; | ||
1696 | 132 | } | ||
1697 | 133 | |||
1698 | 134 | static void | ||
1699 | 135 | set_props (DbusmenuMenuitem * mi, JsonObject * node) | ||
1700 | 136 | { | ||
1701 | 137 | if (node == NULL) return; | ||
1702 | 138 | |||
1703 | 139 | GList * members = NULL; | ||
1704 | 140 | for (members = json_object_get_members(node); members != NULL; members = g_list_next(members)) { | ||
1705 | 141 | const gchar * member = members->data; | ||
1706 | 142 | |||
1707 | 143 | if (!g_strcmp0(member, "id")) { continue; } | ||
1708 | 144 | if (!g_strcmp0(member, "submenu")) { continue; } | ||
1709 | 145 | |||
1710 | 146 | JsonNode * lnode = json_object_get_member(node, member); | ||
1711 | 147 | GValue * value = node2value(lnode); | ||
1712 | 148 | |||
1713 | 149 | if (value != NULL) { | ||
1714 | 150 | dbusmenu_menuitem_property_set_value(mi, member, value); | ||
1715 | 151 | g_value_unset(value); | ||
1716 | 152 | g_free(value); | ||
1717 | 153 | } | ||
1718 | 154 | } | ||
1719 | 155 | |||
1720 | 156 | return; | ||
1721 | 157 | } | ||
1722 | 158 | |||
1723 | 159 | DbusmenuMenuitem * | ||
1724 | 160 | dbusmenu_json_build_from_node (const JsonNode * cnode) | ||
1725 | 161 | { | ||
1726 | 162 | JsonNode * node = (JsonNode *)cnode; /* To match the jsonglib API :( */ | ||
1727 | 163 | |||
1728 | 164 | if (node == NULL) return NULL; | ||
1729 | 165 | if (JSON_NODE_TYPE(node) != JSON_NODE_OBJECT) return NULL; | ||
1730 | 166 | |||
1731 | 167 | JsonObject * layout = json_node_get_object(node); | ||
1732 | 168 | |||
1733 | 169 | DbusmenuMenuitem * local = NULL; | ||
1734 | 170 | if (json_object_has_member(layout, "id")) { | ||
1735 | 171 | JsonNode * node = json_object_get_member(layout, "id"); | ||
1736 | 172 | g_return_val_if_fail(JSON_NODE_TYPE(node) == JSON_NODE_VALUE, NULL); | ||
1737 | 173 | local = dbusmenu_menuitem_new_with_id(json_node_get_int(node)); | ||
1738 | 174 | } else { | ||
1739 | 175 | local = dbusmenu_menuitem_new(); | ||
1740 | 176 | } | ||
1741 | 177 | |||
1742 | 178 | set_props(local, layout); | ||
1743 | 179 | |||
1744 | 180 | if (json_object_has_member(layout, "submenu")) { | ||
1745 | 181 | JsonNode * node = json_object_get_member(layout, "submenu"); | ||
1746 | 182 | g_return_val_if_fail(JSON_NODE_TYPE(node) == JSON_NODE_ARRAY, local); | ||
1747 | 183 | JsonArray * array = json_node_get_array(node); | ||
1748 | 184 | guint count; | ||
1749 | 185 | for (count = 0; count < json_array_get_length(array); count++) { | ||
1750 | 186 | DbusmenuMenuitem * child = dbusmenu_json_build_from_node(json_array_get_element(array, count)); | ||
1751 | 187 | if (child != NULL) { | ||
1752 | 188 | dbusmenu_menuitem_child_append(local, child); | ||
1753 | 189 | } | ||
1754 | 190 | } | ||
1755 | 191 | } | ||
1756 | 192 | |||
1757 | 193 | /* g_debug("Layout to menu return: 0x%X", (unsigned int)local); */ | ||
1758 | 194 | return local; | ||
1759 | 195 | } | ||
1760 | 196 | |||
1761 | 197 | DbusmenuMenuitem * | ||
1762 | 198 | dbusmenu_json_build_from_file (const gchar * filename) | ||
1763 | 199 | { | ||
1764 | 200 | JsonParser * parser = json_parser_new(); | ||
1765 | 201 | |||
1766 | 202 | GError * error = NULL; | ||
1767 | 203 | if (!json_parser_load_from_file(parser, filename, &error)) { | ||
1768 | 204 | g_warning("Failed parsing file %s because: %s", filename, error->message); | ||
1769 | 205 | g_error_free(error); | ||
1770 | 206 | return NULL; | ||
1771 | 207 | } | ||
1772 | 208 | |||
1773 | 209 | JsonNode * root_node = json_parser_get_root(parser); | ||
1774 | 210 | if (JSON_NODE_TYPE(root_node) != JSON_NODE_OBJECT) { | ||
1775 | 211 | g_warning("Root node is not an object, fail. It's an: %s", json_node_type_name(root_node)); | ||
1776 | 212 | return NULL; | ||
1777 | 213 | } | ||
1778 | 214 | |||
1779 | 215 | DbusmenuMenuitem * mi = dbusmenu_json_build_from_node(root_node); | ||
1780 | 216 | |||
1781 | 217 | g_object_unref(parser); | ||
1782 | 218 | |||
1783 | 219 | return mi; | ||
1784 | 220 | } | ||
1785 | 0 | 221 | ||
1786 | === added file 'tests/json-loader.h' | |||
1787 | --- tests/json-loader.h 1970-01-01 00:00:00 +0000 | |||
1788 | +++ tests/json-loader.h 2010-07-01 14:04:28 +0000 | |||
1789 | @@ -0,0 +1,31 @@ | |||
1790 | 1 | /* | ||
1791 | 2 | A loader to turn JSON into dbusmenu menuitems | ||
1792 | 3 | |||
1793 | 4 | Copyright 2010 Canonical Ltd. | ||
1794 | 5 | |||
1795 | 6 | Authors: | ||
1796 | 7 | Ted Gould <ted@canonical.com> | ||
1797 | 8 | |||
1798 | 9 | This program is free software: you can redistribute it and/or modify it | ||
1799 | 10 | under the terms of the GNU General Public License version 3, as published | ||
1800 | 11 | by the Free Software Foundation. | ||
1801 | 12 | |||
1802 | 13 | This program is distributed in the hope that it will be useful, but | ||
1803 | 14 | WITHOUT ANY WARRANTY; without even the implied warranties of | ||
1804 | 15 | MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
1805 | 16 | PURPOSE. See the GNU General Public License for more details. | ||
1806 | 17 | |||
1807 | 18 | You should have received a copy of the GNU General Public License along | ||
1808 | 19 | with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1809 | 20 | */ | ||
1810 | 21 | |||
1811 | 22 | #ifndef __DBUSMENU_JSON_LOADER_H__ | ||
1812 | 23 | #define __DBUSMENU_JSON_LOADER_H__ | ||
1813 | 24 | |||
1814 | 25 | #include <libdbusmenu-glib/menuitem.h> | ||
1815 | 26 | #include <json-glib/json-glib.h> | ||
1816 | 27 | |||
1817 | 28 | DbusmenuMenuitem * dbusmenu_json_build_from_node (const JsonNode * node); | ||
1818 | 29 | DbusmenuMenuitem * dbusmenu_json_build_from_file (const gchar * filename); | ||
1819 | 30 | |||
1820 | 31 | #endif /* __DBUSMENU_JSON_LOADER_H__ */ | ||
1821 | 0 | 32 | ||
1822 | === modified file 'tests/test-gtk-label-server.c' | |||
1823 | --- tests/test-gtk-label-server.c 2010-02-04 19:04:28 +0000 | |||
1824 | +++ tests/test-gtk-label-server.c 2010-07-01 14:04:28 +0000 | |||
1825 | @@ -30,74 +30,7 @@ | |||
1826 | 30 | #include <libdbusmenu-glib/server.h> | 30 | #include <libdbusmenu-glib/server.h> |
1827 | 31 | 31 | ||
1828 | 32 | #include <json-glib/json-glib.h> | 32 | #include <json-glib/json-glib.h> |
1897 | 33 | 33 | #include "json-loader.h" | |
1830 | 34 | static void | ||
1831 | 35 | menuitem_click(DbusmenuMenuitem * mi, guint32 time, gpointer user_data) | ||
1832 | 36 | { | ||
1833 | 37 | g_debug("Clicked on: %d @ %d", dbusmenu_menuitem_get_id(mi), time); | ||
1834 | 38 | return; | ||
1835 | 39 | } | ||
1836 | 40 | |||
1837 | 41 | static void | ||
1838 | 42 | set_props (DbusmenuMenuitem * mi, JsonObject * node) | ||
1839 | 43 | { | ||
1840 | 44 | if (node == NULL) return; | ||
1841 | 45 | |||
1842 | 46 | GList * members = NULL; | ||
1843 | 47 | for (members = json_object_get_members(node); members != NULL; members = g_list_next(members)) { | ||
1844 | 48 | const gchar * member = members->data; | ||
1845 | 49 | |||
1846 | 50 | if (!g_strcmp0(member, "id")) { continue; } | ||
1847 | 51 | if (!g_strcmp0(member, "submenu")) { continue; } | ||
1848 | 52 | |||
1849 | 53 | JsonNode * lnode = json_object_get_member(node, member); | ||
1850 | 54 | if (JSON_NODE_TYPE(lnode) != JSON_NODE_VALUE) { continue; } | ||
1851 | 55 | |||
1852 | 56 | GValue value = {0}; | ||
1853 | 57 | json_node_get_value(lnode, &value); | ||
1854 | 58 | dbusmenu_menuitem_property_set_value(mi, member, &value); | ||
1855 | 59 | g_value_unset(&value); | ||
1856 | 60 | } | ||
1857 | 61 | |||
1858 | 62 | return; | ||
1859 | 63 | } | ||
1860 | 64 | |||
1861 | 65 | static DbusmenuMenuitem * | ||
1862 | 66 | layout2menuitem (JsonNode * inlayout) | ||
1863 | 67 | { | ||
1864 | 68 | if (inlayout == NULL) return NULL; | ||
1865 | 69 | if (JSON_NODE_TYPE(inlayout) != JSON_NODE_OBJECT) return NULL; | ||
1866 | 70 | |||
1867 | 71 | JsonObject * layout = json_node_get_object(inlayout); | ||
1868 | 72 | |||
1869 | 73 | DbusmenuMenuitem * local = NULL; | ||
1870 | 74 | if (json_object_has_member(layout, "id")) { | ||
1871 | 75 | JsonNode * node = json_object_get_member(layout, "id"); | ||
1872 | 76 | g_return_val_if_fail(JSON_NODE_TYPE(node) == JSON_NODE_VALUE, NULL); | ||
1873 | 77 | local = dbusmenu_menuitem_new_with_id(json_node_get_int(node)); | ||
1874 | 78 | } else { | ||
1875 | 79 | local = dbusmenu_menuitem_new(); | ||
1876 | 80 | } | ||
1877 | 81 | g_signal_connect(G_OBJECT(local), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(menuitem_click), NULL); | ||
1878 | 82 | |||
1879 | 83 | set_props(local, layout); | ||
1880 | 84 | |||
1881 | 85 | if (json_object_has_member(layout, "submenu")) { | ||
1882 | 86 | JsonNode * node = json_object_get_member(layout, "submenu"); | ||
1883 | 87 | g_return_val_if_fail(JSON_NODE_TYPE(node) == JSON_NODE_ARRAY, local); | ||
1884 | 88 | JsonArray * array = json_node_get_array(node); | ||
1885 | 89 | guint count; | ||
1886 | 90 | for (count = 0; count < json_array_get_length(array); count++) { | ||
1887 | 91 | DbusmenuMenuitem * child = layout2menuitem(json_array_get_element(array, count)); | ||
1888 | 92 | if (child != NULL) { | ||
1889 | 93 | dbusmenu_menuitem_child_append(local, child); | ||
1890 | 94 | } | ||
1891 | 95 | } | ||
1892 | 96 | } | ||
1893 | 97 | |||
1894 | 98 | /* g_debug("Layout to menu return: 0x%X", (unsigned int)local); */ | ||
1895 | 99 | return local; | ||
1896 | 100 | } | ||
1898 | 101 | 34 | ||
1899 | 102 | static JsonArray * root_array = NULL; | 35 | static JsonArray * root_array = NULL; |
1900 | 103 | static guint layouton = 0; | 36 | static guint layouton = 0; |
1901 | @@ -114,7 +47,7 @@ | |||
1902 | 114 | } | 47 | } |
1903 | 115 | g_debug("Updating to Layout %d", layouton); | 48 | g_debug("Updating to Layout %d", layouton); |
1904 | 116 | 49 | ||
1906 | 117 | dbusmenu_server_set_root(server, layout2menuitem(json_array_get_element(root_array, layouton))); | 50 | dbusmenu_server_set_root(server, dbusmenu_json_build_from_node(json_array_get_element(root_array, layouton))); |
1907 | 118 | layouton++; | 51 | layouton++; |
1908 | 119 | 52 | ||
1909 | 120 | return TRUE; | 53 | return TRUE; |
1910 | 121 | 54 | ||
1911 | === added file 'tests/test-json-01.json' | |||
1912 | --- tests/test-json-01.json 1970-01-01 00:00:00 +0000 | |||
1913 | +++ tests/test-json-01.json 2010-07-01 14:04:28 +0000 | |||
1914 | @@ -0,0 +1,4023 @@ | |||
1915 | 1 | { | ||
1916 | 2 | "id": 0, | ||
1917 | 3 | "children-display": "submenu", | ||
1918 | 4 | "submenu": [ | ||
1919 | 5 | { | ||
1920 | 6 | "id": 5, | ||
1921 | 7 | "enabled": true, | ||
1922 | 8 | "label": "File", | ||
1923 | 9 | "children-display": "submenu", | ||
1924 | 10 | "visible": true, | ||
1925 | 11 | "submenu": [ | ||
1926 | 12 | { | ||
1927 | 13 | "id": 6, | ||
1928 | 14 | "shortcut": [["Control", "q"]], | ||
1929 | 15 | "enabled": true, | ||
1930 | 16 | "label": "Quit", | ||
1931 | 17 | "visible": true | ||
1932 | 18 | }, | ||
1933 | 19 | { | ||
1934 | 20 | "id": 7, | ||
1935 | 21 | "shortcut": [["Control", "Shift", "w"]], | ||
1936 | 22 | "enabled": true, | ||
1937 | 23 | "label": "Close all", | ||
1938 | 24 | "visible": true | ||
1939 | 25 | }, | ||
1940 | 26 | { | ||
1941 | 27 | "id": 8, | ||
1942 | 28 | "shortcut": [["Control", "w"]], | ||
1943 | 29 | "enabled": true, | ||
1944 | 30 | "label": "Close", | ||
1945 | 31 | "visible": true | ||
1946 | 32 | }, | ||
1947 | 33 | { | ||
1948 | 34 | "id": 9, | ||
1949 | 35 | "type": "separator" | ||
1950 | 36 | }, | ||
1951 | 37 | { | ||
1952 | 38 | "id": 10, | ||
1953 | 39 | "enabled": true, | ||
1954 | 40 | "label": "Send by Email...", | ||
1955 | 41 | "visible": true | ||
1956 | 42 | }, | ||
1957 | 43 | { | ||
1958 | 44 | "id": 11, | ||
1959 | 45 | "shortcut": [["Control", "p"]], | ||
1960 | 46 | "enabled": true, | ||
1961 | 47 | "label": "Print...", | ||
1962 | 48 | "visible": true | ||
1963 | 49 | }, | ||
1964 | 50 | { | ||
1965 | 51 | "id": 12, | ||
1966 | 52 | "enabled": true, | ||
1967 | 53 | "label": "Page Setup", | ||
1968 | 54 | "visible": true | ||
1969 | 55 | }, | ||
1970 | 56 | { | ||
1971 | 57 | "id": 13, | ||
1972 | 58 | "type": "separator" | ||
1973 | 59 | }, | ||
1974 | 60 | { | ||
1975 | 61 | "id": 14, | ||
1976 | 62 | "enabled": true, | ||
1977 | 63 | "label": "Revert", | ||
1978 | 64 | "visible": true | ||
1979 | 65 | }, | ||
1980 | 66 | { | ||
1981 | 67 | "id": 15, | ||
1982 | 68 | "enabled": true, | ||
1983 | 69 | "label": "Save as Template...", | ||
1984 | 70 | "visible": true | ||
1985 | 71 | }, | ||
1986 | 72 | { | ||
1987 | 73 | "id": 16, | ||
1988 | 74 | "enabled": true, | ||
1989 | 75 | "label": "Save a Copy...", | ||
1990 | 76 | "visible": true | ||
1991 | 77 | }, | ||
1992 | 78 | { | ||
1993 | 79 | "id": 17, | ||
1994 | 80 | "shortcut": [["Control", "Shift", "s"]], | ||
1995 | 81 | "enabled": true, | ||
1996 | 82 | "label": "Save As...", | ||
1997 | 83 | "visible": true | ||
1998 | 84 | }, | ||
1999 | 85 | { | ||
2000 | 86 | "id": 18, | ||
2001 | 87 | "shortcut": [["Control", "s"]], | ||
2002 | 88 | "enabled": true, | ||
2003 | 89 | "label": "Save", | ||
2004 | 90 | "visible": true | ||
2005 | 91 | }, | ||
2006 | 92 | { | ||
2007 | 93 | "id": 19, | ||
2008 | 94 | "type": "separator" | ||
2009 | 95 | }, | ||
2010 | 96 | { | ||
2011 | 97 | "id": 20, | ||
2012 | 98 | "enabled": true, | ||
2013 | 99 | "label": "Open Recent", | ||
2014 | 100 | "children-display": "submenu", | ||
2015 | 101 | "visible": true, | ||
2016 | 102 | "submenu": [ | ||
2017 | 103 | { | ||
2018 | 104 | "id": 21, | ||
2019 | 105 | "enabled": true, | ||
2020 | 106 | "label": "Document History", | ||
2021 | 107 | "visible": true | ||
2022 | 108 | }, | ||
2023 | 109 | { | ||
2024 | 110 | "id": 22, | ||
2025 | 111 | "type": "separator" | ||
2026 | 112 | }, | ||
2027 | 113 | { | ||
2028 | 114 | "id": 23, | ||
2029 | 115 | "shortcut": [["Control", "2"]], | ||
2030 | 116 | "enabled": true, | ||
2031 | 117 | "label": "giggity.jpg", | ||
2032 | 118 | "visible": true | ||
2033 | 119 | }, | ||
2034 | 120 | { | ||
2035 | 121 | "id": 24, | ||
2036 | 122 | "shortcut": [["Control", "1"]], | ||
2037 | 123 | "enabled": true, | ||
2038 | 124 | "label": "Icon Height.svg", | ||
2039 | 125 | "visible": true | ||
2040 | 126 | } | ||
2041 | 127 | ] | ||
2042 | 128 | }, | ||
2043 | 129 | { | ||
2044 | 130 | "id": 25, | ||
2045 | 131 | "enabled": true, | ||
2046 | 132 | "label": "Open Location...", | ||
2047 | 133 | "visible": true | ||
2048 | 134 | }, | ||
2049 | 135 | { | ||
2050 | 136 | "id": 26, | ||
2051 | 137 | "shortcut": [["Control", "Alt", "o"]], | ||
2052 | 138 | "enabled": true, | ||
2053 | 139 | "label": "Open as Layers...", | ||
2054 | 140 | "visible": true | ||
2055 | 141 | }, | ||
2056 | 142 | { | ||
2057 | 143 | "id": 27, | ||
2058 | 144 | "shortcut": [["Control", "o"]], | ||
2059 | 145 | "enabled": true, | ||
2060 | 146 | "label": "Open...", | ||
2061 | 147 | "visible": true | ||
2062 | 148 | }, | ||
2063 | 149 | { | ||
2064 | 150 | "id": 28, | ||
2065 | 151 | "enabled": true, | ||
2066 | 152 | "label": "Create", | ||
2067 | 153 | "children-display": "submenu", | ||
2068 | 154 | "visible": true, | ||
2069 | 155 | "submenu": [ | ||
2070 | 156 | { | ||
2071 | 157 | "id": 29, | ||
2072 | 158 | "enabled": true, | ||
2073 | 159 | "label": "Web Page Themes", | ||
2074 | 160 | "children-display": "submenu", | ||
2075 | 161 | "visible": true, | ||
2076 | 162 | "submenu": [ | ||
2077 | 163 | { | ||
2078 | 164 | "id": 30, | ||
2079 | 165 | "enabled": true, | ||
2080 | 166 | "label": "Classic.Gimp.Org", | ||
2081 | 167 | "children-display": "submenu", | ||
2082 | 168 | "visible": true, | ||
2083 | 169 | "submenu": [ | ||
2084 | 170 | { | ||
2085 | 171 | "id": 31, | ||
2086 | 172 | "enabled": true, | ||
2087 | 173 | "label": "Tube Sub-Sub-Button Label...", | ||
2088 | 174 | "visible": true | ||
2089 | 175 | }, | ||
2090 | 176 | { | ||
2091 | 177 | "id": 32, | ||
2092 | 178 | "enabled": true, | ||
2093 | 179 | "label": "Tube Sub-Button Label...", | ||
2094 | 180 | "visible": true | ||
2095 | 181 | }, | ||
2096 | 182 | { | ||
2097 | 183 | "id": 33, | ||
2098 | 184 | "enabled": true, | ||
2099 | 185 | "label": "Tube Button Label...", | ||
2100 | 186 | "visible": true | ||
2101 | 187 | }, | ||
2102 | 188 | { | ||
2103 | 189 | "id": 34, | ||
2104 | 190 | "enabled": true, | ||
2105 | 191 | "label": "Small Header...", | ||
2106 | 192 | "visible": true | ||
2107 | 193 | }, | ||
2108 | 194 | { | ||
2109 | 195 | "id": 35, | ||
2110 | 196 | "enabled": true, | ||
2111 | 197 | "label": "General Tube Labels...", | ||
2112 | 198 | "visible": true | ||
2113 | 199 | }, | ||
2114 | 200 | { | ||
2115 | 201 | "id": 36, | ||
2116 | 202 | "enabled": true, | ||
2117 | 203 | "label": "Big Header...", | ||
2118 | 204 | "visible": true | ||
2119 | 205 | } | ||
2120 | 206 | ] | ||
2121 | 207 | }, | ||
2122 | 208 | { | ||
2123 | 209 | "id": 37, | ||
2124 | 210 | "enabled": true, | ||
2125 | 211 | "label": "Beveled Pattern", | ||
2126 | 212 | "children-display": "submenu", | ||
2127 | 213 | "visible": true, | ||
2128 | 214 | "submenu": [ | ||
2129 | 215 | { | ||
2130 | 216 | "id": 38, | ||
2131 | 217 | "enabled": true, | ||
2132 | 218 | "label": "Hrule...", | ||
2133 | 219 | "visible": true | ||
2134 | 220 | }, | ||
2135 | 221 | { | ||
2136 | 222 | "id": 39, | ||
2137 | 223 | "enabled": true, | ||
2138 | 224 | "label": "Heading...", | ||
2139 | 225 | "visible": true | ||
2140 | 226 | }, | ||
2141 | 227 | { | ||
2142 | 228 | "id": 40, | ||
2143 | 229 | "enabled": true, | ||
2144 | 230 | "label": "Button...", | ||
2145 | 231 | "visible": true | ||
2146 | 232 | }, | ||
2147 | 233 | { | ||
2148 | 234 | "id": 41, | ||
2149 | 235 | "enabled": true, | ||
2150 | 236 | "label": "Bullet...", | ||
2151 | 237 | "visible": true | ||
2152 | 238 | }, | ||
2153 | 239 | { | ||
2154 | 240 | "id": 42, | ||
2155 | 241 | "enabled": true, | ||
2156 | 242 | "label": "Arrow...", | ||
2157 | 243 | "visible": true | ||
2158 | 244 | } | ||
2159 | 245 | ] | ||
2160 | 246 | }, | ||
2161 | 247 | { | ||
2162 | 248 | "id": 43, | ||
2163 | 249 | "enabled": true, | ||
2164 | 250 | "label": "Alien Glow", | ||
2165 | 251 | "children-display": "submenu", | ||
2166 | 252 | "visible": true, | ||
2167 | 253 | "submenu": [ | ||
2168 | 254 | { | ||
2169 | 255 | "id": 44, | ||
2170 | 256 | "enabled": true, | ||
2171 | 257 | "label": "Hrule...", | ||
2172 | 258 | "visible": true | ||
2173 | 259 | }, | ||
2174 | 260 | { | ||
2175 | 261 | "id": 45, | ||
2176 | 262 | "enabled": true, | ||
2177 | 263 | "label": "Button...", | ||
2178 | 264 | "visible": true | ||
2179 | 265 | }, | ||
2180 | 266 | { | ||
2181 | 267 | "id": 46, | ||
2182 | 268 | "enabled": true, | ||
2183 | 269 | "label": "Bullet...", | ||
2184 | 270 | "visible": true | ||
2185 | 271 | }, | ||
2186 | 272 | { | ||
2187 | 273 | "id": 47, | ||
2188 | 274 | "enabled": true, | ||
2189 | 275 | "label": "Arrow...", | ||
2190 | 276 | "visible": true | ||
2191 | 277 | } | ||
2192 | 278 | ] | ||
2193 | 279 | } | ||
2194 | 280 | ] | ||
2195 | 281 | }, | ||
2196 | 282 | { | ||
2197 | 283 | "id": 48, | ||
2198 | 284 | "enabled": true, | ||
2199 | 285 | "label": "Patterns", | ||
2200 | 286 | "children-display": "submenu", | ||
2201 | 287 | "visible": true, | ||
2202 | 288 | "submenu": [ | ||
2203 | 289 | { | ||
2204 | 290 | "id": 49, | ||
2205 | 291 | "enabled": true, | ||
2206 | 292 | "label": "Truchet...", | ||
2207 | 293 | "visible": true | ||
2208 | 294 | }, | ||
2209 | 295 | { | ||
2210 | 296 | "id": 50, | ||
2211 | 297 | "enabled": true, | ||
2212 | 298 | "label": "Swirly...", | ||
2213 | 299 | "visible": true | ||
2214 | 300 | }, | ||
2215 | 301 | { | ||
2216 | 302 | "id": 51, | ||
2217 | 303 | "enabled": true, | ||
2218 | 304 | "label": "Swirl-Tile...", | ||
2219 | 305 | "visible": true | ||
2220 | 306 | }, | ||
2221 | 307 | { | ||
2222 | 308 | "id": 52, | ||
2223 | 309 | "enabled": true, | ||
2224 | 310 | "label": "Render Map...", | ||
2225 | 311 | "visible": true | ||
2226 | 312 | }, | ||
2227 | 313 | { | ||
2228 | 314 | "id": 53, | ||
2229 | 315 | "enabled": true, | ||
2230 | 316 | "label": "Land...", | ||
2231 | 317 | "visible": true | ||
2232 | 318 | }, | ||
2233 | 319 | { | ||
2234 | 320 | "id": 54, | ||
2235 | 321 | "enabled": true, | ||
2236 | 322 | "label": "Flatland...", | ||
2237 | 323 | "visible": true | ||
2238 | 324 | }, | ||
2239 | 325 | { | ||
2240 | 326 | "id": 55, | ||
2241 | 327 | "enabled": true, | ||
2242 | 328 | "label": "Camouflage...", | ||
2243 | 329 | "visible": true | ||
2244 | 330 | }, | ||
2245 | 331 | { | ||
2246 | 332 | "id": 56, | ||
2247 | 333 | "enabled": true, | ||
2248 | 334 | "label": "3D Truchet...", | ||
2249 | 335 | "visible": true | ||
2250 | 336 | } | ||
2251 | 337 | ] | ||
2252 | 338 | }, | ||
2253 | 339 | { | ||
2254 | 340 | "id": 57, | ||
2255 | 341 | "enabled": true, | ||
2256 | 342 | "label": "Logos", | ||
2257 | 343 | "children-display": "submenu", | ||
2258 | 344 | "visible": true, | ||
2259 | 345 | "submenu": [ | ||
2260 | 346 | { | ||
2261 | 347 | "id": 58, | ||
2262 | 348 | "enabled": true, | ||
2263 | 349 | "label": "Web Title Header...", | ||
2264 | 350 | "visible": true | ||
2265 | 351 | }, | ||
2266 | 352 | { | ||
2267 | 353 | "id": 59, | ||
2268 | 354 | "enabled": true, | ||
2269 | 355 | "label": "Textured...", | ||
2270 | 356 | "visible": true | ||
2271 | 357 | }, | ||
2272 | 358 | { | ||
2273 | 359 | "id": 60, | ||
2274 | 360 | "enabled": true, | ||
2275 | 361 | "label": "Text Circle...", | ||
2276 | 362 | "visible": true | ||
2277 | 363 | }, | ||
2278 | 364 | { | ||
2279 | 365 | "id": 61, | ||
2280 | 366 | "enabled": true, | ||
2281 | 367 | "label": "Starscape...", | ||
2282 | 368 | "visible": true | ||
2283 | 369 | }, | ||
2284 | 370 | { | ||
2285 | 371 | "id": 62, | ||
2286 | 372 | "enabled": true, | ||
2287 | 373 | "label": "Speed Text...", | ||
2288 | 374 | "visible": true | ||
2289 | 375 | }, | ||
2290 | 376 | { | ||
2291 | 377 | "id": 63, | ||
2292 | 378 | "enabled": true, | ||
2293 | 379 | "label": "SOTA Chrome...", | ||
2294 | 380 | "visible": true | ||
2295 | 381 | }, | ||
2296 | 382 | { | ||
2297 | 383 | "id": 64, | ||
2298 | 384 | "enabled": true, | ||
2299 | 385 | "label": "Particle Trace...", | ||
2300 | 386 | "visible": true | ||
2301 | 387 | }, | ||
2302 | 388 | { | ||
2303 | 389 | "id": 65, | ||
2304 | 390 | "enabled": true, | ||
2305 | 391 | "label": "Newsprint Text...", | ||
2306 | 392 | "visible": true | ||
2307 | 393 | }, | ||
2308 | 394 | { | ||
2309 | 395 | "id": 66, | ||
2310 | 396 | "enabled": true, | ||
2311 | 397 | "label": "Neon...", | ||
2312 | 398 | "visible": true | ||
2313 | 399 | }, | ||
2314 | 400 | { | ||
2315 | 401 | "id": 67, | ||
2316 | 402 | "enabled": true, | ||
2317 | 403 | "label": "Imigre-26...", | ||
2318 | 404 | "visible": true | ||
2319 | 405 | }, | ||
2320 | 406 | { | ||
2321 | 407 | "id": 68, | ||
2322 | 408 | "enabled": true, | ||
2323 | 409 | "label": "Gradient Bevel...", | ||
2324 | 410 | "visible": true | ||
2325 | 411 | }, | ||
2326 | 412 | { | ||
2327 | 413 | "id": 69, | ||
2328 | 414 | "enabled": true, | ||
2329 | 415 | "label": "Glowing Hot...", | ||
2330 | 416 | "visible": true | ||
2331 | 417 | }, | ||
2332 | 418 | { | ||
2333 | 419 | "id": 70, | ||
2334 | 420 | "enabled": true, | ||
2335 | 421 | "label": "Glossy...", | ||
2336 | 422 | "visible": true | ||
2337 | 423 | }, | ||
2338 | 424 | { | ||
2339 | 425 | "id": 71, | ||
2340 | 426 | "enabled": true, | ||
2341 | 427 | "label": "Frosty...", | ||
2342 | 428 | "visible": true | ||
2343 | 429 | }, | ||
2344 | 430 | { | ||
2345 | 431 | "id": 72, | ||
2346 | 432 | "enabled": true, | ||
2347 | 433 | "label": "Crystal...", | ||
2348 | 434 | "visible": true | ||
2349 | 435 | }, | ||
2350 | 436 | { | ||
2351 | 437 | "id": 73, | ||
2352 | 438 | "enabled": true, | ||
2353 | 439 | "label": "Cool Metal...", | ||
2354 | 440 | "visible": true | ||
2355 | 441 | }, | ||
2356 | 442 | { | ||
2357 | 443 | "id": 74, | ||
2358 | 444 | "enabled": true, | ||
2359 | 445 | "label": "Comic Book...", | ||
2360 | 446 | "visible": true | ||
2361 | 447 | }, | ||
2362 | 448 | { | ||
2363 | 449 | "id": 75, | ||
2364 | 450 | "enabled": true, | ||
2365 | 451 | "label": "Chrome...", | ||
2366 | 452 | "visible": true | ||
2367 | 453 | }, | ||
2368 | 454 | { | ||
2369 | 455 | "id": 76, | ||
2370 | 456 | "enabled": true, | ||
2371 | 457 | "label": "Chip Away...", | ||
2372 | 458 | "visible": true | ||
2373 | 459 | }, | ||
2374 | 460 | { | ||
2375 | 461 | "id": 77, | ||
2376 | 462 | "enabled": true, | ||
2377 | 463 | "label": "Chalk...", | ||
2378 | 464 | "visible": true | ||
2379 | 465 | }, | ||
2380 | 466 | { | ||
2381 | 467 | "id": 78, | ||
2382 | 468 | "enabled": true, | ||
2383 | 469 | "label": "Carved...", | ||
2384 | 470 | "visible": true | ||
2385 | 471 | }, | ||
2386 | 472 | { | ||
2387 | 473 | "id": 79, | ||
2388 | 474 | "enabled": true, | ||
2389 | 475 | "label": "Bovination...", | ||
2390 | 476 | "visible": true | ||
2391 | 477 | }, | ||
2392 | 478 | { | ||
2393 | 479 | "id": 80, | ||
2394 | 480 | "enabled": true, | ||
2395 | 481 | "label": "Blended...", | ||
2396 | 482 | "visible": true | ||
2397 | 483 | }, | ||
2398 | 484 | { | ||
2399 | 485 | "id": 81, | ||
2400 | 486 | "enabled": true, | ||
2401 | 487 | "label": "Basic I...", | ||
2402 | 488 | "visible": true | ||
2403 | 489 | }, | ||
2404 | 490 | { | ||
2405 | 491 | "id": 82, | ||
2406 | 492 | "enabled": true, | ||
2407 | 493 | "label": "Basic II...", | ||
2408 | 494 | "visible": true | ||
2409 | 495 | }, | ||
2410 | 496 | { | ||
2411 | 497 | "id": 83, | ||
2412 | 498 | "enabled": true, | ||
2413 | 499 | "label": "Alien Neon...", | ||
2414 | 500 | "visible": true | ||
2415 | 501 | }, | ||
2416 | 502 | { | ||
2417 | 503 | "id": 84, | ||
2418 | 504 | "enabled": true, | ||
2419 | 505 | "label": "Alien Glow...", | ||
2420 | 506 | "visible": true | ||
2421 | 507 | }, | ||
2422 | 508 | { | ||
2423 | 509 | "id": 85, | ||
2424 | 510 | "enabled": true, | ||
2425 | 511 | "label": "3D Outline...", | ||
2426 | 512 | "visible": true | ||
2427 | 513 | } | ||
2428 | 514 | ] | ||
2429 | 515 | }, | ||
2430 | 516 | { | ||
2431 | 517 | "id": 86, | ||
2432 | 518 | "enabled": true, | ||
2433 | 519 | "label": "Buttons", | ||
2434 | 520 | "children-display": "submenu", | ||
2435 | 521 | "visible": true, | ||
2436 | 522 | "submenu": [ | ||
2437 | 523 | { | ||
2438 | 524 | "id": 87, | ||
2439 | 525 | "enabled": true, | ||
2440 | 526 | "label": "Simple Beveled Button...", | ||
2441 | 527 | "visible": true | ||
2442 | 528 | }, | ||
2443 | 529 | { | ||
2444 | 530 | "id": 88, | ||
2445 | 531 | "enabled": true, | ||
2446 | 532 | "label": "Round Button...", | ||
2447 | 533 | "visible": true | ||
2448 | 534 | } | ||
2449 | 535 | ] | ||
2450 | 536 | }, | ||
2451 | 537 | { | ||
2452 | 538 | "id": 89, | ||
2453 | 539 | "type": "separator" | ||
2454 | 540 | }, | ||
2455 | 541 | { | ||
2456 | 542 | "id": 90, | ||
2457 | 543 | "enabled": true, | ||
2458 | 544 | "label": "xscanimage", | ||
2459 | 545 | "children-display": "submenu", | ||
2460 | 546 | "visible": true, | ||
2461 | 547 | "submenu": [ | ||
2462 | 548 | { | ||
2463 | 549 | "id": 91, | ||
2464 | 550 | "enabled": false, | ||
2465 | 551 | "label": "Device dialog...", | ||
2466 | 552 | "visible": true | ||
2467 | 553 | } | ||
2468 | 554 | ] | ||
2469 | 555 | }, | ||
2470 | 556 | { | ||
2471 | 557 | "id": 92, | ||
2472 | 558 | "enabled": true, | ||
2473 | 559 | "label": "Screenshot...", | ||
2474 | 560 | "visible": true | ||
2475 | 561 | }, | ||
2476 | 562 | { | ||
2477 | 563 | "id": 93, | ||
2478 | 564 | "shortcut": [["Control", "Shift", "v"]], | ||
2479 | 565 | "enabled": true, | ||
2480 | 566 | "label": "From Clipboard", | ||
2481 | 567 | "visible": true | ||
2482 | 568 | } | ||
2483 | 569 | ] | ||
2484 | 570 | }, | ||
2485 | 571 | { | ||
2486 | 572 | "id": 94, | ||
2487 | 573 | "shortcut": [["Control", "n"]], | ||
2488 | 574 | "enabled": true, | ||
2489 | 575 | "label": "New...", | ||
2490 | 576 | "visible": true | ||
2491 | 577 | } | ||
2492 | 578 | ] | ||
2493 | 579 | }, | ||
2494 | 580 | { | ||
2495 | 581 | "id": 95, | ||
2496 | 582 | "enabled": true, | ||
2497 | 583 | "label": "Edit", | ||
2498 | 584 | "children-display": "submenu", | ||
2499 | 585 | "visible": true, | ||
2500 | 586 | "submenu": [ | ||
2501 | 587 | { | ||
2502 | 588 | "id": 96, | ||
2503 | 589 | "enabled": true, | ||
2504 | 590 | "label": "Units", | ||
2505 | 591 | "visible": true | ||
2506 | 592 | }, | ||
2507 | 593 | { | ||
2508 | 594 | "id": 97, | ||
2509 | 595 | "enabled": true, | ||
2510 | 596 | "label": "Modules", | ||
2511 | 597 | "visible": true | ||
2512 | 598 | }, | ||
2513 | 599 | { | ||
2514 | 600 | "id": 98, | ||
2515 | 601 | "enabled": true, | ||
2516 | 602 | "label": "Keyboard Shortcuts", | ||
2517 | 603 | "visible": true | ||
2518 | 604 | }, | ||
2519 | 605 | { | ||
2520 | 606 | "id": 99, | ||
2521 | 607 | "enabled": true, | ||
2522 | 608 | "label": "Preferences", | ||
2523 | 609 | "visible": true | ||
2524 | 610 | }, | ||
2525 | 611 | { | ||
2526 | 612 | "id": 100, | ||
2527 | 613 | "type": "separator" | ||
2528 | 614 | }, | ||
2529 | 615 | { | ||
2530 | 616 | "id": 101, | ||
2531 | 617 | "enabled": false, | ||
2532 | 618 | "label": "Stroke Path...", | ||
2533 | 619 | "visible": true | ||
2534 | 620 | }, | ||
2535 | 621 | { | ||
2536 | 622 | "id": 102, | ||
2537 | 623 | "enabled": false, | ||
2538 | 624 | "label": "Stroke Selection...", | ||
2539 | 625 | "visible": true | ||
2540 | 626 | }, | ||
2541 | 627 | { | ||
2542 | 628 | "id": 103, | ||
2543 | 629 | "shortcut": [["Control", "semicolon"]], | ||
2544 | 630 | "enabled": true, | ||
2545 | 631 | "label": "Fill with Pattern", | ||
2546 | 632 | "visible": true | ||
2547 | 633 | }, | ||
2548 | 634 | { | ||
2549 | 635 | "id": 104, | ||
2550 | 636 | "shortcut": [["Control", "period"]], | ||
2551 | 637 | "enabled": true, | ||
2552 | 638 | "label": "Fill with BG Color", | ||
2553 | 639 | "visible": true | ||
2554 | 640 | }, | ||
2555 | 641 | { | ||
2556 | 642 | "id": 105, | ||
2557 | 643 | "shortcut": [["Control", "comma"]], | ||
2558 | 644 | "enabled": true, | ||
2559 | 645 | "label": "Fill with FG Color", | ||
2560 | 646 | "visible": true | ||
2561 | 647 | }, | ||
2562 | 648 | { | ||
2563 | 649 | "id": 106, | ||
2564 | 650 | "shortcut": [["Delete"]], | ||
2565 | 651 | "enabled": true, | ||
2566 | 652 | "label": "Clear", | ||
2567 | 653 | "visible": true | ||
2568 | 654 | }, | ||
2569 | 655 | { | ||
2570 | 656 | "id": 107, | ||
2571 | 657 | "type": "separator" | ||
2572 | 658 | }, | ||
2573 | 659 | { | ||
2574 | 660 | "id": 108, | ||
2575 | 661 | "enabled": true, | ||
2576 | 662 | "label": "Buffer", | ||
2577 | 663 | "children-display": "submenu", | ||
2578 | 664 | "visible": true, | ||
2579 | 665 | "submenu": [ | ||
2580 | 666 | { | ||
2581 | 667 | "id": 109, | ||
2582 | 668 | "enabled": true, | ||
2583 | 669 | "label": "Paste Named...", | ||
2584 | 670 | "visible": true | ||
2585 | 671 | }, | ||
2586 | 672 | { | ||
2587 | 673 | "id": 110, | ||
2588 | 674 | "enabled": true, | ||
2589 | 675 | "label": "Copy Visible Named...", | ||
2590 | 676 | "visible": true | ||
2591 | 677 | }, | ||
2592 | 678 | { | ||
2593 | 679 | "id": 111, | ||
2594 | 680 | "enabled": true, | ||
2595 | 681 | "label": "Copy Named...", | ||
2596 | 682 | "visible": true | ||
2597 | 683 | }, | ||
2598 | 684 | { | ||
2599 | 685 | "id": 112, | ||
2600 | 686 | "enabled": true, | ||
2601 | 687 | "label": "Cut Named...", | ||
2602 | 688 | "visible": true | ||
2603 | 689 | } | ||
2604 | 690 | ] | ||
2605 | 691 | }, | ||
2606 | 692 | { | ||
2607 | 693 | "id": 113, | ||
2608 | 694 | "enabled": true, | ||
2609 | 695 | "label": "Paste as", | ||
2610 | 696 | "children-display": "submenu", | ||
2611 | 697 | "visible": true, | ||
2612 | 698 | "submenu": [ | ||
2613 | 699 | { | ||
2614 | 700 | "id": 114, | ||
2615 | 701 | "enabled": true, | ||
2616 | 702 | "label": "New Pattern...", | ||
2617 | 703 | "visible": true | ||
2618 | 704 | }, | ||
2619 | 705 | { | ||
2620 | 706 | "id": 115, | ||
2621 | 707 | "enabled": true, | ||
2622 | 708 | "label": "New Brush...", | ||
2623 | 709 | "visible": true | ||
2624 | 710 | }, | ||
2625 | 711 | { | ||
2626 | 712 | "id": 116, | ||
2627 | 713 | "enabled": true, | ||
2628 | 714 | "label": "New Layer", | ||
2629 | 715 | "visible": true | ||
2630 | 716 | }, | ||
2631 | 717 | { | ||
2632 | 718 | "id": 117, | ||
2633 | 719 | "shortcut": [["Control", "Shift", "v"]], | ||
2634 | 720 | "enabled": true, | ||
2635 | 721 | "label": "New Image", | ||
2636 | 722 | "visible": true | ||
2637 | 723 | } | ||
2638 | 724 | ] | ||
2639 | 725 | }, | ||
2640 | 726 | { | ||
2641 | 727 | "id": 118, | ||
2642 | 728 | "enabled": true, | ||
2643 | 729 | "label": "Paste Into", | ||
2644 | 730 | "visible": true | ||
2645 | 731 | }, | ||
2646 | 732 | { | ||
2647 | 733 | "id": 119, | ||
2648 | 734 | "shortcut": [["Control", "v"]], | ||
2649 | 735 | "enabled": true, | ||
2650 | 736 | "label": "Paste", | ||
2651 | 737 | "visible": true | ||
2652 | 738 | }, | ||
2653 | 739 | { | ||
2654 | 740 | "id": 120, | ||
2655 | 741 | "shortcut": [["Control", "Shift", "c"]], | ||
2656 | 742 | "enabled": true, | ||
2657 | 743 | "label": "Copy Visible", | ||
2658 | 744 | "visible": true | ||
2659 | 745 | }, | ||
2660 | 746 | { | ||
2661 | 747 | "id": 121, | ||
2662 | 748 | "shortcut": [["Control", "c"]], | ||
2663 | 749 | "enabled": true, | ||
2664 | 750 | "label": "Copy", | ||
2665 | 751 | "visible": true | ||
2666 | 752 | }, | ||
2667 | 753 | { | ||
2668 | 754 | "id": 122, | ||
2669 | 755 | "shortcut": [["Control", "x"]], | ||
2670 | 756 | "enabled": true, | ||
2671 | 757 | "label": "Cut", | ||
2672 | 758 | "visible": true | ||
2673 | 759 | }, | ||
2674 | 760 | { | ||
2675 | 761 | "id": 123, | ||
2676 | 762 | "type": "separator" | ||
2677 | 763 | }, | ||
2678 | 764 | { | ||
2679 | 765 | "id": 124, | ||
2680 | 766 | "enabled": true, | ||
2681 | 767 | "label": "Undo History", | ||
2682 | 768 | "visible": true | ||
2683 | 769 | }, | ||
2684 | 770 | { | ||
2685 | 771 | "id": 3, | ||
2686 | 772 | "enabled": false, | ||
2687 | 773 | "label": "_Fade...", | ||
2688 | 774 | "visible": true | ||
2689 | 775 | }, | ||
2690 | 776 | { | ||
2691 | 777 | "id": 2, | ||
2692 | 778 | "shortcut": [["Control", "y"]], | ||
2693 | 779 | "enabled": false, | ||
2694 | 780 | "label": "_Redo", | ||
2695 | 781 | "visible": true | ||
2696 | 782 | }, | ||
2697 | 783 | { | ||
2698 | 784 | "id": 1, | ||
2699 | 785 | "shortcut": [["Control", "z"]], | ||
2700 | 786 | "enabled": false, | ||
2701 | 787 | "label": "_Undo", | ||
2702 | 788 | "visible": true | ||
2703 | 789 | } | ||
2704 | 790 | ] | ||
2705 | 791 | }, | ||
2706 | 792 | { | ||
2707 | 793 | "id": 125, | ||
2708 | 794 | "enabled": true, | ||
2709 | 795 | "label": "Select", | ||
2710 | 796 | "children-display": "submenu", | ||
2711 | 797 | "visible": true, | ||
2712 | 798 | "submenu": [ | ||
2713 | 799 | { | ||
2714 | 800 | "id": 126, | ||
2715 | 801 | "enabled": false, | ||
2716 | 802 | "label": "To Path", | ||
2717 | 803 | "visible": true | ||
2718 | 804 | }, | ||
2719 | 805 | { | ||
2720 | 806 | "id": 127, | ||
2721 | 807 | "enabled": true, | ||
2722 | 808 | "label": "Save to Channel", | ||
2723 | 809 | "visible": true | ||
2724 | 810 | }, | ||
2725 | 811 | { | ||
2726 | 812 | "id": 128, | ||
2727 | 813 | "shortcut": [["Shift", "q"]], | ||
2728 | 814 | "enabled": true, | ||
2729 | 815 | "toggle-state": 0, | ||
2730 | 816 | "label": "Toggle Quick Mask", | ||
2731 | 817 | "toggle-type": "checkmark", | ||
2732 | 818 | "visible": true | ||
2733 | 819 | }, | ||
2734 | 820 | { | ||
2735 | 821 | "id": 129, | ||
2736 | 822 | "type": "separator" | ||
2737 | 823 | }, | ||
2738 | 824 | { | ||
2739 | 825 | "id": 130, | ||
2740 | 826 | "enabled": true, | ||
2741 | 827 | "label": "Distort...", | ||
2742 | 828 | "visible": true | ||
2743 | 829 | }, | ||
2744 | 830 | { | ||
2745 | 831 | "id": 131, | ||
2746 | 832 | "enabled": false, | ||
2747 | 833 | "label": "Border...", | ||
2748 | 834 | "visible": true | ||
2749 | 835 | }, | ||
2750 | 836 | { | ||
2751 | 837 | "id": 132, | ||
2752 | 838 | "enabled": false, | ||
2753 | 839 | "label": "Grow...", | ||
2754 | 840 | "visible": true | ||
2755 | 841 | }, | ||
2756 | 842 | { | ||
2757 | 843 | "id": 133, | ||
2758 | 844 | "enabled": false, | ||
2759 | 845 | "label": "Shrink...", | ||
2760 | 846 | "visible": true | ||
2761 | 847 | }, | ||
2762 | 848 | { | ||
2763 | 849 | "id": 134, | ||
2764 | 850 | "enabled": false, | ||
2765 | 851 | "label": "Sharpen", | ||
2766 | 852 | "visible": true | ||
2767 | 853 | }, | ||
2768 | 854 | { | ||
2769 | 855 | "id": 135, | ||
2770 | 856 | "enabled": false, | ||
2771 | 857 | "label": "Feather...", | ||
2772 | 858 | "visible": true | ||
2773 | 859 | }, | ||
2774 | 860 | { | ||
2775 | 861 | "id": 136, | ||
2776 | 862 | "type": "separator" | ||
2777 | 863 | }, | ||
2778 | 864 | { | ||
2779 | 865 | "id": 137, | ||
2780 | 866 | "enabled": true, | ||
2781 | 867 | "label": "Selection Editor", | ||
2782 | 868 | "visible": true | ||
2783 | 869 | }, | ||
2784 | 870 | { | ||
2785 | 871 | "id": 138, | ||
2786 | 872 | "shortcut": [["Shift", "v"]], | ||
2787 | 873 | "enabled": false, | ||
2788 | 874 | "label": "From Path", | ||
2789 | 875 | "visible": true | ||
2790 | 876 | }, | ||
2791 | 877 | { | ||
2792 | 878 | "id": 139, | ||
2793 | 879 | "shortcut": [["Shift", "o"]], | ||
2794 | 880 | "enabled": true, | ||
2795 | 881 | "label": "By Color", | ||
2796 | 882 | "visible": true | ||
2797 | 883 | }, | ||
2798 | 884 | { | ||
2799 | 885 | "id": 140, | ||
2800 | 886 | "shortcut": [["Control", "Shift", "l"]], | ||
2801 | 887 | "enabled": false, | ||
2802 | 888 | "label": "Float", | ||
2803 | 889 | "visible": true | ||
2804 | 890 | }, | ||
2805 | 891 | { | ||
2806 | 892 | "id": 141, | ||
2807 | 893 | "shortcut": [["Control", "i"]], | ||
2808 | 894 | "enabled": true, | ||
2809 | 895 | "label": "Invert", | ||
2810 | 896 | "visible": true | ||
2811 | 897 | }, | ||
2812 | 898 | { | ||
2813 | 899 | "id": 142, | ||
2814 | 900 | "shortcut": [["Control", "Shift", "a"]], | ||
2815 | 901 | "enabled": false, | ||
2816 | 902 | "label": "None", | ||
2817 | 903 | "visible": true | ||
2818 | 904 | }, | ||
2819 | 905 | { | ||
2820 | 906 | "id": 143, | ||
2821 | 907 | "shortcut": [["Control", "a"]], | ||
2822 | 908 | "enabled": true, | ||
2823 | 909 | "label": "All", | ||
2824 | 910 | "visible": true | ||
2825 | 911 | } | ||
2826 | 912 | ] | ||
2827 | 913 | }, | ||
2828 | 914 | { | ||
2829 | 915 | "id": 144, | ||
2830 | 916 | "enabled": true, | ||
2831 | 917 | "label": "View", | ||
2832 | 918 | "children-display": "submenu", | ||
2833 | 919 | "visible": true, | ||
2834 | 920 | "submenu": [ | ||
2835 | 921 | { | ||
2836 | 922 | "id": 145, | ||
2837 | 923 | "enabled": true, | ||
2838 | 924 | "toggle-state": 1, | ||
2839 | 925 | "label": "Show Statusbar", | ||
2840 | 926 | "toggle-type": "checkmark", | ||
2841 | 927 | "visible": true | ||
2842 | 928 | }, | ||
2843 | 929 | { | ||
2844 | 930 | "id": 146, | ||
2845 | 931 | "enabled": true, | ||
2846 | 932 | "toggle-state": 0, | ||
2847 | 933 | "label": "Show Scrollbars", | ||
2848 | 934 | "toggle-type": "checkmark", | ||
2849 | 935 | "visible": true | ||
2850 | 936 | }, | ||
2851 | 937 | { | ||
2852 | 938 | "id": 147, | ||
2853 | 939 | "shortcut": [["Control", "Shift", "r"]], | ||
2854 | 940 | "enabled": true, | ||
2855 | 941 | "toggle-state": 0, | ||
2856 | 942 | "label": "Show Rulers", | ||
2857 | 943 | "toggle-type": "checkmark", | ||
2858 | 944 | "visible": true | ||
2859 | 945 | }, | ||
2860 | 946 | { | ||
2861 | 947 | "id": 148, | ||
2862 | 948 | "enabled": true, | ||
2863 | 949 | "toggle-state": 1, | ||
2864 | 950 | "label": "Show Menubar", | ||
2865 | 951 | "toggle-type": "checkmark", | ||
2866 | 952 | "visible": true | ||
2867 | 953 | }, | ||
2868 | 954 | { | ||
2869 | 955 | "id": 149, | ||
2870 | 956 | "enabled": true, | ||
2871 | 957 | "label": "Padding Color", | ||
2872 | 958 | "children-display": "submenu", | ||
2873 | 959 | "visible": true, | ||
2874 | 960 | "submenu": [ | ||
2875 | 961 | { | ||
2876 | 962 | "id": 150, | ||
2877 | 963 | "enabled": true, | ||
2878 | 964 | "label": "As in Preferences", | ||
2879 | 965 | "visible": true | ||
2880 | 966 | }, | ||
2881 | 967 | { | ||
2882 | 968 | "id": 151, | ||
2883 | 969 | "type": "separator" | ||
2884 | 970 | }, | ||
2885 | 971 | { | ||
2886 | 972 | "id": 152, | ||
2887 | 973 | "enabled": true, | ||
2888 | 974 | "label": "Select Custom Color...", | ||
2889 | 975 | "visible": true | ||
2890 | 976 | }, | ||
2891 | 977 | { | ||
2892 | 978 | "id": 153, | ||
2893 | 979 | "enabled": true, | ||
2894 | 980 | "label": "Dark Check Color", | ||
2895 | 981 | "visible": true | ||
2896 | 982 | }, | ||
2897 | 983 | { | ||
2898 | 984 | "id": 154, | ||
2899 | 985 | "enabled": true, | ||
2900 | 986 | "label": "Light Check Color", | ||
2901 | 987 | "visible": true | ||
2902 | 988 | }, | ||
2903 | 989 | { | ||
2904 | 990 | "id": 155, | ||
2905 | 991 | "enabled": true, | ||
2906 | 992 | "label": "From Theme", | ||
2907 | 993 | "visible": true | ||
2908 | 994 | } | ||
2909 | 995 | ] | ||
2910 | 996 | }, | ||
2911 | 997 | { | ||
2912 | 998 | "id": 156, | ||
2913 | 999 | "type": "separator" | ||
2914 | 1000 | }, | ||
2915 | 1001 | { | ||
2916 | 1002 | "id": 157, | ||
2917 | 1003 | "enabled": true, | ||
2918 | 1004 | "toggle-state": 0, | ||
2919 | 1005 | "label": "Snap to Active Path", | ||
2920 | 1006 | "toggle-type": "checkmark", | ||
2921 | 1007 | "visible": true | ||
2922 | 1008 | }, | ||
2923 | 1009 | { | ||
2924 | 1010 | "id": 158, | ||
2925 | 1011 | "enabled": true, | ||
2926 | 1012 | "toggle-state": 0, | ||
2927 | 1013 | "label": "Snap to Canvas Edges", | ||
2928 | 1014 | "toggle-type": "checkmark", | ||
2929 | 1015 | "visible": true | ||
2930 | 1016 | }, | ||
2931 | 1017 | { | ||
2932 | 1018 | "id": 159, | ||
2933 | 1019 | "enabled": true, | ||
2934 | 1020 | "toggle-state": 0, | ||
2935 | 1021 | "label": "Snap to Grid", | ||
2936 | 1022 | "toggle-type": "checkmark", | ||
2937 | 1023 | "visible": true | ||
2938 | 1024 | }, | ||
2939 | 1025 | { | ||
2940 | 1026 | "id": 160, | ||
2941 | 1027 | "enabled": true, | ||
2942 | 1028 | "toggle-state": 1, | ||
2943 | 1029 | "label": "Snap to Guides", | ||
2944 | 1030 | "toggle-type": "checkmark", | ||
2945 | 1031 | "visible": true | ||
2946 | 1032 | }, | ||
2947 | 1033 | { | ||
2948 | 1034 | "id": 161, | ||
2949 | 1035 | "type": "separator" | ||
2950 | 1036 | }, | ||
2951 | 1037 | { | ||
2952 | 1038 | "id": 162, | ||
2953 | 1039 | "enabled": true, | ||
2954 | 1040 | "toggle-state": 0, | ||
2955 | 1041 | "label": "Show Sample Points", | ||
2956 | 1042 | "toggle-type": "checkmark", | ||
2957 | 1043 | "visible": true | ||
2958 | 1044 | }, | ||
2959 | 1045 | { | ||
2960 | 1046 | "id": 163, | ||
2961 | 1047 | "enabled": true, | ||
2962 | 1048 | "toggle-state": 0, | ||
2963 | 1049 | "label": "Show Grid", | ||
2964 | 1050 | "toggle-type": "checkmark", | ||
2965 | 1051 | "visible": true | ||
2966 | 1052 | }, | ||
2967 | 1053 | { | ||
2968 | 1054 | "id": 164, | ||
2969 | 1055 | "shortcut": [["Control", "Shift", "t"]], | ||
2970 | 1056 | "enabled": true, | ||
2971 | 1057 | "toggle-state": 0, | ||
2972 | 1058 | "label": "Show Guides", | ||
2973 | 1059 | "toggle-type": "checkmark", | ||
2974 | 1060 | "visible": true | ||
2975 | 1061 | }, | ||
2976 | 1062 | { | ||
2977 | 1063 | "id": 165, | ||
2978 | 1064 | "enabled": true, | ||
2979 | 1065 | "toggle-state": 0, | ||
2980 | 1066 | "label": "Show Layer Boundary", | ||
2981 | 1067 | "toggle-type": "checkmark", | ||
2982 | 1068 | "visible": true | ||
2983 | 1069 | }, | ||
2984 | 1070 | { | ||
2985 | 1071 | "id": 166, | ||
2986 | 1072 | "shortcut": [["Control", "t"]], | ||
2987 | 1073 | "enabled": true, | ||
2988 | 1074 | "toggle-state": 0, | ||
2989 | 1075 | "label": "Show Selection", | ||
2990 | 1076 | "toggle-type": "checkmark", | ||
2991 | 1077 | "visible": true | ||
2992 | 1078 | }, | ||
2993 | 1079 | { | ||
2994 | 1080 | "id": 167, | ||
2995 | 1081 | "type": "separator" | ||
2996 | 1082 | }, | ||
2997 | 1083 | { | ||
2998 | 1084 | "id": 168, | ||
2999 | 1085 | "enabled": true, | ||
3000 | 1086 | "label": "Display Filters...", | ||
3001 | 1087 | "visible": true | ||
3002 | 1088 | }, | ||
3003 | 1089 | { | ||
3004 | 1090 | "id": 169, | ||
3005 | 1091 | "enabled": true, | ||
3006 | 1092 | "label": "Navigation Window", | ||
3007 | 1093 | "visible": true | ||
3008 | 1094 | }, | ||
3009 | 1095 | { | ||
3010 | 1096 | "id": 170, | ||
3011 | 1097 | "type": "separator" | ||
3012 | 1098 | }, | ||
3013 | 1099 | { | ||
3014 | 1100 | "id": 171, | ||
3015 | 1101 | "enabled": true, | ||
3016 | 1102 | "shortcut": [["F11"]], | ||
3017 | 1103 | "toggle-state": 0, | ||
3018 | 1104 | "label": "Fullscreen", | ||
3019 | 1105 | "toggle-type": "checkmark", | ||
3020 | 1106 | "children-display": "submenu", | ||
3021 | 1107 | "visible": true, | ||
3022 | 1108 | "submenu": [ | ||
3023 | 1109 | { | ||
3024 | 1110 | "id": 172, | ||
3025 | 1111 | "enabled": true, | ||
3026 | 1112 | "label": "Open Display...", | ||
3027 | 1113 | "visible": true | ||
3028 | 1114 | } | ||
3029 | 1115 | ] | ||
3030 | 1116 | }, | ||
3031 | 1117 | { | ||
3032 | 1118 | "id": 173, | ||
3033 | 1119 | "shortcut": [["Control", "e"]], | ||
3034 | 1120 | "enabled": true, | ||
3035 | 1121 | "label": "Shrink Wrap", | ||
3036 | 1122 | "visible": true | ||
3037 | 1123 | }, | ||
3038 | 1124 | { | ||
3039 | 1125 | "id": 174, | ||
3040 | 1126 | "type": "separator" | ||
3041 | 1127 | }, | ||
3042 | 1128 | { | ||
3043 | 1129 | "id": 175, | ||
3044 | 1130 | "enabled": true, | ||
3045 | 1131 | "label": "_Zoom (67%)", | ||
3046 | 1132 | "children-display": "submenu", | ||
3047 | 1133 | "visible": true, | ||
3048 | 1134 | "submenu": [ | ||
3049 | 1135 | { | ||
3050 | 1136 | "id": 176, | ||
3051 | 1137 | "enabled": true, | ||
3052 | 1138 | "toggle-state": 0, | ||
3053 | 1139 | "label": "Othe_r (67%)...", | ||
3054 | 1140 | "toggle-type": "checkmark", | ||
3055 | 1141 | "visible": true | ||
3056 | 1142 | }, | ||
3057 | 1143 | { | ||
3058 | 1144 | "id": 177, | ||
3059 | 1145 | "type": "separator" | ||
3060 | 1146 | }, | ||
3061 | 1147 | { | ||
3062 | 1148 | "id": 178, | ||
3063 | 1149 | "enabled": true, | ||
3064 | 1150 | "toggle-state": 0, | ||
3065 | 1151 | "label": "1:16 (6.25%)", | ||
3066 | 1152 | "toggle-type": "checkmark", | ||
3067 | 1153 | "visible": true | ||
3068 | 1154 | }, | ||
3069 | 1155 | { | ||
3070 | 1156 | "id": 179, | ||
3071 | 1157 | "enabled": true, | ||
3072 | 1158 | "toggle-state": 0, | ||
3073 | 1159 | "label": "1:8 (12.5%)", | ||
3074 | 1160 | "toggle-type": "checkmark", | ||
3075 | 1161 | "visible": true | ||
3076 | 1162 | }, | ||
3077 | 1163 | { | ||
3078 | 1164 | "id": 180, | ||
3079 | 1165 | "enabled": true, | ||
3080 | 1166 | "toggle-state": 0, | ||
3081 | 1167 | "label": "1:4 (25%)", | ||
3082 | 1168 | "toggle-type": "checkmark", | ||
3083 | 1169 | "visible": true | ||
3084 | 1170 | }, | ||
3085 | 1171 | { | ||
3086 | 1172 | "id": 181, | ||
3087 | 1173 | "enabled": true, | ||
3088 | 1174 | "toggle-state": 0, | ||
3089 | 1175 | "label": "1:2 (50%)", | ||
3090 | 1176 | "toggle-type": "checkmark", | ||
3091 | 1177 | "visible": true | ||
3092 | 1178 | }, | ||
3093 | 1179 | { | ||
3094 | 1180 | "id": 182, | ||
3095 | 1181 | "shortcut": [["1"]], | ||
3096 | 1182 | "enabled": true, | ||
3097 | 1183 | "toggle-state": 1, | ||
3098 | 1184 | "label": "1:1 (100%)", | ||
3099 | 1185 | "toggle-type": "checkmark", | ||
3100 | 1186 | "visible": true | ||
3101 | 1187 | }, | ||
3102 | 1188 | { | ||
3103 | 1189 | "id": 183, | ||
3104 | 1190 | "enabled": true, | ||
3105 | 1191 | "toggle-state": 0, | ||
3106 | 1192 | "label": "2:1 (200%)", | ||
3107 | 1193 | "toggle-type": "checkmark", | ||
3108 | 1194 | "visible": true | ||
3109 | 1195 | }, | ||
3110 | 1196 | { | ||
3111 | 1197 | "id": 184, | ||
3112 | 1198 | "enabled": true, | ||
3113 | 1199 | "toggle-state": 0, | ||
3114 | 1200 | "label": "4:1 (400%)", | ||
3115 | 1201 | "toggle-type": "checkmark", | ||
3116 | 1202 | "visible": true | ||
3117 | 1203 | }, | ||
3118 | 1204 | { | ||
3119 | 1205 | "id": 185, | ||
3120 | 1206 | "enabled": true, | ||
3121 | 1207 | "toggle-state": 0, | ||
3122 | 1208 | "label": "8:1 (800%)", | ||
3123 | 1209 | "toggle-type": "checkmark", | ||
3124 | 1210 | "visible": true | ||
3125 | 1211 | }, | ||
3126 | 1212 | { | ||
3127 | 1213 | "id": 186, | ||
3128 | 1214 | "enabled": true, | ||
3129 | 1215 | "toggle-state": 0, | ||
3130 | 1216 | "label": "16:1 (1600%)", | ||
3131 | 1217 | "toggle-type": "checkmark", | ||
3132 | 1218 | "visible": true | ||
3133 | 1219 | }, | ||
3134 | 1220 | { | ||
3135 | 1221 | "id": 187, | ||
3136 | 1222 | "type": "separator" | ||
3137 | 1223 | }, | ||
3138 | 1224 | { | ||
3139 | 1225 | "id": 188, | ||
3140 | 1226 | "enabled": true, | ||
3141 | 1227 | "label": "Fill Window", | ||
3142 | 1228 | "visible": true | ||
3143 | 1229 | }, | ||
3144 | 1230 | { | ||
3145 | 1231 | "id": 189, | ||
3146 | 1232 | "shortcut": [["Control", "Shift", "e"]], | ||
3147 | 1233 | "enabled": true, | ||
3148 | 1234 | "label": "Fit Image in Window", | ||
3149 | 1235 | "visible": true | ||
3150 | 1236 | }, | ||
3151 | 1237 | { | ||
3152 | 1238 | "id": 190, | ||
3153 | 1239 | "shortcut": [["plus"]], | ||
3154 | 1240 | "enabled": true, | ||
3155 | 1241 | "label": "Zoom In", | ||
3156 | 1242 | "visible": true | ||
3157 | 1243 | }, | ||
3158 | 1244 | { | ||
3159 | 1245 | "id": 191, | ||
3160 | 1246 | "shortcut": [["minus"]], | ||
3161 | 1247 | "enabled": true, | ||
3162 | 1248 | "label": "Zoom Out", | ||
3163 | 1249 | "visible": true | ||
3164 | 1250 | }, | ||
3165 | 1251 | { | ||
3166 | 1252 | "id": 4, | ||
3167 | 1253 | "shortcut": [["grave"]], | ||
3168 | 1254 | "enabled": true, | ||
3169 | 1255 | "label": "Re_vert Zoom (67%)", | ||
3170 | 1256 | "visible": true | ||
3171 | 1257 | } | ||
3172 | 1258 | ] | ||
3173 | 1259 | }, | ||
3174 | 1260 | { | ||
3175 | 1261 | "id": 192, | ||
3176 | 1262 | "enabled": true, | ||
3177 | 1263 | "toggle-state": 1, | ||
3178 | 1264 | "label": "Dot for Dot", | ||
3179 | 1265 | "toggle-type": "checkmark", | ||
3180 | 1266 | "visible": true | ||
3181 | 1267 | }, | ||
3182 | 1268 | { | ||
3183 | 1269 | "id": 193, | ||
3184 | 1270 | "enabled": true, | ||
3185 | 1271 | "label": "New View", | ||
3186 | 1272 | "visible": true | ||
3187 | 1273 | } | ||
3188 | 1274 | ] | ||
3189 | 1275 | }, | ||
3190 | 1276 | { | ||
3191 | 1277 | "id": 194, | ||
3192 | 1278 | "enabled": true, | ||
3193 | 1279 | "label": "Image", | ||
3194 | 1280 | "children-display": "submenu", | ||
3195 | 1281 | "visible": true, | ||
3196 | 1282 | "submenu": [ | ||
3197 | 1283 | { | ||
3198 | 1284 | "id": 195, | ||
3199 | 1285 | "shortcut": [["Alt", "Return"]], | ||
3200 | 1286 | "enabled": true, | ||
3201 | 1287 | "label": "Image Properties", | ||
3202 | 1288 | "visible": true | ||
3203 | 1289 | }, | ||
3204 | 1290 | { | ||
3205 | 1291 | "id": 196, | ||
3206 | 1292 | "enabled": true, | ||
3207 | 1293 | "label": "Configure Grid...", | ||
3208 | 1294 | "visible": true | ||
3209 | 1295 | }, | ||
3210 | 1296 | { | ||
3211 | 1297 | "id": 197, | ||
3212 | 1298 | "enabled": true, | ||
3213 | 1299 | "label": "Guides", | ||
3214 | 1300 | "children-display": "submenu", | ||
3215 | 1301 | "visible": true, | ||
3216 | 1302 | "submenu": [ | ||
3217 | 1303 | { | ||
3218 | 1304 | "id": 198, | ||
3219 | 1305 | "enabled": true, | ||
3220 | 1306 | "label": "Remove all Guides", | ||
3221 | 1307 | "visible": true | ||
3222 | 1308 | }, | ||
3223 | 1309 | { | ||
3224 | 1310 | "id": 199, | ||
3225 | 1311 | "enabled": true, | ||
3226 | 1312 | "label": "New Guides from Selection", | ||
3227 | 1313 | "visible": true | ||
3228 | 1314 | }, | ||
3229 | 1315 | { | ||
3230 | 1316 | "id": 200, | ||
3231 | 1317 | "enabled": true, | ||
3232 | 1318 | "label": "New Guide...", | ||
3233 | 1319 | "visible": true | ||
3234 | 1320 | }, | ||
3235 | 1321 | { | ||
3236 | 1322 | "id": 201, | ||
3237 | 1323 | "enabled": true, | ||
3238 | 1324 | "label": "New Guide (by Percent)...", | ||
3239 | 1325 | "visible": true | ||
3240 | 1326 | } | ||
3241 | 1327 | ] | ||
3242 | 1328 | }, | ||
3243 | 1329 | { | ||
3244 | 1330 | "id": 202, | ||
3245 | 1331 | "type": "separator" | ||
3246 | 1332 | }, | ||
3247 | 1333 | { | ||
3248 | 1334 | "id": 203, | ||
3249 | 1335 | "enabled": true, | ||
3250 | 1336 | "label": "Align Visible Layers...", | ||
3251 | 1337 | "visible": true | ||
3252 | 1338 | }, | ||
3253 | 1339 | { | ||
3254 | 1340 | "id": 204, | ||
3255 | 1341 | "enabled": true, | ||
3256 | 1342 | "label": "Flatten Image", | ||
3257 | 1343 | "visible": true | ||
3258 | 1344 | }, | ||
3259 | 1345 | { | ||
3260 | 1346 | "id": 205, | ||
3261 | 1347 | "shortcut": [["Control", "m"]], | ||
3262 | 1348 | "enabled": true, | ||
3263 | 1349 | "label": "Merge Visible Layers...", | ||
3264 | 1350 | "visible": true | ||
3265 | 1351 | }, | ||
3266 | 1352 | { | ||
3267 | 1353 | "id": 206, | ||
3268 | 1354 | "type": "separator" | ||
3269 | 1355 | }, | ||
3270 | 1356 | { | ||
3271 | 1357 | "id": 207, | ||
3272 | 1358 | "enabled": true, | ||
3273 | 1359 | "label": "Zealous Crop", | ||
3274 | 1360 | "visible": true | ||
3275 | 1361 | }, | ||
3276 | 1362 | { | ||
3277 | 1363 | "id": 208, | ||
3278 | 1364 | "enabled": true, | ||
3279 | 1365 | "label": "Autocrop Image", | ||
3280 | 1366 | "visible": true | ||
3281 | 1367 | }, | ||
3282 | 1368 | { | ||
3283 | 1369 | "id": 209, | ||
3284 | 1370 | "enabled": false, | ||
3285 | 1371 | "label": "Crop to Selection", | ||
3286 | 1372 | "visible": true | ||
3287 | 1373 | }, | ||
3288 | 1374 | { | ||
3289 | 1375 | "id": 210, | ||
3290 | 1376 | "type": "separator" | ||
3291 | 1377 | }, | ||
3292 | 1378 | { | ||
3293 | 1379 | "id": 211, | ||
3294 | 1380 | "enabled": true, | ||
3295 | 1381 | "label": "Scale Image...", | ||
3296 | 1382 | "visible": true | ||
3297 | 1383 | }, | ||
3298 | 1384 | { | ||
3299 | 1385 | "id": 212, | ||
3300 | 1386 | "enabled": true, | ||
3301 | 1387 | "label": "Print Size...", | ||
3302 | 1388 | "visible": true | ||
3303 | 1389 | }, | ||
3304 | 1390 | { | ||
3305 | 1391 | "id": 213, | ||
3306 | 1392 | "enabled": false, | ||
3307 | 1393 | "label": "Fit Canvas to Selection", | ||
3308 | 1394 | "visible": true | ||
3309 | 1395 | }, | ||
3310 | 1396 | { | ||
3311 | 1397 | "id": 214, | ||
3312 | 1398 | "enabled": true, | ||
3313 | 1399 | "label": "Fit Canvas to Layers", | ||
3314 | 1400 | "visible": true | ||
3315 | 1401 | }, | ||
3316 | 1402 | { | ||
3317 | 1403 | "id": 215, | ||
3318 | 1404 | "enabled": true, | ||
3319 | 1405 | "label": "Canvas Size...", | ||
3320 | 1406 | "visible": true | ||
3321 | 1407 | }, | ||
3322 | 1408 | { | ||
3323 | 1409 | "id": 216, | ||
3324 | 1410 | "type": "separator" | ||
3325 | 1411 | }, | ||
3326 | 1412 | { | ||
3327 | 1413 | "id": 217, | ||
3328 | 1414 | "enabled": true, | ||
3329 | 1415 | "label": "Transform", | ||
3330 | 1416 | "children-display": "submenu", | ||
3331 | 1417 | "visible": true, | ||
3332 | 1418 | "submenu": [ | ||
3333 | 1419 | { | ||
3334 | 1420 | "id": 218, | ||
3335 | 1421 | "enabled": true, | ||
3336 | 1422 | "label": "Guillotine", | ||
3337 | 1423 | "visible": true | ||
3338 | 1424 | }, | ||
3339 | 1425 | { | ||
3340 | 1426 | "id": 219, | ||
3341 | 1427 | "type": "separator" | ||
3342 | 1428 | }, | ||
3343 | 1429 | { | ||
3344 | 1430 | "id": 220, | ||
3345 | 1431 | "enabled": true, | ||
3346 | 1432 | "label": "Rotate 180\302\260", | ||
3347 | 1433 | "visible": true | ||
3348 | 1434 | }, | ||
3349 | 1435 | { | ||
3350 | 1436 | "id": 221, | ||
3351 | 1437 | "enabled": true, | ||
3352 | 1438 | "label": "Rotate 90\302\260 counter-clockwise", | ||
3353 | 1439 | "visible": true | ||
3354 | 1440 | }, | ||
3355 | 1441 | { | ||
3356 | 1442 | "id": 222, | ||
3357 | 1443 | "enabled": true, | ||
3358 | 1444 | "label": "Rotate 90\302\260 clockwise", | ||
3359 | 1445 | "visible": true | ||
3360 | 1446 | }, | ||
3361 | 1447 | { | ||
3362 | 1448 | "id": 223, | ||
3363 | 1449 | "type": "separator" | ||
3364 | 1450 | }, | ||
3365 | 1451 | { | ||
3366 | 1452 | "id": 224, | ||
3367 | 1453 | "enabled": true, | ||
3368 | 1454 | "label": "Flip Vertically", | ||
3369 | 1455 | "visible": true | ||
3370 | 1456 | }, | ||
3371 | 1457 | { | ||
3372 | 1458 | "id": 225, | ||
3373 | 1459 | "enabled": true, | ||
3374 | 1460 | "label": "Flip Horizontally", | ||
3375 | 1461 | "visible": true | ||
3376 | 1462 | } | ||
3377 | 1463 | ] | ||
3378 | 1464 | }, | ||
3379 | 1465 | { | ||
3380 | 1466 | "id": 226, | ||
3381 | 1467 | "enabled": true, | ||
3382 | 1468 | "label": "Mode", | ||
3383 | 1469 | "children-display": "submenu", | ||
3384 | 1470 | "visible": true, | ||
3385 | 1471 | "submenu": [ | ||
3386 | 1472 | { | ||
3387 | 1473 | "id": 227, | ||
3388 | 1474 | "enabled": true, | ||
3389 | 1475 | "label": "Convert to Color Profile...", | ||
3390 | 1476 | "visible": true | ||
3391 | 1477 | }, | ||
3392 | 1478 | { | ||
3393 | 1479 | "id": 228, | ||
3394 | 1480 | "enabled": true, | ||
3395 | 1481 | "label": "Assign Color Profile...", | ||
3396 | 1482 | "visible": true | ||
3397 | 1483 | }, | ||
3398 | 1484 | { | ||
3399 | 1485 | "id": 229, | ||
3400 | 1486 | "type": "separator" | ||
3401 | 1487 | }, | ||
3402 | 1488 | { | ||
3403 | 1489 | "id": 230, | ||
3404 | 1490 | "enabled": true, | ||
3405 | 1491 | "toggle-state": 0, | ||
3406 | 1492 | "label": "Indexed...", | ||
3407 | 1493 | "toggle-type": "checkmark", | ||
3408 | 1494 | "visible": true | ||
3409 | 1495 | }, | ||
3410 | 1496 | { | ||
3411 | 1497 | "id": 231, | ||
3412 | 1498 | "enabled": true, | ||
3413 | 1499 | "toggle-state": 0, | ||
3414 | 1500 | "label": "Grayscale", | ||
3415 | 1501 | "toggle-type": "checkmark", | ||
3416 | 1502 | "visible": true | ||
3417 | 1503 | }, | ||
3418 | 1504 | { | ||
3419 | 1505 | "id": 232, | ||
3420 | 1506 | "enabled": true, | ||
3421 | 1507 | "toggle-state": 1, | ||
3422 | 1508 | "label": "RGB", | ||
3423 | 1509 | "toggle-type": "checkmark", | ||
3424 | 1510 | "visible": true | ||
3425 | 1511 | } | ||
3426 | 1512 | ] | ||
3427 | 1513 | }, | ||
3428 | 1514 | { | ||
3429 | 1515 | "id": 233, | ||
3430 | 1516 | "shortcut": [["Control", "d"]], | ||
3431 | 1517 | "enabled": true, | ||
3432 | 1518 | "label": "Duplicate", | ||
3433 | 1519 | "visible": true | ||
3434 | 1520 | } | ||
3435 | 1521 | ] | ||
3436 | 1522 | }, | ||
3437 | 1523 | { | ||
3438 | 1524 | "id": 234, | ||
3439 | 1525 | "enabled": true, | ||
3440 | 1526 | "label": "Layer", | ||
3441 | 1527 | "children-display": "submenu", | ||
3442 | 1528 | "visible": true, | ||
3443 | 1529 | "submenu": [ | ||
3444 | 1530 | { | ||
3445 | 1531 | "id": 235, | ||
3446 | 1532 | "enabled": true, | ||
3447 | 1533 | "label": "Autocrop Layer", | ||
3448 | 1534 | "visible": true | ||
3449 | 1535 | }, | ||
3450 | 1536 | { | ||
3451 | 1537 | "id": 236, | ||
3452 | 1538 | "enabled": false, | ||
3453 | 1539 | "label": "Crop to Selection", | ||
3454 | 1540 | "visible": true | ||
3455 | 1541 | }, | ||
3456 | 1542 | { | ||
3457 | 1543 | "id": 237, | ||
3458 | 1544 | "enabled": true, | ||
3459 | 1545 | "label": "Scale Layer...", | ||
3460 | 1546 | "visible": true | ||
3461 | 1547 | }, | ||
3462 | 1548 | { | ||
3463 | 1549 | "id": 238, | ||
3464 | 1550 | "enabled": true, | ||
3465 | 1551 | "label": "Layer to Image Size", | ||
3466 | 1552 | "visible": true | ||
3467 | 1553 | }, | ||
3468 | 1554 | { | ||
3469 | 1555 | "id": 239, | ||
3470 | 1556 | "enabled": true, | ||
3471 | 1557 | "label": "Layer Boundary Size...", | ||
3472 | 1558 | "visible": true | ||
3473 | 1559 | }, | ||
3474 | 1560 | { | ||
3475 | 1561 | "id": 240, | ||
3476 | 1562 | "type": "separator" | ||
3477 | 1563 | }, | ||
3478 | 1564 | { | ||
3479 | 1565 | "id": 241, | ||
3480 | 1566 | "enabled": true, | ||
3481 | 1567 | "label": "Transform", | ||
3482 | 1568 | "children-display": "submenu", | ||
3483 | 1569 | "visible": true, | ||
3484 | 1570 | "submenu": [ | ||
3485 | 1571 | { | ||
3486 | 1572 | "id": 242, | ||
3487 | 1573 | "shortcut": [["Control", "Shift", "o"]], | ||
3488 | 1574 | "enabled": true, | ||
3489 | 1575 | "label": "Offset...", | ||
3490 | 1576 | "visible": true | ||
3491 | 1577 | }, | ||
3492 | 1578 | { | ||
3493 | 1579 | "id": 243, | ||
3494 | 1580 | "type": "separator" | ||
3495 | 1581 | }, | ||
3496 | 1582 | { | ||
3497 | 1583 | "id": 244, | ||
3498 | 1584 | "enabled": true, | ||
3499 | 1585 | "label": "Arbitrary Rotation...", | ||
3500 | 1586 | "visible": true | ||
3501 | 1587 | }, | ||
3502 | 1588 | { | ||
3503 | 1589 | "id": 245, | ||
3504 | 1590 | "enabled": true, | ||
3505 | 1591 | "label": "Rotate 180\302\260", | ||
3506 | 1592 | "visible": true | ||
3507 | 1593 | }, | ||
3508 | 1594 | { | ||
3509 | 1595 | "id": 246, | ||
3510 | 1596 | "enabled": true, | ||
3511 | 1597 | "label": "Rotate 90\302\260 counter-clockwise", | ||
3512 | 1598 | "visible": true | ||
3513 | 1599 | }, | ||
3514 | 1600 | { | ||
3515 | 1601 | "id": 247, | ||
3516 | 1602 | "enabled": true, | ||
3517 | 1603 | "label": "Rotate 90\302\260 clockwise", | ||
3518 | 1604 | "visible": true | ||
3519 | 1605 | }, | ||
3520 | 1606 | { | ||
3521 | 1607 | "id": 248, | ||
3522 | 1608 | "type": "separator" | ||
3523 | 1609 | }, | ||
3524 | 1610 | { | ||
3525 | 1611 | "id": 249, | ||
3526 | 1612 | "enabled": true, | ||
3527 | 1613 | "label": "Flip Vertically", | ||
3528 | 1614 | "visible": true | ||
3529 | 1615 | }, | ||
3530 | 1616 | { | ||
3531 | 1617 | "id": 250, | ||
3532 | 1618 | "enabled": true, | ||
3533 | 1619 | "label": "Flip Horizontally", | ||
3534 | 1620 | "visible": true | ||
3535 | 1621 | } | ||
3536 | 1622 | ] | ||
3537 | 1623 | }, | ||
3538 | 1624 | { | ||
3539 | 1625 | "id": 251, | ||
3540 | 1626 | "enabled": true, | ||
3541 | 1627 | "label": "Transparency", | ||
3542 | 1628 | "children-display": "submenu", | ||
3543 | 1629 | "visible": true, | ||
3544 | 1630 | "submenu": [ | ||
3545 | 1631 | { | ||
3546 | 1632 | "id": 252, | ||
3547 | 1633 | "enabled": true, | ||
3548 | 1634 | "label": "Intersect with Selection", | ||
3549 | 1635 | "visible": true | ||
3550 | 1636 | }, | ||
3551 | 1637 | { | ||
3552 | 1638 | "id": 253, | ||
3553 | 1639 | "enabled": true, | ||
3554 | 1640 | "label": "Subtract from Selection", | ||
3555 | 1641 | "visible": true | ||
3556 | 1642 | }, | ||
3557 | 1643 | { | ||
3558 | 1644 | "id": 254, | ||
3559 | 1645 | "enabled": true, | ||
3560 | 1646 | "label": "Add to Selection", | ||
3561 | 1647 | "visible": true | ||
3562 | 1648 | }, | ||
3563 | 1649 | { | ||
3564 | 1650 | "id": 255, | ||
3565 | 1651 | "enabled": true, | ||
3566 | 1652 | "label": "Alpha to Selection", | ||
3567 | 1653 | "visible": true | ||
3568 | 1654 | }, | ||
3569 | 1655 | { | ||
3570 | 1656 | "id": 256, | ||
3571 | 1657 | "type": "separator" | ||
3572 | 1658 | }, | ||
3573 | 1659 | { | ||
3574 | 1660 | "id": 257, | ||
3575 | 1661 | "enabled": true, | ||
3576 | 1662 | "label": "Threshold Alpha...", | ||
3577 | 1663 | "visible": true | ||
3578 | 1664 | }, | ||
3579 | 1665 | { | ||
3580 | 1666 | "id": 258, | ||
3581 | 1667 | "enabled": true, | ||
3582 | 1668 | "label": "Semi-Flatten", | ||
3583 | 1669 | "visible": true | ||
3584 | 1670 | }, | ||
3585 | 1671 | { | ||
3586 | 1672 | "id": 259, | ||
3587 | 1673 | "enabled": true, | ||
3588 | 1674 | "label": "Color to Alpha...", | ||
3589 | 1675 | "visible": true | ||
3590 | 1676 | }, | ||
3591 | 1677 | { | ||
3592 | 1678 | "id": 260, | ||
3593 | 1679 | "enabled": true, | ||
3594 | 1680 | "label": "Remove Alpha Channel", | ||
3595 | 1681 | "visible": true | ||
3596 | 1682 | }, | ||
3597 | 1683 | { | ||
3598 | 1684 | "id": 261, | ||
3599 | 1685 | "enabled": false, | ||
3600 | 1686 | "label": "Add Alpha Channel", | ||
3601 | 1687 | "visible": true | ||
3602 | 1688 | } | ||
3603 | 1689 | ] | ||
3604 | 1690 | }, | ||
3605 | 1691 | { | ||
3606 | 1692 | "id": 262, | ||
3607 | 1693 | "enabled": true, | ||
3608 | 1694 | "label": "Mask", | ||
3609 | 1695 | "children-display": "submenu", | ||
3610 | 1696 | "visible": true, | ||
3611 | 1697 | "submenu": [ | ||
3612 | 1698 | { | ||
3613 | 1699 | "id": 263, | ||
3614 | 1700 | "enabled": false, | ||
3615 | 1701 | "label": "Intersect with Selection", | ||
3616 | 1702 | "visible": true | ||
3617 | 1703 | }, | ||
3618 | 1704 | { | ||
3619 | 1705 | "id": 264, | ||
3620 | 1706 | "enabled": false, | ||
3621 | 1707 | "label": "Subtract from Selection", | ||
3622 | 1708 | "visible": true | ||
3623 | 1709 | }, | ||
3624 | 1710 | { | ||
3625 | 1711 | "id": 265, | ||
3626 | 1712 | "enabled": false, | ||
3627 | 1713 | "label": "Add to Selection", | ||
3628 | 1714 | "visible": true | ||
3629 | 1715 | }, | ||
3630 | 1716 | { | ||
3631 | 1717 | "id": 266, | ||
3632 | 1718 | "enabled": false, | ||
3633 | 1719 | "label": "Mask to Selection", | ||
3634 | 1720 | "visible": true | ||
3635 | 1721 | }, | ||
3636 | 1722 | { | ||
3637 | 1723 | "id": 267, | ||
3638 | 1724 | "type": "separator" | ||
3639 | 1725 | }, | ||
3640 | 1726 | { | ||
3641 | 1727 | "id": 268, | ||
3642 | 1728 | "enabled": false, | ||
3643 | 1729 | "toggle-state": 0, | ||
3644 | 1730 | "label": "Disable Layer Mask", | ||
3645 | 1731 | "toggle-type": "checkmark", | ||
3646 | 1732 | "visible": true | ||
3647 | 1733 | }, | ||
3648 | 1734 | { | ||
3649 | 1735 | "id": 269, | ||
3650 | 1736 | "enabled": false, | ||
3651 | 1737 | "toggle-state": 0, | ||
3652 | 1738 | "label": "Edit Layer Mask", | ||
3653 | 1739 | "toggle-type": "checkmark", | ||
3654 | 1740 | "visible": true | ||
3655 | 1741 | }, | ||
3656 | 1742 | { | ||
3657 | 1743 | "id": 270, | ||
3658 | 1744 | "enabled": false, | ||
3659 | 1745 | "toggle-state": 0, | ||
3660 | 1746 | "label": "Show Layer Mask", | ||
3661 | 1747 | "toggle-type": "checkmark", | ||
3662 | 1748 | "visible": true | ||
3663 | 1749 | }, | ||
3664 | 1750 | { | ||
3665 | 1751 | "id": 271, | ||
3666 | 1752 | "type": "separator" | ||
3667 | 1753 | }, | ||
3668 | 1754 | { | ||
3669 | 1755 | "id": 272, | ||
3670 | 1756 | "enabled": false, | ||
3671 | 1757 | "label": "Delete Layer Mask", | ||
3672 | 1758 | "visible": true | ||
3673 | 1759 | }, | ||
3674 | 1760 | { | ||
3675 | 1761 | "id": 273, | ||
3676 | 1762 | "enabled": false, | ||
3677 | 1763 | "label": "Apply Layer Mask", | ||
3678 | 1764 | "visible": true | ||
3679 | 1765 | }, | ||
3680 | 1766 | { | ||
3681 | 1767 | "id": 274, | ||
3682 | 1768 | "enabled": true, | ||
3683 | 1769 | "label": "Add Layer Mask...", | ||
3684 | 1770 | "visible": true | ||
3685 | 1771 | } | ||
3686 | 1772 | ] | ||
3687 | 1773 | }, | ||
3688 | 1774 | { | ||
3689 | 1775 | "id": 275, | ||
3690 | 1776 | "enabled": true, | ||
3691 | 1777 | "label": "Stack", | ||
3692 | 1778 | "children-display": "submenu", | ||
3693 | 1779 | "visible": true, | ||
3694 | 1780 | "submenu": [ | ||
3695 | 1781 | { | ||
3696 | 1782 | "id": 276, | ||
3697 | 1783 | "enabled": true, | ||
3698 | 1784 | "label": "Reverse Layer Order", | ||
3699 | 1785 | "visible": true | ||
3700 | 1786 | }, | ||
3701 | 1787 | { | ||
3702 | 1788 | "id": 277, | ||
3703 | 1789 | "type": "separator" | ||
3704 | 1790 | }, | ||
3705 | 1791 | { | ||
3706 | 1792 | "id": 278, | ||
3707 | 1793 | "enabled": false, | ||
3708 | 1794 | "label": "Layer to Bottom", | ||
3709 | 1795 | "visible": true | ||
3710 | 1796 | }, | ||
3711 | 1797 | { | ||
3712 | 1798 | "id": 279, | ||
3713 | 1799 | "enabled": false, | ||
3714 | 1800 | "label": "Layer to Top", | ||
3715 | 1801 | "visible": true | ||
3716 | 1802 | }, | ||
3717 | 1803 | { | ||
3718 | 1804 | "id": 280, | ||
3719 | 1805 | "enabled": false, | ||
3720 | 1806 | "label": "Lower Layer", | ||
3721 | 1807 | "visible": true | ||
3722 | 1808 | }, | ||
3723 | 1809 | { | ||
3724 | 1810 | "id": 281, | ||
3725 | 1811 | "enabled": false, | ||
3726 | 1812 | "label": "Raise Layer", | ||
3727 | 1813 | "visible": true | ||
3728 | 1814 | }, | ||
3729 | 1815 | { | ||
3730 | 1816 | "id": 282, | ||
3731 | 1817 | "type": "separator" | ||
3732 | 1818 | }, | ||
3733 | 1819 | { | ||
3734 | 1820 | "id": 283, | ||
3735 | 1821 | "shortcut": [["End"]], | ||
3736 | 1822 | "enabled": false, | ||
3737 | 1823 | "label": "Select Bottom Layer", | ||
3738 | 1824 | "visible": true | ||
3739 | 1825 | }, | ||
3740 | 1826 | { | ||
3741 | 1827 | "id": 284, | ||
3742 | 1828 | "shortcut": [["Home"]], | ||
3743 | 1829 | "enabled": false, | ||
3744 | 1830 | "label": "Select Top Layer", | ||
3745 | 1831 | "visible": true | ||
3746 | 1832 | }, | ||
3747 | 1833 | { | ||
3748 | 1834 | "id": 285, | ||
3749 | 1835 | "shortcut": [["Page_Down"]], | ||
3750 | 1836 | "enabled": false, | ||
3751 | 1837 | "label": "Select Next Layer", | ||
3752 | 1838 | "visible": true | ||
3753 | 1839 | }, | ||
3754 | 1840 | { | ||
3755 | 1841 | "id": 286, | ||
3756 | 1842 | "shortcut": [["Page_Up"]], | ||
3757 | 1843 | "enabled": false, | ||
3758 | 1844 | "label": "Select Previous Layer", | ||
3759 | 1845 | "visible": true | ||
3760 | 1846 | } | ||
3761 | 1847 | ] | ||
3762 | 1848 | }, | ||
3763 | 1849 | { | ||
3764 | 1850 | "id": 287, | ||
3765 | 1851 | "type": "separator", | ||
3766 | 1852 | "children-display": "submenu", | ||
3767 | 1853 | "submenu": [ | ||
3768 | 1854 | { | ||
3769 | 1855 | "id": 288, | ||
3770 | 1856 | "enabled": false, | ||
3771 | 1857 | "label": "Empty", | ||
3772 | 1858 | "visible": true | ||
3773 | 1859 | } | ||
3774 | 1860 | ] | ||
3775 | 1861 | }, | ||
3776 | 1862 | { | ||
3777 | 1863 | "id": 289, | ||
3778 | 1864 | "enabled": true, | ||
3779 | 1865 | "label": "Delete Layer", | ||
3780 | 1866 | "visible": true | ||
3781 | 1867 | }, | ||
3782 | 1868 | { | ||
3783 | 1869 | "id": 290, | ||
3784 | 1870 | "enabled": false, | ||
3785 | 1871 | "label": "Merge Down", | ||
3786 | 1872 | "visible": true | ||
3787 | 1873 | }, | ||
3788 | 1874 | { | ||
3789 | 1875 | "id": 291, | ||
3790 | 1876 | "shortcut": [["Control", "h"]], | ||
3791 | 1877 | "enabled": false, | ||
3792 | 1878 | "label": "Anchor Layer", | ||
3793 | 1879 | "visible": true | ||
3794 | 1880 | }, | ||
3795 | 1881 | { | ||
3796 | 1882 | "id": 292, | ||
3797 | 1883 | "shortcut": [["Control", "Shift", "d"]], | ||
3798 | 1884 | "enabled": true, | ||
3799 | 1885 | "label": "Duplicate Layer", | ||
3800 | 1886 | "visible": true | ||
3801 | 1887 | }, | ||
3802 | 1888 | { | ||
3803 | 1889 | "id": 293, | ||
3804 | 1890 | "enabled": true, | ||
3805 | 1891 | "label": "New from Visible", | ||
3806 | 1892 | "visible": true | ||
3807 | 1893 | }, | ||
3808 | 1894 | { | ||
3809 | 1895 | "id": 294, | ||
3810 | 1896 | "shortcut": [["Control", "Shift", "n"]], | ||
3811 | 1897 | "enabled": true, | ||
3812 | 1898 | "label": "New Layer...", | ||
3813 | 1899 | "visible": true | ||
3814 | 1900 | } | ||
3815 | 1901 | ] | ||
3816 | 1902 | }, | ||
3817 | 1903 | { | ||
3818 | 1904 | "id": 295, | ||
3819 | 1905 | "enabled": true, | ||
3820 | 1906 | "label": "Colors", | ||
3821 | 1907 | "children-display": "submenu", | ||
3822 | 1908 | "visible": true, | ||
3823 | 1909 | "submenu": [ | ||
3824 | 1910 | { | ||
3825 | 1911 | "id": 296, | ||
3826 | 1912 | "enabled": true, | ||
3827 | 1913 | "label": "Retinex...", | ||
3828 | 1914 | "visible": true | ||
3829 | 1915 | }, | ||
3830 | 1916 | { | ||
3831 | 1917 | "id": 297, | ||
3832 | 1918 | "enabled": true, | ||
3833 | 1919 | "label": "Maximum RGB...", | ||
3834 | 1920 | "visible": true | ||
3835 | 1921 | }, | ||
3836 | 1922 | { | ||
3837 | 1923 | "id": 298, | ||
3838 | 1924 | "enabled": false, | ||
3839 | 1925 | "label": "Hot...", | ||
3840 | 1926 | "visible": true | ||
3841 | 1927 | }, | ||
3842 | 1928 | { | ||
3843 | 1929 | "id": 299, | ||
3844 | 1930 | "enabled": true, | ||
3845 | 1931 | "label": "Filter Pack...", | ||
3846 | 1932 | "visible": true | ||
3847 | 1933 | }, | ||
3848 | 1934 | { | ||
3849 | 1935 | "id": 300, | ||
3850 | 1936 | "enabled": true, | ||
3851 | 1937 | "label": "Color to Alpha...", | ||
3852 | 1938 | "visible": true | ||
3853 | 1939 | }, | ||
3854 | 1940 | { | ||
3855 | 1941 | "id": 301, | ||
3856 | 1942 | "enabled": true, | ||
3857 | 1943 | "label": "Colorify...", | ||
3858 | 1944 | "visible": true | ||
3859 | 1945 | }, | ||
3860 | 1946 | { | ||
3861 | 1947 | "id": 302, | ||
3862 | 1948 | "type": "separator" | ||
3863 | 1949 | }, | ||
3864 | 1950 | { | ||
3865 | 1951 | "id": 303, | ||
3866 | 1952 | "enabled": true, | ||
3867 | 1953 | "label": "Info", | ||
3868 | 1954 | "children-display": "submenu", | ||
3869 | 1955 | "visible": true, | ||
3870 | 1956 | "submenu": [ | ||
3871 | 1957 | { | ||
3872 | 1958 | "id": 304, | ||
3873 | 1959 | "enabled": true, | ||
3874 | 1960 | "label": "Smooth Palette...", | ||
3875 | 1961 | "visible": true | ||
3876 | 1962 | }, | ||
3877 | 1963 | { | ||
3878 | 1964 | "id": 305, | ||
3879 | 1965 | "enabled": true, | ||
3880 | 1966 | "label": "Colorcube Analysis...", | ||
3881 | 1967 | "visible": true | ||
3882 | 1968 | }, | ||
3883 | 1969 | { | ||
3884 | 1970 | "id": 306, | ||
3885 | 1971 | "enabled": true, | ||
3886 | 1972 | "label": "Border Average...", | ||
3887 | 1973 | "visible": true | ||
3888 | 1974 | }, | ||
3889 | 1975 | { | ||
3890 | 1976 | "id": 307, | ||
3891 | 1977 | "enabled": true, | ||
3892 | 1978 | "label": "Histogram", | ||
3893 | 1979 | "visible": true | ||
3894 | 1980 | } | ||
3895 | 1981 | ] | ||
3896 | 1982 | }, | ||
3897 | 1983 | { | ||
3898 | 1984 | "id": 308, | ||
3899 | 1985 | "enabled": true, | ||
3900 | 1986 | "label": "Map", | ||
3901 | 1987 | "children-display": "submenu", | ||
3902 | 1988 | "visible": true, | ||
3903 | 1989 | "submenu": [ | ||
3904 | 1990 | { | ||
3905 | 1991 | "id": 309, | ||
3906 | 1992 | "enabled": true, | ||
3907 | 1993 | "label": "Sample Colorize...", | ||
3908 | 1994 | "visible": true | ||
3909 | 1995 | }, | ||
3910 | 1996 | { | ||
3911 | 1997 | "id": 310, | ||
3912 | 1998 | "enabled": true, | ||
3913 | 1999 | "label": "Rotate Colors...", | ||
3914 | 2000 | "visible": true | ||
3915 | 2001 | }, | ||
3916 | 2002 | { | ||
3917 | 2003 | "id": 311, | ||
3918 | 2004 | "enabled": true, | ||
3919 | 2005 | "label": "Palette Map", | ||
3920 | 2006 | "visible": true | ||
3921 | 2007 | }, | ||
3922 | 2008 | { | ||
3923 | 2009 | "id": 312, | ||
3924 | 2010 | "enabled": true, | ||
3925 | 2011 | "label": "Gradient Map", | ||
3926 | 2012 | "visible": true | ||
3927 | 2013 | }, | ||
3928 | 2014 | { | ||
3929 | 2015 | "id": 313, | ||
3930 | 2016 | "enabled": true, | ||
3931 | 2017 | "label": "Color Exchange...", | ||
3932 | 2018 | "visible": true | ||
3933 | 2019 | }, | ||
3934 | 2020 | { | ||
3935 | 2021 | "id": 314, | ||
3936 | 2022 | "enabled": true, | ||
3937 | 2023 | "label": "Alien Map...", | ||
3938 | 2024 | "visible": true | ||
3939 | 2025 | }, | ||
3940 | 2026 | { | ||
3941 | 2027 | "id": 315, | ||
3942 | 2028 | "type": "separator" | ||
3943 | 2029 | }, | ||
3944 | 2030 | { | ||
3945 | 2031 | "id": 316, | ||
3946 | 2032 | "enabled": false, | ||
3947 | 2033 | "label": "Set Colormap...", | ||
3948 | 2034 | "visible": true | ||
3949 | 2035 | }, | ||
3950 | 2036 | { | ||
3951 | 2037 | "id": 317, | ||
3952 | 2038 | "enabled": false, | ||
3953 | 2039 | "label": "Rearrange Colormap...", | ||
3954 | 2040 | "visible": true | ||
3955 | 2041 | } | ||
3956 | 2042 | ] | ||
3957 | 2043 | }, | ||
3958 | 2044 | { | ||
3959 | 2045 | "id": 318, | ||
3960 | 2046 | "enabled": true, | ||
3961 | 2047 | "label": "Components", | ||
3962 | 2048 | "children-display": "submenu", | ||
3963 | 2049 | "visible": true, | ||
3964 | 2050 | "submenu": [ | ||
3965 | 2051 | { | ||
3966 | 2052 | "id": 319, | ||
3967 | 2053 | "enabled": false, | ||
3968 | 2054 | "label": "Recompose", | ||
3969 | 2055 | "visible": true | ||
3970 | 2056 | }, | ||
3971 | 2057 | { | ||
3972 | 2058 | "id": 320, | ||
3973 | 2059 | "enabled": true, | ||
3974 | 2060 | "label": "Decompose...", | ||
3975 | 2061 | "visible": true | ||
3976 | 2062 | }, | ||
3977 | 2063 | { | ||
3978 | 2064 | "id": 321, | ||
3979 | 2065 | "enabled": false, | ||
3980 | 2066 | "label": "Compose...", | ||
3981 | 2067 | "visible": true | ||
3982 | 2068 | }, | ||
3983 | 2069 | { | ||
3984 | 2070 | "id": 322, | ||
3985 | 2071 | "enabled": true, | ||
3986 | 2072 | "label": "Channel Mixer...", | ||
3987 | 2073 | "visible": true | ||
3988 | 2074 | } | ||
3989 | 2075 | ] | ||
3990 | 2076 | }, | ||
3991 | 2077 | { | ||
3992 | 2078 | "id": 323, | ||
3993 | 2079 | "enabled": true, | ||
3994 | 2080 | "label": "Auto", | ||
3995 | 2081 | "children-display": "submenu", | ||
3996 | 2082 | "visible": true, | ||
3997 | 2083 | "submenu": [ | ||
3998 | 2084 | { | ||
3999 | 2085 | "id": 324, | ||
4000 | 2086 | "enabled": true, | ||
4001 | 2087 | "label": "Stretch HSV", | ||
4002 | 2088 | "visible": true | ||
4003 | 2089 | }, | ||
4004 | 2090 | { | ||
4005 | 2091 | "id": 325, | ||
4006 | 2092 | "enabled": true, | ||
4007 | 2093 | "label": "Stretch Contrast", | ||
4008 | 2094 | "visible": true | ||
4009 | 2095 | }, | ||
4010 | 2096 | { | ||
4011 | 2097 | "id": 326, | ||
4012 | 2098 | "enabled": true, | ||
4013 | 2099 | "label": "Normalize", | ||
4014 | 2100 | "visible": true | ||
4015 | 2101 | }, | ||
4016 | 2102 | { | ||
4017 | 2103 | "id": 327, | ||
4018 | 2104 | "enabled": true, | ||
4019 | 2105 | "label": "Color Enhance", | ||
4020 | 2106 | "visible": true | ||
4021 | 2107 | }, | ||
4022 | 2108 | { | ||
4023 | 2109 | "id": 328, | ||
4024 | 2110 | "enabled": true, | ||
4025 | 2111 | "label": "White Balance", | ||
4026 | 2112 | "visible": true | ||
4027 | 2113 | }, | ||
4028 | 2114 | { | ||
4029 | 2115 | "id": 329, | ||
4030 | 2116 | "enabled": true, | ||
4031 | 2117 | "label": "Equalize", | ||
4032 | 2118 | "visible": true | ||
4033 | 2119 | } | ||
4034 | 2120 | ] | ||
4035 | 2121 | }, | ||
4036 | 2122 | { | ||
4037 | 2123 | "id": 330, | ||
4038 | 2124 | "type": "separator" | ||
4039 | 2125 | }, | ||
4040 | 2126 | { | ||
4041 | 2127 | "id": 331, | ||
4042 | 2128 | "enabled": true, | ||
4043 | 2129 | "toggle-state": 0, | ||
4044 | 2130 | "label": "Use GEGL", | ||
4045 | 2131 | "toggle-type": "checkmark", | ||
4046 | 2132 | "visible": true | ||
4047 | 2133 | }, | ||
4048 | 2134 | { | ||
4049 | 2135 | "id": 332, | ||
4050 | 2136 | "type": "separator" | ||
4051 | 2137 | }, | ||
4052 | 2138 | { | ||
4053 | 2139 | "id": 333, | ||
4054 | 2140 | "enabled": true, | ||
4055 | 2141 | "label": "Value Invert", | ||
4056 | 2142 | "visible": true | ||
4057 | 2143 | }, | ||
4058 | 2144 | { | ||
4059 | 2145 | "id": 334, | ||
4060 | 2146 | "enabled": true, | ||
4061 | 2147 | "label": "Invert", | ||
4062 | 2148 | "visible": true | ||
4063 | 2149 | }, | ||
4064 | 2150 | { | ||
4065 | 2151 | "id": 335, | ||
4066 | 2152 | "type": "separator" | ||
4067 | 2153 | }, | ||
4068 | 2154 | { | ||
4069 | 2155 | "id": 336, | ||
4070 | 2156 | "enabled": true, | ||
4071 | 2157 | "label": "Desaturate...", | ||
4072 | 2158 | "visible": true | ||
4073 | 2159 | }, | ||
4074 | 2160 | { | ||
4075 | 2161 | "id": 337, | ||
4076 | 2162 | "enabled": true, | ||
4077 | 2163 | "label": "Posterize...", | ||
4078 | 2164 | "visible": true | ||
4079 | 2165 | }, | ||
4080 | 2166 | { | ||
4081 | 2167 | "id": 338, | ||
4082 | 2168 | "enabled": true, | ||
4083 | 2169 | "label": "Curves...", | ||
4084 | 2170 | "visible": true | ||
4085 | 2171 | }, | ||
4086 | 2172 | { | ||
4087 | 2173 | "id": 339, | ||
4088 | 2174 | "enabled": true, | ||
4089 | 2175 | "label": "Levels...", | ||
4090 | 2176 | "visible": true | ||
4091 | 2177 | }, | ||
4092 | 2178 | { | ||
4093 | 2179 | "id": 340, | ||
4094 | 2180 | "enabled": true, | ||
4095 | 2181 | "label": "Threshold...", | ||
4096 | 2182 | "visible": true | ||
4097 | 2183 | }, | ||
4098 | 2184 | { | ||
4099 | 2185 | "id": 341, | ||
4100 | 2186 | "enabled": true, | ||
4101 | 2187 | "label": "Brightness-Contrast...", | ||
4102 | 2188 | "visible": true | ||
4103 | 2189 | }, | ||
4104 | 2190 | { | ||
4105 | 2191 | "id": 342, | ||
4106 | 2192 | "enabled": true, | ||
4107 | 2193 | "label": "Colorize...", | ||
4108 | 2194 | "visible": true | ||
4109 | 2195 | }, | ||
4110 | 2196 | { | ||
4111 | 2197 | "id": 343, | ||
4112 | 2198 | "enabled": true, | ||
4113 | 2199 | "label": "Hue-Saturation...", | ||
4114 | 2200 | "visible": true | ||
4115 | 2201 | }, | ||
4116 | 2202 | { | ||
4117 | 2203 | "id": 344, | ||
4118 | 2204 | "enabled": true, | ||
4119 | 2205 | "label": "Color Balance...", | ||
4120 | 2206 | "visible": true | ||
4121 | 2207 | } | ||
4122 | 2208 | ] | ||
4123 | 2209 | }, | ||
4124 | 2210 | { | ||
4125 | 2211 | "id": 345, | ||
4126 | 2212 | "enabled": true, | ||
4127 | 2213 | "label": "Tools", | ||
4128 | 2214 | "children-display": "submenu", | ||
4129 | 2215 | "visible": true, | ||
4130 | 2216 | "submenu": [ | ||
4131 | 2217 | { | ||
4132 | 2218 | "id": 346, | ||
4133 | 2219 | "shortcut": [["x"]], | ||
4134 | 2220 | "enabled": true, | ||
4135 | 2221 | "label": "Swap Colors", | ||
4136 | 2222 | "visible": true | ||
4137 | 2223 | }, | ||
4138 | 2224 | { | ||
4139 | 2225 | "id": 347, | ||
4140 | 2226 | "shortcut": [["d"]], | ||
4141 | 2227 | "enabled": true, | ||
4142 | 2228 | "label": "Default Colors", | ||
4143 | 2229 | "visible": true | ||
4144 | 2230 | }, | ||
4145 | 2231 | { | ||
4146 | 2232 | "id": 348, | ||
4147 | 2233 | "shortcut": [["Control", "b"]], | ||
4148 | 2234 | "enabled": true, | ||
4149 | 2235 | "label": "Toolbox", | ||
4150 | 2236 | "visible": true | ||
4151 | 2237 | }, | ||
4152 | 2238 | { | ||
4153 | 2239 | "id": 349, | ||
4154 | 2240 | "type": "separator" | ||
4155 | 2241 | }, | ||
4156 | 2242 | { | ||
4157 | 2243 | "id": 350, | ||
4158 | 2244 | "enabled": true, | ||
4159 | 2245 | "label": "GEGL Operation...", | ||
4160 | 2246 | "visible": true | ||
4161 | 2247 | }, | ||
4162 | 2248 | { | ||
4163 | 2249 | "id": 351, | ||
4164 | 2250 | "shortcut": [["t"]], | ||
4165 | 2251 | "enabled": true, | ||
4166 | 2252 | "label": "Text", | ||
4167 | 2253 | "visible": true | ||
4168 | 2254 | }, | ||
4169 | 2255 | { | ||
4170 | 2256 | "id": 352, | ||
4171 | 2257 | "shortcut": [["Shift", "m"]], | ||
4172 | 2258 | "enabled": true, | ||
4173 | 2259 | "label": "Measure", | ||
4174 | 2260 | "visible": true | ||
4175 | 2261 | }, | ||
4176 | 2262 | { | ||
4177 | 2263 | "id": 353, | ||
4178 | 2264 | "shortcut": [["z"]], | ||
4179 | 2265 | "enabled": true, | ||
4180 | 2266 | "label": "Zoom", | ||
4181 | 2267 | "visible": true | ||
4182 | 2268 | }, | ||
4183 | 2269 | { | ||
4184 | 2270 | "id": 354, | ||
4185 | 2271 | "shortcut": [["o"]], | ||
4186 | 2272 | "enabled": true, | ||
4187 | 2273 | "label": "Color Picker", | ||
4188 | 2274 | "visible": true | ||
4189 | 2275 | }, | ||
4190 | 2276 | { | ||
4191 | 2277 | "id": 355, | ||
4192 | 2278 | "shortcut": [["b"]], | ||
4193 | 2279 | "enabled": true, | ||
4194 | 2280 | "label": "Paths", | ||
4195 | 2281 | "visible": true | ||
4196 | 2282 | }, | ||
4197 | 2283 | { | ||
4198 | 2284 | "id": 356, | ||
4199 | 2285 | "enabled": true, | ||
4200 | 2286 | "label": "Color Tools", | ||
4201 | 2287 | "children-display": "submenu", | ||
4202 | 2288 | "visible": true, | ||
4203 | 2289 | "submenu": [ | ||
4204 | 2290 | { | ||
4205 | 2291 | "id": 357, | ||
4206 | 2292 | "enabled": true, | ||
4207 | 2293 | "label": "Desaturate...", | ||
4208 | 2294 | "visible": true | ||
4209 | 2295 | }, | ||
4210 | 2296 | { | ||
4211 | 2297 | "id": 358, | ||
4212 | 2298 | "enabled": true, | ||
4213 | 2299 | "label": "Posterize...", | ||
4214 | 2300 | "visible": true | ||
4215 | 2301 | }, | ||
4216 | 2302 | { | ||
4217 | 2303 | "id": 359, | ||
4218 | 2304 | "enabled": true, | ||
4219 | 2305 | "label": "Curves...", | ||
4220 | 2306 | "visible": true | ||
4221 | 2307 | }, | ||
4222 | 2308 | { | ||
4223 | 2309 | "id": 360, | ||
4224 | 2310 | "enabled": true, | ||
4225 | 2311 | "label": "Levels...", | ||
4226 | 2312 | "visible": true | ||
4227 | 2313 | }, | ||
4228 | 2314 | { | ||
4229 | 2315 | "id": 361, | ||
4230 | 2316 | "enabled": true, | ||
4231 | 2317 | "label": "Threshold...", | ||
4232 | 2318 | "visible": true | ||
4233 | 2319 | }, | ||
4234 | 2320 | { | ||
4235 | 2321 | "id": 362, | ||
4236 | 2322 | "enabled": true, | ||
4237 | 2323 | "label": "Brightness-Contrast...", | ||
4238 | 2324 | "visible": true | ||
4239 | 2325 | }, | ||
4240 | 2326 | { | ||
4241 | 2327 | "id": 363, | ||
4242 | 2328 | "enabled": true, | ||
4243 | 2329 | "label": "Colorize...", | ||
4244 | 2330 | "visible": true | ||
4245 | 2331 | }, | ||
4246 | 2332 | { | ||
4247 | 2333 | "id": 364, | ||
4248 | 2334 | "enabled": true, | ||
4249 | 2335 | "label": "Hue-Saturation...", | ||
4250 | 2336 | "visible": true | ||
4251 | 2337 | }, | ||
4252 | 2338 | { | ||
4253 | 2339 | "id": 365, | ||
4254 | 2340 | "enabled": true, | ||
4255 | 2341 | "label": "Color Balance...", | ||
4256 | 2342 | "visible": true | ||
4257 | 2343 | } | ||
4258 | 2344 | ] | ||
4259 | 2345 | }, | ||
4260 | 2346 | { | ||
4261 | 2347 | "id": 366, | ||
4262 | 2348 | "enabled": true, | ||
4263 | 2349 | "label": "Transform Tools", | ||
4264 | 2350 | "children-display": "submenu", | ||
4265 | 2351 | "visible": true, | ||
4266 | 2352 | "submenu": [ | ||
4267 | 2353 | { | ||
4268 | 2354 | "id": 367, | ||
4269 | 2355 | "shortcut": [["Shift", "f"]], | ||
4270 | 2356 | "enabled": true, | ||
4271 | 2357 | "label": "Flip", | ||
4272 | 2358 | "visible": true | ||
4273 | 2359 | }, | ||
4274 | 2360 | { | ||
4275 | 2361 | "id": 368, | ||
4276 | 2362 | "shortcut": [["Shift", "p"]], | ||
4277 | 2363 | "enabled": true, | ||
4278 | 2364 | "label": "Perspective", | ||
4279 | 2365 | "visible": true | ||
4280 | 2366 | }, | ||
4281 | 2367 | { | ||
4282 | 2368 | "id": 369, | ||
4283 | 2369 | "shortcut": [["Shift", "s"]], | ||
4284 | 2370 | "enabled": true, | ||
4285 | 2371 | "label": "Shear", | ||
4286 | 2372 | "visible": true | ||
4287 | 2373 | }, | ||
4288 | 2374 | { | ||
4289 | 2375 | "id": 370, | ||
4290 | 2376 | "shortcut": [["Shift", "t"]], | ||
4291 | 2377 | "enabled": true, | ||
4292 | 2378 | "label": "Scale", | ||
4293 | 2379 | "visible": true | ||
4294 | 2380 | }, | ||
4295 | 2381 | { | ||
4296 | 2382 | "id": 371, | ||
4297 | 2383 | "shortcut": [["Shift", "r"]], | ||
4298 | 2384 | "enabled": true, | ||
4299 | 2385 | "label": "Rotate", | ||
4300 | 2386 | "visible": true | ||
4301 | 2387 | }, | ||
4302 | 2388 | { | ||
4303 | 2389 | "id": 372, | ||
4304 | 2390 | "shortcut": [["Shift", "c"]], | ||
4305 | 2391 | "enabled": true, | ||
4306 | 2392 | "label": "Crop", | ||
4307 | 2393 | "visible": true | ||
4308 | 2394 | }, | ||
4309 | 2395 | { | ||
4310 | 2396 | "id": 373, | ||
4311 | 2397 | "shortcut": [["m"]], | ||
4312 | 2398 | "enabled": true, | ||
4313 | 2399 | "label": "Move", | ||
4314 | 2400 | "visible": true | ||
4315 | 2401 | }, | ||
4316 | 2402 | { | ||
4317 | 2403 | "id": 374, | ||
4318 | 2404 | "shortcut": [["q"]], | ||
4319 | 2405 | "enabled": true, | ||
4320 | 2406 | "label": "Align", | ||
4321 | 2407 | "visible": true | ||
4322 | 2408 | } | ||
4323 | 2409 | ] | ||
4324 | 2410 | }, | ||
4325 | 2411 | { | ||
4326 | 2412 | "id": 375, | ||
4327 | 2413 | "enabled": true, | ||
4328 | 2414 | "label": "Paint Tools", | ||
4329 | 2415 | "children-display": "submenu", | ||
4330 | 2416 | "visible": true, | ||
4331 | 2417 | "submenu": [ | ||
4332 | 2418 | { | ||
4333 | 2419 | "id": 376, | ||
4334 | 2420 | "shortcut": [["Shift", "d"]], | ||
4335 | 2421 | "enabled": true, | ||
4336 | 2422 | "label": "Dodge / Burn", | ||
4337 | 2423 | "visible": true | ||
4338 | 2424 | }, | ||
4339 | 2425 | { | ||
4340 | 2426 | "id": 377, | ||
4341 | 2427 | "shortcut": [["s"]], | ||
4342 | 2428 | "enabled": true, | ||
4343 | 2429 | "label": "Smudge", | ||
4344 | 2430 | "visible": true | ||
4345 | 2431 | }, | ||
4346 | 2432 | { | ||
4347 | 2433 | "id": 378, | ||
4348 | 2434 | "shortcut": [["Shift", "u"]], | ||
4349 | 2435 | "enabled": true, | ||
4350 | 2436 | "label": "Blur / Sharpen", | ||
4351 | 2437 | "visible": true | ||
4352 | 2438 | }, | ||
4353 | 2439 | { | ||
4354 | 2440 | "id": 379, | ||
4355 | 2441 | "enabled": true, | ||
4356 | 2442 | "label": "Perspective Clone", | ||
4357 | 2443 | "visible": true | ||
4358 | 2444 | }, | ||
4359 | 2445 | { | ||
4360 | 2446 | "id": 380, | ||
4361 | 2447 | "shortcut": [["h"]], | ||
4362 | 2448 | "enabled": true, | ||
4363 | 2449 | "label": "Heal", | ||
4364 | 2450 | "visible": true | ||
4365 | 2451 | }, | ||
4366 | 2452 | { | ||
4367 | 2453 | "id": 381, | ||
4368 | 2454 | "shortcut": [["c"]], | ||
4369 | 2455 | "enabled": true, | ||
4370 | 2456 | "label": "Clone", | ||
4371 | 2457 | "visible": true | ||
4372 | 2458 | }, | ||
4373 | 2459 | { | ||
4374 | 2460 | "id": 382, | ||
4375 | 2461 | "shortcut": [["k"]], | ||
4376 | 2462 | "enabled": true, | ||
4377 | 2463 | "label": "Ink", | ||
4378 | 2464 | "visible": true | ||
4379 | 2465 | }, | ||
4380 | 2466 | { | ||
4381 | 2467 | "id": 383, | ||
4382 | 2468 | "shortcut": [["a"]], | ||
4383 | 2469 | "enabled": true, | ||
4384 | 2470 | "label": "Airbrush", | ||
4385 | 2471 | "visible": true | ||
4386 | 2472 | }, | ||
4387 | 2473 | { | ||
4388 | 2474 | "id": 384, | ||
4389 | 2475 | "shortcut": [["Shift", "e"]], | ||
4390 | 2476 | "enabled": true, | ||
4391 | 2477 | "label": "Eraser", | ||
4392 | 2478 | "visible": true | ||
4393 | 2479 | }, | ||
4394 | 2480 | { | ||
4395 | 2481 | "id": 385, | ||
4396 | 2482 | "shortcut": [["p"]], | ||
4397 | 2483 | "enabled": true, | ||
4398 | 2484 | "label": "Paintbrush", | ||
4399 | 2485 | "visible": true | ||
4400 | 2486 | }, | ||
4401 | 2487 | { | ||
4402 | 2488 | "id": 386, | ||
4403 | 2489 | "shortcut": [["n"]], | ||
4404 | 2490 | "enabled": true, | ||
4405 | 2491 | "label": "Pencil", | ||
4406 | 2492 | "visible": true | ||
4407 | 2493 | }, | ||
4408 | 2494 | { | ||
4409 | 2495 | "id": 387, | ||
4410 | 2496 | "shortcut": [["l"]], | ||
4411 | 2497 | "enabled": true, | ||
4412 | 2498 | "label": "Blend", | ||
4413 | 2499 | "visible": true | ||
4414 | 2500 | }, | ||
4415 | 2501 | { | ||
4416 | 2502 | "id": 388, | ||
4417 | 2503 | "shortcut": [["Shift", "b"]], | ||
4418 | 2504 | "enabled": true, | ||
4419 | 2505 | "label": "Bucket Fill", | ||
4420 | 2506 | "visible": true | ||
4421 | 2507 | } | ||
4422 | 2508 | ] | ||
4423 | 2509 | }, | ||
4424 | 2510 | { | ||
4425 | 2511 | "id": 389, | ||
4426 | 2512 | "enabled": true, | ||
4427 | 2513 | "label": "Selection Tools", | ||
4428 | 2514 | "children-display": "submenu", | ||
4429 | 2515 | "visible": true, | ||
4430 | 2516 | "submenu": [ | ||
4431 | 2517 | { | ||
4432 | 2518 | "id": 390, | ||
4433 | 2519 | "shortcut": [["i"]], | ||
4434 | 2520 | "enabled": true, | ||
4435 | 2521 | "label": "Intelligent Scissors", | ||
4436 | 2522 | "visible": true | ||
4437 | 2523 | }, | ||
4438 | 2524 | { | ||
4439 | 2525 | "id": 391, | ||
4440 | 2526 | "shortcut": [["Shift", "o"]], | ||
4441 | 2527 | "enabled": true, | ||
4442 | 2528 | "label": "By Color Select", | ||
4443 | 2529 | "visible": true | ||
4444 | 2530 | }, | ||
4445 | 2531 | { | ||
4446 | 2532 | "id": 392, | ||
4447 | 2533 | "shortcut": [["u"]], | ||
4448 | 2534 | "enabled": true, | ||
4449 | 2535 | "label": "Fuzzy Select", | ||
4450 | 2536 | "visible": true | ||
4451 | 2537 | }, | ||
4452 | 2538 | { | ||
4453 | 2539 | "id": 393, | ||
4454 | 2540 | "enabled": true, | ||
4455 | 2541 | "label": "Foreground Select", | ||
4456 | 2542 | "visible": true | ||
4457 | 2543 | }, | ||
4458 | 2544 | { | ||
4459 | 2545 | "id": 394, | ||
4460 | 2546 | "shortcut": [["f"]], | ||
4461 | 2547 | "enabled": true, | ||
4462 | 2548 | "label": "Free Select", | ||
4463 | 2549 | "visible": true | ||
4464 | 2550 | }, | ||
4465 | 2551 | { | ||
4466 | 2552 | "id": 395, | ||
4467 | 2553 | "shortcut": [["e"]], | ||
4468 | 2554 | "enabled": true, | ||
4469 | 2555 | "label": "Ellipse Select", | ||
4470 | 2556 | "visible": true | ||
4471 | 2557 | }, | ||
4472 | 2558 | { | ||
4473 | 2559 | "id": 396, | ||
4474 | 2560 | "shortcut": [["r"]], | ||
4475 | 2561 | "enabled": true, | ||
4476 | 2562 | "label": "Rectangle Select", | ||
4477 | 2563 | "visible": true | ||
4478 | 2564 | } | ||
4479 | 2565 | ] | ||
4480 | 2566 | } | ||
4481 | 2567 | ] | ||
4482 | 2568 | }, | ||
4483 | 2569 | { | ||
4484 | 2570 | "id": 397, | ||
4485 | 2571 | "enabled": true, | ||
4486 | 2572 | "label": "Filters", | ||
4487 | 2573 | "children-display": "submenu", | ||
4488 | 2574 | "visible": true, | ||
4489 | 2575 | "submenu": [ | ||
4490 | 2576 | { | ||
4491 | 2577 | "id": 398, | ||
4492 | 2578 | "enabled": true, | ||
4493 | 2579 | "label": "Script-Fu", | ||
4494 | 2580 | "children-display": "submenu", | ||
4495 | 2581 | "visible": true, | ||
4496 | 2582 | "submenu": [ | ||
4497 | 2583 | { | ||
4498 | 2584 | "id": 399, | ||
4499 | 2585 | "enabled": true, | ||
4500 | 2586 | "label": "Start Server...", | ||
4501 | 2587 | "visible": true | ||
4502 | 2588 | }, | ||
4503 | 2589 | { | ||
4504 | 2590 | "id": 400, | ||
4505 | 2591 | "enabled": true, | ||
4506 | 2592 | "label": "Refresh Scripts", | ||
4507 | 2593 | "visible": true | ||
4508 | 2594 | }, | ||
4509 | 2595 | { | ||
4510 | 2596 | "id": 401, | ||
4511 | 2597 | "enabled": true, | ||
4512 | 2598 | "label": "Console", | ||
4513 | 2599 | "visible": true | ||
4514 | 2600 | } | ||
4515 | 2601 | ] | ||
4516 | 2602 | }, | ||
4517 | 2603 | { | ||
4518 | 2604 | "id": 402, | ||
4519 | 2605 | "enabled": true, | ||
4520 | 2606 | "label": "Python-Fu", | ||
4521 | 2607 | "children-display": "submenu", | ||
4522 | 2608 | "visible": true, | ||
4523 | 2609 | "submenu": [ | ||
4524 | 2610 | { | ||
4525 | 2611 | "id": 403, | ||
4526 | 2612 | "enabled": true, | ||
4527 | 2613 | "label": "Console", | ||
4528 | 2614 | "visible": true | ||
4529 | 2615 | } | ||
4530 | 2616 | ] | ||
4531 | 2617 | }, | ||
4532 | 2618 | { | ||
4533 | 2619 | "id": 404, | ||
4534 | 2620 | "type": "separator" | ||
4535 | 2621 | }, | ||
4536 | 2622 | { | ||
4537 | 2623 | "id": 405, | ||
4538 | 2624 | "enabled": true, | ||
4539 | 2625 | "label": "Alpha to Logo", | ||
4540 | 2626 | "children-display": "submenu", | ||
4541 | 2627 | "visible": true, | ||
4542 | 2628 | "submenu": [ | ||
4543 | 2629 | { | ||
4544 | 2630 | "id": 406, | ||
4545 | 2631 | "enabled": true, | ||
4546 | 2632 | "label": "Textured...", | ||
4547 | 2633 | "visible": true | ||
4548 | 2634 | }, | ||
4549 | 2635 | { | ||
4550 | 2636 | "id": 407, | ||
4551 | 2637 | "enabled": true, | ||
4552 | 2638 | "label": "Particle Trace...", | ||
4553 | 2639 | "visible": true | ||
4554 | 2640 | }, | ||
4555 | 2641 | { | ||
4556 | 2642 | "id": 408, | ||
4557 | 2643 | "enabled": true, | ||
4558 | 2644 | "label": "Neon...", | ||
4559 | 2645 | "visible": true | ||
4560 | 2646 | }, | ||
4561 | 2647 | { | ||
4562 | 2648 | "id": 409, | ||
4563 | 2649 | "enabled": true, | ||
4564 | 2650 | "label": "Gradient Bevel...", | ||
4565 | 2651 | "visible": true | ||
4566 | 2652 | }, | ||
4567 | 2653 | { | ||
4568 | 2654 | "id": 410, | ||
4569 | 2655 | "enabled": true, | ||
4570 | 2656 | "label": "Glowing Hot...", | ||
4571 | 2657 | "visible": true | ||
4572 | 2658 | }, | ||
4573 | 2659 | { | ||
4574 | 2660 | "id": 411, | ||
4575 | 2661 | "enabled": true, | ||
4576 | 2662 | "label": "Glossy...", | ||
4577 | 2663 | "visible": true | ||
4578 | 2664 | }, | ||
4579 | 2665 | { | ||
4580 | 2666 | "id": 412, | ||
4581 | 2667 | "enabled": true, | ||
4582 | 2668 | "label": "Frosty...", | ||
4583 | 2669 | "visible": true | ||
4584 | 2670 | }, | ||
4585 | 2671 | { | ||
4586 | 2672 | "id": 413, | ||
4587 | 2673 | "enabled": true, | ||
4588 | 2674 | "label": "Cool Metal...", | ||
4589 | 2675 | "visible": true | ||
4590 | 2676 | }, | ||
4591 | 2677 | { | ||
4592 | 2678 | "id": 414, | ||
4593 | 2679 | "enabled": true, | ||
4594 | 2680 | "label": "Comic Book...", | ||
4595 | 2681 | "visible": true | ||
4596 | 2682 | }, | ||
4597 | 2683 | { | ||
4598 | 2684 | "id": 415, | ||
4599 | 2685 | "enabled": true, | ||
4600 | 2686 | "label": "Chrome...", | ||
4601 | 2687 | "visible": true | ||
4602 | 2688 | }, | ||
4603 | 2689 | { | ||
4604 | 2690 | "id": 416, | ||
4605 | 2691 | "enabled": true, | ||
4606 | 2692 | "label": "Chip Away...", | ||
4607 | 2693 | "visible": true | ||
4608 | 2694 | }, | ||
4609 | 2695 | { | ||
4610 | 2696 | "id": 417, | ||
4611 | 2697 | "enabled": true, | ||
4612 | 2698 | "label": "Chalk...", | ||
4613 | 2699 | "visible": true | ||
4614 | 2700 | }, | ||
4615 | 2701 | { | ||
4616 | 2702 | "id": 418, | ||
4617 | 2703 | "enabled": true, | ||
4618 | 2704 | "label": "Bovination...", | ||
4619 | 2705 | "visible": true | ||
4620 | 2706 | }, | ||
4621 | 2707 | { | ||
4622 | 2708 | "id": 419, | ||
4623 | 2709 | "enabled": true, | ||
4624 | 2710 | "label": "Blended...", | ||
4625 | 2711 | "visible": true | ||
4626 | 2712 | }, | ||
4627 | 2713 | { | ||
4628 | 2714 | "id": 420, | ||
4629 | 2715 | "enabled": true, | ||
4630 | 2716 | "label": "Basic I...", | ||
4631 | 2717 | "visible": true | ||
4632 | 2718 | }, | ||
4633 | 2719 | { | ||
4634 | 2720 | "id": 421, | ||
4635 | 2721 | "enabled": true, | ||
4636 | 2722 | "label": "Basic II...", | ||
4637 | 2723 | "visible": true | ||
4638 | 2724 | }, | ||
4639 | 2725 | { | ||
4640 | 2726 | "id": 422, | ||
4641 | 2727 | "enabled": true, | ||
4642 | 2728 | "label": "Alien Neon...", | ||
4643 | 2729 | "visible": true | ||
4644 | 2730 | }, | ||
4645 | 2731 | { | ||
4646 | 2732 | "id": 423, | ||
4647 | 2733 | "enabled": true, | ||
4648 | 2734 | "label": "Alien Glow...", | ||
4649 | 2735 | "visible": true | ||
4650 | 2736 | }, | ||
4651 | 2737 | { | ||
4652 | 2738 | "id": 424, | ||
4653 | 2739 | "enabled": true, | ||
4654 | 2740 | "label": "3D Outline...", | ||
4655 | 2741 | "visible": true | ||
4656 | 2742 | } | ||
4657 | 2743 | ] | ||
4658 | 2744 | }, | ||
4659 | 2745 | { | ||
4660 | 2746 | "id": 425, | ||
4661 | 2747 | "type": "separator" | ||
4662 | 2748 | }, | ||
4663 | 2749 | { | ||
4664 | 2750 | "id": 426, | ||
4665 | 2751 | "enabled": true, | ||
4666 | 2752 | "label": "Animation", | ||
4667 | 2753 | "children-display": "submenu", | ||
4668 | 2754 | "visible": true, | ||
4669 | 2755 | "submenu": [ | ||
4670 | 2756 | { | ||
4671 | 2757 | "id": 427, | ||
4672 | 2758 | "enabled": true, | ||
4673 | 2759 | "label": "Unoptimize", | ||
4674 | 2760 | "visible": true | ||
4675 | 2761 | }, | ||
4676 | 2762 | { | ||
4677 | 2763 | "id": 428, | ||
4678 | 2764 | "enabled": true, | ||
4679 | 2765 | "label": "Playback...", | ||
4680 | 2766 | "visible": true | ||
4681 | 2767 | }, | ||
4682 | 2768 | { | ||
4683 | 2769 | "id": 429, | ||
4684 | 2770 | "enabled": true, | ||
4685 | 2771 | "label": "Optimize (for GIF)", | ||
4686 | 2772 | "visible": true | ||
4687 | 2773 | }, | ||
4688 | 2774 | { | ||
4689 | 2775 | "id": 430, | ||
4690 | 2776 | "enabled": true, | ||
4691 | 2777 | "label": "Optimize (Difference)", | ||
4692 | 2778 | "visible": true | ||
4693 | 2779 | }, | ||
4694 | 2780 | { | ||
4695 | 2781 | "id": 431, | ||
4696 | 2782 | "type": "separator" | ||
4697 | 2783 | }, | ||
4698 | 2784 | { | ||
4699 | 2785 | "id": 432, | ||
4700 | 2786 | "enabled": true, | ||
4701 | 2787 | "label": "Waves...", | ||
4702 | 2788 | "visible": true | ||
4703 | 2789 | }, | ||
4704 | 2790 | { | ||
4705 | 2791 | "id": 433, | ||
4706 | 2792 | "enabled": true, | ||
4707 | 2793 | "label": "Spinning Globe...", | ||
4708 | 2794 | "visible": true | ||
4709 | 2795 | }, | ||
4710 | 2796 | { | ||
4711 | 2797 | "id": 434, | ||
4712 | 2798 | "enabled": true, | ||
4713 | 2799 | "label": "Rippling...", | ||
4714 | 2800 | "visible": true | ||
4715 | 2801 | }, | ||
4716 | 2802 | { | ||
4717 | 2803 | "id": 435, | ||
4718 | 2804 | "enabled": true, | ||
4719 | 2805 | "label": "Burn-In...", | ||
4720 | 2806 | "visible": true | ||
4721 | 2807 | }, | ||
4722 | 2808 | { | ||
4723 | 2809 | "id": 436, | ||
4724 | 2810 | "enabled": true, | ||
4725 | 2811 | "label": "Blend...", | ||
4726 | 2812 | "visible": true | ||
4727 | 2813 | } | ||
4728 | 2814 | ] | ||
4729 | 2815 | }, | ||
4730 | 2816 | { | ||
4731 | 2817 | "id": 437, | ||
4732 | 2818 | "enabled": true, | ||
4733 | 2819 | "label": "Web", | ||
4734 | 2820 | "children-display": "submenu", | ||
4735 | 2821 | "visible": true, | ||
4736 | 2822 | "submenu": [ | ||
4737 | 2823 | { | ||
4738 | 2824 | "id": 438, | ||
4739 | 2825 | "enabled": true, | ||
4740 | 2826 | "label": "Slice...", | ||
4741 | 2827 | "visible": true | ||
4742 | 2828 | }, | ||
4743 | 2829 | { | ||
4744 | 2830 | "id": 439, | ||
4745 | 2831 | "enabled": true, | ||
4746 | 2832 | "label": "Semi-Flatten", | ||
4747 | 2833 | "visible": true | ||
4748 | 2834 | }, | ||
4749 | 2835 | { | ||
4750 | 2836 | "id": 440, | ||
4751 | 2837 | "enabled": true, | ||
4752 | 2838 | "label": "Image Map...", | ||
4753 | 2839 | "visible": true | ||
4754 | 2840 | } | ||
4755 | 2841 | ] | ||
4756 | 2842 | }, | ||
4757 | 2843 | { | ||
4758 | 2844 | "id": 441, | ||
4759 | 2845 | "enabled": true, | ||
4760 | 2846 | "label": "Render", | ||
4761 | 2847 | "children-display": "submenu", | ||
4762 | 2848 | "visible": true, | ||
4763 | 2849 | "submenu": [ | ||
4764 | 2850 | { | ||
4765 | 2851 | "id": 442, | ||
4766 | 2852 | "enabled": true, | ||
4767 | 2853 | "label": "Spyrogimp...", | ||
4768 | 2854 | "visible": true | ||
4769 | 2855 | }, | ||
4770 | 2856 | { | ||
4771 | 2857 | "id": 443, | ||
4772 | 2858 | "enabled": true, | ||
4773 | 2859 | "label": "Sphere Designer...", | ||
4774 | 2860 | "visible": true | ||
4775 | 2861 | }, | ||
4776 | 2862 | { | ||
4777 | 2863 | "id": 444, | ||
4778 | 2864 | "enabled": true, | ||
4779 | 2865 | "label": "Line Nova...", | ||
4780 | 2866 | "visible": true | ||
4781 | 2867 | }, | ||
4782 | 2868 | { | ||
4783 | 2869 | "id": 445, | ||
4784 | 2870 | "enabled": true, | ||
4785 | 2871 | "label": "Lava...", | ||
4786 | 2872 | "visible": true | ||
4787 | 2873 | }, | ||
4788 | 2874 | { | ||
4789 | 2875 | "id": 446, | ||
4790 | 2876 | "enabled": true, | ||
4791 | 2877 | "label": "Gfig...", | ||
4792 | 2878 | "visible": true | ||
4793 | 2879 | }, | ||
4794 | 2880 | { | ||
4795 | 2881 | "id": 447, | ||
4796 | 2882 | "enabled": true, | ||
4797 | 2883 | "label": "Fractal Explorer...", | ||
4798 | 2884 | "visible": true | ||
4799 | 2885 | }, | ||
4800 | 2886 | { | ||
4801 | 2887 | "id": 448, | ||
4802 | 2888 | "enabled": true, | ||
4803 | 2889 | "label": "Circuit...", | ||
4804 | 2890 | "visible": true | ||
4805 | 2891 | }, | ||
4806 | 2892 | { | ||
4807 | 2893 | "id": 449, | ||
4808 | 2894 | "type": "separator" | ||
4809 | 2895 | }, | ||
4810 | 2896 | { | ||
4811 | 2897 | "id": 450, | ||
4812 | 2898 | "enabled": true, | ||
4813 | 2899 | "label": "Pattern", | ||
4814 | 2900 | "children-display": "submenu", | ||
4815 | 2901 | "visible": true, | ||
4816 | 2902 | "submenu": [ | ||
4817 | 2903 | { | ||
4818 | 2904 | "id": 451, | ||
4819 | 2905 | "enabled": true, | ||
4820 | 2906 | "label": "Sinus...", | ||
4821 | 2907 | "visible": true | ||
4822 | 2908 | }, | ||
4823 | 2909 | { | ||
4824 | 2910 | "id": 452, | ||
4825 | 2911 | "enabled": true, | ||
4826 | 2912 | "label": "Qbist...", | ||
4827 | 2913 | "visible": true | ||
4828 | 2914 | }, | ||
4829 | 2915 | { | ||
4830 | 2916 | "id": 453, | ||
4831 | 2917 | "enabled": true, | ||
4832 | 2918 | "label": "Maze...", | ||
4833 | 2919 | "visible": true | ||
4834 | 2920 | }, | ||
4835 | 2921 | { | ||
4836 | 2922 | "id": 454, | ||
4837 | 2923 | "enabled": true, | ||
4838 | 2924 | "label": "Jigsaw...", | ||
4839 | 2925 | "visible": true | ||
4840 | 2926 | }, | ||
4841 | 2927 | { | ||
4842 | 2928 | "id": 455, | ||
4843 | 2929 | "enabled": true, | ||
4844 | 2930 | "label": "Grid...", | ||
4845 | 2931 | "visible": true | ||
4846 | 2932 | }, | ||
4847 | 2933 | { | ||
4848 | 2934 | "id": 456, | ||
4849 | 2935 | "enabled": true, | ||
4850 | 2936 | "label": "Diffraction Patterns...", | ||
4851 | 2937 | "visible": true | ||
4852 | 2938 | }, | ||
4853 | 2939 | { | ||
4854 | 2940 | "id": 457, | ||
4855 | 2941 | "enabled": true, | ||
4856 | 2942 | "label": "CML Explorer...", | ||
4857 | 2943 | "visible": true | ||
4858 | 2944 | }, | ||
4859 | 2945 | { | ||
4860 | 2946 | "id": 458, | ||
4861 | 2947 | "enabled": true, | ||
4862 | 2948 | "label": "Checkerboard...", | ||
4863 | 2949 | "visible": true | ||
4864 | 2950 | } | ||
4865 | 2951 | ] | ||
4866 | 2952 | }, | ||
4867 | 2953 | { | ||
4868 | 2954 | "id": 459, | ||
4869 | 2955 | "enabled": true, | ||
4870 | 2956 | "label": "Nature", | ||
4871 | 2957 | "children-display": "submenu", | ||
4872 | 2958 | "visible": true, | ||
4873 | 2959 | "submenu": [ | ||
4874 | 2960 | { | ||
4875 | 2961 | "id": 460, | ||
4876 | 2962 | "enabled": true, | ||
4877 | 2963 | "label": "IFS Fractal...", | ||
4878 | 2964 | "visible": true | ||
4879 | 2965 | }, | ||
4880 | 2966 | { | ||
4881 | 2967 | "id": 461, | ||
4882 | 2968 | "enabled": true, | ||
4883 | 2969 | "label": "Flame...", | ||
4884 | 2970 | "visible": true | ||
4885 | 2971 | } | ||
4886 | 2972 | ] | ||
4887 | 2973 | }, | ||
4888 | 2974 | { | ||
4889 | 2975 | "id": 462, | ||
4890 | 2976 | "enabled": true, | ||
4891 | 2977 | "label": "Clouds", | ||
4892 | 2978 | "children-display": "submenu", | ||
4893 | 2979 | "visible": true, | ||
4894 | 2980 | "submenu": [ | ||
4895 | 2981 | { | ||
4896 | 2982 | "id": 463, | ||
4897 | 2983 | "enabled": true, | ||
4898 | 2984 | "label": "Solid Noise...", | ||
4899 | 2985 | "visible": true | ||
4900 | 2986 | }, | ||
4901 | 2987 | { | ||
4902 | 2988 | "id": 464, | ||
4903 | 2989 | "enabled": true, | ||
4904 | 2990 | "label": "Plasma...", | ||
4905 | 2991 | "visible": true | ||
4906 | 2992 | }, | ||
4907 | 2993 | { | ||
4908 | 2994 | "id": 465, | ||
4909 | 2995 | "enabled": true, | ||
4910 | 2996 | "label": "Fog...", | ||
4911 | 2997 | "visible": true | ||
4912 | 2998 | }, | ||
4913 | 2999 | { | ||
4914 | 3000 | "id": 466, | ||
4915 | 3001 | "enabled": true, | ||
4916 | 3002 | "label": "Difference Clouds...", | ||
4917 | 3003 | "visible": true | ||
4918 | 3004 | } | ||
4919 | 3005 | ] | ||
4920 | 3006 | } | ||
4921 | 3007 | ] | ||
4922 | 3008 | }, | ||
4923 | 3009 | { | ||
4924 | 3010 | "id": 467, | ||
4925 | 3011 | "enabled": true, | ||
4926 | 3012 | "label": "Map", | ||
4927 | 3013 | "children-display": "submenu", | ||
4928 | 3014 | "visible": true, | ||
4929 | 3015 | "submenu": [ | ||
4930 | 3016 | { | ||
4931 | 3017 | "id": 468, | ||
4932 | 3018 | "enabled": true, | ||
4933 | 3019 | "label": "Warp...", | ||
4934 | 3020 | "visible": true | ||
4935 | 3021 | }, | ||
4936 | 3022 | { | ||
4937 | 3023 | "id": 469, | ||
4938 | 3024 | "enabled": true, | ||
4939 | 3025 | "label": "Tile...", | ||
4940 | 3026 | "visible": true | ||
4941 | 3027 | }, | ||
4942 | 3028 | { | ||
4943 | 3029 | "id": 470, | ||
4944 | 3030 | "enabled": true, | ||
4945 | 3031 | "label": "Small Tiles...", | ||
4946 | 3032 | "visible": true | ||
4947 | 3033 | }, | ||
4948 | 3034 | { | ||
4949 | 3035 | "id": 471, | ||
4950 | 3036 | "enabled": true, | ||
4951 | 3037 | "label": "Paper Tile...", | ||
4952 | 3038 | "visible": true | ||
4953 | 3039 | }, | ||
4954 | 3040 | { | ||
4955 | 3041 | "id": 472, | ||
4956 | 3042 | "enabled": true, | ||
4957 | 3043 | "label": "Map Object...", | ||
4958 | 3044 | "visible": true | ||
4959 | 3045 | }, | ||
4960 | 3046 | { | ||
4961 | 3047 | "id": 473, | ||
4962 | 3048 | "enabled": true, | ||
4963 | 3049 | "label": "Make Seamless", | ||
4964 | 3050 | "visible": true | ||
4965 | 3051 | }, | ||
4966 | 3052 | { | ||
4967 | 3053 | "id": 474, | ||
4968 | 3054 | "enabled": true, | ||
4969 | 3055 | "label": "Illusion...", | ||
4970 | 3056 | "visible": true | ||
4971 | 3057 | }, | ||
4972 | 3058 | { | ||
4973 | 3059 | "id": 475, | ||
4974 | 3060 | "enabled": true, | ||
4975 | 3061 | "label": "Fractal Trace...", | ||
4976 | 3062 | "visible": true | ||
4977 | 3063 | }, | ||
4978 | 3064 | { | ||
4979 | 3065 | "id": 476, | ||
4980 | 3066 | "enabled": true, | ||
4981 | 3067 | "label": "Displace...", | ||
4982 | 3068 | "visible": true | ||
4983 | 3069 | }, | ||
4984 | 3070 | { | ||
4985 | 3071 | "id": 477, | ||
4986 | 3072 | "enabled": true, | ||
4987 | 3073 | "label": "Bump Map...", | ||
4988 | 3074 | "visible": true | ||
4989 | 3075 | } | ||
4990 | 3076 | ] | ||
4991 | 3077 | }, | ||
4992 | 3078 | { | ||
4993 | 3079 | "id": 478, | ||
4994 | 3080 | "enabled": true, | ||
4995 | 3081 | "label": "Decor", | ||
4996 | 3082 | "children-display": "submenu", | ||
4997 | 3083 | "visible": true, | ||
4998 | 3084 | "submenu": [ | ||
4999 | 3085 | { | ||
5000 | 3086 | "id": 479, |
The diff has been truncated for viewing.