Merge lp:~samitheberber/openfilepad/gui-dev into lp:openfilepad

[Sami Saada]

[Sami Saada (samitheberber)]

There is working gui, which should be merged in trunk.

[Martti Rannanjärvi (mrannanj)]

review: Approve

=== modified file 'README'
--- README	2009-10-26 02:34:05 +0000
+++ README	2009-10-27 21:15:19 +0000
@@ -7,12 +7,13 @@
 
 QFriendsLOL is a simple QT file drop box application that enables friends to exchange files by using OpenLookup v2.
 
-To get QFriendsLOL running you need to get the latest OpenLookup.
-You can download it to your home directory by commanding:
- cd ~
+QFriendsLOL requires simplejson and openlookup to run. Simplejson is probably
+packaged by your distribution. The name of the package is python-simplejson in
+Ubuntu and dev-python/simplejson in Gentoo. Openlookup you can download to your
+home directory with these commands:
+ cd
  svn checkout http://openlookup.googlecode.com/svn/v2 openlookup2
 
 then set python path as follows before starting QFriendsLOL:
  export PYTHONPATH=~/openlookup2
 
-
 
=== added directory 'src/gfx'
=== added file 'src/gfx/home.svg'
--- src/gfx/home.svg	1970-01-01 00:00:00 +0000
+++ src/gfx/home.svg	2009-10-27 21:15:19 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="16"
+   height="16"
+   id="svg1901">
+  <defs
+     id="defs1903" />
+  <g
+     id="layer1"
+     style="opacity:1">
+    <g
+       transform="matrix(3.3802679e-2,0,0,3.9578024e-2,-3.7983281,-8.644124)"
+       id="g2405">
+      <rect
+         width="302.85715"
+         height="211.42857"
+         rx="0"
+         ry="0"
+         x="188.57143"
+         y="375.21933"
+         id="rect2380"
+         style="fill:#000000;fill-opacity:1" />
+      <path
+         d="M 340,252.36219 L 542.8571,378.07646 L 151.42857,378.07646 L 340,252.36219 z"
+         id="rect2382"
+         style="fill:#000000;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
 
