Commit graph

4001 commits

Author SHA1 Message Date
Klaas Freitag
dbf02772c3 Fixed tray icon, use theme for this
Fixed folder enable/disable.
2012-03-03 10:51:06 +01:00
Klaas Freitag
1f12f3d181 Next beta version 0.2.2 2012-03-03 10:18:47 +01:00
Klaas Freitag
f494492459 Refresh status dialog after removal of a folder 2012-03-03 10:18:03 +01:00
Klaas Freitag
660abb491d Add install target for owncloud 2012-03-02 15:03:35 +01:00
Klaas Freitag
1fc60f8797 Set version to internal beta version 0.2.1 2012-03-02 11:49:01 +01:00
Klaas Freitag
afe6180a88 Fixed some glitches in CMakeLists.txt for Unix 2012-03-01 16:56:08 +01:00
Klaas Freitag
8c9e364eec Removed moc includes as this is fixed in the build process. 2012-03-01 16:15:29 +01:00
Klaas Freitag
65f80c655c Fixes for inotify includes on win
removed moc include
2012-03-01 16:14:44 +01:00
Klaas Freitag
d1f0578bf8 some changes to get inotify out of win build.
removed moc include.
2012-03-01 16:13:50 +01:00
Klaas Freitag
060b2ddfa5 Use undef instead of numeric define for USE_WATCHER 2012-03-01 16:12:44 +01:00
Klaas Freitag
dd1c947c38 added missing include stdint.h 2012-03-01 16:11:56 +01:00
Klaas Freitag
f892212acf Changes to build for mingw32 properly. 2012-03-01 16:10:08 +01:00
Klaas Freitag
96ac39601c Fixed ignore handling, do not allow hidden files to trigger sync. 2012-02-29 16:25:38 +01:00
Klaas Freitag
1fc19647e5 Added #ifdef USE_WATCHER to switch between INotify and Polling
depending on the platform environment var set by Qt.
2012-02-29 15:25:16 +01:00
Klaas Freitag
f6846a2107 Added local polling to owncloud folder, based on csync. 2012-02-28 16:49:13 +01:00
Klaas Freitag
59b8af2aef removed the INotify initialisation. 2012-02-28 15:14:35 +01:00
Klaas Freitag
e06867f155 disabled a log line 2012-02-28 15:13:59 +01:00
Klaas Freitag
c9597c8fb9 Added a splashscreen. 2012-02-23 11:44:44 +01:00
Klaas Freitag
94481a672a button to add a new sync folder added to status dialog. 2012-02-21 13:26:39 +01:00
Klaas Freitag
267f444dd1 Hide some buttons in status dialog which are currently not needed,
show ownCloud info on status dialog
2012-02-21 12:40:46 +01:00
Klaas Freitag
da482e742b removed all GUI related stuff finally away from the folder class,
last thing were the openActions, which went to the GUI class.
2012-02-21 11:50:19 +01:00
Klaas Freitag
5e08f15aca more elaborated version macros, moved version to theme class 2012-02-21 10:48:18 +01:00
Klaas Freitag
4c655684a0 introduced theming in the status dialog, removed the syncState again
and moved it to the SyncResult object to simplify code, removed
icon code from folders (WIP), removed some unused code.
2012-02-20 16:45:27 +01:00
Klaas Freitag
34f28bb4ad Display status "Sync running" in status dialog correctly. 2012-02-18 21:58:12 +01:00
Klaas Freitag
e63fcdc9f0 simplified the folder change notification to the GUI app: Reduced
to one signal stateChanged(), provided an easy api to get the
new state and last sync result by alias in folderman.
2012-02-18 21:21:58 +01:00
Klaas Freitag
b52f9f534d removed ownCloudDirCheck class and enhanced ownCloudInfo class to take
its functionality. Added defaultConnectionName() and AuthHeader to the
config file class. Fixed folderwizard to create ownCloud folder again.
2012-02-18 17:02:10 +01:00
Klaas Freitag
0001b9088a - WIP ownCloud connect wizard: added a test call to check if the
connect really works, better error checking
2012-02-17 15:54:39 +01:00
Klaas Freitag
ddf062ee14 - set app name correctly in config file class
- fix link to newly  installed ownCloud
2012-02-17 12:16:48 +01:00
Klaas Freitag
d31877a448 - fix config file location
- writing ownCloud config works again
2012-02-17 11:56:27 +01:00
Klaas Freitag
2c6c2625bf WIP:
- split up owncloudsetup class to have a wizard class and a class that
delivers plain config data
- renamed ownCloudSetup -> ownCloudSetupWizard
- added new class MirallConfigFile
- made mirall config file (which currently only contains the owncloud
connection) multi-connection aware
- removed some sitecopy code
- removed fetch- and push slots
- adopted readFolderConfigFromFile to new file format
2012-02-17 11:11:18 +01:00
Klaas Freitag
04841c940d WIP: introduce folder manager to separate folder management from
GUI and ease the Application object
2012-02-17 09:48:31 +01:00
Klaas Freitag
591054ed8f introduced a theming class to build the traditional mirall client
as well as an ownCloud client
2012-02-16 10:42:44 +01:00
Klaas Freitag
07cfc08823 Use a hash to store inotified pathes. 2012-02-15 22:36:52 +01:00
Klaas Freitag
d2f989566d removed sitecopy code from application and fixed url setting bug 2012-02-15 21:45:11 +01:00
dragotin
9da08610ee Merge pull request #3 from dschmidt/master
fix static linking to libmirall/qwebdav
2012-02-15 05:48:13 -08:00
Klaas Freitag
c55f0201fc remove accidentially added sync client and add owncloud folder 2012-02-15 14:44:09 +01:00
Klaas Freitag
0c46382b6b moved CsyncThread class to its own file 2012-02-15 09:30:37 +01:00
Klaas Freitag
ad0be9f6ee - Added info dialog with file listing
- Added overall status display on the tray icon plus tooltip
-> patches from Alvaro Soliverez
2012-01-23 22:10:01 +01:00
Klaas Freitag
128223553c added a windows compatible implementation 2012-01-20 10:21:49 +01:00
Dominik Schmidt
7e988d2e08 win32: fix static linking to libmirall/qwebdav 2012-01-19 14:10:18 +01:00
Klaas Freitag
e168eeae46 more useful user feedback about sync state, patch provided by Alvaro Soliverez 2011-12-29 09:31:45 +01:00
Klaas Freitag
bb2baeb1d2 Two patches sent by Alvaro Soliverez <asoliverez@kde.org>:
- fixed refresh of the folder list in the status dialog
- show enabled status in the status dialog
2011-12-25 21:55:29 +01:00
Klaas Freitag
0c9c2962c2 Enable/Disable button, patch submitted by Alvaro Soliverez 2011-12-12 17:47:30 +01:00
Klaas Freitag
c23c96cdc6 - add exclude patterns to sitecopy config, Patch contributed by Alvaro
Soliverez
2011-12-12 17:26:13 +01:00
Klaas Freitag
a3fa419f82 Bump version 2011-12-05 12:03:16 +01:00
Klaas Freitag
180c06b39e Patch sent in by Alvaro Soliverez: Add a "upload" button to the
Status dialog to solve conflict situations from local -> cloud
2011-12-05 12:01:39 +01:00
Klaas Freitag
bf40e0aafc - added icon defaults for systems without icon theming bnc#730834
- fixed some bugs with ownCloud status check fails
- bumped version to 0.1.2
2011-11-28 14:53:34 +01:00
Klaas Freitag
56a30af52d virtual inheritance not supported, fix compile problem 2011-11-28 13:35:46 +01:00
Klaas Freitag
37d6fb6022 Version string added 2011-11-24 16:38:12 +01:00
Klaas Freitag
cb4c5e31b1 - fix ownCloud sourcepackage download from owncloud.org
- fix installation output in setup dialog
2011-11-24 16:26:24 +01:00
Klaas Freitag
b9ce7d037f - renamed icons to mirall instead of ownCloud
- install of desktop file icon added
2011-11-22 18:31:44 +01:00
Klaas Freitag
782cda05dc Merge branch 'master' of github.com:dragotin/mirall 2011-11-07 17:09:18 +01:00
Klaas Freitag
b7ca0ef36a Added install target, thanks to Dominik Schmidt <dev@dominik-schmidt.de> for the patch 2011-11-07 17:09:02 +01:00
Klaas Freitag
cd4528324c error handling: sitecopy not installed 2011-11-04 11:41:49 +01:00
Klaas Freitag
869152424c Polished the ui, stop syncing during user actions. 2011-11-03 16:06:40 +01:00
Klaas Freitag
b7f5b8c2d8 Fix authentication loop if ownCloud does not accept the basic auth header 2011-11-02 15:07:34 +01:00
Klaas Freitag
e660fe25b1 Use the new owncloud-admin version 2011-11-02 14:44:53 +01:00
Klaas Freitag
aa8ba76e3c deleted unused files 2011-10-26 14:00:28 +02:00
Klaas Freitag
4c002a127f added webdav support utilizing qtwebdav-qnetworkmanager 2011-10-26 13:59:06 +02:00
Klaas Freitag
de8d7bb87c Added open ownCloud button to status dialog 2011-10-20 11:48:41 +02:00
Klaas Freitag
267d74b381 More polish and bugfixing 2011-10-20 10:26:40 +02:00
Klaas Freitag
71873df369 Use icons depending on the backend 2011-10-19 13:10:43 +02:00
Klaas Freitag
9c27edc6b6 - polished the folder wizard
- bugfixes
- added user warnings if remote root dir is picked.
2011-10-19 11:53:12 +02:00
Klaas Freitag
9d3a0e8596 Implemented folder fetching. 2011-10-18 10:22:24 +02:00
Klaas Freitag
90f722e2da - fix alias bug in folderwizard
- call restart before showing folderwizard
- ask for admin credentials for ftp install
2011-10-14 18:13:34 +02:00
Klaas Freitag
95eadf2cb9 some more smaller fixes 2011-10-14 16:39:53 +02:00
Klaas Freitag
4911a528c4 Error publishing in the status dialog 2011-10-13 16:41:24 +02:00
Klaas Freitag
a2c564306f Enable secure connection via sitecopy 2011-10-13 13:58:46 +02:00
Klaas Freitag
cb359ba89d removal of folders added 2011-10-13 13:55:52 +02:00
Klaas Freitag
ced69489a5 WIP status dialog 2011-10-12 16:58:54 +02:00
Klaas Freitag
c4b24ab952 Show warning on wrong remote folder 2011-10-12 15:14:39 +02:00
Klaas Freitag
91b12c7eb3 Show a warning text in folder wizard 2011-10-11 15:39:25 +02:00
Klaas Freitag
91bf272c9b Don't allow to pick local directories or aliases twice. 2011-10-11 14:23:32 +02:00
Klaas Freitag
ecc3a9edd5 remote folder check for oC finished 2011-10-07 16:01:58 +02:00
Klaas Freitag
f4c5b9adbb added check for the owncloud folder - WIP 2011-10-06 16:55:28 +02:00
Klaas Freitag
f3123b6c02 - simplified the folder wizard
- live check of the ownCloud connect
2011-10-06 10:54:54 +02:00
Klaas Freitag
60c304667f added online check 2011-10-05 17:49:03 +02:00
Klaas Freitag
2dec870eaa Use nice empty icon 2011-10-05 15:56:56 +02:00
Klaas Freitag
f582c19c67 - fixed some Ownclouds -> ownCloud
- start wizard if mirall config missing
2011-10-05 15:48:30 +02:00
Klaas Freitag
e0f8499484 Setup of local folder with initial sync 2011-10-05 12:11:10 +02:00
Klaas Freitag
5a42aa3028 Added some gpl headers to sourcefiles 2011-09-30 17:42:28 +02:00
Klaas Freitag
c9de9810e2 Fix url parameter, add http 2011-09-30 15:35:19 +02:00
Klaas Freitag
35aee0de00 Create the local sync folder successfully 2011-09-30 14:19:26 +02:00
Klaas Freitag
7452f1956e Added owncloud credentials page 2011-09-30 12:51:56 +02:00
Klaas Freitag
3f860709bc fix slash mixmax in url assembling for remote key in sitecopyrc 2011-09-30 12:04:17 +02:00
İsmail Dönmez
682325f977 Reparse configuration files when folders added/removed 2011-09-30 11:49:19 +02:00
İsmail Dönmez
37c6276197 Merge branch 'master' of git://github.com/dragotin/mirall 2011-09-30 11:46:56 +02:00
Klaas Freitag
96eaeb2c62 read oc url from config file. 2011-09-30 10:24:01 +02:00
Klaas Freitag
9043e69d27 - write mirall config file
- check on valid parameters in owncloud wizard.
2011-09-29 19:05:49 +02:00
Klaas Freitag
b7c7b8a566 - handle empty password in .sitecopyrc.
- check for the owncloud admin script and warn if its not there.
2011-09-29 17:17:50 +02:00
Klaas Freitag
e8dcfe4a3c Installation of local computer and ftp based works. 2011-09-29 16:36:27 +02:00
Klaas Freitag
68b966256e WIP: OC installation wizard integration 2011-09-28 18:14:48 +02:00
İsmail Dönmez
20bed61446 Fix typo 2011-09-28 12:14:14 +02:00
Klaas Freitag
292965c6a3 Wizard for owncloud configuration 2011-09-27 19:10:01 +02:00
Klaas Freitag
ace9e9d690 Error counting added 2011-09-27 08:15:30 +02:00
Klaas Freitag
defda477c4 status dialog work 2011-09-26 21:46:26 +02:00
Klaas Freitag
b3eecf54a5 improved error handling 2011-09-26 18:19:01 +02:00
Klaas Freitag
0000caa632 - various code cleanups
- fix alias usage in sitecopy config file
2011-09-26 16:20:53 +02:00
Klaas Freitag
627a2691ad Statusdialog added 2011-09-26 15:00:12 +02:00
Klaas Freitag
83613f4576 Add a sitecopy backend to mirall, some GUI cleanups 2011-09-26 13:12:00 +02:00
Duncan Mac-Vicar P
87ac6cae2b add support for the conflict copy feature available on csync git 2011-09-13 14:18:47 +02:00
Duncan Mac-Vicar P
9569ff1dc6 link Qt to the static library 2011-04-08 12:03:09 +02:00
Duncan Mac-Vicar P
67b6e77979 handle errors to the UI 2011-04-08 11:36:53 +02:00
Duncan Mac-Vicar P
b0efc506cd increase poll timer to 1 minute 2011-04-08 10:51:18 +02:00
Duncan Mac-Vicar P
d1ee08d442 add a mutex for the csync threads 2011-04-08 10:49:28 +02:00
Duncan Mac-Vicar P
0ba4fac32f for csync, accept smb:// urls as well 2011-04-08 10:49:26 +02:00
Duncan Mac-Vicar P
58270990ed force the initial sync even if the list is empty as this point 2011-04-08 10:48:22 +02:00
Duncan Mac-Vicar P
0aa5f51bb5 Use csync as default 2011-04-08 09:58:16 +02:00
Duncan Mac-Vicar P
3ce5932bbd g
Basic implementation of a CSyncFolder

