Changeset 414

Timestamp:

02/09/07 09:27:48 (19 months ago)

Author:

daelstorm

Message:

Murmur: major fixes to the Settings dialog (hey, it actually works now)

Location:

murmur/trunk/sources/pymurmur

Files:

• muscan.py (modified) (1 diff)
• settings.py (modified) (87 diffs)

murmur/trunk/sources/pymurmur/muscan.py

@@ -31 +31 @@
                         if len(fileprefix) == 2:
                                 file = fileprefix[0]+".xml"
-                                 #self.frame.Networking.config["shares"]["database"][:pos]
                                 if os.path.exists(file):
                                         self.configfile = file

murmur/trunk/sources/pymurmur/settings.py

@@ -6 +6 @@
 import gobject
 import time, stat, string, shutil
- #pwd, 
+import pwd
 from time import sleep
 from utils import _
@@ -108 +108 @@
                 self.murmur_config = self.app.Config
                 self.set_transient_for(self.app.MurmurWindow)
-                self.set_default_size(600, 400)
+                self.set_default_size(600, 600)
                 self.connect("destroy", self.quit)
                 self.connect("delete_event", self.quit)
@@ -135 +135 @@
                 sbox3.show()
                 label3 = gtk.Label("Museek Interface:")
-                sbox3.pack_start(label3, True, False)
+                label3.set_alignment(0, 0)
+                sbox3.pack_start(label3, True, True)
                 label3.show()
                 self.Interface = gtk.Entry()
@@ -142 +143 @@
                 else:
                         self.Interface.set_text("Input a Museek Interface")
-                sbox3.pack_start(self.Interface, True, False)
+                sbox3.pack_start(self.Interface, True, True)
                 self.Interface.show()
                 
@@ -150 +151 @@
                 sbox2.show()
                 label2 = gtk.Label("Password:")
-                sbox2.pack_start(label2, True, False)
+                label2.set_alignment(0, 0)
+                sbox2.pack_start(label2, True, True)
                 label2.show()
                 self.Password = gtk.Entry()
@@ -157 +159 @@
                 else:
                         self.Password.set_text("Input a password")
-                sbox2.pack_start(self.Password, True, False)
+                sbox2.pack_start(self.Password, True, True)
                 self.Password.show()
                 
                 
                 
-                self.vbox1 = gtk.VBox()
-                self.vbox1.pack_start(sbox3, False, False) #entry3  (interface)
-                self.vbox1.pack_start(sbox2, False, False) #entry2  (password)
+                self.vbox1 = gtk.VBox(True, spacing=5)
+                self.vbox1.set_border_width(5)
+                self.vbox1.pack_start(sbox3, False, False, 5) #entry3  (interface)
+                self.vbox1.pack_start(sbox2, False, False, 5) #entry2  (password)
                 self.vbox1.show()
                 self.frame1.add(self.vbox1)
@@ -170 +173 @@
                 
                 # Tooltips
-                sbox4 = gtk.HBox(True, spacing=5)
-                sbox4.show()
-                label1 = gtk.Label("Tooltips:")
-                sbox4.pack_start(label1, False, False)
-                
-                label1.show()
-                self.TooltipCheck = gtk.CheckButton(label=None)
+                #sbox4 = gtk.HBox(True, spacing=5)
+                #sbox4.set_border_width(5)
+                #sbox4.show()
+                #label1 = gtk.Label("Tooltips:")
+                #label1.set_alignment(0, 0)
+                #sbox4.pack_start(label1, True, True)
+                
+                #label1.show()
+                self.TooltipCheck = gtk.CheckButton("Tooltips")
                 self.TooltipCheck.connect("toggled", self.tooltip_check, "check button 1")
                 
@@ -185 +190 @@
                         
                 self.TooltipCheck.show()
-                sbox4.pack_start(self.TooltipCheck, False, False)
+                #sbox4.pack_start(self.TooltipCheck, True, True)
         
                 # Tooltips