=== added file 'src/gfx/logo.svg'
--- src/gfx/logo.svg	1970-01-01 00:00:00 +0000
+++ src/gfx/logo.svg	2009-10-27 21:15:19 +0000
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="53.300831"
+   height="50.020782"
+   id="svg1901"
+   inkscape:version="0.46"
+   sodipodi:docname="qfriendslol_logo.svg"
+   sodipodi:version="0.32"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata28">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="789"
+     inkscape:window-height="786"
+     id="namedview26"
+     showgrid="false"
+     inkscape:zoom="5.3299604"
+     inkscape:cx="55.118585"
+     inkscape:cy="7.1743389"
+     inkscape:window-x="0"
+     inkscape:window-y="12"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g2899" />
+  <defs
+     id="defs1903">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 372.04724 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1052.3622 : 372.04724 : 1"
+       inkscape:persp3d-origin="526.18109 : 248.03149 : 1"
+       id="perspective30" />
+  </defs>
+  <g
+     transform="matrix(0.7786856,0,0,0.7880085,-69.510459,-145.8237)"
+     id="g2899">
+    <g
+       id="g2974"
+       transform="matrix(7.1574807e-2,0,0,7.1574807e-2,82.877173,171.80829)">
+      <g
+         transform="matrix(1.2842154,0,0,1.2690218,896.81145,162.03984)"
+         id="g2930">
+        <g
+           id="g2561"
+           transform="matrix(0.7121539,0,0,0.7121539,-652.62997,34.07993)">
+          <g
+             style="fill:#729fcf"
+             id="g2390">
+            <path
+               style="fill:#729fcf"
+               id="path2382"
+               d="M 508.57143,223.79076 C 508.57143,342.1375 412.63244,438.07648 294.28571,438.07648 C 175.93897,438.07648 79.999985,342.1375 79.999985,223.79076 C 79.999985,105.44402 175.93897,9.5050375 294.28571,9.5050375 C 412.63244,9.5050375 508.57143,105.44402 508.57143,223.79076 L 508.57143,223.79076 z" />
+            <rect
+               style="fill:#729fcf"
+               id="rect2384"
+               y="419.50504"
+               x="33.428574"
+               ry="120"
+               rx="174.28572"
+               height="474.28574"
+               width="522.85712" />
+          </g>
+        </g>
+        <g
+           style="fill:#ef2929"
+           id="g2566"
+           transform="matrix(0.7121539,0,0,0.7121539,-280.2977,34.066399)">
+          <g
+             style="fill:#ef2929"
+             id="g2568">
+            <path
+               style="fill:#ef2929"
+               id="path2570"
+               d="M 508.57143,223.79076 C 508.57143,342.1375 412.63244,438.07648 294.28571,438.07648 C 175.93897,438.07648 79.999985,342.1375 79.999985,223.79076 C 79.999985,105.44402 175.93897,9.5050375 294.28571,9.5050375 C 412.63244,9.5050375 508.57143,105.44402 508.57143,223.79076 L 508.57143,223.79076 z" />
+            <rect
+               style="fill:#ef2929"
+               id="rect2572"
+               y="419.50504"
+               x="33.428574"
+               ry="120"
+               rx="174.28572"
+               height="474.28574"
+               width="522.85712" />
+          </g>
+        </g>
+      </g>
+      <g
+         id="g2952">
+        <g
+           style="fill:#8ae234"
+           id="g2574"
+           transform="matrix(1.0149288,0,0,1.0029211,272.88051,175.52064)">
+          <g
+             style="fill:#8ae234"
+             id="g2576">
+            <path
+               style="fill:#8ae234"
+               id="path2578"
+               d="M 508.57143,223.79076 C 508.57143,342.1375 412.63244,438.07648 294.28571,438.07648 C 175.93897,438.07648 79.999985,342.1375 79.999985,223.79076 C 79.999985,105.44402 175.93897,9.5050375 294.28571,9.5050375 C 412.63244,9.5050375 508.57143,105.44402 508.57143,223.79076 L 508.57143,223.79076 z" />
+            <rect
+               style="fill:#8ae234"
+               id="rect2580"
+               y="419.50504"
+               x="33.428574"
+               ry="120"
+               rx="174.28572"
+               height="474.28574"
+               width="522.85712" />
+          </g>
+        </g>
+        <text
+           x="444.51709"
+           y="516.66309"
+           id="text3360"
+           xml:space="preserve"
+           style="font-size:323.3861084px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+             x="444.51709"
+             y="516.66309"
+             id="tspan3362">Q</tspan></text>
+        <g
+           id="g2877"
+           transform="matrix(1.0216867,0,0,1.0216867,166.7808,-619.91001)">
+          <text
+             style="font-size:237.41375732px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+             xml:space="preserve"
+             id="text3364"
+             y="1561.1241"
+             x="165.02359"><tspan
+               id="tspan3366"
+               y="1561.1241"
+               x="165.02359">LOL</tspan></text>
+          <text
+             style="font-size:99.64174652px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+             xml:space="preserve"
+             id="text3368"
+             y="1359.7706"
+             x="178.23366"><tspan
+               id="tspan3370"
+               y="1359.7706"
+               x="178.23366">FRIENDS</tspan></text>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
 
=== added file 'src/gfx/mugshot_new.svg'
--- src/gfx/mugshot_new.svg	1970-01-01 00:00:00 +0000
+++ src/gfx/mugshot_new.svg	2009-10-27 21:15:19 +0000
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="57.575825"
+   height="97.375511"
+   id="svg1901"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="mugshot_new.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata2424">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="1022"
+     inkscape:window-width="789"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="1.8928844"
+     inkscape:cx="115.61036"
+     inkscape:cy="39.417556"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg1901" />
+  <defs
+     id="defs1903">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2426" />
+  </defs>
+  <g
+     id="layer1"
+     style="opacity:1"
+     transform="matrix(0.1101177,0,0,0.1101177,-13.056815,-7.4177671)">
+    <g
+       transform="translate(85.14287,57.857131)"
+       id="g2433"
+       style="opacity:1">
+      <g
+         id="g2390"
+         style="fill:#729fcf">
+        <path
+           d="M 508.57143,223.79076 C 508.57143,342.1375 412.63244,438.07648 294.28571,438.07648 C 175.93897,438.07648 79.999985,342.1375 79.999985,223.79076 C 79.999985,105.44402 175.93897,9.5050375 294.28571,9.5050375 C 412.63244,9.5050375 508.57143,105.44402 508.57143,223.79076 L 508.57143,223.79076 z"
+           id="path2382"
+           style="fill:#729fcf" />
+        <rect
+           width="522.85712"
+           height="474.28574"
+           rx="174.28572"
+           ry="120"
+           x="33.428574"
+           y="419.50504"
+           id="rect2384"
+           style="fill:#729fcf" />
+      </g>
+    </g>
+    <text
+       x="71.970245"
+       y="942.89124"
+       id="text2438"
+       xml:space="preserve"
+       style="font-size:731.74212646px;font-style:normal;font-weight:normal;fill:#204a87;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
+         x="71.970245"
+         y="942.89124"
+         id="tspan2440">+</tspan></text>
+  </g>
+</svg>
 
