Changeset 3863 for branch/PreferencesWindow/higwidgets/higtables.py

Timestamp:

12/21/08 18:03:08 (4 years ago)

Author:

luis

Message:

Merged revisions 3765-3766,3771,3788-3789,3792,3794,3797-3804,3849,3858 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

........

r3765 | boltrix | 2008-10-18 06:48:00 +0100 (Sáb, 18 Out 2008) | 6 lines

M trunk/umitGUI/ScanHostDetailsPage.py - Now, when we have more than one osmatch, it will show a list of possible operating system matches from which user can select one and the accuracy and icon will change. This is a simple solution to that problem, which can fit on our need for Umit 1.0 but it certainly deserve more atention for future versions, where we will probably think of changing the way some data are shown.
M trunk/umitGUI/ScanNotebook.py - Follows the modifications made at ScanHostDetailsPage?.py
M trunk/umitCore/NmapParser.py - Also follows the modifications made at ScanHostDetailsPage?.py
M trunk/umitCore/TargetList.py - Jut removed an annoying commented code of a db import.

........

r3766 | zero | 2008-10-19 16:28:24 +0100 (Dom, 19 Out 2008) | 1 line

Patch of ticket #48 (error when creating a profile with all tabs closed)

........

r3771 | luis | 2008-10-25 19:40:06 +0100 (Sáb, 25 Out 2008) | 12 lines

• Added ProfileManager?.py (new management profiles, implemented in InterfaceEditor? branch)

• MainWindow?.py:
  • Added Profile Manager to Umit menu

• Remove Delete keystroke (useless)

• Added key stroke (Ctrl+M) Profile Manger

• ProfileEditor?.py:
  • Added functions to update profile manager list (new and update exist profile)

........

r3788 | luis | 2008-11-16 11:47:59 +0000 (Dom, 16 Nov 2008) | 1 line

Added RadialNet Icons

........

r3789 | luis | 2008-11-16 12:48:29 +0000 (Dom, 16 Nov 2008) | 1 line

Fixed traceback - write hosts with None values

........

r3792 | nopper | 2008-11-18 08:48:17 +0000 (Ter, 18 Nov 2008) | 1 line

Merging UmitPlugins into trunk

........

r3794 | nopper | 2008-11-18 21:32:15 +0000 (Ter, 18 Nov 2008) | 1 line

Fixing plugins building

........

r3797 | getxsick | 2008-11-29 17:55:16 +0000 (Sáb, 29 Nov 2008) | 1 line

ticket #174: patched proposed by nopper, rewritten and modified by getxsick

........

r3798 | luis | 2008-11-29 18:08:19 +0000 (Sáb, 29 Nov 2008) | 6 lines

Integration of RadialNet:

• higwidgets
• Added Mapper to Notebook
• Change version number Credit for commit: me and Daniel Cassiano AUTHOR of RadialNet: Joao Medeiros

........

r3799 | luis | 2008-11-29 18:08:46 +0000 (Sáb, 29 Nov 2008) | 1 line

Forget add Mapper Page

........

r3800 | luis | 2008-11-30 13:00:58 +0000 (Dom, 30 Nov 2008) | 1 line

Fixed RadialNet rotate

........

r3801 | nopper | 2008-11-30 14:32:25 +0000 (Dom, 30 Nov 2008) | 1 line

Stupid fix

........

r3802 | getxsick | 2008-11-30 15:17:26 +0000 (Dom, 30 Nov 2008) | 1 line

fixed #179: casting to int with correct condition and rewritten the related code block.

........

r3803 | luis | 2008-11-30 15:31:56 +0000 (Dom, 30 Nov 2008) | 1 line

Fixed box packing issue for each Node

........

r3804 | luis | 2008-11-30 16:17:30 +0000 (Dom, 30 Nov 2008) | 1 line

Fix: update list of profiles inside ProfileManager?

........

r3849 | gpolo | 2008-12-18 16:03:33 +0000 (Qui, 18 Dez 2008) | 3 lines

Initialized merge tracking via "svnmerge" with revisions "1-3848" from
http://svn.umitproject.org/svnroot/umit/branch/NetworkInventory

........

r3858 | nopper | 2008-12-21 12:52:40 +0000 (Dom, 21 Dez 2008) | 1 line

Fixing horror

........

Location:

branch/PreferencesWindow

Files:

• . (modified) (1 prop)
• higwidgets/higtables.py (modified) (2 diffs)

branch/PreferencesWindow/higwidgets/higtables.py

@@ -33 +33 @@
 #from higlabels import *
 #from higentries import *
+from higwidgets.higboxes import HIGBox
 
 class HIGTable(gtk.Table):
@@ -56 +57 @@
     def attach_entry(self, widget, x0, x, y0, y):
         self.attach(widget, x0, x, y0, y, xoptions=gtk.FILL|gtk.EXPAND)
+
+class HIGTableRNet(gtk.Table, HIGBox):
+    def __init__(self, rows=1, columns=1, homogeneous=False):
+        gtk.Table.__init__(self, rows, columns, homogeneous)
+        self._set_spacing(12)
+
+        self.__rows = rows
+        self.__columns = columns
+
+        self.__last_point = (0, 0)
+
+
+    def _set_spacing(self, spacing):
+        self.set_row_spacings(spacing)
+        self.set_col_spacings(spacing)
+
+
+    def _resize(self, rows, columns):
+        self.__rows = rows
+        self.__columns = columns
+
+        self.resize(rows, columns)
+
+
+    def _attach_next(self,
+                     child,
+                     xoptions=gtk.EXPAND|gtk.FILL,
+                     yoptions=gtk.EXPAND|gtk.FILL,
+                     xpadding=0,
+                     ypadding=0):
+        row, column = self.__last_point
+
+        if row != self.__rows:
+
+            self.attach(child,
+                        column,
+                        column + 1,
+                        row,
+                        row + 1,
+                        xoptions,
+                        yoptions,
+                        xpadding,
+                        ypadding)
+
+            if column + 1 == self.__columns:
+
+                column = 0
+                row += 1
+
+            else:
+                column += 1
+
+            self.__last_point = (row, column)