summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog13
-rwxr-xr-xgui.py19
-rw-r--r--iw/installpath_gui.py2
-rw-r--r--iw/language_gui.py3
-rw-r--r--iw/package_gui.py4
-rw-r--r--iw/progress_gui.py4
-rw-r--r--iw/welcome_gui.py3
7 files changed, 32 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 6bc34e2e4..cc639c0dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-01-26 Chris Lumens <clumens@redhat.com>
+
+ * gui.py: Fixed deprecation warnings for gtk.idle_add,
+ gtk.idle_remove, gtk.timeout_add, gtk.timeout_remove.
+ * iw/installpath_gui.py: Fixed deprecation warning for
+ ics.readPixmap.
+ * iw/language_gui.py: Likewise.
+ * iw/welcome_gui.py: Likewise.
+ * iw/package_gui.py: Fixed deprecation warnings for gtk.idle_add,
+ gtk.idle_remove.
+ * iw/progress_gui.py: Fixed deprecation warnings for
+ ics.readPixmapDithered.
+
2005-01-25 Peter Jones <pjones@redhat.com>
* loader2/method.c: make validIsoImages check the buildstamp and report
diff --git a/gui.py b/gui.py
index eb3006266..b44fff85d 100755
--- a/gui.py
+++ b/gui.py
@@ -24,6 +24,7 @@ import sys
import parted
import gtk
import gtk.glade
+import gobject
import htmlbuffer
import rpm
import kudzu
@@ -188,7 +189,7 @@ def handleShiftPrintScrnRelease (window, event):
def setupTreeViewFixupIdleHandler(view, store):
id = {}
- id["id"] = gtk.idle_add(scrollToIdleHandler, (view, store, id))
+ id["id"] = gobject.idle_add(scrollToIdleHandler, (view, store, id))
def scrollToIdleHandler((view, store, iddict)):
if not view or not store or not iddict:
@@ -212,7 +213,7 @@ def scrollToIdleHandler((view, store, iddict)):
view.scroll_to_cell(path, col, gtk.TRUE, 0.5, 0.5)
if id:
- gtk.idle_remove(id)
+ gobject.source_remove(id)
# setup globals
def processEvents():
@@ -948,7 +949,7 @@ class InstallControlWindow:
if not still_running:
self.releaseNotesViewerPid = None
- gtk.timeout_remove(self.releaseNotesViewerIdleID)
+ gobject.source_remove(self.releaseNotesViewerIdleID)
self.mainxml.get_widget("buttonBar").set_sensitive(gtk.TRUE)
self.releaseNotesModalDummy.destroy()
@@ -981,7 +982,7 @@ class InstallControlWindow:
self.releaseNotesStartViewerAttempts += 1
if self.releaseNotesStartViewerAttempts > 15:
log("Giving up trying to run viewer!")
- gtk.timeout_remove(self.releaseNotesStartViewerIdleID)
+ gobject.source_remove(self.releaseNotesStartViewerIdleID)
self.releaseNotesStartViewer = 0
self.releaseNotesStartViewerAttempts = 0
setCursorToNormal()
@@ -989,7 +990,7 @@ class InstallControlWindow:
self.releaseNotesStartViewer = 1
else:
# started viewer succesfully, remove idle handler
- gtk.timeout_remove(self.releaseNotesStartViewerIdleID)
+ gobject.source_remove(self.releaseNotesStartViewerIdleID)
return gtk.TRUE
@@ -1016,7 +1017,7 @@ class InstallControlWindow:
self.releaseNotesStartViewerAttempts = 0
self.releaseNotesStartViewer = 1
- self.releaseNotesStartViewerIdleID = gtk.timeout_add(250, self.releaseNotesPollStartViewerCB, None)
+ self.releaseNotesStartViewerIdleID = gobject.timeout_add(250, self.releaseNotesPollStartViewerCB, None)
# we make cursor busy, on assumption when viewer app runs it will
# make it normal
@@ -1063,7 +1064,7 @@ class InstallControlWindow:
# python interpretter cannot act on signals reliably while inside
# the gtk main loop.
#
- self.releaseNotesViewerIdleID = gtk.timeout_add(50, self.releaseNotesViewerPollExitCB, None)
+ self.releaseNotesViewerIdleID = gobject.timeout_add(50, self.releaseNotesViewerPollExitCB, None)
self.releaseNotesViewerPid = child
#desensitize button bar at bottom of screen
@@ -1140,7 +1141,7 @@ class InstallControlWindow:
takeScreenShot()
self.nextClicked()
else:
- gtk.idle_remove(self.handle)
+ gobject.source_remove(self.handle)
def setScreen (self):
(step, args) = self.dispatch.currentStep()
@@ -1201,7 +1202,7 @@ class InstallControlWindow:
self.installFrame.add(new_screen)
self.installFrame.show_all()
- self.handle = gtk.idle_add(self.handleRenderCallback)
+ self.handle = gobject.idle_add(self.handleRenderCallback)
if self.reloadRcQueued:
self.window.reset_rc_styles()
diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py
index fc7f5fc85..de7829d50 100644
--- a/iw/installpath_gui.py
+++ b/iw/installpath_gui.py
@@ -58,7 +58,7 @@ class InstallPathWindow (InstallWindow):
for (name, object, pixmap) in self.installTypes:
descr = object.description
- r.addEntry(name, _(name), pixmap=self.ics.readPixmap(pixmap),
+ r.addEntry(name, _(name), pixmap=gui.readImageFromFile(pixmap),
descr=_(descr))
return r
diff --git a/iw/language_gui.py b/iw/language_gui.py
index 017a06e4c..86f85ee00 100644
--- a/iw/language_gui.py
+++ b/iw/language_gui.py
@@ -13,6 +13,7 @@
import gobject
import gtk
+import gui
from iw_gui import *
from rhpl.translate import _, N_
@@ -53,7 +54,7 @@ class LanguageWindow (InstallWindow):
mainBox = gtk.VBox (gtk.FALSE, 10)
hbox = gtk.HBox(gtk.FALSE, 5)
- pix = self.ics.readPixmap ("gnome-globe.png")
+ pix = gui.readImageFromFile ("gnome-globe.png")
if pix:
a = gtk.Alignment ()
a.add (pix)
diff --git a/iw/package_gui.py b/iw/package_gui.py
index 5d9e131b7..1f09329a2 100644
--- a/iw/package_gui.py
+++ b/iw/package_gui.py
@@ -908,7 +908,7 @@ class PackageSelectionWindow (InstallWindow):
self.scrolledWindow.get_vadjustment().set_value(swmax-pagesize)
if self.idleid is not None:
- gtk.idle_remove(self.idleid)
+ gobject.source_remove(self.idleid)
self.idleid = None
self.needToFocus = 0
@@ -1104,7 +1104,7 @@ class PackageSelectionWindow (InstallWindow):
self.needToFocus = 1
if self.needToFocus:
- self.idleid = gtk.idle_add(self.focusIdleHandler, None)
+ self.idleid = gobject.idle_add(self.focusIdleHandler, None)
# pack rest of screen
hbox = gtk.HBox (gtk.FALSE, 5)
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index 203375e55..28d1e3f5b 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -198,7 +198,7 @@ class InstallProgressWindow_NEW (InstallWindow):
num = 0
self.wrappedpixlist = 1
- pix = self.ics.readPixmapDithered (self.pixmaps[num], 500, 325)
+ pix = gui.readImageFromFile (self.pixmaps[num], 500, 325)
if pix:
if self.adpix:
self.adbox.remove (self.adpix)
@@ -314,7 +314,7 @@ class InstallProgressWindow_NEW (InstallWindow):
vbox = gtk.VBox (gtk.FALSE, 10)
# Create rnote area
- pix = self.ics.readPixmapDithered ("progress_first.png")
+ pix = gui.readImageFromFile ("progress_first.png")
if pix:
frame = gtk.Frame()
frame.set_shadow_type(gtk.SHADOW_NONE)
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index ddcb5de10..1f837b96d 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -12,6 +12,7 @@
#
import gtk
+import gui
from iw_gui import *
from rhpl.translate import _, N_
@@ -30,7 +31,7 @@ class WelcomeWindow (InstallWindow):
frame.set_shadow_type (gtk.SHADOW_NONE)
image = configFileData["WelcomeScreen"]
- pix = self.ics.readPixmapDithered(image)
+ pix = gui.readImageFromFile(image)
if pix:
box = gtk.EventBox ()
generated by cgit (git 2.34.1) at 2024-10-05 20:39:47 +0000