GNOME.org
 

tomboy r2224 - in trunk: . Setup Tomboy

Author: sharm
Date: Sat Oct 18 10:32:16 2008
New Revision: 2224
URL: http://svn.gnome.org/viewvc/tomboy?rev=2224&view=rev

Log:
* Tomboy/Defines.WIN32.cs: Set DATADIR, GNOME_LOCALE_DIR, and SYS_ADDINS_DIR
properly for a Windows install. i18n not really ready yet, though.
* Tomboy/Tomboy.cs: Cross-platform path separator fix.

* Tomboy.csproj:
* Setup/*.wxs: Install icons to app-specifc gtk theme area.

Modified:
   trunk/ChangeLog
   trunk/Setup/Files.wxs
   trunk/Setup/Setup.wxs
   trunk/Tomboy.csproj
   trunk/Tomboy/Defines.WIN32.cs
   trunk/Tomboy/Tomboy.cs

Modified: trunk/Setup/Files.wxs
==============================================================================
--- trunk/Setup/Files.wxs	(original)
+++ trunk/Setup/Files.wxs	Sat Oct 18 10:32:16 2008
@@ -21,8 +21,7 @@
 						<File Source="..\bin\Debug\Mono.Posix.dll" Name="Mono.Posix.dll" Id="Mono.Posix.dll" />
 						<File Source="..\bin\Debug\MonoPosixHelper.dll" Name="MonoPosixHelper.dll" Id="MonoPosixHelper.dll" />
 						<File Source="..\bin\Debug\NoteOfTheDay.dll" Name="NoteOfTheDay.dll" Id="NoteOfTheDay.dll" />
-						<File Source="..\bin\Debug\Tomboy.exe" Name="Tomboy.exe" Id="Tomboy.exe" Vital="yes">
-						</File>
+						<File Source="..\bin\Debug\Tomboy.exe" Name="Tomboy.exe" Id="Tomboy.exe" Vital="yes"></File>
 						<File Source="..\bin\Debug\Backlinks.pdb" Name="Backlinks.pdb" Id="Backlinks.pdb" />
 						<File Source="..\bin\Debug\Bugzilla.pdb" Name="Bugzilla.pdb" Id="Bugzilla.pdb" />
 						<File Source="..\bin\Debug\ExportToHtml.pdb" Name="ExportToHtml.pdb" Id="ExportToHtml.pdb" />
@@ -33,14 +32,111 @@
 						<File Source="..\bin\Debug\Tomboy.pdb" Name="Tomboy.pdb" Id="Tomboy.pdb" />
 					</Component>
 					<Component Id="Shortcuts" Guid="D1F1C647-7D55-4AD2-B765-4152B337546E" DiskId="1">
-					<CreateFolder/>
-						<RegistryKey Root="HKCU" Key="Software\Tomboy\Install"
-							Action="createAndRemoveOnUninstall">
-							<RegistryValue Name="DTSC" Value="1" Type="integer" KeyPath="yes"/>
+						<CreateFolder />
+						<RegistryKey Root="HKCU" Key="Software\Tomboy\Install" Action="createAndRemoveOnUninstall">
+							<RegistryValue Name="DTSC" Value="1" Type="integer" KeyPath="yes" />
 						</RegistryKey>
 						<Shortcut Id="startmenuTomboy" Directory="ProgramMenuFolder" Name="Tomboy Notes" WorkingDirectory="INSTALLDIR" Icon="Tomboy.exe" IconIndex="0" Target="[#Tomboy.exe]" />
 						<Shortcut Id="desktopTomboy" Directory="DesktopFolder" Name="Tomboy Notes" WorkingDirectory="INSTALLDIR" Icon="Tomboy.exe" IconIndex="0" Target="[#Tomboy.exe]" />
 					</Component>
+					<Directory Id="tomboy" Name="tomboy">
+						<Directory Id="icons" Name="icons">
+							<Directory Id="hicolor" Name="hicolor">
+								<Directory Id="_6x16" Name="16x16">
+									<Directory Id="actions16" Name="actions">
+										<Component Guid="2F7685A9-DF0E-4471-9308-D3986E1E1A76" Id="Note_newPng" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\16x16\actions\note-new.png" Name="note-new.png" Id="note_new.png" />
+										</Component>
+									</Directory>
+									<Directory Id="apps16" Name="apps">
+										<Component Guid="5765C385-C549-4976-8E32-0D9218B666B3" Id="TomboyPng" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\16x16\apps\tomboy.png" Name="tomboy.png" Id="tomboy.png" />
+										</Component>
+									</Directory>
+									<Directory Id="places16" Name="places" />
+									<Directory Id="status16" Name="status">
+										<Component Guid="7DC80176-A1D9-4078-B09D-CA08D029728E" Id="Pin_activePng" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\16x16\status\pin-active.png" Name="pin-active.png" Id="pin_active.png" />
+										</Component>
+										<Component Guid="03FEA52F-888F-43B1-9DE0-3934C88E8BF6" Id="Pin_downPng" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\16x16\status\pin-down.png" Name="pin-down.png" Id="pin_down.png" />
+										</Component>
+										<Component Guid="3EB31AAD-392C-4B25-BD29-178C829FFA3E" Id="Pin_upPng" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\16x16\status\pin-up.png" Name="pin-up.png" Id="pin_up.png" />
+										</Component>
+									</Directory>
+								</Directory>
+								<Directory Id="_2x22" Name="22x22">
+									<Directory Id="actions22" Name="actions">
+										<Component Guid="EE1BA642-20A2-4CF1-9356-D174F32EA91B" Id="Filter_note_allPng" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\22x22\actions\filter-note-all.png" Name="filter-note-all.png" Id="filter_note_all.png" />
+										</Component>
+										<Component Guid="48ED3CD0-FDF0-4A76-8609-1C6ACF436003" Id="Filter_note_unfiledPng" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\22x22\actions\filter-note-unfiled.png" Name="filter-note-unfiled.png" Id="filter_note_unfiled.png" />
+										</Component>
+									</Directory>
+									<Directory Id="apps22" Name="apps">
+										<Component Guid="23BD730D-537E-49C0-81B2-E687DD458B31" Id="AppsTomboyPng" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\22x22\apps\tomboy.png" Name="tomboy.png" Id="apps.tomboy.png" />
+										</Component>
+									</Directory>
+									<Directory Id="places22" Name="places">
+										<Component Guid="A421B2BE-7618-484E-B79C-4A583395E847" Id="NotePng" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\22x22\places\note.png" Name="note.png" Id="note.png" />
+										</Component>
+										<Component Guid="6F91DF63-6D53-4ACF-AFFD-756A87108A74" Id="NotebookPng" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\22x22\places\notebook.png" Name="notebook.png" Id="notebook.png" />
+										</Component>
+									</Directory>
+									<Directory Id="status22" Name="status" />
+								</Directory>
+								<Directory Id="_4x24" Name="24x24">
+									<Directory Id="actions24" Name="actions" />
+									<Directory Id="apps24" Name="apps">
+										<Component Guid="2EEEDADB-BFAB-486E-8A90-4FB849924813" Id="AppsTomboyPng1" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\24x24\apps\tomboy.png" Name="tomboy.png" Id="apps.tomboy1.png" />
+										</Component>
+									</Directory>
+									<Directory Id="places24" Name="places" />
+									<Directory Id="status24" Name="status" />
+								</Directory>
+								<Directory Id="_2x32" Name="32x32">
+									<Directory Id="actions32" Name="actions" />
+									<Directory Id="apps32" Name="apps">
+										<Component Guid="7C4CA97A-AF77-452F-B848-9655BD322337" Id="AppsTomboyPng2" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\32x32\apps\tomboy.png" Name="tomboy.png" Id="apps.tomboy2.png" />
+										</Component>
+									</Directory>
+									<Directory Id="places32" Name="places" />
+									<Directory Id="status32" Name="status" />
+								</Directory>
+								<Directory Id="_8x48" Name="48x48">
+									<Directory Id="actions48" Name="actions">
+										<Component Guid="88DE93FC-41BD-456B-B3F9-2DFB6C9970F4" Id="Notebook_newPng" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\48x48\actions\notebook-new.png" Name="notebook-new.png" Id="notebook_new.png" />
+										</Component>
+									</Directory>
+									<Directory Id="apps48" Name="apps">
+										<Component Guid="4B6E164C-E3E8-4B28-8FF4-2E48BA766A02" Id="AppsTomboyPng3" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\48x48\apps\tomboy.png" Name="tomboy.png" Id="apps.tomboy3.png" />
+										</Component>
+									</Directory>
+									<Directory Id="places48" Name="places" />
+									<Directory Id="status48" Name="status" />
+								</Directory>
+								<Directory Id="scalable" Name="scalable">
+									<Directory Id="actions" Name="actions" />
+									<Directory Id="apps" Name="apps">
+										<Component Guid="ED86C52A-2B08-4E59-9702-156DB2601F9A" Id="TomboySvg" DiskId="1">
+											<File Source="..\bin\Debug\tomboy\icons\hicolor\scalable\apps\tomboy.svg" Name="tomboy.svg" Id="tomboy.svg" />
+										</Component>
+									</Directory>
+									<Directory Id="places" Name="places" />
+									<Directory Id="status" Name="status" />
+								</Directory>
+							</Directory>
+						</Directory>
+					</Directory>
 				</Directory>
 			</Directory>
 		</DirectoryRef>

Modified: trunk/Setup/Setup.wxs
==============================================================================
--- trunk/Setup/Setup.wxs	(original)
+++ trunk/Setup/Setup.wxs	Sat Oct 18 10:32:16 2008
@@ -44,6 +44,21 @@
 		         Level="1">
 		         <ComponentRef Id="MyComponent"/>
 		         <ComponentRef Id="Shortcuts"/>
+		         <ComponentRef Id="Note_newPng"/>
+		         <ComponentRef Id="TomboyPng"/>
+		         <ComponentRef Id="Pin_activePng"/>
+		         <ComponentRef Id="Pin_downPng"/>
+		         <ComponentRef Id="Pin_upPng"/>
+		         <ComponentRef Id="Filter_note_allPng"/>
+		         <ComponentRef Id="Filter_note_unfiledPng"/>
+		         <ComponentRef Id="AppsTomboyPng"/>
+		         <ComponentRef Id="NotePng"/>
+		         <ComponentRef Id="NotebookPng"/>
+		         <ComponentRef Id="AppsTomboyPng1"/>
+		         <ComponentRef Id="AppsTomboyPng2"/>
+		         <ComponentRef Id="Notebook_newPng"/>
+		         <ComponentRef Id="AppsTomboyPng3"/>
+		         <ComponentRef Id="TomboySvg"/>
 		</Feature>
 		
 		<WixVariable Id="WixUIDialogBmp" Value="DlgBmp.bmp" />

Modified: trunk/Tomboy.csproj
==============================================================================
--- trunk/Tomboy.csproj	(original)
+++ trunk/Tomboy.csproj	Sat Oct 18 10:32:16 2008
@@ -221,7 +221,7 @@
   </ProjectExtensions>
   <PropertyGroup>
     <PreBuildEvent>copy "$(ProjectDir)data\icons\tomboy.ico" "$(ProjectDir)tomboy.ico"
-copy "$(ProjectDir)data\icons\hicolor_apps_22x22_tomboy.png" "$(ProjectDir)tomboy.png"
+copy "$(ProjectDir)data\icons\hicolor_apps_48x48_tomboy.png" "$(ProjectDir)tomboy.png"
 copy "$(ProjectDir)data\icons\hicolor_places_22x22_note.png" "$(ProjectDir)note.png"
 copy "$(ProjectDir)data\icons\hicolor_actions_16x16_note-new.png" "$(ProjectDir)note-new.png"
 copy "$(ProjectDir)data\icons\hicolor_actions_22x22_filter-note-all.png" "$(ProjectDir)filter-note-all.png"
@@ -234,6 +234,55 @@
 copy "$(ProjectDir)Tomboy\Tomboy.addin.xml" "$(ProjectDir)"
 copy "$(ProjectDir)data\UIManagerLayout.xml" "$(ProjectDir)"</PreBuildEvent>
     <PostBuildEvent>copy "$(ProjectDir)winbin\MonoPosixHelper.dll" "$(ProjectDir)bin\Debug"
-copy "$(ProjectDir)winbin\Mono.Addins.dll.config" "$(ProjectDir)bin\Debug"</PostBuildEvent>
+copy "$(ProjectDir)winbin\Mono.Addins.dll.config" "$(ProjectDir)bin\Debug"
+
+copy "$(ProjectDir)data\icons\tomboy.ico" "$(ProjectDir)tomboy.ico"
+
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\apps"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\apps"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\24x24\apps"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\32x32\apps"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\apps"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\scalable\apps"
+
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\actions"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\actions"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\24x24\actions"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\32x32\actions"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\actions"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\scalable\actions"
+
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\places"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\places"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\24x24\places"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\32x32\places"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\places"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\scalable\places"
+
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\status"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\status"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\24x24\status"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\32x32\status"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\status"
+mkdir "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\scalable\status"
+
+copy "$(ProjectDir)data\icons\hicolor_actions_16x16_note-new.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\actions\note-new.png"
+copy "$(ProjectDir)data\icons\hicolor_actions_48x48_notebook-new.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\actions\notebook-new.png"
+copy "$(ProjectDir)data\icons\hicolor_actions_22x22_filter-note-all.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\actions\filter-note-all.png"
+copy "$(ProjectDir)data\icons\hicolor_actions_22x22_filter-note-unfiled.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\actions\filter-note-unfiled.png"
+copy "$(ProjectDir)data\icons\hicolor_apps_16x16_tomboy.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\apps\tomboy.png"
+copy "$(ProjectDir)data\icons\hicolor_apps_22x22_tomboy.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\apps\tomboy.png"
+copy "$(ProjectDir)data\icons\hicolor_apps_24x24_tomboy.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\24x24\apps\tomboy.png"
+copy "$(ProjectDir)data\icons\hicolor_apps_32x32_tomboy.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\32x32\apps\tomboy.png"
+copy "$(ProjectDir)data\icons\hicolor_apps_48x48_tomboy.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\48x48\apps\tomboy.png"
+copy "$(ProjectDir)data\icons\hicolor_apps_scalable_tomboy.svg" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\scalable\apps\tomboy.svg"
+copy "$(ProjectDir)data\icons\hicolor_places_22x22_note.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\places\note.png"
+copy "$(ProjectDir)data\icons\hicolor_places_22x22_notebook.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\22x22\places\notebook.png"
+copy "$(ProjectDir)data\icons\hicolor_status_16x16_pin-down.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\status\pin-down.png"
+copy "$(ProjectDir)data\icons\hicolor_status_16x16_pin-up.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\status\pin-up.png"
+copy "$(ProjectDir)data\icons\hicolor_status_16x16_pin-active.png" "$(ProjectDir)bin\Debug\tomboy\icons\hicolor\16x16\status\pin-active.png"
+
+copy "$(ProjectDir)Tomboy\Tomboy.addin.xml" "$(ProjectDir)"
+copy "$(ProjectDir)data\UIManagerLayout.xml" "$(ProjectDir)"</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file

Modified: trunk/Tomboy/Defines.WIN32.cs
==============================================================================
--- trunk/Tomboy/Defines.WIN32.cs	(original)
+++ trunk/Tomboy/Defines.WIN32.cs	Sat Oct 18 10:32:16 2008
@@ -7,11 +7,11 @@
 namespace Tomboy {
 	public class Defines {
 		public const string VERSION = "0.13.0";
-		public const string DATADIR = "@datadir@";
-		public const string GNOME_LOCALE_DIR = "@datadir@/locale";
+		public static readonly string DATADIR = System.IO.Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
+		public static readonly string GNOME_LOCALE_DIR = System.IO.Path.Combine (DATADIR, "locale");
 		public const string GNOME_HELP_DIR = "@datadir@/gnome/help/tomboy";
 		public const string PKGLIBDIR = "@pkglibdir@";
-		public const string SYS_ADDINS_DIR = "@pkglibdir@/addins";
+		public static readonly string SYS_ADDINS_DIR = DATADIR;
 		public const string TOMBOY_WEBSITE = "http://www.gnome.org/projects/tomboy/";;
 	}
 }

Modified: trunk/Tomboy/Tomboy.cs
==============================================================================
--- trunk/Tomboy/Tomboy.cs	(original)
+++ trunk/Tomboy/Tomboy.cs	Sat Oct 18 10:32:16 2008
@@ -47,7 +47,7 @@
 
 			// Add private icon dir to search path
 			icon_theme = Gtk.IconTheme.Default;
-			icon_theme.AppendSearchPath (System.IO.Path.Combine (Defines.DATADIR, "tomboy/icons"));
+			icon_theme.AppendSearchPath (Path.Combine (Path.Combine (Defines.DATADIR, "tomboy"), "icons"));
 
 //   PluginManager.CheckPluginUnloading = cmd_line.CheckPluginUnloading;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]