[mono/monodevelop] 43fbbd0a: Add waiting status animation and use it in some copy operations
"Lluis Sanchez (
[email protected])" <
[email protected]>
Thu, 14 Nov 2013 19:56:59 +0000
| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<00000142583022f3-9ae7468c-7e80-4b24-8555-8cedd2bf2d5e-000000@email.amazonses.com> |
Branch: refs/heads/retina
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/2a8915d9210b...43fbbd0aabb2
Commit: 43fbbd0aabb20d1d8b027663f16f73ea3cbee0cc
Author: Lluis Sanchez <[email protected]> (slluis)
Date: 2013-11-14 19:55:50 GMT
URL: https://github.com/mono/monodevelop/commit/43fbbd0aabb20d1d8b027663f16f73ea3cbee0cc
Add waiting status animation and use it in some copy operations
Changed paths:
M main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ShowAllFilesBuilderExtension.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StockIcons.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
Modified: main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
===================================================================
@@ -283,6 +283,7 @@
<StockIcon stockid = "md-status-open" animation = "res:status-opening-1-14.png;res:status-opening-2-14.png;res:status-opening-3-14.png;res:status-opening-4-14.png;res:status-opening-5-14.png;res:status-opening-6-14.png" size="Menu" />
<StockIcon stockid = "md-status-search" animation = "res:status-searching-1-14.png;res:status-searching-2-14.png;res:status-searching-3-14.png;res:status-searching-4-14.png" size="Menu" />
<StockIcon stockid = "md-status-connecting" animation = "res:status-connecting-1-14.png;res:status-connecting-2-14.png;res:status-connecting-3-14.png;res:status-connecting-4-14.png;res:status-connecting-5-14.png;res:status-connecting-6-14.png" size="Menu" />
+ <StockIcon stockid = "md-status-waiting" animation = "res:status-waiting-1-14.png;res:status-waiting-2-14.png;res:status-waiting-3-14.png;res:status-waiting-4-14.png;res:status-waiting-5-14.png" size="Menu" />
<StockIcon stockid = "md-status-steady" icon = "res:status-ready-14.png" size="Menu" />
<StockIcon stockid = "md-status-success" icon = "res:status-success-14.png" size="Menu" />
<StockIcon stockid = "md-status-warning" icon = "res:status-warning-14.png" size="Menu" />
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
===================================================================
@@ -244,7 +244,7 @@ void Drop (ProjectFile pf, DragOperation operation, HashSet<SolutionEntityItem>
bool move = operation == DragOperation.Move;
var opText = move ? GettextCatalog.GetString ("Moving file...") : GettextCatalog.GetString ("Copying file...");
- using (var monitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (opText, Stock.StatusSolutionOperation, true))
+ using (var monitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (opText, Stock.StatusWorking, true))
IdeApp.ProjectOperations.TransferFiles (monitor, pf.Project, pf.FilePath, target.Project, targetPath, move, true);
pf = target.Project.Files.GetFile (targetPath);
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ShowAllFilesBuilderExtension.cs
===================================================================
@@ -355,7 +355,7 @@ public override void OnNodeDrop (object dataObject, DragOperation operation)
if (targetPath == source)
targetPath = ProjectOperations.GetTargetCopyName (targetPath, false);
- using (IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (GettextCatalog.GetString("Copying files..."), Stock.StatusSolutionOperation, true))
+ using (IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (GettextCatalog.GetString("Copying files..."), Stock.StatusWorking, true))
{
bool move = operation == DragOperation.Move;
IdeApp.ProjectOperations.TransferFiles (monitor, null, source, targetProject, targetPath, move, false);
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StockIcons.cs
===================================================================
@@ -154,6 +154,7 @@ public class Stock
public static readonly IconId StatusWarning = "md-status-warning";
public static readonly IconId StatusError = "md-status-error";
public static readonly IconId StatusConnecting = "md-status-connecting";
+ public static readonly IconId StatusWorking = "md-status-waiting";
public static readonly IconId Broom = "md-clear";
public static readonly IconId Stop = "md-stop";
public static readonly IconId MessageLog = "md-message-log";
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
===================================================================
@@ -479,7 +479,7 @@ public Document OpenDocument (FileOpenInformation info)
Counters.OpenDocumentTimer.Trace ("Initializing monitor");
IProgressMonitor pm = ProgressMonitors.GetStatusProgressMonitor (
GettextCatalog.GetString ("Opening {0}", info.FileName),
- Stock.StatusSolutionOperation,
+ Stock.StatusWorking,
true
);
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
===================================================================
@@ -1485,6 +1485,36 @@
<EmbeddedResource Include="icons\file-gtk-32%402x.png">
<LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
+ <EmbeddedResource Include="icons\status-waiting-1-14.png">
+ <LogicalName>status-waiting-1-14.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="icons\status-waiting-1-14%402x.png">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="icons\status-waiting-2-14.png">
+ <LogicalName>status-waiting-2-14.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="icons\status-waiting-2-14%402x.png">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="icons\status-waiting-3-14.png">
+ <LogicalName>status-waiting-3-14.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="icons\status-waiting-3-14%402x.png">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="icons\status-waiting-4-14.png">
+ <LogicalName>status-waiting-4-14.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="icons\status-waiting-4-14%402x.png">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="icons\status-waiting-5-14.png">
+ <LogicalName>status-waiting-5-14.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="icons\status-waiting-5-14%402x.png">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Compile Include="MonoDevelop.Ide.Commands\CustomStringTagProvider.cs" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches