blam r677 - trunk/src

[cmartin svn gnome org]

Author: cmartin
Date: Sun Mar  8 23:52:30 2009
New Revision: 677
URL: http://svn.gnome.org/viewvc/blam?rev=677&view=rev

Log:
Remove context-menu group management.

The DnD is much better and simpler. Remove this hack.

Modified:
   trunk/src/ChannelList.cs

Modified: trunk/src/ChannelList.cs
==============================================================================
--- trunk/src/ChannelList.cs	(original)
+++ trunk/src/ChannelList.cs	Sun Mar  8 23:52:30 2009
@@ -472,106 +472,8 @@
                                     Catalog.GetString ("Remo_ve"),
                                     "gtk-remove",
                                     new EventHandler (EmitRemoveCb), true);
-            popup_menu.Append(BuildGroupMenu());
-            popup_menu.Append(BuildRemoveFromGroupMenu());
             popup_menu.Popup (null, null, null, 
                               eb.Button, eb.Time);
-        }        
-        
-        private Gtk.MenuItem BuildGroupMenu()
-        {
-            MenuItem item = new MenuItem(Catalog.GetString("M_ove to group"));
-            Menu menu = new Menu();
-
-            foreach(ChannelGroup group in Application.TheApp.CCollection.Groups){
-                MenuItem i = new MenuItem(group.Name);
-                i.Data["title"] = group.Name;
-                i.Activated += MoveChannelToGroupCb;
-                i.Sensitive = true;
-                menu.Append(i);
-                i.Show();
-            }
-
-            item.Sensitive = true;
-            item.Submenu = menu;
-            item.Show();
-
-            return item;
-        }
-
-        public void MoveChannelToGroupCb(object obj, EventArgs args)
-        {
-            MenuItem item = obj as MenuItem;
-            string groupname = item.Data["title"] as string;
-            TreeModel model;
-            TreeIter iter;
-            Application.TheApp.ChannelList.Selection.GetSelected(out model, out iter);
-            Channel chan = model.GetValue(iter, 0) as Channel;
-
-            foreach(ChannelGroup group in Application.TheApp.CCollection.Groups){
-                if(group.Name == groupname){
-                    group.Channels.Add(chan);
-                    chan.Iter = (model as TreeStore).AppendValues(group.Iter, chan as IChannel);
-                    /* Needed? */
-                    model.EmitRowChanged(model.GetPath(group.Iter), group.Iter);
-                }
-            }
-
-            (model as TreeStore).Remove(ref iter);
-            //Application.TheApp.CCollection.Remove(chan as IChannel);
-        }
-
-        Gtk.MenuItem BuildRemoveFromGroupMenu()
-        {
-            bool ingroup = false;
-            TreeModel model;
-            TreeIter iter;
-            Application.TheApp.ChannelList.Selection.GetSelected(out model, out iter);
-            Channel lookfor = (model as TreeStore).GetValue(iter, 0) as Channel;
-            
-            foreach(ChannelGroup group in Application.TheApp.CCollection.Groups){
-                foreach(Channel chan in group.Channels){
-                    if(chan == lookfor){
-                        ingroup = true;
-                        break;
-                    }
-                }
-            }
-            
-            if(ingroup == true){
-                MenuItem item = new MenuItem("Remove from _Group");
-                item.Sensitive = true;
-                item.Activated += RemoveChannelFromGroupCb;
-                item.Show();
-                
-                return item;
-            }
-            
-            return null;
-        }
-        
-        public void RemoveChannelFromGroupCb(object obj, EventArgs args)
-        {
-            ChannelGroup ingroup = null;
-
-            TreeModel model;
-            TreeIter iter;
-            Application.TheApp.ChannelList.Selection.GetSelected(out model, out iter);
-            Channel lookfor = (model as TreeStore).GetValue(iter, 0) as Channel;
-           
-            foreach(ChannelGroup group in Application.TheApp.CCollection.Groups){
-                foreach(Channel chan in group.Channels){
-                    if(chan == lookfor){
-                        ingroup = group;
-                        break;
-                    }
-                }
-            }
-            
-            lookfor.Iter = (model as TreeStore).AppendValues(lookfor as IChannel);
-            (model as TreeStore).Remove(ref iter);
-            ingroup.Channels.Remove(lookfor);
-            Application.TheApp.CCollection.Add(lookfor);
         }
 
         public void EmitMarkAsReadCb (object obj, EventArgs args)