Still waiting for Jann's patches for conflictcopy to hit a stable
release to make it the default.
2011-04-07 19:04:07 +02:00
Duncan Mac-Vicar P
83eeeb4216 Simplify how the event queue works. Now it is just a timer
that gets restarted on every new event, and the processing starts
when no events reset the timer for the event interval.
2011-04-06 22:35:08 +02:00
Duncan Mac-Vicar P
a4c5996f47 Make the folders network state aware 2011-04-06 15:57:18 +02:00
Duncan Mac-Vicar P
65c41b6368 add simple network location infrastructure 2011-04-06 15:22:40 +02:00
Duncan Mac-Vicar P
f882fe46e2 Use icons from theme. Qt already handles this in a nice way 2011-04-06 12:09:56 +02:00
Duncan Mac-Vicar P
2411b0c9b7 add proper licensing 2011-04-06 11:48:02 +02:00
Duncan Mac-Vicar P
493b6924c9 Setup the menu for new added folders 2011-04-06 10:56:20 +02:00
Duncan Mac-Vicar P
ab86052f8a typo, it is path() not root() 2011-04-06 10:56:16 +02:00
Duncan Mac-Vicar P
79f28c7f10 stop poll timer when syncing, and add path to the debug messages 2011-04-06 10:40:15 +02:00
Duncan Mac-Vicar P
c19c9859e3 add alias to folder 2011-04-06 09:52:02 +02:00
Duncan Mac-Vicar P
c16fd94150 Fix crash at shutdown.
Menu contains actions from the folders so we should
first delete the tray and the folders later.

