Changeset 27:d95d48685969

Timestamp:

02/25/12 10:14:12 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Created icons, reorganized sources and made the Windows installer work

Files:

• MANIFEST.in (modified) (1 diff)
• logo.xcf (added)
• mlx.nsi (modified) (1 diff)
• runmlx.py (moved) (moved from src/runmlx.py ) (1 diff)
• setup.py (modified) (4 diffs)
• src/mlx/__init__.py (added)
• src/mlx/acft.py (moved) (moved from src/acft.py )
• src/mlx/checks.py (moved) (moved from src/checks.py )
• src/mlx/const.py (moved) (moved from src/const.py )
• src/mlx/flight.py (moved) (moved from src/flight.py )
• src/mlx/fs.py (moved) (moved from src/fs.py )
• src/mlx/fsuipc.py (moved) (moved from src/fsuipc.py )
• src/mlx/logger.py (moved) (moved from src/logger.py )
• src/mlx/logo.ico (added)
• src/mlx/logo_uninst.ico (added)
• src/mlx/mlx.py (moved) (moved from src/mlx.py ) (5 diffs)
• src/mlx/pyuipc_emu.py (moved) (moved from src/pyuipc_emu.py )
• src/mlx/test.py (moved) (moved from src/test.py )
• src/mlx/util.py (moved) (moved from src/util.py )

MANIFEST.in

@@ -2 +2 @@
 include makeinst.bat
 include license.txt
+include runmlx.py

mlx.nsi

@@ -33 +33 @@
 ;Interface Settings
 
-  ;!define MUI_ICON "cflib\cfgui.ico"
-  ;!define MUI_UNICON "cflib\cfgui_uninst.ico"
+  !define MUI_ICON "src/mlx/logo.ico"
+  !define MUI_UNICON "src/mlx/logo_uninst.ico"
   !define MUI_ABORTWARNING
 

runmlx.py

@@ -2 +2 @@
 
 if __name__ == "__main__":
-    import mlx
-    mlx.main()
+    import mlx.mlx
+    mlx.mlx.main()

setup.py

@@ -8 +8 @@
 sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), "src"))
 
-import const
+import mlx.const
 
 data_files = []
 if os.name=="nt":
     import py2exe
+
+    data_files.append(("", ["src/mlx/logo.ico"]))
 
     msvcrDir = os.environ["MSVCRDIR"] if "MSVCRDIR" in os.environ else None
@@ -27 +29 @@
         
     with open("mlx-common.nsh", "wt") as f:
-            print >>f, '!define MLX_VERSION "%s"' % (const.VERSION)
+            print >>f, '!define MLX_VERSION "%s"' % (mlx.const.VERSION)
             f.close()
 
