1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-25 10:42:46 +01:00
Commit Graph

6388 Commits

Author SHA1 Message Date
Daniel Molkentin
6e1deab0ae Supplemental: less hardcoded uses of "ownCloud" 2012-09-26 17:01:33 +02:00
Daniel Molkentin
5df5d55fa4 Make code more readable 2012-09-26 17:01:25 +02:00
Daniel Molkentin
991a04abc5 remove arguments from ownCloudInfo ctor
its only caller is the singletons instance() method
2012-09-26 16:59:53 +02:00
Daniel Molkentin
261731c841 Consistency fixes for single folder mode 2012-09-26 16:59:47 +02:00
Daniel Molkentin
1b0744dac6 icon improvements
- more sizes
- rename state icons due to a cmake limitation
  (it globs owncloud-icon-* for mac and windows icons,
   which causes the state icons to appear as app icons)
- adjust resourcefile and theme accordingly
2012-09-25 17:14:21 +02:00
Daniel Molkentin
bcf9bb8238 Reuse Theme singleton 2012-09-24 19:42:48 +02:00
Daniel Molkentin
bc08f81683 More use of appName() in tr()'s. 2012-09-24 19:21:55 +02:00
Daniel Molkentin
e3a9081181 Fix default implementation of Folder::nativeSecondPath(). 2012-09-24 19:20:16 +02:00
Daniel Molkentin
2de9cc9590 Use the themes appName() instead of "ownCloud".
This turns the Theme class into a singleton.
2012-09-24 17:57:20 +02:00
Daniel Molkentin
d0a66b70f4 Defer handling of pretty remote path to subclasses.
The base class cannot reasonably assume anything about
pretty printing. The subclasses know a lot better.
2012-09-21 18:33:11 +02:00
Daniel Molkentin
663a1886e9 CMake: Centralize all application-specific parameters. 2012-09-20 17:31:18 +02:00
Klaas Freitag
dd5d407198 Fix activation of list entries in status dialog (thanks kyle-f). 2012-09-20 18:14:22 +03:00
Daniel Molkentin
aa34331489 Remove unused declaration. 2012-09-20 11:12:52 +02:00
Daniel Molkentin
50166424c8 Fix crash on exit on X11. 2012-09-20 11:12:52 +02:00
Klaas Freitag
8f40b2a276 Use delete[] to free mem from qstrdup, thanks valgrind. 2012-09-19 13:51:27 +03:00
Klaas Freitag
d195ad3072 Fix ownCloud icon and a layout issue. 2012-09-19 13:31:42 +03:00
Klaas Freitag
75554a2ed6 Removed hackish beta version marker in status dialog. 2012-09-19 13:02:28 +03:00
Klaas Freitag
45d224e922 Handle the themed singleSyncFolder-mode correctly. 2012-09-19 12:58:34 +03:00
Klaas Freitag
09d8fb9483 Add a theme switch to only allow a single sync folder for the client. 2012-09-19 12:58:02 +03:00
Klaas Freitag
a526035273 Add a method to set the enabled status of the buttons correctly. 2012-09-19 12:57:12 +03:00
Klaas Freitag
090bdcab68 Use the THEME_CLASS macro in config file class. 2012-09-18 13:55:58 +03:00
Klaas Freitag
29f3a002c4 Merge branch 'master' of github.com:owncloud/mirall 2012-09-18 13:53:42 +03:00
Klaas Freitag
a9c7b9304e Use a macro THEME_CLASS from CMakeLists.txt instead of ifdefs. 2012-09-18 13:52:52 +03:00
Daniel Molkentin
aab1c94e44 Simplify version display.
Reduces amount of required helper macros.
2012-09-17 21:23:56 +02:00
Daniel Molkentin
6d13b1b2fb Added a simple about dialog. 2012-09-17 21:06:20 +02:00
Daniel Molkentin
ff4a119c0c Don't swallow ':' when entered.
Treat entering 'http(s)://' gracefully by
removing the substring and flipping the
checkbox.
2012-09-17 19:23:53 +02:00
Kyle Fazzari
4dbd8ee016 Forgot to comform to ownCloud coding standards. Fixed. 2012-09-13 22:51:47 -04:00
Kyle Fazzari
2652a744d0 Damino requested that QUrl be used to parse the URL, along with toString(QUrl::RemoveScheme). QUrl::RemoveScheme doesn't remove the slashes, so extra code was thrown in to ensure they were removed if they were present. 2012-09-13 22:47:39 -04:00
Kyle Fazzari
7f6d39383e Found a much slicker solution to the problem of the OC URL
containing the protocol when the back button is used. Instead
of moving to two separate URL fields, a slot was created and
connected to the textChanged signal of the OCUrl LineEdit.
This slot simply ensures the protocol is not present.
2012-09-11 18:56:32 -04:00
Sebastian Kügler
591b71cf18 Return QNetworkReply from remote mkdir
This patch allows the client implementation to react to specific results
of mkdir requests

