Jocelyn Turcotte
a98ab6f51d
shell_integration: Remove OwnCloud from public strings on OSX
...
Also removed it from commented out logs just in case.
2015-02-25 12:13:28 +01:00
Jocelyn Turcotte
ccf4298c81
shell_integration: Cleanup our uses of NSLog
...
Remove info messages and make sure that error messages
have an OwnCloud prefix since they will be reported by
Finder's process.
2015-02-17 18:23:30 +01:00
Jocelyn Turcotte
0b461e2275
shell_integration: Fix the overlay icons in the column view
...
Based on 79a713ea643e13e95f52bfe2adbbaf4a5ca92f8a in upstream liferay-nativity.
2015-02-17 18:20:16 +01:00
Markus Goetz
3a1501dea4
OS X: Connect to newest possible overlay icon socket
...
This is for branded ownCloud clients which use a different file name.
2015-02-04 18:44:00 +01:00
Markus Goetz
bb215ad095
OS X: Don't show menu item outside sync folder
...
As per #2732
2015-01-29 21:13:09 +01:00
Olivier Goffart
a999884adf
osx integration: adapt to socket api changes
2015-01-23 16:13:16 +01:00
Markus Goetz
c54621eb19
OS X: Share menu for Finder
2015-01-23 12:00:31 +01:00
Olivier Goffart
414ac5433d
Merge branch '1.7'
...
Conflicts:
binary
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
doc/troubleshooting.rst
2015-01-05 14:40:53 +01:00
Markus Goetz
f195648b90
OS X: Fix overlay icons
...
a3e7f513e6
broke them.
2014-12-15 11:34:44 +01:00
Daniel Molkentin
d5f2c36abd
Mirall -> (Desktop) Client
2014-12-08 17:54:32 +01:00
Markus Goetz
0d9ae241c9
OwnCloudFinder: Rename to SyncStateFinder
...
Project file names stay the same, only the output file(s) changed
2014-10-23 12:19:19 +02:00
Markus Goetz
f8f5a7ceaa
OS X Overlay Icons: Fix static analyzer warnings
2014-10-10 11:44:40 +02:00
Markus Goetz
b01839e9a4
OS X: Remove dead JSON code
2014-10-10 11:44:40 +02:00
Markus Goetz
6fbd28d228
Merge branch 'overlayicon_cache' into 1.7
2014-10-08 11:02:58 +02:00
Markus Goetz
ef019cdbfa
OS X Overlay Icons: Fix Finder plugin crash
...
By enabling ARC for GCDAsyncSocket (as we should have done before
https://github.com/robbiehanson/CocoaAsyncSocket/wiki/ARC ) there
is no chance anymore for a situation where the to-be-written NSData*
is deleted before the socket has had a chance to write it.
Interestingly, this only happened after switching to local sockets,
probably because of how immediatly the NSData* would be sent.
This commit also keeps the debug symbols for the Finder plugin.
2014-10-03 07:23:43 +02:00
Markus Goetz
b6d97cfffb
OS X Overlay Icons: Introduce a short term cache for rendered icons
...
This is for #2093
2014-10-01 13:21:29 +02:00
Olivier Goffart
147fa60f81
Merge branch 'socketapi_localsocket' into 1.7
2014-10-01 12:34:22 +02:00
Markus Goetz
02f971b534
OS X Overlay Icons: Fix request for sync dir itself
2014-09-30 12:53:35 +02:00
Markus Goetz
f8b73eb9d9
SocketApi: Port OS X to use local sockets
2014-09-30 07:36:20 +02:00
Markus Goetz
0539098371
OS X: Update GCDAsyncSocket
...
The two files are from the fork from
https://github.com/jdiehl/CocoaAsyncSocket/tree/socketUN
It supports unix domain sockets.
SHA1 was 7e97fc876522c7bf2a2a434cf40579ae9daf9da5
2014-09-30 07:09:39 +02:00
Klaas Freitag
8915f94931
Mac Overlays: handle filenames with slashes properly.
...
There are filenames with slashes on MacOSX, they can be created
in Finder. Internally they are converted to colons.
2014-09-25 12:24:32 +02:00
Klaas Freitag
688b8dcc38
MacOverlays: Pass isDir flag to isRegisteredPath method
...
With that, a path can be added to directories to also detect the
sync top directory.
This fixes bug #2053
2014-09-23 10:25:11 +02:00
Klaas Freitag
280edee1db
cmake: fix typo
2014-09-23 10:25:11 +02:00
Markus Goetz
2fddf05515
OS X: Overlay Icons: Load from bundle-specific path
...
The client (in this case mirall) tells the Finder plugin where to get the icons.
This enables installation in different locations and in branded clients.
2014-09-12 15:09:47 +02:00
Markus Goetz
91d1864840
OS X: Overlay Icons: Less verbose debug output
2014-09-12 15:09:46 +02:00
Markus Goetz
0edd4d3c02
OS X: Overlay icons: Don't show if folder is not marked as being an oC folder
2014-09-12 11:46:53 +02:00
Markus Goetz
4ce03e8b61
OS X: Fix Overlay icon retrieval
...
Re-retrieve all icons for a path in case we receive UPDATE_VIEW.
(But in contrast to previous code, don't delete the icons which then
would have caused screen flickering)
2014-09-07 11:38:23 +02:00
Markus Goetz
b6f42a91f4
OS X: Fix Finder bundle NVTY->OWNC
2014-08-28 15:45:07 +02:00
Markus Goetz
d69049ce10
OS X: Fix Finder plugin
2014-08-28 10:21:56 +02:00
Markus Goetz
2f34b046d0
Overlay Icons: Improve OS X version, improve general feedback
...
Now the update phase of the syncing algorithm pushes stuff the notification socket too.
2014-08-27 19:15:43 +02:00
Markus Goetz
79b547b83b
Icon Overlay OS X: Complain if icon couldnt be loaded
2014-08-26 17:21:15 +02:00
Markus Goetz
d9de6e68ad
OS X: Optimize Finder icon drawing code
...
Don't have an intermeditate TIFF.
2014-08-20 14:02:58 +02:00
Markus Goetz
b62b87eed3
OS X: Rename LiferayNativity code for shell icons
2014-08-18 12:57:29 +02:00
Klaas Freitag
14ed261606
MacOverlays: Rather use FileManager API to check if is directory.
2014-08-04 12:03:01 +02:00
Klaas Freitag
aad5c96759
Mac Overlays: No crash on context menu actions.
...
Disable overlay menus for now.
2014-08-04 11:09:16 +02:00
Klaas Freitag
23269c9a08
Mac Overlays: load icons from the proper place in the system.
2014-08-01 15:26:18 +02:00
Klaas Freitag
0a7642dbe0
Mac Package: New shellscript and packages steering file.
2014-08-01 12:19:08 +02:00
Klaas Freitag
68f0227ca1
OverlaysMac: Make use of REGISTER_PATH to learn the synced dirs.
2014-08-01 12:18:52 +02:00
Klaas Freitag
a248fc36fe
Remove user XCode file.
2014-08-01 12:18:52 +02:00
Klaas Freitag
e28a7a7ae3
MacOverlays: Start a 5 seconds timer to try connect if unconn.
...
If mirall is not here, a timer is started to try again later.
2014-08-01 12:18:52 +02:00
Klaas Freitag
b92789825d
MacOverlays: Redraw window if registered pathes are empty.
...
That is the condition after a reconnect to the mirall server.
2014-08-01 12:18:52 +02:00
Klaas Freitag
c3b6aecb79
MacOverlay: Some logging cleanings.
2014-08-01 12:18:52 +02:00
Klaas Freitag
4688126f84
MacOverlays: Export the redraw method of content man.
2014-08-01 12:18:52 +02:00
Klaas Freitag
5a5c03a826
MacOverlays: Registered pathes support.
...
Remember the pathes that come with the first UPDATE_VIEW msg. That
reduces the number of socket communications.
2014-08-01 12:18:52 +02:00
Klaas Freitag
7bef588851
SocketAPI: Try reconnect if socket was not connected.
2014-08-01 10:59:50 +02:00
Klaas Freitag
72a25cf6ee
MacOverlays: Minor cleanups.
2014-08-01 10:59:50 +02:00
Klaas Freitag
74e13f4c70
Use better variable naming.
2014-08-01 10:59:50 +02:00
Klaas Freitag
267b9e5c2f
FinderOverlays: Display the error if socket can not connect.
2014-08-01 10:59:49 +02:00
Klaas Freitag
55d94bf15a
Overlays: Handle Sharing state and display the correct icons.
2014-08-01 10:59:49 +02:00
Klaas Freitag
86acdf69d9
MocOverlays: Handle the UPDATE_VIEW socket notification correctly.
...
With UPDATE_VIEW the plugin gets notified to update the overlays.
It invalidates the entries in the file icon cache for the path
that comes with the UPDATE_VIEW and than refreshes the view.
2014-08-01 10:59:49 +02:00