Changeset 4595

Timestamp:

04/26/09 23:49:09 (4 years ago)

Author:

cassiano

Message:

adding core and others to the base branch

Location:

branch/QuickScan/QS

Files:

• __init__.py (copied) (copied from trunk/umit/__init__.py)
• core (copied) (copied from trunk/umit/core)
• db (copied) (copied from trunk/umit/db)
• gui (copied) (copied from trunk/umit/gui)
• gui/radialnet/Toolbar.py (modified) (2 diffs)
• interfaceeditor (copied) (copied from trunk/umit/interfaceeditor)
• plugin (copied) (copied from trunk/umit/plugin)

branch/QuickScan/QS/gui/radialnet/Toolbar.py

@@ -242 +242 @@
 
 
+<<<<<<< .mine
+=======
     def __fullscreen_exit(self, widget, event):
         """
@@ -248 +250 @@
 
 
+>>>>>>> .r4581
     def __fullscreen_callback(self, widget=None):
         """
         """
         if self.__fullscreen.get_active():
+<<<<<<< .mine
+            self.__fullscreen_window = HIGWindow(("Topology - Fullscreen"),
+                                       buttons=(gtk.STOCK_CLOSE, gtk.STOCK_FULLSCREEN))
+=======
 
             self.__fullscreen_window = HIGWindow()
+>>>>>>> .r4581
             self.__fullscreen_window.connect('delete-event',
                     self.__fullscreen_exit)