# 
# 
# patch ".cdtproject"
#  from [12dbefa33165b73777bc02113bda0b11a42d46bd]
#    to [74af2f4c9ba634a1a7b2261be9a48703a226af2c]
# 
# patch "README"
#  from [12871744e38567553f1694a88026a1f17141ab86]
#    to [8804f09ccf4db9e7a583446baf627066c0cc6c53]
# 
# patch "i18n/guitone_de.ts"
#  from [a900ab54923ef382eb4abdd0c891de86d7222b88]
#    to [26647e7950bae0db517d0122ff230c13ebd6b0ee]
# 
# patch "src/main.cpp"
#  from [980a3179878d33e38f2c16a98426dfdea4bd6840]
#    to [49d4ecfe84b258ba291dfd3789eeff52d7194c3e]
# 
# patch "src/model/IconProvider.cpp"
#  from [3672a30d7f27afdad5361809ab67d09d7350e7cb]
#    to [599660908a1821849b091e0327b7d326bdcacafb]
# 
# patch "src/view/Guitone.cpp"
#  from [cec9aa01303fe91e5619f5cdf5e3570c3985f212]
#    to [89d7535b4f789dbbe0e677429213d05c9f32dbd7]
# 
============================================================
--- .cdtproject	12dbefa33165b73777bc02113bda0b11a42d46bd
+++ .cdtproject	74af2f4c9ba634a1a7b2261be9a48703a226af2c
@@ -1,3 +1,78 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <?eclipse-cdt version="2.0"?>
+
+<cdtproject id="org.eclipse.cdt.make.core.make">
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MachO" point="org.eclipse.cdt.core.BinaryParser">
+<attribute key="c++filt" value="c++filt"/>
+</extension>
+<extension id="org.eclipse.cdt.core.ctagsindexer" point="org.eclipse.cdt.core.CIndexer">
+<attribute key="ctagslocation" value=""/>
+<attribute key="ctagsindexincludes" value="false"/>
+<attribute key="ctagfiletype" value="ctags_internal"/>
+<attribute key="ctagslocationtype" value="ctags_path_default"/>
+<attribute key="ctagfilelocation" value=""/>
+</extension>
+<data>
+<item id="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+</item>
+<item id="org.eclipse.cdt.core.pathentry">
+<pathentry kind="src" path=""/>
+<pathentry kind="out" path=""/>
+<pathentry kind="out" path="bin"/>
+<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
+</item>
+<item id="org.eclipse.cdt.make.core.buildtargets">
+<buildTargets>
+<target name="all" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<buildCommand>/home/tommyd/monotone/guitone/build.sh</buildCommand>
+<buildArguments/>
+<buildTarget>all</buildTarget>
+<stopOnError>false</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+</buildTargets>
+</item>
+</data>
+</cdtproject>
-<cdtproject id='org.eclipse.cdt.make.core.make'><extension point='org.eclipse.cdt.core.BinaryParser' id='org.eclipse.cdt.core.ELF'/><extension point='org.eclipse.cdt.core.CIndexer' id='org.eclipse.cdt.core.ctagsindexer'><attribute key='ctagfilelocation' value=''/><attribute key='ctagslocation' value=''/><attribute key='ctagsindexincludes' value='false'/><attribute key='ctagfiletype' value='ctags_internal'/><attribute key='ctagslocationtype' value='ctags_path_default'/></extension><data><item id='scannerConfiguration'><autodiscovery enabled='true' selectedProfileId='org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile' problemReportingEnabled='true'/><profile id='org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile'><buildOutputProvider><openAction enabled='true' filePath=''/><parser enabled='true'/></buildOutputProvider><scannerInfoProvider id='specsFile'><runAction useDefault='true' command='gcc' arguments='-E -P -v -dD ${plugin_state_location}/${specs_file}'/><
parser enabled='true'/></scannerInfoProvider></profile><profile id='org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile'><buildOutputProvider><openAction enabled='false' filePath=''/><parser enabled='true'/></buildOutputProvider><scannerInfoProvider id='makefileGenerator'><runAction useDefault='true' command='make' arguments='-f ${project_name}_scd.mk'/><parser enabled='false'/></scannerInfoProvider></profile><profile id='org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile'><buildOutputProvider><openAction enabled='false' filePath=''/><parser enabled='true'/></buildOutputProvider><scannerInfoProvider id='specsFile'><runAction useDefault='true' command='gcc' arguments='-E -P -v -dD ${plugin_state_location}/${specs_file}'/><parser enabled='false'/></scannerInfoProvider></profile><profile id='org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile'><buildOutputProvider><openAction enabled='false' filePath=''/><parser enabled='true'/></buildOutputProvider><scannerInfoProvider id='specsFile'><runAction useDefault='true' command='gcc' arguments='-E -P -v -dD ${plugin_state_location}/${specs_file}'/><parser enabled='false'/></scannerInfoProvider></profile></item><item id='org.eclipse.cdt.core.pathentry'><pathentry kind='src' path=''/><pathentry kind='out' path=''/><pathentry kind='out' path='bin'/><pathentry kind='con' path='org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO'/></item><item id='org.eclipse.cdt.make.core.buildtargets'><buildTargets><target name='all' targetID='org.eclipse.cdt.make.MakeTargetBuilder' path=''><buildCommand>/home/tommyd/monotone/guitone/build.sh</buildCommand><buildArguments></buildArguments><buildTarget>all</buildTarget><stopOnError>false</stopOnError><useDefaultCommand>false</useDefaultCommand></target></buildTargets></item></data></cdtproject>
============================================================
--- README	12871744e38567553f1694a88026a1f17141ab86
+++ README	8804f09ccf4db9e7a583446baf627066c0cc6c53
@@ -27,15 +27,20 @@
 
 And btw... contributions are welcome!
 
