PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 20:51:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge #2088: Update Zenmap to Python 3 and PyGObject

Browse Source 
Note: Ndiff build will be broken until subsequent changes are made.
Deprecation warnings will need to be addressed in future changes.
Closes #2088
This commit is contained in:
dmiller
2022-12-07 20:34:03 +00:00
parent e2e55660c3
commit 24b26317c7
104 changed files with 5381 additions and 4383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
zenmap/zenmapGUI/ScanNmapOutputPage.py
View File

@@ -1,5 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#!/usr/bin/env python3
# ***********************IMPORTANT NMAP LICENSE TERMS************************
# * *
@@ -58,9 +57,11 @@
# * *
# ***************************************************************************/
import gtk
import gobject
import pango
import gi
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GObject, GdkPixbuf, Pango
import os
from zenmapGUI.higwidgets.higboxes import HIGHBox, HIGVBox
@@ -74,14 +75,14 @@ import zenmapCore.I18N # lgtm[py/unused-import]
def scan_entry_data_func(widget, cell_renderer, model, iter):
"""Set the properties of a cell renderer for a scan entry."""
cell_renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
cell_renderer.set_property("style", pango.STYLE_NORMAL)
cell_renderer.set_property("ellipsize", Pango.EllipsizeMode.END)
cell_renderer.set_property("style", Pango.Style.NORMAL)
cell_renderer.set_property("strikethrough", False)
entry = model.get_value(iter, 0)
if entry is None:
return
if entry.running:
cell_renderer.set_property("style", pango.STYLE_ITALIC)
cell_renderer.set_property("style", Pango.Style.ITALIC)
elif entry.finished:
pass
elif entry.failed or entry.canceled:
@@ -89,21 +90,21 @@ def scan_entry_data_func(widget, cell_renderer, model, iter):
cell_renderer.set_property("text", entry.get_command_string())
class Throbber(gtk.Image):
class Throbber(Gtk.Image):
"""This is a little progress indicator that animates while a scan is
running."""
try:
still = gtk.gdk.pixbuf_new_from_file(
still = GdkPixbuf.Pixbuf.new_from_file(
os.path.join(Path.pixmaps_dir, "throbber.png"))
anim = gtk.gdk.PixbufAnimation(
anim = GdkPixbuf.PixbufAnimation(
os.path.join(Path.pixmaps_dir, "throbber.gif"))
except Exception, e:
except Exception as e:
log.debug("Error loading throbber images: %s." % str(e))
still = None
anim = None
def __init__(self):
gtk.Image.__init__(self)
Gtk.Image.__init__(self)
self.set_from_pixbuf(self.still)
self.animating = False
@@ -127,7 +128,7 @@ class ScanNmapOutputPage(HIGVBox):
the combo box selection changes."""
__gsignals__ = {
"changed": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ())
"changed": (GObject.SignalFlags.RUN_FIRST, GObject.TYPE_NONE, ())
}
def __init__(self, scans_store):
@@ -140,8 +141,8 @@ class ScanNmapOutputPage(HIGVBox):
hbox = HIGHBox()
self.scans_list = gtk.ComboBox(scans_store)
cell = gtk.CellRendererText()
self.scans_list = Gtk.ComboBox.new_with_model(scans_store)
cell = Gtk.CellRendererText()
self.scans_list.pack_start(cell, True)
self.scans_list.set_cell_data_func(cell, scan_entry_data_func)
hbox._pack_expand_fill(self.scans_list)
@@ -153,7 +154,7 @@ class ScanNmapOutputPage(HIGVBox):
self.throbber = Throbber()
hbox._pack_noexpand_nofill(self.throbber)
self.details_button = gtk.Button(_("Details"))
self.details_button = Gtk.Button.new_with_label(_("Details"))
self.details_button.connect("clicked", self._show_details)
hbox._pack_noexpand_nofill(self.details_button)
@@ -227,7 +228,7 @@ class ScanNmapOutputPage(HIGVBox):
if not entry.finished:
return
if self._details_windows.get(entry) is None:
window = gtk.Window()
window = Gtk.Window()
window.add(ScanRunDetailsPage(entry.parsed))
def close_details(details, event, entry):