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
=== removed file 'CMakeFiles/CMakeCCompiler.cmake'
--- CMakeFiles/CMakeCCompiler.cmake 2012-06-22 21:31:12 +0000
+++ CMakeFiles/CMakeCCompiler.cmake 1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
1SET(CMAKE_C_COMPILER "/usr/bin/gcc")
2SET(CMAKE_C_COMPILER_ARG1 "")
3SET(CMAKE_C_COMPILER_ID "GNU")
4SET(CMAKE_C_PLATFORM_ID "Linux")
5
6SET(CMAKE_AR "/usr/bin/ar")
7SET(CMAKE_RANLIB "/usr/bin/ranlib")
8SET(CMAKE_LINKER "/usr/bin/ld")
9SET(CMAKE_COMPILER_IS_GNUCC 1)
10SET(CMAKE_C_COMPILER_LOADED 1)
11SET(CMAKE_COMPILER_IS_MINGW )
12SET(CMAKE_COMPILER_IS_CYGWIN )
13IF(CMAKE_COMPILER_IS_CYGWIN)
14 SET(CYGWIN 1)
15 SET(UNIX 1)
16ENDIF(CMAKE_COMPILER_IS_CYGWIN)
17
18SET(CMAKE_C_COMPILER_ENV_VAR "CC")
19
20IF(CMAKE_COMPILER_IS_MINGW)
21 SET(MINGW 1)
22ENDIF(CMAKE_COMPILER_IS_MINGW)
23SET(CMAKE_C_COMPILER_ID_RUN 1)
24SET(CMAKE_C_SOURCE_FILE_EXTENSIONS c)
25SET(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
26SET(CMAKE_C_LINKER_PREFERENCE 10)
27
28# Save compiler ABI information.
29SET(CMAKE_C_SIZEOF_DATA_PTR "4")
30SET(CMAKE_C_COMPILER_ABI "ELF")
31SET(CMAKE_C_LIBRARY_ARCHITECTURE "i386-linux-gnu")
32
33IF(CMAKE_C_SIZEOF_DATA_PTR)
34 SET(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}")
35ENDIF(CMAKE_C_SIZEOF_DATA_PTR)
36
37IF(CMAKE_C_COMPILER_ABI)
38 SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}")
39ENDIF(CMAKE_C_COMPILER_ABI)
40
41IF(CMAKE_C_LIBRARY_ARCHITECTURE)
42 SET(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
43ENDIF()
44
45SET(CMAKE_C_HAS_ISYSROOT "")
46
47
48SET(CMAKE_C_IMPLICIT_LINK_LIBRARIES "c")
49SET(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")
500
=== removed file 'CMakeFiles/CMakeCXXCompiler.cmake'
--- CMakeFiles/CMakeCXXCompiler.cmake 2012-06-22 21:31:12 +0000
+++ CMakeFiles/CMakeCXXCompiler.cmake 1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
1SET(CMAKE_CXX_COMPILER "/usr/bin/c++")
2SET(CMAKE_CXX_COMPILER_ARG1 "")
3SET(CMAKE_CXX_COMPILER_ID "GNU")
4SET(CMAKE_CXX_PLATFORM_ID "Linux")
5
6SET(CMAKE_AR "/usr/bin/ar")
7SET(CMAKE_RANLIB "/usr/bin/ranlib")
8SET(CMAKE_LINKER "/usr/bin/ld")
9SET(CMAKE_COMPILER_IS_GNUCXX 1)
10SET(CMAKE_CXX_COMPILER_LOADED 1)
11SET(CMAKE_COMPILER_IS_MINGW )
12SET(CMAKE_COMPILER_IS_CYGWIN )
13IF(CMAKE_COMPILER_IS_CYGWIN)
14 SET(CYGWIN 1)
15 SET(UNIX 1)
16ENDIF(CMAKE_COMPILER_IS_CYGWIN)
17
18SET(CMAKE_CXX_COMPILER_ENV_VAR "CXX")
19
20IF(CMAKE_COMPILER_IS_MINGW)
21 SET(MINGW 1)
22ENDIF(CMAKE_COMPILER_IS_MINGW)
23SET(CMAKE_CXX_COMPILER_ID_RUN 1)
24SET(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC)
25SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;CPP)
26SET(CMAKE_CXX_LINKER_PREFERENCE 30)
27SET(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1)
28
29# Save compiler ABI information.
30SET(CMAKE_CXX_SIZEOF_DATA_PTR "4")
31SET(CMAKE_CXX_COMPILER_ABI "ELF")
32SET(CMAKE_CXX_LIBRARY_ARCHITECTURE "i386-linux-gnu")
33
34IF(CMAKE_CXX_SIZEOF_DATA_PTR)
35 SET(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}")
36ENDIF(CMAKE_CXX_SIZEOF_DATA_PTR)
37
38IF(CMAKE_CXX_COMPILER_ABI)
39 SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}")
40ENDIF(CMAKE_CXX_COMPILER_ABI)
41
42IF(CMAKE_CXX_LIBRARY_ARCHITECTURE)
43 SET(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
44ENDIF()
45
46SET(CMAKE_CXX_HAS_ISYSROOT "")
47
48
49SET(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "stdc++;m;c")
50SET(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")
510
=== removed file 'CMakeFiles/CMakeDirectoryInformation.cmake'
--- CMakeFiles/CMakeDirectoryInformation.cmake 2012-06-22 21:31:12 +0000
+++ CMakeFiles/CMakeDirectoryInformation.cmake 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
1# CMAKE generated file: DO NOT EDIT!
2# Generated by "Unix Makefiles" Generator, CMake Version 2.8
3
4# Relative path conversion top directories.
5SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/kenny/appdevcontest/daily/code")
6SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/kenny/appdevcontest/daily/code")
7
8# Force unix paths in dependencies.
9SET(CMAKE_FORCE_UNIX_PATHS 1)
10
11# The C and CXX include file search paths:
12SET(CMAKE_C_INCLUDE_PATH
13 "."
14 )
15SET(CMAKE_CXX_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})
16SET(CMAKE_Fortran_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})
17SET(CMAKE_ASM_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})
18
19# The C and CXX include file regular expressions for this directory.
20SET(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$")
21SET(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$")
22SET(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN})
23SET(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN})
240
=== removed file 'CMakeFiles/CMakeSystem.cmake'
--- CMakeFiles/CMakeSystem.cmake 2012-06-22 21:31:12 +0000
+++ CMakeFiles/CMakeSystem.cmake 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
1
2
3SET(CMAKE_SYSTEM "Linux-3.2.0-25-generic-pae")
4SET(CMAKE_SYSTEM_NAME "Linux")
5SET(CMAKE_SYSTEM_VERSION "3.2.0-25-generic-pae")
6SET(CMAKE_SYSTEM_PROCESSOR "i686")
7
8SET(CMAKE_HOST_SYSTEM "Linux-3.2.0-25-generic-pae")
9SET(CMAKE_HOST_SYSTEM_NAME "Linux")
10SET(CMAKE_HOST_SYSTEM_VERSION "3.2.0-25-generic-pae")
11SET(CMAKE_HOST_SYSTEM_PROCESSOR "i686")
12
13SET(CMAKE_CROSSCOMPILING "FALSE")
14
15SET(CMAKE_SYSTEM_LOADED 1)
160
=== removed file 'CMakeFiles/Makefile.cmake'
--- CMakeFiles/Makefile.cmake 2012-06-23 00:49:33 +0000
+++ CMakeFiles/Makefile.cmake 1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
1# CMAKE generated file: DO NOT EDIT!
2# Generated by "Unix Makefiles" Generator, CMake Version 2.8
3
4# The generator used is:
5SET(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
6
7# The top level Makefile was generated from the following files:
8SET(CMAKE_MAKEFILE_DEPENDS
9 "CMakeCache.txt"
10 "CMakeFiles/CMakeCCompiler.cmake"
11 "CMakeFiles/CMakeCXXCompiler.cmake"
12 "CMakeFiles/CMakeSystem.cmake"
13 "CMakeLists.txt"
14 "cmake/FindVala.cmake"
15 "cmake/GSettings.cmake"
16 "cmake/ParseArguments.cmake"
17 "cmake/ValaPrecompile.cmake"
18 "src/Config.vala.cmake"
19 "/usr/share/cmake-2.8/Modules/CMakeCInformation.cmake"
20 "/usr/share/cmake-2.8/Modules/CMakeCXXInformation.cmake"
21 "/usr/share/cmake-2.8/Modules/CMakeCommonLanguageInclude.cmake"
22 "/usr/share/cmake-2.8/Modules/CMakeGenericSystem.cmake"
23 "/usr/share/cmake-2.8/Modules/CMakeParseArguments.cmake"
24 "/usr/share/cmake-2.8/Modules/CMakeSystemSpecificInformation.cmake"
25 "/usr/share/cmake-2.8/Modules/Compiler/GNU-C.cmake"
26 "/usr/share/cmake-2.8/Modules/Compiler/GNU-CXX.cmake"
27 "/usr/share/cmake-2.8/Modules/Compiler/GNU.cmake"
28 "/usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake"
29 "/usr/share/cmake-2.8/Modules/FindPackageMessage.cmake"
30 "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU-C.cmake"
31 "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU-CXX.cmake"
32 "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU.cmake"
33 "/usr/share/cmake-2.8/Modules/Platform/Linux.cmake"
34 "/usr/share/cmake-2.8/Modules/Platform/UnixPaths.cmake"
35 )
36
37# The corresponding makefile is:
38SET(CMAKE_MAKEFILE_OUTPUTS
39 "Makefile"
40 "CMakeFiles/cmake.check_cache"
41 )
42
43# Byproducts of CMake generate step:
44SET(CMAKE_MAKEFILE_PRODUCTS
45 "CMakeFiles/CMakeDirectoryInformation.cmake"
46 )
47
48# Dependency information for all targets:
49SET(CMAKE_DEPEND_INFO_FILES
50 "CMakeFiles/daily.dir/DependInfo.cmake"
51 )
520
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-07-05 04:39:46 +0000
+++ CMakeLists.txt 2012-07-06 03:13:19 +0000
@@ -1,6 +1,8 @@
1# Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation1# Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation
22
3project (daily)3set (NAME daily)
4
5project (${NAME})
4cmake_minimum_required (VERSION 2.6)6cmake_minimum_required (VERSION 2.6)
5cmake_policy (VERSION 2.8)7cmake_policy (VERSION 2.8)
68
@@ -13,9 +15,9 @@
13enable_testing()15enable_testing()
1416
15set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")17set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
16set (PKGDATADIR "${DATADIR}/daily")18set (PKGDATADIR "${DATADIR}/${NAME}")
17set (GETTEXT_PACKAGE "daily")19set (GETTEXT_PACKAGE "${NAME}")
18set (RELEASE_NAME "Daily")20set (RELEASE_NAME "${NAME}")
19set (VERSION "0.1")21set (VERSION "0.1")
20set (VERSION_INFO "Release")22set (VERSION_INFO "Release")
21set (CMAKE_C_FLAGS "-ggdb")23set (CMAKE_C_FLAGS "-ggdb")
@@ -54,7 +56,18 @@
54 )56 )
5557
5658
57add_executable("daily" ${VALA_C})59add_executable(${NAME} ${VALA_C})
5860
59include(GSettings)61include(GSettings)
6062
63install(TARGETS ${NAME} RUNTIME DESTINATION bin)
64install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/${NAME}.desktop DESTINATION ${DATADIR}/applications)
65install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/new.png DESTINATION ${PKGDATADIR}/images)
66install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/rect.png DESTINATION ${PKGDATADIR}/images)
67install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/daily.png DESTINATION share/icons/hicolor/48x48/apps)
68
69
70install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/demo/ubuntu.jpg DESTINATION ${PKGDATADIR}/demo)
71install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/demo/skype.jpg DESTINATION ${PKGDATADIR}/demo)
72install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/demo/spotify.jpg DESTINATION ${PKGDATADIR}/demo)
73install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/demo/runescape.jpg DESTINATION ${PKGDATADIR}/demo)
6174
=== added file 'data/daily.desktop'
--- data/daily.desktop 1970-01-01 00:00:00 +0000
+++ data/daily.desktop 2012-07-06 03:13:19 +0000
@@ -0,0 +1,9 @@
1[Desktop Entry]
2Type=Application
3Name=Daily
4Icon=daily
5Comment= An elementary RSS/Atom reader.
6GenericName= RSS/Atom reader.
7Exec=daily
8Terminal=false
9Categories=Gnome;Gtk;Network;News;
0\ No newline at end of file10\ No newline at end of file
111
=== added file 'data/daily.png'
2Binary files data/daily.png 1970-01-01 00:00:00 +0000 and data/daily.png 2012-07-06 03:13:19 +0000 differ12Binary files data/daily.png 1970-01-01 00:00:00 +0000 and data/daily.png 2012-07-06 03:13:19 +0000 differ
=== added directory 'data/demo'
=== added file 'data/demo/runescape.jpg'
3Binary files data/demo/runescape.jpg 1970-01-01 00:00:00 +0000 and data/demo/runescape.jpg 2012-07-06 03:13:19 +0000 differ13Binary 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
=== added file 'data/demo/skype.jpg'
4Binary files data/demo/skype.jpg 1970-01-01 00:00:00 +0000 and data/demo/skype.jpg 2012-07-06 03:13:19 +0000 differ14Binary 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
=== added file 'data/demo/spotify.jpg'
5Binary files data/demo/spotify.jpg 1970-01-01 00:00:00 +0000 and data/demo/spotify.jpg 2012-07-06 03:13:19 +0000 differ15Binary 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
=== added file 'data/demo/ubuntu.jpg'
6Binary files data/demo/ubuntu.jpg 1970-01-01 00:00:00 +0000 and data/demo/ubuntu.jpg 2012-07-06 03:13:19 +0000 differ16Binary 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
=== removed directory 'data/icons'
=== removed file 'data/icons/list-add.svg'
--- data/icons/list-add.svg 2012-07-05 04:39:46 +0000
+++ data/icons/list-add.svg 1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3<svg
4 xmlns:svg="http://www.w3.org/2000/svg"
5 xmlns="http://www.w3.org/2000/svg"
6 xmlns:xlink="http://www.w3.org/1999/xlink"
7 version="1.0"
8 width="16"
9 height="16"
10 id="svg3247">
11 <defs
12 id="defs3249">
13 <linearGradient
14 id="linearGradient2264">
15 <stop
16 id="stop2266"
17 style="stop-color:#d7e866;stop-opacity:1"
18 offset="0" />
19 <stop
20 id="stop2268"
21 style="stop-color:#8cab2a;stop-opacity:1"
22 offset="1" />
23 </linearGradient>
24 <linearGradient
25 x1="24.103895"
26 y1="15.180944"
27 x2="24.103895"
28 y2="34.224861"
29 id="linearGradient2401"
30 xlink:href="#linearGradient2264"
31 gradientUnits="userSpaceOnUse"
32 gradientTransform="matrix(0.709648,0,0,0.7053673,-8.9450299,-8.2362938)" />
33 <linearGradient
34 id="linearGradient3180">
35 <stop
36 id="stop3182"
37 style="stop-color:#ffffff;stop-opacity:1"
38 offset="0" />
39 <stop
40 id="stop3184"
41 style="stop-color:#ffffff;stop-opacity:0"
42 offset="1" />
43 </linearGradient>
44 <linearGradient
45 x1="8"
46 y1="0"
47 x2="8"
48 y2="16.004318"
49 id="linearGradient3190"
50 xlink:href="#linearGradient3180"
51 gradientUnits="userSpaceOnUse" />
52 </defs>
53 <g
54 id="layer1">
55 <path
56 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"
57 id="path2262"
58 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" />
59 <path
60 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"
61 id="path3188"
62 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" />
63 </g>
64</svg>
650
=== removed file 'data/icons/view-list-details-symbolic.svg'
--- data/icons/view-list-details-symbolic.svg 2012-07-05 04:39:46 +0000
+++ data/icons/view-list-details-symbolic.svg 1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:xlink="http://www.w3.org/1999/xlink"
11 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
12 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
13 version="1.0"
14 width="16"
15 height="16"
16 id="svg3196"
17 sodipodi:version="0.32"
18 inkscape:version="0.47 r22583"
19 sodipodi:docname="view-list-details-symbolic.svg"
20 inkscape:output_extension="org.inkscape.output.svg.inkscape">
21 <metadata
22 id="metadata11">
23 <rdf:RDF>
24 <cc:Work
25 rdf:about="">
26 <dc:format>image/svg+xml</dc:format>
27 <dc:type
28 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
29 <dc:title></dc:title>
30 </cc:Work>
31 </rdf:RDF>
32 </metadata>
33 <sodipodi:namedview
34 inkscape:window-height="706"
35 inkscape:window-width="640"
36 inkscape:pageshadow="2"
37 inkscape:pageopacity="0.0"
38 guidetolerance="10.0"
39 gridtolerance="10.0"
40 objecttolerance="10.0"
41 borderopacity="1.0"
42 bordercolor="#666666"
43 pagecolor="#ffffff"
44 id="base"
45 showgrid="false"
46 inkscape:zoom="7.3362329"
47 inkscape:cx="12"
48 inkscape:cy="11.903614"
49 inkscape:window-x="399"
50 inkscape:window-y="49"
51 inkscape:current-layer="svg3196"
52 inkscape:window-maximized="0" />
53 <defs
54 id="defs3198">
55 <linearGradient
56 id="linearGradient3587-6-5">
57 <stop
58 id="stop3589-9-2"
59 style="stop-color:#000000;stop-opacity:1"
60 offset="0" />
61 <stop
62 id="stop3591-7-4"
63 style="stop-color:#363636;stop-opacity:1"
64 offset="1" />
65 </linearGradient>
66 <linearGradient
67 x1="1.3333321"
68 y1="6.6666665"
69 x2="1.3333321"
70 y2="33.333332"
71 id="linearGradient2422"
72 xlink:href="#linearGradient3587-6-5"
73 gradientUnits="userSpaceOnUse"
74 gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
75 </defs>
76 <path
77 d="m 2,6.5 12,0 m -12,-3 12,0 m -12,9 12,0 m -12,-3 12,0"
78 id="path2407"
79 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" />
80 <path
81 d="m 2,7.5 12,0 m -12,-3 12,0 m -12,9 12,0 m -12,-3 12,0"
82 id="path2424"
83 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" />
84</svg>
850
=== removed file 'data/icons/view-list-icons-symbolic.svg'
--- data/icons/view-list-icons-symbolic.svg 2012-07-05 04:39:46 +0000
+++ data/icons/view-list-icons-symbolic.svg 1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:xlink="http://www.w3.org/1999/xlink"
11 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
12 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
13 version="1.0"
14 width="16"
15 height="16"
16 id="svg3196"
17 sodipodi:version="0.32"
18 inkscape:version="0.47 r22583"
19 sodipodi:docname="view-list-icons-symbolic.svg"
20 inkscape:output_extension="org.inkscape.output.svg.inkscape">
21 <metadata
22 id="metadata20">
23 <rdf:RDF>
24 <cc:Work
25 rdf:about="">
26 <dc:format>image/svg+xml</dc:format>
27 <dc:type
28 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
29 <dc:title></dc:title>
30 </cc:Work>
31 </rdf:RDF>
32 </metadata>
33 <sodipodi:namedview
34 inkscape:window-height="706"
35 inkscape:window-width="640"
36 inkscape:pageshadow="2"
37 inkscape:pageopacity="0.0"
38 guidetolerance="10.0"
39 gridtolerance="10.0"
40 objecttolerance="10.0"
41 borderopacity="1.0"
42 bordercolor="#666666"
43 pagecolor="#ffffff"
44 id="base"
45 showgrid="false"
46 inkscape:zoom="7.3362329"
47 inkscape:cx="12"
48 inkscape:cy="11.903614"
49 inkscape:window-x="399"
50 inkscape:window-y="49"
51 inkscape:current-layer="svg3196"
52 inkscape:window-maximized="0" />
53 <defs
54 id="defs3198">
55 <linearGradient
56 id="linearGradient3587-6-5">
57 <stop
58 id="stop3589-9-2"
59 style="stop-color:#000000;stop-opacity:1"
60 offset="0" />
61 <stop
62 id="stop3591-7-4"
63 style="stop-color:#363636;stop-opacity:1"
64 offset="1" />
65 </linearGradient>
66 <linearGradient
67 x1="26.045763"
68 y1="9.6223383"
69 x2="26.045763"
70 y2="19.490837"
71 id="linearGradient3189"
72 xlink:href="#linearGradient3587-6-5"
73 gradientUnits="userSpaceOnUse"
74 gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
75 <linearGradient
76 x1="26.045763"
77 y1="9.6223383"
78 x2="26.045763"
79 y2="19.490837"
80 id="linearGradient3203"
81 xlink:href="#linearGradient3587-6-5"
82 gradientUnits="userSpaceOnUse"
83 gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
84 <linearGradient
85 x1="26.045763"
86 y1="9.6223383"
87 x2="26.045763"
88 y2="19.490837"
89 id="linearGradient3207"
90 xlink:href="#linearGradient3587-6-5"
91 gradientUnits="userSpaceOnUse"
92 gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
93 <linearGradient
94 x1="26.045763"
95 y1="9.6223383"
96 x2="26.045763"
97 y2="19.490837"
98 id="linearGradient3211"
99 xlink:href="#linearGradient3587-6-5"
100 gradientUnits="userSpaceOnUse"
101 gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
102 </defs>
103 <rect
104 width="3"
105 height="3"
106 x="10.5"
107 y="4.5"
108 id="rect3213"
109 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" />
110 <rect
111 width="3"
112 height="3"
113 x="2.5"
114 y="4.5"
115 id="rect3215"
116 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" />
117 <rect
118 width="3"
119 height="3"
120 x="10.5"
121 y="11.5"
122 id="rect3217"
123 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" />
124 <rect
125 width="3"
126 height="3"
127 x="2.5"
128 y="11.5"
129 id="rect3219"
130 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" />
131 <rect
132 width="3"
133 height="3"
134 x="10.5"
135 y="3.5"
136 id="rect3187"
137 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" />
138 <rect
139 width="3"
140 height="3"
141 x="2.5"
142 y="3.5"
143 id="rect3201"
144 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" />
145 <rect
146 width="3"
147 height="3"
148 x="10.5"
149 y="10.5"
150 id="rect3205"
151 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" />
152 <rect
153 width="3"
154 height="3"
155 x="2.5"
156 y="10.5"
157 id="rect3209"
158 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" />
159</svg>
1600
=== added directory 'data/images'
=== added file 'data/images/new.png'
161Binary files data/images/new.png 1970-01-01 00:00:00 +0000 and data/images/new.png 2012-07-06 03:13:19 +0000 differ1Binary 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
=== added file 'data/images/rect.png'
162Binary files data/images/rect.png 1970-01-01 00:00:00 +0000 and data/images/rect.png 2012-07-06 03:13:19 +0000 differ2Binary 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
=== removed file 'data/new.png'
163Binary files data/new.png 2012-07-05 04:39:46 +0000 and data/new.png 1970-01-01 00:00:00 +0000 differ3Binary files data/new.png 2012-07-05 04:39:46 +0000 and data/new.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/rect.png'
164Binary files data/rect.png 2012-06-27 04:30:09 +0000 and data/rect.png 1970-01-01 00:00:00 +0000 differ4Binary files data/rect.png 2012-06-27 04:30:09 +0000 and data/rect.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/runescape.jpg'
165Binary files data/runescape.jpg 2012-07-02 20:32:13 +0000 and data/runescape.jpg 1970-01-01 00:00:00 +0000 differ5Binary files data/runescape.jpg 2012-07-02 20:32:13 +0000 and data/runescape.jpg 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/skype.jpg'
166Binary files data/skype.jpg 2012-07-02 20:32:13 +0000 and data/skype.jpg 1970-01-01 00:00:00 +0000 differ6Binary files data/skype.jpg 2012-07-02 20:32:13 +0000 and data/skype.jpg 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/spotify.jpg'
167Binary files data/spotify.jpg 2012-07-02 20:32:13 +0000 and data/spotify.jpg 1970-01-01 00:00:00 +0000 differ7Binary files data/spotify.jpg 2012-07-02 20:32:13 +0000 and data/spotify.jpg 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/ubuntu.jpg'
168Binary files data/ubuntu.jpg 2012-07-02 20:32:13 +0000 and data/ubuntu.jpg 1970-01-01 00:00:00 +0000 differ8Binary files data/ubuntu.jpg 2012-07-02 20:32:13 +0000 and data/ubuntu.jpg 1970-01-01 00:00:00 +0000 differ
=== modified file 'src/Content.vala'
--- src/Content.vala 2012-07-05 04:39:46 +0000
+++ src/Content.vala 2012-07-06 03:13:19 +0000
@@ -41,6 +41,7 @@
41 public Box left_list_box;41 public Box left_list_box;
42 public Box content_box;42 public Box content_box;
43 private signal void update_image ();43 private signal void update_image ();
44 private const string build_pkg_data_dir = Constants.PKGDATADIR;
44 45
45 public ContentItem (string? image_path, string title, string author, string date, string site, string content, string url){46 public ContentItem (string? image_path, string title, string author, string date, string site, string content, string url){
4647
@@ -63,7 +64,7 @@
63 64
64 Image image_with_new = new Image ();65 Image image_with_new = new Image ();
65 Image image_without_new = new Image ();66 Image image_without_new = new Image ();
66 var pix = new Gdk.Pixbuf.from_file ("../data/rect.png");67 var pix = new Gdk.Pixbuf.from_file (build_pkg_data_dir+"/images/rect.png");
67 68
68 try {69 try {
69 if (image_path != null){70 if (image_path != null){
@@ -79,7 +80,7 @@
79 80
80 try {81 try {
81 82
82 Gdk.Pixbuf img = new Gdk.Pixbuf.from_file ("../data/new.png");83 Gdk.Pixbuf img = new Gdk.Pixbuf.from_file (build_pkg_data_dir+"/images/new.png");
83 img.composite (pix, 3, 3, 37, 37, 0, 0, 1, 1, Gdk.InterpType.BILINEAR, 255);84 img.composite (pix, 3, 3, 37, 37, 0, 0, 1, 1, Gdk.InterpType.BILINEAR, 255);
84 image_with_new = new Image.from_pixbuf (pix);85 image_with_new = new Image.from_pixbuf (pix);
85 86
@@ -187,6 +188,9 @@
187 title.get_style_context ().add_class ("title");188 title.get_style_context ().add_class ("title");
188 title.get_style_context ().add_provider (css, 10000);189 title.get_style_context ().add_provider (css, 10000);
189 190
191 var title_event = new EventBox ();
192 title_event.add (title);
193
190 var post_info = new Label (post_info ());194 var post_info = new Label (post_info ());
191 post_info.set_alignment (0, 0);195 post_info.set_alignment (0, 0);
192 post_info.get_style_context ().add_class ("post_info");196 post_info.get_style_context ().add_class ("post_info");
@@ -205,7 +209,7 @@
205 content_box.pack_start (image_event);209 content_box.pack_start (image_event);
206 content_box.pack_start (content);210 content_box.pack_start (content);
207 211
208 main_box.pack_start (title, false);212 main_box.pack_start (title_event, false);
209 main_box.pack_start (post_info, false);213 main_box.pack_start (post_info, false);
210 main_box.pack_start (content_box, false);214 main_box.pack_start (content_box, false);
211 215
212216
=== modified file 'src/Main.vala'
--- src/Main.vala 2012-07-05 04:39:46 +0000
+++ src/Main.vala 2012-07-06 03:13:19 +0000
@@ -49,7 +49,7 @@
4949
50 app_years = "2012";50 app_years = "2012";
51 application_id = "org.pantheon.daily";51 application_id = "org.pantheon.daily";
52 //app_icon = "";52 app_icon = "daily";
53 app_launcher = "daily.desktop";53 app_launcher = "daily.desktop";
5454
55 main_url = "https://launchpad.net/daily";55 main_url = "https://launchpad.net/daily";
@@ -98,7 +98,7 @@
98 98
99 window = new Local.LightWindow ();99 window = new Local.LightWindow ();
100 window.title = "Daily";100 window.title = "Daily";
101 //window.icon_name = "";101 window.icon_name = "daily";
102 window.set_default_size(810, 510);102 window.set_default_size(810, 510);
103 window.window_position = Gtk.WindowPosition.CENTER;103 window.window_position = Gtk.WindowPosition.CENTER;
104 window.destroy.connect (Gtk.main_quit);104 window.destroy.connect (Gtk.main_quit);
@@ -106,12 +106,12 @@
106 var contents = new Content ();106 var contents = new Content ();
107 contents.add (new ContentItem (null, "Game Store Gameolith Expands Horizons, No Longer Linux-Only", "", "", "", "", ""));107 contents.add (new ContentItem (null, "Game Store Gameolith Expands Horizons, No Longer Linux-Only", "", "", "", "", ""));
108 contents.add (new ContentItem (null, "Title", "DavyS", "june 15, 2012", "elementaryOS", "Lorem Ipsum", ""));108 contents.add (new ContentItem (null, "Title", "DavyS", "june 15, 2012", "elementaryOS", "Lorem Ipsum", ""));
109 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"));109 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"));
110 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"));110 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"));
111 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"));111 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"));
112 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"));112 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"));
113 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"));113 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"));
114 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"));114 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"));
115 115
116 116
117 var grid_view = new GridView (contents);117 var grid_view = new GridView (contents);
@@ -150,7 +150,6 @@
150 //need fix multiple instances!!150 //need fix multiple instances!!
151 151
152 var pop = new Daily.Widgets.PopOver ();152 var pop = new Daily.Widgets.PopOver ();
153 pop.set_parent_pop (window);
154 var content = pop.get_content_area ();153 var content = pop.get_content_area ();
155 content.set_size_request (300, 200);154 content.set_size_request (300, 200);
156 155

Subscribers

People subscribed via source and target branches

to all changes: