GNOME.org
 

[tasque/transition: 36/213] Put resources back in global data folder to ease access for icon creators

commit d8d6c7309180f3c6e139d16023bb878528c27ed1
Author: Antonius Riha <antoniusriha gmail com>
Date:   Tue May 29 10:22:38 2012 +0200

    Put resources back in global data folder to ease access for icon creators
    
    * renamed some icons to reflect freedesktop.org icon name specification
    * refelect new names in source (TaskTreeView.cs and TaskWindow.cs)
    * in tasque.csproj: added icons temporarily as embedded resources and set resource id to the icons' names, so they may be picked up by the Utitlities.GetIcon method.

 .../icons/hicolor_actions_22x22_notebook.png       |  Bin 820 -> 820 bytes
 .../icons/hicolor_actions_22x22_notebook.svg       |    0
 .../icons/hicolor_animations_16x16_countdown-1.png |  Bin 244 -> 244 bytes
 .../hicolor_animations_16x16_countdown-10.png      |  Bin 382 -> 382 bytes
 .../hicolor_animations_16x16_countdown-11.png      |  Bin 398 -> 398 bytes
 .../hicolor_animations_16x16_countdown-12.png      |  Bin 336 -> 336 bytes
 .../hicolor_animations_16x16_countdown-12.svg      |    0
 .../icons/hicolor_animations_16x16_countdown-2.png |  Bin 272 -> 272 bytes
 .../icons/hicolor_animations_16x16_countdown-3.png |  Bin 264 -> 264 bytes
 .../icons/hicolor_animations_16x16_countdown-4.png |  Bin 297 -> 297 bytes
 .../icons/hicolor_animations_16x16_countdown-5.png |  Bin 330 -> 330 bytes
 .../icons/hicolor_animations_16x16_countdown-6.png |  Bin 290 -> 290 bytes
 .../icons/hicolor_animations_16x16_countdown-7.png |  Bin 335 -> 335 bytes
 .../icons/hicolor_animations_16x16_countdown-8.png |  Bin 359 -> 359 bytes
 .../icons/hicolor_animations_16x16_countdown-9.png |  Bin 323 -> 323 bytes
 {src/tasque/res/images => data/icons}/rtmLogo.png  |  Bin 11341 -> 11341 bytes
 .../tasque/res/images => data/icons}/tasque-16.png |  Bin 711 -> 711 bytes
 .../tasque/res/images => data/icons}/tasque-22.png |  Bin 1029 -> 1029 bytes
 .../tasque/res/images => data/icons}/tasque-24.png |  Bin 1086 -> 1086 bytes
 .../res/images => data/icons}/tasque-256.png       |  Bin 30119 -> 30119 bytes
 .../tasque/res/images => data/icons}/tasque-32.png |  Bin 1474 -> 1474 bytes
 .../tasque/res/images => data/icons}/tasque-48.png |  Bin 2146 -> 2146 bytes
 .../images => data/icons}/tasque-icons-source.svg  |    0
 .../res => data/icons}/tasque-opensuse-1click.png  |  Bin 3587 -> 3587 bytes
 {src/tasque/res/images => data/icons}/tasque.ico   |  Bin 285478 -> 285478 bytes
 {src/tasque/res/images => data/icons}/tasque.svg   |    0
 {src/tasque/res => data}/osx/Contents/Info.plist   |    0
 {src/tasque/res => data}/osx/Contents/MacOS/Tasque |    0
 .../osx/Contents/Resources/tasque.icns             |  Bin 141249 -> 141249 bytes
 {src/tasque/res => data}/sounds/notify.wav         |  Bin 70604 -> 70604 bytes
 src/tasque/TaskTreeView.cs                         |    6 +-
 src/tasque/TaskWindow.cs                           |    2 +-
 src/tasque/tasque.csproj                           |  155 ++++++++++++++++----
 33 files changed, 129 insertions(+), 34 deletions(-)