=== added file 'src/gfx/mugshot_unknown.svg'
--- src/gfx/mugshot_unknown.svg	1970-01-01 00:00:00 +0000
+++ src/gfx/mugshot_unknown.svg	2009-10-27 21:15:19 +0000
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="49.8494"
+   height="84.308144"
+   id="svg1901"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="mugshot_unknown.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata2540">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="510"
+     inkscape:window-width="487"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="2.6769428"
+     inkscape:cx="36.591392"
+     inkscape:cy="21.560543"
+     inkscape:window-x="791"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg1901" />
+  <defs
+     id="defs1903">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2542" />
+  </defs>
+  <g
+     id="layer1"
+     style="opacity:1"
+     transform="matrix(9.5340385e-2,0,0,9.5340385e-2,-3.1870931,-0.9062139)">
+    <g
+       id="g2390"
+       style="fill:#729fcf">
+      <path
+         d="M 508.57143,223.79076 C 508.57143,342.1375 412.63244,438.07648 294.28571,438.07648 C 175.93897,438.07648 79.999985,342.1375 79.999985,223.79076 C 79.999985,105.44402 175.93897,9.5050375 294.28571,9.5050375 C 412.63244,9.5050375 508.57143,105.44402 508.57143,223.79076 L 508.57143,223.79076 z"
+         id="path2382"
+         style="fill:#729fcf" />
+      <rect
+         width="522.85712"
+         height="474.28574"
+         rx="174.28572"
+         ry="120"
+         x="33.428574"
+         y="419.50504"
+         id="rect2384"
+         style="fill:#729fcf" />
+    </g>
+    <text
+       x="159.92941"
+       y="632.41937"
+       transform="scale(0.8084629,1.2369151)"
+       id="text2386"
+       xml:space="preserve"
+       style="font-size:778.21777344px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#204a87;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Rudelsberg;-inkscape-font-specification:Rudelsberg Medium"><tspan
+         x="159.92941"
+         y="632.41937"
+         id="tspan2388">?</tspan></text>
+  </g>
+</svg>
 
=== added directory 'src/gui'
=== added file 'src/gui/__init__.py'
--- src/gui/__init__.py	1970-01-01 00:00:00 +0000
+++ src/gui/__init__.py	2009-10-27 21:15:19 +0000
@@ -0,0 +1,2 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
 
=== added file 'src/gui/friendtab.py'
--- src/gui/friendtab.py	1970-01-01 00:00:00 +0000
+++ src/gui/friendtab.py	2009-10-27 21:15:19 +0000
@@ -0,0 +1,15 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
+
+from userfiles import UserFiles
+from userinfo import UserInfo
+from usertab import UserTab
+
+
+class FriendTab(UserTab):
+
+    def __init__(self, control, friendId, *args):
+        apply(UserTab.__init__, (self, control, ) + args)
+        self._friendId = friendId
+        self.addWidget(UserInfo(control, self._friendId))
+        self.addWidget(UserFiles(control, self._friendId))
 
=== added file 'src/gui/hometab.py'
--- src/gui/hometab.py	1970-01-01 00:00:00 +0000
+++ src/gui/hometab.py	2009-10-27 21:15:19 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
+
+from userfiles import UserFiles
+from userinfo import UserInfo
+from usertab import UserTab
+
+
+class HomeTab(UserTab):
+
+    def __init__(self, control,  *args):
+        apply(UserTab.__init__, (self, control, ) + args)
+        self.addWidget(UserInfo(control))
+        self.addWidget(UserFiles(control))
 
=== added file 'src/gui/mainwindow.py'
--- src/gui/mainwindow.py	1970-01-01 00:00:00 +0000
+++ src/gui/mainwindow.py	2009-10-27 21:15:19 +0000
@@ -0,0 +1,18 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
+
+from usertabwidget import UserTabWidget
+
+from PyQt4.QtGui import QIcon
+from PyQt4.QtGui import QMainWindow
+
+
+class MainWindow(QMainWindow):
+
+    def __init__(self, control, *args):
+        apply(QMainWindow.__init__, (self, ) + args)
+        self.setWindowTitle(u'QFriendsLOL')
+        self._control = control
+        self.setWindowIcon(QIcon(self._control.getGFXPath() + '/logo.svg'))
+        self._userTabs = UserTabWidget(control)
+        self.setCentralWidget(self._userTabs)
 
