diff --git a/gtk/wicd-client.py b/gtk/wicd-client.py index e0f1927..a8a763d 100644 --- a/gtk/wicd-client.py +++ b/gtk/wicd-client.py @@ -85,6 +85,9 @@ if __name__ == '__main__': daemon = wireless = wired = lost_dbus_id = None DBUS_AVAIL = False +theme = gtk.icon_theme_get_default() +theme.append_search_path(wpath.images) + def catchdbus(func): def wrapper(*args, **kwargs): try: @@ -261,7 +264,7 @@ class TrayIcon(object): wired_ip = info[0] self.network_addr = str(info[0]) self.network_type = "wired" - self.tr.set_from_file(os.path.join(wpath.images, "wired.png")) + self.tr.set_from_name('wired') # status_string = _('Connected to wired network (IP: $A)').replace('$A', #wired_ip) # self.tr.set_tooltip(status_string) @@ -314,7 +317,7 @@ class TrayIcon(object): cur_network + "..." self.update_tooltip() # self.tr.set_tooltip(status_string) - self.tr.set_from_file(os.path.join(wpath.images, "no-signal.png")) + self.tr.set_from_name('no-signal') if wired: self._show_notification(cur_network, _('Establishing connection...'), @@ -328,7 +331,7 @@ class TrayIcon(object): @catchdbus def set_not_connected_state(self, info=None): """ Set the icon info for the not connected state. """ - self.tr.set_from_file(wpath.images + "no-signal.png") + self.tr.set_from_name('no-signal') if not DBUS_AVAIL: status = _('Wicd daemon unreachable') elif wireless.GetKillSwitchEnabled(): @@ -393,9 +396,8 @@ class TrayIcon(object): signal_img = "low-signal" else: signal_img = "bad-signal" - - img_file = ''.join([wpath.images, prefix, signal_img, lock, ".png"]) - self.tr.set_from_file(img_file) + img_name = ''.join([prefix, signal_img, lock]) + self.tr.set_from_name(img_name) @catchdbus def get_bandwidth_activity(self): @@ -677,10 +679,7 @@ TX:''')) if type_ == "__wired__": image.set_from_icon_name("network-wired", 2) else: - pb = gtk.gdk.pixbuf_new_from_file_at_size(self._get_img(n_id), - 20, 20) - image.set_from_pixbuf(pb) - del pb + image.set_from_icon_name(self._get_img(n_id), 2) item.set_image(image) del image item.connect("activate", network_selected, type_, n_id) @@ -706,23 +705,23 @@ TX:''')) if daemon.GetWPADriver() == 'ralink legacy' or \ daemon.GetSignalDisplayType() == 1: if dbm_strength >= -60: - signal_img = 'signal-100.png' + signal_img = 'signal-100' elif dbm_strength >= -70: - signal_img = 'signal-75.png' + signal_img = 'signal-75' elif dbm_strength >= -80: - signal_img = 'signal-50.png' + signal_img = 'signal-50' else: - signal_img = 'signal-25.png' + signal_img = 'signal-25' else: if strength > 75: - signal_img = 'signal-100.png' + signal_img = 'signal-100' elif strength > 50: - signal_img = 'signal-75.png' + signal_img = 'signal-75' elif strength > 25: - signal_img = 'signal-50.png' + signal_img = 'signal-50' else: - signal_img = 'signal-25.png' - return wpath.images + signal_img + signal_img = 'signal-25' + return signal_img @catchdbus def on_net_menu_activate(self, item): @@ -847,7 +846,7 @@ TX:''')) self.tray = egg.trayicon.TrayIcon("WicdTrayIcon") self.pic = gtk.Image() self.tooltip.set_tip(self.eb, "Initializing wicd...") - self.pic.set_from_file(wpath.images + "no-signal.png") + self.pic.set_from_name('no-signal') self.eb.connect('button_press_event', self.tray_clicked) self.eb.add(self.pic) @@ -864,7 +863,7 @@ TX:''')) def set_from_file(self, val=None): """ Calls set_from_file on the gtk.Image for the tray icon. """ - self.pic.set_from_file(val) + self.pic.set_from_file(os.path.join(wpath.images, 'hicolor/22x22/status/%s.png' % val)) def set_tooltip(self, val): """ Set the tooltip for this tray icon. @@ -899,11 +898,11 @@ TX:''')) TrayIcon.TrayIconGUI.__init__(self, parent) gtk.StatusIcon.__init__(self) - self.current_icon_path = '' + self.current_icon_name = '' self.set_visible(True) self.connect('activate', self.on_activate) self.connect('popup-menu', self.on_popup_menu) - self.set_from_file(wpath.images + "no-signal.png") + self.set_from_name('no-signal') self.set_tooltip("Initializing wicd...") def on_popup_menu(self, status, button, timestamp): @@ -911,11 +910,11 @@ TX:''')) self.init_network_menu() self.menu.popup(None, None, None, button, timestamp) - def set_from_file(self, path=None): + def set_from_name(self, name=None): """ Sets a new tray icon picture. """ - if path != self.current_icon_path: - self.current_icon_path = path - gtk.StatusIcon.set_from_file(self, path) + if name != self.current_icon_name: + self.current_icon_name = name + gtk.StatusIcon.set_from_icon_name(self, name) def visible(self, val): """ Set if the icon is visible or not. diff --git a/icons/128px/wicd-gtk.png b/icons/128x128/apps/wicd-gtk.png similarity index 100% rename from icons/128px/wicd-gtk.png rename to icons/128x128/apps/wicd-gtk.png diff --git a/icons/16px/wicd-gtk.png b/icons/16x16/apps/wicd-gtk.png similarity index 100% rename from icons/16px/wicd-gtk.png rename to icons/16x16/apps/wicd-gtk.png diff --git a/icons/192px/wicd-gtk.png b/icons/192x192/apps/wicd-gtk.png similarity index 100% rename from icons/192px/wicd-gtk.png rename to icons/192x192/apps/wicd-gtk.png diff --git a/icons/22px/wicd-gtk.png b/icons/22x22/apps/wicd-gtk.png similarity index 100% rename from icons/22px/wicd-gtk.png rename to icons/22x22/apps/wicd-gtk.png diff --git a/icons/24px/wicd-gtk.png b/icons/24x24/apps/wicd-gtk.png similarity index 100% rename from icons/24px/wicd-gtk.png rename to icons/24x24/apps/wicd-gtk.png diff --git a/icons/32px/wicd-gtk.png b/icons/32x32/apps/wicd-gtk.png similarity index 100% rename from icons/32px/wicd-gtk.png rename to icons/32x32/apps/wicd-gtk.png diff --git a/icons/36px/wicd-gtk.png b/icons/36x36/apps/wicd-gtk.png similarity index 100% rename from icons/36px/wicd-gtk.png rename to icons/36x36/apps/wicd-gtk.png diff --git a/icons/48px/wicd-gtk.png b/icons/48x48/apps/wicd-gtk.png similarity index 100% rename from icons/48px/wicd-gtk.png rename to icons/48x48/apps/wicd-gtk.png diff --git a/icons/64px/wicd-gtk.png b/icons/64x64/apps/wicd-gtk.png similarity index 100% rename from icons/64px/wicd-gtk.png rename to icons/64x64/apps/wicd-gtk.png diff --git a/icons/72px/wicd-gtk.png b/icons/72x72/apps/wicd-gtk.png similarity index 100% rename from icons/72px/wicd-gtk.png rename to icons/72x72/apps/wicd-gtk.png diff --git a/icons/96px/wicd-gtk.png b/icons/96x96/apps/wicd-gtk.png similarity index 100% rename from icons/96px/wicd-gtk.png rename to icons/96x96/apps/wicd-gtk.png diff --git a/icons/scalable/wicd-gtk.svg b/icons/scalable/apps/wicd-gtk.svg similarity index 100% rename from icons/scalable/wicd-gtk.svg rename to icons/scalable/apps/wicd-gtk.svg diff --git a/images/16x16/status/signal-100.png b/images/16x16/status/signal-100.png new file mode 100644 index 0000000..0eb0288 Binary files /dev/null and b/images/16x16/status/signal-100.png differ diff --git a/images/16x16/status/signal-25.png b/images/16x16/status/signal-25.png new file mode 100644 index 0000000..72e0148 Binary files /dev/null and b/images/16x16/status/signal-25.png differ diff --git a/images/16x16/status/signal-50.png b/images/16x16/status/signal-50.png new file mode 100644 index 0000000..177c716 Binary files /dev/null and b/images/16x16/status/signal-50.png differ diff --git a/images/16x16/status/signal-75.png b/images/16x16/status/signal-75.png new file mode 100644 index 0000000..599df25 Binary files /dev/null and b/images/16x16/status/signal-75.png differ diff --git a/images/bad-signal-lock.png b/images/22x22/status/bad-signal-lock.png similarity index 100% rename from images/bad-signal-lock.png rename to images/22x22/status/bad-signal-lock.png diff --git a/images/bad-signal.png b/images/22x22/status/bad-signal.png similarity index 100% rename from images/bad-signal.png rename to images/22x22/status/bad-signal.png diff --git a/images/both-bad-signal-lock.png b/images/22x22/status/both-bad-signal-lock.png similarity index 100% rename from images/both-bad-signal-lock.png rename to images/22x22/status/both-bad-signal-lock.png diff --git a/images/both-bad-signal.png b/images/22x22/status/both-bad-signal.png similarity index 100% rename from images/both-bad-signal.png rename to images/22x22/status/both-bad-signal.png diff --git a/images/both-good-signal-lock.png b/images/22x22/status/both-good-signal-lock.png similarity index 100% rename from images/both-good-signal-lock.png rename to images/22x22/status/both-good-signal-lock.png diff --git a/images/both-good-signal.png b/images/22x22/status/both-good-signal.png similarity index 100% rename from images/both-good-signal.png rename to images/22x22/status/both-good-signal.png diff --git a/images/both-high-signal-lock.png b/images/22x22/status/both-high-signal-lock.png similarity index 100% rename from images/both-high-signal-lock.png rename to images/22x22/status/both-high-signal-lock.png diff --git a/images/both-high-signal.png b/images/22x22/status/both-high-signal.png similarity index 100% rename from images/both-high-signal.png rename to images/22x22/status/both-high-signal.png diff --git a/images/both-low-signal-lock.png b/images/22x22/status/both-low-signal-lock.png similarity index 100% rename from images/both-low-signal-lock.png rename to images/22x22/status/both-low-signal-lock.png diff --git a/images/both-low-signal.png b/images/22x22/status/both-low-signal.png similarity index 100% rename from images/both-low-signal.png rename to images/22x22/status/both-low-signal.png diff --git a/images/good-signal-lock.png b/images/22x22/status/good-signal-lock.png similarity index 100% rename from images/good-signal-lock.png rename to images/22x22/status/good-signal-lock.png diff --git a/images/good-signal.png b/images/22x22/status/good-signal.png similarity index 100% rename from images/good-signal.png rename to images/22x22/status/good-signal.png diff --git a/images/high-signal-lock.png b/images/22x22/status/high-signal-lock.png similarity index 100% rename from images/high-signal-lock.png rename to images/22x22/status/high-signal-lock.png diff --git a/images/high-signal.png b/images/22x22/status/high-signal.png similarity index 100% rename from images/high-signal.png rename to images/22x22/status/high-signal.png diff --git a/images/idle-bad-signal-lock.png b/images/22x22/status/idle-bad-signal-lock.png similarity index 100% rename from images/idle-bad-signal-lock.png rename to images/22x22/status/idle-bad-signal-lock.png diff --git a/images/idle-bad-signal.png b/images/22x22/status/idle-bad-signal.png similarity index 100% rename from images/idle-bad-signal.png rename to images/22x22/status/idle-bad-signal.png diff --git a/images/idle-good-signal-lock.png b/images/22x22/status/idle-good-signal-lock.png similarity index 100% rename from images/idle-good-signal-lock.png rename to images/22x22/status/idle-good-signal-lock.png diff --git a/images/idle-good-signal.png b/images/22x22/status/idle-good-signal.png similarity index 100% rename from images/idle-good-signal.png rename to images/22x22/status/idle-good-signal.png diff --git a/images/idle-high-signal-lock.png b/images/22x22/status/idle-high-signal-lock.png similarity index 100% rename from images/idle-high-signal-lock.png rename to images/22x22/status/idle-high-signal-lock.png diff --git a/images/idle-high-signal.png b/images/22x22/status/idle-high-signal.png similarity index 100% rename from images/idle-high-signal.png rename to images/22x22/status/idle-high-signal.png diff --git a/images/idle-low-signal-lock.png b/images/22x22/status/idle-low-signal-lock.png similarity index 100% rename from images/idle-low-signal-lock.png rename to images/22x22/status/idle-low-signal-lock.png diff --git a/images/idle-low-signal.png b/images/22x22/status/idle-low-signal.png similarity index 100% rename from images/idle-low-signal.png rename to images/22x22/status/idle-low-signal.png diff --git a/images/low-signal-lock.png b/images/22x22/status/low-signal-lock.png similarity index 100% rename from images/low-signal-lock.png rename to images/22x22/status/low-signal-lock.png diff --git a/images/low-signal.png b/images/22x22/status/low-signal.png similarity index 100% rename from images/low-signal.png rename to images/22x22/status/low-signal.png diff --git a/images/no-signal.png b/images/22x22/status/no-signal.png similarity index 100% rename from images/no-signal.png rename to images/22x22/status/no-signal.png diff --git a/images/receiving-bad-signal-lock.png b/images/22x22/status/receiving-bad-signal-lock.png similarity index 100% rename from images/receiving-bad-signal-lock.png rename to images/22x22/status/receiving-bad-signal-lock.png diff --git a/images/receiving-bad-signal.png b/images/22x22/status/receiving-bad-signal.png similarity index 100% rename from images/receiving-bad-signal.png rename to images/22x22/status/receiving-bad-signal.png diff --git a/images/receiving-good-signal-lock.png b/images/22x22/status/receiving-good-signal-lock.png similarity index 100% rename from images/receiving-good-signal-lock.png rename to images/22x22/status/receiving-good-signal-lock.png diff --git a/images/receiving-good-signal.png b/images/22x22/status/receiving-good-signal.png similarity index 100% rename from images/receiving-good-signal.png rename to images/22x22/status/receiving-good-signal.png diff --git a/images/receiving-high-signal-lock.png b/images/22x22/status/receiving-high-signal-lock.png similarity index 100% rename from images/receiving-high-signal-lock.png rename to images/22x22/status/receiving-high-signal-lock.png diff --git a/images/receiving-high-signal.png b/images/22x22/status/receiving-high-signal.png similarity index 100% rename from images/receiving-high-signal.png rename to images/22x22/status/receiving-high-signal.png diff --git a/images/receiving-low-signal-lock.png b/images/22x22/status/receiving-low-signal-lock.png similarity index 100% rename from images/receiving-low-signal-lock.png rename to images/22x22/status/receiving-low-signal-lock.png diff --git a/images/receiving-low-signal.png b/images/22x22/status/receiving-low-signal.png similarity index 100% rename from images/receiving-low-signal.png rename to images/22x22/status/receiving-low-signal.png diff --git a/images/22x22/status/signal-100.png b/images/22x22/status/signal-100.png new file mode 100644 index 0000000..4aaba84 Binary files /dev/null and b/images/22x22/status/signal-100.png differ diff --git a/images/22x22/status/signal-25.png b/images/22x22/status/signal-25.png new file mode 100644 index 0000000..2e271ab Binary files /dev/null and b/images/22x22/status/signal-25.png differ diff --git a/images/22x22/status/signal-50.png b/images/22x22/status/signal-50.png new file mode 100644 index 0000000..de5918b Binary files /dev/null and b/images/22x22/status/signal-50.png differ diff --git a/images/22x22/status/signal-75.png b/images/22x22/status/signal-75.png new file mode 100644 index 0000000..9335516 Binary files /dev/null and b/images/22x22/status/signal-75.png differ diff --git a/images/transmitting-bad-signal-lock.png b/images/22x22/status/transmitting-bad-signal-lock.png similarity index 100% rename from images/transmitting-bad-signal-lock.png rename to images/22x22/status/transmitting-bad-signal-lock.png diff --git a/images/transmitting-bad-signal.png b/images/22x22/status/transmitting-bad-signal.png similarity index 100% rename from images/transmitting-bad-signal.png rename to images/22x22/status/transmitting-bad-signal.png diff --git a/images/transmitting-good-signal-lock.png b/images/22x22/status/transmitting-good-signal-lock.png similarity index 100% rename from images/transmitting-good-signal-lock.png rename to images/22x22/status/transmitting-good-signal-lock.png diff --git a/images/transmitting-good-signal.png b/images/22x22/status/transmitting-good-signal.png similarity index 100% rename from images/transmitting-good-signal.png rename to images/22x22/status/transmitting-good-signal.png diff --git a/images/transmitting-high-signal-lock.png b/images/22x22/status/transmitting-high-signal-lock.png similarity index 100% rename from images/transmitting-high-signal-lock.png rename to images/22x22/status/transmitting-high-signal-lock.png diff --git a/images/transmitting-high-signal.png b/images/22x22/status/transmitting-high-signal.png similarity index 100% rename from images/transmitting-high-signal.png rename to images/22x22/status/transmitting-high-signal.png diff --git a/images/transmitting-low-signal-lock.png b/images/22x22/status/transmitting-low-signal-lock.png similarity index 100% rename from images/transmitting-low-signal-lock.png rename to images/22x22/status/transmitting-low-signal-lock.png diff --git a/images/transmitting-low-signal.png b/images/22x22/status/transmitting-low-signal.png similarity index 100% rename from images/transmitting-low-signal.png rename to images/22x22/status/transmitting-low-signal.png diff --git a/images/wired.png b/images/22x22/status/wired.png similarity index 100% rename from images/wired.png rename to images/22x22/status/wired.png diff --git a/images/24x24/status/signal-100.png b/images/24x24/status/signal-100.png new file mode 100644 index 0000000..fae16df Binary files /dev/null and b/images/24x24/status/signal-100.png differ diff --git a/images/24x24/status/signal-25.png b/images/24x24/status/signal-25.png new file mode 100644 index 0000000..cfb4e99 Binary files /dev/null and b/images/24x24/status/signal-25.png differ diff --git a/images/24x24/status/signal-50.png b/images/24x24/status/signal-50.png new file mode 100644 index 0000000..b9c9420 Binary files /dev/null and b/images/24x24/status/signal-50.png differ diff --git a/images/24x24/status/signal-75.png b/images/24x24/status/signal-75.png new file mode 100644 index 0000000..ba46fb3 Binary files /dev/null and b/images/24x24/status/signal-75.png differ diff --git a/images/32x32/status/signal-100.png b/images/32x32/status/signal-100.png new file mode 100644 index 0000000..c2c75ee Binary files /dev/null and b/images/32x32/status/signal-100.png differ diff --git a/images/32x32/status/signal-25.png b/images/32x32/status/signal-25.png new file mode 100644 index 0000000..d9c3b01 Binary files /dev/null and b/images/32x32/status/signal-25.png differ diff --git a/images/32x32/status/signal-50.png b/images/32x32/status/signal-50.png new file mode 100644 index 0000000..b040f0d Binary files /dev/null and b/images/32x32/status/signal-50.png differ diff --git a/images/32x32/status/signal-75.png b/images/32x32/status/signal-75.png new file mode 100644 index 0000000..537ed8c Binary files /dev/null and b/images/32x32/status/signal-75.png differ diff --git a/images/36x36/status/signal-100.png b/images/36x36/status/signal-100.png new file mode 100644 index 0000000..d60b620 Binary files /dev/null and b/images/36x36/status/signal-100.png differ diff --git a/images/36x36/status/signal-25.png b/images/36x36/status/signal-25.png new file mode 100644 index 0000000..173e95c Binary files /dev/null and b/images/36x36/status/signal-25.png differ diff --git a/images/36x36/status/signal-50.png b/images/36x36/status/signal-50.png new file mode 100644 index 0000000..3220899 Binary files /dev/null and b/images/36x36/status/signal-50.png differ diff --git a/images/36x36/status/signal-75.png b/images/36x36/status/signal-75.png new file mode 100644 index 0000000..ef3761e Binary files /dev/null and b/images/36x36/status/signal-75.png differ diff --git a/images/48x48/status/signal-100.png b/images/48x48/status/signal-100.png new file mode 100644 index 0000000..bfd17d8 Binary files /dev/null and b/images/48x48/status/signal-100.png differ diff --git a/images/48x48/status/signal-25.png b/images/48x48/status/signal-25.png new file mode 100644 index 0000000..e698b2a Binary files /dev/null and b/images/48x48/status/signal-25.png differ diff --git a/images/48x48/status/signal-50.png b/images/48x48/status/signal-50.png new file mode 100644 index 0000000..e5fd237 Binary files /dev/null and b/images/48x48/status/signal-50.png differ diff --git a/images/48x48/status/signal-75.png b/images/48x48/status/signal-75.png new file mode 100644 index 0000000..d59763e Binary files /dev/null and b/images/48x48/status/signal-75.png differ diff --git a/images/signal-100.png b/images/original/status/signal-100.png similarity index 100% rename from images/signal-100.png rename to images/original/status/signal-100.png diff --git a/images/signal-25.png b/images/original/status/signal-25.png similarity index 100% rename from images/signal-25.png rename to images/original/status/signal-25.png diff --git a/images/signal-50.png b/images/original/status/signal-50.png similarity index 100% rename from images/signal-50.png rename to images/original/status/signal-50.png diff --git a/images/signal-75.png b/images/original/status/signal-75.png similarity index 100% rename from images/signal-75.png rename to images/original/status/signal-75.png diff --git a/images/wired-gui.svg b/images/scalable/devices/wired-gui.svg similarity index 100% rename from images/wired-gui.svg rename to images/scalable/devices/wired-gui.svg diff --git a/setup.py b/setup.py index e867465..f7200ae 100755 --- a/setup.py +++ b/setup.py @@ -139,9 +139,6 @@ class configure(Command): self.share = '/usr/share/wicd/' self.etc = '/etc/wicd/' self.scripts = self.etc + "scripts/" - self.icons = '/usr/share/icons/hicolor/' - self.pixmaps = '/usr/share/pixmaps/' - self.images = self.pixmaps + 'wicd/' self.encryption = self.etc + 'encryption/templates/' self.bin = '/usr/bin/' self.sbin = '/usr/sbin/' @@ -150,6 +147,9 @@ class configure(Command): self.curses = self.share + 'curses' self.gtk = self.share + 'gtk' self.cli = self.share + 'cli' + self.icons = '/usr/share/icons/hicolor/' + self.pixmaps = '/usr/share/pixmaps/' + self.images = self.share + 'icons' self.varlib = '/var/lib/wicd/' self.networks = self.varlib + 'configurations/' self.log = '/var/log/wicd/' @@ -462,19 +462,20 @@ class install(_install): data.append((wpath.autostart, ['other/wicd-tray.desktop'])) if not wpath.no_install_man: data.append((wpath.mandir + 'man1/', [ 'man/wicd-client.1' ])) - data.append((wpath.icons + 'scalable/apps/', ['icons/scalable/wicd-gtk.svg'])) - data.append((wpath.icons + '192x192/apps/', ['icons/192px/wicd-gtk.png'])) - data.append((wpath.icons + '128x128/apps/', ['icons/128px/wicd-gtk.png'])) - data.append((wpath.icons + '96x96/apps/', ['icons/96px/wicd-gtk.png'])) - data.append((wpath.icons + '72x72/apps/', ['icons/72px/wicd-gtk.png'])) - data.append((wpath.icons + '64x64/apps/', ['icons/64px/wicd-gtk.png'])) - data.append((wpath.icons + '48x48/apps/', ['icons/48px/wicd-gtk.png'])) - data.append((wpath.icons + '36x36/apps/', ['icons/36px/wicd-gtk.png'])) - data.append((wpath.icons + '32x32/apps/', ['icons/32px/wicd-gtk.png'])) - data.append((wpath.icons + '24x24/apps/', ['icons/24px/wicd-gtk.png'])) - data.append((wpath.icons + '22x22/apps/', ['icons/22px/wicd-gtk.png'])) - data.append((wpath.icons + '16x16/apps/', ['icons/16px/wicd-gtk.png'])) - data.append((wpath.images, [('images/' + b) for b in os.listdir('images') if not b.startswith('.')])) + for size in os.listdir('icons'): + for category in os.listdir(os.path.join('icons', size)): + imgdir = os.path.join('icons', size, category) + data.append( + (os.path.join(wpath.icons, size, category), + [(os.path.join(imgdir, f)) for f in os.listdir(imgdir) if not f.startswith('.')]) + ) + for size in os.listdir('images'): + for category in os.listdir(os.path.join('images', size)): + imgdir = os.path.join('images', size, category) + data.append( + (os.path.join(wpath.images, 'hicolor', size, category), + [(os.path.join(imgdir, f)) for f in os.listdir(imgdir) if not f.startswith('.')]) + ) data.append((wpath.pixmaps, ['other/wicd-gtk.xpm'])) if not wpath.no_install_ncurses: data.append((wpath.curses, ['curses/curses_misc.py']))