Also change QHash in inotify watcher map to QMap as QHash
gives weird crashes with the inotify thread.
2011-04-05 18:31:19 +02:00
Duncan Mac-Vicar P
f1d6352f27 working folder wizard, only actual creation of the folder pending 2011-04-05 18:31:14 +02:00
Duncan Mac-Vicar P
9055cdc60d move polling system to Folder where it belongs 2011-04-05 12:16:24 +02:00
Duncan Mac-Vicar P
e721acd7e8 add folder wizard class 2011-04-05 11:10:44 +02:00
Duncan Mac-Vicar P
4e45cab2c1 - lot of stability improvements
- the crash with threads goes away by using QMap
- add a polling timer
2011-04-04 18:41:14 +02:00
Duncan Mac-Vicar P
389507d92f Change icon when sync is running 2011-04-04 12:23:30 +02:00
Duncan Mac-Vicar P
5aa1e08558 unused member variable 2011-04-04 11:40:14 +02:00
Duncan Mac-Vicar P
8d5a760d91 implemented dynamic creation of folder configurations
from INI files in user's home directory
2011-04-04 11:36:44 +02:00
Duncan Mac-Vicar P
3f32499c4e If the first event happens before 5 secs after starting the
program, it will always cause it to queue it to avoid event
flood (5 secs). So don't init the QTime for last event, and then
check if it is null.
2011-03-31 19:07:45 +02:00
Duncan Mac-Vicar P
7bac43c5c3 I missunderstood how mkdtemp worked. Allocate a buffer duplicating
the template. Then free this buffer.
2011-03-31 19:06:30 +02:00
Duncan Mac-Vicar P
f917dbc2ad - Use a full sync (without -path) the first time
unison is invoked
- disable -confirmbigdel
2011-03-31 08:19:04 +02:00
Duncan Mac-Vicar P
9d09b7ea5f show only a summary of subdirectories 2011-03-29 22:23:42 +02:00
Duncan Mac-Vicar P
1b19507ca8 * Missing brackets changed all logic around an 'if'
* Improve debug output
2011-03-28 11:54:10 +02:00
Duncan Mac-Vicar P
15579232f7 refactor the notification timer in a new method
some debug messages cleanup
2011-03-27 23:29:45 +02:00
Duncan Mac-Vicar P
6b8589f4dc When syncing, disable event notifier and start accumulating them
until the sync is done. When they are enabled again, a forced
event is scheduled to empty the queue.
2011-03-27 01:26:41 +01:00
Duncan Mac-Vicar P
64e4d531b3 sync process now runs, but no synchronization between sync processes 2011-03-25 18:25:56 +01:00
Duncan Mac-Vicar P
f31ddde36d Merge branch 'fix_inotify'
Conflicts:
	src/mirall/folder.cpp
	src/mirall/folder.h