=== added file 'src/gui/newfriendtab.py'
--- src/gui/newfriendtab.py	1970-01-01 00:00:00 +0000
+++ src/gui/newfriendtab.py	2009-10-27 21:15:19 +0000
@@ -0,0 +1,111 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
+
+from usertab import UserTab
+
+from PyQt4.QtGui import QLabel
+from PyQt4.QtGui import QWidget
+from PyQt4.QtGui import QHBoxLayout
+from PyQt4.QtGui import QVBoxLayout
+from PyQt4.QtGui import QPixmap
+from PyQt4.QtGui import QLineEdit
+from PyQt4.QtGui import QPushButton
+from PyQt4.QtGui import QScrollArea
+from PyQt4.QtCore import Qt
+from PyQt4.QtCore import QObject
+from PyQt4.QtCore import SIGNAL
+from PyQt4.QtCore import SLOT
+
+
+class NewFriendTab(UserTab):
+
+    def __init__(self, control, *args):
+        apply(UserTab.__init__, (self, control, ) + args)
+        self._searchBox()
+        self._searchResults()
+
+    def _searchBox(self):
+        searchBoxWidget = QWidget()
+        self.addWidget(searchBoxWidget)
+        searchBoxLayout = QHBoxLayout()
+        searchBoxWidget.setLayout(searchBoxLayout)
+
+        searchBoxLayout.addWidget(self._searchBoxPicture())
+        searchBoxLayout.addWidget(self._searchBoxDataField())
+        searchBoxLayout.addWidget(self._searchBoxSubmit())
+
+        QObject.connect(self._addButton, SIGNAL('pressed()'), self._searchUser)
+        QObject.connect(self._searchField, SIGNAL('returnPressed()'), self._searchUser)
+
+    def _searchBoxPicture(self):
+        picture = QLabel()
+        picture.setPixmap(QPixmap(self._control.getGFXPath() + '/mugshot_new.svg'))
+        return picture
+
+    def _searchBoxDataField(self):
+        self._searchField = QLineEdit()
+        self._errorMessage = QLabel()
+        self._errorMessage.hide()
+
+        searchData = QWidget()
+        searchLayout = QVBoxLayout()
+        searchLayout.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop);
+        searchData.setLayout(searchLayout)
+
+        searchLayout.addWidget(QLabel(u'Enter email or user id:'))
+        searchLayout.addWidget(self._searchField)
+        searchLayout.addWidget(self._errorMessage)
+        return searchData
+
+    def _searchBoxSubmit(self):
+        self._addButton = QPushButton(u'Add')
+        self._addButton.setAutoDefault(True)
+        self._addButton.setDefault(True)
+        return self._addButton
+
+    def _searchResults(self):
+        self._results = QScrollArea()
+        self.addWidget(self._results)
+
+    def _searchUser(self):
+        searchData = str(self._searchField.text())
+        hits = [uid for uid in self._control.getRemote().findUser(searchData) \
+                if not uid == self._control.getRemote().localIdentityHex()]
+
+        old = self._results.widget()
+        if old:
+            old.destroy()
+            self._results.setWidget(QWidget())
+
+        if len(hits) == 0:
+            self._errorMessage.setText(u'No such user.')
+            self._errorMessage.show()
+        elif len(hits) > 1:
+            self._errorMessage.setText(u'Many hits from such user.')
+            self._errorMessage.show()
+            self._addToSearchResults(hits)
+        else:
+            hit = hits[0]
+            if hit in self._control.getStore().getFriends():
+                self._errorMessage.setText(u'Found user is already in your friends.')
+                self._errorMessage.show()
+            else:
+                self._searchField.setText(u'')
+                self._errorMessage.setText(u'')
+                self._errorMessage.hide()
+                if not self._control.getRemote().isValidId(searchData):
+                    self._control.addUser(hit, searchData)
+                else:
+                    self._control.addUser(hit)
+
+    def _addToSearchResults(self, hits):
+        results = QWidget()
+        resultsLayout = QVBoxLayout()
+        results.setLayout(resultsLayout)
+        for hit in hits:
+            resultsLayout.addWidget(self._morphHit(hit))
+        self._results.setWidget(results)
+
+    def _morphHit(self, hit):
+        #TODO: Add better view.
+        return QLabel(u'%s' % hit)
 
