GNOME.org
 

tasque r183 - in trunk: . osx/Contents/MacOS src

Author: sharm
Date: Wed Dec 24 01:33:28 2008
New Revision: 183
URL: http://svn.gnome.org/viewvc/tasque?rev=183&view=rev

Log:
* mac-prebuild.sh:
* mac-postbuild.sh:
* tasque-mac.csproj: Update project to actually work on a Mac.

* bundle-mac-app.sh: Copy RtmNet.dll and all .mdb files into bundle.
* osx/Contents/MacOS/Tasque: Run with --debug.

* src/TaskWindow.cs: ShowWindow only shows; use new ToggleWindowVisible
method for toggle support.
* src/Application.cs: Use ToggleWindowVisible when tray icon is activated.
Fix #if directives to have proper Mac support.
* src/OSXApplications.cs: Add Window menu with ShowTasksAction.


Added:
   trunk/mac-postbuild.sh   (contents, props changed)
   trunk/mac-prebuild.sh   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/bundle-mac-app.sh
   trunk/osx/Contents/MacOS/Tasque
   trunk/src/Application.cs
   trunk/src/OSXApplication.cs
   trunk/src/TaskWindow.cs
   trunk/tasque-mac.csproj

Modified: trunk/bundle-mac-app.sh
==============================================================================
--- trunk/bundle-mac-app.sh	(original)
+++ trunk/bundle-mac-app.sh	Wed Dec 24 01:33:28 2008
@@ -15,5 +15,6 @@
 cp osx/$MACOS/Tasque $BUNDLE/$MACOS
 cp osx/$RESOURCES/tasque.icns $BUNDLE/$RESOURCES
 
-cp bin/Debug/tasque.exe $BUNDLE/$MACOS
+cp bin/Debug/tasque.exe* $BUNDLE/$MACOS
+cp bin/Debug/RtmNet.dll* $BUNDLE/$MACOS
 cp macbin/ige-mac-integration-sharp.dll $BUNDLE/$MACOS

