Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaul Gutierrez Segales <rgs@collabora.co.uk>2011-09-12 09:07:02 (GMT)
committer Simon Schampijer <simon@laptop.org>2011-09-12 10:33:49 (GMT)
commit9a0b038a53f16a065c40b467df3c40c90081411f (patch)
tree138a5810a56f6cffaafb37ce45ac7a9eea0f0f3f
parentf689a563377e6653a7e13cf8dcf60b5ed7231f92 (diff)
Got clipboard frame panel working
-rw-r--r--src/jarabe/frame/clipboardpanelwindow.py1
-rw-r--r--src/jarabe/frame/frame.py1
-rw-r--r--src/jarabe/frame/framewindow.py3
3 files changed, 3 insertions, 2 deletions
diff --git a/src/jarabe/frame/clipboardpanelwindow.py b/src/jarabe/frame/clipboardpanelwindow.py
index 063dddc..aefec7b 100644
--- a/src/jarabe/frame/clipboardpanelwindow.py
+++ b/src/jarabe/frame/clipboardpanelwindow.py
@@ -38,6 +38,7 @@ class ClipboardPanelWindow(FrameWindow):
self._clipboard.connect('owner-change', self._owner_change_cb)
self._clipboard_tray = ClipboardTray()
+ self._clipboard_tray.show()
self.append(self._clipboard_tray)
# Receiving dnd drops
diff --git a/src/jarabe/frame/frame.py b/src/jarabe/frame/frame.py
index 84041a8..ad4c2d6 100644
--- a/src/jarabe/frame/frame.py
+++ b/src/jarabe/frame/frame.py
@@ -191,7 +191,6 @@ class Frame(object):
def _create_bottom_panel(self):
panel = self._create_panel(gtk.POS_BOTTOM)
- # TODO: same issue as in _create_top_panel()
devices_tray = DevicesTray()
panel.append(devices_tray)
devices_tray.show()
diff --git a/src/jarabe/frame/framewindow.py b/src/jarabe/frame/framewindow.py
index abc3b3c..11b654c 100644
--- a/src/jarabe/frame/framewindow.py
+++ b/src/jarabe/frame/framewindow.py
@@ -73,7 +73,8 @@ class FrameWindow(gtk.Window):
spacer_start.show()
self._container = gtk.VBox()
- self._container.set_size_request(-1, gtk.gdk.screen_height())
+ height = gtk.gdk.screen_height() - (2*(padding+border))
+ self._container.set_size_request(-1, height)
self._bg.pack_start(self._container, True, True)
self._container.show()