=== added file 'src/gui/userfiles.py'
--- src/gui/userfiles.py	1970-01-01 00:00:00 +0000
+++ src/gui/userfiles.py	2009-10-27 21:15:19 +0000
@@ -0,0 +1,34 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
+
+from PyQt4.QtGui import QLabel
+from PyQt4.QtGui import QScrollArea
+from PyQt4.QtGui import QVBoxLayout
+from PyQt4.QtCore import Qt
+
+
+class UserFiles(QScrollArea):
+
+    def __init__(self, control, userId = None, *args):
+        apply(QScrollArea.__init__, (self, ) + args)
+
+        self._control = control
+        self._userId = self._control.getRemote().localIdentityHex() \
+                if userId == None else userId
+
+        self._layout = QVBoxLayout()
+        self.setLayout(self._layout)
+
+        self.update()
+
+    def update(self):
+        files = self._control.getRemote().getfilenames(self._userId)
+        if files:
+            for file in files:
+                fileLabel = QLabel(u'%s' % file)
+                fileLabel.setAlignment(Qt.AlignLeft|Qt.AlignTop)
+                self._layout.addWidget(fileLabel)
+        else:
+            notFoundLabel = QLabel(u'No files found.')
+            notFoundLabel.setAlignment(Qt.AlignHCenter|Qt.AlignTop)
+            self._layout.addWidget(notFoundLabel)
 
=== added file 'src/gui/userinfo.py'
--- src/gui/userinfo.py	1970-01-01 00:00:00 +0000
+++ src/gui/userinfo.py	2009-10-27 21:15:19 +0000
@@ -0,0 +1,90 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
+
+from userpicture import UserPicture
+
+from PyQt4.QtGui import QHBoxLayout
+from PyQt4.QtGui import QLabel
+from PyQt4.QtGui import QLineEdit
+from PyQt4.QtGui import QPushButton
+from PyQt4.QtGui import QVBoxLayout
+from PyQt4.QtGui import QWidget
+from PyQt4.QtCore import Qt
+from PyQt4.QtCore import QObject
+from PyQt4.QtCore import SIGNAL
+from PyQt4.QtCore import SLOT
+
+
+class UserInfo(QWidget):
+
+    def __init__(self, control, userId = None, *args):
+        apply(QWidget.__init__, (self, ) + args)
+        self._control = control
+        self._layout = QHBoxLayout()
+        self._layout.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop);
+        self.setLayout(self._layout)
+        self._email = None
+        self._layout.addWidget(UserPicture(self._control, userId))
+        if userId:
+            self._friendHeader(userId)
+        else:
+            self._userHeader()
+        self._uid = userId
+
+    def _userHeader(self):
+        emailData = self._control.getStore().getEmail()
+        if not emailData:
+            emailData = ''
+        self._email = QLineEdit(u'%s' % emailData)
+        QObject.connect(self._email, SIGNAL('returnPressed()'), self._changeEmail)
+
+        data = QWidget()
+        dataLayout = QVBoxLayout()
+        dataLayout.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop);
+        data.setLayout(dataLayout)
+
+        userId = QLabel(u'User id: %s' % self._control.getRemote().localIdentityHex())
+        userId.setTextInteractionFlags(Qt.TextSelectableByMouse)
+        dataLayout.addWidget(userId)
+
+        email = QWidget()
+        emailLayout = QHBoxLayout()
+        email.setLayout(emailLayout)
+        emailLayout.addWidget(QLabel(u'Email:'))
+        emailLayout.addWidget(self._email)
+        dataLayout.addWidget(email)
+
+        self._layout.addWidget(data)
+
+    def _friendHeader(self, friendId):
+        data = QWidget()
+
+        dataLayout = QVBoxLayout()
+        dataLayout.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop);
+
+        userId = QLabel(u'User id: %s' % friendId)
+        userId.setTextInteractionFlags(Qt.TextSelectableByMouse)
+        dataLayout.addWidget(userId)
+
+        emailData = self._control.getStore().getEmail(friendId)
+        if emailData:
+            email = QLabel(u'Email: %s' % emailData)
+            email.setTextInteractionFlags(Qt.TextSelectableByMouse)
+            dataLayout.addWidget(email)
+
+        data.setLayout(dataLayout)
+        self._layout.addWidget(data)
+
+        actionButton = QPushButton(u'Forget')
+        QObject.connect(actionButton, SIGNAL('pressed()'), self._forgetUser)
+        self._layout.addWidget(actionButton)
+
+    def _forgetUser(self):
+        self._control.forgetUser(self._uid)
+
+    def _changeEmail(self):
+        self._control.changeEmail(str(self._email.text()))
+
+    def _changeMugshot(self):
+        #self._control.changeMugshot(str(self._email.text()))
+        pass
 