---
diff --git a/src/tasque/res/images/note-16.png b/data/icons/hicolor_actions_22x22_notebook.png
similarity index 100%
rename from src/tasque/res/images/note-16.png
rename to data/icons/hicolor_actions_22x22_notebook.png
diff --git a/src/tasque/res/images/note-22.svg b/data/icons/hicolor_actions_22x22_notebook.svg
similarity index 100%
rename from src/tasque/res/images/note-22.svg
rename to data/icons/hicolor_actions_22x22_notebook.svg
diff --git a/src/tasque/res/images/clock-16-11.png b/data/icons/hicolor_animations_16x16_countdown-1.png
similarity index 100%
rename from src/tasque/res/images/clock-16-11.png
rename to data/icons/hicolor_animations_16x16_countdown-1.png
diff --git a/src/tasque/res/images/clock-16-2.png b/data/icons/hicolor_animations_16x16_countdown-10.png
similarity index 100%
rename from src/tasque/res/images/clock-16-2.png
rename to data/icons/hicolor_animations_16x16_countdown-10.png
diff --git a/src/tasque/res/images/clock-16-1.png b/data/icons/hicolor_animations_16x16_countdown-11.png
similarity index 100%
rename from src/tasque/res/images/clock-16-1.png
rename to data/icons/hicolor_animations_16x16_countdown-11.png
diff --git a/src/tasque/res/images/clock-16-0.png b/data/icons/hicolor_animations_16x16_countdown-12.png
similarity index 100%
rename from src/tasque/res/images/clock-16-0.png
rename to data/icons/hicolor_animations_16x16_countdown-12.png
diff --git a/src/tasque/res/images/clock-16-0.svg b/data/icons/hicolor_animations_16x16_countdown-12.svg
similarity index 100%
rename from src/tasque/res/images/clock-16-0.svg
rename to data/icons/hicolor_animations_16x16_countdown-12.svg
diff --git a/src/tasque/res/images/clock-16-10.png b/data/icons/hicolor_animations_16x16_countdown-2.png
similarity index 100%
rename from src/tasque/res/images/clock-16-10.png
rename to data/icons/hicolor_animations_16x16_countdown-2.png
diff --git a/src/tasque/res/images/clock-16-9.png b/data/icons/hicolor_animations_16x16_countdown-3.png
similarity index 100%
rename from src/tasque/res/images/clock-16-9.png
rename to data/icons/hicolor_animations_16x16_countdown-3.png
diff --git a/src/tasque/res/images/clock-16-8.png b/data/icons/hicolor_animations_16x16_countdown-4.png
similarity index 100%
rename from src/tasque/res/images/clock-16-8.png
rename to data/icons/hicolor_animations_16x16_countdown-4.png
diff --git a/src/tasque/res/images/clock-16-7.png b/data/icons/hicolor_animations_16x16_countdown-5.png
similarity index 100%
rename from src/tasque/res/images/clock-16-7.png
rename to data/icons/hicolor_animations_16x16_countdown-5.png
diff --git a/src/tasque/res/images/clock-16-6.png b/data/icons/hicolor_animations_16x16_countdown-6.png
similarity index 100%
rename from src/tasque/res/images/clock-16-6.png
rename to data/icons/hicolor_animations_16x16_countdown-6.png
diff --git a/src/tasque/res/images/clock-16-5.png b/data/icons/hicolor_animations_16x16_countdown-7.png
similarity index 100%
rename from src/tasque/res/images/clock-16-5.png
rename to data/icons/hicolor_animations_16x16_countdown-7.png
diff --git a/src/tasque/res/images/clock-16-4.png b/data/icons/hicolor_animations_16x16_countdown-8.png
similarity index 100%
rename from src/tasque/res/images/clock-16-4.png
rename to data/icons/hicolor_animations_16x16_countdown-8.png
diff --git a/src/tasque/res/images/clock-16-3.png b/data/icons/hicolor_animations_16x16_countdown-9.png
similarity index 100%
rename from src/tasque/res/images/clock-16-3.png
rename to data/icons/hicolor_animations_16x16_countdown-9.png
diff --git a/src/tasque/res/images/rtmLogo.png b/data/icons/rtmLogo.png
similarity index 100%
rename from src/tasque/res/images/rtmLogo.png
rename to data/icons/rtmLogo.png
diff --git a/src/tasque/res/images/tasque-16.png b/data/icons/tasque-16.png
similarity index 100%
rename from src/tasque/res/images/tasque-16.png
rename to data/icons/tasque-16.png
diff --git a/src/tasque/res/images/tasque-22.png b/data/icons/tasque-22.png
similarity index 100%
rename from src/tasque/res/images/tasque-22.png
rename to data/icons/tasque-22.png
diff --git a/src/tasque/res/images/tasque-24.png b/data/icons/tasque-24.png
similarity index 100%
rename from src/tasque/res/images/tasque-24.png
rename to data/icons/tasque-24.png
diff --git a/src/tasque/res/images/tasque-256.png b/data/icons/tasque-256.png
similarity index 100%
rename from src/tasque/res/images/tasque-256.png
rename to data/icons/tasque-256.png
diff --git a/src/tasque/res/images/tasque-32.png b/data/icons/tasque-32.png
similarity index 100%
rename from src/tasque/res/images/tasque-32.png
rename to data/icons/tasque-32.png
diff --git a/src/tasque/res/images/tasque-48.png b/data/icons/tasque-48.png
similarity index 100%
rename from src/tasque/res/images/tasque-48.png
rename to data/icons/tasque-48.png
diff --git a/src/tasque/res/images/tasque-icons-source.svg b/data/icons/tasque-icons-source.svg
similarity index 100%
rename from src/tasque/res/images/tasque-icons-source.svg
rename to data/icons/tasque-icons-source.svg
diff --git a/src/tasque/res/tasque-opensuse-1click.png b/data/icons/tasque-opensuse-1click.png
similarity index 100%
rename from src/tasque/res/tasque-opensuse-1click.png
rename to data/icons/tasque-opensuse-1click.png
diff --git a/src/tasque/res/images/tasque.ico b/data/icons/tasque.ico
similarity index 100%
rename from src/tasque/res/images/tasque.ico
rename to data/icons/tasque.ico
diff --git a/src/tasque/res/images/tasque.svg b/data/icons/tasque.svg
similarity index 100%
rename from src/tasque/res/images/tasque.svg
rename to data/icons/tasque.svg
diff --git a/src/tasque/res/osx/Contents/Info.plist b/data/osx/Contents/Info.plist
similarity index 100%
rename from src/tasque/res/osx/Contents/Info.plist
rename to data/osx/Contents/Info.plist
diff --git a/src/tasque/res/osx/Contents/MacOS/Tasque b/data/osx/Contents/MacOS/Tasque
old mode 100755
new mode 100644
similarity index 100%
rename from src/tasque/res/osx/Contents/MacOS/Tasque
rename to data/osx/Contents/MacOS/Tasque
diff --git a/src/tasque/res/osx/Contents/Resources/tasque.icns b/data/osx/Contents/Resources/tasque.icns
similarity index 100%
rename from src/tasque/res/osx/Contents/Resources/tasque.icns
rename to data/osx/Contents/Resources/tasque.icns
diff --git a/src/tasque/res/sounds/notify.wav b/data/sounds/notify.wav
similarity index 100%
rename from src/tasque/res/sounds/notify.wav
rename to data/sounds/notify.wav
diff --git a/src/tasque/TaskTreeView.cs b/src/tasque/TaskTreeView.cs
index efeeadc..3ea3373 100644
--- a/src/tasque/TaskTreeView.cs
+++ b/src/tasque/TaskTreeView.cs
@@ -27,11 +27,11 @@ namespace Tasque
 		
 		static TaskTreeView ()
 		{
-			notePixbuf = Utilities.GetIcon ("note", 16);
+			notePixbuf = Utilities.GetIcon ("hicolor_animations_16x16_notebook", 16);
 			
 			inactiveAnimPixbufs = new Gdk.Pixbuf [12];
-			for (int i = 0; i < 12; i++) {
-				string iconName = string.Format ("clock-16-{0}", i);
+			for (int i = 11; i >= 0; i--) {
+				string iconName = string.Format ("hicolor_animations_16x16_countdown-{0}", i);
 				inactiveAnimPixbufs [i] = Utilities.GetIcon (iconName, 16);
 			}
 		}
diff --git a/src/tasque/TaskWindow.cs b/src/tasque/TaskWindow.cs
index eaedaf4..e9bc2ff 100644
--- a/src/tasque/TaskWindow.cs
+++ b/src/tasque/TaskWindow.cs
@@ -80,7 +80,7 @@ namespace Tasque
 		
 		static TaskWindow ()
 		{
-			noteIcon = Utilities.GetIcon ("note", 16);
+			noteIcon = Utilities.GetIcon ("hicolor_animations_16x16_notebook", 16);
 		}
 		
 		public TaskWindow (IBackend aBackend) : base (Gtk.WindowType.Toplevel)
diff --git a/src/tasque/tasque.csproj b/src/tasque/tasque.csproj
index a45f769..552955a 100644
--- a/src/tasque/tasque.csproj
+++ b/src/tasque/tasque.csproj
@@ -64,36 +64,18 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\tasque-opensuse-1click.png" />
-    <None Include="res\images\clock-16-0.png" />
-    <None Include="res\images\clock-16-0.svg" />
-    <None Include="res\images\clock-16-1.png" />
-    <None Include="res\images\clock-16-10.png" />
-    <None Include="res\images\clock-16-11.png" />
-    <None Include="res\images\clock-16-2.png" />
-    <None Include="res\images\clock-16-3.png" />
-    <None Include="res\images\clock-16-4.png" />
-    <None Include="res\images\clock-16-5.png" />
-    <None Include="res\images\clock-16-6.png" />
-    <None Include="res\images\clock-16-7.png" />
-    <None Include="res\images\clock-16-8.png" />
-    <None Include="res\images\clock-16-9.png" />
-    <None Include="res\images\note-16.png" />
-    <None Include="res\images\note-22.svg" />
-    <None Include="res\images\rtmLogo.png" />
-    <None Include="res\images\tasque-16.png" />
-    <None Include="res\images\tasque-22.png" />
-    <None Include="res\images\tasque-24.png" />
-    <None Include="res\images\tasque-256.png" />
-    <None Include="res\images\tasque-32.png" />
-    <None Include="res\images\tasque-48.png" />
-    <None Include="res\images\tasque-icons-source.svg" />
-    <None Include="res\images\tasque.ico" />
-    <None Include="res\images\tasque.svg" />
-    <None Include="res\osx\Contents\Info.plist" />
-    <None Include="res\osx\Contents\MacOS\Tasque" />
-    <None Include="res\osx\Contents\Resources\tasque.icns" />
-    <None Include="res\sounds\notify.wav" />
+    <None Include="..\..\data\osx\Contents\Info.plist">
+      <Link>data\osx\Contents\Info.plist</Link>
+    </None>
+    <None Include="..\..\data\osx\Contents\MacOS\Tasque">
+      <Link>data\osx\Contents\MacOS\Tasque</Link>
+    </None>
+    <None Include="..\..\data\osx\Contents\Resources\tasque.icns">
+      <Link>data\osx\Contents\Resources\tasque.icns</Link>
+    </None>
+    <None Include="..\..\data\sounds\notify.wav">
+      <Link>data\sounds\notify.wav</Link>
+    </None>
     <Compile Include="Defines.WIN32.cs" />
     <Compile Include="RemoteControl.cs" />
     <Compile Include="RemoteControlProxy.cs" />
@@ -183,6 +165,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
+    <Folder Include="data\" />
+    <Folder Include="data\icons\" />
+    <Folder Include="data\osx\" />
+    <Folder Include="data\sounds\" />
+    <Folder Include="data\osx\Contents\" />
+    <Folder Include="data\osx\Contents\MacOS\" />
+    <Folder Include="data\osx\Contents\Resources\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\libtasque\libtasque.csproj">
@@ -194,4 +183,110 @@
       <Name>RtmNet</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_actions_22x22_notebook.png">
+      <Link>data\icons\hicolor_actions_22x22_notebook.png</Link>
+      <LogicalName>hicolor_actions_22x22_notebook.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_actions_22x22_notebook.svg">
+      <Link>data\icons\hicolor_actions_22x22_notebook.svg</Link>
+      <LogicalName>hicolor_actions_22x22_notebook.svg</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-1.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-1.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-1.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-10.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-10.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-10.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-11.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-11.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-11.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-12.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-12.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-12.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-12.svg">
+      <Link>data\icons\hicolor_animations_16x16_countdown-12.svg</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-12.svg</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-2.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-2.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-2.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-3.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-3.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-3.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-4.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-4.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-4.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-5.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-5.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-5.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-6.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-6.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-6.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-7.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-7.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-7.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-8.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-8.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-8.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\hicolor_animations_16x16_countdown-9.png">
+      <Link>data\icons\hicolor_animations_16x16_countdown-9.png</Link>
+      <LogicalName>hicolor_animations_16x16_countdown-9.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\rtmLogo.png">
+      <Link>data\icons\rtmLogo.png</Link>
+      <LogicalName>rtmLogo.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\tasque.ico">
+      <Link>data\icons\tasque.ico</Link>
+      <LogicalName>tasque.ico</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\tasque.svg">
+      <Link>data\icons\tasque.svg</Link>
+      <LogicalName>tasque.svg</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\tasque-16.png">
+      <Link>data\icons\tasque-16.png</Link>
+      <LogicalName>tasque-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\tasque-22.png">
+      <Link>data\icons\tasque-22.png</Link>
+      <LogicalName>tasque-22.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\tasque-24.png">
+      <Link>data\icons\tasque-24.png</Link>
+      <LogicalName>tasque-24.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\tasque-256.png">
+      <Link>data\icons\tasque-256.png</Link>
+      <LogicalName>tasque-256.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\tasque-32.png">
+      <Link>data\icons\tasque-32.png</Link>
+      <LogicalName>tasque-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\tasque-48.png">
+      <Link>data\icons\tasque-48.png</Link>
+      <LogicalName>tasque-48.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\tasque-icons-source.svg">
+      <Link>data\icons\tasque-icons-source.svg</Link>
+      <LogicalName>tasque-icons-source.svg</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\data\icons\tasque-opensuse-1click.png">
+      <Link>data\icons\tasque-opensuse-1click.png</Link>
+      <LogicalName>tasque-opensuse-1click.png</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]