[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33444 - in gnunet-gtk: contrib src/main
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33444 - in gnunet-gtk: contrib src/main |
|
Date: |
Thu, 29 May 2014 23:03:48 +0200 |
Author: grothoff
Date: 2014-05-29 23:03:48 +0200 (Thu, 29 May 2014)
New Revision: 33444
Added:
gnunet-gtk/contrib/conversation.png
gnunet-gtk/contrib/conversation.svg
Modified:
gnunet-gtk/contrib/Makefile.am
gnunet-gtk/contrib/gnunet_gtk.glade
gnunet-gtk/src/main/gnunet-gtk.c
Log:
integrating gnunet-conversation-gtk wth gnunet-gtk
Modified: gnunet-gtk/contrib/Makefile.am
===================================================================
--- gnunet-gtk/contrib/Makefile.am 2014-05-29 16:35:55 UTC (rev 33443)
+++ gnunet-gtk/contrib/Makefile.am 2014-05-29 21:03:48 UTC (rev 33444)
@@ -1,4 +1,4 @@
-# Process this file with automake to produce Makefile.in
+ # Process this file with automake to produce Makefile.in
SUBDIRS = .
@@ -30,6 +30,7 @@
black.png \
yellow.png \
purple.png \
+ conversation.png conversation.svg \
setup.png setup.svg \
fs.png fs.svg \
statistics.png statistics.svg \
Added: gnunet-gtk/contrib/conversation.png
===================================================================
(Binary files differ)
Index: gnunet-gtk/contrib/conversation.png
===================================================================
--- gnunet-gtk/contrib/conversation.png 2014-05-29 16:35:55 UTC (rev 33443)
+++ gnunet-gtk/contrib/conversation.png 2014-05-29 21:03:48 UTC (rev 33444)
Property changes on: gnunet-gtk/contrib/conversation.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-gtk/contrib/conversation.svg
===================================================================
--- gnunet-gtk/contrib/conversation.svg (rev 0)
+++ gnunet-gtk/contrib/conversation.svg 2014-05-29 21:03:48 UTC (rev 33444)
@@ -0,0 +1,182 @@
+<?xml version="1.0"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
xmlns="http://www.w3.org/2000/svg"; xmlns:cc="http://creativecommons.org/ns#";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:svg="http://www.w3.org/2000/svg"; id="svg2" viewBox="0 0 330.78 251.29"
version="1.1">
+ <defs id="defs4">
+ <linearGradient id="linearGradient3727">
+ <stop id="stop3729" stop-color="#fff" offset="0"/>
+ <stop id="stop3731" stop-color="#fff" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3724" x1="495.5"
gradientUnits="userSpaceOnUse" y1="49.297" gradientTransform="translate(0
-.000037380)" x2="164.72" y2="300.59">
+ <stop id="stop3640-5" stop-color="#cf1919" offset="0"/>
+ <stop id="stop3642-8" stop-color="#600000" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3733" x1="432.97"
xlink:href="#linearGradient3727" gradientUnits="userSpaceOnUse" x2="383.19"
y1="139.86" y2="266.65"/>
+ <filter id="filter3797" width="1.5622" y="-.26" x="-.28108" height="1.52"
color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur3799" stdDeviation="4.7259856"/>
+ </filter>
+ <clipPath id="clipPath3820" clipPathUnits="userSpaceOnUse">
+ <path id="path3822" d="m264.66 91.707 1.0102-21.718
23.234-6.0609-0.50508 26.769s49.497-16.162 18.183-32.83c-31.315-16.668-87.378
4.5457-73.236 21.213 14.142 16.668 32.325 12.627 31.315 12.627z"/>
+ </clipPath>
+ <clipPath id="clipPath3820-6" clipPathUnits="userSpaceOnUse">
+ <path id="path3822-6" d="m264.66 91.707 1.0102-21.718
23.234-6.0609-0.50508 26.769s49.497-16.162 18.183-32.83c-31.315-16.668-87.378
4.5457-73.236 21.213 14.142 16.668 32.325 12.627 31.315 12.627z"/>
+ </clipPath>
+ <filter id="filter3797-6" height="1.52" width="1.5622" y="-.26"
x="-.28108" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur3799-5" stdDeviation="4.7259856"/>
+ </filter>
+ <linearGradient id="linearGradient3866" x1="170"
xlink:href="#linearGradient3727" gradientUnits="userSpaceOnUse" x2="186.96"
y1="79.171" y2="90.243"/>
+ <filter id="filter3884" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur3886" stdDeviation="0.41189662"/>
+ </filter>
+ <filter id="filter3892" width="1.177" y="-.65209" x="-.088497"
height="2.3042" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur3894" stdDeviation="1.303687"/>
+ </filter>
+ <clipPath id="clipPath3896" clipPathUnits="userSpaceOnUse">
+ <path id="path3898" stroke="#000" stroke-width="1px" d="m166.42
133.12-0.25254 3.0304 9.0914 19.445 40.154-5.8084
26.516-17.93-20.203-29.042-52.78 15.152-2.5254 15.152z"/>
+ </clipPath>
+ <filter id="filter3906" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur3908" stdDeviation="0.97632089"/>
+ </filter>
+ <filter id="filter3962" width="1.5658" y="-.2782" x="-.28288"
height="1.5564" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur3964" stdDeviation="3.0098556"/>
+ </filter>
+ <clipPath id="clipPath3966" clipPathUnits="userSpaceOnUse">
+ <path id="path3968" d="m403.59 123.87s9.7031 3.2256 15.507 8.2531c9.0683
7.8554 10.93 18.846 10.93 18.846l23.018-12.686-40.306-34.085c-3.0666
3.694-11.74 11.55-9.1492 19.671z"/>
+ </clipPath>
+ <filter id="filter3974" width="1.4294" y="-.26942" x="-.21469"
height="1.5388" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur3976" stdDeviation="2.6861951"/>
+ </filter>
+ <clipPath id="clipPath3978" clipPathUnits="userSpaceOnUse">
+ <path id="path3980" d="m256.07 121.29 5.7143 1.7857 4.2857-2.8572l11.43
29.29-44.29 16.07-3.21-18.57s13.929-5.3571 20.714-12.857c6.7857-7.5
7.1428-10.357 7.1428-10.357l-1.7857-2.5z"/>
+ </clipPath>
+ <linearGradient id="linearGradient3998" x1="219.5"
xlink:href="#linearGradient3727" gradientUnits="userSpaceOnUse" x2="201.19"
y1="82.905" y2="131.64"/>
+ <filter id="filter4006" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur4008" stdDeviation="1.8365094"/>
+ </filter>
+ <clipPath id="clipPath4030" clipPathUnits="userSpaceOnUse">
+ <path id="path4032" stroke="#000" stroke-width="1px" d="m166.68
109.38s2.5254-23.739 7.0711-28.789c4.5457-5.0508 54.665-30.008 143.95-30.81
71.1-0.63349 111.8 6.6125 160.11 27.274l18.183 55.558-12.122 26.769-135.87
1.5152-188.39 15.152 7.0711-66.67z"/>
+ </clipPath>
+ <filter id="filter4070" width="1.079" y="-.10624" x="-.039511"
height="1.2125" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur4072" stdDeviation="5.7460049"/>
+ </filter>
+ <filter id="filter4076" width="1.2343" y="-.19176" x="-.11716"
height="1.3835" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur4078" stdDeviation="2.7940472"/>
+ </filter>
+ <filter id="filter4162" width="1.4007" y="-.30303" x="-.20033"
height="1.6061" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur4164" stdDeviation="2.0657702"/>
+ </filter>
+ <filter id="filter4181" width="1.3355" y="-.41533" x="-.16773"
height="1.8307" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur4183" stdDeviation="9.6891287"/>
+ </filter>
+ <filter id="filter4337" width="1.5" y="-.25" x="-.25" height="1.5"
color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur4339" in="SourceAlpha"
stdDeviation="2.000000" result="blur"/>
+ <feColorMatrix id="feColorMatrix4341" type="matrix" values="1 0 0 0 0 0
1 0 0 0 0 0 1 0 0 0 0 0 1.000000 0 " result="bluralpha"/>
+ <feOffset id="feOffset4343" dy="1.400000" in="bluralpha" dx="0.000000"
result="offsetBlur"/>
+ <feMerge id="feMerge4345">
+ <feMergeNode id="feMergeNode4347" in="offsetBlur"/>
+ <feMergeNode id="feMergeNode4349" in="SourceGraphic"/>
+ </feMerge>
+ </filter>
+ <filter id="filter4359" width="1.4554" y="-.40266" x="-.22771"
height="1.8053" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur4361" stdDeviation="3.4248544"/>
+ </filter>
+ <linearGradient id="linearGradient4423" y2="149.12"
gradientUnits="userSpaceOnUse" y1="186.39" x2="330.51" x1="321.36">
+ <stop id="stop4365" stop-color="#121212" offset="0"/>
+ <stop id="stop4367" stop-color="#323232" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient5208" y2="73.6"
gradientUnits="userSpaceOnUse" y1="131.17" x2="476.53" x1="410.52">
+ <stop id="stop5204" offset="0"/>
+ <stop id="stop5206" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <filter id="filter5214" width="1.4376" y="-.2509" x="-.21883"
height="1.5018" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur5216" stdDeviation="6.0186545"/>
+ </filter>
+ <linearGradient id="linearGradient5226" x1="486.62"
xlink:href="#linearGradient3727" gradientUnits="userSpaceOnUse" x2="457.01"
y1="71.946" y2="114.92"/>
+ <filter id="filter5228" width="1.2364" y="-.12186" x="-.1182"
height="1.2437" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur5230" stdDeviation="2.9670464"/>
+ </filter>
+ <filter id="filter5242" width="1.9628" y="-.28551" x="-.48141"
height="1.571" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur5244" stdDeviation="1.737162"/>
+ </filter>
+ <filter id="filter5262" width="1.9294" y="-.19561" x="-.46468"
height="1.3912" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur5264" stdDeviation="1.6397538"/>
+ </filter>
+ </defs>
+ <g id="layer2" stroke="#000" stroke-width="1px" transform="translate(-164.72
-49.312)">
+ <path id="path3627" fill="url(#linearGradient3724)" d="m330.75
49.812c-2.3892-0.000883-4.788 0.01786-7.1875 0.0625-51.882 0.45042-120.55
11.506-145 26.781-7.5 8.2143-6.4152 9.6384-10.344 26.781-3.9286 17.143-2.875
33.562-2.875 33.562l9.3125 20.719c-0.35715 0.71429 3.1752 1.2268 18.188 0.34375
12.14-0.71 35.71-11.06 35.71-11.06s-4.9821 39.652-7.125 76.438-2.875
71.438-2.875 71.438-2.8348 3.5714 116.09 5c118.93 1.4286 106.06-4.3125
106.06-4.3125s-3.9241-84.277-6.7812-111.06c-2.8571-26.786-3.2188-25.245-3.2188-32.125
18.571 8.4734 48.933 9.9866 53.219 7.8438 4.29-2.15 11.07-22.85
11.07-27.85s-14.29-47.871-18.219-54.656c-3.8-6.579-71.96-27.884-146.03-27.912zm-8.97
37.188c25.714 0.35714 48.562 1.4375 48.562 1.4375v13.562s-19.634 1.0625-43.562
1.0625c-23.929 0-38.938-0.6875-38.938-0.6875v-13.938s14.295-1.0804
33.938-1.4375zm71.781 2.875c16.429 4.2857 12.156 22.5 12.156
22.5s-1.8036-0.72321-2.875 3.5625-0.6875 6.7812-0.6875
6.7812l-6.4375-2.8438-2.1562-30zm-128.22 0.6875c0 0.71
429-1.06
7 25.741-1.7812 29.312-0.71429 3.5714-6.7812 1.7812-6.7812
1.7812s0.34822-6.4375-1.4375-11.438c-1.7857-5-1.0625
2.1339-3.5625-6.4375s13.562-13.219 13.562-13.219z"/>
+ <path id="path3751" fill="none" d="m236.12 144s11.617-5.3033
16.92-11.112c5.3033-5.8084 3.0305-10.102 3.0305-10.102"/>
+ <path id="path3753" fill="none" d="m405.71 124.51c8.2873 2.7861 20.245
10.508 22.143 22.143"/>
+ <path id="path3755" fill="none" d="m266.07 87.005 0.72-16.071 20.35-4.643
0.36 18.928"/>
+ <path id="path3757" fill="none" d="m371.07 85.576v-19.286l20.714 4.6429
1.4286 15"/>
+ <path id="path3759" fill="none" d="m407.14 113.08s8.9286 7.8571 21.429
12.857"/>
+ <path id="path3761" fill="none" d="m492.14 134.86s-13.929 6.7857-38.929
0"/>
+ <path id="path3763" fill="none" d="m491.79 129.51s-2.1429 5.7143-13.214
6.4286"/>
+ <path id="path3765" fill="none" d="m167.14 133.79s17.857 4.2857 34.286
0.35714"/>
+ <path id="path3767" fill="none" d="m167.86 137.72s24.643 2.1429
45.714-6.0714"/>
+ <path id="path3769" fill="none" d="m250.71 108.79s2.8571 4.6429-6.7857
8.9286"/>
+ </g>
+ <g id="layer3" transform="translate(-164.72 -49.312)">
+ <path id="path3636" opacity=".40529" fill="url(#linearGradient3733)"
d="m229.64 172.01s-3.3474-23.595 3.7373-24.505c19.604-2.5179 29.691-28.057
41.541-18.352-3.5312 2.2619-6.572 4.5238-8.1351 6.7857 0 0 18.929-13.929
58.214-14.286 39.286-0.35715 55.924 8.5157 72.5
15.714-5.7041-5.8402-14.886-8.8858-20.357-11.071 0 0 18.571 1.0714 36.071
14.643 7.9874 6.1943 15.714 27.5 15.714
27.5s-13.214-17.143-23.929-23.214c12.857 16.071 14.643 18.214 19.643
38.571-0.4715 29.559 26.117 66.31-10.714
67.143-28.214-0.71429-64.286-6.0714-93.571-7.5-29.286-1.4286-51.885
12.785-70.714-10.714-15.937-19.89-32.346-40.229-9.0257-73.571-6.6059
2.6092-11.331 13.214-10.974 12.857z"/>
+ <path id="path3795" opacity=".5" filter="url(#filter3797)"
clip-path="url(#clipPath3820)" d="m277.29 98.273s-19.698
11.112-19.698-3.5355c0-14.647-4.0406-32.325 9.5964-33.84 13.637-1.5152
27.779-5.5558 27.779 3.5355 0 9.0914 6.0609 30.81-1.0102 32.325-7.0711
1.5152-17.173 1.5152-16.668 1.5152z"/>
+ <path id="path3795-8" opacity=".5" d="m277.29 98.273s-19.698
11.112-19.698-3.5355c0-14.647-4.0406-32.325 9.5964-33.84 13.637-1.5152
27.779-5.5558 27.779 3.5355 0 9.0914 6.0609 30.81-1.0102 32.325-7.0711
1.5152-17.173 1.5152-16.668 1.5152z" clip-path="url(#clipPath3820-6)"
transform="matrix(-1 0 0 1 658.63 .74934)" filter="url(#filter3797-6)"/>
+ <path id="path3858" opacity=".72247" filter="url(#filter3884)"
fill="url(#linearGradient3866)" d="m170 111.29s0.35714-18.929
5.7143-26.786c5.3571-7.8571 28.214-15.357 28.214-15.357s-22.857 10.714-26.786
18.214c-3.9286 7.5-6.7857 25-7.1429 23.929z"/>
+ <path id="path3890" filter="url(#filter3892)"
clip-path="url(#clipPath3896)" d="m161.88 132.87s11.869 2.5254 19.698
2.5254c7.8287 0 20.961-1.2627 20.961-1.2627s-14.142 4.5457-22.981
4.5457c-8.8388 0-18.435-1.5152-18.435-1.5152l0.75761-4.2932z"/>
+ <path id="path3900" opacity=".89546" filter="url(#filter3906)" d="m484.12
103.83s9.1649 25.306 5.5558 27.274c-11.112 6.0609-37.881 4.0406-37.881
4.0406s39.143 6.8185 40.911-1.0102c1.7678-7.8287-8.8388-30.305-8.5863-30.305z"/>
+ <path id="path3910" filter="url(#filter3962)"
clip-path="url(#clipPath3966)" transform="matrix(1 -.0029369 .0029369 1 -.39648
1.2221)" d="m403.36 122.9s-1.875 12.863 2.4107 17.684c4.2857 4.8214 22.411
8.0303 22.411
8.0303s2.3214-10.714-6.9643-19.286c-9.2857-8.5714-18.036-6.6072-17.857-6.4286z"/>
+ <path id="path3970" filter="url(#filter3974)"
clip-path="url(#clipPath3978)" d="m230.36 146.29s2.1429-13.214
11.071-18.214c8.9286-5 15.357-5.7143 15.357-5.7143s7.8572 1.7857 0.35715
11.429c-7.5 9.6429-26.429 12.5-26.786 12.5z"/>
+ <path id="path3982" opacity=".26432" filter="url(#filter4006)"
fill="url(#linearGradient3998)" d="m247.99
110.39s-13.132-13.637-15.152-9.5964c-2.0203 4.0406 7.5762 13.132 0.50508
16.668-7.0711 3.5355-26.264 12.627-33.84 14.142-7.5762 1.5152-18.183-52.528
8.0812-48.487 26.264 4.0406 42.426 28.284 40.406 27.274z"/>
+ <path id="path4010" opacity=".91308" d="m153.04 107.41s4.5457-16.668
36.365-31.315c31.82-14.647 71.721-22.223 144.45-20.203 72.731 2.0203 134.86
13.637 139.4 21.213 4.5457 7.5761 28.789 73.741 28.789
73.741l-2.02-99.508-134.86-30.305s-203.04 14.142-203.55 16.162c-0.50508
2.0203-9.0914 70.711-8.5863 70.206z" clip-path="url(#clipPath4030)"
filter="url(#filter4070)" fill="#fff"/>
+ <path id="path4074" filter="url(#filter4076)" d="m404.06 93.222s7.5761
6.566 7.5761 12.627c0 6.0609 3.5355 12.122 20.203 16.668 16.668 4.5457 29.294
5.5558 29.294
5.5558s-37.881-7.5761-43.437-21.213c-5.5558-13.637-15.152-14.142-13.637-13.637z"/>
+ <path id="path4080" filter="url(#filter4162)" d="m490.43 143.73s-1.0102
11.112-8.5863 14.647c-7.5762 3.5355-16.162 0.50508-16.162 0.50508s11.617 0
17.678-6.566c6.0609-6.566 7.0711-7.5761 7.0711-8.5863z"/>
+ <path id="path5200" opacity=".63436" filter="url(#filter5214)"
fill="url(#linearGradient5208)" d="m400.71 88.791c2.7701-0.65058 6.6541 12.58
7.1429 22.857 12.602 9.7235 40.148 23.863 67.857 19.286
13.864-2.2903-27.143-13.571-36.429-32.857-9.28-19.286-52.14-18.572-38.57-9.286z"/>
+ <path id="path5218" opacity=".35242" filter="url(#filter5228)"
fill="url(#linearGradient5226)" d="m413.57 81.648c10-10.714 16.982-12.668
44.286-7.1429 33.609 6.8016 34.286 52.857 26.429 55.714-7.8571
2.8571-15.084-52.719-50.714-48.571-22.251 2.5898-2.1429 24.286-14.286
24.286s-16.076-13.184-5.7143-24.286z"/>
+ <path id="path5232" opacity=".71806" filter="url(#filter5242)" d="m396.5
87.362s4-1 6-7 1 6.5 2.5 11.5-8-4-8.5-4.5z"/>
+ <path id="path5248" opacity=".82819" filter="url(#filter5262)"
transform="matrix(.84301 -.53789 .53789 .84301 15.265 234.15)" d="m407
100.86c-8-13.5 6-20 6-20s-5.5 3.5-5.5 9.5 0 11.5-0.5 10.5z"/>
+ </g>
+ <g id="layer4" transform="translate(-164.72 -49.312)">
+ <path id="path4169" opacity=".3348" d="m260.62 142.21c-63.42 48.474 10.566
103.72 71.216 100.51 65.021-3.4372 85.863-25.254 89.904-49.497
4.0406-24.244-4.5457-27.779-4.5457-27.779 4.7567 1.5856 19.743 71.047-83.338
72.731-51.453 0.84068-81.761-20.246-90.934-41.228-9.1727-20.981 2.7904-41.857
17.698-54.737z"/>
+ <path id="path4179" opacity=".5815" filter="url(#filter4181)" d="m266.18
173.53s-12.122 7.0711 0 24.244 22.223 30.81 66.165 29.294c43.942-1.5152
57.579-21.718 65.66-36.871 8.0812-15.152-19.193-6.566-57.579
0.50508s-53.033-28.789-74.246-17.173z"/>
+ <path id="path4185" d="m328.53 132.94c-1.7154 0.0245-3.4819 0.0928-5.2812
0.1875-57.766 3.0403-63.653 50.003-51.531 62.125s17.753 21.42 65.156
24.25c33.84 2.0203 58.094-22.539
58.094-45.469-0.00001-9.7858-13.26-41.854-66.438-41.094zm-6.75 6.2188c13.571 0
10.085 5.8298 2.1562 6.7812-8.9286 1.0714-18.942-3.2098-2.1562-6.7812zm25
1.7812c12.857 0.71429 10.719 8.9107 0.71875
7.125s-13.933-6.0536-0.71875-7.125zm-44.938 5.5312c8.291-0.41016 9.2812
4.7812-0.40625 6.9688-11.071 2.5-15.737-4.6518-3.5938-6.4375 1.4732-0.3125
2.8156-0.47266 4-0.53125zm62.656 3.25c0.88636-0.0379 1.8951 0.0223 3 0.15625
13.571 1.0714 12.504 7.8438 0.71875 7.8438-10.681
0-12.287-7.6334-3.7188-8zm-77.59 8.03c9.7392-0.14793 10.069 7.683-1.9062
9.625-13.214 2.1429-12.152-7.5268-1.4375-9.3125 1.2054-0.20089 2.3362-0.2972
3.3438-0.3125zm-2.25 15.906c0.30894-0.0108 0.6053-0.007 0.90625 0 3.7451 0.0903
6.7812 1.5625 6.9375 4.0625 0.35714 5.7143-23.915 10.362-20.344 3.2188
2.4484-4.8968 7.866-7.119 12.5-7.2812
zm5.9062
15.688c4.4147-0.14526 9.1562 1.1562 10.875 4.4375-4.6429 8.2143-14.996
8.942-19.281 2.1562-2.4107-3.817 2.7302-6.407 8.4062-6.5938zm71.562
3.2188c8.4144-0.29776 16.073 8.3025 0.875 11.719-13.214
0-12.433-4.7626-7.6562-9.0625 1.9874-1.789 4.4252-2.5729 6.7812-2.6562zm-49.906
6.125c0.36803-0.013 0.7274-0.004 1.0938 0 4.5591 0.0489 8.8438 1.4062 8.8438
4.375 2.4378 6.1021-14.637 11.547-19.312 1.4375-1.628-3.5198 3.8546-5.6175
9.375-5.8125zm26.219 1.5c9.6135 0.14563 12.58 12.85 0.125
11.812-12.857-1.0714-13.92-11.424-1.0625-11.781 0.32366-0.0223 0.62739-0.036
0.9375-0.0312z" fill-opacity=".42326" filter="url(#filter4337)" stroke="#000"
stroke-width="1px" fill="#fff"/>
+ <path id="path4351" stroke="#000" stroke-width="1px"
fill="url(#linearGradient4423)" d="m330.71 149.15c17.945-2.3847 40.451 19.722
25.811 36.139-13.366 10.993-36.857 12.859-50.527
1.6528-13.03-11.132-4.1984-30.429 10.08-35.032 4.6031-1.9602 9.6342-2.915
14.636-2.7603z"/>
+ <path id="path4353" opacity=".45374" filter="url(#filter4359)" fill="#fff"
d="m305 173.08s-1.0714-8.5714 10.714-16.071c11.786-7.5 25.357-2.8571
25.357-2.8571s-17.857 0-24.643 7.1428c-6.7857 7.1429-11.071 12.5-11.429
11.786z"/>
+ <path id="path4473" stroke="#000" stroke-width="1px" d="m367.5 175.58 30
7.1428-1.4286 14.286 12.857-2.8571s-3.3771-9.3394-5.3571-17.5c-6.37
0.93-36.07-1.07-36.07-1.07z"/>
+ </g>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work>
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
+ <dc:publisher>
+ <cc:Agent rdf:about="http://openclipart.org/";>
+ <dc:title>Openclipart</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:title>Red Phone</dc:title>
+ <dc:date>2010-07-20T22:14:29</dc:date>
+ <dc:description>A red rotary phone</dc:description>
+
<dc:source>http://openclipart.org/detail/74113/red-phone-by-pipeep</dc:source>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>pipeep</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>Gloss</rdf:li>
+ <rdf:li>Glossy</rdf:li>
+ <rdf:li>Phone</rdf:li>
+ <rdf:li>Photorealism</rdf:li>
+ <rdf:li>Photorealistic</rdf:li>
+ <rdf:li>Red</rdf:li>
+ <rdf:li>clip art</rdf:li>
+ <rdf:li>clipart</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
+ <cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/";>
+ <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+ <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+ <cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+</svg>
Modified: gnunet-gtk/contrib/gnunet_gtk.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_gtk.glade 2014-05-29 16:35:55 UTC (rev 33443)
+++ gnunet-gtk/contrib/gnunet_gtk.glade 2014-05-29 21:03:48 UTC (rev 33444)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="gnunet_gtk_window">
<property name="can_focus">False</property>
<property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK
| GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK |
GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK |
GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK |
GDK_SCROLL_MASK</property>
@@ -23,7 +22,7 @@
</object>
</child>
<child type="tab">
- <object class="GtkImage" id="image1">
+ <object class="GtkImage" id="statistics_image">
<property name="width_request">100</property>
<property name="height_request">50</property>
<property name="visible">True</property>
@@ -48,7 +47,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkImage" id="image2">
+ <object class="GtkImage" id="peerinfo_image">
<property name="width_request">100</property>
<property name="height_request">50</property>
<property name="visible">True</property>
@@ -74,7 +73,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkImage" id="image3">
+ <object class="GtkImage" id="namestore_image">
<property name="width_request">100</property>
<property name="height_request">0</property>
<property name="visible">True</property>
@@ -100,7 +99,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkImage" id="image4">
+ <object class="GtkImage" id="fs_image">
<property name="width_request">100</property>
<property name="height_request">0</property>
<property name="visible">True</property>
@@ -126,7 +125,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkImage" id="image5">
+ <object class="GtkImage" id="identity_image">
<property name="width_request">100</property>
<property name="height_request">0</property>
<property name="visible">True</property>
@@ -140,7 +139,8 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="gnunet_setup_hbox">
+ <object class="GtkBox" id="gnunet_conversation_hbox">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
@@ -151,7 +151,30 @@
</packing>
</child>
<child type="tab">
- <object class="GtkImage" id="image6">
+ <object class="GtkImage" id="conversation_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Voice
conversation</property>
+ <property name="pixbuf">conversation.png</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="gnunet_setup_hbox">
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkImage" id="setup_image">
<property name="width_request">100</property>
<property name="height_request">50</property>
<property name="visible">True</property>
@@ -160,7 +183,7 @@
<property name="pixbuf">setup.png</property>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
<property name="tab_fill">False</property>
</packing>
</child>
Modified: gnunet-gtk/src/main/gnunet-gtk.c
===================================================================
--- gnunet-gtk/src/main/gnunet-gtk.c 2014-05-29 16:35:55 UTC (rev 33443)
+++ gnunet-gtk/src/main/gnunet-gtk.c 2014-05-29 21:03:48 UTC (rev 33444)
@@ -324,6 +324,9 @@
plug ("gnunet_identity_hbox",
"gnunet-identity-gtk",
"GNUNET_IDENTITY_GTK_PLUG");
+ plug ("gnunet_conversation_hbox",
+ "gnunet-conversation-gtk",
+ "GNUNET_CONVERSATION_GTK_PLUG");
#if 0
plug ("gnunet_setup_hbox",
"gnunet-setup",
@@ -366,5 +369,4 @@
}
-
/* end of gnunet-gtk.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33444 - in gnunet-gtk: contrib src/main,
gnunet <=