Merge lp:~cando/activity-log-manager/vala into lp:activity-log-manager/0.8
- vala
- Merge into trunk
Proposed by
Stefano Candori
Status: | Rejected |
---|---|
Rejected by: | Manish Sinha (मनीष सिन्हा) |
Proposed branch: | lp:~cando/activity-log-manager/vala |
Merge into: | lp:activity-log-manager/0.8 |
Diff against target: |
656 lines (+590/-0) (has conflicts) 12 files modified
COPYING (+166/-0) ChangeLog (+2/-0) Makefile.am (+21/-0) autogen.sh (+157/-0) configure.ac (+25/-0) src/Makefile.am (+30/-0) src/activity-log-manager.vala (+44/-0) src/alm.vala (+53/-0) src/applications-widget.vala (+27/-0) src/config.vapi (+11/-0) src/files-widget.vala (+27/-0) src/history-widget.vala (+27/-0) Conflict adding file COPYING. Moved existing file to COPYING.moved. |
To merge this branch: | bzr merge lp:~cando/activity-log-manager/vala |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Activity Log Manager | Pending | ||
Review via email: mp+88605@code.launchpad.net |
Commit message
Description of the change
I've cleaned up the vala branch and added other little things (advanced tab):this branch is the result.
I suggest to use this branch instead of the old one.
To post a comment you must log in.
Revision history for this message
Seif Lotfy (seif) wrote : | # |
- 2. By Stefano Candori
-
Removed Advanced tab.
Unmerged revisions
- 2. By Stefano Candori
-
Removed Advanced tab.
- 1. By Stefano Candori
-
Init commit.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'AUTHORS' | |||
2 | === added file 'COPYING' | |||
3 | --- COPYING 1970-01-01 00:00:00 +0000 | |||
4 | +++ COPYING 2012-01-15 13:31:23 +0000 | |||
5 | @@ -0,0 +1,166 @@ | |||
6 | 1 | GNU LESSER GENERAL PUBLIC LICENSE | ||
7 | 2 | Version 3, 29 June 2007 | ||
8 | 3 | |||
9 | 4 | Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> | ||
10 | 5 | Everyone is permitted to copy and distribute verbatim copies | ||
11 | 6 | of this license document, but changing it is not allowed. | ||
12 | 7 | |||
13 | 8 | |||
14 | 9 | This version of the GNU Lesser General Public License incorporates | ||
15 | 10 | the terms and conditions of version 3 of the GNU General Public | ||
16 | 11 | License, supplemented by the additional permissions listed below. | ||
17 | 12 | |||
18 | 13 | 0. Additional Definitions. | ||
19 | 14 | |||
20 | 15 | As used herein, "this License" refers to version 3 of the GNU Lesser | ||
21 | 16 | General Public License, and the "GNU GPL" refers to version 3 of the GNU | ||
22 | 17 | General Public License. | ||
23 | 18 | |||
24 | 19 | "The Library" refers to a covered work governed by this License, | ||
25 | 20 | other than an Application or a Combined Work as defined below. | ||
26 | 21 | |||
27 | 22 | An "Application" is any work that makes use of an interface provided | ||
28 | 23 | by the Library, but which is not otherwise based on the Library. | ||
29 | 24 | Defining a subclass of a class defined by the Library is deemed a mode | ||
30 | 25 | of using an interface provided by the Library. | ||
31 | 26 | |||
32 | 27 | A "Combined Work" is a work produced by combining or linking an | ||
33 | 28 | Application with the Library. The particular version of the Library | ||
34 | 29 | with which the Combined Work was made is also called the "Linked | ||
35 | 30 | Version". | ||
36 | 31 | |||
37 | 32 | The "Minimal Corresponding Source" for a Combined Work means the | ||
38 | 33 | Corresponding Source for the Combined Work, excluding any source code | ||
39 | 34 | for portions of the Combined Work that, considered in isolation, are | ||
40 | 35 | based on the Application, and not on the Linked Version. | ||
41 | 36 | |||
42 | 37 | The "Corresponding Application Code" for a Combined Work means the | ||
43 | 38 | object code and/or source code for the Application, including any data | ||
44 | 39 | and utility programs needed for reproducing the Combined Work from the | ||
45 | 40 | Application, but excluding the System Libraries of the Combined Work. | ||
46 | 41 | |||
47 | 42 | 1. Exception to Section 3 of the GNU GPL. | ||
48 | 43 | |||
49 | 44 | You may convey a covered work under sections 3 and 4 of this License | ||
50 | 45 | without being bound by section 3 of the GNU GPL. | ||
51 | 46 | |||
52 | 47 | 2. Conveying Modified Versions. | ||
53 | 48 | |||
54 | 49 | If you modify a copy of the Library, and, in your modifications, a | ||
55 | 50 | facility refers to a function or data to be supplied by an Application | ||
56 | 51 | that uses the facility (other than as an argument passed when the | ||
57 | 52 | facility is invoked), then you may convey a copy of the modified | ||
58 | 53 | version: | ||
59 | 54 | |||
60 | 55 | a) under this License, provided that you make a good faith effort to | ||
61 | 56 | ensure that, in the event an Application does not supply the | ||
62 | 57 | function or data, the facility still operates, and performs | ||
63 | 58 | whatever part of its purpose remains meaningful, or | ||
64 | 59 | |||
65 | 60 | b) under the GNU GPL, with none of the additional permissions of | ||
66 | 61 | this License applicable to that copy. | ||
67 | 62 | |||
68 | 63 | 3. Object Code Incorporating Material from Library Header Files. | ||
69 | 64 | |||
70 | 65 | The object code form of an Application may incorporate material from | ||
71 | 66 | a header file that is part of the Library. You may convey such object | ||
72 | 67 | code under terms of your choice, provided that, if the incorporated | ||
73 | 68 | material is not limited to numerical parameters, data structure | ||
74 | 69 | layouts and accessors, or small macros, inline functions and templates | ||
75 | 70 | (ten or fewer lines in length), you do both of the following: | ||
76 | 71 | |||
77 | 72 | a) Give prominent notice with each copy of the object code that the | ||
78 | 73 | Library is used in it and that the Library and its use are | ||
79 | 74 | covered by this License. | ||
80 | 75 | |||
81 | 76 | b) Accompany the object code with a copy of the GNU GPL and this license | ||
82 | 77 | document. | ||
83 | 78 | |||
84 | 79 | 4. Combined Works. | ||
85 | 80 | |||
86 | 81 | You may convey a Combined Work under terms of your choice that, | ||
87 | 82 | taken together, effectively do not restrict modification of the | ||
88 | 83 | portions of the Library contained in the Combined Work and reverse | ||
89 | 84 | engineering for debugging such modifications, if you also do each of | ||
90 | 85 | the following: | ||
91 | 86 | |||
92 | 87 | a) Give prominent notice with each copy of the Combined Work that | ||
93 | 88 | the Library is used in it and that the Library and its use are | ||
94 | 89 | covered by this License. | ||
95 | 90 | |||
96 | 91 | b) Accompany the Combined Work with a copy of the GNU GPL and this license | ||
97 | 92 | document. | ||
98 | 93 | |||
99 | 94 | c) For a Combined Work that displays copyright notices during | ||
100 | 95 | execution, include the copyright notice for the Library among | ||
101 | 96 | these notices, as well as a reference directing the user to the | ||
102 | 97 | copies of the GNU GPL and this license document. | ||
103 | 98 | |||
104 | 99 | d) Do one of the following: | ||
105 | 100 | |||
106 | 101 | 0) Convey the Minimal Corresponding Source under the terms of this | ||
107 | 102 | License, and the Corresponding Application Code in a form | ||
108 | 103 | suitable for, and under terms that permit, the user to | ||
109 | 104 | recombine or relink the Application with a modified version of | ||
110 | 105 | the Linked Version to produce a modified Combined Work, in the | ||
111 | 106 | manner specified by section 6 of the GNU GPL for conveying | ||
112 | 107 | Corresponding Source. | ||
113 | 108 | |||
114 | 109 | 1) Use a suitable shared library mechanism for linking with the | ||
115 | 110 | Library. A suitable mechanism is one that (a) uses at run time | ||
116 | 111 | a copy of the Library already present on the user's computer | ||
117 | 112 | system, and (b) will operate properly with a modified version | ||
118 | 113 | of the Library that is interface-compatible with the Linked | ||
119 | 114 | Version. | ||
120 | 115 | |||
121 | 116 | e) Provide Installation Information, but only if you would otherwise | ||
122 | 117 | be required to provide such information under section 6 of the | ||
123 | 118 | GNU GPL, and only to the extent that such information is | ||
124 | 119 | necessary to install and execute a modified version of the | ||
125 | 120 | Combined Work produced by recombining or relinking the | ||
126 | 121 | Application with a modified version of the Linked Version. (If | ||
127 | 122 | you use option 4d0, the Installation Information must accompany | ||
128 | 123 | the Minimal Corresponding Source and Corresponding Application | ||
129 | 124 | Code. If you use option 4d1, you must provide the Installation | ||
130 | 125 | Information in the manner specified by section 6 of the GNU GPL | ||
131 | 126 | for conveying Corresponding Source.) | ||
132 | 127 | |||
133 | 128 | 5. Combined Libraries. | ||
134 | 129 | |||
135 | 130 | You may place library facilities that are a work based on the | ||
136 | 131 | Library side by side in a single library together with other library | ||
137 | 132 | facilities that are not Applications and are not covered by this | ||
138 | 133 | License, and convey such a combined library under terms of your | ||
139 | 134 | choice, if you do both of the following: | ||
140 | 135 | |||
141 | 136 | a) Accompany the combined library with a copy of the same work based | ||
142 | 137 | on the Library, uncombined with any other library facilities, | ||
143 | 138 | conveyed under the terms of this License. | ||
144 | 139 | |||
145 | 140 | b) Give prominent notice with the combined library that part of it | ||
146 | 141 | is a work based on the Library, and explaining where to find the | ||
147 | 142 | accompanying uncombined form of the same work. | ||
148 | 143 | |||
149 | 144 | 6. Revised Versions of the GNU Lesser General Public License. | ||
150 | 145 | |||
151 | 146 | The Free Software Foundation may publish revised and/or new versions | ||
152 | 147 | of the GNU Lesser General Public License from time to time. Such new | ||
153 | 148 | versions will be similar in spirit to the present version, but may | ||
154 | 149 | differ in detail to address new problems or concerns. | ||
155 | 150 | |||
156 | 151 | Each version is given a distinguishing version number. If the | ||
157 | 152 | Library as you received it specifies that a certain numbered version | ||
158 | 153 | of the GNU Lesser General Public License "or any later version" | ||
159 | 154 | applies to it, you have the option of following the terms and | ||
160 | 155 | conditions either of that published version or of any later version | ||
161 | 156 | published by the Free Software Foundation. If the Library as you | ||
162 | 157 | received it does not specify a version number of the GNU Lesser | ||
163 | 158 | General Public License, you may choose any version of the GNU Lesser | ||
164 | 159 | General Public License ever published by the Free Software Foundation. | ||
165 | 160 | |||
166 | 161 | If the Library as you received it specifies that a proxy can decide | ||
167 | 162 | whether future versions of the GNU Lesser General Public License shall | ||
168 | 163 | apply, that proxy's public statement of acceptance of any version is | ||
169 | 164 | permanent authorization for you to choose that version for the | ||
170 | 165 | Library. | ||
171 | 166 | |||
172 | 0 | 167 | ||
173 | === renamed file 'COPYING' => 'COPYING.moved' | |||
174 | === added file 'ChangeLog' | |||
175 | --- ChangeLog 1970-01-01 00:00:00 +0000 | |||
176 | +++ ChangeLog 2012-01-15 13:31:23 +0000 | |||
177 | @@ -0,0 +1,2 @@ | |||
178 | 1 | |||
179 | 2 | |||
180 | 0 | 3 | ||
181 | === added symlink 'INSTALL' | |||
182 | === target is u'/usr/share/automake-1.11/INSTALL' | |||
183 | === added file 'Makefile.am' | |||
184 | --- Makefile.am 1970-01-01 00:00:00 +0000 | |||
185 | +++ Makefile.am 2012-01-15 13:31:23 +0000 | |||
186 | @@ -0,0 +1,21 @@ | |||
187 | 1 | ## Process this file with automake to produce Makefile.in | ||
188 | 2 | ## Created by Anjuta | ||
189 | 3 | |||
190 | 4 | SUBDIRS = src | ||
191 | 5 | |||
192 | 6 | almdocdir = ${prefix}/doc/alm | ||
193 | 7 | almdoc_DATA = \ | ||
194 | 8 | README\ | ||
195 | 9 | COPYING\ | ||
196 | 10 | AUTHORS\ | ||
197 | 11 | ChangeLog\ | ||
198 | 12 | INSTALL\ | ||
199 | 13 | NEWS | ||
200 | 14 | |||
201 | 15 | |||
202 | 16 | EXTRA_DIST = $(almdoc_DATA) | ||
203 | 17 | |||
204 | 18 | |||
205 | 19 | # Remove doc directory on uninstall | ||
206 | 20 | uninstall-local: | ||
207 | 21 | -rm -r $(almdocdir) | ||
208 | 0 | 22 | ||
209 | === added file 'NEWS' | |||
210 | === added file 'README' | |||
211 | === added file 'autogen.sh' | |||
212 | --- autogen.sh 1970-01-01 00:00:00 +0000 | |||
213 | +++ autogen.sh 2012-01-15 13:31:23 +0000 | |||
214 | @@ -0,0 +1,157 @@ | |||
215 | 1 | #!/bin/sh | ||
216 | 2 | # Run this to generate all the initial makefiles, etc. | ||
217 | 3 | |||
218 | 4 | srcdir=`dirname $0` | ||
219 | 5 | test -z "$srcdir" && srcdir=. | ||
220 | 6 | |||
221 | 7 | DIE=0 | ||
222 | 8 | |||
223 | 9 | if [ -n "$GNOME2_DIR" ]; then | ||
224 | 10 | ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" | ||
225 | 11 | LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH" | ||
226 | 12 | PATH="$GNOME2_DIR/bin:$PATH" | ||
227 | 13 | export PATH | ||
228 | 14 | export LD_LIBRARY_PATH | ||
229 | 15 | fi | ||
230 | 16 | |||
231 | 17 | (test -f $srcdir/configure.ac) || { | ||
232 | 18 | echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" | ||
233 | 19 | echo " top-level package directory" | ||
234 | 20 | exit 1 | ||
235 | 21 | } | ||
236 | 22 | |||
237 | 23 | (autoconf --version) < /dev/null > /dev/null 2>&1 || { | ||
238 | 24 | echo | ||
239 | 25 | echo "**Error**: You must have \`autoconf' installed." | ||
240 | 26 | echo "Download the appropriate package for your distribution," | ||
241 | 27 | echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" | ||
242 | 28 | DIE=1 | ||
243 | 29 | } | ||
244 | 30 | |||
245 | 31 | (grep "^IT_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && { | ||
246 | 32 | (intltoolize --version) < /dev/null > /dev/null 2>&1 || { | ||
247 | 33 | echo | ||
248 | 34 | echo "**Error**: You must have \`intltool' installed." | ||
249 | 35 | echo "You can get it from:" | ||
250 | 36 | echo " ftp://ftp.gnome.org/pub/GNOME/" | ||
251 | 37 | DIE=1 | ||
252 | 38 | } | ||
253 | 39 | } | ||
254 | 40 | |||
255 | 41 | (grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.ac >/dev/null) && { | ||
256 | 42 | (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || { | ||
257 | 43 | echo | ||
258 | 44 | echo "**Error**: You must have \`xml-i18n-toolize' installed." | ||
259 | 45 | echo "You can get it from:" | ||
260 | 46 | echo " ftp://ftp.gnome.org/pub/GNOME/" | ||
261 | 47 | DIE=1 | ||
262 | 48 | } | ||
263 | 49 | } | ||
264 | 50 | |||
265 | 51 | (grep "^LT_INIT" $srcdir/configure.ac >/dev/null) && { | ||
266 | 52 | (libtool --version) < /dev/null > /dev/null 2>&1 || { | ||
267 | 53 | echo | ||
268 | 54 | echo "**Error**: You must have \`libtool' installed." | ||
269 | 55 | echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" | ||
270 | 56 | DIE=1 | ||
271 | 57 | } | ||
272 | 58 | } | ||
273 | 59 | |||
274 | 60 | (grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && { | ||
275 | 61 | (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \ | ||
276 | 62 | (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || { | ||
277 | 63 | echo | ||
278 | 64 | echo "**Error**: You must have \`glib' installed." | ||
279 | 65 | echo "You can get it from: ftp://ftp.gtk.org/pub/gtk" | ||
280 | 66 | DIE=1 | ||
281 | 67 | } | ||
282 | 68 | } | ||
283 | 69 | |||
284 | 70 | (automake --version) < /dev/null > /dev/null 2>&1 || { | ||
285 | 71 | echo | ||
286 | 72 | echo "**Error**: You must have \`automake' installed." | ||
287 | 73 | echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" | ||
288 | 74 | DIE=1 | ||
289 | 75 | NO_AUTOMAKE=yes | ||
290 | 76 | } | ||
291 | 77 | |||
292 | 78 | |||
293 | 79 | # if no automake, don't bother testing for aclocal | ||
294 | 80 | test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { | ||
295 | 81 | echo | ||
296 | 82 | echo "**Error**: Missing \`aclocal'. The version of \`automake'" | ||
297 | 83 | echo "installed doesn't appear recent enough." | ||
298 | 84 | echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" | ||
299 | 85 | DIE=1 | ||
300 | 86 | } | ||
301 | 87 | |||
302 | 88 | if test "$DIE" -eq 1; then | ||
303 | 89 | exit 1 | ||
304 | 90 | fi | ||
305 | 91 | |||
306 | 92 | if test -z "$*"; then | ||
307 | 93 | echo "**Warning**: I am going to run \`configure' with no arguments." | ||
308 | 94 | echo "If you wish to pass any to it, please specify them on the" | ||
309 | 95 | echo \`$0\'" command line." | ||
310 | 96 | echo | ||
311 | 97 | fi | ||
312 | 98 | |||
313 | 99 | case $CC in | ||
314 | 100 | xlc ) | ||
315 | 101 | am_opt=--include-deps;; | ||
316 | 102 | esac | ||
317 | 103 | |||
318 | 104 | for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.ac -print` | ||
319 | 105 | do | ||
320 | 106 | dr=`dirname $coin` | ||
321 | 107 | if test -f $dr/NO-AUTO-GEN; then | ||
322 | 108 | echo skipping $dr -- flagged as no auto-gen | ||
323 | 109 | else | ||
324 | 110 | echo processing $dr | ||
325 | 111 | ( cd $dr | ||
326 | 112 | |||
327 | 113 | aclocalinclude="$ACLOCAL_FLAGS" | ||
328 | 114 | |||
329 | 115 | if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then | ||
330 | 116 | echo "Creating $dr/aclocal.m4 ..." | ||
331 | 117 | test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 | ||
332 | 118 | echo "Running glib-gettextize... Ignore non-fatal messages." | ||
333 | 119 | echo "no" | glib-gettextize --force --copy | ||
334 | 120 | echo "Making $dr/aclocal.m4 writable ..." | ||
335 | 121 | test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 | ||
336 | 122 | fi | ||
337 | 123 | if grep "^IT_PROG_INTLTOOL" configure.ac >/dev/null; then | ||
338 | 124 | echo "Running intltoolize..." | ||
339 | 125 | intltoolize --copy --force --automake | ||
340 | 126 | fi | ||
341 | 127 | if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then | ||
342 | 128 | echo "Running xml-i18n-toolize..." | ||
343 | 129 | xml-i18n-toolize --copy --force --automake | ||
344 | 130 | fi | ||
345 | 131 | if grep "^LT_INIT" configure.ac >/dev/null; then | ||
346 | 132 | if test -z "$NO_LIBTOOLIZE" ; then | ||
347 | 133 | echo "Running libtoolize..." | ||
348 | 134 | libtoolize --force --copy | ||
349 | 135 | fi | ||
350 | 136 | fi | ||
351 | 137 | echo "Running aclocal $aclocalinclude ..." | ||
352 | 138 | aclocal $aclocalinclude | ||
353 | 139 | if grep "^A[CM]_CONFIG_HEADER" configure.ac >/dev/null; then | ||
354 | 140 | echo "Running autoheader..." | ||
355 | 141 | autoheader | ||
356 | 142 | fi | ||
357 | 143 | echo "Running automake --gnu $am_opt ..." | ||
358 | 144 | automake --add-missing --gnu $am_opt | ||
359 | 145 | echo "Running autoconf ..." | ||
360 | 146 | autoconf | ||
361 | 147 | ) | ||
362 | 148 | fi | ||
363 | 149 | done | ||
364 | 150 | |||
365 | 151 | if test x$NOCONFIGURE = x; then | ||
366 | 152 | echo Running $srcdir/configure "$@" ... | ||
367 | 153 | $srcdir/configure "$@" \ | ||
368 | 154 | && echo Now type \`make\' to compile. || exit 1 | ||
369 | 155 | else | ||
370 | 156 | echo Skipping configure process. | ||
371 | 157 | fi | ||
372 | 0 | 158 | ||
373 | === added file 'configure.ac' | |||
374 | --- configure.ac 1970-01-01 00:00:00 +0000 | |||
375 | +++ configure.ac 2012-01-15 13:31:23 +0000 | |||
376 | @@ -0,0 +1,25 @@ | |||
377 | 1 | AC_INIT(alm, 0.1) | ||
378 | 2 | |||
379 | 3 | AC_CONFIG_HEADERS([config.h]) | ||
380 | 4 | |||
381 | 5 | AM_INIT_AUTOMAKE([1.11]) | ||
382 | 6 | |||
383 | 7 | AM_SILENT_RULES([yes]) | ||
384 | 8 | |||
385 | 9 | AC_PROG_CC | ||
386 | 10 | |||
387 | 11 | |||
388 | 12 | LT_INIT | ||
389 | 13 | |||
390 | 14 | |||
391 | 15 | AM_PROG_VALAC([0.10.0]) | ||
392 | 16 | |||
393 | 17 | |||
394 | 18 | PKG_CHECK_MODULES(ALM, [gtk+-3.0 zeitgeist-1.0 gee-1.0]) | ||
395 | 19 | |||
396 | 20 | |||
397 | 21 | AC_OUTPUT([ | ||
398 | 22 | Makefile | ||
399 | 23 | src/Makefile | ||
400 | 24 | |||
401 | 25 | ]) | ||
402 | 0 | 26 | ||
403 | === added directory 'src' | |||
404 | === added file 'src/Makefile.am' | |||
405 | --- src/Makefile.am 1970-01-01 00:00:00 +0000 | |||
406 | +++ src/Makefile.am 2012-01-15 13:31:23 +0000 | |||
407 | @@ -0,0 +1,30 @@ | |||
408 | 1 | AM_CPPFLAGS = \ | ||
409 | 2 | -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ | ||
410 | 3 | -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ | ||
411 | 4 | -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ | ||
412 | 5 | $(ALM_CFLAGS) | ||
413 | 6 | |||
414 | 7 | AM_CFLAGS =\ | ||
415 | 8 | -Wall\ | ||
416 | 9 | -g | ||
417 | 10 | |||
418 | 11 | VALAFLAGS = \ | ||
419 | 12 | --pkg zeitgeist-1.0 \ | ||
420 | 13 | --pkg gtk+-3.0 \ | ||
421 | 14 | --pkg gee-1.0 | ||
422 | 15 | |||
423 | 16 | bin_PROGRAMS = alm | ||
424 | 17 | |||
425 | 18 | alm_SOURCES = \ | ||
426 | 19 | alm.vala \ | ||
427 | 20 | config.vapi \ | ||
428 | 21 | activity-log-manager.vala \ | ||
429 | 22 | history-widget.vala \ | ||
430 | 23 | files-widget.vala \ | ||
431 | 24 | applications-widget.vala | ||
432 | 25 | |||
433 | 26 | alm_LDFLAGS = \ | ||
434 | 27 | -Wl,--export-dynamic | ||
435 | 28 | |||
436 | 29 | alm_LDADD = $(ALM_LIBS) | ||
437 | 30 | |||
438 | 0 | 31 | ||
439 | === added file 'src/activity-log-manager.vala' | |||
440 | --- src/activity-log-manager.vala 1970-01-01 00:00:00 +0000 | |||
441 | +++ src/activity-log-manager.vala 2012-01-15 13:31:23 +0000 | |||
442 | @@ -0,0 +1,44 @@ | |||
443 | 1 | /* | ||
444 | 2 | * activity-log-manager.vala | ||
445 | 3 | * Copyright (C) Seif Lotfy 2012 <seif@lotfy.com> | ||
446 | 4 | * Copyright (C) Stefano Candori 2012 <stefano.candori@gmail.com> | ||
447 | 5 | * | ||
448 | 6 | * alm is free software: you can redistribute it and/or modify it | ||
449 | 7 | * under the terms of the GNU Lesser General Public License as published | ||
450 | 8 | * by the Free Software Foundation, either version 3 of the License, or | ||
451 | 9 | * (at your option) any later version. | ||
452 | 10 | * | ||
453 | 11 | * alm is distributed in the hope that it will be useful, but | ||
454 | 12 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
455 | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
456 | 14 | * See the GNU Lesser General Public License for more details. | ||
457 | 15 | * | ||
458 | 16 | * You should have received a copy of the GNU Lesser General Public License | ||
459 | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>."; | ||
460 | 18 | */ | ||
461 | 19 | |||
462 | 20 | public class ActivityLogManager : Gtk.Box { | ||
463 | 21 | private Gtk.Notebook notebook; | ||
464 | 22 | private HistoryWidget history_widget; | ||
465 | 23 | private FilesWidget files_widget; | ||
466 | 24 | private ApplicationsWidget apps_widget; | ||
467 | 25 | |||
468 | 26 | // Constructor | ||
469 | 27 | public ActivityLogManager () { | ||
470 | 28 | Object(orientation: Gtk.Orientation.VERTICAL); | ||
471 | 29 | this.set_size_request(600,400); | ||
472 | 30 | notebook = new Gtk.Notebook(); | ||
473 | 31 | this.pack_start(notebook, true, true, 0); | ||
474 | 32 | |||
475 | 33 | history_widget = new HistoryWidget(); | ||
476 | 34 | notebook.append_page(history_widget, new Gtk.Label("History")); | ||
477 | 35 | |||
478 | 36 | files_widget = new FilesWidget(); | ||
479 | 37 | notebook.append_page(files_widget, new Gtk.Label("Files")); | ||
480 | 38 | |||
481 | 39 | apps_widget = new ApplicationsWidget(); | ||
482 | 40 | notebook.append_page(apps_widget, new Gtk.Label("Applications")); | ||
483 | 41 | |||
484 | 42 | this.show_all(); | ||
485 | 43 | } | ||
486 | 44 | } | ||
487 | 0 | 45 | ||
488 | === added file 'src/alm.vala' | |||
489 | --- src/alm.vala 1970-01-01 00:00:00 +0000 | |||
490 | +++ src/alm.vala 2012-01-15 13:31:23 +0000 | |||
491 | @@ -0,0 +1,53 @@ | |||
492 | 1 | /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ | ||
493 | 2 | /* | ||
494 | 3 | * main.c | ||
495 | 4 | * Copyright (C) Seif Lotfy 2012 <seif@lotfy.com> | ||
496 | 5 | * | ||
497 | 6 | alm is free software: you can redistribute it and/or modify it | ||
498 | 7 | * under the terms of the GNU Lesser General Public License as published | ||
499 | 8 | * by the Free Software Foundation, either version 3 of the License, or | ||
500 | 9 | * (at your option) any later version. | ||
501 | 10 | * | ||
502 | 11 | * alm is distributed in the hope that it will be useful, but | ||
503 | 12 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
504 | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
505 | 14 | * See the GNU Lesser General Public License for more details. | ||
506 | 15 | * | ||
507 | 16 | * You should have received a copy of the GNU Lesser General Public License | ||
508 | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>."; | ||
509 | 18 | */ | ||
510 | 19 | |||
511 | 20 | using GLib; | ||
512 | 21 | using Gtk; | ||
513 | 22 | |||
514 | 23 | public class Main : Object | ||
515 | 24 | { | ||
516 | 25 | |||
517 | 26 | public Main () | ||
518 | 27 | { | ||
519 | 28 | |||
520 | 29 | Window window = new Window(); | ||
521 | 30 | window.set_title ("Activity Log Manager"); | ||
522 | 31 | |||
523 | 32 | var widget = new ActivityLogManager(); | ||
524 | 33 | window.add(widget); | ||
525 | 34 | |||
526 | 35 | window.show_all(); | ||
527 | 36 | window.destroy.connect(on_destroy); | ||
528 | 37 | |||
529 | 38 | } | ||
530 | 39 | |||
531 | 40 | [CCode (instance_pos = -1)] | ||
532 | 41 | public void on_destroy (Widget window) | ||
533 | 42 | { | ||
534 | 43 | Gtk.main_quit(); | ||
535 | 44 | } | ||
536 | 45 | |||
537 | 46 | static int main (string[] args) | ||
538 | 47 | { | ||
539 | 48 | Gtk.init (ref args); | ||
540 | 49 | var app = new Main (); | ||
541 | 50 | Gtk.main (); | ||
542 | 51 | return 0; | ||
543 | 52 | } | ||
544 | 53 | } | ||
545 | 0 | 54 | ||
546 | === added file 'src/applications-widget.vala' | |||
547 | --- src/applications-widget.vala 1970-01-01 00:00:00 +0000 | |||
548 | +++ src/applications-widget.vala 2012-01-15 13:31:23 +0000 | |||
549 | @@ -0,0 +1,27 @@ | |||
550 | 1 | /* -*- Mode: vala; tab-width: 4; intend-tabs-mode: t -*- */ | ||
551 | 2 | /* alm | ||
552 | 3 | * | ||
553 | 4 | * Copyright (C) Seif Lotfy 2012 <seif@lotfy.com> | ||
554 | 5 | * | ||
555 | 6 | alm is free software: you can redistribute it and/or modify it | ||
556 | 7 | * under the terms of the GNU Lesser General Public License as published | ||
557 | 8 | * by the Free Software Foundation, either version 3 of the License, or | ||
558 | 9 | * (at your option) any later version. | ||
559 | 10 | * | ||
560 | 11 | * alm is distributed in the hope that it will be useful, but | ||
561 | 12 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
562 | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
563 | 14 | * See the GNU Lesser General Public License for more details. | ||
564 | 15 | * | ||
565 | 16 | * You should have received a copy of the GNU Lesser General Public License | ||
566 | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>."; | ||
567 | 18 | */ | ||
568 | 19 | |||
569 | 20 | public class ApplicationsWidget : Gtk.Box { | ||
570 | 21 | |||
571 | 22 | // Constructor | ||
572 | 23 | public ApplicationsWidget () { | ||
573 | 24 | |||
574 | 25 | } | ||
575 | 26 | |||
576 | 27 | } | ||
577 | 0 | 28 | ||
578 | === added file 'src/config.vapi' | |||
579 | --- src/config.vapi 1970-01-01 00:00:00 +0000 | |||
580 | +++ src/config.vapi 2012-01-15 13:31:23 +0000 | |||
581 | @@ -0,0 +1,11 @@ | |||
582 | 1 | [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")] | ||
583 | 2 | namespace Config { | ||
584 | 3 | public const string GETTEXT_PACKAGE; | ||
585 | 4 | public const string SPRITE_DIR; | ||
586 | 5 | public const string BACKGROUND_DIR; | ||
587 | 6 | public const string PACKAGE_DATA_DIR; | ||
588 | 7 | public const string PACKAGE_LOCALE_DIR; | ||
589 | 8 | public const string PACKAGE_NAME; | ||
590 | 9 | public const string PACKAGE_VERSION; | ||
591 | 10 | public const string VERSION; | ||
592 | 11 | } | ||
593 | 0 | 12 | ||
594 | === added file 'src/files-widget.vala' | |||
595 | --- src/files-widget.vala 1970-01-01 00:00:00 +0000 | |||
596 | +++ src/files-widget.vala 2012-01-15 13:31:23 +0000 | |||
597 | @@ -0,0 +1,27 @@ | |||
598 | 1 | /* -*- Mode: vala; tab-width: 4; intend-tabs-mode: t -*- */ | ||
599 | 2 | /* alm | ||
600 | 3 | * | ||
601 | 4 | * Copyright (C) Seif Lotfy 2012 <seif@lotfy.com> | ||
602 | 5 | * | ||
603 | 6 | alm is free software: you can redistribute it and/or modify it | ||
604 | 7 | * under the terms of the GNU Lesser General Public License as published | ||
605 | 8 | * by the Free Software Foundation, either version 3 of the License, or | ||
606 | 9 | * (at your option) any later version. | ||
607 | 10 | * | ||
608 | 11 | * alm is distributed in the hope that it will be useful, but | ||
609 | 12 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
610 | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
611 | 14 | * See the GNU Lesser General Public License for more details. | ||
612 | 15 | * | ||
613 | 16 | * You should have received a copy of the GNU Lesser General Public License | ||
614 | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>."; | ||
615 | 18 | */ | ||
616 | 19 | |||
617 | 20 | public class FilesWidget : Gtk.Box { | ||
618 | 21 | |||
619 | 22 | // Constructor | ||
620 | 23 | public FilesWidget () { | ||
621 | 24 | |||
622 | 25 | } | ||
623 | 26 | |||
624 | 27 | } | ||
625 | 0 | 28 | ||
626 | === added file 'src/history-widget.vala' | |||
627 | --- src/history-widget.vala 1970-01-01 00:00:00 +0000 | |||
628 | +++ src/history-widget.vala 2012-01-15 13:31:23 +0000 | |||
629 | @@ -0,0 +1,27 @@ | |||
630 | 1 | /* -*- Mode: vala; tab-width: 4; intend-tabs-mode: t -*- */ | ||
631 | 2 | /* alm | ||
632 | 3 | * | ||
633 | 4 | * Copyright (C) Seif Lotfy 2012 <seif@lotfy.com> | ||
634 | 5 | * | ||
635 | 6 | alm is free software: you can redistribute it and/or modify it | ||
636 | 7 | * under the terms of the GNU Lesser General Public License as published | ||
637 | 8 | * by the Free Software Foundation, either version 3 of the License, or | ||
638 | 9 | * (at your option) any later version. | ||
639 | 10 | * | ||
640 | 11 | * alm is distributed in the hope that it will be useful, but | ||
641 | 12 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
642 | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
643 | 14 | * See the GNU Lesser General Public License for more details. | ||
644 | 15 | * | ||
645 | 16 | * You should have received a copy of the GNU Lesser General Public License | ||
646 | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>."; | ||
647 | 18 | */ | ||
648 | 19 | |||
649 | 20 | public class HistoryWidget : Gtk.Box { | ||
650 | 21 | |||
651 | 22 | // Constructor | ||
652 | 23 | public HistoryWidget () { | ||
653 | 24 | |||
654 | 25 | } | ||
655 | 26 | |||
656 | 27 | } |
we will not use the advanced tab for the rewrite
On Sun, Jan 15, 2012 at 12:55 PM, Stefano Candori <<email address hidden>
> wrote:
> Stefano Candori has proposed merging lp:~cando/activity-log-manager/vala log-manager) /code.launchpad .net/~cando/ activity- log-manager/ vala/+merge/ 88605 /code.launchpad .net/~cando/ activity- log-manager/ vala/+merge/ 88605
> into lp:activity-log-manager.
>
> Requested reviews:
> Activity Log Manager (activity-
>
> For more details, see:
> https:/
>
> I've cleaned up the vala branch and added other little things (advanced
> tab):this branch is the result.
> I suggest to use this branch instead of the old one.
> --
> https:/
> You are subscribed to branch lp:activity-log-manager.
>