I need this patch to be able to catch errors from creating remote
folders.
2012-09-11 05:26:07 +02:00
Sebastian Kügler
76e9687d6f Return QNetworkReply from getRequests
This patch allows the client implementation to react to specific
getRequests, such as folder checks, etc. It allows to connect
client-specific slots to requests, catch its errors and handle them
separately.

I need this patch to be able to check more than one remote folder on the
server, and not mix up their job's signal handling.
2012-09-11 03:35:32 +02:00
Kyle Fazzari
a426c4ea37 * Fixed bug where the if one enters the owncloud URL on the setup page of the initial wizard, continued, and then hit the back button on the Install page, the protocol was included in the URL. 2012-09-10 20:50:51 -04:00
Sebastian Kügler
c24728b692 Move SslErrorDialog into Application
This patch makes it possible to cut out a large piece from the lib. We
want to avoid having GUI code in the daemon. For Mirall, this is now
handled in Application. for other clients, they can do whatever they
want with this signal, and implement their own SSL Error handling.

The patch isn't exactly a beauty queen, since it involves some
back-and-forth between application and owncloudinfo objects, but it
seems the only way to properly separate and abstract the UI out of
owncloudinfo, and cuts down a huge part of the dependency chain,
especially QWidget-based classes.

I haven't been able to properly test this, but if anyone can give me a
login to a server that has wrong or untrusted SSL certificates, I'll
happily do it.

Merge? *puppy eyes*
2012-09-10 23:53:49 +02:00
Klaas Freitag
7701805dc4 Add a warning window for/against usage of old server versions. 2012-08-30 18:52:50 +03:00
Klaas Freitag
824bd1e087 Fix memory allocation for proxy struct in thread. 2012-08-30 18:50:42 +03:00
Klaas Freitag
f78f3e0869 Set beta tag to application version. Not a pretty solution. 2012-08-30 18:48:32 +03:00
Klaas Freitag
094d563dbb Set sslCertsTrust to defined value at start. 2012-08-30 14:02:42 +03:00
Klaas Freitag
cb6b3e1d85 Setup connections to ocinfo when needed. 2012-08-30 14:02:15 +03:00
Klaas Freitag
72e14b3688 Use the remote.php/webdav url rather than files/webdav.php 2012-08-30 13:23:14 +03:00
Klaas Freitag
a723a968ba allow custom media at relative path for windows. 2012-08-27 19:09:56 +03:00
Klaas Freitag
f4bb981ad4 add application path back to translation laoding. 2012-08-27 18:59:31 +03:00
Klaas Freitag
ced6f0ed96 Fix compile problem. 2012-08-26 16:10:17 +02:00
Klaas Freitag
fd7cb38c16 Use qthread more correct, see
http://labs.qt.nokia.com/2006/12/04/threading-without-the-headache/
2012-08-26 11:47:45 +02:00
Klaas Freitag
a459f468a3 Use PlainTextEdit widget for more efficient log file display. 2012-08-26 11:46:59 +02:00
Klaas Freitag
5294f446a2 Merge branch 'master' of gitorious.org:owncloud/mirall
Conflicts:
	src/mirall/owncloudinfo.cpp
	src/mirall/owncloudsetupwizard.cpp
	src/mirall/owncloudwizard.cpp