2011-03-22 23:21:56 +01:00
Duncan Mac-Vicar P
d885fe39f8 Implement an event queue:
- If FolderWatcher receives a inotify event in less than 5
  seconds from the last one, then the paths are queued and a timer
  is setup for 5 seconds more. New events are queued if a timer
  is running. The next event after the time gap is due will process
  the full path list
2011-03-22 23:03:43 +01:00
Duncan Mac-Vicar P
f42169a8fc The unison folder class.
May be factor it out in a external process tool folder type later.
2011-03-21 00:58:53 +01:00
Duncan Mac-Vicar P
25685de4fd move the subfolder list function to FileUtils 2011-03-20 22:43:03 +01:00
Duncan Mac-Vicar P
89361db55d Only fire folderChanged if > 2 seconds since last event 2011-03-20 22:38:33 +01:00
Duncan Mac-Vicar P
d53490c67c add accessor for root folder 2011-03-20 22:18:38 +01:00
Duncan Mac-Vicar P
3bb5869183 add some documentation 2011-03-20 22:17:23 +01:00
Duncan Mac-Vicar P
ad90a6c05e Make the socket read loop more robust, and handle the EINVAL when
the read buffer is too small.
2011-03-20 22:13:40 +01:00
Duncan Mac-Vicar P
8b5c371012 - listen to the right events
- rename inotify signal
- pass also the cookie
2011-03-19 21:18:43 +01:00
Duncan Mac-Vicar P
bd5effe78c - fix inotify/folderwatcher so that it uses full paths
- make the test pass using QSignalSpy
2011-03-18 13:54:32 +01:00
Duncan Mac-Vicar P
e6a135273d - introduce a tmp dir class and rm-rf util function
- start a testcase for the folder watcher part
2011-03-18 01:14:45 +01:00
Duncan Mac-Vicar P
03194d3aae Make the inotify interface work with multiple paths 2011-03-17 07:13:30 +01:00
Duncan Mac-Vicar P
5294bee2bf Infrastructure for inotify. To replace QFileSystemWatcher, which, due
to a Qt bug, can't see modified files.
See http://qt.gitorious.org/qt/qt/merge_requests/2301
2011-03-16 14:53:41 +01:00
Duncan Mac-Vicar P
e2638aa487 react to its own signals to set the icons 2011-02-17 15:10:06 +01:00
Duncan Mac-Vicar P
0af772f524 fix defines 2011-02-17 15:10:03 +01:00
Duncan Mac-Vicar P
cf88820069 rename action to openAction to add also forgetAction and others later 2011-02-17 11:27:05 +01:00
Duncan Mac-Vicar P
b7a3fc7ab8 first port to C++ 2011-02-17 00:21:45 +01:00