nut/debian/patches/0002-nut-monitor-paths.patch

49 lines
2.8 KiB
Diff
Raw Normal View History

2011-06-03 14:22:58 +00:00
--- a/scripts/python/app/NUT-Monitor
+++ b/scripts/python/app/NUT-Monitor
@@ -70,7 +70,7 @@
( cmd_opts, args ) = opt_parser.parse_args()
- self.__glade_file = os.path.join( os.path.dirname( sys.argv[0] ), "gui-1.3.glade" )
+ self.__glade_file = '/usr/share/nut-monitor/gui-1.3.glade'
self.__widgets["interface"] = gtk.glade.XML( self.__glade_file, "window1", APP )
self.__widgets["main_window"] = self.__widgets["interface"].get_widget("window1")
@@ -103,11 +103,11 @@
# Create the tray icon and connect it to the show/hide method...
self.__widgets["status_icon"] = gtk.StatusIcon()
- self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) )
+ self.__widgets["status_icon"].set_from_file( "/usr/share/nut-monitor/pixmaps/on_line.png" )
self.__widgets["status_icon"].set_visible( True )
self.__widgets["status_icon"].connect( "activate", self.tray_activated )
- self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) )
+ self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut-monitor/pixmaps/on_line.png" )
# Define interface callbacks actions
self.__callbacks = { "on_window1_destroy" : self.quit,
@@ -265,8 +265,8 @@
#-------------------------------------------------------------------
# Change the status icon and tray icon
def change_status_icon( self, icon="on_line", blink=False ) :
- self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) )
- self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) )
+ self.__widgets["status_icon"].set_from_file( "/usr/share/nut-monitor/pixmaps/%s.png" % icon )
+ self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut-monitor/pixmaps/%s.png" % icon )
self.__widgets["status_icon"].set_blinking( blink )
#-------------------------------------------------------------------
@@ -719,9 +719,9 @@
for k,v in vars.iteritems() :
if ( rwvars.has_key( k ) ) :
- icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-rw.png" )
+ icon_file = "/usr/share/nut-monitor/pixmaps/var-rw.png"
else :
- icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-ro.png" )
+ icon_file = "/usr/share/nut-monitor/pixmaps/var-ro.png"
icon = gtk.gdk.pixbuf_new_from_file( icon_file )
self.__widgets["ups_vars_tree_store"].append( [ icon, k, v ] )