Author: lluis
Date: 2007-07-18 19:21:14 -0400 (Wed, 18 Jul 2007)
New Revision: 82253

Added:
   trunk/monodevelop/Core/src/MonoDevelop.Ide/icons/system-file-manager.png
Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
   trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/FileScout.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/TaskListPad.cs
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
Log:
* MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs: Show command
  icons in the list.
* MonoDevelop.Ide.Commands/ViewCommands.cs: The pad list doesn't show
  checkboxes anymore. Instead, clicking on an option always brings
  the pad to front.
* MonoDevelop.Ide.Gui.Pads/TaskListPad.cs,
  MonoDevelop.Ide.Gui.Pads/FileScout.cs: Pad icons are set in the xml
  file.
* MonoDevelop.Ide.addin.xml: Updated some pad icons.
* MonoDevelop.Ide.mdp, Makefile.am, icons/system-file-manager.png: New
  icon for the file pad.
* MonoDevelop.Ide.Gui/Workbench.cs: Minor fix.
* MonoDevelop.Ide.Gui/Pad.cs: Added icon property.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-07-18 
23:18:01 UTC (rev 82252)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-07-18 
23:21:14 UTC (rev 82253)
@@ -1,3 +1,19 @@
+2007-07-19  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs: Show command
+         icons in the list.
+       * MonoDevelop.Ide.Commands/ViewCommands.cs: The pad list doesn't show
+         checkboxes anymore. Instead, clicking on an option always brings
+         the pad to front.
+       * MonoDevelop.Ide.Gui.Pads/TaskListPad.cs,
+         MonoDevelop.Ide.Gui.Pads/FileScout.cs: Pad icons are set in the xml
+         file.
+       * MonoDevelop.Ide.addin.xml: Updated some pad icons.
+       * MonoDevelop.Ide.mdp, Makefile.am, icons/system-file-manager.png: New
+         icon for the file pad.
+       * MonoDevelop.Ide.Gui/Workbench.cs: Minor fix.
+       * MonoDevelop.Ide.Gui/Pad.cs: Added icon property.
+
 2007-07-18  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * MonoDevelop.Ide.Templates/FileTemplate.cs,

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am      2007-07-18 
23:18:01 UTC (rev 82252)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am      2007-07-18 
23:21:14 UTC (rev 82253)
@@ -308,6 +308,7 @@
        icons/navigate-previous.png \
        icons/parsing.png \
        icons/SplashScreen.png \
+       icons/system-file-manager.png \
        MonoDevelop.Ide.StandardHeader/StandardHeaderTemplates.xml \
        templates/AppConfigFile.xft.xml \
        templates/BlankCombine.xpt.xml \

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
 2007-07-18 23:18:01 UTC (rev 82252)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
 2007-07-18 23:21:14 UTC (rev 82253)
@@ -81,6 +81,7 @@
                {
                        foreach (Pad pad in IdeApp.Workbench.Pads) {
                                CommandInfo cmd = new CommandInfo (pad.Title);
+                               cmd.Icon = pad.Icon;
                                cmd.UseMarkup = true;
                                cmd.Checked = pad.Visible;
                                info.Add (cmd, pad);
@@ -90,7 +91,8 @@
                protected override void Run (object ob)
                {
                        Pad pad = (Pad) ob;
-                       pad.Visible = !pad.Visible;
+                       pad.Visible = true;
+                       pad.BringToFront ();
                }
        }
        

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs       
2007-07-18 23:18:01 UTC (rev 82252)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs       
2007-07-18 23:21:14 UTC (rev 82253)
@@ -56,6 +56,10 @@
                        get { return window.Title; }
                }
                
+               public string Icon {
+                       get { return window.Icon; }
+               }
+               
                public string Id {
                        get { return window.Id; }
                }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs 