=== added file 'src/gui/userpicture.py'
--- src/gui/userpicture.py	1970-01-01 00:00:00 +0000
+++ src/gui/userpicture.py	2009-10-27 21:15:19 +0000
@@ -0,0 +1,59 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
+
+from PyQt4.QtGui import QHBoxLayout
+from PyQt4.QtGui import QImage
+from PyQt4.QtGui import QPushButton
+from PyQt4.QtGui import QPixmap
+from PyQt4.QtGui import QIcon
+from PyQt4.QtGui import QFileDialog
+from PyQt4.QtCore import Qt
+from PyQt4.QtCore import QSize
+from PyQt4.QtCore import QObject
+from PyQt4.QtCore import SIGNAL
+from PyQt4.QtCore import SLOT
+
+
+class UserPicture(QPushButton):
+
+    def __init__(self, control, userId = None, *args):
+        apply(QPushButton.__init__, (self, ) + args)
+        self._control = control
+        self._userId = userId
+        self.setIconSize(QSize(100, 100))
+        self.setFlat(True)
+        self.update()
+        if userId:
+            QObject.connect(self, SIGNAL('pressed()'), self._pictureUpdate)
+        else:
+            QObject.connect(self, SIGNAL('pressed()'), self._pictureChange)
+
+    def update(self):
+        mugshot = self._control.getStore().getMugshot(self._userId)
+        if mugshot:
+            mugData = QPixmap()
+            mugData.loadFromData(mugshot)
+            pictureData = mugData.scaled(100,100, Qt.KeepAspectRatio)
+        else:
+            pictureData = QPixmap(self._control.getGFXPath() + '/mugshot_unknown.svg')
+        self.setIcon(QIcon(pictureData))
+
+    def _pictureChange(self):
+        filePath = QFileDialog.getOpenFileName(None, u'Open Image', '', 'Image Files (*.png *.jpg *.bmp *.svg)');
+        import os.path
+        if os.path.isfile(filePath):
+            file = open(filePath, 'r')
+            data = file.read()
+            file.close()
+            self._control.changeMugshot(data)
+            self.update()
+
+    def _pictureUpdate(self):
+        try:
+            mugshot = self._control.getRemote().retrieve('mugshot', self._userId)
+        except:
+            mugshot = None
+        if mugshot:
+            self._control.getStore().putMugshot(mugshot, self._userId)
+            self.update()
+            self._control.refreshTab(self._userId)
 
=== added file 'src/gui/usertab.py'
--- src/gui/usertab.py	1970-01-01 00:00:00 +0000
+++ src/gui/usertab.py	2009-10-27 21:15:19 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
+
+from PyQt4.QtGui import QWidget
+from PyQt4.QtGui import QVBoxLayout
+from PyQt4.QtCore import Qt
+
+
+class UserTab(QWidget):
+
+    def __init__(self, control, *args):
+        apply(QWidget.__init__, (self, ) + args)
+        self._control = control
+        self._layout = QVBoxLayout()
+        self._layout.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop);
+        self.setLayout(self._layout)
+
+    def addWidget(self, widget):
+        self._layout.addWidget(widget)
 
=== added file 'src/gui/usertabwidget.py'
--- src/gui/usertabwidget.py	1970-01-01 00:00:00 +0000
+++ src/gui/usertabwidget.py	2009-10-27 21:15:19 +0000
@@ -0,0 +1,66 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
+
+from hometab import HomeTab
+from friendtab import FriendTab
+from newfriendtab import NewFriendTab
+
+from PyQt4.QtGui import QIcon
+from PyQt4.QtGui import QTabWidget
+from PyQt4.QtGui import QPixmap
+
+
+class UserTabWidget(QTabWidget):
+
+    def __init__(self, control, *args):
+        apply(QTabWidget.__init__, (self, ) + args)
+        self._control = control
+        self._control.addUserTabWidget(self)
+        self._addUserTab()
+        self._addFriendTabs()
+        self._addNewFriendTab()
+
+    def _addUserTab(self):
+        self.addTab(HomeTab(self._control), QIcon(self._control.getGFXPath() + '/home.svg'), u'&Home')
+
+    def _addFriendTabs(self):
+        order = 0
+        for friendId in self._control.getStore().getFriends():
+            (icon, title) = self._getFriendTabInfo(friendId)
+            self.addTab(FriendTab(self._control, friendId), icon, u'%s' % title)
+            self._control.addUserTab((order, friendId))
+            order+=1
+
+    def addFriendTab(self, friendId):
+        pos = self.count()-1
+        order = pos-1
+        (icon, title) = self._getFriendTabInfo(friendId)
+        self.insertTab(pos, FriendTab(self._control, friendId), icon, u'%s' % title)
+        self._control.addUserTab((order, friendId))
+        self.setCurrentIndex(pos)
+
+    def _getFriendTabInfo(self, uid):
+        email = self._control.getStore().getEmail(uid)
+
+        if email == None:
+            title = uid[:5]
+        else:
+            title = email.split('@')[0]
+
+        return (self.getFriendIcon(uid), title)
+
+    def getFriendIcon(self, uid):
+        mugshot = self._control.getStore().getMugshot(uid)
+        if mugshot:
+            iconData = QPixmap()
+            iconData.loadFromData(mugshot)
+            icon = QIcon(iconData)
+        else:
+            icon = self._loadUnknownMugshot()
+        return icon
+
+    def _addNewFriendTab(self):
+        self.addTab(NewFriendTab(self._control), u'+')
+
+    def _loadUnknownMugshot(self):
+        return QIcon(self._control.getGFXPath() + '/mugshot_unknown.svg')
 
