mirror of
https://github.com/nmap/nmap.git
synced 2025-12-12 18:59:03 +00:00
Merge #2088: Update Zenmap to Python 3 and PyGObject
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:
@@ -1,5 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# ***********************IMPORTANT NMAP LICENSE TERMS************************
|
||||
# * *
|
||||
@@ -66,13 +65,16 @@ higwidgets/higlogindialog.py
|
||||
|
||||
__all__ = ['HIGTable']
|
||||
|
||||
import gtk
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk
|
||||
|
||||
#from higlabels import *
|
||||
#from higentries import *
|
||||
|
||||
|
||||
class HIGTable(gtk.Table):
|
||||
class HIGTable(Gtk.Table):
|
||||
"""
|
||||
A HIGFied table
|
||||
"""
|
||||
@@ -82,7 +84,7 @@ class HIGTable(gtk.Table):
|
||||
# - Generic attach function that detects the widget type
|
||||
|
||||
def __init__(self, rows=1, columns=1, homogeneous=False):
|
||||
gtk.Table.__init__(self, rows, columns, homogeneous)
|
||||
Gtk.Table.__init__(self, n_rows=rows, n_columns=columns, homogeneous=homogeneous)
|
||||
self.set_row_spacings(6)
|
||||
self.set_col_spacings(12)
|
||||
|
||||
@@ -90,7 +92,7 @@ class HIGTable(gtk.Table):
|
||||
self.columns = columns
|
||||
|
||||
def attach_label(self, widget, x0, x, y0, y):
|
||||
self.attach(widget, x0, x, y0, y, xoptions=gtk.FILL)
|
||||
self.attach(widget, x0, x, y0, y, xoptions=Gtk.AttachOptions.FILL)
|
||||
|
||||
def attach_entry(self, widget, x0, x, y0, y):
|
||||
self.attach(widget, x0, x, y0, y, xoptions=gtk.FILL | gtk.EXPAND)
|
||||
self.attach(widget, x0, x, y0, y, xoptions=Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND)
|
||||
|
||||
Reference in New Issue
Block a user