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
Klaas Freitag
29987ca2aa
Overlays Linux: Add the state to the cache to save calls to add_emblem
...
The SocketAPI sends status updates for files without being asked for.
And in order to not draw the emblem again if it had not changed, the
state is compared before calling add_emblem
2014-09-30 13:57:06 +02:00
Markus Goetz
02f971b534
OS X Overlay Icons: Fix request for sync dir itself
2014-09-30 12:53:35 +02:00
Klaas Freitag
efbc495f79
overlays Nautilus: Adopt to the use a local unix socket not TCP.
...
Also, use the appname to find the correct branded icons.
2014-09-30 11:17:05 +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
788c27bf2f
cmake: Fix installation of overlay icons on linux
2014-09-29 16:08:49 +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
Klaas Freitag
09be4d22ee
Nautilus: Renamed nautilus plugin script to make it branding friendly
2014-09-22 12:24:06 +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
hefee
ddfc7c75df
Fix minor Python styling issues
...
* Do not use sapces inside parenthesis
* make indend PEP8
* empty lines should not contain whitespaces
2014-08-31 00:35:56 +02:00
David Prévot
7618f29657
Fix minor Python syntax errors
...
The installation fails because of these:
TabError: inconsistent use of tabs and spaces in indentation
SyntaxError: Missing parentheses in call to 'print'
2014-08-31 00:28:25 +02:00
Klaas Freitag
4d33773cef
Nautilus Overlays: Rename icons according to branding.
...
Added a script that renames the icons and patches the python file for
nautilus.
2014-08-29 20:02:52 +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
Daniel Molkentin
315c2eb4ca
Windows Shell Integration: Ensure precedence
2014-08-21 11:06:10 +02:00
Klaas Freitag
fef0d0b31c
Overlays Nautilus: Handle UNREGISTER_PATH and do proper reconnect.
...
This is needed to fix #2073
2014-08-20 17:33:48 +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
Daniel Molkentin
d171431ac7
Windows Shell Integration: Add version information
2014-08-19 15:52:58 +02:00
Daniel Molkentin
76e0d61b19
Windows Shell Integration: Register icons with well known name
2014-08-19 15:52:47 +02:00
Daniel Molkentin
cc6d83a953
Windows Shell Integration: Adjust port
2014-08-19 15:51:40 +02:00
Daniel Molkentin
6fbbe2d0e4
Create ShellIconOverlayIdentifiers key
...
It may not exist. Registration fails in that case.
2014-08-18 17:06:26 +02:00
Markus Goetz
b62b87eed3
OS X: Rename LiferayNativity code for shell icons
2014-08-18 12:57:29 +02:00
Klaas Freitag
4aec783362
Nautilus Overlays: Fix: do not change an dictionary which is iterated.
...
Also, item.invalidate_extension_info() is sufficient, no need to call
update_file_info afterwards.
2014-08-15 17:16:47 +02:00
Klaas Freitag
b494181764
Nautilus Overlays: Use port 34001 by default.
2014-08-15 17:16:47 +02:00
Klaas Freitag
f6d20cbe55
nautilus overlay: Fix reconnect, create a new socket everytime.
2014-08-14 11:07:31 +02:00
Klaas Freitag
fcd211b190
overlayNautilus: Better reconnect behaviour if mirall was not running.
2014-08-14 11:07:31 +02:00
Daniel Molkentin
5306cdc7a1
Shell Integration: Fix Integration bug when explorer starts before OCC
...
Also slightly improves performance
2014-08-08 02:40:46 +02:00
Daniel Molkentin
344b98bf13
Shell Integration / MSVC: Fix target platform
2014-08-08 02:40:46 +02:00
Klaas Freitag
2ccfdcb084
NautilusOverlays: return False if sock connection breaks
2014-08-06 09:52:52 +02:00
Daniel Molkentin
4ad9ff4301
Merge remote-tracking branch 'origin/win_overlay_icons'
...
Conflicts:
.gitignore
2014-08-05 19:27:51 +02:00
Daniel Molkentin
c7ff1e9b3f
Windows Shell extension: Add watched directories
2014-08-05 19:23:40 +02:00
Klaas Freitag
f4e2041b0b
CMake: Fix installation of the icons, path corrected.
2014-08-05 11:46:21 +02:00
Klaas Freitag
4e13c882f8
CMake: Install the nautilus plugin.
2014-08-04 18:58:35 +02:00
Klaas Freitag
0fe51d826f
Overlays: renamed icons to sensible names. Also removed .DS_Store
2014-08-04 17:22:34 +02:00
Klaas Freitag
b2976baf9b
NautilusOverlays: Use the correct icon names, removed unused function.
2014-08-04 17:21:49 +02:00
Klaas Freitag
a0a5a49d7b
CMake: Install icons under linux.
2014-08-04 17:20:57 +02:00
Daniel Molkentin
9a1781f613
Support for multiple icons
2014-08-04 15:40:08 +02:00