-                sbox5 = gtk.HBox(True, spacing=5)
-                sbox5.show()
-                label1 = gtk.Label("Load Tray App at start:")
-                sbox5.pack_start(label1, False, False)
-                
-                label1.show()
-                self.check_button2 = gtk.CheckButton(label=None)
+                #sbox5 = gtk.HBox(True, spacing=5)
+                #sbox5.set_border_width(5)
+                #sbox5.show()
+                #label1 = gtk.Label("Load Tray App at start:")
+                #sbox5.pack_start(label1, False, False)
+                
+                #label1.show()
+                self.check_button2 = gtk.CheckButton(_("Load Tray Icon at start"))
                 
                 if self.murmur_config["murmur"]["trayapp"] == "yes":
@@ -202 +208 @@
                 self.check_button2.connect("toggled", self.trayapp_check, "check button 1")     
                 self.check_button2.show()
-                sbox5.pack_start(self.check_button2, False, False)
+                #sbox5.pack_start(self.check_button2, False, False)
                 
                 # Museek Interface
-                sbox6 = gtk.HBox(True, spacing=5)
-                sbox6.show()
+                #sbox6 = gtk.HBox(True, spacing=5)
+                #sbox6.show()
                 label6 = gtk.Label("Museekd's Config File:")
-                sbox6.pack_start(label6, True, False)
+                label6.set_alignment(0, 0)
+                #sbox6.pack_start(label6, True, True)
                 label6.show()
                 self.Configfile = gtk.Entry()
@@ -216 +223 @@
                         self.Configfile.set_text("Input the path to the Museekd Config")
                 self.Configfile.show()
-                sbox6.pack_start(self.Configfile, True, True)
+                #sbox6.pack_start(self.Configfile, True, True)
                 
                 
@@ -227 +234 @@
                 hbox.pack_start(self.frame1, False, False)
                 hbox.show()
-                self.vbox2 = gtk.VBox()
+                self.vbox2 = gtk.VBox(True, spacing=5)
                 self.vbox2.show()
-                self.vbox2.pack_start(sbox4, False, False)      #checkbox (tooltip)
-                self.vbox2.pack_start(sbox5, False, False)      #checkbox (trayapp)
-                self.vbox2.pack_start(sbox6, True, True)
+                self.vbox2.pack_start(self.TooltipCheck, False, False)  #checkbox (tooltip)
+                self.vbox2.pack_start(self.check_button2, False, False) #checkbox (trayapp)
+                self.vbox2.pack_start(label6, False, False)
+                self.vbox2.pack_start(self.Configfile, False, False)
                 hbox.pack_start(self.vbox2, True, True)
                 self.vbox.pack_start(hbox, False, False)
@@ -239 +247 @@
                 self.vbox.pack_start(self.notebook1)
                 
-                button = gtk.Button("Save")
-                button.connect("clicked", self.click)
-                button.set_flags(gtk.CAN_DEFAULT)
-                self.action_area.pack_start(button)
-                button.show()
-                button.grab_default()
-                button = gtk.Button("Cancel")
-                button.connect("clicked", self.quit)
-                button.set_flags(gtk.CAN_DEFAULT)
-                self.action_area.pack_start(button)
-                button.show()
+                OkButton = self.app.CreateIconButton(gtk.STOCK_OK, "stock", self.click, _("OK"))
+                self.action_area.pack_start(OkButton)
+                OkButton.set_flags(gtk.CAN_DEFAULT)
+
+                
+                SaveButton = self.app.CreateIconButton(gtk.STOCK_SAVE, "stock", self.save, _("Save"))
+                self.action_area.pack_start(SaveButton)
+                SaveButton.set_flags(gtk.CAN_DEFAULT)
+
+
+                CancelButton = self.app.CreateIconButton(gtk.STOCK_CANCEL, "stock", self.quit, _("Cancel"))
+                self.action_area.pack_start(CancelButton)
+                CancelButton.set_flags(gtk.CAN_DEFAULT)
+                CancelButton.grab_default()
+                
+
                 self.ret = None
         
@@ -411 +424 @@
                         #       
 