2012-08-24 11:16:58 +02:00
Klaas Freitag
d733aac0e8 Fix QLatin1String issues. 2012-08-17 18:13:17 +03:00
Klaas Freitag
a8296a6b6e Removed unneeded win32 headers. 2012-08-17 18:00:03 +03:00
Klaas Freitag
094f791400 Removed unused file temporarydir. 2012-08-17 17:55:15 +03:00
Klaas Freitag
58d75e7bfe Show pathes in platform specific notation 2012-08-15 18:16:44 +03:00
Klaas Freitag
1b7ad22e2e Fix setup dialog: Use https if checkbox is activated. 2012-08-14 13:23:06 +03:00
Klaas Freitag
74c6c4e7c9 cleanups and improved error messaging on proxy problems. 2012-08-09 15:13:20 +03:00
Klaas Freitag
9e30fe4ea5 Do not stop syncing if local directories are write protected. 2012-08-09 12:12:54 +03:00
Klaas Freitag
d743f7f4b3 Fixed and cleaned redirect bug, make sync work again. 2012-08-08 23:11:07 +03:00
Klaas Freitag
8117b9802b Connect ocInfo only if needed in ownCloud setup wizard. 2012-08-08 16:52:12 +03:00
Klaas Freitag
08d925a8fa read proxy setting from cfg file rather than from Qt proxy object. 2012-08-08 16:48:21 +03:00
Klaas Freitag
58ca49c8bd QLatin1String fix. 2012-08-08 16:47:56 +03:00
Klaas Freitag
aeb0499833 read proxy settings from config file rather than from Qt proxy obj. 2012-08-08 16:47:25 +03:00
Klaas Freitag
80f2699c80 handle proxy port correctly. 2012-08-06 17:44:23 +03:00
Klaas Freitag
70838442c9 Fixed error handling on remote dir create. 2012-08-06 17:43:24 +03:00
Klaas Freitag
d694525d8f Simplify loading of the exclude file on various platforms. 2012-08-06 16:13:35 +03:00
Klaas Freitag
c916f5cbd9 connect owncloudinfo signals more selective. 2012-08-06 15:00:22 +03:00
Klaas Freitag
83bda2c8d5 handle HTTP status 301 -> redirect. 2012-08-06 14:59:59 +03:00
Klaas Freitag
a00086759e connect the owncloudinfo signals more selective. 2012-08-06 14:59:18 +03:00
Klaas Freitag
4b869cfb10 do not write CA Certs on its own, use methods in mirallconfigfile. 2012-08-06 14:58:24 +03:00
Klaas Freitag
f5717348f8 QLatin1String fix 2012-08-06 14:58:11 +03:00
Klaas Freitag
4cad29331f - set ownCloudUrl and known CA Certs. 2012-08-06 14:57:26 +03:00
Klaas Freitag
84a588ccf0 Fix signal connection and initialize the dialog pointer to zero. 2012-08-06 11:13:26 +03:00
Klaas Freitag
2c2fe38ad0 Fix app name back to "ownCloud" to load existing configs again. 2012-08-03 15:03:57 +03:00
Klaas Freitag
bdb35f508a QLatin1String fixes all over. 2012-08-02 12:17:24 +03:00
Klaas Freitag
35e92030f8 Fix size of dialog. 2012-08-02 12:16:18 +03:00
Klaas Freitag
9fe003df78 Restructured the tray context menu. 2012-08-02 12:15:57 +03:00
Klaas Freitag
ba856bf2d4 Fix proper placeholding patches in oC connection wizard. 2012-08-02 12:11:02 +03:00
Klaas Freitag
d867cfacb4 Some translation changes. 2012-08-02 12:09:37 +03:00
Klaas Freitag
eecb444772 Replace some delete calls with QObject parenting. 2012-08-02 12:08:27 +03:00
Klaas Freitag
42283e4684 Some code cleanups for the proxy dialog. 2012-08-02 12:07:14 +03:00
Klaas Freitag
343f646660 Fix load self signed certs into NetworkManager (#oc-843) 2012-08-02 12:02:46 +03:00
Klaas Freitag
d3bb223898 Proceed proxy settings to csync thread. 2012-08-02 11:17:15 +03:00
Daniel Molkentin
62d1f281c3 Fix SSL support in ownCloud wizard
- honor secure connect option
- fix connects in ctor of singleton
- don't crash
2012-08-01 18:33:19 +02:00
Thomas Mueller
eb2d93de38 read proxy settings from config on dialog startup 2012-07-31 11:03:52 +02:00
Thomas Mueller
e4da16b9d6 support Qt 4.6 2012-07-31 10:43:38 +02:00
Klaas Freitag
5bde3262d6 Merge branch 'master' of gitorious.org:owncloud/mirall 2012-07-31 11:18:43 +03:00
Klaas Freitag
bfb99d2078 Qt part of proxy support - contributed by Thomas Mueller. 2012-07-31 11:17:52 +03:00
Dominik Schmidt
8fef939a1a Extend wizard raising hack to OS X. 2012-07-31 01:57:02 +02:00
Klaas Freitag
5275238f51 Added 3rdpart QtSingleApplication class. Fixed some overall-status
issues.
2012-07-30 17:10:48 +03:00
Klaas Freitag
ae847e46e7 Added support method statusToString 2012-07-30 17:09:49 +03:00
Klaas Freitag
1ff94e86bd Fix build with UNICODE under windows, fix USE_INOTIFY initialization. 2012-07-30 17:08:42 +03:00
Klaas Freitag
90c4e422d8 Merge commit 'refs/merge-requests/7' of git://gitorious.org/owncloud/mirall into merge-requests/7 2012-07-26 11:45:30 +03:00
Klaas Freitag
0112bb1e05 Merge branch 'master' of gitorious.org:owncloud/mirall 2012-07-26 11:40:06 +03:00
Klaas Freitag
b7993a43fd Removed Log Window Button 2012-07-26 11:38:14 +03:00
Klaas Freitag
b2580b4b0e Merge branch 'master' of gitorious.org:owncloud/mirall 2012-07-26 10:16:59 +02:00
Klaas Freitag
e3f83f4bda converted ownCloudInfo to Singleton pattern to fix crashes. 2012-07-26 10:16:18 +02:00
Klaas Freitag
66d70c0835 More custom media for the connect dialog. 2012-07-26 11:01:43 +03:00
Klaas Freitag
0c89dd9555 Store GUI customizations at system place. 2012-07-25 18:47:31 +03:00
Klaas Freitag
64e83cb287 Added a new setup page in the ownCloud connection wizard. Also added
the ability for custom images and text in  the setup assistant.
2012-07-25 17:51:29 +03:00
Klaas Freitag
37359969e4 Fix for bug #oc-1318, crash through accessing zero pointer. 2012-07-25 16:00:18 +03:00
Klaas Freitag
4ef948bf3c Use a better inotify implementation and use config.h. Fixes oCB #713. 2012-07-20 17:13:23 +02:00
Klaas Freitag
4b33997678 Check the system for inotify in cmake and use a config.h file. 2012-07-20 17:12:29 +02:00
Klaas Freitag
2433b35727 Merge branch 'mirall-kde' 2012-07-20 11:56:50 +02:00
Klaas Freitag
75835c45a3 emit folderChange after initial setup. 2012-07-20 11:37:54 +02:00
Klaas Freitag
d225dd124b Fixed icon setup. Theme now really supports icons in various sizes. 2012-07-18 17:29:06 +02:00
Klaas Freitag
3244a922e3 fixed overall sync state calculation for tray . 2012-07-18 17:28:30 +02:00
Dominik Schmidt
d7fb6fa749 Fix installation on all platforms + bundle on osx 2012-07-17 15:16:02 +02:00
Michael Georg Hansen
9c64b5e753 Add a clear button to the log window. 2012-07-16 21:11:19 +02:00
Klaas Freitag
c3c8e512c8 Fix library build for windows, un-QOBJECTed the theme class. 2012-07-12 14:33:58 +02:00
Klaas Freitag
973c2c1786 remove the push atomar method call for csync. 2012-07-10 16:21:51 +02:00
Klaas Freitag
324a9d2480 Isolate a library to add a dbus interface around. 2012-07-10 15:59:06 +02:00
Klaas Freitag
dd4f76c5c7 replace URL by Link in user string 2012-07-02 11:03:41 +02:00
Klaas Freitag
40a3b1e4e8 Use absolute path function for directory comparison 2012-06-26 12:27:50 +02:00
Klaas Freitag
c8ac719752 Remove csync db in case the local path gets removed. 2012-06-25 15:31:13 +02:00
Klaas Freitag
928ef731c9 Better protection against remote folder delete. 2012-06-25 14:18:13 +02:00
Klaas Freitag
0e418b2f68 Fix a missing delete. 2012-06-22 15:36:04 +02:00
Klaas Freitag
6ad89d98a9 - Add csync push atomar switch
- Fix a wording if the directory does not exist.
2012-06-22 15:35:22 +02:00
Klaas Freitag
34cf97a827 Also clear error list in folders for the inotify case. 2012-06-20 12:52:21 +02:00
Klaas Freitag
bccb17ce41 Clear error list on start of non local sync. 2012-06-20 12:50:46 +02:00
Klaas Freitag
5e2729ddef Fix a typo in ssl dialog 2012-06-18 18:27:06 +02:00
Klaas Freitag
5d0aada871 Fix translations loading under win32 2012-06-18 17:45:04 +02:00
Klaas Freitag
689ef1254b MacOS: Move translations to the right place 2012-06-18 15:52:56 +02:00
Klaas Freitag
cb99ccf75d Load translations correctly. 2012-06-18 15:50:17 +02:00
Klaas Freitag
5ca9d5b915 Install i18n files in MacOS installer 2012-06-18 15:18:08 +02:00
Klaas Freitag
8384fe477a Simplified LogBrowser 2012-06-18 14:51:49 +02:00
Klaas Freitag
8fe20369af Some more usefull debug output 2012-06-18 10:42:30 +02:00
Klaas Freitag
9901d3a736 Added --help option with output 2012-06-15 13:36:38 +02:00
Klaas Freitag
c90eb1cca6 Log to file added, with flush option 2012-06-15 13:04:23 +02:00
Klaas Freitag
4d1fed3d00 Rejecting the SSL dialog means untrusting. 2012-06-15 11:18:16 +02:00
Klaas Freitag
4807c355e5 Fixed wording in setup assistant 2012-06-15 10:58:15 +02:00
Klaas Freitag
ce50043524 Improved some grammar based on Matts proposals. 2012-06-15 10:51:51 +02:00
Klaas Freitag
36ad4fdc83 More encoding fixes to make win32 with special chars work. 2012-06-13 17:34:20 +02:00
Klaas Freitag
a39fb310e1 use UTF-8 encoding in the settings file. 2012-06-13 17:33:48 +02:00
Klaas Freitag
d5d0c472ed store the custom config for each reply object. 2012-06-13 11:37:20 +02:00
Klaas Freitag
f0bae07a2c make ssldialog aware of custom configs. 2012-06-13 11:36:56 +02:00
Klaas Freitag
5953d36297 Fixed removeAllFolders: Terminate running syncs before removal. 2012-06-13 11:30:26 +02:00
Klaas Freitag
2dcbb54095 Use UTF8 to read password and username rather than local8bit. 2012-06-13 11:29:38 +02:00
Klaas Freitag
6d8956f68a Make setup wizard really cancel if user clicks cancel and accept
only if the user finally accepts the dialog.
Remove all sync folder definitions if a new oC connection was done.
2012-06-12 12:30:05 +02:00
Klaas Freitag
f219b0613c Added method to drop all sync folder definitions. 2012-06-12 12:29:39 +02:00
Klaas Freitag
d55900561b only restart folderman if the setup wizard was closed with accept. 2012-06-12 12:28:58 +02:00
Klaas Freitag
e82681c47f Added ability to work with the custom config file. 2012-06-12 12:28:07 +02:00
Klaas Freitag
408b44913e Added ability to work with a custom config file different from the
master one to test temporar connections in the setup wizard.
2012-06-12 12:27:02 +02:00
Klaas Freitag
1af154fc96 Merge branch 'extlogging' 2012-06-11 10:14:52 +02:00
Klaas Freitag
06b3a50e84 Wipe the csync statedb after a sync definition is removed. 2012-06-11 10:10:07 +02:00
Georg Ehrke
469a7a997c fix spelling of password 2012-06-10 21:27:31 +02:00
Klaas Freitag
8b38131b4b Provide proper return value for getauth 2012-06-05 18:37:48 +02:00
Klaas Freitag
c0cf575ada Fix csync log encoding 2012-06-05 16:30:55 +02:00
Klaas Freitag
9d0a8d35d8 - created setupLogBrowser method in application
- removed unused config variable code
2012-06-05 15:49:53 +02:00
Klaas Freitag
926f7ce4a5 Added a window for log output.
Added log handlers for both the cmake logging and the mirall logging.
Push all logging to a log window with the ability to save to a file.
2012-06-05 15:11:29 +02:00
Klaas Freitag
59f821f728 Make krazy2 build target optional if krazy is installed. 2012-06-04 16:44:49 +02:00
Klaas Freitag
3052506d31 Read poll timer settings from config file. 2012-05-26 14:37:21 +02:00
Klaas Freitag
dc7c6d1913 Fix win32 build again. 2012-05-26 13:25:05 +02:00
Dominik Schmidt
b7b617ac28 Add krazy target 2012-05-21 18:12:25 +02:00
Klaas Freitag
6f7165f9f0 A lot of krazy2 (codechecker) fixes. 2012-05-21 16:48:49 +02:00
Klaas Freitag
6cf6e1dcba fix exclude.lst reading on MacOSX 2012-05-16 15:13:51 +02:00
Klaas Freitag
be7a1ca111 Find exclude.lst under MacOS 2012-05-16 14:55:19 +02:00
Klaas Freitag
0fdc3cb205 Add system info to updatedetector on Linux. 2012-05-16 11:56:05 +02:00
Klaas Freitag
d2adecbaac Fix QDesktopServices::openURL for Win32, Qt bug. 2012-05-16 11:54:14 +02:00
Klaas Freitag
bbef2ef30e Fix open the local folder action on Win32, workarounded a Qt bug. 2012-05-16 11:42:47 +02:00
Klaas Freitag
f9b060fe82 Added open ownCloud action to tray menu 2012-05-15 18:29:12 +02:00
Klaas Freitag
8510d1fc32 Use pause and resume instead of enable and disable 2012-05-15 18:03:53 +02:00
Klaas Freitag
0527f997c0 Push status window to front if you click on tray icon. 2012-05-15 17:52:30 +02:00
Klaas Freitag
c475fb644b Merge branch 'master' of gitorious.org:owncloud/mirall 2012-05-15 08:20:30 +02:00
Klaas Freitag
7690734052 Enhanced version parsing from status.php 2012-05-14 16:22:30 +02:00
Klaas Freitag
f2888274f9 simplified url assembly for folderman. 2012-05-14 16:18:08 +02:00
Klaas Freitag
5a443bde70 Fix tray tooltip again 2012-05-14 13:23:04 +02:00
Klaas Freitag
f913790f29 Fix try message for disabled folders. 2012-05-14 11:51:47 +02:00
Klaas Freitag
64e94708df If a sync folder is removed, terminate if its currently running. 2012-05-14 11:09:01 +02:00
Klaas Freitag
f7e5f021c7 Fix icon install again, renaming. 2012-05-11 10:50:43 +02:00
Klaas Freitag
5bc6e080de Fix icon install. 2012-05-11 10:30:35 +02:00
Klaas Freitag
d5ebf0477b Install both application icons 2012-05-11 10:28:33 +02:00
Klaas Freitag
aa86561f31 write version set in VERSION.cmake to version.h 2012-05-11 10:19:15 +02:00
Klaas Freitag
9706d6e545 use QLatin1String rather than QString::from... 2012-05-11 10:10:23 +02:00
Klaas Freitag
3e99f25578 more useful debug output with network reply. 2012-05-11 10:09:57 +02:00
Klaas Freitag
f7fd9928b7 added a debug line without WIN32 marker. 2012-05-11 10:09:27 +02:00
Klaas Freitag
bacc70a299 Use the correct icon for sync ok 2012-05-02 17:12:45 +02:00
Klaas Freitag
cd6d3644b9 set owncloud compile flag for mac osx 2012-05-02 17:06:30 +02:00
Klaas Freitag
7fc409152f Display a proper tray icon at app startup 2012-05-02 17:05:31 +02:00
Klaas Freitag
496572314d Fix the app icon to be ownclouds 2012-05-02 16:33:07 +02:00
Klaas Freitag
8d33a470b1 Fixed theming: Made a mirall and a ownCloud icon theme working. 2012-05-02 15:50:01 +02:00
Klaas Freitag
125d2a4533 Make OWNCLOUD_CLIENT compile flag depending on the compile target. 2012-05-02 15:45:38 +02:00
Klaas Freitag
69e6096d14 Fixed encoding issue: Do not double encode. 2012-05-02 11:40:39 +02:00
Klaas Freitag
f8efb1fc99 - Added an open status entry into the tray menu
- fixed some menu glitches on the mac os platform.
2012-04-30 16:38:00 +02:00
Klaas Freitag
9c4613e5d2 Allow to interrupt running sync task, incl. some cleanups. 2012-04-30 08:56:56 +02:00
Klaas Freitag
31b636a423 Add a win32 debug line to CMakeLists 2012-04-23 10:58:21 +02:00
Klaas Freitag
603151fe08 Add proper error message if the owncloud module could not be loaded. 2012-04-23 10:58:21 +02:00
Thomas Müller
527bece4a9 Backport to Qt 4.6 finished - test against a local installation of owncloud via http 2012-04-21 21:03:29 +02:00
Klaas Freitag
633e50e776 Removed unsused variable 2012-04-21 11:50:20 +02:00
Klaas Freitag
eb4fd865d5 Fix missing return values for bool functions. 2012-04-21 11:22:03 +02:00
Klaas Freitag
d8bb48bcee Fix tray context menu after a folder has been added or removed. 2012-04-21 11:22:03 +02:00
Klaas Freitag
4c192d0960 initialize polltimercnt with one lower than exceed to start syncing
quickly on program startup.
2012-04-21 11:22:03 +02:00
Klaas Freitag
fda234cfb8 initialize sync status correctly. 2012-04-21 11:22:03 +02:00
Klaas Freitag
a875d14671 Improved startup logging with version and lang 2012-04-21 11:22:03 +02:00
Thomas Müller
c52a3f290b continue backport Qt 4.6: place holder text was introduced in Qt 4.7 2012-04-21 01:07:22 +02:00
Thomas Müller
8695b8fb3c implement MKCOL with QHttp to make it work with Qt 4.6 2012-04-20 23:58:09 +02:00
Klaas Freitag
9e163a3c28 Fix QApp contructor singature 2012-04-20 13:17:48 +02:00
Klaas Freitag
a81ad4acdc Translation and wording fixes. 2012-04-18 15:21:55 +02:00
Klaas Freitag
3f027cda73 Handle translation files correct. 2012-04-18 13:59:03 +02:00
Klaas Freitag
d4b264acbc Log the system name used for translations 2012-04-18 12:10:14 +02:00
Klaas Freitag
2c90a368f9 minor fixes and changes. 2012-04-18 11:59:56 +02:00
Klaas Freitag
1cb23ecb26 fixed wording. 2012-04-17 17:03:46 +02:00
Klaas Freitag
5c07363335 fix status dialog status display and overall status display. 2012-04-17 15:02:18 +02:00
Klaas Freitag
61ddff840a Fix display status dialog: Do not flicker on local runs if polling.
handle syncresult object in folder consistent.
2012-04-17 13:18:14 +02:00
Klaas Freitag
3f379b5671 removed useless double include. 2012-04-17 13:18:14 +02:00
Klaas Freitag
3c3bdeec5b added clearError and flag to indicate local run methods. 2012-04-17 13:18:14 +02:00
Klaas Freitag
e521d0f53c fix check if INOTIFY flag was given on cmake command line. 2012-04-17 13:18:14 +02:00
Klaas Freitag
2f5a3b849c - Restrict authentication to the configured ownCloud URL
- catch wrong username error correctly and report to user.
2012-04-17 13:06:25 +02:00
Klaas Freitag
b92c22b6df use thread save implementation of error codes in csync. 2012-04-17 12:34:19 +02:00
Dominik Schmidt
ccac3dcf95 Make it buildable as bundle on OSX 2012-04-16 13:03:20 +02:00
Florian Reinhard
508d05336b cmake fix. 2012-04-15 18:30:31 +02:00
Klaas Freitag
77fff8e1bf Caught additional error messages 2012-04-15 16:49:11 +02:00
Klaas Freitag
29a38b82ad Replace USE_WATCHER with USE_INOTIFY 2012-04-15 14:47:43 +02:00
Klaas Freitag
4a89768d02 Removed obsolete QWebdav class from CMake 2012-04-15 14:43:50 +02:00
Klaas Freitag
8cec736fea Fix mkdir in owncloudsetupwizard 2012-04-15 14:36:24 +02:00
Klaas Freitag
bf61aba351 Enable activation of status dialog entries on macos 2012-04-15 14:14:16 +02:00
Klaas Freitag
c71ad3072f Removed mirallwebdav header 2012-04-15 14:07:00 +02:00
Klaas Freitag
ccd93036fb Removed obsolete class MirallWebDav 2012-04-15 14:06:27 +02:00
Klaas Freitag
c04315805f clearifications in ownCloudInfo 2012-04-15 13:54:16 +02:00
Klaas Freitag
7c6ec3de93 Created WebDAV MkCol request on ownCloudInfo, QWebDav-Lib ready to
be deleted.
2012-04-14 19:08:53 +02:00
Klaas Freitag
28aa90444a Fixed a missing return type. 2012-04-14 12:56:45 +02:00
Dominik Schmidt
b6472ce1af Make USE_WATCHER configurable from CMake 2012-04-14 14:31:46 +02:00
Klaas Freitag
7acf400436 Removed path from csync include 2012-04-14 12:16:30 +02:00
Klaas Freitag
93b0f3e6ca removed a compile warning non void return type. 2012-04-14 12:09:08 +02:00
Klaas Freitag
74abe2fa7a explicitely enable the finish button. 2012-04-14 11:20:12 +02:00
Dominik Schmidt
f7c34ea652 Try some stuff with FindCsync.cmake 2012-04-14 04:19:52 +02:00
Klaas Freitag
590f563150 Pushed to version 1.0.1 2012-04-12 21:34:04 +02:00
Klaas Freitag
fe45804c37 Save password base64 encoded instead of plain text 2012-04-12 21:30:47 +02:00
Klaas Freitag
cb9fcb00bd fixed password storage field when writing config. 2012-04-12 14:48:45 +02:00
Klaas Freitag
b8434a8d56 Support for password not stored locally. 2012-04-12 14:06:59 +02:00
Klaas Freitag
3fede657b9 SSL Connection Warning dialog working. 2012-04-12 11:37:48 +02:00
Klaas Freitag
0d0783ba5c Fixed owncloudinfo to handle multiple connections, workarounded a
few 'interesting' behaviours of QNetworkAccessManager.
2012-04-10 20:55:50 +02:00
Klaas Freitag
21a385ab4a - passed whole NetworkReply object to not-found slots to give more
descriptive error messages.
- Improved error messages for users if ownCloud is unreachable.
- Fixed a crash with ownCloudInfo getting deleted by Statusdialog.
2012-04-10 14:51:45 +02:00
Klaas Freitag
9fbc97503e Fix build, early stage. 2012-04-06 09:00:15 +02:00
Klaas Freitag
5ac5d6ee5f SSL Support WIP - not yet functionable. 2012-04-06 08:53:57 +02:00
Klaas Freitag
2e8c963d21 remove test setting of own version. 2012-04-02 20:19:01 +02:00
Klaas Freitag
663e352956 Added an update check that queries an oC server for new versions. 2012-04-02 20:10:29 +02:00
Klaas Freitag
6f49d20785 - enable WIN32 build
- enable cpack changes.
2012-04-02 13:47:53 +02:00
Klaas Freitag
43a9d1dcd0 added app icon 2012-04-02 13:44:00 +02:00
Klaas Freitag
596e824b54 Fixed sync start after ownCloud initial configuration. 2012-04-02 13:21:13 +02:00
Klaas Freitag
eb1fd2d5f8 Set verion to 1.0.0 2012-04-02 13:15:53 +02:00
Klaas Freitag
225753b150 Win32: Open local urls in Explorer correctly. 2012-04-02 12:13:55 +02:00
Klaas Freitag
41cc1b9377 search alternative places for the global exclude list 2012-04-01 15:09:04 +02:00
Klaas Freitag
cd817940ae - added a new icon to display the waiting-to-be-synced state
- fixed the status display if the status dialog opens
2012-03-31 12:44:22 +02:00
Klaas Freitag
c196f77732 - Fixed the tray icon on all platforms.
- Simplified the application icon method in the theme
- Set a Window Icon
2012-03-31 11:31:28 +02:00
Klaas Freitag
ccd1623528 Added check on correct oC Credentials on startup. 2012-03-30 20:42:40 +02:00
Klaas Freitag
903c8ca220 Provide better error messages in owncloud for csync bugs. 2012-03-30 15:34:56 +02:00
Klaas Freitag
8e637bd8c7 - fixed local file change detection in win poller
- fixed context menu at startup.
2012-03-30 13:57:02 +02:00
Klaas Freitag
3fb471edad Changed the folder queue to use QString instead of folder ptrs.
Delete folder after finished if its syncing at deletion time.
2012-03-29 10:13:19 +02:00
Klaas Freitag
d938c531c8 - added ocInfo check on startup to prevent folder syncing without
valid ownCloud connection
- fixed folder remove
2012-03-29 09:41:30 +02:00
Klaas Freitag
3d114f5b91 Use a large icon because QIcon does scale down but never up. 2012-03-28 17:28:50 +02:00
Klaas Freitag
bfc96b0783 Set Edit-Trigger to nothing. Do not let start editing by doubleclick. 2012-03-28 17:28:08 +02:00
Klaas Freitag
109bb10110 Initialise the resource code in the main function. 2012-03-28 17:27:28 +02:00
Klaas Freitag
3a36f54096 Added WIN32 switch to avoid the konsole window for production. 2012-03-28 17:26:54 +02:00
Klaas Freitag
ffc5895ba1 Poll folder watcher: compare to last seen file. 2012-03-28 15:13:08 +02:00
Klaas Freitag
84ffebe26c Let folderwatcher use the exclude list file.
simplified naming in mirallconfigfile class.
2012-03-28 12:23:34 +02:00
Klaas Freitag
47f5c51a87 Let csync load the exclude list file 2012-03-28 11:26:51 +02:00
Klaas Freitag
a89122d214 Fixed some mirall->ownCloud namings 2012-03-26 15:19:40 +02:00
Klaas Freitag
9dcc948b3b Disabled some logging 2012-03-26 14:38:48 +02:00
Klaas Freitag
248a0cfed8 - removed the sitecopy files and last references
- Fix status dialog:
 * display local and remote folder names
 * fixed status icon
 * fixed sizing when font size changes
 * fixed enable/disable buttons
- moved second path to folder base class
- added remote folder role to status dellegate
2012-03-26 13:20:15 +02:00
Klaas Freitag
b9a861c95c added internationalization support in application object. 2012-03-26 11:02:01 +02:00
Klaas Freitag
3cee1275b9 Removed confusing open... button in status dialog, link added 2012-03-26 11:01:04 +02:00
Klaas Freitag
5259ae1565 added translations of the application. 2012-03-26 09:48:30 +02:00
Klaas Freitag
5f3d82288d pushed version to 0.2.5 for next beta. 2012-03-26 09:34:46 +02:00
Klaas Freitag
5a4caef2db Update folder list in status dialog without wiping selection. 2012-03-23 15:31:46 +01:00
Klaas Freitag
bdbb85f245 Big changes: queue sync requests of folders and do in one thread
only to avoid thread clottering. Improve error reporting from the
csync thread.
2012-03-22 16:22:08 +01:00
Klaas Freitag
c6a9fb02d0 A more secure csync thread implementation (part1) 2012-03-21 18:03:49 +01:00
Klaas Freitag
c5c3e2ecb1 prevent thread from crashing if len is less than zero. 2012-03-19 16:08:18 +01:00
Klaas Freitag
8f94ea9f6a bumped version to next beta. 2012-03-17 13:48:29 +01:00
Klaas Freitag
91cab8f15f allow 202 reply from server on mkcol request. 2012-03-16 15:20:50 +01:00
Klaas Freitag
08991a5177 fix memory leak in folderinfo 2012-03-16 15:16:45 +01:00
Klaas Freitag
cceb350582 Fix remote dir check by starting the timer in initialize of the page.
Use showWarn everywhere.
2012-03-16 14:43:37 +01:00
Klaas Freitag
a074e4433e Fix signal and slot arguments in Folder add wizard. 2012-03-16 12:54:56 +01:00
Klaas Freitag
838272240c Fix detection of parent folders when adding a new folder. 2012-03-16 11:02:44 +01:00
Klaas Freitag
b7eae107ae Fixed crash when removing folders.
Simplified code to achieve that, removed a slot from status dia.
2012-03-16 10:39:20 +01:00
Klaas Freitag
16a9a73ea3 - removed constants.h as not longer needed because of themes.
- tray icons from theme now.
2012-03-15 18:09:00 +01:00
Klaas Freitag
759e2fff9d Added missing Q_OBJECTs 2012-03-14 11:57:08 +01:00
Klaas Freitag
ad6b3504ee Added automatic creation of a sync after connect. 2012-03-14 11:26:00 +01:00
Klaas Freitag
e30ed86153 Add mirall version to user agent 2012-03-14 10:02:52 +01:00
Klaas Freitag
ac2df346ac Handle empty oC-Url from setup correctly. 2012-03-14 09:56:47 +01:00
Klaas Freitag
3bbfeaee93 - do connection check to owncloud in the show event.
- fix deletion of the check object
2012-03-14 09:52:18 +01:00
Klaas Freitag
cc25ee62cc Set strict permission on cfg file. 2012-03-13 17:52:23 +01:00
Klaas Freitag
ba13437fce Remove user and passwd from ownCloud url and implement a callback.
Added static data to CSyncThread to hold user and passwd, which is
asked for in the callback.
2012-03-13 17:37:43 +01:00
Klaas Freitag
4699093c06 Fix tray icon loading if no share is defined. 2012-03-13 16:30:37 +01:00
Klaas Freitag
1a20d42424 use portable QTimer to initialize the rand function. 2012-03-13 15:45:10 +01:00
Klaas Freitag
753be4d2bc version to new internal beta 0.2.3 2012-03-13 15:39:50 +01:00
Klaas Freitag
2882b49676 More elegant status dialog update 2012-03-13 15:39:04 +01:00
Klaas Freitag
2ae1b5dc84 move the poll timer stop to the correct place just before starting
to sync.
2012-03-12 17:37:18 +01:00
Klaas Freitag
c61c7962f7 introduce a proper model for the status dialog. 2012-03-08 13:40:55 +01:00
Klaas Freitag
5908cd9377 open a folder on double click in status dialog. 2012-03-08 12:08:53 +01:00
Klaas Freitag
949b33a6d1 Set a variable poll timer interval, useful for multiple folders.
Start polltimer again after folder add.
2012-03-08 11:39:31 +01:00
Klaas Freitag
cf4130caf9 fix more include dirs and link commands for csync. 2012-03-08 11:37:36 +01:00
Klaas Freitag
98a3fff9b9 Removed an unused comment 2012-03-03 11:01:36 +01:00
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