@@ -37 +39 @@
 
 setup(name = "mlx",
-      version = const.VERSION,
+      version = mlx.const.VERSION,
       description = "MAVA Logger X",
       long_description = long_description,
@@ -44 +46 @@
       url = "http://mlx.varadiistvan.hu",
       package_dir = { "" : "src" },
-      packages = [""],
+      packages = ["mlx"],
+      package_data = { "mlx" : ["logo.ico", "logo_uninst.ico"] },
       requires = ["pyuipc"],
-      windows = [{ "script" : "src/runmlx.py" }],
+      windows = [{ "script" : "runmlx.py",
+                   "icon_resources" : [(1, "src/mlx/logo.ico")]}],
       options = { "py2exe" : { "includes": "gio, pango, atk, pangocairo"} },
       data_files = data_files,

src/mlx/mlx.py

@@ -12 +12 @@
 import time
 
+appIndicator = False
+
 if os.name=="nt" or "FORCE_PYGTK" in os.environ:
     print "Using PyGTK"
@@ -18 +20 @@
     import gtk
     import gobject
+    try:
+        import appindicator
+        appIndicator = True
+    except Exception, e:
+        pass
 else:
     print "Using PyGObject"
@@ -23 +30 @@
     from gi.repository import Gtk as gtk
     from gi.repository import GObject as gobject
+    from gi.repository import AppIndicator3 as appindicator
+    appIndicator = True
 
 import cairo
@@ -56 +65 @@
         win = gtk.Window()
         win.set_title("MAVA Logger X " + const.VERSION)
+        win.set_icon_from_file("logo.ico")
         win.connect("delete-event", gtk.main_quit)
 
@@ -586 +596 @@
         self._logView.scroll_mark_onscreen(buffer.get_insert())
 
+class TrackerStatusIcon(gtk.StatusIcon):
+        def __init__(self):
+                gtk.StatusIcon.__init__(self)
+                menu = '''
+                        <ui>
+                         <menubar name="Menubar">
+                          <menu action="Menu">
+                           <menuitem action="Search"/>
+                           <menuitem action="Preferences"/>
+                           <separator/>
+                           <menuitem action="About"/>
+                          </menu>
+                         </menubar>
+                        </ui>
+                '''
+                actions = [
+                        ('Menu',  None, 'Menu'),
+                        ('Search', None, '_Search...', None, 'Search files with MetaTracker', self.on_activate),
+                        ('Preferences', gtk.STOCK_PREFERENCES, '_Preferences...', None, 'Change MetaTracker preferences', self.on_preferences),
+                        ('About', gtk.STOCK_ABOUT, '_About...', None, 'About MetaTracker', self.on_about)]
+                ag = gtk.ActionGroup('Actions')
+                ag.add_actions(actions)
+                self.manager = gtk.UIManager()
+                self.manager.insert_action_group(ag, 0)
+                self.manager.add_ui_from_string(menu)
+                self.menu = self.manager.get_widget('/Menubar/Menu/About').props.parent
+                search = self.manager.get_widget('/Menubar/Menu/Search')
+                search.get_children()[0].set_markup('<b>_Search...</b>')
+                search.get_children()[0].set_use_underline(True)
+                search.get_children()[0].set_use_markup(True)
+                #search.get_children()[1].set_from_stock(gtk.STOCK_FIND, gtk.ICON_SIZE_MENU)
+                self.set_from_stock(gtk.STOCK_FIND)
+                self.set_tooltip('Tracker Desktop Search')
+                self.set_visible(True)
+                self.connect('activate', self.on_activate)
+                self.connect('popup-menu', self.on_popup_menu)
+
+        def on_activate(self, data):
+                os.spawnlpe(os.P_NOWAIT, 'tracker-search-tool', os.environ)
+
+        def on_popup_menu(self, status, button, time):
+                self.menu.popup(None, None, None, button, time)
+
+        def on_preferences(self, data):
+                print 'preferences'
+
+        def on_about(self, data):
+                dialog = gtk.AboutDialog()
+                dialog.set_name('Tracker')
+                dialog.set_version('0.5.0')
+                dialog.set_comments('A desktop indexing and search tool')
+                dialog.set_website('www.freedesktop.org/Tracker')
+                dialog.run()
+                dialog.destroy()
+
 def main():
     """The main operation of the program."""
     gobject.threads_init()
+
+    # menu = gtk.Menu()  
+    # item = gtk.MenuItem()  
+    # item.set_label("Menu Item")  
+    # item.show()  
+    # menu.append(item)  
+
+    # menu.show()  
+
+    # if appIndicator:
+    #     if pygobject:
+    #         ind = appindicator.Indicator.new ("mava-logger-x",
+    #                                           "/home/vi/munka/repules/mlx/src/logo.ico",
+    #                                           #"indicator-messages",
+    #                                           appindicator.IndicatorCategory.APPLICATION_STATUS)
+    #         ind.set_status (appindicator.IndicatorStatus.ACTIVE)
+    #     else:
+    #         ind = appindicator.Indicator ("mava-logger-x",
+    #                                       "/home/vi/munka/repules/mlx/src/logo.ico",
+    #                                       appindicator.CATEGORY_APPLICATION_STATUS)
+    #         ind.set_status (appindicator.STATUS_ACTIVE)
+
+    #     ind.set_menu(menu)
+    #     #ind.set_icon("distributor-logo")
+    # else:
+    #     def popup_menu(status, button, time):
+    #         menu.popup(None, None, gtk.status_icon_position_menu,
+    #                    button, time, status)
+    #     statusIcon = gtk.StatusIcon()
+    #     #statusIcon.set_from_stock(gtk.STOCK_FIND)
+    #     statusIcon.set_from_file("logo.ico")
+    #     statusIcon.set_tooltip_markup("MAVA Logger X")
+    #     statusIcon.set_visible(True)
+    #     statusIcon.connect('popup-menu', popup_menu)
+
     gui = GUI()
     gui.build()
     gui.run()
-              
+
 if __name__ == "__main__":
     main()