2007-07-18 23:18:01 UTC (rev 82252)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs 
2007-07-18 23:21:14 UTC (rev 82253)
@@ -430,6 +430,7 @@
                        
                        Pad pad = GetLocationListPad ();
                        if (pad != null) {
+                               pad.BringToFront ();
                                ILocationListPad loc = (ILocationListPad) 
pad.Content;
                                string file;
                                int lin, col;
@@ -444,6 +445,7 @@
                        
                        Pad pad = GetLocationListPad ();
                        if (pad != null) {
+                               pad.BringToFront ();
                                ILocationListPad loc = (ILocationListPad) 
pad.Content;
                                string file;
                                int lin, col;
@@ -469,7 +471,6 @@
                        if (active == null)
                                return null;
                        
-                       active.BringToFront ();
                        return active;
                }
                

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
     2007-07-18 23:18:01 UTC (rev 82252)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
     2007-07-18 23:21:14 UTC (rev 82253)
@@ -43,6 +43,8 @@
                static readonly int bindingCol = 2;
                static readonly int descCol = 3;
                static readonly int boldCol = 4;
+               static readonly int iconCol = 5;
+               static readonly int iconVisibleCol = 6;
                
                bool accelIncomplete = false;
                bool accelComplete = false;
@@ -53,9 +55,22 @@
                {
                        this.Build ();
                        
-                       keyStore = new TreeStore (typeof (Command), typeof 
(string), typeof (string), typeof (string), typeof (int));
+                       keyStore = new TreeStore (typeof (Command), typeof 
(string), typeof (string), typeof (string), typeof (int), typeof(string), 
typeof(bool));
                        keyTreeView.Model = keyStore;
-                       keyTreeView.AppendColumn ("Command", new 
CellRendererText (), "text", labelCol, "weight", boldCol);
+                       
+                       TreeViewColumn col = new TreeViewColumn ();
+                       col.Title = GettextCatalog.GetString ("Command");
+                       col.Spacing = 4;
+                       CellRendererPixbuf crp = new CellRendererPixbuf ();
+                       col.PackStart (crp, false);
+                       col.AddAttribute (crp, "stock-id", iconCol);
+                       col.AddAttribute (crp, "visible", iconVisibleCol);
+                       CellRendererText crt = new CellRendererText ();
+                       col.PackStart (crt, true);
+                       col.AddAttribute (crt, "text", labelCol);
+                       col.AddAttribute (crt, "weight", boldCol);
+                       keyTreeView.AppendColumn (col);
+                       
                        keyTreeView.AppendColumn ("Key Binding", new 
CellRendererText (), "text", bindingCol);
                        keyTreeView.AppendColumn ("Description", new 
CellRendererText (), "text", descCol);
                        
@@ -104,7 +119,10 @@
                        List<string> catNames = new List<string> ();
                        
                        foreach (object c in 
IdeApp.CommandService.CommandManager.GetCommands ()) {
-                               Command cmd = c as Command;
+                               ActionCommand cmd = c as ActionCommand;
+                               if (cmd == null || cmd.CommandArray)
+                                       continue;
+                               
                                string key;
                                
                                if (cmd.Id is Enum)
@@ -130,7 +148,7 @@
                                TreeIter icat;
                                if (!categories.TryGetValue (cat, out icat)) {
                                        string name = cat.Length == 0 ? 
GettextCatalog.GetString ("Other") : cat;
-                                       icat = keyStore.AppendValues (null, 
name, String.Empty, String.Empty, (int) Pango.Weight.Bold);
+                                       icat = keyStore.AppendValues (null, 
name, String.Empty, String.Empty, (int) Pango.Weight.Bold, null, false);
                                        categories [cat] = icat;
                                }
                        }
@@ -141,7 +159,7 @@
                                string label = cmd.Text.Replace ("_", 
String.Empty);
                                
                                TreeIter icat = categories [cmd.Category];
-                               keyStore.AppendValues (icat, cmd, label, 
cmd.AccelKey != null ? cmd.AccelKey : String.Empty, cmd.Description, (int) 
Pango.Weight.Normal);
+                               keyStore.AppendValues (icat, cmd, label, 
cmd.AccelKey != null ? cmd.AccelKey : String.Empty, cmd.Description, (int) 
Pango.Weight.Normal, cmd.Icon, true);
                        }
                }
                

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/FileScout.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/FileScout.cs
    2007-07-18 23:18:01 UTC (rev 82252)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/FileScout.cs
    2007-07-18 23:21:14 UTC (rev 82253)