-                        
-        def OnAddTrusted(self, widget):
-                self.AddItemToList("trusted", _("Trusted User"), _("Comment"))
-        
-        def OnAddBuddy(self, widget):
-                self.AddItemToList("buddies", _("Buddied User"), _("Comment"))
-        
-        def OnAddBanned(self, widget):
-                self.AddItemToList("banned", _("Banned User"), _("Comment"))
-
-        def OnAddInterface(self, widget):
-                self.AddItemToList("interfaces.bind", _("Socket / Port"), None)
-        
-        def OnAddIgnored(self, widget):
-                self.AddItemToList("ignored", _("Ignored User"), _("Comment"))
-        
-        def OnAddAlert(self, widget):
-                self.AddItemToList("alerts", _("User Status Alert"), None)
-        
-        def OnAddTicker(self, widget):
-                self.AddItemToList("tickers", _("Ticker's Room"), _("Ticker"))
-                
-        def OnAddEncoding(self, widget):
-                self.AddItemToList("encoding.rooms", _("Room"), _("Encoding"))
-                
-        def OnAddAutojoin(self, widget):
-                self.AddItemToList("autojoin", _("AutoJoin Room"), None)
-
-        
-        def TreeViewSelection3(self, model, path, iter):
-                key = model.get_value(iter, 0)
-                value = model.get_value(iter, 1)
-                num = model.get_value(iter, 2)
-                self.selected_items = [key, value, num]
-                
-        def TreeViewSelection2(self, model, path, iter):
-                key = model.get_value(iter, 0)
-                num = model.get_value(iter, 1)
-                self.selected_items = [key, num]
-                
-        def EditItemToList(self, node, message, message2, key, value, num):
-                self.key = key
-                self.value = value
-                key, value = self.input_box(title="Edit Config setting", message=message, message2=message2, key=key, value=value, modal= True, List=[], vlist=[], second=True)
-                
+        def AddItemToList(self, node, message, message2, treeview):
+                
+                key, value = self.input_box(title=_("Add Config setting"), message=message, message2=message2, key="", value="", modal= True, List=[], vlist=[], second=True)
+        
                 if node == None or key == None:
                         return
@@ -465 +437 @@
 
                 if node in self.config:
+                        if key in self.config[node]:
+                                self.Bug(_("Item %s already in the %s list. Please edit instead.") %(key, node), "")
+                                return
                         # a genuine new key
                         self.config[node][key] = value
-
-                        if self.key != key:
+        
+                        self.parents[node][key] = treeview.get_model().append( None, [ key, value ] )
+                        #self.populate_dialogs()
+                        
+        def OnAddTrusted(self, widget):
+                treeview = self.TrustedTreeview
+                self.AddItemToList("trusted", _("Trusted User"), _("Comment"), treeview)
+        
+        def OnAddBuddy(self, widget):
+                treeview = self.BuddiesTreeview
+                self.AddItemToList("buddies", _("Buddied User"), _("Comment"), treeview)
+        
+        def OnAddBanned(self, widget):
+                treeview = self.BannedTreeview
+                self.AddItemToList("banned", _("Banned User"), _("Comment"), treeview)
+
+        def OnAddInterface(self, widget):
+                treeview = self.interfacesTreeview
+                self.AddItemToList("interfaces.bind", _("Socket / Port"), None, treeview)
+        
+        def OnAddIgnored(self, widget):
+                treeview = self.IgnoredTreeview
+                self.AddItemToList("ignored", _("Ignored User"), _("Comment"), treeview)
+        
+        def OnAddAlert(self, widget):
+                treeview = self.AlertsTreeview
+                self.AddItemToList("alerts", _("User Status Alert"), None, treeview)
+        
+        def OnAddTicker(self, widget):
+                treeview = self.tickersTreeview
+                self.AddItemToList("tickers", _("Ticker's Room"), _("Ticker"), treeview)
+                
+        def OnAddEncoding(self, widget):
+                treeview = self.encodingsTreeview
+                self.AddItemToList("encoding.rooms", _("Room"), _("Encoding"), treeview)
+                
+        def OnAddAutojoin(self, widget):
+                treeview = self.autojoinTreeview
+                self.AddItemToList("autojoin", _("AutoJoin Room"), None, treeview)
+
+        
+        def TreeViewSelection3(self, model, path, iter):
+                key = model.get_value(iter, 0)
+                value = model.get_value(iter, 1)
+                #num = model.get_value(iter, 2)
+                self.selected_items = [key, value]
+                
+        def TreeViewSelection2(self, model, path, iter):
+                key = model.get_value(iter, 0)
+                #num = model.get_value(iter, 1)
+                self.selected_items = [key]
+                
+        def EditItemToList(self, node, message, message2, key, value, num, treeview):
+                self.key = key
+                self.value = value
+                key, value = self.input_box(title="Edit Config setting", message=message, message2=message2, key=key, value=value, modal= True, List=[], vlist=[], second=True)
+                
+                if node == None or key == None:
+                        return
+                if key == "" or key.isspace():
+                        return
+                
+                if value == None:
+                        value = ""
+
+                if node in self.config:
+                        # a genuine new key
+                        
+                        self.config[node][key] = value
+                        
+                        if self.key == key:
+                                treeview.get_model().set(self.parents[node][key], 0, key, 1, value)
                                 # Remove old key