Added: trunk/mac-postbuild.sh
==============================================================================
--- (empty file)
+++ trunk/mac-postbuild.sh	Wed Dec 24 01:33:28 2008
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cp macbin/*.dll bin/Debug
\ No newline at end of file

Added: trunk/mac-prebuild.sh
==============================================================================
--- (empty file)
+++ trunk/mac-prebuild.sh	Wed Dec 24 01:33:28 2008
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cp data/images/*.png .
\ No newline at end of file

Modified: trunk/osx/Contents/MacOS/Tasque
==============================================================================
--- trunk/osx/Contents/MacOS/Tasque	(original)
+++ trunk/osx/Contents/MacOS/Tasque	Wed Dec 24 01:33:28 2008
@@ -10,4 +10,4 @@
 export DYLD_FALLBACK_LIBRARY_PATH=$APP_PATH/Contents/MacOS:$MONO_FRAMEWORK_PATH/lib:/lib:/usr/lib
 
 cd "$APP_PATH/Contents/MacOS"
-exec -a "Tasque" "$MONO" $ASSEMBLY $@
\ No newline at end of file
+exec -a "Tasque" "$MONO" --debug $ASSEMBLY $@
\ No newline at end of file

Modified: trunk/src/Application.cs
==============================================================================
--- trunk/src/Application.cs	(original)
+++ trunk/src/Application.cs	Wed Dec 24 01:33:28 2008
@@ -52,7 +52,7 @@
 		private static Tasque.Application application = null;
 		private static System.Object locker = new System.Object();
 		private INativeApplication nativeApp;
-#if !WIN32
+#if !WIN32 && !OSX
 		private RemoteControl remoteControl;
 #endif
 		private Gdk.Pixbuf normalPixBuf;
@@ -207,7 +207,7 @@
 
 			preferences = new Preferences (nativeApp.ConfDir);
 			
-#if !WIN32
+#if !WIN32 && !OSX
 			// Register Tasque RemoteControl
 			try {
 				remoteControl = RemoteControlProxy.Register ();
@@ -537,7 +537,7 @@
 
 		private void OnTrayIconClick (object sender, EventArgs args) // handler for mouse click
 		{
-			TaskWindow.ShowWindow();
+			TaskWindow.ToggleWindowVisible ();
 		}
 
 		private void OnTrayIconPopupMenu (object sender, EventArgs args)

Modified: trunk/src/OSXApplication.cs
==============================================================================
--- trunk/src/OSXApplication.cs	(original)
+++ trunk/src/OSXApplication.cs	Wed Dec 24 01:33:28 2008
@@ -22,6 +22,9 @@
       <menuitem action=""RefreshAction""/>
 
     </menu>
+    <menu name=""WindowMenu"" action=""WindowMenuAction"">
+      <menuitem action=""ShowTasksAction""/>
+    </menu>
   </menubar>
 </ui>
 ";
@@ -34,6 +37,12 @@
 				                 Catalog.GetString ("_File"),
 				                 null,
 				                 null,
+				                 null),
+				new ActionEntry ("WindowMenuAction",
+				                 null,
+				                 Catalog.GetString ("_Window"),
+				                 null,
+				                 null,
 				                 null)
 			});
 			
@@ -44,7 +53,7 @@
 			
 			// This totally doesn't work...is my lib too old?
 			IgeMacDock dock = new IgeMacDock();
-			dock.Clicked += delegate (object sender, EventArgs args) { Logger.Debug ("doc clicked");};
+			dock.Clicked += delegate (object sender, EventArgs args) {TaskWindow.ShowWindow ();};
 			dock.QuitActivate += delegate (object sender, EventArgs args) { Application.Instance.Quit (); };
 			
 			MenuShell mainMenu = uiManager.GetWidget ("/MainMenu") as MenuShell;
@@ -60,9 +69,6 @@
 			IgeMacMenuGroup about_group = IgeMacMenu.AddAppMenuGroup ();
 			IgeMacMenuGroup prefs_group = IgeMacMenu.AddAppMenuGroup ();
 
-
-			
-
 			about_group.AddMenuItem (about_item, null);
 			prefs_group.AddMenuItem (prefs_item, null);
 			

Modified: trunk/src/TaskWindow.cs
==============================================================================
--- trunk/src/TaskWindow.cs	(original)
+++ trunk/src/TaskWindow.cs	Wed Dec 24 01:33:28 2008
@@ -400,10 +400,20 @@
 
 		}
 		
-		public static void ShowWindow()
+		public static void ShowWindow ()
+		{
+			ShowWindow (false);
+		}
+		
+		public static void ToggleWindowVisible ()
+		{
+			ShowWindow (true);
+		}
+		
+		private static void ShowWindow(bool supportToggle)
 		{
 			if(taskWindow != null) {
-				if(taskWindow.IsActive) {
+				if(taskWindow.IsActive && supportToggle) {
 					int x;
 					int y;
 

Modified: trunk/tasque-mac.csproj
==============================================================================
--- trunk/tasque-mac.csproj	(original)
+++ trunk/tasque-mac.csproj	Wed Dec 24 01:33:28 2008
@@ -1,4 +1,5 @@
-ï<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -20,6 +21,12 @@
     <DefineConstants>TRACE;DEBUG;WIN32</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="BeforeBuild" command="mac-prebuild.sh" workingdir="${SolutionDir}" />
+        <Command type="AfterBuild" command="mac-postbuild.sh" workingdir="${SolutionDir}" />
+      </CustomCommands>
+    </CustomCommands>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,93 +37,38 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="atk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\Medsphere\Gtk# SDK\lib\gtk-sharp-2.0\atk\atk-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="gdk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\Medsphere\Gtk# SDK\lib\gtk-sharp-2.0\gdk\gdk-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="glib-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+    <Reference Include="Mono.Posix" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\Medsphere\Gtk# SDK\lib\gtk-sharp-2.0\glib\glib-sharp.dll</HintPath>
+      <HintPath>..\..\..\..\Library\Frameworks\Mono.framework\Versions\2.0.1\lib\mono\gac\gtk-sharp\2.12.0.0__35e10195dab3c99f\gtk-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\Medsphere\Gtk# SDK\lib\gtk-sharp-2.0\gtk\gtk-sharp.dll</HintPath>
+      <HintPath>..\..\..\..\Library\Frameworks\Mono.framework\Versions\2.0.1\lib\mono\gac\glib-sharp\2.12.0.0__35e10195dab3c99f\glib-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="ige-mac-integration-sharp, Version=0.6.0.0, Culture=neutral, PublicKeyToken=8df8155add92b1bc, processorArchitecture=MSIL">
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>macbin\ige-mac-integration-sharp.dll</HintPath>
+      <HintPath>..\..\..\..\Library\Frameworks\Mono.framework\Versions\2.0.1\lib\mono\gac\gdk-sharp\2.12.0.0__35e10195dab3c99f\gdk-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>winbin\Mono.Data.Sqlite.dll</HintPath>
+      <HintPath>..\..\..\..\Library\Frameworks\Mono.framework\Versions\2.0.1\lib\mono\gac\atk-sharp\2.12.0.0__35e10195dab3c99f\atk-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Posix, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+    <Reference Include="Mono.Data.Sqlite" />
+    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>winbin\Mono.Posix.dll</HintPath>
+      <HintPath>..\..\..\..\Library\Frameworks\Mono.framework\Versions\2.0.1\lib\mono\gac\pango-sharp\2.12.0.0__35e10195dab3c99f\pango-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="pango-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+    <Reference Include="System.Xml" />
+    <Reference Include="ige-mac-integration-sharp, Version=0.6.0.0, Culture=neutral, PublicKeyToken=8df8155add92b1bc">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\Medsphere\Gtk# SDK\lib\gtk-sharp-2.0\pango\pango-sharp.dll</HintPath>
+      <HintPath>macbin\ige-mac-integration-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="ChangeLog" />
-    <None Include="data\images\clock-16-0.svg" />
-    <None Include="data\images\note-22.svg" />
-    <None Include="data\images\tasque-icons-source.svg" />
-    <None Include="data\images\tasque.svg" />
     <Compile Include="src\Defines.WIN32.cs" />
-    <None Include="src\Defines.cs.in" />
-    <None Include="src\Tasque.exe.config.in" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="clock-16-1.png" />
-    <EmbeddedResource Include="clock-16-10.png" />
-    <EmbeddedResource Include="clock-16-11.png" />
-    <EmbeddedResource Include="clock-16-2.png" />
-    <EmbeddedResource Include="clock-16-3.png" />
-    <EmbeddedResource Include="clock-16-4.png" />
-    <EmbeddedResource Include="clock-16-5.png" />
-    <EmbeddedResource Include="clock-16-6.png" />
-    <EmbeddedResource Include="clock-16-7.png" />
-    <EmbeddedResource Include="clock-16-8.png" />
-    <EmbeddedResource Include="clock-16-9.png" />
-    <Content Include="data\images\clock-16-0.png" />
-    <Content Include="data\images\clock-16-1.png" />
-    <Content Include="data\images\clock-16-10.png" />
-    <Content Include="data\images\clock-16-11.png" />
-    <Content Include="data\images\clock-16-2.png" />
-    <Content Include="data\images\clock-16-3.png" />
-    <Content Include="data\images\clock-16-4.png" />
-    <Content Include="data\images\clock-16-5.png" />
-    <Content Include="data\images\clock-16-6.png" />
-    <Content Include="data\images\clock-16-7.png" />
-    <Content Include="data\images\clock-16-8.png" />
-    <Content Include="data\images\clock-16-9.png" />
-    <Content Include="data\images\note-16.png" />
-    <Content Include="data\images\rtmLogo.png" />
-    <Content Include="data\images\tasque-16.png" />
-    <Content Include="data\images\tasque-22.png" />
-    <Content Include="data\images\tasque-24.png" />
-    <Content Include="data\images\tasque-32.png" />
-    <Content Include="data\images\tasque-48.png" />
-    <Content Include="data\sounds\notify.wav" />
-    <EmbeddedResource Include="note-16.png" />
-    <EmbeddedResource Include="rtmLogo.png" />
-    <EmbeddedResource Include="tasque-16.png" />
-    <EmbeddedResource Include="tasque-22.png" />
-    <EmbeddedResource Include="tasque-24.png" />
-    <EmbeddedResource Include="tasque-32.png" />
-    <EmbeddedResource Include="tasque-48.png" />
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="src\AbstractTask.cs" />
     <Compile Include="src\AllCategory.cs" />
     <Compile Include="src\Application.cs" />
@@ -146,7 +98,6 @@
     <Compile Include="src\CellRendererDate.cs" />
     <Compile Include="src\CompletedTaskGroup.cs" />
     <Compile Include="src\DateButton.cs" />
-    <None Include="src\GnomeApplication.cs" />
     <Compile Include="src\GtkApplication.cs" />
     <Compile Include="src\IBackend.cs" />
     <Compile Include="src\ICategory.cs" />
@@ -166,10 +117,58 @@
     <Compile Include="src\TaskTreeView.cs" />
     <Compile Include="src\TaskWindow.cs" />
     <Compile Include="src\Utilities.cs" />
+    <None Include="ChangeLog" />
+    <None Include="data\images\clock-16-0.svg" />
+    <None Include="data\images\note-22.svg" />
+    <None Include="data\images\tasque-icons-source.svg" />
+    <None Include="data\images\tasque.svg" />
+    <None Include="src\Defines.cs.in" />
+    <None Include="src\Tasque.exe.config.in" />
+    <None Include="src\GnomeApplication.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="clock-16-1.png" />
+    <EmbeddedResource Include="clock-16-10.png" />
+    <EmbeddedResource Include="clock-16-11.png" />
+    <EmbeddedResource Include="clock-16-2.png" />
+    <EmbeddedResource Include="clock-16-3.png" />
+    <EmbeddedResource Include="clock-16-4.png" />
+    <EmbeddedResource Include="clock-16-5.png" />
+    <EmbeddedResource Include="clock-16-6.png" />
+    <EmbeddedResource Include="clock-16-7.png" />
+    <EmbeddedResource Include="clock-16-8.png" />
+    <EmbeddedResource Include="clock-16-9.png" />
+    <EmbeddedResource Include="note-16.png" />
+    <EmbeddedResource Include="rtmLogo.png" />
+    <EmbeddedResource Include="tasque-16.png" />
+    <EmbeddedResource Include="tasque-22.png" />
+    <EmbeddedResource Include="tasque-24.png" />
+    <EmbeddedResource Include="tasque-32.png" />
+    <EmbeddedResource Include="tasque-48.png" />
+    <Content Include="data\images\clock-16-0.png" />
+    <Content Include="data\images\clock-16-1.png" />
+    <Content Include="data\images\clock-16-10.png" />
+    <Content Include="data\images\clock-16-11.png" />
+    <Content Include="data\images\clock-16-2.png" />
+    <Content Include="data\images\clock-16-3.png" />
+    <Content Include="data\images\clock-16-4.png" />
+    <Content Include="data\images\clock-16-5.png" />
+    <Content Include="data\images\clock-16-6.png" />
+    <Content Include="data\images\clock-16-7.png" />
+    <Content Include="data\images\clock-16-8.png" />
+    <Content Include="data\images\clock-16-9.png" />
+    <Content Include="data\images\note-16.png" />
+    <Content Include="data\images\rtmLogo.png" />
+    <Content Include="data\images\tasque-16.png" />
+    <Content Include="data\images\tasque-22.png" />
+    <Content Include="data\images\tasque-24.png" />
+    <Content Include="data\images\tasque-32.png" />
+    <Content Include="data\images\tasque-48.png" />
+    <Content Include="data\sounds\notify.wav" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="RtmNet\RtmNet.csproj">
-      <Project>{0AA1B96E-03DE-4D26-B4FD-507E988FD9B7}</Project>
+      <Project>{B19B9840-669D-4984-9772-E1F55193A67F}</Project>
       <Name>RtmNet</Name>
     </ProjectReference>
   </ItemGroup>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]