add title to network interface edit dialog, remove scroll_to hack since gtk2+ is fixed now

6 files changed, 2 insertions, 29 deletions

diff --git a/iw/language_gui.py b/iw/language_gui.py
index 0acc59d84..a31b87c1e 100644
--- a/iw/language_gui.py
+++ b/iw/language_gui.py
@@ -16,8 +16,6 @@ import gtk
 from iw_gui import *
 from rhpl.translate import _, N_
 
-from gui import setupTreeViewFixupIdleHandler
-
 class LanguageWindow (InstallWindow):
 
     windowTitle = N_("Language Selection")
@@ -101,8 +99,6 @@ class LanguageWindow (InstallWindow):
         sw.set_policy (gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
         sw.add (self.listView)
 
-	setupTreeViewFixupIdleHandler(self.listView, self.listStore)
-        
         mainBox.pack_start (hbox, gtk.FALSE, gtk.FALSE, 10)
         mainBox.pack_start (sw, gtk.TRUE, gtk.TRUE)
 
diff --git a/iw/language_support_gui.py b/iw/language_support_gui.py
index 0b75e4836..67fadcfc5 100644
--- a/iw/language_support_gui.py
+++ b/iw/language_support_gui.py
@@ -17,8 +17,6 @@ from iw_gui import *
 from flags import flags
 from rhpl.translate import _, N_
 
-from gui import setupTreeViewFixupIdleHandler
-
 class LanguageSupportWindow (InstallWindow):
     windowTitle = _("Additional Language Support")
     htmlTag = "langsupport"
@@ -238,7 +236,4 @@ class LanguageSupportWindow (InstallWindow):
 
 	store = self.languageList.get_model()
 
-	setupTreeViewFixupIdleHandler(self.languageList,
-				      self.languageList.get_model())
-
         return vbox
diff --git a/iw/mouse_gui.py b/iw/mouse_gui.py
index 1d81fa39d..d732e1881 100644
--- a/iw/mouse_gui.py
+++ b/iw/mouse_gui.py
@@ -19,8 +19,6 @@ from re import *
 from rhpl.translate import _, N_
 from flags import flags
 
-from gui import setupTreeViewFixupIdleHandler
-
 class MouseWindow(InstallWindow):
     windowTitle = N_("Mouse Configuration")
     htmlTag = "mouse"
@@ -246,9 +244,6 @@ class MouseWindow(InstallWindow):
         sw.add(self.mouseview)
         box.pack_start(sw)
 
-	# ok hack to see if we can get scroll_to_cell to work
-	setupTreeViewFixupIdleHandler(self.mouseview, self.mousestore)
-        
         # then the port list
         frame = gtk.Frame()
         frame.set_shadow_type(gtk.SHADOW_IN)
diff --git a/iw/network_gui.py b/iw/network_gui.py
index c97c84542..77a60219e 100644
--- a/iw/network_gui.py
+++ b/iw/network_gui.py
@@ -195,7 +195,8 @@ class NetworkWindow(InstallWindow):
 	onboot = model.get_value(iter, 0)
 
 	# create dialog box
-        editWin = gtk.Dialog(flags=gtk.DIALOG_MODAL)
+        editWin = gtk.Dialog(_("Edit Interface %s") % (dev,),
+			     flags=gtk.DIALOG_MODAL)
         gui.addFrame(editWin)
         editWin.set_modal(gtk.TRUE)
 #        editWin.set_size_request(350, 200)
diff --git a/iw/timezone_map_gui.py b/iw/timezone_map_gui.py
index 3b5ee39b3..ca713778a 100644
--- a/iw/timezone_map_gui.py
+++ b/iw/timezone_map_gui.py
@@ -20,8 +20,6 @@ import re
 import math
 from rhpl.translate import _
 
-from gui import setupTreeViewFixupIdleHandler
-
 class Enum:
     def __init__(self, *args):
         i = 0
@@ -119,9 +117,6 @@ class TimezoneMap(gtk.VBox):
 
         self.setCurrent(self.currentEntry)
 
-	# ok hack to see if we can get scroll_to_cell to work
-	setupTreeViewFixupIdleHandler(self.listView, self.listStore)
-
     def getCurrent(self):
         return self.currentEntry
 
diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py
index ef22488fc..6bc95f997 100644
--- a/iw/xconfig_gui.py
+++ b/iw/xconfig_gui.py
@@ -30,8 +30,6 @@ from rhpl.videocard import Videocard_blacklist
 
 from desktop import ENABLE_DESKTOP_CHOICE
 
-from gui import setupTreeViewFixupIdleHandler
-
 ddc_monitor_string = _("DDC Probed Monitor")
 unprobed_monitor_string = _("Unprobed Monitor")
 
@@ -718,9 +716,6 @@ class MonitorWindow (InstallWindow):
         
         box.pack_start (synctable, gtk.FALSE, gtk.FALSE)
 
-	# ok hack to see if we can get scroll_to_cell to work
-	setupTreeViewFixupIdleHandler(self.monitorview, self.monitorstore)
-
         return box
 
 class XConfigWindow (InstallWindow):
@@ -1063,8 +1058,4 @@ class XConfigWindow (InstallWindow):
 	self.probedMem = self.videocard.primaryCard(useProbed=1).getVideoRam()
 	self.setCurrent(self.currentCard, self.currentMem)
 
-	# ok hack to see if we can get scroll_to_cell to work
-	setupTreeViewFixupIdleHandler(self.cardview, self.cardstore)
-
-
         return self.topbox