+                        else:
+                                treeview.get_model().remove(self.parents[node][self.key])
                                 del self.config[node][self.key]
-                        self.populate_dialogs()
+                                
+                                treeview.get_model().append(None, [key, value])
+                                
+                        #self.populate_dialogs()
                         #self.populate_store()
         def OnEditEncoding(self, widget):
@@ -479 +529 @@
                 treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, value, num = self.selected_items
-                        self.EditItemToList("encoding.rooms", _("Room"), _("Encoding"), key, value, num)
+                        key, value = self.selected_items
+                        self.EditItemToList("encoding.rooms", _("Room"), _("Encoding"), key, value, None, treeview)
                 
 
@@ -487 +537 @@
                 treeview = self.AlertsTreeview
                 self.selected_items = []
-                treeview.get_selection().selected_foreach(self.TreeViewSelection2)
+                treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, num = self.selected_items
+                        key, value = self.selected_items
                         
-                        self.EditItemToList("alerts", _("User Status Alert"), None, key, None, num)
+                        self.EditItemToList("alerts", _("User Status Alert"), None, key, value, None, treeview)
                         
         def OnEditInterface(self, widget):
@@ -497 +547 @@
                 treeview = self.interfacesTreeview
                 self.selected_items = []
-                treeview.get_selection().selected_foreach(self.TreeViewSelection2)
+                treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, num = self.selected_items
+                        key, value = self.selected_items
                         
-                        self.EditItemToList("interfaces.bind", _("Socket / Port"), None, key, None, num)
+                        self.EditItemToList("interfaces.bind", _("Socket / Port"), None, key, value, None, treeview)
                         
         def OnEditAutojoin(self, widget):
@@ -507 +557 @@
                 treeview = self.autojoinTreeview
                 self.selected_items = []
-                treeview.get_selection().selected_foreach(self.TreeViewSelection2)
+                treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, num = self.selected_items
+                        key, value = self.selected_items
                         
-                        self.EditItemToList("autojoin", _("AutoJoin Room"), None, key, None, num)
+                        self.EditItemToList("autojoin", _("AutoJoin Room"), None, key, value, None, treeview)
                                                 
         def OnEditTicker(self, widget):
@@ -519 +569 @@
                 treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, value, num = self.selected_items
-                        self.EditItemToList("tickers", _("Ticker's Room"), _("Ticker"), key, value, num)
+                        key, value = self.selected_items
+                        self.EditItemToList("tickers", _("Ticker's Room"), _("Ticker"), key, value, None, treeview)
                         
         def OnEditTrusted(self, widget):
@@ -528 +578 @@
                 treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, value, num = self.selected_items
-                        self.EditItemToList("trusted", _("Trusted User"), _("Comment"), key, value, num)
+                        key, value = self.selected_items
+                        self.EditItemToList("trusted", _("Trusted User"), _("Comment"), key, value, None, treeview)
                         
         def OnEditBuddy(self, widget):
