Show
Ignore:
Timestamp:
03/06/09 17:00:48 (4 years ago)
Author:
gpolo
Message:

Merged revisions 4291-4299 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

........

r4291 | gpolo | 2009-03-05 22:10:12 -0300 (Thu, 05 Mar 2009) | 1 line


Added classifier for python 2.4

........

r4292 | gpolo | 2009-03-05 22:12:32 -0300 (Thu, 05 Mar 2009) | 1 line


Added missing commas.

........

r4293 | gpolo | 2009-03-06 13:03:40 -0300 (Fri, 06 Mar 2009) | 1 line


typo fix.

........

r4294 | gpolo | 2009-03-06 13:07:45 -0300 (Fri, 06 Mar 2009) | 3 lines


Avoiding a "GtkWarning?: gtk_label_set_label: assertion `str != NULL'
failed" when not giving a value to text.

........

r4295 | gpolo | 2009-03-06 13:10:00 -0300 (Fri, 06 Mar 2009) | 1 line


Adjusted example to work with the current paths.

........

r4296 | gpolo | 2009-03-06 13:11:51 -0300 (Fri, 06 Mar 2009) | 1 line


Removed bad sys.exit (which didn't even work since sys was never imported here).

........

r4297 | gpolo | 2009-03-06 13:17:37 -0300 (Fri, 06 Mar 2009) | 1 line


Fixed bad widget packing.

........

r4298 | gpolo | 2009-03-06 13:38:11 -0300 (Fri, 06 Mar 2009) | 1 line


Misc tweaks, also removed the broken example.

........

r4299 | gpolo | 2009-03-06 13:50:40 -0300 (Fri, 06 Mar 2009) | 1 line


read_file is gone for more than one year, removed its use here. This code doesn't replace the previous read_file func.

........

Location:
branch/NetworkInventory
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branch/NetworkInventory

    • Property svnmerge-integrated changed from /trunk:1-560,563-566,574,577-597,599-615,617-618,620-635,641-648,651,653-662,666-667,669-764,766-845,848-964,966-1038,1041,1047-1059,1070-1103,1113-1119,1139,1156-1187,1189,1196-1202,1206-1223,1225-1241,1244-1248,1251-1258,1260-1274,1276-1279,1281,1283-1284,1290-1295,1297-1305,1307-1308,1310-1311,1313-1322,1326,1328-1333,1335,1337-1397,1399-1418,1420-3939,3941-3945,3948-3952,3955-3978,3980-4122,4124-4287 to /trunk:1-560,563-566,574,577-597,599-615,617-618,620-635,641-648,651,653-662,666-667,669-764,766-845,848-964,966-1038,1041,1047-1059,1070-1103,1113-1119,1139,1156-1187,1189,1196-1202,1206-1223,1225-1241,1244-1248,1251-1258,1260-1274,1276-1279,1281,1283-1284,1290-1295,1297-1305,1307-1308,1310-1311,1313-1322,1326,1328-1333,1335,1337-1397,1399-1418,1420-3939,3941-3945,3948-3952,3955-3978,3980-4122,4124-4299

  • branch/NetworkInventory/umit/gui/ProfileWizardEditor.py

    r4252 r4300  
    194194        box = HIGHBox() 
    195195        box._pack_expand_fill(self.treeview) 
    196         self.profile_group_sw.add(box) 
     196        self.profile_group_sw.add_with_viewport(box) 
    197197         
    198198         
    … …  
    290290        column = gtk.TreeViewColumn("Name", renderer, text=0) 
    291291        treeview.append_column(column) 
    292         self.prop_frame_option.add(treeview) 
     292        prop_sw.add(treeview) 
    293293        self.prop_frame_option.add(prop_sw) 
    294294         
    … …  
    306306        self.prop_exp = HIGExpander("Proprieties") 
    307307 
    308         label = gtk.Label('s') 
    309         self.prop_exp.add(label) 
    310         self.prop_frame.add(self.prop_exp)     
    311          
     308        self.prop_frame.add(self.prop_exp) 
     309 
    312310 
    313311