Merge lp:~davysson/daily/gui into lp:daily

Proposed by DavyS
Status: Merged
Merged at revision: 16
Proposed branch: lp:~davysson/daily/gui
Merge into: lp:daily
Diff against target: 722 lines (+42/-512)
12 files modified
CMakeFiles/CMakeCCompiler.cmake (+0/-49)
CMakeFiles/CMakeCXXCompiler.cmake (+0/-50)
CMakeFiles/CMakeDirectoryInformation.cmake (+0/-23)
CMakeFiles/CMakeSystem.cmake (+0/-15)
CMakeFiles/Makefile.cmake (+0/-51)
CMakeLists.txt (+18/-5)
data/daily.desktop (+9/-0)
data/icons/list-add.svg (+0/-64)
data/icons/view-list-details-symbolic.svg (+0/-84)
data/icons/view-list-icons-symbolic.svg (+0/-159)
src/Content.vala (+7/-3)
src/Main.vala (+8/-9)
To merge this branch: bzr merge lp:~davysson/daily/gui
Reviewer Review Type Date Requested Status
Kenneth Malac Pending
Review via email: mp+113676@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'CMakeFiles/CMakeCCompiler.cmake'
2--- CMakeFiles/CMakeCCompiler.cmake 2012-06-22 21:31:12 +0000
3+++ CMakeFiles/CMakeCCompiler.cmake 1970-01-01 00:00:00 +0000
4@@ -1,49 +0,0 @@
5-SET(CMAKE_C_COMPILER "/usr/bin/gcc")
6-SET(CMAKE_C_COMPILER_ARG1 "")
7-SET(CMAKE_C_COMPILER_ID "GNU")
8-SET(CMAKE_C_PLATFORM_ID "Linux")
9-
10-SET(CMAKE_AR "/usr/bin/ar")
11-SET(CMAKE_RANLIB "/usr/bin/ranlib")
12-SET(CMAKE_LINKER "/usr/bin/ld")
13-SET(CMAKE_COMPILER_IS_GNUCC 1)
14-SET(CMAKE_C_COMPILER_LOADED 1)
15-SET(CMAKE_COMPILER_IS_MINGW )
16-SET(CMAKE_COMPILER_IS_CYGWIN )
17-IF(CMAKE_COMPILER_IS_CYGWIN)
18- SET(CYGWIN 1)
19- SET(UNIX 1)
20-ENDIF(CMAKE_COMPILER_IS_CYGWIN)
21-
22-SET(CMAKE_C_COMPILER_ENV_VAR "CC")
23-
24-IF(CMAKE_COMPILER_IS_MINGW)
25- SET(MINGW 1)
26-ENDIF(CMAKE_COMPILER_IS_MINGW)
27-SET(CMAKE_C_COMPILER_ID_RUN 1)
28-SET(CMAKE_C_SOURCE_FILE_EXTENSIONS c)
29-SET(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
30-SET(CMAKE_C_LINKER_PREFERENCE 10)
31-
32-# Save compiler ABI information.
33-SET(CMAKE_C_SIZEOF_DATA_PTR "4")
34-SET(CMAKE_C_COMPILER_ABI "ELF")
35-SET(CMAKE_C_LIBRARY_ARCHITECTURE "i386-linux-gnu")
36-
37-IF(CMAKE_C_SIZEOF_DATA_PTR)
38- SET(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}")
39-ENDIF(CMAKE_C_SIZEOF_DATA_PTR)
40-
41-IF(CMAKE_C_COMPILER_ABI)
42- SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}")
43-ENDIF(CMAKE_C_COMPILER_ABI)
44-
45-IF(CMAKE_C_LIBRARY_ARCHITECTURE)
46- SET(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
47-ENDIF()
48-
49-SET(CMAKE_C_HAS_ISYSROOT "")
50-
51-
52-SET(CMAKE_C_IMPLICIT_LINK_LIBRARIES "c")
53-SET(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/i686-linux-gnu/4.6;/usr/lib/i386-linux-gnu;/usr/lib;/lib/i386-linux-gnu;/lib")
54
55=== removed file 'CMakeFiles/CMakeCXXCompiler.cmake'
56--- CMakeFiles/CMakeCXXCompiler.cmake 2012-06-22 21:31:12 +0000
57+++ CMakeFiles/CMakeCXXCompiler.cmake 1970-01-01 00:00:00 +0000
58@@ -1,50 +0,0 @@
59-SET(CMAKE_CXX_COMPILER "/usr/bin/c++")
60-SET(CMAKE_CXX_COMPILER_ARG1 "")
61-SET(CMAKE_CXX_COMPILER_ID "GNU")
62-SET(CMAKE_CXX_PLATFORM_ID "Linux")
63-
64-SET(CMAKE_AR "/usr/bin/ar")
65-SET(CMAKE_RANLIB "/usr/bin/ranlib")
66-SET(CMAKE_LINKER "/usr/bin/ld")
67-SET(CMAKE_COMPILER_IS_GNUCXX 1)
68-SET(CMAKE_CXX_COMPILER_LOADED 1)
69-SET(CMAKE_COMPILER_IS_MINGW )
70-SET(CMAKE_COMPILER_IS_CYGWIN )
71-IF(CMAKE_COMPILER_IS_CYGWIN)
72- SET(CYGWIN 1)
73- SET(UNIX 1)
74-ENDIF(CMAKE_COMPILER_IS_CYGWIN)
75-
76-SET(CMAKE_CXX_COMPILER_ENV_VAR "CXX")
77-
78-IF(CMAKE_COMPILER_IS_MINGW)
79- SET(MINGW 1)
80-ENDIF(CMAKE_COMPILER_IS_MINGW)
81-SET(CMAKE_CXX_COMPILER_ID_RUN 1)
82-SET(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC)
83-SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;CPP)
84-SET(CMAKE_CXX_LINKER_PREFERENCE 30)
85-SET(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1)
86-
87-# Save compiler ABI information.
88-SET(CMAKE_CXX_SIZEOF_DATA_PTR "4")
89-SET(CMAKE_CXX_COMPILER_ABI "ELF")
90-SET(CMAKE_CXX_LIBRARY_ARCHITECTURE "i386-linux-gnu")
91-
92-IF(CMAKE_CXX_SIZEOF_DATA_PTR)
93- SET(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}")
94-ENDIF(CMAKE_CXX_SIZEOF_DATA_PTR)
95-
96-IF(CMAKE_CXX_COMPILER_ABI)
97- SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}")
98-ENDIF(CMAKE_CXX_COMPILER_ABI)
99-
100-IF(CMAKE_CXX_LIBRARY_ARCHITECTURE)
101- SET(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
102-ENDIF()
103-
104-SET(CMAKE_CXX_HAS_ISYSROOT "")
105-
106-
107-SET(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "stdc++;m;c")
108-SET(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/i686-linux-gnu/4.6;/usr/lib/i386-linux-gnu;/usr/lib;/lib/i386-linux-gnu;/lib")
109
110=== removed file 'CMakeFiles/CMakeDirectoryInformation.cmake'
111--- CMakeFiles/CMakeDirectoryInformation.cmake 2012-06-22 21:31:12 +0000
112+++ CMakeFiles/CMakeDirectoryInformation.cmake 1970-01-01 00:00:00 +0000
113@@ -1,23 +0,0 @@
114-# CMAKE generated file: DO NOT EDIT!
115-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
116-
117-# Relative path conversion top directories.
118-SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/kenny/appdevcontest/daily/code")
119-SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/kenny/appdevcontest/daily/code")
120-
121-# Force unix paths in dependencies.
122-SET(CMAKE_FORCE_UNIX_PATHS 1)
123-
124-# The C and CXX include file search paths:
125-SET(CMAKE_C_INCLUDE_PATH
126- "."
127- )
128-SET(CMAKE_CXX_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})
129-SET(CMAKE_Fortran_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})
130-SET(CMAKE_ASM_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})
131-
132-# The C and CXX include file regular expressions for this directory.
133-SET(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$")
134-SET(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$")
135-SET(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN})
136-SET(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN})
137
138=== removed file 'CMakeFiles/CMakeSystem.cmake'
139--- CMakeFiles/CMakeSystem.cmake 2012-06-22 21:31:12 +0000
140+++ CMakeFiles/CMakeSystem.cmake 1970-01-01 00:00:00 +0000
141@@ -1,15 +0,0 @@
142-
143-
144-SET(CMAKE_SYSTEM "Linux-3.2.0-25-generic-pae")
145-SET(CMAKE_SYSTEM_NAME "Linux")
146-SET(CMAKE_SYSTEM_VERSION "3.2.0-25-generic-pae")
147-SET(CMAKE_SYSTEM_PROCESSOR "i686")
148-
149-SET(CMAKE_HOST_SYSTEM "Linux-3.2.0-25-generic-pae")
150-SET(CMAKE_HOST_SYSTEM_NAME "Linux")
151-SET(CMAKE_HOST_SYSTEM_VERSION "3.2.0-25-generic-pae")
152-SET(CMAKE_HOST_SYSTEM_PROCESSOR "i686")
153-
154-SET(CMAKE_CROSSCOMPILING "FALSE")
155-
156-SET(CMAKE_SYSTEM_LOADED 1)
157
158=== removed file 'CMakeFiles/Makefile.cmake'
159--- CMakeFiles/Makefile.cmake 2012-06-23 00:49:33 +0000
160+++ CMakeFiles/Makefile.cmake 1970-01-01 00:00:00 +0000
161@@ -1,51 +0,0 @@
162-# CMAKE generated file: DO NOT EDIT!
163-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
164-
165-# The generator used is:
166-SET(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
167-
168-# The top level Makefile was generated from the following files:
169-SET(CMAKE_MAKEFILE_DEPENDS
170- "CMakeCache.txt"
171- "CMakeFiles/CMakeCCompiler.cmake"
172- "CMakeFiles/CMakeCXXCompiler.cmake"
173- "CMakeFiles/CMakeSystem.cmake"
174- "CMakeLists.txt"
175- "cmake/FindVala.cmake"
176- "cmake/GSettings.cmake"
177- "cmake/ParseArguments.cmake"
178- "cmake/ValaPrecompile.cmake"
179- "src/Config.vala.cmake"
180- "/usr/share/cmake-2.8/Modules/CMakeCInformation.cmake"
181- "/usr/share/cmake-2.8/Modules/CMakeCXXInformation.cmake"
182- "/usr/share/cmake-2.8/Modules/CMakeCommonLanguageInclude.cmake"
183- "/usr/share/cmake-2.8/Modules/CMakeGenericSystem.cmake"
184- "/usr/share/cmake-2.8/Modules/CMakeParseArguments.cmake"
185- "/usr/share/cmake-2.8/Modules/CMakeSystemSpecificInformation.cmake"
186- "/usr/share/cmake-2.8/Modules/Compiler/GNU-C.cmake"
187- "/usr/share/cmake-2.8/Modules/Compiler/GNU-CXX.cmake"
188- "/usr/share/cmake-2.8/Modules/Compiler/GNU.cmake"
189- "/usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake"
190- "/usr/share/cmake-2.8/Modules/FindPackageMessage.cmake"
191- "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU-C.cmake"
192- "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU-CXX.cmake"
193- "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU.cmake"
194- "/usr/share/cmake-2.8/Modules/Platform/Linux.cmake"
195- "/usr/share/cmake-2.8/Modules/Platform/UnixPaths.cmake"
196- )
197-
198-# The corresponding makefile is:
199-SET(CMAKE_MAKEFILE_OUTPUTS
200- "Makefile"
201- "CMakeFiles/cmake.check_cache"
202- )
203-
204-# Byproducts of CMake generate step:
205-SET(CMAKE_MAKEFILE_PRODUCTS
206- "CMakeFiles/CMakeDirectoryInformation.cmake"
207- )
208-
209-# Dependency information for all targets:
210-SET(CMAKE_DEPEND_INFO_FILES
211- "CMakeFiles/daily.dir/DependInfo.cmake"
212- )
213
214=== modified file 'CMakeLists.txt'
215--- CMakeLists.txt 2012-07-05 04:39:46 +0000
216+++ CMakeLists.txt 2012-07-06 03:13:19 +0000
217@@ -1,6 +1,8 @@
218 # Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation
219
220-project (daily)
221+set (NAME daily)
222+
223+project (${NAME})
224 cmake_minimum_required (VERSION 2.6)
225 cmake_policy (VERSION 2.8)
226
227@@ -13,9 +15,9 @@
228 enable_testing()
229
230 set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
231-set (PKGDATADIR "${DATADIR}/daily")
232-set (GETTEXT_PACKAGE "daily")
233-set (RELEASE_NAME "Daily")
234+set (PKGDATADIR "${DATADIR}/${NAME}")
235+set (GETTEXT_PACKAGE "${NAME}")
236+set (RELEASE_NAME "${NAME}")
237 set (VERSION "0.1")
238 set (VERSION_INFO "Release")
239 set (CMAKE_C_FLAGS "-ggdb")
240@@ -54,7 +56,18 @@
241 )
242
243
244-add_executable("daily" ${VALA_C})
245+add_executable(${NAME} ${VALA_C})
246
247 include(GSettings)
248
249+install(TARGETS ${NAME} RUNTIME DESTINATION bin)
250+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/${NAME}.desktop DESTINATION ${DATADIR}/applications)
251+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/new.png DESTINATION ${PKGDATADIR}/images)
252+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/rect.png DESTINATION ${PKGDATADIR}/images)
253+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/daily.png DESTINATION share/icons/hicolor/48x48/apps)
254+
255+
256+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/demo/ubuntu.jpg DESTINATION ${PKGDATADIR}/demo)
257+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/demo/skype.jpg DESTINATION ${PKGDATADIR}/demo)
258+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/demo/spotify.jpg DESTINATION ${PKGDATADIR}/demo)
259+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/demo/runescape.jpg DESTINATION ${PKGDATADIR}/demo)
260
261=== added file 'data/daily.desktop'
262--- data/daily.desktop 1970-01-01 00:00:00 +0000
263+++ data/daily.desktop 2012-07-06 03:13:19 +0000
264@@ -0,0 +1,9 @@
265+[Desktop Entry]
266+Type=Application
267+Name=Daily
268+Icon=daily
269+Comment= An elementary RSS/Atom reader.
270+GenericName= RSS/Atom reader.
271+Exec=daily
272+Terminal=false
273+Categories=Gnome;Gtk;Network;News;
274\ No newline at end of file
275
276=== added file 'data/daily.png'
277Binary files data/daily.png 1970-01-01 00:00:00 +0000 and data/daily.png 2012-07-06 03:13:19 +0000 differ
278=== added directory 'data/demo'
279=== added file 'data/demo/runescape.jpg'
280Binary files data/demo/runescape.jpg 1970-01-01 00:00:00 +0000 and data/demo/runescape.jpg 2012-07-06 03:13:19 +0000 differ
281=== added file 'data/demo/skype.jpg'
282Binary files data/demo/skype.jpg 1970-01-01 00:00:00 +0000 and data/demo/skype.jpg 2012-07-06 03:13:19 +0000 differ
283=== added file 'data/demo/spotify.jpg'
284Binary files data/demo/spotify.jpg 1970-01-01 00:00:00 +0000 and data/demo/spotify.jpg 2012-07-06 03:13:19 +0000 differ
285=== added file 'data/demo/ubuntu.jpg'
286Binary files data/demo/ubuntu.jpg 1970-01-01 00:00:00 +0000 and data/demo/ubuntu.jpg 2012-07-06 03:13:19 +0000 differ
287=== removed directory 'data/icons'
288=== removed file 'data/icons/list-add.svg'
289--- data/icons/list-add.svg 2012-07-05 04:39:46 +0000
290+++ data/icons/list-add.svg 1970-01-01 00:00:00 +0000
291@@ -1,64 +0,0 @@
292-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
293-<!-- Created with Inkscape (http://www.inkscape.org/) -->
294-<svg
295- xmlns:svg="http://www.w3.org/2000/svg"
296- xmlns="http://www.w3.org/2000/svg"
297- xmlns:xlink="http://www.w3.org/1999/xlink"
298- version="1.0"
299- width="16"
300- height="16"
301- id="svg3247">
302- <defs
303- id="defs3249">
304- <linearGradient
305- id="linearGradient2264">
306- <stop
307- id="stop2266"
308- style="stop-color:#d7e866;stop-opacity:1"
309- offset="0" />
310- <stop
311- id="stop2268"
312- style="stop-color:#8cab2a;stop-opacity:1"
313- offset="1" />
314- </linearGradient>
315- <linearGradient
316- x1="24.103895"
317- y1="15.180944"
318- x2="24.103895"
319- y2="34.224861"
320- id="linearGradient2401"
321- xlink:href="#linearGradient2264"
322- gradientUnits="userSpaceOnUse"
323- gradientTransform="matrix(0.709648,0,0,0.7053673,-8.9450299,-8.2362938)" />
324- <linearGradient
325- id="linearGradient3180">
326- <stop
327- id="stop3182"
328- style="stop-color:#ffffff;stop-opacity:1"
329- offset="0" />
330- <stop
331- id="stop3184"
332- style="stop-color:#ffffff;stop-opacity:0"
333- offset="1" />
334- </linearGradient>
335- <linearGradient
336- x1="8"
337- y1="0"
338- x2="8"
339- y2="16.004318"
340- id="linearGradient3190"
341- xlink:href="#linearGradient3180"
342- gradientUnits="userSpaceOnUse" />
343- </defs>
344- <g
345- id="layer1">
346- <path
347- d="M 5.5,5.5 L 5.5,0.5 L 10.5,0.5 L 10.5,5.5 L 15.5,5.5 L 15.5,10.5 L 10.5,10.5 L 10.5,15.5 L 5.5,15.5 L 5.5,10.5 L 0.5,10.5 L 0.5,5.5 L 5.5,5.5 z"
348- id="path2262"
349- style="fill:url(#linearGradient2401);fill-opacity:1;fill-rule:evenodd;stroke:#699536;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
350- <path
351- d="M 6.5,1.5 L 6.5,5.5 C 6.495191,6.0502805 6.0502805,6.495191 5.5,6.5 L 1.5,6.5 L 1.5,9.5 L 5.5,9.5 C 6.0502805,9.504809 6.495191,9.9497195 6.5,10.5 L 6.5,14.5 L 9.5,14.5 L 9.5,10.5 C 9.504809,9.9497195 9.9497195,9.504809 10.5,9.5 L 14.5,9.5 L 14.5,6.5 L 10.5,6.5 C 9.9497195,6.495191 9.504809,6.0502805 9.5,5.5 L 9.5,1.5 L 6.5,1.5 z"
352- id="path3188"
353- style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3190);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
354- </g>
355-</svg>
356
357=== removed file 'data/icons/view-list-details-symbolic.svg'
358--- data/icons/view-list-details-symbolic.svg 2012-07-05 04:39:46 +0000
359+++ data/icons/view-list-details-symbolic.svg 1970-01-01 00:00:00 +0000
360@@ -1,84 +0,0 @@
361-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
362-<!-- Created with Inkscape (http://www.inkscape.org/) -->
363-
364-<svg
365- xmlns:dc="http://purl.org/dc/elements/1.1/"
366- xmlns:cc="http://creativecommons.org/ns#"
367- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
368- xmlns:svg="http://www.w3.org/2000/svg"
369- xmlns="http://www.w3.org/2000/svg"
370- xmlns:xlink="http://www.w3.org/1999/xlink"
371- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
372- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
373- version="1.0"
374- width="16"
375- height="16"
376- id="svg3196"
377- sodipodi:version="0.32"
378- inkscape:version="0.47 r22583"
379- sodipodi:docname="view-list-details-symbolic.svg"
380- inkscape:output_extension="org.inkscape.output.svg.inkscape">
381- <metadata
382- id="metadata11">
383- <rdf:RDF>
384- <cc:Work
385- rdf:about="">
386- <dc:format>image/svg+xml</dc:format>
387- <dc:type
388- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
389- <dc:title></dc:title>
390- </cc:Work>
391- </rdf:RDF>
392- </metadata>
393- <sodipodi:namedview
394- inkscape:window-height="706"
395- inkscape:window-width="640"
396- inkscape:pageshadow="2"
397- inkscape:pageopacity="0.0"
398- guidetolerance="10.0"
399- gridtolerance="10.0"
400- objecttolerance="10.0"
401- borderopacity="1.0"
402- bordercolor="#666666"
403- pagecolor="#ffffff"
404- id="base"
405- showgrid="false"
406- inkscape:zoom="7.3362329"
407- inkscape:cx="12"
408- inkscape:cy="11.903614"
409- inkscape:window-x="399"
410- inkscape:window-y="49"
411- inkscape:current-layer="svg3196"
412- inkscape:window-maximized="0" />
413- <defs
414- id="defs3198">
415- <linearGradient
416- id="linearGradient3587-6-5">
417- <stop
418- id="stop3589-9-2"
419- style="stop-color:#000000;stop-opacity:1"
420- offset="0" />
421- <stop
422- id="stop3591-7-4"
423- style="stop-color:#363636;stop-opacity:1"
424- offset="1" />
425- </linearGradient>
426- <linearGradient
427- x1="1.3333321"
428- y1="6.6666665"
429- x2="1.3333321"
430- y2="33.333332"
431- id="linearGradient2422"
432- xlink:href="#linearGradient3587-6-5"
433- gradientUnits="userSpaceOnUse"
434- gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
435- </defs>
436- <path
437- d="m 2,6.5 12,0 m -12,-3 12,0 m -12,9 12,0 m -12,-3 12,0"
438- id="path2407"
439- style="opacity:0.7;fill:none;stroke:url(#linearGradient2422);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
440- <path
441- d="m 2,7.5 12,0 m -12,-3 12,0 m -12,9 12,0 m -12,-3 12,0"
442- id="path2424"
443- style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
444-</svg>
445
446=== removed file 'data/icons/view-list-icons-symbolic.svg'
447--- data/icons/view-list-icons-symbolic.svg 2012-07-05 04:39:46 +0000
448+++ data/icons/view-list-icons-symbolic.svg 1970-01-01 00:00:00 +0000
449@@ -1,159 +0,0 @@
450-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
451-<!-- Created with Inkscape (http://www.inkscape.org/) -->
452-
453-<svg
454- xmlns:dc="http://purl.org/dc/elements/1.1/"
455- xmlns:cc="http://creativecommons.org/ns#"
456- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
457- xmlns:svg="http://www.w3.org/2000/svg"
458- xmlns="http://www.w3.org/2000/svg"
459- xmlns:xlink="http://www.w3.org/1999/xlink"
460- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
461- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
462- version="1.0"
463- width="16"
464- height="16"
465- id="svg3196"
466- sodipodi:version="0.32"
467- inkscape:version="0.47 r22583"
468- sodipodi:docname="view-list-icons-symbolic.svg"
469- inkscape:output_extension="org.inkscape.output.svg.inkscape">
470- <metadata
471- id="metadata20">
472- <rdf:RDF>
473- <cc:Work
474- rdf:about="">
475- <dc:format>image/svg+xml</dc:format>
476- <dc:type
477- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
478- <dc:title></dc:title>
479- </cc:Work>
480- </rdf:RDF>
481- </metadata>
482- <sodipodi:namedview
483- inkscape:window-height="706"
484- inkscape:window-width="640"
485- inkscape:pageshadow="2"
486- inkscape:pageopacity="0.0"
487- guidetolerance="10.0"
488- gridtolerance="10.0"
489- objecttolerance="10.0"
490- borderopacity="1.0"
491- bordercolor="#666666"
492- pagecolor="#ffffff"
493- id="base"
494- showgrid="false"
495- inkscape:zoom="7.3362329"
496- inkscape:cx="12"
497- inkscape:cy="11.903614"
498- inkscape:window-x="399"
499- inkscape:window-y="49"
500- inkscape:current-layer="svg3196"
501- inkscape:window-maximized="0" />
502- <defs
503- id="defs3198">
504- <linearGradient
505- id="linearGradient3587-6-5">
506- <stop
507- id="stop3589-9-2"
508- style="stop-color:#000000;stop-opacity:1"
509- offset="0" />
510- <stop
511- id="stop3591-7-4"
512- style="stop-color:#363636;stop-opacity:1"
513- offset="1" />
514- </linearGradient>
515- <linearGradient
516- x1="26.045763"
517- y1="9.6223383"
518- x2="26.045763"
519- y2="19.490837"
520- id="linearGradient3189"
521- xlink:href="#linearGradient3587-6-5"
522- gradientUnits="userSpaceOnUse"
523- gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
524- <linearGradient
525- x1="26.045763"
526- y1="9.6223383"
527- x2="26.045763"
528- y2="19.490837"
529- id="linearGradient3203"
530- xlink:href="#linearGradient3587-6-5"
531- gradientUnits="userSpaceOnUse"
532- gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
533- <linearGradient
534- x1="26.045763"
535- y1="9.6223383"
536- x2="26.045763"
537- y2="19.490837"
538- id="linearGradient3207"
539- xlink:href="#linearGradient3587-6-5"
540- gradientUnits="userSpaceOnUse"
541- gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
542- <linearGradient
543- x1="26.045763"
544- y1="9.6223383"
545- x2="26.045763"
546- y2="19.490837"
547- id="linearGradient3211"
548- xlink:href="#linearGradient3587-6-5"
549- gradientUnits="userSpaceOnUse"
550- gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
551- </defs>
552- <rect
553- width="3"
554- height="3"
555- x="10.5"
556- y="4.5"
557- id="rect3213"
558- style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
559- <rect
560- width="3"
561- height="3"
562- x="2.5"
563- y="4.5"
564- id="rect3215"
565- style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
566- <rect
567- width="3"
568- height="3"
569- x="10.5"
570- y="11.5"
571- id="rect3217"
572- style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
573- <rect
574- width="3"
575- height="3"
576- x="2.5"
577- y="11.5"
578- id="rect3219"
579- style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
580- <rect
581- width="3"
582- height="3"
583- x="10.5"
584- y="3.5"
585- id="rect3187"
586- style="opacity:0.7;fill:none;stroke:url(#linearGradient3189);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
587- <rect
588- width="3"
589- height="3"
590- x="2.5"
591- y="3.5"
592- id="rect3201"
593- style="opacity:0.7;fill:none;stroke:url(#linearGradient3203);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
594- <rect
595- width="3"
596- height="3"
597- x="10.5"
598- y="10.5"
599- id="rect3205"
600- style="opacity:0.7;fill:none;stroke:url(#linearGradient3207);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
601- <rect
602- width="3"
603- height="3"
604- x="2.5"
605- y="10.5"
606- id="rect3209"
607- style="opacity:0.7;fill:none;stroke:url(#linearGradient3211);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
608-</svg>
609
610=== added directory 'data/images'
611=== added file 'data/images/new.png'
612Binary files data/images/new.png 1970-01-01 00:00:00 +0000 and data/images/new.png 2012-07-06 03:13:19 +0000 differ
613=== added file 'data/images/rect.png'
614Binary files data/images/rect.png 1970-01-01 00:00:00 +0000 and data/images/rect.png 2012-07-06 03:13:19 +0000 differ
615=== removed file 'data/new.png'
616Binary files data/new.png 2012-07-05 04:39:46 +0000 and data/new.png 1970-01-01 00:00:00 +0000 differ
617=== removed file 'data/rect.png'
618Binary files data/rect.png 2012-06-27 04:30:09 +0000 and data/rect.png 1970-01-01 00:00:00 +0000 differ
619=== removed file 'data/runescape.jpg'
620Binary files data/runescape.jpg 2012-07-02 20:32:13 +0000 and data/runescape.jpg 1970-01-01 00:00:00 +0000 differ
621=== removed file 'data/skype.jpg'
622Binary files data/skype.jpg 2012-07-02 20:32:13 +0000 and data/skype.jpg 1970-01-01 00:00:00 +0000 differ
623=== removed file 'data/spotify.jpg'
624Binary files data/spotify.jpg 2012-07-02 20:32:13 +0000 and data/spotify.jpg 1970-01-01 00:00:00 +0000 differ
625=== removed file 'data/ubuntu.jpg'
626Binary files data/ubuntu.jpg 2012-07-02 20:32:13 +0000 and data/ubuntu.jpg 1970-01-01 00:00:00 +0000 differ
627=== modified file 'src/Content.vala'
628--- src/Content.vala 2012-07-05 04:39:46 +0000
629+++ src/Content.vala 2012-07-06 03:13:19 +0000
630@@ -41,6 +41,7 @@
631 public Box left_list_box;
632 public Box content_box;
633 private signal void update_image ();
634+ private const string build_pkg_data_dir = Constants.PKGDATADIR;
635
636 public ContentItem (string? image_path, string title, string author, string date, string site, string content, string url){
637
638@@ -63,7 +64,7 @@
639
640 Image image_with_new = new Image ();
641 Image image_without_new = new Image ();
642- var pix = new Gdk.Pixbuf.from_file ("../data/rect.png");
643+ var pix = new Gdk.Pixbuf.from_file (build_pkg_data_dir+"/images/rect.png");
644
645 try {
646 if (image_path != null){
647@@ -79,7 +80,7 @@
648
649 try {
650
651- Gdk.Pixbuf img = new Gdk.Pixbuf.from_file ("../data/new.png");
652+ Gdk.Pixbuf img = new Gdk.Pixbuf.from_file (build_pkg_data_dir+"/images/new.png");
653 img.composite (pix, 3, 3, 37, 37, 0, 0, 1, 1, Gdk.InterpType.BILINEAR, 255);
654 image_with_new = new Image.from_pixbuf (pix);
655
656@@ -187,6 +188,9 @@
657 title.get_style_context ().add_class ("title");
658 title.get_style_context ().add_provider (css, 10000);
659
660+ var title_event = new EventBox ();
661+ title_event.add (title);
662+
663 var post_info = new Label (post_info ());
664 post_info.set_alignment (0, 0);
665 post_info.get_style_context ().add_class ("post_info");
666@@ -205,7 +209,7 @@
667 content_box.pack_start (image_event);
668 content_box.pack_start (content);
669
670- main_box.pack_start (title, false);
671+ main_box.pack_start (title_event, false);
672 main_box.pack_start (post_info, false);
673 main_box.pack_start (content_box, false);
674
675
676=== modified file 'src/Main.vala'
677--- src/Main.vala 2012-07-05 04:39:46 +0000
678+++ src/Main.vala 2012-07-06 03:13:19 +0000
679@@ -49,7 +49,7 @@
680
681 app_years = "2012";
682 application_id = "org.pantheon.daily";
683- //app_icon = "";
684+ app_icon = "daily";
685 app_launcher = "daily.desktop";
686
687 main_url = "https://launchpad.net/daily";
688@@ -98,7 +98,7 @@
689
690 window = new Local.LightWindow ();
691 window.title = "Daily";
692- //window.icon_name = "";
693+ window.icon_name = "daily";
694 window.set_default_size(810, 510);
695 window.window_position = Gtk.WindowPosition.CENTER;
696 window.destroy.connect (Gtk.main_quit);
697@@ -106,12 +106,12 @@
698 var contents = new Content ();
699 contents.add (new ContentItem (null, "Game Store Gameolith Expands Horizons, No Longer Linux-Only", "", "", "", "", ""));
700 contents.add (new ContentItem (null, "Title", "DavyS", "june 15, 2012", "elementaryOS", "Lorem Ipsum", ""));
701- contents.add (new ContentItem ("../data/ubuntu.jpg", "Ubuntu Launch App Creation Competition With Big Prizes Up For Grabs", "Joey Sneddon", "june 15, 2012", "OMG! Ubuntu!", "Could you create an entirely new application for Ubuntu in just three weeks?", "http://www.omgubuntu.co.uk/2012/06/ubuntu-launch-app-creation-competition-with-big-prizes-up-for-grabs"));
702- contents.add (new ContentItem ("../data/ubuntu.jpg", "Ubuntu Launch App Creation Competition With Big Prizes Up For Grabs", "Joey Sneddon", "june 15, 2012", "OMG! Ubuntu!", "Ubuntu Launch App creation Competition", "http://www.omgubuntu.co.uk/2012/06/ubuntu-launch-app-creation-competition-with-big-prizes-up-for-grabs"));
703- contents.add (new ContentItem ("../data/skype.jpg", "Skype for linux loses bet hint tag", "DavyS", "june 15, 2012", "elementaryOS", "After more than 3 years in development Skype for Linux has shaken off its beta tag and made a substantial new release.\n\nBumping the app version from 2.2 all the way to 4.0, Skype have nicknamed the release ‘Four Rooms for Improvement,’ becasue, they say, that this release ‘finally [fills] the gap with our other desktop clients and we are now making many of the latest Skype features, as well as a lot of UI improvements, available to our penguin lovers.’", "http://www.omgubuntu.co.uk/2012/06/skype-for-linux-loses-beta-tag-bumps-to-4-0"));
704- contents.add (new ContentItem ("../data/runescape.jpg", "Add RuneScape Wikia Lens to Ubuntu 12.04", "DavyS", "june 15, 2012", "elementaryOS", "If you still play RuneScape – one of the worlds most popular free MMORPGs – then you may find yourself searching the dedicated Runescape ‘Wikia’ site from time to time.\n\nA new Unity lens, created by Runescaper Ryan McClure, brings that Wikia to the Ubuntu desktop. ", "http://www.omgubuntu.co.uk/2012/06/how-to-add-runescape-wikia-lens-to-ubuntu-12-04"));
705- contents.add (new ContentItem ("../data/spotify.jpg", "Fix Spotify Repo Key Change Error", "DavyS", "june 15, 2012", "elementaryOS", "Spotify have changed the key used to authenticate their Linux repository – meaning you will need to update it inorder to continue getting updates.\n\nUnless checking for system updates using the Terminal, you won’t be warned about the change. Ubuntu’s Update Manager application will continue to ‘update’ as normal, but not give any indication that there is an error.\n\nThe issue only affects those who have added the official Spotify for Linux repo to their Software Sources. Users of Spotify via WINE are not affected.\n\nLeaving the error unfixed will mean that Spotify updates will not be detected, downloaded or applied.", "http://www.omgubuntu.co.uk/2012/06/how-to-fix-spotify-repo-key-change-error"));
706- contents.add (new ContentItem ("../data/ubuntu.jpg", "Ubuntu Launch App Creation Competition With Big Prizes Up For Grabs", "Joey Sneddon", "june 15, 2012", "OMG! Ubuntu!", "Could you create an entirely new application for Ubuntu in just three weeks? That’s the challenge being put forward by the Ubuntu Development team as they gear up to launch an application creation competition with some awesome prizes up for grabs.From June 18th seasoned and budding developers alike will be given three weeks to create an entirely new app from scratch using the user-friendly Quickly development tool whatever tools and toolkits they like.", "http://www.omgubuntu.co.uk/2012/06/ubuntu-launch-app-creation-competition-with-big-prizes-up-for-grabs"));
707+ contents.add (new ContentItem (build_pkg_data_dir+"/demo/ubuntu.jpg", "Ubuntu Launch App Creation Competition With Big Prizes Up For Grabs", "Joey Sneddon", "june 15, 2012", "OMG! Ubuntu!", "Could you create an entirely new application for Ubuntu in just three weeks?", "http://www.omgubuntu.co.uk/2012/06/ubuntu-launch-app-creation-competition-with-big-prizes-up-for-grabs"));
708+ contents.add (new ContentItem (build_pkg_data_dir+"/demo/ubuntu.jpg", "Ubuntu Launch App Creation Competition With Big Prizes Up For Grabs", "Joey Sneddon", "june 15, 2012", "OMG! Ubuntu!", "Ubuntu Launch App creation Competition", "http://www.omgubuntu.co.uk/2012/06/ubuntu-launch-app-creation-competition-with-big-prizes-up-for-grabs"));
709+ contents.add (new ContentItem (build_pkg_data_dir+"/demo/skype.jpg", "Skype for linux loses bet hint tag", "DavyS", "june 15, 2012", "elementaryOS", "After more than 3 years in development Skype for Linux has shaken off its beta tag and made a substantial new release.\n\nBumping the app version from 2.2 all the way to 4.0, Skype have nicknamed the release ‘Four Rooms for Improvement,’ becasue, they say, that this release ‘finally [fills] the gap with our other desktop clients and we are now making many of the latest Skype features, as well as a lot of UI improvements, available to our penguin lovers.’", "http://www.omgubuntu.co.uk/2012/06/skype-for-linux-loses-beta-tag-bumps-to-4-0"));
710+ contents.add (new ContentItem (build_pkg_data_dir+"/demo/runescape.jpg", "Add RuneScape Wikia Lens to Ubuntu 12.04", "DavyS", "june 15, 2012", "elementaryOS", "If you still play RuneScape – one of the worlds most popular free MMORPGs – then you may find yourself searching the dedicated Runescape ‘Wikia’ site from time to time.\n\nA new Unity lens, created by Runescaper Ryan McClure, brings that Wikia to the Ubuntu desktop. ", "http://www.omgubuntu.co.uk/2012/06/how-to-add-runescape-wikia-lens-to-ubuntu-12-04"));
711+ contents.add (new ContentItem (build_pkg_data_dir+"/demo/spotify.jpg", "Fix Spotify Repo Key Change Error", "DavyS", "june 15, 2012", "elementaryOS", "Spotify have changed the key used to authenticate their Linux repository – meaning you will need to update it inorder to continue getting updates.\n\nUnless checking for system updates using the Terminal, you won’t be warned about the change. Ubuntu’s Update Manager application will continue to ‘update’ as normal, but not give any indication that there is an error.\n\nThe issue only affects those who have added the official Spotify for Linux repo to their Software Sources. Users of Spotify via WINE are not affected.\n\nLeaving the error unfixed will mean that Spotify updates will not be detected, downloaded or applied.", "http://www.omgubuntu.co.uk/2012/06/how-to-fix-spotify-repo-key-change-error"));
712+ contents.add (new ContentItem (build_pkg_data_dir+"/demo/ubuntu.jpg", "Ubuntu Launch App Creation Competition With Big Prizes Up For Grabs", "Joey Sneddon", "june 15, 2012", "OMG! Ubuntu!", "Could you create an entirely new application for Ubuntu in just three weeks? That’s the challenge being put forward by the Ubuntu Development team as they gear up to launch an application creation competition with some awesome prizes up for grabs.From June 18th seasoned and budding developers alike will be given three weeks to create an entirely new app from scratch using the user-friendly Quickly development tool whatever tools and toolkits they like.", "http://www.omgubuntu.co.uk/2012/06/ubuntu-launch-app-creation-competition-with-big-prizes-up-for-grabs"));
713
714
715 var grid_view = new GridView (contents);
716@@ -150,7 +150,6 @@
717 //need fix multiple instances!!
718
719 var pop = new Daily.Widgets.PopOver ();
720- pop.set_parent_pop (window);
721 var content = pop.get_content_area ();
722 content.set_size_request (300, 200);
723

Subscribers

People subscribed via source and target branches

to all changes: