From c496a470bb31474c9bf9a430528d47f8bc912425 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Wed, 11 May 2005 21:58:20 +0000 Subject: [PATCH] Updates for GTK 2.6 (Ken Hayber). git-svn-id: https://rox.svn.sourceforge.net/svnroot/rox/trunk/Archive@3923 66de3db3-b00d-0410-b41b-f4738ad19bea --- Help/Changes | 4 ++++ box.py | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Help/Changes b/Help/Changes index 04153d9..a7489ba 100644 --- a/Help/Changes +++ b/Help/Changes @@ -4,6 +4,10 @@ * unrar can infinite loop asking for confirm to terminal? * +11-May-2005 +~~~~~~~~~~~ +Updates for GTK 2.6 (Ken Hayber). + 17-Apr-2005 (Release 1.9.5) ~~~~~~~~~~~ Added support for Ace archives (Rodolfo Borges). diff --git a/box.py b/box.py index a6d8489..e92b839 100644 --- a/box.py +++ b/box.py @@ -5,7 +5,7 @@ from rox import saving, g import formats -use_combo_box=hasattr(g, 'ComboBox') +use_combo_box = hasattr(g, 'ComboBox') class ArchiveBox(saving.SaveBox, saving.Saveable): "A savebox with an operation selector." @@ -27,13 +27,16 @@ class ArchiveBox(saving.SaveBox, saving.Saveable): def build_main_area(self): self.vbox.add(self.save_area) + frame = g.Frame(None) + frame.set_shadow_type(g.SHADOW_NONE) if use_combo_box: self.operation = g.combo_box_new_text() else: self.operation = g.OptionMenu() - self.vbox.pack_start(self.operation, False, True, 0) - self.operation.show() - self.operation.set_border_width(5) + frame.add(self.operation) + self.vbox.pack_start(frame, False, True, 0) + frame.set_border_width(3) + frame.show_all() self.updating = 0 self.delete_choice = g.CheckButton(_('Delete file afterwards?')) @@ -106,7 +109,10 @@ class ArchiveBox(saving.SaveBox, saving.Saveable): i = 0 for op in self.ops: if op and name.endswith('.' + op.extension): - self.operation.set_history(i) + if use_combo_box: + self.operation.set_active(i) + else: + self.operation.set_history(i) break i += 1 -- 2.11.4.GIT