diff -cr nicotine-1.0.8rc1/pynicotine/gtkgui/dirchooser.py nicotine-daelstorm/pynicotine/gtkgui/dirchooser.py *** nicotine-1.0.8rc1/pynicotine/gtkgui/dirchooser.py 2004-01-04 02:01:29.000000000 +0200 --- nicotine-daelstorm/pynicotine/gtkgui/dirchooser.py 2004-12-23 03:54:05.000000000 +0200 *************** *** 10,256 **** from pynicotine.utils import _ - class DirNode: - def __init__(self, parent, name, init = None): - self.parent = parent - self.name = name - if init is not None: - self._nodes = [DirNode(self, init)] - else: - self._nodes = None - - def nodes(self): - if self._nodes is None: - self._nodes = [] - node = self - path = "" - while node: - path = os.path.join(node.name, path) - node = node.parent - try: - l = os.listdir(path) - except: - self._nodes = [] - return self._nodes - - l.sort(locale.strcoll) - for i in l: - if i[0] == ".": - continue - fn = os.path.join(path, i) - if not os.path.isdir(fn): - continue - newnode = DirNode(self, i) - self._nodes.append(newnode) - return self._nodes - - def find(self, path): - self.nodes() - ix = 0 - for node in self._nodes: - if node.name == path: - return node, ix - ix += 1 - return None, 0 - - class DirTreeModel(gtk.GenericTreeModel): - def __init__(self): - gtk.GenericTreeModel.__init__(self) - self.tree = DirNode(None, "", "/") - - def find_path(self, path): - if not path: - return - if path[-1] == "/": - path = path[:-1] - p = [] - while 1: - path, t = os.path.split(path) - if t == "": - p.insert(0, path) - break - p.insert(0, t) - r = [] - node = self.tree - for i in p: - node, ix = node.find(i) - if node is None: - break - r.append(ix) - return tuple(r) - - def on_get_flags(self): - return 0 - - def on_get_n_columns(self): - return 2 - - def on_get_column_type(self, column): - return gobject.TYPE_STRING - - def on_get_path(self, node): - path = [] - while node.parent != None: - path.insert(0, node.parent.nodes().index(node)) - node = node.parent - return tuple(path) - - def on_get_iter(self, path): - node = self.tree - for i in path: - node = node.nodes()[i] - return node - - def on_get_value(self, node, column): - if column == 0: - return recode(node.name) - - res = node.name - while node.parent is not None: - node = node.parent - res = os.path.join(node.name, res) - return res - - def on_iter_next(self, node): - try: - ix = node.parent.nodes().index(node) + 1 - return node.parent.nodes()[ix] - except IndexError: - return None - - def on_iter_children(self, node): - try: - return node.nodes()[0] - except: - return None - - def on_iter_has_child(self, node): - return len(node.nodes()) > 0 - - def on_iter_n_children(self, node): - return len(node.nodes()) - - def on_iter_nth_child(self, node, n): - try: - return node.nodes()[n] - except: - return None - - def on_iter_parent(self, node): - return node.parent - - class DirChooser(gtk.Dialog): - def __init__(self, title = _("Select directory..."), parent = None, initialdir = "~"): - gtk.Dialog.__init__(self, title, parent, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, - (gtk.STOCK_OK, gtk.RESPONSE_OK, - gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) - - self.set_default_size(300, 400) - self.set_border_width(10) - self.vbox.set_spacing(10) - - scrolledwindow = gtk.ScrolledWindow() - scrolledwindow.set_shadow_type(gtk.SHADOW_IN) - - self.model = DirTreeModel() - - self.treeview = gtk.TreeView(self.model) - self.treeview.set_headers_visible(gtk.FALSE) - scrolledwindow.add(self.treeview) - - column = gtk.TreeViewColumn(_("Directory Tree"), gtk.CellRendererText(), text = 0) - self.treeview.append_column(column) - - scrolledwindow.show_all() - self.vbox.pack_start(scrolledwindow, gtk.TRUE, gtk.TRUE) - - hbox = gtk.HBox() - b = gtk.Button(_("Create folder")) - b.connect("clicked", self.OnMakeDir) - hbox.pack_end(b, gtk.FALSE, gtk.FALSE) - hbox.show_all() - self.vbox.pack_start(hbox, gtk.FALSE, gtk.TRUE) - - if not initialdir: - initialdir = "~" - if initialdir == "~" and sys.platform.startswith("win"): - initialdir = "C:\\My Documents" - self.initialdir = initialdir - - def run(self): - gobject.idle_add(self.select_path, self.initialdir) - return gtk.Dialog.run(self) - - def select_path(self, path): - path = self.model.find_path(os.path.expanduser(path)) - if path: - for i in range(len(path)): - self.treeview.expand_row(path[:i+1], gtk.FALSE) - sel = self.treeview.get_selection() - if sel: - sel.unselect_all() - sel.select_path(path) - self.treeview.scroll_to_cell(path, None, gtk.TRUE, 0.5, 0.5) - - def get_path(self): - model, iter = self.treeview.get_selection().get_selected() - if iter is not None: - return model.get_value(iter, 1) - else: - return None - - def OnMakeDir(self, widget): - path = self.get_path() - if not path: - path = "" - else: - path += "/" - newpath = InputDialog(self, _("Make folder..."), _("Enter pathname of new folder:")) - if not newpath: - return - path = os.path.normpath(os.path.join(path, os.path.expanduser(newpath))) - try: - os.makedirs(path) - except: - dlg = gtk.MessageDialog(self, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, _("Could not create folder")) - dlg.run() - dlg.destroy() - self.select_path(path) - return - - if path[:-1] == "/": - path = path[:-1] - s = [] - p = path - while 1: - p, t = os.path.split(p) - if t == "": - s.insert(0, p) - break - s.insert(0, t) - p = "" - node = self.model.tree - for part in s: - newnode, ix = node.find(part) - p = os.path.join(p, part) - if newnode is None: - newnode = DirNode(node, part) - newnode._nodes = [] - node._nodes.append(newnode) - _p = self.model.find_path(p) - _i = self.model.get_iter(_p) - self.model.emit("row-inserted", _p, _i) - node = newnode - self.select_path(path) - def ChooseDir(parent = None, initialdir = "~"): ! dlg = DirChooser(parent = parent, initialdir = initialdir) ! response = dlg.run() ! if response == gtk.RESPONSE_OK: ! res = dlg.get_path() else: res = None ! dlg.destroy() return res if __name__ == "__main__": --- 10,25 ---- from pynicotine.utils import _ def ChooseDir(parent = None, initialdir = "~"): ! dialog = gtk.FileChooserDialog(parent=None, action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT, gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT)) ! dialog.set_select_multiple(True) ! response = dialog.run() ! ! if response == gtk.RESPONSE_ACCEPT: ! res = dialog.get_filenames() else: res = None ! dialog.destroy() return res if __name__ == "__main__": diff -cr nicotine-1.0.8rc1/pynicotine/gtkgui/glade2py.py nicotine-daelstorm/pynicotine/gtkgui/glade2py.py *** nicotine-1.0.8rc1/pynicotine/gtkgui/glade2py.py 2004-01-04 02:02:05.000000000 +0200 --- nicotine-daelstorm/pynicotine/gtkgui/glade2py.py 2004-12-23 14:02:02.000000000 +0200 *************** *** 1,3 **** --- 1,4 ---- + #!/usr/bin/python # Copyright (c) 2003-2004 Hyriand. All rights reserved. # indent = " " *************** *** 27,32 **** --- 28,34 ---- ["scrollable", lambda w,v: "%s.set_scrollable(gtk.%s)" % (w, v.upper())], ["can-focus", lambda w,v: "%s.set_property('can-focus', gtk.%s)" % (w, v.upper())], ["can-focus", lambda w,v: "%s.set_property('has-focus', gtk.%s)" % (w, v.upper())], + ["wrap", lambda w,v: "%s.set_line_wrap(gtk.%s)" % (w, v.upper())], ["visible", lambda w, v: (v == "True" and ("%s.show()" % w)) or ""], ["headers_visible", lambda w, v: "%s.set_headers_visible(gtk.%s)" % (w, v.upper())], ["spacing", lambda w,v: "%s.set_spacing(%s)" % (w,v)], *************** *** 306,311 **** --- 308,314 ---- "GtkProgressBar": [write_widget_generic, "ProgressBar"], "GtkImage": [write_widget_generic, "Image"], "GtkVSeparator": [write_widget_generic, "VSeparator"], + "GtkHSeparator": [write_widget_generic, "HSeparator"], "GtkHButtonBox": [write_widget_container, "HButtonBox", PM_PACK], "GtkAlignment": [write_widget_container, "Alignment", PM_ADD, "@xalign", "@yalign", "@xscale", "@yscale"], "Custom": [write_widget_custom], diff -cr nicotine-1.0.8rc1/pynicotine/gtkgui/nicotine_glade.py nicotine-daelstorm/pynicotine/gtkgui/nicotine_glade.py *** nicotine-1.0.8rc1/pynicotine/gtkgui/nicotine_glade.py 2004-01-08 00:08:25.000000000 +0200 --- nicotine-daelstorm/pynicotine/gtkgui/nicotine_glade.py 2004-12-23 14:02:06.000000000 +0200 *************** *** 403,408 **** --- 403,409 ---- self.label22 = gtk.Label(_("Add")) self.label22.set_padding(0, 0) + self.label22.set_line_wrap(gtk.FALSE) self.label22.show() self.hbox15.pack_start(self.label22, gtk.FALSE, gtk.FALSE, 0) *************** *** 449,454 **** --- 450,456 ---- self.label21 = gtk.Label(_("Add")) self.label21.set_padding(0, 0) + self.label21.set_line_wrap(gtk.FALSE) self.label21.show() self.hbox14.pack_start(self.label21, gtk.FALSE, gtk.FALSE, 0) *************** *** 520,525 **** --- 522,528 ---- self.label12 = gtk.Label(_("Add: ")) self.label12.set_padding(0, 0) + self.label12.set_line_wrap(gtk.FALSE) self.label12.show() self.hbox3.pack_start(self.label12, gtk.FALSE, gtk.FALSE, 0) *************** *** 973,978 **** --- 976,982 ---- self.label13 = gtk.Label(_("Filter in:")) self.label13.set_padding(0, 0) + self.label13.set_line_wrap(gtk.FALSE) self.label13.show() self.Filters.pack_start(self.label13, gtk.FALSE, gtk.FALSE, 0) *************** *** 992,997 **** --- 996,1002 ---- self.label14 = gtk.Label(_("Filter out:")) self.label14.set_padding(0, 0) + self.label14.set_line_wrap(gtk.FALSE) self.label14.show() self.Filters.pack_start(self.label14, gtk.FALSE, gtk.FALSE, 0) *************** *** 1011,1016 **** --- 1016,1022 ---- self.label15 = gtk.Label(_("Size:")) self.label15.set_padding(0, 0) + self.label15.set_line_wrap(gtk.FALSE) self.label15.show() self.Filters.pack_start(self.label15, gtk.FALSE, gtk.FALSE, 0) *************** *** 1031,1036 **** --- 1037,1043 ---- self.label16 = gtk.Label(_("Bitrate:")) self.label16.set_padding(0, 0) + self.label16.set_line_wrap(gtk.FALSE) self.label16.show() self.Filters.pack_start(self.label16, gtk.FALSE, gtk.FALSE, 0) *************** *** 1051,1056 **** --- 1058,1064 ---- self.label23 = gtk.Label(_("Country:")) self.label23.set_padding(0, 0) + self.label23.set_line_wrap(gtk.FALSE) self.label23.show() self.Filters.pack_start(self.label23, gtk.FALSE, gtk.FALSE, 0) *************** *** 1167,1172 **** --- 1175,1181 ---- self.label17 = gtk.Label(_("Self description:")) self.label17.set_padding(0, 0) + self.label17.set_line_wrap(gtk.FALSE) self.label17.show() self.frame1.set_label_widget(self.label17) *************** *** 1184,1201 **** --- 1193,1213 ---- self.uploads = gtk.Label(_("Total uploads allowed: unknown")) self.uploads.set_alignment(0, 0.5) self.uploads.set_padding(0, 0) + self.uploads.set_line_wrap(gtk.FALSE) self.uploads.show() self.vbox10.pack_start(self.uploads, gtk.FALSE, gtk.FALSE, 0) self.queuesize = gtk.Label(_("Queue size: unknown")) self.queuesize.set_alignment(0, 0.5) self.queuesize.set_padding(0, 0) + self.queuesize.set_line_wrap(gtk.FALSE) self.queuesize.show() self.vbox10.pack_start(self.queuesize, gtk.FALSE, gtk.FALSE, 0) self.slotsavail = gtk.Label(_("Slots available: unknown")) self.slotsavail.set_alignment(0, 0.5) self.slotsavail.set_padding(0, 0) + self.slotsavail.set_line_wrap(gtk.FALSE) self.slotsavail.show() self.vbox10.pack_start(self.slotsavail, gtk.FALSE, gtk.FALSE, 0) *************** *** 1207,1212 **** --- 1219,1225 ---- self.label18 = gtk.Label(_("Information:")) self.label18.set_padding(0, 0) + self.label18.set_line_wrap(gtk.FALSE) self.label18.show() self.frame2.set_label_widget(self.label18) *************** *** 1238,1243 **** --- 1251,1257 ---- self.label19 = gtk.Label(_("Picture:")) self.label19.set_padding(0, 0) + self.label19.set_line_wrap(gtk.FALSE) self.label19.show() self.frame3.set_label_widget(self.label19) *************** *** 1374,1379 **** --- 1388,1394 ---- self.label20 = gtk.Label(_("Search file and folder names (exact match):")) self.label20.set_padding(0, 0) + self.label20.set_line_wrap(gtk.FALSE) self.label20.show() self.hbox8.pack_start(self.label20, gtk.FALSE, gtk.FALSE, 0) *************** *** 1506,1511 **** --- 1521,1527 ---- self.label10 = gtk.Label(_("Create: ")) self.label10.set_padding(0, 0) + self.label10.set_line_wrap(gtk.FALSE) self.label10.show() self.hbox1.pack_start(self.label10, gtk.FALSE, gtk.FALSE, 0) diff -cr nicotine-1.0.8rc1/pynicotine/gtkgui/nicotine-settings.glade nicotine-daelstorm/pynicotine/gtkgui/nicotine-settings.glade *** nicotine-1.0.8rc1/pynicotine/gtkgui/nicotine-settings.glade 2004-01-13 20:56:26.000000000 +0200 --- nicotine-daelstorm/pynicotine/gtkgui/nicotine-settings.glade 2004-12-23 03:42:33.000000000 +0200 *************** *** 5,16 **** True ! window2 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 5,21 ---- True ! Server Settings GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 34,46 **** ! 123 True Server: (use server.slsknet.org:2240 for the main server) False False GTK_JUSTIFY_LEFT ! False False 0 0 --- 39,51 ---- ! 360 True Server: (use server.slsknet.org:2240 for the main server) False False GTK_JUSTIFY_LEFT ! True False 0 0 *************** *** 149,155 **** ! 100 True True True --- 154,160 ---- ! 130 True True True *************** *** 257,263 **** - 129 True Network Character Encoding (utf-8 is a good choice) False --- 262,267 ---- *************** *** 342,367 **** 0 - - True - True - I can receive direct connections - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - 30 True Client connection ports (use first available): False --- 346,352 ---- *************** *** 375,389 **** 0 ! 3 ! True ! True ! 40 True False 5 --- 360,374 ---- 0 ! 0 ! False ! False ! 114 True False 5 *************** *** 451,461 **** ! 0 True True 0 --- 436,507 ---- ! 3 True True + + + + True + Use the above ports to configure your router or firewall. + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 11 + + + 0 + False + False + + + + + + True + True + I can receive direct connections + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + (only use if the above ports are remotely accessable) + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + 0 *************** *** 490,501 **** True ! window3 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 536,552 ---- True ! Shares GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 569,574 **** --- 620,626 ---- True True GTK_RELIEF_NORMAL + True *************** *** 578,583 **** --- 630,639 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 706,711 **** --- 762,768 ---- True True GTK_RELIEF_NORMAL + True *************** *** 715,720 **** --- 772,781 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 785,790 **** --- 846,852 ---- Share download directory True GTK_RELIEF_NORMAL + True False False True *************** *** 849,854 **** --- 911,917 ---- True True GTK_RELIEF_NORMAL + True *************** *** 858,863 **** --- 921,930 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 919,924 **** --- 986,992 ---- True True GTK_RELIEF_NORMAL + True *************** *** 928,933 **** --- 996,1005 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 1005,1010 **** --- 1077,1083 ---- Rescan shares on startup True GTK_RELIEF_NORMAL + True False False True *************** *** 1042,1053 **** True ! window4 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 1115,1131 ---- True ! Transfers GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 1070,1096 **** 0 - - True - Locally queue uploads if: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - True False --- 1148,1153 ---- *************** *** 1099,1105 **** True ! Upload speed exceeds False False GTK_JUSTIFY_LEFT --- 1156,1162 ---- True ! If Uploads are sent at False False GTK_JUSTIFY_LEFT *************** *** 1140,1146 **** True ! KBytes/sec False False GTK_JUSTIFY_LEFT --- 1197,1203 ---- True ! KBytes/sec then False False GTK_JUSTIFY_LEFT *************** *** 1166,1171 **** --- 1223,1250 ---- + + 24 + True + other uploads will be queued. + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 0 + 0 + + + 0 + False + False + + + + True False *************** *** 1175,1183 **** True True ! Number of uploads exceeds True GTK_RELIEF_NORMAL False False True --- 1254,1263 ---- True True ! Limit number of uploads to True GTK_RELIEF_NORMAL + True False False True *************** *** 1308,1313 **** --- 1388,1394 ---- Limit uploads speed to True GTK_RELIEF_NORMAL + True False False True *************** *** 1330,1335 **** --- 1411,1417 ---- per transfer True GTK_RELIEF_NORMAL + True False False True *************** *** 1351,1356 **** --- 1433,1439 ---- total transfers True GTK_RELIEF_NORMAL + True False False True *************** *** 1388,1394 **** True ! A user may queue a maximum of False False GTK_JUSTIFY_LEFT --- 1471,1477 ---- True ! Each user may queue a maximum of False False GTK_JUSTIFY_LEFT *************** *** 1458,1466 **** True True ! Queue limit does not apply to friends True GTK_RELIEF_NORMAL False False True --- 1541,1550 ---- True True ! Queue size limit does not apply to friends True GTK_RELIEF_NORMAL + True False False True *************** *** 1486,1491 **** --- 1570,1576 ---- Share to friends only True GTK_RELIEF_NORMAL + True False False True *************** *** 1505,1510 **** --- 1590,1596 ---- Privilege all my friends True GTK_RELIEF_NORMAL + True False False True *************** *** 1523,1528 **** --- 1609,1615 ---- Lock incoming files (turn off for NFS) True GTK_RELIEF_NORMAL + True False False True *************** *** 1560,1571 **** True ! window5 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 1647,1663 ---- True ! Userinfo GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 1629,1634 **** --- 1721,1728 ---- True True True + False + True GTK_JUSTIFY_LEFT GTK_WRAP_WORD True *************** *** 1664,1669 **** --- 1758,1784 ---- + + True + Image: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + True False *************** *** 1694,1699 **** --- 1809,1815 ---- True True GTK_RELIEF_NORMAL + True *************** *** 1703,1708 **** --- 1819,1828 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 1792,1803 **** True ! window6 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 1912,1928 ---- True ! Bloat GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 1820,1825 **** --- 1945,1951 ---- Close-buttons on tabs (requires restart) True GTK_RELIEF_NORMAL + True False False True *************** *** 1845,1850 **** --- 1971,1977 ---- True True GTK_RELIEF_NORMAL + True *************** *** 1853,1858 **** --- 1980,1989 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 1939,1944 **** --- 2070,2076 ---- True True GTK_RELIEF_NORMAL + True *************** *** 1947,1952 **** --- 2079,2088 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 2011,2016 **** --- 2147,2153 ---- True True GTK_RELIEF_NORMAL + True *************** *** 2019,2024 **** --- 2156,2165 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 2084,2089 **** --- 2225,2231 ---- True True GTK_RELIEF_NORMAL + True *************** *** 2092,2097 **** --- 2234,2243 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 2157,2162 **** --- 2303,2309 ---- True True GTK_RELIEF_NORMAL + True *************** *** 2165,2170 **** --- 2312,2321 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 2230,2235 **** --- 2381,2387 ---- True True GTK_RELIEF_NORMAL + True *************** *** 2238,2243 **** --- 2390,2399 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 2302,2307 **** --- 2458,2464 ---- True True GTK_RELIEF_NORMAL + True *************** *** 2310,2315 **** --- 2467,2476 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 2374,2379 **** --- 2535,2541 ---- True True GTK_RELIEF_NORMAL + True *************** *** 2382,2387 **** --- 2544,2553 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 2533,2538 **** --- 2699,2705 ---- True True GTK_RELIEF_NORMAL + True *************** *** 2541,2546 **** --- 2708,2717 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 2606,2611 **** --- 2777,2783 ---- True True GTK_RELIEF_NORMAL + True *************** *** 2614,2619 **** --- 2786,2795 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 2721,2726 **** --- 2897,2903 ---- True True GTK_RELIEF_NORMAL + True *************** *** 2729,2734 **** --- 2906,2915 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 2793,2798 **** --- 2974,2980 ---- True True GTK_RELIEF_NORMAL + True *************** *** 2801,2806 **** --- 2983,2992 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 2989,3000 **** True ! window7 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 3175,3191 ---- True ! Log GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 3017,3022 **** --- 3208,3214 ---- Log private chat by default True GTK_RELIEF_NORMAL + True False False True *************** *** 3035,3040 **** --- 3227,3233 ---- Log chatrooms by default True GTK_RELIEF_NORMAL + True False False True *************** *** 3053,3058 **** --- 3246,3252 ---- Log transfers True GTK_RELIEF_NORMAL + True False False True *************** *** 3121,3126 **** --- 3315,3321 ---- True True GTK_RELIEF_NORMAL + True *************** *** 3130,3135 **** --- 3325,3334 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 3226,3237 **** True ! window8 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 3425,3441 ---- True ! Ban GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 3313,3318 **** --- 3517,3523 ---- True True GTK_RELIEF_NORMAL + True *************** *** 3322,3327 **** --- 3527,3536 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 3383,3388 **** --- 3592,3598 ---- True True GTK_RELIEF_NORMAL + True *************** *** 3392,3397 **** --- 3602,3611 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 3453,3458 **** --- 3667,3673 ---- True True GTK_RELIEF_NORMAL + True *************** *** 3462,3467 **** --- 3677,3686 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 3585,3590 **** --- 3804,3810 ---- True True GTK_RELIEF_NORMAL + True *************** *** 3594,3599 **** --- 3814,3823 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 3655,3660 **** --- 3879,3885 ---- True True GTK_RELIEF_NORMAL + True *************** *** 3664,3669 **** --- 3889,3898 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 3725,3730 **** --- 3954,3960 ---- True True GTK_RELIEF_NORMAL + True *************** *** 3734,3739 **** --- 3964,3973 ---- 0.5 0 0 + 0 + 0 + 0 + 0 *************** *** 3817,3822 **** --- 4051,4057 ---- Use custom ban message: True GTK_RELIEF_NORMAL + True False False True *************** *** 3881,3892 **** True ! window9 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 4116,4132 ---- True ! Search GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 3903,3908 **** --- 4143,4169 ---- 10 + + True + Network Searches: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 0 + 0 + + + 0 + False + False + + + + True False *************** *** 3911,3923 **** True ! Return a max of False False GTK_JUSTIFY_LEFT False False ! 0.5 0.5 0 0 --- 4172,4184 ---- True ! Send out a max of False False GTK_JUSTIFY_LEFT False False ! 1 0.5 0 0 *************** *** 3978,3989 **** --- 4239,4272 ---- + + True + Your Searches: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + True True Use regular expressions for filter in & out True GTK_RELIEF_NORMAL + True False False True *************** *** 4002,4007 **** --- 4285,4291 ---- Enable filters by default True GTK_RELIEF_NORMAL + True False False True *************** *** 4238,4243 **** --- 4522,4528 ---- Free slot True GTK_RELIEF_NORMAL + True False False True *************** *** 4351,4356 **** --- 4636,4646 ---- 400 True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 4439,4444 **** --- 4729,4735 ---- gtk-apply True GTK_RELIEF_NORMAL + True *************** *** 4451,4456 **** --- 4742,4748 ---- gtk-ok True GTK_RELIEF_NORMAL + True *************** *** 4463,4468 **** --- 4755,4761 ---- gtk-cancel True GTK_RELIEF_NORMAL + True *************** *** 4479,4490 **** True ! window1 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 4772,4788 ---- True ! Away GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 4656,4667 **** True ! window2 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 4954,4970 ---- True ! Events GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 4812,4823 **** True ! window1 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 5115,5131 ---- True ! GeoBlock GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 4840,4845 **** --- 5148,5154 ---- Enable geographical blocker True GTK_RELIEF_NORMAL + True False False True *************** *** 4859,4864 **** --- 5168,5174 ---- Geographical paranoia (block unresolvable IPs) True GTK_RELIEF_NORMAL + True False False True *************** *** 4936,4947 **** True ! window1 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False --- 5246,5262 ---- True ! UrlCatch GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST *************** *** 4964,4969 **** --- 5279,5285 ---- Enable URL catching True GTK_RELIEF_NORMAL + True False False True *************** *** 4983,4988 **** --- 5299,5305 ---- Humanize slsk:// urls True GTK_RELIEF_NORMAL + True False False True *************** *** 5148,5153 **** --- 5465,5471 ---- Update True GTK_RELIEF_NORMAL + True *************** *** 5167,5172 **** --- 5485,5491 ---- Remove True GTK_RELIEF_NORMAL + True *************** *** 5210,5213 **** --- 5529,6045 ---- + + True + Connection + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + + + + True + 0 + 0 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 4 + 1 + 1 + 1 + + + + 2 + True + False + 6 + + + + True + Choose Server to configure the server you wish to connect to, your username, password and connection ports. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + Choose Shares to configure your Download and Shared directories. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + Choose Transfers to configure how uploads are queued and what privileges are given to your friends. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + Choose Geo Block (if available) to control from which countries users are allowed access to your shares. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + If you wish to use Geo Block, install GeoIP and it's Python Bindings from your distro's packaging tool or from: + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + http://www.maxmind.com/app/c + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + http://www.maxmind.com/app/python + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + + + + + True + Connection Settings + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + + + + True + UI + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0 + 0 + 1 + 1 + 4 + 1 + 1 + 1 + + + + 2 + True + False + 6 + + + + True + Choose Interface to configure text color and other settings. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + Choose URL Catching to configure the programs used when clicking on links. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + + + + + True + User Interface Settings + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + + + + True + Misc + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0 + 0 + 1 + 1 + 4 + 1 + 1 + 1 + + + + 2 + True + False + 6 + + + + True + Choose Away mode to configure your auto-away settings. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + Choose User info to add text and an image to your personal info. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + Choose Ban / ignore to manage your ban list and ignore list. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + Choose Logging to configure what's logged and where to save the logs. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + Choose Searches to configure search settings and to set default search filters. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + True + Choose Events to configure what commands are executed upon the completion of downloads. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 8 + 0 + + + 0 + False + False + + + + + + + + + + True + Miscellaneous Settings + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + + diff -cr nicotine-1.0.8rc1/pynicotine/gtkgui/settings_glade.py nicotine-daelstorm/pynicotine/gtkgui/settings_glade.py *** nicotine-1.0.8rc1/pynicotine/gtkgui/settings_glade.py 2004-01-08 00:08:26.000000000 +0200 --- nicotine-daelstorm/pynicotine/gtkgui/settings_glade.py 2004-12-23 14:02:10.000000000 +0200 *************** *** 9,15 **** self.accel_group = accel_group if create: self.ServerFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.ServerFrame.set_title(_("window2")) self.ServerFrame.set_position(gtk.WIN_POS_NONE) self.ServerFrame.add_accel_group(self.accel_group) self.ServerFrame.show() --- 9,15 ---- self.accel_group = accel_group if create: self.ServerFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.ServerFrame.set_title(_("Server Settings")) self.ServerFrame.set_position(gtk.WIN_POS_NONE) self.ServerFrame.add_accel_group(self.accel_group) self.ServerFrame.show() *************** *** 27,36 **** self.vbox72.show() self.vbox72.set_spacing(0) ! self.label166 = gtk.Label(_("Server: (use mail.slsk.org:2240 for the main server)")) self.label166.set_alignment(0, 0) ! self.label166.set_size_request(123, -1) self.label166.set_padding(0, 0) self.label166.show() self.vbox72.pack_start(self.label166, gtk.FALSE, gtk.FALSE, 3) --- 27,37 ---- self.vbox72.show() self.vbox72.set_spacing(0) ! self.label166 = gtk.Label(_("Server: (use server.slsknet.org:2240 for the main server)")) self.label166.set_alignment(0, 0) ! self.label166.set_size_request(360, -1) self.label166.set_padding(0, 0) + self.label166.set_line_wrap(gtk.TRUE) self.label166.show() self.vbox72.pack_start(self.label166, gtk.FALSE, gtk.FALSE, 3) *************** *** 69,79 **** self.label167.set_alignment(0, 0.5) self.label167.set_size_request(57, -1) self.label167.set_padding(0, 0) self.label167.show() self.vbox73.pack_start(self.label167, gtk.FALSE, gtk.FALSE, 0) self.Login = gtk.Entry() ! self.Login.set_size_request(100, -1) self.Login.set_text("") self.Login.set_editable(gtk.TRUE) self.Login.show() --- 70,81 ---- self.label167.set_alignment(0, 0.5) self.label167.set_size_request(57, -1) self.label167.set_padding(0, 0) + self.label167.set_line_wrap(gtk.FALSE) self.label167.show() self.vbox73.pack_start(self.label167, gtk.FALSE, gtk.FALSE, 0) self.Login = gtk.Entry() ! self.Login.set_size_request(130, -1) self.Login.set_text("") self.Login.set_editable(gtk.TRUE) self.Login.show() *************** *** 93,98 **** --- 95,101 ---- self.label168.set_alignment(0, 0) self.label168.set_size_request(5, -1) self.label168.set_padding(0, 0) + self.label168.set_line_wrap(gtk.FALSE) self.label168.show() self.vbox74.pack_start(self.label168, gtk.FALSE, gtk.FALSE, 0) *************** *** 113,120 **** self.label169 = gtk.Label(_("Network Character Encoding (utf-8 is a good choice)")) self.label169.set_alignment(0.05, 0.5) - self.label169.set_size_request(129, -1) self.label169.set_padding(0, 0) self.label169.show() self.vbox75.pack_start(self.label169, gtk.FALSE, gtk.FALSE, 0) --- 116,123 ---- self.label169 = gtk.Label(_("Network Character Encoding (utf-8 is a good choice)")) self.label169.set_alignment(0.05, 0.5) self.label169.set_padding(0, 0) + self.label169.set_line_wrap(gtk.FALSE) self.label169.show() self.vbox75.pack_start(self.label169, gtk.FALSE, gtk.FALSE, 0) *************** *** 144,164 **** self.vbox76.show() self.vbox76.set_spacing(0) - self.DirectConnection = gtk.CheckButton() - self.DirectConnection.set_active(gtk.FALSE) - self.DirectConnection.set_label(_("I can receive direct connections")) - self.DirectConnection.show() - self.vbox76.pack_start(self.DirectConnection, gtk.FALSE, gtk.FALSE, 0) - self.label172 = gtk.Label(_("Client connection ports (use first available):")) self.label172.set_alignment(0, 0.5) - self.label172.set_size_request(30, -1) self.label172.set_padding(0, 0) self.label172.show() ! self.vbox76.pack_start(self.label172, gtk.TRUE, gtk.TRUE, 3) self.hbox106 = gtk.HBox(gtk.FALSE, 5) ! self.hbox106.set_size_request(40, -1) self.hbox106.show() self.hbox106.set_spacing(5) --- 147,161 ---- self.vbox76.show() self.vbox76.set_spacing(0) self.label172 = gtk.Label(_("Client connection ports (use first available):")) self.label172.set_alignment(0, 0.5) self.label172.set_padding(0, 0) + self.label172.set_line_wrap(gtk.FALSE) self.label172.show() ! self.vbox76.pack_start(self.label172, gtk.FALSE, gtk.FALSE, 0) self.hbox106 = gtk.HBox(gtk.FALSE, 5) ! self.hbox106.set_size_request(114, -1) self.hbox106.show() self.hbox106.set_spacing(5) *************** *** 172,177 **** --- 169,175 ---- self.label173 = gtk.Label(_("-")) self.label173.set_size_request(0, -1) self.label173.set_padding(0, 0) + self.label173.set_line_wrap(gtk.FALSE) self.label173.show() self.hbox106.pack_start(self.label173, gtk.FALSE, gtk.FALSE, 0) *************** *** 182,188 **** self.LastPort.show() self.hbox106.pack_start(self.LastPort, gtk.FALSE, gtk.FALSE, 0) ! self.vbox76.pack_start(self.hbox106, gtk.TRUE, gtk.TRUE, 0) self.vbox71.pack_start(self.vbox76, gtk.FALSE, gtk.FALSE, 0) --- 180,206 ---- self.LastPort.show() self.hbox106.pack_start(self.LastPort, gtk.FALSE, gtk.FALSE, 0) ! self.vbox76.pack_start(self.hbox106, gtk.TRUE, gtk.TRUE, 3) ! ! self.label260 = gtk.Label(_("Use the above ports to configure your router or firewall.")) ! self.label260.set_alignment(0, 0.5) ! self.label260.set_padding(0, 11) ! self.label260.set_line_wrap(gtk.FALSE) ! self.label260.show() ! self.vbox76.pack_start(self.label260, gtk.FALSE, gtk.FALSE, 0) ! ! self.DirectConnection = gtk.CheckButton() ! self.DirectConnection.set_active(gtk.FALSE) ! self.DirectConnection.set_label(_("I can receive direct connections")) ! self.DirectConnection.show() ! self.vbox76.pack_start(self.DirectConnection, gtk.FALSE, gtk.FALSE, 0) ! ! self.label271 = gtk.Label(_("(only use if the above ports are remotely accessable)")) ! self.label271.set_alignment(0, 0.5) ! self.label271.set_padding(0, 0) ! self.label271.set_line_wrap(gtk.FALSE) ! self.label271.show() ! self.vbox76.pack_start(self.label271, gtk.FALSE, gtk.FALSE, 0) self.vbox71.pack_start(self.vbox76, gtk.FALSE, gtk.FALSE, 0) *************** *** 190,195 **** --- 208,214 ---- self.label165 = gtk.Label(_("Server")) self.label165.set_padding(0, 0) + self.label165.set_line_wrap(gtk.FALSE) self.label165.show() self.Main.set_label_widget(self.label165) *************** *** 209,215 **** self.accel_group = accel_group if create: self.SharesFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.SharesFrame.set_title(_("window3")) self.SharesFrame.set_position(gtk.WIN_POS_NONE) self.SharesFrame.add_accel_group(self.accel_group) self.SharesFrame.show() --- 228,234 ---- self.accel_group = accel_group if create: self.SharesFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.SharesFrame.set_title(_("Shares")) self.SharesFrame.set_position(gtk.WIN_POS_NONE) self.SharesFrame.add_accel_group(self.accel_group) self.SharesFrame.show() *************** *** 230,235 **** --- 249,255 ---- self.label176 = gtk.Label(_("Incomplete file directory:")) self.label176.set_alignment(0, 0.5) self.label176.set_padding(0, 0) + self.label176.set_line_wrap(gtk.FALSE) self.label176.show() self.vbox78.pack_start(self.label176, gtk.FALSE, gtk.FALSE, 0) *************** *** 263,268 **** --- 283,289 ---- self.label231 = gtk.Label(_("Choose...")) self.label231.set_padding(0, 0) + self.label231.set_line_wrap(gtk.FALSE) self.label231.show() self.hbox152.pack_start(self.label231, gtk.FALSE, gtk.FALSE, 0) *************** *** 283,288 **** --- 304,310 ---- self.label178 = gtk.Label(_("Download directory:")) self.label178.set_alignment(0, 0.5) self.label178.set_padding(0, 0) + self.label178.set_line_wrap(gtk.FALSE) self.label178.show() self.vbox79.pack_start(self.label178, gtk.FALSE, gtk.FALSE, 0) *************** *** 316,321 **** --- 338,344 ---- self.label232 = gtk.Label(_("Choose...")) self.label232.set_padding(0, 0) + self.label232.set_line_wrap(gtk.FALSE) self.label232.show() self.hbox153.pack_start(self.label232, gtk.FALSE, gtk.FALSE, 0) *************** *** 376,381 **** --- 399,405 ---- self.label233 = gtk.Label(_("Add...")) self.label233.set_padding(0, 0) + self.label233.set_line_wrap(gtk.FALSE) self.label233.show() self.hbox154.pack_start(self.label233, gtk.FALSE, gtk.FALSE, 0) *************** *** 404,409 **** --- 428,434 ---- self.label234 = gtk.Label(_("Remove")) self.label234.set_padding(0, 0) + self.label234.set_line_wrap(gtk.FALSE) self.label234.show() self.hbox155.pack_start(self.label234, gtk.FALSE, gtk.FALSE, 0) *************** *** 427,432 **** --- 452,458 ---- self.label175 = gtk.Label(_("Shares")) self.label175.set_padding(0, 0) + self.label175.set_line_wrap(gtk.FALSE) self.label175.show() self.Main.set_label_widget(self.label175) *************** *** 461,467 **** self.accel_group = accel_group if create: self.TransfersFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.TransfersFrame.set_title(_("window4")) self.TransfersFrame.set_position(gtk.WIN_POS_NONE) self.TransfersFrame.add_accel_group(self.accel_group) self.TransfersFrame.show() --- 487,493 ---- self.accel_group = accel_group if create: self.TransfersFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.TransfersFrame.set_title(_("Transfers")) self.TransfersFrame.set_position(gtk.WIN_POS_NONE) self.TransfersFrame.add_accel_group(self.accel_group) self.TransfersFrame.show() *************** *** 479,496 **** self.vbox82.show() self.vbox82.set_spacing(0) - self.label184 = gtk.Label(_("Locally queue uploads if:")) - self.label184.set_alignment(0, 0.5) - self.label184.set_padding(0, 0) - self.label184.show() - self.vbox82.pack_start(self.label184, gtk.FALSE, gtk.FALSE, 0) - self.hbox117 = gtk.HBox(gtk.FALSE, 5) self.hbox117.show() self.hbox117.set_spacing(5) ! self.label185 = gtk.Label(_("Upload speed exceeds ")) self.label185.set_padding(0, 0) self.label185.show() self.hbox117.pack_start(self.label185, gtk.FALSE, gtk.FALSE, 0) --- 505,517 ---- self.vbox82.show() self.vbox82.set_spacing(0) self.hbox117 = gtk.HBox(gtk.FALSE, 5) self.hbox117.show() self.hbox117.set_spacing(5) ! self.label185 = gtk.Label(_("If Uploads are sent at")) self.label185.set_padding(0, 0) + self.label185.set_line_wrap(gtk.FALSE) self.label185.show() self.hbox117.pack_start(self.label185, gtk.FALSE, gtk.FALSE, 0) *************** *** 501,520 **** self.QueueBandwidth.show() self.hbox117.pack_start(self.QueueBandwidth, gtk.FALSE, gtk.FALSE, 0) ! self.label186 = gtk.Label(_("KBytes/sec")) self.label186.set_padding(0, 0) self.label186.show() self.hbox117.pack_start(self.label186, gtk.FALSE, gtk.FALSE, 0) self.vbox82.pack_start(self.hbox117, gtk.FALSE, gtk.FALSE, 0) self.hbox118 = gtk.HBox(gtk.FALSE, 5) self.hbox118.show() self.hbox118.set_spacing(5) self.QueueUseSlots = gtk.CheckButton() self.QueueUseSlots.set_active(gtk.FALSE) ! self.QueueUseSlots.set_label(_("Number of uploads exceeds")) self.QueueUseSlots.show() self.QueueUseSlots.connect("toggled", self.OnQueueUseSlotsToggled) self.hbox118.pack_start(self.QueueUseSlots, gtk.FALSE, gtk.FALSE, 0) --- 522,550 ---- self.QueueBandwidth.show() self.hbox117.pack_start(self.QueueBandwidth, gtk.FALSE, gtk.FALSE, 0) ! self.label186 = gtk.Label(_("KBytes/sec then")) self.label186.set_padding(0, 0) + self.label186.set_line_wrap(gtk.FALSE) self.label186.show() self.hbox117.pack_start(self.label186, gtk.FALSE, gtk.FALSE, 0) self.vbox82.pack_start(self.hbox117, gtk.FALSE, gtk.FALSE, 0) + self.label261 = gtk.Label(_("other uploads will be queued.")) + self.label261.set_alignment(0, 0) + self.label261.set_size_request(-1, 24) + self.label261.set_padding(0, 0) + self.label261.set_line_wrap(gtk.FALSE) + self.label261.show() + self.vbox82.pack_start(self.label261, gtk.FALSE, gtk.FALSE, 0) + self.hbox118 = gtk.HBox(gtk.FALSE, 5) self.hbox118.show() self.hbox118.set_spacing(5) self.QueueUseSlots = gtk.CheckButton() self.QueueUseSlots.set_active(gtk.FALSE) ! self.QueueUseSlots.set_label(_("Limit number of uploads to")) self.QueueUseSlots.show() self.QueueUseSlots.connect("toggled", self.OnQueueUseSlotsToggled) self.hbox118.pack_start(self.QueueUseSlots, gtk.FALSE, gtk.FALSE, 0) *************** *** 528,533 **** --- 558,564 ---- self.label254 = gtk.Label(_("(NOT RECOMMENDED)")) self.label254.set_padding(0, 0) + self.label254.set_line_wrap(gtk.FALSE) self.label254.show() self.hbox118.pack_start(self.label254, gtk.FALSE, gtk.FALSE, 0) *************** *** 549,554 **** --- 580,586 ---- self.label188 = gtk.Label(_("KBytes/sec")) self.label188.set_padding(0, 0) + self.label188.set_line_wrap(gtk.FALSE) self.label188.show() self.table1.attach(self.label188, 2, 3, 0, 1, 0, 0, 0, 0) *************** *** 583,591 **** self.hbox119.show() self.hbox119.set_spacing(5) ! self.label189 = gtk.Label(_("A user may queue a maximum of")) self.label189.set_alignment(0, 0.5) self.label189.set_padding(0, 0) self.label189.show() self.hbox119.pack_start(self.label189, gtk.FALSE, gtk.FALSE, 0) --- 615,624 ---- self.hbox119.show() self.hbox119.set_spacing(5) ! self.label189 = gtk.Label(_("Each user may queue a maximum of")) self.label189.set_alignment(0, 0.5) self.label189.set_padding(0, 0) + self.label189.set_line_wrap(gtk.FALSE) self.label189.show() self.hbox119.pack_start(self.label189, gtk.FALSE, gtk.FALSE, 0) *************** *** 598,603 **** --- 631,637 ---- self.label190 = gtk.Label(_("Megabytes")) self.label190.set_padding(0, 0) + self.label190.set_line_wrap(gtk.FALSE) self.label190.show() self.hbox119.pack_start(self.label190, gtk.FALSE, gtk.FALSE, 0) *************** *** 605,611 **** self.FriendsNoLimits = gtk.CheckButton() self.FriendsNoLimits.set_active(gtk.FALSE) ! self.FriendsNoLimits.set_label(_("Queue limit does not apply to friends")) self.FriendsNoLimits.show() self.vbox83.pack_start(self.FriendsNoLimits, gtk.FALSE, gtk.FALSE, 0) --- 639,645 ---- self.FriendsNoLimits = gtk.CheckButton() self.FriendsNoLimits.set_active(gtk.FALSE) ! self.FriendsNoLimits.set_label(_("Queue size limit does not apply to friends")) self.FriendsNoLimits.show() self.vbox83.pack_start(self.FriendsNoLimits, gtk.FALSE, gtk.FALSE, 0) *************** *** 634,639 **** --- 668,674 ---- self.label183 = gtk.Label(_("Transfers")) self.label183.set_padding(0, 0) + self.label183.set_line_wrap(gtk.FALSE) self.label183.show() self.Main.set_label_widget(self.label183) *************** *** 662,668 **** self.accel_group = accel_group if create: self.UserinfoFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.UserinfoFrame.set_title(_("window5")) self.UserinfoFrame.set_position(gtk.WIN_POS_NONE) self.UserinfoFrame.add_accel_group(self.accel_group) self.UserinfoFrame.show() --- 697,703 ---- self.accel_group = accel_group if create: self.UserinfoFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.UserinfoFrame.set_title(_("Userinfo")) self.UserinfoFrame.set_position(gtk.WIN_POS_NONE) self.UserinfoFrame.add_accel_group(self.accel_group) self.UserinfoFrame.show() *************** *** 683,688 **** --- 718,724 ---- self.label193 = gtk.Label(_("Self description:")) self.label193.set_alignment(0, 0.5) self.label193.set_padding(0, 0) + self.label193.set_line_wrap(gtk.FALSE) self.label193.show() self.vbox85.pack_start(self.label193, gtk.FALSE, gtk.FALSE, 0) *************** *** 709,714 **** --- 745,757 ---- self.vbox84.pack_start(self.vbox85, gtk.TRUE, gtk.TRUE, 0) + self.label265 = gtk.Label(_("Image:")) + self.label265.set_alignment(0, 0.5) + self.label265.set_padding(0, 0) + self.label265.set_line_wrap(gtk.FALSE) + self.label265.show() + self.vbox84.pack_start(self.label265, gtk.FALSE, gtk.FALSE, 0) + self.hbox122 = gtk.HBox(gtk.FALSE, 5) self.hbox122.show() self.hbox122.set_spacing(5) *************** *** 739,744 **** --- 782,788 ---- self.label230 = gtk.Label(_("Choose...")) self.label230.set_padding(0, 0) + self.label230.set_line_wrap(gtk.FALSE) self.label230.show() self.hbox151.pack_start(self.label230, gtk.FALSE, gtk.FALSE, 0) *************** *** 754,759 **** --- 798,804 ---- self.label192 = gtk.Label(_("Personal settings")) self.label192.set_padding(0, 0) + self.label192.set_line_wrap(gtk.FALSE) self.label192.show() self.Main.set_label_widget(self.label192) *************** *** 776,782 **** self.accel_group = accel_group if create: self.BloatFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.BloatFrame.set_title(_("window6")) self.BloatFrame.set_position(gtk.WIN_POS_NONE) self.BloatFrame.add_accel_group(self.accel_group) self.BloatFrame.show() --- 821,827 ---- self.accel_group = accel_group if create: self.BloatFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.BloatFrame.set_title(_("Bloat")) self.BloatFrame.set_position(gtk.WIN_POS_NONE) self.BloatFrame.add_accel_group(self.accel_group) self.BloatFrame.show() *************** *** 820,825 **** --- 865,871 ---- self.label197 = gtk.Label(_("Remote text")) self.label197.set_padding(0, 0) + self.label197.set_line_wrap(gtk.FALSE) self.label197.show() self.hbox124.pack_start(self.label197, gtk.FALSE, gtk.FALSE, 0) *************** *** 853,858 **** --- 899,905 ---- self.label198 = gtk.Label(_("Default")) self.label198.set_padding(0, 0) + self.label198.set_line_wrap(gtk.FALSE) self.label198.show() self.hbox125.pack_start(self.label198, gtk.FALSE, gtk.FALSE, 0) *************** *** 881,886 **** --- 928,934 ---- self.label205 = gtk.Label(_("Local text")) self.label205.set_padding(0, 0) + self.label205.set_line_wrap(gtk.FALSE) self.label205.show() self.hbox132.pack_start(self.label205, gtk.FALSE, gtk.FALSE, 0) *************** *** 909,914 **** --- 957,963 ---- self.label206 = gtk.Label(_("/me text")) self.label206.set_padding(0, 0) + self.label206.set_line_wrap(gtk.FALSE) self.label206.show() self.hbox133.pack_start(self.label206, gtk.FALSE, gtk.FALSE, 0) *************** *** 937,942 **** --- 986,992 ---- self.label207 = gtk.Label(_("Highlight text")) self.label207.set_padding(0, 0) + self.label207.set_line_wrap(gtk.FALSE) self.label207.show() self.hbox134.pack_start(self.label207, gtk.FALSE, gtk.FALSE, 0) *************** *** 964,969 **** --- 1014,1020 ---- self.label202 = gtk.Label(_("Default")) self.label202.set_padding(0, 0) + self.label202.set_line_wrap(gtk.FALSE) self.label202.show() self.hbox129.pack_start(self.label202, gtk.FALSE, gtk.FALSE, 0) *************** *** 991,996 **** --- 1042,1048 ---- self.label203 = gtk.Label(_("Default")) self.label203.set_padding(0, 0) + self.label203.set_line_wrap(gtk.FALSE) self.label203.show() self.hbox130.pack_start(self.label203, gtk.FALSE, gtk.FALSE, 0) *************** *** 1018,1023 **** --- 1070,1076 ---- self.label204 = gtk.Label(_("Default")) self.label204.set_padding(0, 0) + self.label204.set_line_wrap(gtk.FALSE) self.label204.show() self.hbox131.pack_start(self.label204, gtk.FALSE, gtk.FALSE, 0) *************** *** 1048,1053 **** --- 1101,1107 ---- self.label196 = gtk.Label(_("Chat colours")) self.label196.set_alignment(0, 0.5) self.label196.set_padding(0, 5) + self.label196.set_line_wrap(gtk.FALSE) self.label196.show() self.table2.attach(self.label196, 0, 3, 0, 1, gtk.FILL, 0, 0, 0) *************** *** 1070,1075 **** --- 1124,1130 ---- self.label209 = gtk.Label(_("Immediate DL")) self.label209.set_padding(0, 0) + self.label209.set_line_wrap(gtk.FALSE) self.label209.show() self.hbox135.pack_start(self.label209, gtk.FALSE, gtk.FALSE, 0) *************** *** 1098,1103 **** --- 1153,1159 ---- self.label210 = gtk.Label(_("With queue")) self.label210.set_padding(0, 0) + self.label210.set_line_wrap(gtk.FALSE) self.label210.show() self.hbox136.pack_start(self.label210, gtk.FALSE, gtk.FALSE, 0) *************** *** 1137,1142 **** --- 1193,1199 ---- self.label211 = gtk.Label(_("Default")) self.label211.set_padding(0, 0) + self.label211.set_line_wrap(gtk.FALSE) self.label211.show() self.hbox137.pack_start(self.label211, gtk.FALSE, gtk.FALSE, 0) *************** *** 1164,1169 **** --- 1221,1227 ---- self.label212 = gtk.Label(_("Default")) self.label212.set_padding(0, 0) + self.label212.set_line_wrap(gtk.FALSE) self.label212.show() self.hbox138.pack_start(self.label212, gtk.FALSE, gtk.FALSE, 0) *************** *** 1176,1181 **** --- 1234,1240 ---- self.label208 = gtk.Label(_("Search colours")) self.label208.set_alignment(0, 0.5) self.label208.set_padding(0, 5) + self.label208.set_line_wrap(gtk.FALSE) self.label208.show() self.table2.attach(self.label208, 0, 3, 5, 6, gtk.FILL, 0, 0, 0) *************** *** 1188,1193 **** --- 1247,1253 ---- self.label213 = gtk.Label(_("Decimal seperator:")) self.label213.set_alignment(0, 0.5) self.label213.set_padding(0, 0) + self.label213.set_line_wrap(gtk.FALSE) self.label213.show() self.hbox139.pack_start(self.label213, gtk.FALSE, gtk.FALSE, 0) *************** *** 1211,1216 **** --- 1271,1277 ---- self.label195 = gtk.Label(_("Extra stuff for your comfort")) self.label195.set_padding(0, 0) + self.label195.set_line_wrap(gtk.FALSE) self.label195.show() self.Main.set_label_widget(self.label195) *************** *** 1230,1236 **** self.accel_group = accel_group if create: self.LogFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.LogFrame.set_title(_("window7")) self.LogFrame.set_position(gtk.WIN_POS_NONE) self.LogFrame.add_accel_group(self.accel_group) self.LogFrame.show() --- 1291,1297 ---- self.accel_group = accel_group if create: self.LogFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.LogFrame.set_title(_("Log")) self.LogFrame.set_position(gtk.WIN_POS_NONE) self.LogFrame.add_accel_group(self.accel_group) self.LogFrame.show() *************** *** 1269,1274 **** --- 1330,1336 ---- self.label217 = gtk.Label(_("Logs directory:")) self.label217.set_alignment(0, 0.5) self.label217.set_padding(0, 0) + self.label217.set_line_wrap(gtk.FALSE) self.label217.show() self.vbox90.pack_start(self.label217, gtk.FALSE, gtk.FALSE, 0) *************** *** 1301,1306 **** --- 1363,1369 ---- self.label227 = gtk.Label(_("Choose...")) self.label227.set_padding(0, 0) + self.label227.set_line_wrap(gtk.FALSE) self.label227.show() self.hbox148.pack_start(self.label227, gtk.FALSE, gtk.FALSE, 0) *************** *** 1318,1323 **** --- 1381,1387 ---- self.label216 = gtk.Label(_("Logging")) self.label216.set_padding(0, 0) + self.label216.set_line_wrap(gtk.FALSE) self.label216.show() self.Main.set_label_widget(self.label216) *************** *** 1340,1346 **** self.accel_group = accel_group if create: self.BanFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.BanFrame.set_title(_("window8")) self.BanFrame.set_position(gtk.WIN_POS_NONE) self.BanFrame.add_accel_group(self.accel_group) self.BanFrame.show() --- 1404,1410 ---- self.accel_group = accel_group if create: self.BanFrame = gtk.Window(gtk.WINDOW_TOPLEVEL) ! self.BanFrame.set_title(_("Ban")) self.BanFrame.set_position(gtk.WIN_POS_NONE) self.BanFrame.add_accel_group(self.accel_group) self.BanFrame.show() *************** *** 1365,1370 **** --- 1429,1435 ---- self.label219 = gtk.Label(_("Banned Users:")) self.label219.set_padding(0, 0) + self.label219.set_line_wrap(gtk.FALSE) self.label219.show() self.vbox92.pack_start(self.label219, gtk.FALSE, gtk.FALSE, 0) *************** *** 13