@@ -12,8 +12,6 @@
        {
                void IPadContent.Initialize (IPadWindow window)
                {
-                       window.Title = GettextCatalog.GetString ("Files");
-                       window.Icon = Gtk.Stock.Open;
                }
                
                public string Id {

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/TaskListPad.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/TaskListPad.cs
  2007-07-18 23:18:01 UTC (rev 82252)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/TaskListPad.cs
  2007-07-18 23:21:14 UTC (rev 82253)
@@ -60,8 +60,6 @@
                
                void IPadContent.Initialize (IPadWindow window)
                {
-                       window.Title = GettextCatalog.GetString ("Task List");
-                       window.Icon = MonoDevelop.Core.Gui.Stock.TaskListIcon;
                }
                
                public Gtk.Widget Control {

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml        
2007-07-18 23:18:01 UTC (rev 82252)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml        
2007-07-18 23:21:14 UTC (rev 82253)
@@ -521,7 +521,7 @@
                
                <Command id = "MonoDevelop.Ide.Commands.ViewCommands.ViewList"
                                defaultHandler = 
"MonoDevelop.Ide.Commands.ViewListHandler"
-                               type="check|array"
+                               type="array"
                                _label = "View List" />
                <Command id = "MonoDevelop.Ide.Commands.ViewCommands.LayoutList"
                                defaultHandler = 
"MonoDevelop.Ide.Commands.LayoutListHandler"
@@ -614,6 +614,7 @@
                
                <Command id = "MonoDevelop.Ide.Commands.HelpCommands.Help"
                                _label = "Help" 
+                               icon = "gtk-help"
                                description = "Help"
                                shortcut = "F1" />
                <Command id = 
"MonoDevelop.Ide.Commands.HelpCommands.TipOfTheDay"
@@ -909,11 +910,11 @@
        </Extension>
        
        <Extension path = "/SharpDevelop/Workbench/Pads">
-               <Pad id = "MonoDevelop.Ide.Gui.Pads.FileScout" _label = "Files" 
class = "MonoDevelop.Ide.Gui.Pads.FileScout"/>
-               <Pad id = "MonoDevelop.Ide.Gui.Pads.ErrorListPad" 
defaultPlacement = "Bottom" _label = "Error List" class = 
"MonoDevelop.Ide.Gui.Pads.ErrorListPad"/>
+               <Pad id = "MonoDevelop.Ide.Gui.Pads.FileScout" _label = "Files" 
icon="system-file-manager" class = "MonoDevelop.Ide.Gui.Pads.FileScout"/>
+               <Pad id = "MonoDevelop.Ide.Gui.Pads.ErrorListPad" 
defaultPlacement = "Bottom" _label = "Error List" icon="gtk-dialog-error" class 
= "MonoDevelop.Ide.Gui.Pads.ErrorListPad"/>
                <Pad id = "MonoDevelop.Ide.Gui.Pads.InternalLogPad" 
defaultPlacement = "Bottom" _label = "Message Log" class = 
"MonoDevelop.Ide.Gui.Pads.InternalLogPad"/>
-               <Pad id = "MonoDevelop.Ide.Gui.Pads.TaskListPad" 
defaultPlacement = "Bottom" _label = "Task List" class = 
"MonoDevelop.Ide.Gui.Pads.TaskListPad"/>
-               <Pad id = "MonoDevelop.Ide.Gui.Pads.HelpTree" defaultPlacement 
= "Left" _label = "Help" class = "MonoDevelop.Ide.Gui.Pads.HelpTree"/>
+               <Pad id = "MonoDevelop.Ide.Gui.Pads.TaskListPad" 
defaultPlacement = "Bottom" _label = "Task List" icon="md-task-list-icon" class 
= "MonoDevelop.Ide.Gui.Pads.TaskListPad"/>
+               <Pad id = "MonoDevelop.Ide.Gui.Pads.HelpTree" defaultPlacement 
= "Left" _label = "Help" icon="gtk-help" class = 
"MonoDevelop.Ide.Gui.Pads.HelpTree"/>
 
                <SolutionPad id = "MonoDevelop.Ide.Gui.Pads.ProjectPad" 
defaultPlacement = "Left" _label = "Solution" icon = "md-combine-icon" class = 
"MonoDevelop.Ide.Gui.Pads.ProjectPad.ProjectSolutionPad">
                        <PadOption id = "ShowAllFiles" _label = "Show All 
Files" defaultValue = "False" />
@@ -1256,6 +1257,7 @@
                <StockIcon stockid = "md-parser" resource = "parsing.png" />
                <StockIcon stockid = "md-navigate-next" resource = 
"navigate-next.png" />
                <StockIcon stockid = "md-navigate-previous" resource = 
"navigate-previous.png" />
+               <StockIcon stockid = "system-file-manager" resource = 
"system-file-manager.png" />
        </Extension>
        
        <Extension path = "/SharpDevelop/Dialogs/OptionsDialog/CodingOptions">

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp      
2007-07-18 23:18:01 UTC (rev 82252)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp      
2007-07-18 23:21:14 UTC (rev 82253)
@@ -304,6 +304,7 @@
     <File name="./MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs" 
subtype="Code" buildaction="Compile" />
     <File 
name="./gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs" 
subtype="Code" buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Commands/TextEditorCommands.cs" 
subtype="Code" buildaction="Compile" />
+    <File name="./icons/system-file-manager.png" subtype="Code" 
buildaction="EmbedAsResource" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="False" refto="gecko-sharp, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=ccf7d78a55e9f021" />

Added: trunk/monodevelop/Core/src/MonoDevelop.Ide/icons/system-file-manager.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/icons/system-file-manager.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to