=== added file 'src/guicontrol.py'
--- src/guicontrol.py	1970-01-01 00:00:00 +0000
+++ src/guicontrol.py	2009-10-27 21:15:19 +0000
@@ -0,0 +1,76 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
+
+from remote import Remote
+from store import Store
+from realfs import Realfs
+
+import os
+
+
+class GUIControl(object):
+
+    def __init__(self):
+        self._gfx = ''
+        self._store = Store(Realfs([os.environ['HOME'], '.qfriendslol']))
+        self._remote = Remote()
+        self._tabW = None
+        self._tabs = []
+
+    def setGFXPath(self, path):
+        self._gfx = path
+
+    def getGFXPath(self):
+        return self._gfx
+
+    def getRemote(self):
+        return self._remote
+
+    def getStore(self):
+        return self._store
+
+    def addUserTabWidget(self, tabW):
+        self._tabW = tabW
+
+    def addUserTab(self, tuple):
+        self._tabs.append(tuple)
+
+    def changeEmail(self, email):
+        if not email == self.getStore().getEmail():
+            self.getStore().putEmail(email)
+            self.getRemote().advertise(email)
+
+    def changeMugshot(self, mugshot):
+        if not mugshot == self.getStore().getMugshot():
+            self.getStore().putMugshot(mugshot)
+            self.getRemote().store('mugshot', mugshot)
+
+    def addUser(self, uid, email = None):
+        self.getStore().addFriend(uid)
+        if email:
+            self.getStore().putEmail(email, uid)
+        self.updateUserData(uid)
+        self._tabW.addFriendTab(uid)
+
+    def forgetUser(self, uid):
+        self.getStore().removeFriend(uid)
+        index = map(lambda (x,_): x, filter(lambda (_,y): y == uid,
+            self._tabs))[0]
+        self._tabs = filter(lambda (x,_): x < index, self._tabs) + map(
+                lambda (x,y): (x-1,y), filter(
+                    lambda (x,_): x > index, self._tabs))
+        self._tabW.removeTab(index+1)
+
+    def updateUserData(self, uid):
+        try:
+            rdata = self.getRemote().retrieve('mugshot', uid)
+        except:
+            rdata = None
+
+        if rdata:
+            self.getStore().putMugshot(rdata, uid)
+
+    def refreshTab(self, userId):
+        index = map(lambda (x,_): x, filter(lambda (_,y): y == userId,
+            self._tabs))[0]+1
+        self._tabW.setTabIcon(index, self._tabW.getFriendIcon(userId))
 
=== added file 'src/qfriendslol.pyw'
--- src/qfriendslol.pyw	1970-01-01 00:00:00 +0000
+++ src/qfriendslol.pyw	2009-10-27 21:15:19 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/python2.6
+# -*- coding: utf-8 -*-
+
+from guicontrol import GUIControl
+from gui.mainwindow import MainWindow
+
+import sys
+import os.path
+from PyQt4.QtGui import QApplication
+
+def main():
+    app = QApplication(sys.argv)
+
+    control = GUIControl()
+    control.setGFXPath(os.path.dirname(__file__) + '/gfx')
+    #configTestStore(control.getStore())
+
+    window = MainWindow(control)
+    window.show()
+
+    app.exec_()
+
+def configTestStore(store):
+    store.putEmail('me@localhost')
+    store.addFriend('8682065025227700138022978937487170069337')
+    store.putEmail('[e-mail]', '8682065025227700138022978937487170069337')
+    store.putMugshot(open(os.path.dirname(__file__) + '/../branding/qfriendslol_logo_64x64.png').read(), '8682065025227700138022978937487170069337')
+    store.addFriend('e4e8743ffd801b2a126de53607c9ccd383fb71b8')
+
+if __name__ == '__main__':
+    main()
 
