From b758d7a59ba9977c3d7c8d09c34b6b733aa5270c Mon Sep 17 00:00:00 2001
From: Necoro <>
Date: Tue, 27 Nov 2007 01:10:02 +0000
Subject: r570@Devoty: necoro | 2007-11-27 02:08:21 +0100 Added scrollbars
to update window
---
portato/gui/gtk/basic.py | 1 +
portato/gui/gtk/windows.py | 23 +++--
portato/gui/templates/portato.glade | 168 +++++++++++++++++++-----------------
3 files changed, 108 insertions(+), 84 deletions(-)
(limited to 'portato')
diff --git a/portato/gui/gtk/basic.py b/portato/gui/gtk/basic.py
index 02caaf5..27c932e 100644
--- a/portato/gui/gtk/basic.py
+++ b/portato/gui/gtk/basic.py
@@ -70,6 +70,7 @@ class AbstractDialog (Window):
# set parent
self.window.set_transient_for(parent)
+ self.parent = parent
# catch the ESC-key
self.window.connect("key-press-event", self.cb_key_pressed)
diff --git a/portato/gui/gtk/windows.py b/portato/gui/gtk/windows.py
index d154ab1..fb9836c 100644
--- a/portato/gui/gtk/windows.py
+++ b/portato/gui/gtk/windows.py
@@ -105,7 +105,7 @@ class UpdateWindow (AbstractDialog):
def __init__ (self, parent, packages, queue, jump_to):
AbstractDialog.__init__(self, parent)
-
+
self.queue = queue
self.jump = jump_to
@@ -132,6 +132,21 @@ class UpdateWindow (AbstractDialog):
for p in self.packages:
store.append([False, p.get_cpv()])
+ def cb_set_size (self, *args):
+ """
+ This callback is called shortly before drawing.
+ It calculates the optimal size of the window.
+ The optimum is defined as: as large as possible w/o scrollbars
+ """
+
+ bb = self.tree.get_widget("updateBB")
+ vals = (self.view.get_vadjustment().upper+bb.size_request()[1]+10, # max size of list + size of BB + constant
+ self.parent.get_size()[1]) # size of the parent -> maximum size
+ debug("Size values for the list and for the parent: %d / %d", *vals)
+ val = int(min(vals))
+ debug("Minimum value: %d", val)
+ self.window.set_geometry_hints(self.window, min_height = val)
+
def cb_select_all_clicked (self, btn):
model = self.view.get_model()
iter = model.get_iter_first()
@@ -789,9 +804,7 @@ class MainWindow (Window):
# main window stuff
Window.__init__(self)
self.window.set_title(self.main_title)
- mHeight = 800
- if gtk.gdk.screen_height() <= 800: mHeight = 600
- self.window.set_geometry_hints (self.window, min_width = 600, min_height = mHeight, max_height = gtk.gdk.screen_height(), max_width = gtk.gdk.screen_width())
+ self.window.set_geometry_hints (self.window, max_height = gtk.gdk.screen_height(), max_width = gtk.gdk.screen_width())
# booleans
self.doUpdate = False
@@ -837,7 +850,7 @@ class MainWindow (Window):
splash(_("Building frontend"))
# set vpaned position
self.vpaned = self.tree.get_widget("vpaned")
- self.vpaned.set_position(int(mHeight/2))
+ self.vpaned.set_position(int(self.window.get_size()[1]/2))
# cat and pkg list
self.sortPkgListByName = True
diff --git a/portato/gui/templates/portato.glade b/portato/gui/templates/portato.glade
index 2459ffb..64f4555 100644
--- a/portato/gui/templates/portato.glade
+++ b/portato/gui/templates/portato.glade
@@ -1754,85 +1754,6 @@
-
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Updateble Packages
- GTK_WIN_POS_CENTER_ON_PARENT
- True
- True
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 5
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- False
- True
- True
-
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- True
- GTK_BUTTONBOX_SPREAD
-
-
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- _Close
- True
- 0
-
-
-
-
-
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Select _All
- True
- 0
-
-
-
- 1
-
-
-
-
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- _Install Selected
- True
- 0
-
-
-
- 2
-
-
-
-
- False
- 1
-
-
-
-
-
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
5
@@ -2007,4 +1928,93 @@ German - René 'Necoro' Neumann
+
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Updateble Packages
+ GTK_WIN_POS_CENTER_ON_PARENT
+ True
+ True
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 5
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ False
+ True
+ True
+
+
+
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ True
+ GTK_BUTTONBOX_SPREAD
+
+
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ _Close
+ True
+ 0
+
+
+
+
+
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Select _All
+ True
+ 0
+
+
+
+ 1
+
+
+
+
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ _Install Selected
+ True
+ 0
+
+
+
+ 2
+
+
+
+
+ False
+ 1
+
+
+
+
+
--
cgit v1.2.3-54-g00ecf