Klaas Freitag
8fe102662d
Merge branch 'propagator-ng': Fixes to work with new LGPL ocsync.
...
Conflicts:
src/mirall/csyncthread.cpp
2013-09-04 16:33:06 +02:00
Daniel Molkentin
625b21152e
Merge branch 'qt5'
2013-09-04 15:01:21 +02:00
Klaas Freitag
4fa6faf608
Hide quota and display explanation if no quota info is available.
2013-09-03 14:25:28 +02:00
Klaas Freitag
a24ae13d9c
Added logging to quota info result slot.
2013-09-03 14:25:28 +02:00
Klaas Freitag
81c720c05b
Remove dots from the end of error messages.
2013-09-02 17:37:16 +02:00
Klaas Freitag
edcdcb945a
Show the reason why a file was ignored.
2013-09-02 17:25:23 +02:00
Daniel Molkentin
ab4c6247c7
Fix display of "Monochrome icon" setting
...
The logic was inverse, and there was a typo in the string. Oh my...
2013-08-31 14:14:24 +02:00
Olivier Goffart
02b3033ca3
Use the same convention as on the server to format strings
...
* use power of 10 SI units
* use "B" instead of "bytes"
* use at least 2 significant digit, but no more than one digit after
the period
2013-08-29 12:06:41 +02:00
Olivier Goffart
a27c8ad90c
Fix crash in case of error
...
the QObject::parent() is 0
2013-08-28 21:26:42 +02:00
Olivier Goffart
bf6d0a521c
Compile with Qt5
2013-08-28 20:58:22 +02:00
Olivier Goffart
336bbb2403
Compile with Qt4
2013-08-28 20:14:40 +02:00
Daniel Molkentin
73da086964
Initial changes to also build on Qt5, doesn't compile yet
2013-08-28 17:03:31 +02:00
Olivier Goffart
c15de69156
Reconfigure the proxy when needed
2013-08-27 10:02:59 +02:00
Daniel Molkentin
77e7a1fa8d
Fix casing in settings dialog
2013-08-26 20:22:24 +02:00
Daniel Molkentin
f6d45b68ef
More clear error messages
2013-08-26 20:20:10 +02:00
Olivier Goffart
c3326efe94
Do not sort the entries in the syc protocol dialog alphabetically
...
The entries should be sorted chronogically. But now the QTreeWidget can
only sort them alphabetically by the time, which is not what we want.
Disalbe the sorting, and always insert the elements in the reverse
order.
Fix #890
2013-08-26 17:27:44 +02:00
Daniel Molkentin
c0e056bb84
Only show help if a URL is provided
2013-08-26 14:27:39 +02:00
Olivier Goffart
e78eab46ff
Fix saving the geometry of the log browser
2013-08-23 12:41:29 +02:00
Olivier Goffart
19a08f8d5e
Make remember the size of the settings dialog
...
Before, we saved the geometry in the closeEvent which is only called if
the user press the [x] in the title bar. But it is not called when the
user accept the dialog (by pressing the close button or the enter key)
So save the geometry in the destructor of the dialog instead.
One also must call delete from the Application destructor because it was
leaking
2013-08-23 12:25:16 +02:00
Olivier Goffart
c6319117fd
Better default size for the setting dialog
2013-08-23 11:59:49 +02:00
Daniel Molkentin
b0ab3ca80b
Theme: Add documentation after recent changes
2013-08-23 10:36:09 +02:00
Daniel Molkentin
9f89a2fe76
More adjustments around the application name
...
- libname is now derived from binary name (which is lowercase)
- remove superflouos reimplementation of appName() in owncloud theme
- APPLICATION_SHORTNAME is now optional (and if not set, equals
APPLICATION_NAME
2013-08-23 10:30:03 +02:00
Daniel Molkentin
e386bfb550
fix x-compilation
2013-08-23 00:36:05 +02:00
Olivier Goffart
d3a333e03c
Fix the 'copy button' in the protocol log
...
Fix #863
Also added more padding for the filename because it might be big, and in
case it's not enough, always add at least a space.
2013-08-22 16:20:04 +02:00
Olivier Goffart
04d3e282fb
Stop the poll timer when the folder is disabled
...
No need to request etag every 30 second for disabled folder.
When the folder is re-enabled, the Timer is actived again after the sync
2013-08-22 12:35:28 +02:00
Olivier Goffart
4be5f970d5
Default to no limit upload
...
We don't want to make the transfer slow by default
2013-08-22 12:26:34 +02:00
Daniel Molkentin
42abf4101c
Honor cmake's install prefix
...
since the entire ting is so incredibly broken in cmake,
use the approach taken by csync (which emulates the
approach of autotools), to get the directories right.
This mandates changes in the theme, which need discussion
(APPLICATION_SHORTNAME must now equal appName(), and
APPLICATION_NAME should equal appGuiName()).
2013-08-22 09:40:25 +02:00
onnozweers
13a6393ec5
Adding "Type=Application" to desktop file (to fix autostart in Ubuntu)
2013-08-21 22:11:02 +02:00
Olivier Goffart
3c2bb1e2bc
Compile after the merge
2013-08-21 15:29:04 +02:00
Olivier Goffart
24af9f38f4
Merge branch 'csync_lgpl' into propagator-ng
...
Conflicts:
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/folder.cpp
src/mirall/progressdispatcher.h
src/mirall/syncfileitem.h
2013-08-21 13:19:02 +02:00
Daniel Molkentin
e5117a98c9
Quota bar: Reduce border width to 1px per request
...
As requested by Jan
2013-08-21 11:34:49 +02:00
Daniel Molkentin
c1f7af7e6f
Write desktop file manually, add gnome startup property
...
Fixes #893
2013-08-21 11:09:56 +02:00
Olivier Goffart
b4c116e2a2
Add the new directories comming from the sync in the watcher
2013-08-21 00:45:36 +02:00
Klaas Freitag
98efab83a1
Compile against ocsync based on csync 0.50
2013-08-20 13:26:03 +02:00
Olivier Goffart
29d2094626
Hide password in the account settings
...
Fix #811
2013-08-19 13:42:01 +02:00
Klaas Freitag
c3b82e6818
Fix sequence for recently changed items.
2013-08-19 13:06:48 +02:00
Olivier Goffart
1a7c89326b
Fix crash when finishing the wizard
...
As shown on this backtrace:
=13334== Invalid read of size 8
QCoreApplication::postEvent(QObject*,QEvent*, int)
Mirall::ownCloudInfo::slotReplyFinished()
[...]
==13334== Address 0x1afb91d8 is 8 bytes inside a block of size 16 free'd
operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
QNetworkAccessManager::~QNetworkAccessManager()
Mirall::MirallAccessManager::~MirallAccessManager()
[...]
Mirall::ownCloudInfo::setNetworkAccessManager(QNetworkAccessManager*)
Mirall::ownCloudInfo::setCustomConfigHandle(QString const&)
Mirall::OwncloudSetupWizard::slotAssistantFinished(int)
[...]
Mirall::OwncloudWizard::basicSetupFinished(int)
Mirall::OwncloudWizard::slotCurrentPageChanged(int)
[...]
QWizard::currentIdChanged(int) (in
Mirall::OwncloudWizard::successfulStep()
Mirall::OwncloudSetupWizard::finalizeSetup(bool)
Mirall::OwncloudSetupWizard::slotAuthCheckReply(QString const&,
[...]
Mirall::ownCloudInfo::ownCloudDirExists(QString const&, QNetworkReply*)
Mirall::ownCloudInfo::slotReplyFinished()
The QNetworkManager was destroyed in a slot connected to a signal emited
by slotReplyFinished, but we did not finish with the QNetworkReply yet.
Fix the crash by using QueuedConnection so the QNetworkAccessManager is
not destroyed before slotReplyFinished has completed.
2013-08-19 12:43:52 +02:00
Daniel Molkentin
3a1f04ac2d
Allow folders with characters that need percent-encoding
...
Fixes #191
2013-08-18 20:24:24 +02:00
Klaas Freitag
a9d94ef732
Show error message in status dialog in error case.
2013-08-18 19:27:20 +02:00
Klaas Freitag
2756d17873
Fix/add missing status strings to theme.
2013-08-18 19:20:25 +02:00
Klaas Freitag
34d7f84fc2
Minor cleanup.
2013-08-18 17:59:03 +02:00
Daniel Molkentin
cea9b389bf
Account Settings: Use native highlight color
2013-08-18 17:00:37 +02:00
Daniel Molkentin
be48cb646c
Setup wizard: Start sync when displaying result page
2013-08-18 15:23:52 +02:00
Klaas Freitag
47eb5ff1d9
Do not keep the log if the log window is not visible.
2013-08-18 13:28:40 +02:00
Klaas Freitag
b608f5a670
Progressbar and quota bar tweaking.
2013-08-17 22:56:02 +02:00
Klaas Freitag
e81dc34c4e
Add a tooltip in the sync protocol list.
2013-08-17 17:57:33 +02:00
Klaas Freitag
1603e627a3
Remove superflous conflict case.
2013-08-17 17:57:33 +02:00
Klaas Freitag
bf978b3e0f
Handle Progress as a namespace rather than a class.
2013-08-17 17:57:33 +02:00
Klaas Freitag
0fdaf33288
Use correct translation call from QCoreApplication.
2013-08-17 17:57:33 +02:00
Klaas Freitag
367c4153c1
Show a bubble if the quota was exceeded.
2013-08-17 17:57:33 +02:00
Klaas Freitag
395c673a24
Fix the quota bar for quotas larger 100%.
2013-08-17 17:57:32 +02:00
Olivier Goffart
22de23c651
Fix the 'no limit' upload setting
...
Fix issue #879
2013-08-17 16:11:45 +02:00
Olivier Goffart
23926d2461
small leak
2013-08-16 20:18:35 +02:00
Olivier Goffart
c03f31b6ba
put the 'Account' item first
2013-08-16 15:09:54 +02:00
Olivier Goffart
a1060a8538
fixup the layout of the account settings
2013-08-16 15:03:38 +02:00
Daniel Molkentin
b9228e64ff
Make Folder Reset an expert option (F5)
...
This feature should not be required, but might be helpful
in the debugging process.
2013-08-15 17:00:07 +02:00
Olivier Goffart
c4084de716
Remove the 'Remove Account' button
...
It is not doing anything right now, and we have no plans to implement it
in a short future
Fix Issue #866
2013-08-15 16:42:08 +02:00
Olivier Goffart
3c667918e7
Fix Reconfiguration keeps sync folder definition
...
Issue #875
2013-08-15 16:35:03 +02:00
Olivier Goffart
e55745cbcf
Remove connection from unexisting signal to unexisting slot
2013-08-15 16:16:22 +02:00
Olivier Goffart
dce8cb83d9
Do not forget the config on the second page of the wizzard
...
Fixes mirral issue #874 where certificate was not stored on the first
page
2013-08-15 15:45:16 +02:00
Olivier Goffart
8dc956c55b
Put all the debug in the log window
...
Don't emit debug before we installed the hook and created he log window
Also no debug if we use --help
2013-08-15 15:45:16 +02:00
Daniel Molkentin
6c77921a32
Admendment of last commit
2013-08-15 13:09:20 +02:00
Daniel Molkentin
55e4748f06
allow relative directories for --confdir
2013-08-15 13:01:05 +02:00
Daniel Molkentin
5ff9e02517
Implement --logfile - (log to stdout)
2013-08-15 12:24:52 +02:00
Klaas Freitag
0e5bfc03ce
Removed label on request of Jan.
2013-08-15 12:17:01 +02:00
Klaas Freitag
b309d333a6
Minor wording and margin fixes.
2013-08-15 11:30:48 +02:00
Daniel Molkentin
ee439382ed
Logger: always log to log widget
2013-08-15 10:56:16 +02:00
Klaas Freitag
192212c682
Handle quota exceeding as error.
2013-08-15 08:15:43 +02:00
Klaas Freitag
148bdfdcd6
Some minor cleanups.
2013-08-15 08:15:43 +02:00
Olivier Goffart
e4128cd5d8
progress with new propagator
2013-08-14 19:59:16 +02:00
Daniel Molkentin
9651f1cddf
Folder Wizard: Decode percent encoding
2013-08-14 19:24:02 +02:00
Daniel Molkentin
5feb9b0806
folderwizard: layout fixes
2013-08-14 19:24:02 +02:00
Klaas Freitag
44b9ee19e7
Flatten the itemprogressdialog and show a flat list.
2013-08-14 18:24:06 +02:00
Klaas Freitag
cc16d19bc4
Removed unused defines.
2013-08-14 18:24:06 +02:00
Klaas Freitag
b96c2de2b7
Cleaned folder class, removed a couple of signals and helper classes.
2013-08-14 18:24:06 +02:00
Klaas Freitag
f882b80708
Fix wording to more consolidated style, Jan request.
2013-08-14 18:24:06 +02:00
Daniel Molkentin
1f274699e5
Pressing F12 in Settings now open the log browser
2013-08-14 17:46:58 +02:00
Daniel Molkentin
697e355f07
Hide mono icon options if the resource has no mono icons
2013-08-14 16:35:42 +02:00
Olivier Goffart
f8e6326880
Default to not cancel
...
So that the owncloudcmd client is not blocked
2013-08-14 15:44:30 +02:00
Olivier Goffart
67c5f513aa
Fix compilation after merge
2013-08-14 15:36:34 +02:00
Olivier Goffart
0589bfc51b
Merge branch 'master' into propagator-ng
...
This just fix the conflict.
Do not compile or work yet
Conflicts:
src/CMakeLists.txt
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/owncloudfolder.cpp
src/mirall/syncfileitem.h
test/CMakeLists.txt
2013-08-14 15:19:21 +02:00
Olivier Goffart
04f32bd397
Revert "TMP threaded"
...
This reverts commit 5bb4c3be43
.
2013-08-14 14:59:32 +02:00
Olivier Goffart
e89bdfc422
Make the Pause button stop the sync
2013-08-14 14:57:56 +02:00
Olivier Goffart
c2cc9e62a7
Fix the brandwith limit
...
The unit in mirall are in kbytes/s, but csync expect byte/s
2013-08-14 14:57:56 +02:00
Daniel Molkentin
1f2ae0d061
Folder Wizard UI clean up
...
Input from Jan
2013-08-14 14:01:33 +02:00
Olivier Goffart
91a39588c6
re-enable the sync if the syncing was disabled because the connection is down at startup
2013-08-14 12:59:56 +02:00
Olivier Goffart
a642f86d5b
Detect connection failure from the polling
2013-08-14 12:34:03 +02:00
Olivier Goffart
00cf290574
reduce a bit the log output
2013-08-14 12:34:03 +02:00
Daniel Molkentin
88b4ff9809
Wording changes proposed by Jan
2013-08-14 11:57:19 +02:00
Daniel Molkentin
ddd0965a82
Fix include after class rename
2013-08-14 11:11:47 +02:00
Klaas Freitag
0a9491ff46
Improved timestamp formatting in item sync progress dialog.
2013-08-14 08:04:46 +02:00
Klaas Freitag
32b44e3d87
Removed unused dialog class.
2013-08-14 08:04:46 +02:00
Klaas Freitag
268004b4ff
Get correct action kind from progress Dispatcher in case of Context
...
kind.
2013-08-14 08:04:46 +02:00
Daniel Molkentin
6c0f6ae62e
Make copy action copy all fields again
...
Fixes #863
2013-08-13 15:39:28 +02:00
Yoann Laissus
b058185d3b
Don't add empty entries in hidden files editor with an empty string
...
or when cancel is clicked
2013-08-12 13:10:16 +02:00
Olivier Goffart
82fb8c49cf
Do not clear the pending event in the polling anymore
...
This is useless, and can even cause problems now since polling only do
a sync when the server has actually changed
2013-08-09 14:10:21 +02:00
Daniel Molkentin
d3378c131a
Fix formatting for 1 byte size in octetsToString()
2013-08-09 13:02:24 +02:00
Daniel Molkentin
ff4d2d488f
Add cancel button to wizard on Mac
...
Fixes #848
2013-08-09 01:08:46 +02:00
Daniel Molkentin
b0852b4cf5
No ... for entires that do not spawn a dialog
2013-08-08 20:27:16 +02:00
Daniel Molkentin
c047b4d4de
Seems autowrapping doesn't work everywhere. Enforce it
2013-08-08 17:52:09 +02:00
Olivier Goffart
6655da9d24
Fix warning
2013-08-08 16:03:57 +02:00
Daniel Molkentin
4e3d4c3153
Credits: Add Jan
2013-08-08 15:51:36 +02:00
Olivier Goffart
52a47fbc67
Force a sync run after 5 minutes
2013-08-08 14:32:14 +02:00
Daniel Molkentin
0086916b4d
Retain all old settings when running the setup wizard
...
Fixes #825
Fixes #759
2013-08-08 13:04:05 +02:00
Klaas Freitag
df5ef6fe67
Added new information icon.
2013-08-08 11:16:28 +02:00
Klaas Freitag
c9e51dcfc1
Display properly elided text in progress.
2013-08-08 11:16:28 +02:00
Daniel Molkentin
c05adfd817
Open Top-Level-Dialogs modal, not semi-modal
2013-08-08 10:36:09 +02:00
Daniel Molkentin
055410e38f
Setup proxy connection before every sync
2013-08-08 00:46:23 +02:00
Daniel Molkentin
c24d6bd71c
Notify user if there is a problem with the inotify watcher
2013-08-07 15:00:10 +02:00
Daniel Molkentin
9b319cf189
Significantly simply logging
2013-08-07 15:00:10 +02:00
Klaas Freitag
1a9eb19f0d
Fix even more compile warnings.
2013-08-07 14:51:31 +02:00
Klaas Freitag
1943cc60b6
Added missing switch cases to calm compiler warnings.
2013-08-07 14:46:57 +02:00
Daniel Molkentin
f8878833de
Fix compiler warning
2013-08-07 12:18:44 +02:00
Klaas Freitag
364d4340fd
Show a more informative problem message in progress.
2013-08-07 12:15:28 +02:00
Klaas Freitag
6226a6ee8f
Enable delete messages for progress display.
2013-08-07 10:28:34 +02:00
Daniel Molkentin
c49edeb09d
Fix regression in FolderWizard over 1.3
...
Now it's possible to also pick subdirectory
of in arbitrary depths again
2013-08-06 21:50:22 +02:00
Klaas Freitag
7e794cd94f
Tell the progress dialog about a new sync result object.
2013-08-06 18:07:59 +02:00
Klaas Freitag
933a62de01
Add recent action entries in correct sequence to menu.
2013-08-06 18:07:31 +02:00
Klaas Freitag
23f8e3b4f8
Allow Delete notification.
2013-08-06 18:06:54 +02:00
Klaas Freitag
3502edf71b
More detailed strings for the progress kind.
2013-08-06 18:06:39 +02:00
Klaas Freitag
4d8a371e43
Display information from SyncResult.
2013-08-06 18:06:05 +02:00
Klaas Freitag
01fd3242c4
Add folder alias to sync result structure.
2013-08-06 18:04:42 +02:00
Klaas Freitag
9c289334e9
Handle notifications for deletes.
2013-08-06 18:04:08 +02:00
Olivier Goffart
a9f23a8331
Get the etag of all subfolder for the root directory
...
The root directory etag is not updated when the files change.
That's why we need to check the etag of all its sub items
2013-08-05 20:13:39 +02:00
Olivier Goffart
5d24599546
Fetch the etag of the folder to see if it has changed before syncing
...
Notice that this does not work for the toplevel directory yet, as
owncloud does not change the etag of the root folder
2013-08-05 20:13:39 +02:00
Olivier Goffart
07d9d3770b
Refactor: move the pollTimer to the folder
2013-08-05 20:13:39 +02:00
Daniel Molkentin
c9ddb12b5a
Build after merge
2013-08-05 20:14:22 +02:00
Daniel Molkentin
0932ee6051
Merge branch 'shibboleth'
...
Conflicts:
src/CMakeLists.txt
src/mirall/application.h
2013-08-05 19:54:06 +02:00
Daniel Molkentin
ee1b8465a3
Revert "Temporarily log HTTP traffic done by MirallAccessManager."
...
This reverts commit 5930ca8ac7
.
2013-08-05 19:47:48 +02:00
Daniel Molkentin
26bd164168
Safer implementation for substitution of WebDav URL
...
- Use of RegEx is dangerous with folder names
containing e.g. '(' or ')'.
- Didn't work in my case at all.
2013-08-05 19:45:24 +02:00
Olivier Goffart
203b9c7f6b
leak fix
2013-08-05 16:49:18 +02:00
Daniel Molkentin
7932ec3cc1
IgnoreListEditor: slightly better text
2013-08-05 16:26:17 +02:00
Daniel Molkentin
3f15e02881
Add support for deletable ignores in IgnoreListEditor.
2013-08-05 16:13:26 +02:00
Olivier Goffart
6fb5c04bde
Finish danimo's patch that refactor the scheduler
...
Wait a full poll interval after the end of the sync
2013-08-05 15:15:15 +02:00
Olivier Goffart
578bcc3522
Remove scheduler logic from folderman and moved it in folderman
...
Also fetch and parse the etag when doing a PROPFIND to get the quota
(Patch from danimo)
2013-08-05 15:15:15 +02:00
Daniel Molkentin
99dea76fd1
Fix path display in folder wizard
...
The new implementation did not work correctly when owncloud is installed
in a subdirectory.
2013-08-05 14:28:05 +02:00
Klaas Freitag
67f57a443c
Disable unknown csync flags for now.
2013-08-05 12:30:24 +02:00
Klaas Freitag
2b3b4f9daf
Start setup wizard if no config exists on startup.
2013-08-05 12:19:53 +02:00
Klaas Freitag
16d81db117
Show deletes in progress.
2013-08-05 09:39:06 +02:00
Krzesimir Nowak
5930ca8ac7
Temporarily log HTTP traffic done by MirallAccessManager.
...
To be reverted later.
2013-08-02 14:30:15 +02:00
Klaas Freitag
49be4a3be2
Propagate soft errors into SyncResult, icon fixes.
2013-08-02 14:22:01 +02:00
Klaas Freitag
5e82dc1841
Some more refinements on item progress
2013-08-02 12:16:21 +02:00
Klaas Freitag
6ce1c17ee1
Give application class control over itemprogressdialog
2013-08-02 11:33:45 +02:00
Krzesimir Nowak
b0236eaa24
Fix folder item being inactive.
2013-08-01 19:11:05 +02:00
Daniel Molkentin
19bbff708e
Improve FolderWizard
2013-08-01 18:22:13 +02:00
Klaas Freitag
1399ea13cc
Fixed rounding of size display.
2013-08-01 16:58:36 +02:00
Klaas Freitag
a25d9fd3b4
Added itemprogressdialog class to show the sync progress and problems.
2013-08-01 16:58:36 +02:00
Krzesimir Nowak
f6e3838eb2
Create a QNetworkAccessManager subclass which sets proper user agent and use it.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
c1fdecae2d
Fix misc warnings.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
69a4558fe4
Actually use the remoteFolder sent by signal.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
50edac8ee8
Split setup page into server and advanced parts.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
fa95a638af
Fill username in HTTP credentials setup page.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
6543a01418
Fix warnings emitted by clang.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
9724e52f1b
Fix warnings.
...
Should be now compilable when run with -Wall -Wextra -Wpedantic
-Werror.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
78b6f4df01
Move the creds/ and wizard/ directories one level higher.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
b7e88aa2ef
Fix copyright headers.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
224fd21612
Fix displaying URL in account settings.
...
I deleted too much code there last time.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
a6bf33c501
Make "Connect" button inactive until we get a Shibboleth cookie.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
306a9421fb
Avoid a crash when disposing Shibboleth browser.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
d5885daf0f
Move credential related files to creds directory.
...
CredentialStore is now only used for HTTP credentials, so it was moved
into http directory under creds.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
52b3f7105d
Remove unused stuff.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
7f6dc291c0
Create HTTP credentials object for config without type value.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
eacb849353
Fix credentials handling in csync.
...
CSync module's properties can be set only after it was initialized, so
we split the sync context vfunc into two: the one ran before
initialization and the one ran before sync beginning.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
367bc401ee
Add Shibboleth credentials implementation.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
92af3ea725
Add and use credentials abstraction. Implement HTTP and dummy credentials.
...
To achieve that MirallConfigFile now exports several general
settings-related methods for subclasses (here: for HttpConfigFile), so
it does not have to contain any code targeted for specific
credentials.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
582ce4cfa0
Cleanup setup wizard. Split setup page into two.
...
First page is for giving server URL and advanced setup and second page
is for giving credentials. Second page will differ based on
authentication type supported by ownCloud server. For now only HTTP
credentials are supported.
2013-08-01 16:53:43 +02:00
Daniel Molkentin
1967226c71
fix networksettings.ui _again_
2013-08-01 13:48:42 +02:00
Klaas Freitag
a64724be0e
More sophisticated progress, add Recent Changes Menu to tray.
...
ProgressDispatcher now stores a queue of events as well as sync
problems, better known as soft errors. The tray menu displays a
sub menu with 5 recent changes and adds a more... button that
shows a warning icon if soft errors had happend.
More to implement.
2013-07-30 22:24:48 +02:00
Klaas Freitag
a0d9d41455
Use const reference parameters for custom struct parameters.
2013-07-30 22:24:48 +02:00
Klaas Freitag
84e8ab5b71
Make progress aware of errors, first step.
2013-07-30 22:24:48 +02:00
Markus Goetz
f5bbb12434
Crash hotfix, need to dig down actual cause
2013-07-30 15:49:57 +02:00
Klaas Freitag
edf8147561
Small cleanups.
2013-07-26 15:10:03 +02:00
Klaas Freitag
3a9ab3a86f
Consolidated progress displaying to a single slot from csync.
2013-07-26 13:44:38 +02:00
Klaas Freitag
8f912ca0c5
Adopt to new progress API in csync, WIP
2013-07-25 16:28:45 +02:00
Olivier Goffart
a827056d28
Fix upload limit
2013-07-25 11:21:02 +02:00
Klaas Freitag
6c90989584
Make progress display more robust.
2013-07-25 11:00:19 +02:00
Daniel Molkentin
08acf5e9aa
Network Settings: Reword entries, fix uic warnings
2013-07-25 10:41:44 +02:00
Daniel Molkentin
bca295183b
Make use of bandwidth limiting, split general/network settings.
...
Fixes #14
2013-07-24 19:53:20 +02:00
Markus Goetz
a400a2e0bb
OS X: Fix window messup
2013-07-24 17:06:35 +02:00
Daniel Molkentin
8c15839753
Remove all >= Qt 4.7 ifdefs
2013-07-24 15:34:37 +02:00
Klaas Freitag
810024f4c9
Reworked progress display for more performance.
...
Moved most of the logic to the dialog class to be able to only update
the GUI if there are really changes rather than doing it whenever a
change happens.
2013-07-24 14:40:47 +02:00
Klaas Freitag
de7bcca5fe
Fixed signal and slot parameter list for progress.
2013-07-24 14:40:47 +02:00
Klaas Freitag
6552a48639
Make compactFormatDouble a bit smarter.
2013-07-24 14:40:47 +02:00
Daniel Molkentin
aee0f0c882
make addFolderDefintion easier to read
2013-07-24 14:27:57 +02:00
Daniel Molkentin
e353193fbb
FolderMan: Remove dead code
2013-07-24 14:23:32 +02:00
Daniel Molkentin
fb547e9100
Fix/compactify comments in folderman.h
2013-07-24 14:16:52 +02:00
Markus Goetz
44289c8781
OS X: Fix compile
2013-07-24 14:08:16 +02:00
Daniel Molkentin
d4a5ab252d
Drop Compat with Qt 4.6
...
We now require Qt 4.7 due to QNAM
2013-07-24 13:59:03 +02:00
Daniel Molkentin
a3b3c28694
CSyncThread: Fix unreachable code
2013-07-23 14:34:06 +02:00
Klaas Freitag
976c41a3b8
Beautified ProgressDispatcher
2013-07-23 13:32:33 +02:00
Daniel Molkentin
da087292fd
First version of progress in the context menu
2013-07-23 13:19:17 +02:00
Klaas Freitag
274f59f93b
Reworked progress again following mirall bug #137
2013-07-23 12:23:29 +02:00
Klaas Freitag
85d810d2cf
Rename signal from folderProgress to itemProgress.
2013-07-23 12:23:20 +02:00
Daniel Molkentin
47f151c594
FolderWizard: Return targetPath properly
2013-07-22 23:14:41 +02:00
Daniel Molkentin
7b5ef2186e
Remove accidential change
2013-07-22 23:14:12 +02:00
Daniel Molkentin
8236dafb96
INotify backend: honor ignored files
...
Actually this needs a careful redesign,
but this is good enough to fix the issue.
Fixes : #763
2013-07-22 21:39:13 +02:00
Daniel Molkentin
56e5627b6b
ownCloudFolder -> Folder
...
Fixes #769
2013-07-22 20:30:38 +02:00
Daniel Molkentin
38db0eddab
Make selection of target ListView-based
...
Fixes #222
2013-07-22 18:07:44 +02:00
Daniel Molkentin
710625e2a3
Spelling bee
2013-07-22 18:06:27 +02:00
Daniel Molkentin
a5e7af6c1f
Make FolderMan a singleton
...
It doesn't "belong" to application (think about lib use cases).
This is better.
2013-07-22 13:59:52 +02:00
Daniel Molkentin
5fe4d2db2b
Introduce MirallConfigFile::save/restoreGeometry()
2013-07-22 12:28:43 +02:00
Daniel Molkentin
b2c587e2f8
Settings: Show overall state as account icon
...
Requires the previous refactoring commit
2013-07-22 12:11:12 +02:00
Daniel Molkentin
40c2d891c1
Refactor sync result
...
Sync result computation is now owned by FolderMan
2013-07-22 12:10:13 +02:00
Klaas Freitag
d5ad3a8a70
Removed mistakenly checked in file.
2013-07-22 09:47:15 +02:00
Daniel Molkentin
c74382af4f
octetsToString: Add TB case to pretty printer
2013-07-20 01:27:41 +02:00
Daniel Molkentin
0be0111724
Use WA_DeleteOnClose for settings
...
instead of trying brain dead things
2013-07-20 01:27:00 +02:00
Daniel Molkentin
f0d454b511
Ignore list editor fixes
2013-07-20 01:26:11 +02:00
Daniel Molkentin
b79a45403e
Implement UI changes discussed with Jan.
...
Fixes #785
Fixes #782
Fixes #781
2013-07-19 22:14:21 +02:00
Klaas Freitag
1cc60e755b
Rather show overall progress in settings dialog.
2013-07-19 17:05:46 +02:00
Daniel Molkentin
7fb7cc8c46
Don't hardcode strings, use constants instead
...
This hopefully reduces the chances for
regressions during refactoring.
2013-07-19 16:28:12 +02:00
Daniel Molkentin
1400889b23
Small cleanups
2013-07-19 16:28:12 +02:00
Daniel Molkentin
44fa9bd141
remove skip save pwd parameter -- not used any longer
2013-07-19 16:28:12 +02:00
Klaas Freitag
992dffa032
Add an overall progress counter to progressDispatcher
2013-07-19 13:05:30 +02:00
Klaas Freitag
5fa7e48c24
Do not show the frame around the progress.
2013-07-19 11:07:47 +02:00
Klaas Freitag
3b00dfebed
Add a textual display of the file size in progress.
2013-07-19 10:04:09 +02:00
Klaas Freitag
b42c7e07e6
More work on progress display of file up and download.
...
This is at least working for file upload, untested for downloads
and other operations. Needs more testing and more polish.
2013-07-17 22:34:11 +02:00
Markus Goetz
ab7bfabf12
Put cookies into csync
...
We already have the auth cookies from the quota request,
so put them into csync to avoid a 401 roundtrip
2013-07-17 16:27:18 +02:00
Markus Goetz
ab72644ace
Check if quota request had HTTP 207
2013-07-17 15:08:48 +02:00
Daniel Molkentin
218fa040c8
Reduce thread priority
2013-07-16 16:05:37 +02:00
Daniel Molkentin
b8f783f104
Set proxies and ignored files before every sync run
2013-07-16 16:05:04 +02:00
Daniel Molkentin
edd9d9aee3
Fix disabled state _again_
...
Seems like a bug in Designer
2013-07-12 18:05:59 +02:00
Daniel Molkentin
8c66085621
Folder wizard: Warn if a chosen dir is read-only
...
Fixes #755
2013-07-12 13:54:20 +02:00
Klaas Freitag
40ab325a37
Cleaned up credentialstore class a bit.
...
Removed all "user mode" stuff from the class that was used to ask the
user interactively for the password. We do not do that any more.
2013-07-12 12:22:11 +02:00
Klaas Freitag
7ae95b14f4
Added method to check if the password is in the config file.
2013-07-12 12:21:34 +02:00
Klaas Freitag
6b5b9db20a
Handle progress through ProgressDispatcher class, WIP.
2013-07-11 12:32:58 +02:00
Daniel Molkentin
eb39d144e4
Use default cookie jar again
2013-07-10 18:59:01 +02:00
Daniel Molkentin
cfaaf4a2c4
Don't always send Auth headers
...
Use slotAuthentication again instead.
2013-07-10 18:57:52 +02:00
Daniel Molkentin
279a738aa6
General Settings: Fix spacing in layout
2013-07-10 12:46:43 +02:00
Daniel Molkentin
10b55f11a2
Fix build for Qt <= 4.6
2013-07-10 09:48:10 +02:00
Daniel Molkentin
25065c4151
Remember geometry of LogBrowser
2013-07-10 09:34:41 +02:00
Daniel Molkentin
d2657bc154
Do display floating points with precision of 1
...
For several GB of quota, we might end up showing
<1% far too long. So show one decimal number,
unless it's zero.
2013-07-10 09:34:41 +02:00
Daniel Molkentin
4fde3f4a65
Quota in Account Settings: properly round value
2013-07-10 09:34:41 +02:00
Daniel Molkentin
e398cfb27c
Introduce Utility::compactFormatDouble()
...
Like QLocale::toString(double, 'f', prec), but drops trailing
zeros after the decimal point.
2013-07-10 09:34:27 +02:00
Daniel Molkentin
3cc670ec29
Send non-standard port along with host
...
In QNAM, that's actually the default,
and we were overriding it incorrectly
for no obvious reason. When using the
QHTTP fallback, we need to submit a
non-standard port manually.
Fixes #748
2013-07-10 08:43:10 +02:00
Markus Goetz
c8d9e8458a
OS X: Find out if we are a startup item
2013-07-09 17:30:50 +02:00
Markus Goetz
892419e880
OS X: Ability to disable startup item
2013-07-09 17:13:41 +02:00
Markus Goetz
13fb49cf39
Make Jenkins happy
2013-07-09 14:23:58 +02:00
Markus Goetz
eabe3f968e
Raise settings dialog when creating
...
Else at least on OS X it is burried somewhere.
2013-07-09 14:18:23 +02:00
Markus Goetz
2ca5eaaab9
utility.cpp: Make compile on OS X
2013-07-09 14:07:48 +02:00
Daniel Molkentin
eed3deac67
Acount Settings: Enable in place password change
2013-07-08 14:49:01 +02:00
Daniel Molkentin
748ff13bce
Utility::freeDiskSpace()
...
Does not yet work for UNC locations
2013-07-08 14:48:17 +02:00
Daniel Molkentin
6c7700c2e7
Save size of settings dialog
...
Fixes #541
2013-07-08 04:01:36 +02:00
Daniel Molkentin
c8ccb014c8
Use plural form for sync notification
...
Fixes #419
2013-07-08 03:19:49 +02:00
Daniel Molkentin
f1bd14e8de
Remove superflous cast
2013-07-08 01:44:49 +02:00
Daniel Molkentin
024d01a192
Cleanly install themed clients next to owncloud on Unix
...
- Renames libowncloudsync for themes
- Properly names i18n dir
2013-07-08 01:44:49 +02:00
Daniel Molkentin
b2d02ef0bd
Improve labeling in case of root sync
2013-07-07 01:24:56 +02:00
Daniel Molkentin
751d7deda6
Utility: Compile on Windows again
...
Theme moc files belong with libowncloud
2013-07-06 22:42:02 +02:00
Daniel Molkentin
fff795146e
Make Utility::*Startup* testable
2013-07-06 22:41:59 +02:00
Daniel Molkentin
c6219581f6
More work on ignore/exclude files:
...
- Introduce split between sytem and user files
- Add Editor
Current limitation: Picking up the changes requires
a restart
2013-07-05 16:54:11 +02:00
Klaas Freitag
d0c5fb2395
Check connection at startup through ConnectionValidator
2013-07-05 13:14:48 +02:00
Klaas Freitag
6c2c81dc83
Format integer to string.
2013-07-05 11:40:44 +02:00
Daniel Molkentin
bfdb0c0012
Enable autostart when the client has been configured
2013-07-05 01:05:23 +02:00
Daniel Molkentin
d870d6c326
Implement "Show Desktop Notifications" option (default: on)
...
Should make #314 subscriber happy :-)
2013-07-05 01:01:23 +02:00
Daniel Molkentin
c06410e726
Implement Launch on Startup (Win, Linux).
...
Mac OS started. Untested.
2013-07-05 00:25:19 +02:00
Daniel Molkentin
ef03ebe086
Remove obsolete include
2013-07-04 20:43:20 +02:00
Daniel Molkentin
a217e8f24c
Compile fix
2013-07-04 20:21:40 +02:00
Daniel Molkentin
c164beb040
Commit squashed refactoring branch
...
- introduce settings dialog
- general settings for general / proxy settings
- standalone proxy settings dialog removed
- standalone status dialog removed
- moved status dialog into settings dialog
- radically cut down links in context menu
- add help link to context menu
This needs more cleanup and testing. Known issues:
- When the wizard is called while the settings dialog
is open, it will not show old information (see FIXME)
- Some settings are not implemented yet (greyed out)
- The counter in the FileItemDialog is not correct the
first time around.
Based on the discussion done with Jan and Klaas during the
Nuenberg workshop.
2013-07-04 20:02:44 +02:00
Klaas Freitag
5171e5880d
Initialize member var with zero to avoid crash.
2013-07-02 17:01:16 +02:00
Klaas Freitag
2ef62524d6
Use showTrayMessage instead of _tray directly
2013-07-02 17:01:16 +02:00
Klaas Freitag
4bbb29c2b4
Terminate sync process in the wizard rather than in folderman unload.
2013-07-02 17:01:16 +02:00
Klaas Freitag
261776cc78
Remove useless log message.
2013-07-02 17:01:16 +02:00
Daniel Molkentin
3008142b1b
lowercase webdav request
2013-07-01 14:21:04 +02:00
Daniel Molkentin
152e729768
thinko
2013-06-28 23:23:42 +02:00
Daniel Molkentin
e7c77df59e
Quota: Distinguish 0 and <1
2013-06-28 23:14:09 +02:00
Daniel Molkentin
4ff1a13f32
Implement folder display.
...
- Displayed as disabled action
- Refactor davRequest along the way
- take Verb as QByteArray
- pass along a QIODevice
Not implemented for Qt < 4.8
2013-06-28 23:01:31 +02:00
Daniel Molkentin
b9b18d6120
Remove unused configfile instance
2013-06-28 22:28:18 +02:00
Daniel Molkentin
4945ce3c8c
Use awesome Qt template magic
2013-06-28 22:27:53 +02:00
Daniel Molkentin
efd11b61c6
Merge branch '1.3'
2013-06-28 11:47:09 +02:00
Daniel Molkentin
f2d289326b
More whitespace changes
2013-06-27 16:57:44 +02:00
Daniel Molkentin
a1767b2f7f
String whitespace fixes
2013-06-27 16:57:15 +02:00
Markus Goetz
5e9fcf7537
Raise setup wizard
2013-06-27 16:57:15 +02:00
Markus Goetz
8192cc7eea
Setup Dialog: Fix widget size issue (2)
2013-06-27 16:57:15 +02:00
Markus Goetz
2b8e1f2504
Setup Dialog: Fix widget size issue
...
in advanced settings
2013-06-27 16:57:15 +02:00
Daniel Molkentin
9d01f80744
Fix Dialog behavior
...
- Fix proxy dialog being callable multiple times
- Use smart pointers in more places
- _owncloudSetupWizard was guarded by a smart pointer,
this needs to be accounted for in other code pathes.
Fixes Setup dialog not showing up when left-clicking
on unconfigured instances on Windows.
2013-06-27 16:54:33 +02:00
Daniel Molkentin
d35e1baee1
Remove obsolete code
2013-06-26 17:27:44 +02:00
Daniel Molkentin
903a78623c
Minor theme changes
2013-06-25 14:51:39 +02:00
Daniel Molkentin
644b2673e0
More whitespace changes
2013-06-24 23:00:33 +02:00
Daniel Molkentin
04c8449e5f
String whitespace fixes
2013-06-24 22:58:00 +02:00
Daniel Molkentin
a662c85728
Add "Reset Folder" option to status dialog
...
to recover from invalid databases. Features
a big fat warning.
2013-06-24 21:17:00 +02:00
Daniel Molkentin
5c4b7d427d
Add "Reset Folder" option to status dialog
...
to recover from invalid databases. Features
a big fat warning.
2013-06-24 21:15:22 +02:00
Markus Goetz
12cc8bfd95
Raise setup wizard
2013-06-24 15:15:46 +02:00
Markus Goetz
11c6f20c90
Setup Dialog: Fix widget size issue (2)
2013-06-24 14:57:48 +02:00
Markus Goetz
c602ec310d
Setup Dialog: Fix widget size issue
...
in advanced settings
2013-06-24 13:24:46 +02:00
Olivier Goffart
60a4180dd6
Delay the csync_init after we called status.php
...
That way, if there was a redirection, it is handled propertly
2013-06-21 00:34:46 +02:00
Olivier Goffart
8e42721959
Do not store the redirected URL in the config file.
...
Because it may be a temporary URL.
Especially anoying in captive portal
Fix issue #368
This is a revert of the revert 0bc9b6f44e
With small changes
2013-06-21 00:34:28 +02:00
Daniel Molkentin
3bff5a061b
Network: Display actual error message next to code.
2013-06-20 20:02:25 +02:00
Daniel Molkentin
0bc9b6f44e
Revert "Do not store the redirected URL in the config file."
...
This reverts commit 905f70a186
.
Patch still has issues, defer until after Beta 4
2013-06-20 19:50:34 +02:00
Olivier Goffart
905f70a186
Do not store the redirected URL in the config file.
...
Because it may be a temporary URL.
Especially anoying in captive portal
Fix issue #368
2013-06-20 17:50:02 +02:00
Olivier Goffart
a8707b681d
Report proper error when csync_init fails
...
Fix mirall issue #705
2013-06-19 18:17:32 +02:00
Olivier Goffart
5d8f9f5346
Silent clang warning
2013-06-19 18:16:43 +02:00
Daniel Molkentin
46c7026726
Answer correctly if proxy auth is needed
...
Fixes #704
2013-06-19 12:48:36 +02:00
Daniel Molkentin
01ad3c4d81
Remove more dead code for readability
2013-06-19 11:31:09 +02:00
Daniel Molkentin
4ac98bde73
Remove dead code from StatusDialog
2013-06-18 17:38:20 +02:00
Olivier Goffart
1356a5bbaa
Fix reading the password from the config
...
The code was expecting pwdba to be in base64, which it was not if it
came from the "password" field
2013-06-18 14:19:37 +02:00
Olivier Goffart
3c320c2736
Credidentail dialog: it was suposed to be asynchronous
2013-06-18 14:19:37 +02:00
Olivier Goffart
969757199e
Fix changing the password when the password manager is not available
...
Leaving the state in NoKeychainBackend would break any further attempt
to get the password because CredentialStore::canTryAgain would return
false.
2013-06-18 14:19:37 +02:00
Daniel Molkentin
60f1c65a48
Don't lose proxy settings when changing passwords
2013-06-17 14:25:11 +02:00
Daniel Molkentin
b87b0e16e6
Avoid infinite loop if authcheck fails
2013-06-17 13:35:54 +02:00
Daniel Molkentin
8ed0b1be55
Teach ownCloud theme about QVariant
2013-06-13 16:31:38 +02:00
Daniel Molkentin
91b5f1076f
Theming cleanups
...
- remove splash screen pixmap
- remove backend icon (folderIcon())
- Move owncloud ad into owncloud theme
2013-06-13 12:56:20 +02:00