+Platform Notes
+==============
+
+* If you like to compile guitone on OSX, make sure you've
+  updated your gcc to 4.0.1 or newer which comes with XCode
+  2.2 or later. Otherwise you'll get a "Bus error" on runtime
+  due to a bug in gcc 4.0.0
+
 TODO
 ====
 
 * real actions on the workspace (add/drop/update/...)
 * abilitiy to view the history of the branch/ a file
 * session/workspace saving on restart
-* cross-platform builds
-* full Qt4 support
-* make icons for all common file/folder states
 * well, anything else you can think of...
 
 Authors
============================================================
--- i18n/guitone_de.ts	a900ab54923ef382eb4abdd0c891de86d7222b88
+++ i18n/guitone_de.ts	26647e7950bae0db517d0122ff230c13ebd6b0ee
@@ -52,12 +52,12 @@
     <message>
         <source>Ctrl+I</source>
         <comment>Import</comment>
-        <translation type="unfinished">STRG+I</translation>
+        <translation type="obsolete">STRG+I</translation>
     </message>
     <message>
         <source>Ctrl+Q</source>
         <comment>Quit</comment>
-        <translation type="unfinished">STRG+Q</translation>
+        <translation type="obsolete">STRG+Q</translation>
     </message>
     <message>
         <source>The chosen directory is no monotone workspace!</source>
@@ -71,6 +71,11 @@
         <source>Critical Monotone Error</source>
         <translation type="unfinished">Kritischer monotone-Fehler</translation>
     </message>
+    <message>
+        <source>Ctrl+I</source>
+        <comment>File|Import</comment>
+        <translation type="obsolete">STRG+I</translation>
+    </message>
 </context>
 <context>
     <name>Monotone</name>
============================================================
--- src/main.cpp	980a3179878d33e38f2c16a98426dfdea4bd6840
+++ src/main.cpp	49d4ecfe84b258ba291dfd3789eeff52d7194c3e
@@ -39,9 +39,6 @@
     }
 #endif
 
-// somehow loading the translation code leads to crashes on OSX, so we exclude
-// this OS for now...    
-#ifndef Q_WS_MAC
     // try to find a suitable locale and setup translations
     QString locale = QLocale::system().name();
     QTranslator translator;
@@ -50,7 +47,6 @@
     {
         app.installTranslator(&translator);
     }
-#endif
 
     // create and show the main window
     Guitone *mainWnd = new Guitone();
============================================================
--- src/model/IconProvider.cpp	3672a30d7f27afdad5361809ab67d09d7350e7cb
+++ src/model/IconProvider.cpp	599660908a1821849b091e0327b7d326bdcacafb
@@ -104,7 +104,7 @@
 IconProvider::IconProvider(void)
 {
     QStyle *style = QApplication::style();
-    
+
     //
     // default icons if no state matches
     //
@@ -182,6 +182,14 @@
         QImage overlay(i.value());
         overlay.createAlphaMask();
         
+#ifdef Q_WS_MAC
+        // on OSX system icons have a default size of 32x32
+        // which are later scaled down to 16x16
+        // so we scale our 16x16 overlay up to 32x32
+        // before we apply it on the original icon
+        overlay = overlay.scaled(32, 32);
+#endif
+        
         // the basic icons have to be recreated for each state
         // since we later paint on them
         QImage fileImage(style->standardPixmap(QStyle::SP_FileIcon).toImage());
============================================================
--- src/view/Guitone.cpp	cec9aa01303fe91e5619f5cdf5e3570c3985f212
+++ src/view/Guitone.cpp	89d7535b4f789dbbe0e677429213d05c9f32dbd7
@@ -41,11 +41,22 @@
     // Menubar
     //
 	menu = menuBar()->addMenu(tr("&File"));
-	QAction* act = menu->addAction(tr("&Import Working Directory..."), this, SLOT(chooseWorkspace()));
-    act->setShortcut(tr("Ctrl+I", "Import"));
+	menu->addAction(
+        tr("&Import Working Directory..."),
+        this,
+        SLOT(chooseWorkspace()),
+        Qt::CTRL + Qt::Key_I
+    );
 
-	act = menu->addAction(tr("&Quit"), this, SLOT(close()));
-    act->setShortcut(tr("Ctrl+Q", "Quit"));
+    QAction *act = menu->addAction("");
+    act->setSeparator(true);
+        
+    menu->addAction(
+        tr("&Quit"),
+        this,
+        SLOT(close()),
+        Qt::CTRL + Qt::Key_Q
+    );
 
 	//
     // Toolbar