=== modified file 'src/remote.py'
--- src/remote.py	2009-10-27 14:38:48 +0000
+++ src/remote.py	2009-10-27 21:15:19 +0000
@@ -54,7 +54,7 @@
         qfriendslol-1-metsä.jpg      → piece1
         '''
         keyformat = 'qfriendslol-%s-' + filename
-        block = int(self.get(keyformat % 0, userid))
+        block = self.get(keyformat % 0, userid)
         if block == None:
             raise Error('Header unavailable')
         try:
@@ -119,24 +119,23 @@
     f = open('uppi.jpeg')
     upattava = f.read()
     f.close()
-    r.store('mugshot.jpeg',upattava)
+    r.store('mugshot',upattava)
 
 
     r.advertise('[e-mail]')
     users = r.findUser('[e-mail]')
     user = users[0]
     print user
-    (size,time)= r.fileinfo('mugshot.jpeg', user)
+    (size,time)= r.fileinfo('mugshot', user)
     
     from logic import seconds2string
     print seconds2string(time)
     print '%sB' % size
     
-    r.putfilenames(['mugshot.jpeg'])
+    r.putfilenames(['mugshot'])
     
-    data = r.retrieve('mugshot.jpeg', user)
+    data = r.retrieve('mugshot', user)
 
-    f = open('mugshot.jpeg','w')
+    f = open('mugshot','w')
     f.write(data)
     f.close()
-        
 
=== modified file 'src/store.py'
--- src/store.py	2009-10-27 00:55:02 +0000
+++ src/store.py	2009-10-27 21:15:19 +0000
@@ -5,21 +5,21 @@
 
     def __init__(self, fs):
         self._fs = fs
-        self._friends = []
+        self._updFriends()
 
     def putMugshot(self, pic, userid = None):
         if (userid == None):
-            self._fs.write(['mugshot.jpeg'], pic)
+            self._fs.write(['mugshot'], pic)
         elif self._isValidId(userid) and userid in self.getFriends():
-            self._fs.write([self._getFriendFolderName(userid), 'mugshot.jpeg'], pic)
+            self._fs.write(['friends', self._getFriendFolderName(userid), 'mugshot'], pic)
         else:
             raise ValueError
 
     def getMugshot(self, userid = None):
         if (userid == None):
-            return self._fs.read(['mugshot.jpeg'])
+            return self._fs.read(['mugshot'])
         elif self._isValidId(userid) and userid in self.getFriends():
-            return self._fs.read([self._getFriendFolderName(userid), 'mugshot.jpeg'])
+            return self._fs.read(['friends', self._getFriendFolderName(userid), 'mugshot'])
         else:
             raise ValueError
 
@@ -27,7 +27,7 @@
         if (userid == None):
             self._fs.write(['email.txt'], email)
         elif self._isValidId(userid) and userid in self.getFriends():
-            self._fs.write([self._getFriendFolderName(userid), 'email.txt'], email)
+            self._fs.write(['friends', self._getFriendFolderName(userid), 'email.txt'], email)
         else:
             raise ValueError
 
@@ -35,7 +35,7 @@
         if (userid == None):
             return self._fs.read(['email.txt'])
         elif self._isValidId(userid) and userid in self.getFriends():
-            return self._fs.read([self._getFriendFolderName(userid), 'email.txt'])
+            return self._fs.read(['friends', self._getFriendFolderName(userid), 'email.txt'])
         else:
             raise ValueError
 
@@ -56,18 +56,19 @@
         return map(lambda (_, id): id, self._friends)
 
     def _updFriends(self):
-        self._friends = []
-        for item in self._fs.ls(['friends']):
-            item = item.split('-')
-            if (len(item) == 2) and (self._isValidId(item[1])):
-                self._friends.append((item[0], item[1]))
+        self._friends = filter(lambda (_, uid): self._isValidId(uid), map(lambda folder: tuple(folder.split('-')), self._fs.ls(['friends'])))
+
 
     def _getFriendFolderName(self, userid):
         return "%s-%s" % (self._getFriendNum(userid), userid)
 
     def _getFriendNum(self, userid):
-        return map(lambda (order,_): order, filter(lambda (_,id): id == userid,
-            self._friends))[0]
+        orders = map(lambda (order,_): order, filter(lambda (_,id): id == userid,
+            self._friends))
+        if orders:
+            return orders[0]
+        else:
+            return -1
 
     def _nextFriendNum(self):
         max = 0