@@ -537 +587 @@
                 treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, value, num = self.selected_items
-                        self.EditItemToList("buddies", _("Buddied User"), _("Comment"), key, value, num)
+                        key, value = self.selected_items
+                        self.EditItemToList("buddies", _("Buddied User"), _("Comment"), key, value, None, treeview)
+                        
         def OnEditBanned(self, widget):
                 # 3 column treeview
@@ -545 +596 @@
                 treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, value, num = self.selected_items
-                        self.EditItemToList("banned", _("Banned User"), _("Comment"), key, value, num)
-        
-        
-
-                                
+                        key, value = self.selected_items
+                        self.EditItemToList("banned", _("Banned User"), _("Comment"), key, value, None, treeview)
+        
         def OnEditIgnored(self, widget):
                 # 3 column treeview
@@ -557 +605 @@
                 treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, value, num = self.selected_items
-                        self.EditItemToList("ignored", _("Ignored User"), _("Comment"), key, value, num)
-
-        def RemoveItemFromList(self, node, key, value, num):
+                        key, value = self.selected_items
+                        self.EditItemToList("ignored", _("Ignored User"), _("Comment"), key, value, num, treeview)
+
+        def RemoveItemFromList(self, node, key, value, treeview):
                 if node == None or key == None:
                         return
@@ -568 +616 @@
                 if node in self.config:
                         del self.config[node][key]
-                        self.populate_dialogs()
+                        treeview.get_model().remove(self.parents[node][key])
+
+                        #self.populate_dialogs()
                         #self.populate_store()
                         
@@ -576 +626 @@
                 node = "alerts"
                 self.selected_items = []
-                treeview.get_selection().selected_foreach(self.TreeViewSelection2)
+                treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, num = self.selected_items
+                        print self.selected_items
+                        key, value = self.selected_items
                         
-                        self.RemoveItemFromList(node, key, None, num)
+                        self.RemoveItemFromList(node, key, None, treeview)
                 
         def OnRemoveTicker(self, widget):
@@ -589 +640 @@
                 treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, value, num = self.selected_items
-                        self.RemoveItemFromList(node, key, value, num)
+                        key, value = self.selected_items
+                        self.RemoveItemFromList(node, key, value, treeview)
                 
         def OnRemoveTrusted(self, widget):
@@ -599 +650 @@
                 treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, value, num = self.selected_items
-                        self.RemoveItemFromList(node, key, value, num)
+                        key, value = self.selected_items
+                        self.RemoveItemFromList(node, key, value, treeview)
                 
         def OnRemoveBuddy(self, widget):
@@ -609 +660 @@
                 treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, value, num = self.selected_items
-                        self.RemoveItemFromList(node, key, None, num)
+                        key, value = self.selected_items
+                        self.RemoveItemFromList(node, key, None, treeview)
                 
         def OnRemoveBanned(self, widget):
@@ -619 +670 @@
                 treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, value, num = self.selected_items
-                        
-                        self.RemoveItemFromList(node, key, None, num)
+                        key, value = self.selected_items
+                        
+                        self.RemoveItemFromList(node, key, None, treeview)
                 
         def OnRemoveIgnored(self, widget):
@@ -629 +680 @@
                 treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, value, num = self.selected_items
-                        
-                        self.RemoveItemFromList(node, key, value, num)
+                        key, value = self.selected_items
+                        
+                        self.RemoveItemFromList(node, key, value, treeview)
                 
         def OnRemoveInterface(self, widget):
@@ -638 +689 @@
                 node="interface"
                 self.selected_items = []
-                treeview.get_selection().selected_foreach(self.TreeViewSelection2)
+                treeview.get_selection().selected_foreach(self.TreeViewSelection3)
                 if self.selected_items != []:
-                        key, num = self.selected_items
+                        key = self.selected_items
                         
-                        self.RemoveItemFromList(node, key, None, num)
+                        self.RemoveItemFromList(node, key, None, treeview)
 
         def OnRemoveEncoding(self, widget):