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
Daniel Molkentin
8ec2457965
Only change subtitle if the config file actually exists
2013-06-13 12:55:07 +02:00
Daniel Molkentin
82d79b1188
Remove folder from the scheduling queue
...
Not really needed, but cleaner
2013-06-12 12:42:02 +02:00
Olivier Goffart
e33601becd
Fix leak
2013-06-12 12:23:12 +02:00
Olivier Goffart
334443adbb
Fix crash when removing a folder
...
The problem is that the module_property of csync are not really tight to
a context, but are global to all the contextes.
Which means csync_owncloud may still have a pointer to the destroyed
context of the destroyed folder.
By always resetting the context pointer, we make sure there is no stale
pointers there
2013-06-12 12:23:12 +02:00
Daniel Molkentin
89438f7ace
Make SyncDisabler local to slotAddFolder
...
This also allows us to update the folder state as
soon as the wizard is being closed.
2013-06-12 09:27:20 +02:00
Daniel Molkentin
d323ec5dd9
FileItemDialog: more clarity in the label
...
- finished %n sec ago -> last finished %n sec ago
- switch to minutes after 60 seconds
2013-06-11 22:34:37 +02:00
Daniel Molkentin
bb5cf37330
Fix issues found after review
...
- use safer formatting
- remove unnecessary condition
2013-06-11 22:33:11 +02:00
Daniel Molkentin
4b0bdd648c
Do not repeat old strings
...
Fixes #678 , fixes #494
2013-06-11 22:14:32 +02:00
Olivier Goffart
5588fbe695
Fix clicking on the systray when the setup is not finished
...
We should raise the wizard
2013-06-11 21:32:44 +02:00
Olivier Goffart
12ea381205
Do not re-use the configuration wizard.
...
Create it on demand.
This allow yo alays keep a cleen state.
Mirall issue #668
2013-06-11 21:15:37 +02:00
Daniel Molkentin
99fbf25fb2
Keep the member variable, avoids double instanciation
2013-06-11 18:41:35 +02:00
Daniel Molkentin
b37645e14d
Revert "Put FolderWizard on the stack"
...
This reverts commit 1ec5a1aaa2
.
2013-06-11 18:33:39 +02:00
Daniel Molkentin
1ec5a1aaa2
Put FolderWizard on the stack
2013-06-11 18:19:09 +02:00
Daniel Molkentin
3eb7acde25
Folder wizard: use native separators in path lineedit
2013-06-11 18:18:38 +02:00
Daniel Molkentin
e53e39cfad
Remove obsolete members from enum
2013-06-11 18:17:34 +02:00
Daniel Molkentin
1a17f40233
Remove debug
2013-06-11 18:17:22 +02:00
Daniel Molkentin
10094a997a
Proxy Dialog: default to port 8080
2013-06-11 17:46:00 +02:00
Daniel Molkentin
2af38b093f
Fix status delegate
...
- remove magic values
- remove backend icon, put status icon in the front
- elide text when > list view width
- use list view font
2013-06-11 14:46:12 +02:00
Daniel Molkentin
b03c168175
Status dialog> Do not adjust pen when using Vista Style
...
Light blue and white are not contrasting enough
2013-06-10 21:29:45 +02:00
Daniel Molkentin
1c6bc84d2d
Wizard: Always initialize all labels
2013-06-10 21:29:45 +02:00
Olivier Goffart
541239c17b
Make the message box more explicit when all files have been removed
...
Also clean the db if the user wish to keep the files
2013-06-10 15:58:02 +02:00
Daniel Molkentin
74b4ade15a
Add missing return statement
2013-06-10 15:37:52 +02:00
Olivier Goffart
d2579a7754
Warn if we detect that all fles are about to be removed.
2013-06-08 15:41:53 +02:00
Daniel Molkentin
76580840dd
Fix misleading confirmation message
...
Fixes #459
2013-06-07 22:01:26 +02:00
Olivier Goffart
779e59156c
Added --logexpire to remove the log after some hours
2013-06-07 18:58:16 +02:00
Daniel Molkentin
b0f0d0b1cd
qDebug() ises local8bit, not utf-8.
...
Fixes #651
2013-06-07 17:28:04 +02:00
Daniel Molkentin
858dcb53bd
Status dialog delegate: Use font from option
2013-06-06 22:12:18 +02:00
Daniel Molkentin
9d7db88fcb
status dialog: Use contrast color for highlights
...
Fixes #440 .
2013-06-06 22:11:36 +02:00
Daniel Molkentin
2099b7c6a0
ensureJournalGone: fix logic
2013-06-06 21:43:05 +02:00
Daniel Molkentin
4442564ad2
Clean up slotAddFolder
...
Ensure folder sync scheduling is off in the meanwhile.
2013-06-06 21:27:15 +02:00
Daniel Molkentin
12148b5c9b
remove journal when adding a new sync on an existing folder
2013-06-06 17:59:50 +02:00
Daniel Molkentin
d7d77a49fc
Show help on Windows
...
We have no console, so show a message box.
2013-06-06 16:00:51 +02:00
Daniel Molkentin
0c959e8661
Windows: Log change of power state
2013-06-05 16:14:20 +02:00
Daniel Molkentin
0090862313
wizard: show native separators on folder chooser button
2013-06-04 00:46:34 +02:00
Daniel Molkentin
a4a68c6622
Wizard: Better wording when renaming failes
2013-06-03 23:34:28 +02:00
Klaas Freitag
49b4c341ae
Really unload folders before reconfiguring.
2013-06-03 17:27:06 +02:00
Olivier Goffart
7c1f91abdd
Add the --logdir commandline option
...
To log to a different file for every sync.
This also changed a QueuedConnection to AutoConnection, that way we
directly save the log from the main thread in the file without waiting
for the event loop (so if it crashes before, the log has been writen)
2013-06-03 16:25:41 +02:00
Klaas Freitag
1f2ba7e254
Handle rename fails for backup reasons correctly.
2013-06-03 15:47:39 +02:00
Klaas Freitag
8014bcb7c4
Check for emptiness before backuping the entire dir.
2013-06-03 15:47:07 +02:00
Klaas Freitag
b1c8bf5954
Fix backup name generation.
2013-06-03 15:46:41 +02:00
Klaas Freitag
0eb6740bac
Added default argument to terminateSyncProcess
2013-06-03 15:46:11 +02:00
Klaas Freitag
96531b548a
Minor Cleanups.
2013-06-03 15:45:28 +02:00
Klaas Freitag
f3371360ed
Check the CredentialStore state before fetching creds again.
2013-06-03 15:44:58 +02:00
Olivier Goffart
5bb4c3be43
TMP threaded
2013-06-03 10:43:21 +02:00
Daniel Molkentin
b028ca0738
Merge pull request #650 from manolopm/master
...
Fixes for windows client when setup server url customization
2013-05-31 07:25:09 -07:00
Daniel Molkentin
a9aab30d55
Display proxy errors
2013-05-31 16:16:56 +02:00
Daniel Molkentin
efbad3a3c8
Propagate proxy changes to csync at run time
2013-05-31 16:16:41 +02:00
Manuel Padron Martinez
b6ed959f98
Removes server url label if a custom url is defined
...
Signed-off-by: Manuel Padron Martinez <manolopm@gmail.com>
2013-05-31 04:46:26 +01:00
Manuel Padron Martinez
477953f965
Put wizard url customization before connect signals
...
Signed-off-by: Manuel Padron Martinez <manolopm@gmail.com>
2013-05-31 04:45:48 +01:00
Daniel Molkentin
aaf59cece5
Wizard: Normalize directory separators
2013-05-29 17:24:59 +02:00
Daniel Molkentin
e88b7e8ec2
Centralize User Agent string and use in UpdateDetector
2013-05-29 16:13:38 +02:00
Daniel Molkentin
078b09b5f4
Remove obsolete include
2013-05-29 16:12:42 +02:00
Daniel Molkentin
0d06fe764a
Status dialog: Use correct font metrics
...
This avoids cutting charcters such as 'y'.
2013-05-29 14:46:02 +02:00
Daniel Molkentin
94f8c39a9e
Proxy settings: Also keep proxy user/pwd
...
make sure not to use it when the user
has asked us not to.
Simplify setupProxy()
2013-05-29 12:56:23 +02:00
Daniel Molkentin
7d1bd9da86
Properly deal with SOCKS proxies
...
Fixes #10
2013-05-29 02:14:40 +02:00
Daniel Molkentin
ed8cdf6910
Remember proxy settings even after switching type
...
Fixes #649
2013-05-29 01:41:04 +02:00
Daniel Molkentin
7ee83847c8
Do not try to reset the wizard when visible
2013-05-29 01:30:00 +02:00
Daniel Molkentin
52eca1362f
Delete QWizard on destruction
2013-05-29 01:29:56 +02:00
Daniel Molkentin
eec1af09c4
Wizard: Fix rich text label layouting
2013-05-29 01:17:12 +02:00
Daniel Molkentin
c651c8cbf9
Wizard: Improve wording.
2013-05-29 01:16:52 +02:00
Daniel Molkentin
da6a398624
Wizard: Warn on re-setup with multiple folders
2013-05-28 20:25:31 +02:00
Daniel Molkentin
1418512a9f
More cheating on proxies: Add OS to User-Agent
2013-05-28 19:35:30 +02:00
Daniel Molkentin
dd2859880b
Set User-Agent to contain Mozilla/5.0 string
...
A blatant lie for a blatant abuse of Firewall filters.
2013-05-28 15:44:41 +02:00
Daniel Molkentin
f38d8ba2e4
Improve wizard in edit mode
2013-05-28 14:51:49 +02:00
Daniel Molkentin
fdd52a2520
Kill non-boxed mode for now
2013-05-28 14:51:48 +02:00
Daniel Molkentin
e2c0792043
take local folder path from property
...
This gets set by slotSelectFolder() and from the wizards caller.
2013-05-28 14:51:41 +02:00
Daniel Molkentin
e8889530b0
Fix owncloud theme icon
2013-05-28 14:42:41 +02:00
Klaas Freitag
23f67d950a
Handle password change correct, add "sync from scratch".
...
The setup wizard now destinguishes if there was already a configuration
or not. If yes, it's going to password-change mode. Also added a checkbox
that allows to start a sync from a cleared local directory.
2013-05-26 14:04:11 +02:00
Klaas Freitag
0bd1f507ab
Added a checkbox "start sync from scratch".
2013-05-26 13:57:28 +02:00
Klaas Freitag
2bcfc143f6
Let the folderman create a new sync directory.
...
If a sync directory exists its moved to a backup path and created new.
That allows to start a sync "from scratch".
2013-05-26 13:56:51 +02:00
Klaas Freitag
9dc21bf8a3
Let the keychain return new creds during async save.
...
The credentials are asynchronously saved. The credentialstore now returns
the creds even if the saving has not yet finished but is running, for that
the new state AsyncWriting was added. That makes the start of the sync
after the password was changed more reliable.
2013-05-26 13:55:23 +02:00
Klaas Freitag
70f627ba06
Fix the folder setup wizard.
2013-05-24 09:54:48 +02:00
Daniel Molkentin
0683c26d41
Make setting custom folders work again
...
Also, ensure that opening the local directory from the wizard
will work on Windows.
2013-05-23 01:51:05 +02:00
Daniel Molkentin
dbc085d4d4
Fix systray class when built without FDO support
2013-05-22 17:39:49 +02:00
Daniel Molkentin
804eaa700e
Remove bogus debug output
2013-05-22 15:58:54 +02:00
Daniel Molkentin
62ad2f19e3
Setup Wizard: Make server/folder buttons work
2013-05-21 14:25:31 +02:00
Daniel Molkentin
14f55420f9
Remove obsolete connect statement
2013-05-21 14:20:56 +02:00
Daniel Molkentin
d4ea0ba6ba
Merge branch 'master' of git://github.com/gnumdk/mirall
...
Conflicts:
CMakeLists.txt
As per PR 457
2013-05-20 16:54:49 +02:00
Daniel Molkentin
3a50eece9e
More theming refactoring
2013-05-17 20:56:17 +02:00
Daniel Molkentin
44f0fb0242
Fix broken include
2013-05-17 20:12:31 +02:00
Daniel Molkentin
c210e2b72f
Remove obsolete miralltheme
2013-05-17 20:11:16 +02:00
Daniel Molkentin
0f03b47a46
Make new connection wizard themable
2013-05-17 18:05:22 +02:00
Daniel Molkentin
c923e0803e
Add SyncResult::SyncPrepare case to FileItemDialog
2013-05-17 12:33:02 +02:00
Klaas Freitag
f334b6349b
Add a call to quit to make the thread ending the loop
2013-05-16 17:35:40 +02:00
Olivier Goffart
07ce6cfa79
don't use member variable of the propagator
2013-05-16 14:50:36 +02:00
Olivier Goffart
9ce47c9675
make the propagator asynchronous
2013-05-16 13:54:22 +02:00
Klaas Freitag
2ff9fcfa1d
Fix crash if _thread is not initialized before.
2013-05-16 13:26:05 +02:00
Olivier Goffart
40255d643c
propagator-ng: adapt to the merge of rename_folders branch
2013-05-15 15:22:20 +02:00
Olivier Goffart
b31200a6f2
propagator-ng: fix setting the mtime
2013-05-10 13:20:21 +02:00
Olivier Goffart
98cbb599b8
Fix handling of conflicting directories
...
We can safely ignore them in the propagator
2013-05-10 12:35:10 +02:00
Daniel Molkentin
302fdeb1f9
Use UTF-8 for basic auth
...
Slightly off-specs, and fails for non UTF-8 setups,
but the ownCloud server itself expects UTF-8 encoding.
2013-05-09 22:01:39 +02:00
Daniel Molkentin
eea8542fc0
Quit app/abort sync gracefully.
2013-05-09 21:55:28 +02:00
Olivier Goffart
ecd314cef5
Give the tmp file a proper hidden and excluded name
2013-05-08 14:31:52 +02:00
Olivier Goffart
0b1ecd0ac6
propagator-ng: Abort on fatal error
2013-05-08 13:30:30 +02:00
Olivier Goffart
2193da0ab5
Fix a few FIXME
2013-05-07 17:47:29 +02:00
Olivier Goffart
7cd12e7dc5
remove some FIXME
2013-05-07 17:16:11 +02:00
Olivier Goffart
685bf395be
propagator-ng: resume uploads
...
Currently i think it corrupt the files
2013-05-06 18:41:56 +02:00
Olivier Goffart
0636ae6f28
propagator-ng: be able to resume download
2013-05-06 16:59:11 +02:00
Olivier Goffart
7f8eba3700
propagator-ng: set the modtime on downloaded files
2013-05-06 12:09:21 +02:00
Olivier Goffart
02957aba45
propagator-ng: Emit the fileReceived signal
2013-05-05 12:46:40 +02:00
Klaas Freitag
2e53e2e4e0
Really return true in case of error.
2013-05-05 12:34:38 +02:00
Klaas Freitag
721a8f79ab
Improve error handling, add error string to each individual file item.
2013-05-05 11:47:19 +02:00
Olivier Goffart
ecaf66db5d
style: use _ in front of member variable
2013-05-05 11:32:12 +02:00
Olivier Goffart
0c775aba6d
propagator-ng: get the etag also in the GET request
2013-05-05 11:32:12 +02:00
Olivier Goffart
71b238031f
Fix compilation after previous rebase
2013-05-05 11:32:12 +02:00
Olivier Goffart
662bd4e5fe
propagator-ng: handle conflict
...
Always download the file from the server.
And if they are equals, ignore the conflict
2013-05-05 11:17:42 +02:00
Klaas Freitag
c956d11183
More error handling of propagator, some cleanups.
2013-05-04 17:14:47 +02:00
Klaas Freitag
7df23a1b19
Proper error reporting of propagator - WIP
2013-05-04 17:14:47 +02:00
Daniel Molkentin
be5c1b2072
Fix build
2013-05-04 16:38:39 +02:00
Olivier Goffart
264cc73806
Implement renaming on windows
...
(Not actually tested)
2013-05-04 16:18:13 +02:00
Daniel Molkentin
f0bd1ea48e
Add connectionvalidator class
2013-05-04 16:01:45 +02:00
Olivier Goffart
c041076c95
Handle renames
2013-05-04 15:32:11 +02:00
Daniel Molkentin
c15ce2b20b
Remove last traces of localRun
2013-05-04 15:16:53 +02:00
Daniel Molkentin
b51f210bfa
Drop (broken) mirall binary
...
This remove all non-ownCloud backends, as well
as all obsolete wizard pages. CSync is now
a mandatory dependency.
2013-05-04 14:03:51 +02:00
Olivier Goffart
e1e8842548
New owncloud propagator that skip the vio abstraction layer
...
The vio abstraction layer within csync is inneficient for the owncloud
use case because not all calls maps well to the POSIX interface. We can
be much more efficient by doing exactly what we need.
Also, this will allow us to scedule better the calls and possibly to use
threads.
2013-05-04 11:02:30 +02:00
Daniel Molkentin
105c76c055
Fix sizing problems in the new wizard dialog.
2013-04-30 21:51:48 +02:00
Daniel Molkentin
6b15b7a58f
Update detector: make it possible to skip updates.
...
Fixes issue #588 .
2013-04-30 17:46:07 +02:00
Daniel Molkentin
fee0aae975
new wizard: Better separate folder names in strings.
2013-04-30 17:46:07 +02:00
Klaas Freitag
1e677a5f0f
Fixed default target dir to / and fixed logging text.
2013-04-30 13:53:13 +02:00
Klaas Freitag
a215e11b20
Merge development branch with new setup dialog.
2013-04-29 10:20:01 +02:00
Klaas Freitag
c848ff4bdb
New setup dialog, simplified version.
2013-04-27 22:24:32 +02:00
Klaas Freitag
5aa8f5bc01
Added own CookieJar to not return a Session Cookie, rem Auth Callback
...
The auth callback is not needed as we send an Basic Auth header.
2013-04-27 22:22:20 +02:00
Klaas Freitag
6c5d5a543c
Simplified config file write method, removed don't store pwd.
2013-04-27 22:21:28 +02:00
Daniel Molkentin
2789522948
Folder/ownCloudFolder: Clean up secondPath stuff
2013-04-25 16:06:31 +02:00
Klaas Freitag
fab77a15f0
Fix build after merge
2013-04-24 13:33:26 +02:00
Klaas Freitag
c5a674b1df
More work on new Connection dialog. First working version.
2013-04-24 11:40:29 +02:00
Klaas Freitag
7cc73ed46c
Merge feature branch that introduces non terminating csync.
2013-04-23 16:52:02 +02:00
Klaas Freitag
8928c87fc3
Removed silly configDir hack from thread.
2013-04-22 15:06:28 +02:00
Mario Enrico Ragucci
de99c0c7e7
Silently ignore "installed = true" string in JSON string returned by status.php
2013-04-21 00:46:37 +02:00
Klaas Freitag
9f0348979b
Simplify csyncthread with keeping csync ctx intact
2013-04-20 13:15:27 +03:00
Daniel Molkentin
ea85d68a26
Revert non-working hack
2013-04-19 16:20:30 +02:00
Daniel Molkentin
fb0a883f7b
Init member to 0, remove nonsensical if (foo) delete foo
2013-04-19 16:20:30 +02:00
Daniel Molkentin
1f361b7260
Make certificateChain() thread safe
...
Fixes #487 , #491 , #454
2013-04-18 14:02:20 +02:00
Klaas Freitag
a4be3f304d
Set log verbosity before calling csync_init.
2013-04-17 15:29:44 +02:00
Daniel Molkentin
844d8eba47
Fix tr plural usage
2013-04-17 01:21:15 +02:00
Daniel Molkentin
5e65945a53
filitemdialog: more wording changes
2013-04-16 17:28:03 +02:00
Daniel Molkentin
428040762f
fileitemdialog: GUI feedback for the copy action
2013-04-16 16:49:53 +02:00
Daniel Molkentin
30e0a13bc5
invalid password: Improve wording
2013-04-16 14:28:00 +02:00
Daniel Molkentin
275c2b1a6b
Fix misleading balloon titles
...
Fixes #546
2013-04-16 11:24:07 +02:00
Daniel Molkentin
acdb624713
safer approach for detecting duplicate sync runs
2013-04-15 15:55:54 +02:00
Daniel Molkentin
3cae8e7124
Remove debugging code
2013-04-15 14:32:23 +02:00
Daniel Molkentin
fcde01fd4c
Clarify string in folder wizard
2013-04-11 10:57:19 +04:00
Klaas Freitag
aa6160ab62
Fixed some valgrind warnings.
2013-04-08 14:50:47 +02:00
Daniel Molkentin
f74aa1e9a6
terminate if more than one thread is being started.
2013-04-04 17:25:53 +02:00
Klaas Freitag
86525570aa
Fix default config storage path.
2013-04-04 15:19:45 +02:00
Klaas Freitag
be5a50a000
Merge branch 'confdir' of https://github.com/smessmer/mirall into smessmer-confdir
2013-04-03 14:42:13 +02:00
dragotin
7309a894bc
Merge pull request #477 from rominf/master
...
Fix for bug with folders adding
2013-04-03 04:39:17 -07:00
Daniel Molkentin
d68c4b379f
Unbreak self-signed certificate handling
2013-04-02 15:22:27 +02:00
Klaas Freitag
bec2f7c9b9
Removed verbose logging on Win32.
2013-03-28 11:14:16 +01:00
Daniel Molkentin
0ad2bd4b91
Add favlink generation support for Nautilus
2013-03-25 18:00:58 +01:00
Markus Goetz
d7a93c74aa
OS X: Fix creation of Finder Favorite
2013-03-25 14:57:34 +01:00
rominf
a8f0e79046
Skipping folders with no absolute path.
2013-03-23 10:48:37 +04:00
Daniel Molkentin
1831a975eb
SSLErrorDialog: We cannot use the existing key chain
...
... use the one returned by the new server instead.
2013-03-22 14:59:22 +01:00
Cedric Bellegarde
8165b83a27
Check for service availability
2013-03-22 11:58:55 +01:00
Cedric Bellegarde
fa62c270e6
Merge git://github.com/owncloud/mirall
2013-03-22 11:40:58 +01:00
Cedric Bellegarde
f346503534
Better fdo detection
2013-03-22 11:34:21 +01:00
Daniel Molkentin
337c6d3e4e
Try to avoid crash on Mac OS during setup
...
... by moving setupFavLink to a place only called
if the folder to be referenced exists for sure.
2013-03-21 12:50:47 +01:00
Daniel Molkentin
c633302f31
Use the certificateChain() in the SSL error dialog
...
This includes the self-signed certificate anyway, and the previous
behavior led to funny side-effects.
2013-03-20 15:53:55 +01:00
Cedric Bellegarde
1315ca2a57
Move files to correct location
2013-03-20 10:19:55 +01:00
Cedric Bellegarde
2f0474a467
Add support for freedesktop notifications
2013-03-20 10:03:49 +01:00
Daniel Molkentin
284285d441
Do not follow symlinks when recursing
...
We do not support symlinks anyway
2013-03-18 14:12:25 +01:00
Klaas Freitag
9d2c3ebad3
Move config.h out of header files.
2013-02-25 09:54:19 +01:00
Daniel Molkentin
ad063b0634
Make chinese translations work on OS X
...
... by mapping chinese script codes to country
codes as used by Qt and Transifex.
2013-02-24 15:44:38 +01:00
Daniel Molkentin
8765538458
Be more permission when loading languages
...
Accept languages when they only exist for mirall,
but not for Qt and QtKeychain (Fixes #359 ). This
is more permissive than before, but while fixing
#359 , it became evident that supporting "partial"
translations might actually be beneficial.
2013-02-24 15:44:38 +01:00
Daniel Molkentin
e85291c4ba
en language is implied
2013-02-21 15:17:13 +01:00
Klaas Freitag
4ba85311da
Handle all cases in switches.
2013-02-21 13:36:51 +01:00
Daniel Molkentin
3cf7003101
Load UI languages instead of locales where possible
...
Load Qt translations consistently along the way.
This only has been verified on mac and needs adoption
for win32.
2013-02-21 13:19:54 +01:00
Klaas Freitag
ae558a5889
Add a appNameGUI method to the theming.
2013-02-21 12:21:42 +01:00
Klaas Freitag
55a4fd752d
Fix commit fd83bf - add treewalk success check.
2013-02-20 17:26:07 +01:00
Klaas Freitag
136b699106
Make sure to restart sync after folder add.
2013-02-20 16:06:46 +01:00
Klaas Freitag
fd83bf2089
Remove unused variable doTreeWalk.
2013-02-20 10:06:45 +01:00
Klaas Freitag
817039ddf3
Simplify and fix startup: Steer starting of sync from folderman.
2013-02-19 17:24:10 +01:00
Klaas Freitag
6d6deaf6c4
Setup folders added after setup wizard ended.
2013-02-19 12:04:36 +01:00
Klaas Freitag
9c63b89bac
Removed useless warning.
2013-02-19 09:34:33 +01:00
Klaas Freitag
ec120cd64c
Make folderman load folders at start and update later.
2013-02-18 18:31:29 +02:00
Klaas Freitag
a9173b1aa1
Add setters for update check and max log lines
2013-02-18 17:17:03 +02:00
Klaas Freitag
89f7f75af2
If a new server is configured, take the proxy config to the new config
...
file.
2013-02-18 17:16:10 +02:00
Daniel Molkentin
8809ac0c4a
remove unused connect
2013-02-18 14:56:50 +01:00
Daniel Molkentin
7a03164a9a
Handle server offline state on application start gracefully
2013-02-18 14:56:50 +01:00
Daniel Molkentin
38954c2193
Remove obsolete signal.
2013-02-15 19:29:38 +01:00
Daniel Molkentin
5954fb280c
Centralize error handling for csync steps
...
...as a preparation for offline handling.
As a side-effect, removed the last instance
of goto in mirall.
2013-02-15 19:29:27 +01:00
Daniel Molkentin
8e63652fb3
Send OEM string to update detector.
2013-02-15 18:39:25 +01:00
Daniel Molkentin
1c70fb3ba4
Set csync config dir in mirall properly
...
Otherwise canceling the sync cannot remove the lock file
2013-02-14 17:36:11 +01:00
Daniel Molkentin
e5af8e87b3
Fix crash when pausing mirall.
2013-02-14 17:36:11 +01:00
Daniel Molkentin
bfbec24f43
Add more debug in case inotify fails
...
We should probably make this at least a visible error, because it's a
limitation set by the kernel/the distro and we would require root
permissions to adjust the value.
Right now all that happens is that syncing is not immediate, but only
run every 30 secs (due to server polling).
2013-02-14 17:36:11 +01:00
Daniel Molkentin
8dd97a358a
Introduce SyncPrepare state
...
SyncPrepare is when the folder class prepares the actual syncing,
i.e. does treewalks and runs the reconceiler in case of mirall. The actual
SyncRunning state will only be entered if there is actually anything to
sync.
Fixes #289
2013-02-14 17:36:11 +01:00
Daniel Molkentin
7290afc6fe
Minimize Sync notification notification
...
Notifies only in the end of a complete sync run now
Migitates/fixes #314
2013-02-14 17:36:11 +01:00
Daniel Molkentin
2ba20369ea
Remove unused gitfolder class for now
2013-02-14 17:36:11 +01:00
Daniel Molkentin
804aef6548
Remove stray code
2013-02-14 17:36:11 +01:00
Daniel Molkentin
85f49b6af4
Fix guard position
2013-02-14 17:36:11 +01:00
Daniel Molkentin
68afc6011d
proxy dialog: no extra heading
2013-02-14 17:36:11 +01:00
Daniel Molkentin
524ffcd0e1
owncloud setup: Fix label style
2013-02-14 17:36:11 +01:00
Klaas Freitag
6d984b505d
Handle not stored password correctly.
2013-02-11 14:21:53 +01:00
Klaas Freitag
8d9336f9f4
Removed obsolete scheduler start.
2013-02-11 14:21:21 +01:00
Klaas Freitag
2b5e694181
Set default argument to method.
2013-02-11 14:20:32 +01:00
Klaas Freitag
aa983e4966
Make user password dialog real async working.
2013-02-11 14:18:45 +01:00
Klaas Freitag
424b3a9dfc
cleanup comments and dupes.
2013-02-11 14:18:16 +01:00
Klaas Freitag
4501ec10dc
Make sure that journals are wiped if server changes + some utility
...
functions.
2013-02-10 20:04:03 +01:00
Klaas Freitag
699ae176df
Revert "Allow setting of custom poll interval through status.php"
...
This reverts commit 39a89e8fc7
.
Conflicts:
src/mirall/folderman.cpp
src/mirall/folderman.h
2013-02-10 14:57:57 +01:00
Klaas Freitag
cac5f81388
Clear pending network requests in setup wizard on back.
2013-02-10 14:03:09 +01:00
Klaas Freitag
28af8068e9
Always return QNetworkReply* on mkdir and also on checkInstall.
2013-02-10 14:01:38 +01:00
Sebastian Kügler
a1d64af7b1
API additions for the Plasma client
...
This patch contains a few (source-compatible) API additions needed for
the Plasma client.
* return QNetworkReply* to caller for tracking status and error of
requests such as mkdir, getWebDAVPath and getRequest
* Add a setter for the QNetworkAccessManager. This allows us to route at
least some of the network requests through KIO in the Plasma client
* Add a setter for the remotePollInterval. This should be enough API to
* make it possible to adapt the polling interval to the client's machine
state, e.g. sync less often on battery, or somesuch
2013-02-10 13:10:53 +01:00
dragotin
edbb79b79c
Merge pull request #5 from sebasje/mkdirreply
...
Return QNetworkReply from remote mkdir
2013-02-10 02:34:36 -08:00
dragotin
a000a7b52e
Merge pull request #4 from sebasje/requestreply
...
Return QNetworkReply from getRequests
2013-02-10 02:34:14 -08:00
Klaas Freitag
0a427541d6
Added config file setter for poll interval. Thx for pull request.
2013-02-10 11:27:21 +01:00
Klaas Freitag
1c297c56a2
Stop authentication tries already after the first attempt without
...
success.
2013-02-10 11:02:39 +01:00
Klaas Freitag
6f9bbc431d
Properly stop syncing when connection manager opens.
2013-02-10 11:02:39 +01:00
Klaas Freitag
f62626e3eb
Delete existing folders properly before adding new ones.
2013-02-10 11:02:38 +01:00
Klaas Freitag
39a89e8fc7
Allow setting of custom poll interval through status.php
2013-02-09 14:04:04 +01:00
Klaas Freitag
38a8096732
Fixed sorting of header entries, ie. public / protected / private.
2013-02-09 14:03:05 +01:00
Klaas Freitag
d358c839ce
Fixed typos.
2013-02-09 12:46:08 +01:00
Klaas Freitag
07258deaaf
Fix build for mirall target.
2013-02-06 15:05:34 +01:00
Klaas Freitag
7b53e0f953
Fix return from non void function.
2013-02-06 14:58:31 +01:00
Klaas Freitag
2ac764bd1a
Fix compile without OWNCLOUD_CLIENT define, thx Jenkins
2013-02-06 11:58:14 +02:00
Klaas Freitag
82d2851a6b
Set username in connection dialog if there.
2013-02-06 11:42:36 +02:00
Klaas Freitag
7a3be71452
The user name is not really to be protected.
2013-02-06 11:41:47 +02:00
Klaas Freitag
977a513ee5
Always set the connect result to en/disable the Finish button.
2013-02-06 11:21:50 +02:00
Klaas Freitag
22cbebb7a7
Fix build on debian with ancient Qt, thanks Mr. Jenkins for notifying.
2013-02-06 10:41:25 +02:00
Klaas Freitag
72b2e6778a
Use new ownCloudInfo / CredentialStore interface.
2013-02-06 10:09:02 +02:00
Klaas Freitag
08babbf38d
Set credentials in ownCloudInfo after these have been fetched.
2013-02-06 10:09:02 +02:00
Klaas Freitag
2ae5ae6962
Change interface to not support customHandles.
2013-02-06 10:09:02 +02:00
Klaas Freitag
fa6331a40a
Removed use of CredentialStore from class and added setter for
...
credentials.
This makes handling of temporar credentials for the setup dialog easier
and streamlines the code.
2013-02-06 10:09:02 +02:00
Daniel Molkentin
0bcb65db29
Do not allow to press Finished if connection to the server fails
...
This does not yet consider cases where the connection
succeeds but webdav fails.
2013-02-05 15:40:59 +01:00
Daniel Molkentin
fd30d8b0d1
Typo
2013-02-03 13:39:34 +01:00
Daniel Molkentin
5944acf8a6
Hack: Do not leak FDs when neon is built with gnutls (Linux)
...
Previously, this would cause Mirall to crash sooner or later.
Fixes #154
2013-02-03 13:37:03 +01:00
Michael Kent
854852959c
Changes to handling of command line options. Fix a segmentation fault with owncloud --help. Add -h as help short. If a commandline argument isn't recognized, print that it isn't recognized, print help, and abort.
2013-01-28 22:19:14 -06:00
Daniel Molkentin
d681066dc2
Results bubble: _localPrefix might not end in a separator
2013-01-26 20:47:20 +01:00
Daniel Molkentin
11e06c33db
Fix compilation on win/mac
2013-01-25 15:46:23 +01:00
Daniel Molkentin
c0f2f5bcaa
Load Qt translations from app dir/bundle, too
2013-01-25 15:41:18 +01:00
Klaas Freitag
4fac62560e
Removed remove of list of configured sync folder on reconfiguration.
...
The removal of the configured folders was needed as long as the
csync journal was based in on the folder name of the sync folder.
Now that every folder has its own sync journal its not longer needed.
2013-01-25 11:33:00 +01:00
Daniel Molkentin
aca965f111
Fix favlink generation on windows
2013-01-23 17:22:38 +03:00
Daniel Molkentin
5dbd987df3
Mirall != owncloud client. Move about dialog to theme.
2013-01-23 13:45:50 +01:00
Daniel Molkentin
e37fc8c6e5
tr: Don't hardcode app name in string
2013-01-23 13:45:50 +01:00
Klaas Freitag
7614776e10
Fixed isComplete() for credential setup dialog.
2013-01-23 10:57:45 +01:00
Daniel Molkentin
e0332deffc
SSL: Use better test.
...
The other one was not working anyway.
2013-01-22 15:29:14 +01:00
Daniel Molkentin
afe6caf406
Remove stray object
2013-01-22 15:29:14 +01:00
Klaas Freitag
862a9d938c
Handle missed case in switch statement.
2013-01-22 15:08:04 +01:00
Klaas Freitag
80108727c4
Linux: Work around keychain shortcoming if chain does not contain
...
a password entry.
2013-01-22 12:08:56 +01:00
Klaas Freitag
84e3d6278d
Check for empty user in keychain key.
2013-01-21 18:36:03 +01:00
Klaas Freitag
a1bf324f47
normilize url before writing, error checks.
2013-01-21 16:33:52 +01:00
Klaas Freitag
1b8f7059e3
Fix pre initialization of _state in fetchCredentials().
2013-01-21 15:23:44 +01:00
Daniel Molkentin
7794480da0
csync: Put up the QNAM key chain for comparison
...
Comparing with the CA certs will not help with
intermediates, and other cases.
2013-01-21 13:33:33 +01:00
Daniel Molkentin
0171b8b998
Make hash formatting static
...
no need for class instanciation.
2013-01-21 13:33:33 +01:00
Klaas Freitag
915764cc52
If credentials are ok, do not fetch them again from store.
2013-01-21 13:32:52 +01:00
Klaas Freitag
76653fcedb
Minor: removed bogus stuff.
2013-01-21 11:43:39 +01:00
Daniel Molkentin
0f36dc03c4
FileItemDialog: Add copy to clipboard functionality
2013-01-17 10:35:08 +01:00
Daniel Molkentin
5e3f2cf25a
Remove legacy configuration options.
...
They were not used anyway.
2013-01-16 18:03:40 +01:00
Daniel Molkentin
f678629734
Fix proxy auth
...
- The port was not set correctly
- The password was read base64 encoded, but not read stored as such
2013-01-16 17:50:26 +01:00
Daniel Molkentin
87df74e4d0
Fix: pause icon not visible
2013-01-16 14:41:12 +01:00
Daniel Molkentin
45c82a2746
Go offline when server is in maintenance.
2013-01-16 14:41:12 +01:00
Klaas Freitag
bc3938daa7
A new sync file protocol dialog.
2013-01-15 20:42:09 +01:00
Klaas Freitag
07034daffe
Take valid caList from QSslSocket::defaultCA.
2013-01-14 12:13:51 +01:00
Klaas Freitag
dca8ecb929
Remove bogus spaces.
2013-01-14 12:13:50 +01:00
Klaas Freitag
dd2eecec42
Remove bogus reset after creds were written.
2013-01-14 12:13:50 +01:00
Sebastian Meßmer
4caca2ce1a
The configuration directory is a static attribute in mirallconfigfile class
2013-01-14 00:48:26 +01:00
Daniel Molkentin
280dd205d9
setup wizard: Improve wording and context
2013-01-11 17:10:31 +01:00
Daniel Molkentin
5c495265f4
Consolidate theming support.
...
This implements out-of-repository-theming, and removes the old
custom.ini theming that never worked on all platforms and had
no straight deployment story.
The new approach requires the CMAKE variable OEM_THEME_DIR to
point to a directory that must at least contain an OEM.cmake file
(check OWNCLOUD.cmake for possible options) as well as a themes.qrc
and a themes/ directory that directly correspond to the ones in
the source tree.
2013-01-10 17:16:59 +01:00
Daniel Molkentin
9cdf2d8150
Remove potentially dangerous processEvent calls
2013-01-10 17:16:58 +01:00
Sebastian Meßmer
e0645b4b63
Allow setting the configuration directory on command line
2013-01-02 19:08:14 +01:00
Daniel Molkentin
4ce55a44ba
Klaas > Danimo, I am rather unpolite...
...
Also, fix whitespace errors
2012-12-21 01:16:54 +01:00
Klaas Freitag
f4019f5a5a
Show backend error messages to user.
2012-12-20 20:51:43 +01:00
Daniel Molkentin
e6b9c16d04
Update About dialog
2012-12-20 20:35:21 +01:00
Daniel Molkentin
488943aaa0
Correct inheritance in status dialog
2012-12-20 17:36:10 +01:00
Klaas Freitag
c3f6153f94
Fixed QString -> const char* conversions to handle UTF8 correctly.
2012-12-20 16:49:29 +01:00
Klaas Freitag
87aa3d7c60
More detailed error handling.
2012-12-20 16:49:29 +01:00
Klaas Freitag
144a2832b9
Loop over all certificates to match the approved one.
2012-12-20 16:49:29 +01:00
Daniel Molkentin
26c01cefa7
New icons for ownCloud client
...
--monoicons shows platform-specific monochrome icons
for now until we have a proper settings dialog.
2012-12-20 16:41:54 +01:00
Klaas Freitag
30494eee75
Added utility class with format fingerprint method.
...
Removed other obsolete formatting method.
2012-12-13 21:36:44 +01:00
Klaas Freitag
eb0782ec90
Check certificate fingerprints reported back from neon.
2012-12-13 19:52:22 +01:00
Klaas Freitag
c6edde1365
Fix merging.
2012-12-13 19:52:07 +01:00
Daniel Molkentin
6e3b5e075a
Fix crash
2012-12-12 20:06:59 +01:00
Daniel Molkentin
8b8d78f456
Improved version of popup-notify
2012-12-12 19:30:37 +01:00
Daniel Molkentin
3cb2e74d12
Notify user about new files.
...
Let's see if its too annoying,
we can still add a timer later
2012-12-12 15:00:38 +01:00
Daniel Molkentin
41082c5e81
Fix proxy error
...
This was caused by an incorrect translation to a string type.
2012-12-12 15:00:38 +01:00
Klaas Freitag
5da634ed70
Transparent fallback to the former password storage if keychain is not
...
there.
2012-12-11 15:08:20 +01:00
Klaas Freitag
edfefabcf8
Use two step process to store credentials through config file.
2012-12-08 22:56:48 +01:00
Klaas Freitag
9c627782d4
Use a two step process to store credentials for setup dialog.
2012-12-08 22:55:46 +01:00
Daniel Molkentin
ba9f46ef49
Make Windows-version of Add to Favorites work
...
I committed a WiP before...
2012-12-07 20:20:40 +01:00
Daniel Molkentin
5502087017
Fix windows build
2012-12-07 19:53:36 +01:00
Daniel Molkentin
5510135084
Fix formatting hashes
2012-12-07 19:51:11 +01:00
Daniel Molkentin
ddecca47fd
osx/win: add sync folders to favorite folders
2012-12-07 19:51:11 +01:00
Klaas Freitag
1eabdee253
Enable logging through new csync logging api
2012-12-07 09:03:24 +01:00
Klaas Freitag
029535bcea
Removed another scary thing: qstrdup for proxy type.
2012-12-06 19:05:25 +01:00
Daniel Molkentin
4ef89abac7
Compile on Mac
2012-12-06 18:48:36 +01:00
Klaas Freitag
8af257a4cd
Start fs watching with a delay of 2 seconds to don't catch the journal changes.
2012-12-06 18:38:45 +01:00
Klaas Freitag
a124dcd4e8
More cleanups that were possible by the new notify api.
2012-12-06 18:38:06 +01:00
Klaas Freitag
fbae2d7330
Further cleanups that were possible by new change notification.
2012-12-06 18:35:02 +01:00
Klaas Freitag
f296fad4bb
Set csync context as module parameter
2012-12-06 17:57:00 +01:00
Daniel Molkentin
e2d8105f0d
Remove debug
2012-12-06 17:54:44 +01:00
Daniel Molkentin
287c073f00
Remove code for local sync runs
...
Rely entirely on folderwatcher. Local
sync runs can be implemented in terms
of a dummy folderwatcher if we want
to support systems without fs monitoring
again..
2012-12-06 17:53:04 +01:00
Daniel Molkentin
138a060df2
Fix Windows folder watcher
2012-12-06 17:53:04 +01:00
Daniel Molkentin
6678beadab
Hack: Sleep 2 secs after sync run
...
This avoids that we get notified by the system
about writing of the csync db (IO has latency).
2012-12-06 17:53:04 +01:00
Daniel Molkentin
cab503bb2b
CredentialStore: Fix off-by-one
2012-12-06 17:53:04 +01:00
Daniel Molkentin
f20db6bbc1
Implement folder watching for OS X using FSEvents
2012-12-06 17:53:04 +01:00
Daniel Molkentin
d50d4d1a6f
Add windows backend, require Inotify on Linux
...
Dummy-backend yanked for now, no support for other Unixes...
2012-12-06 17:53:04 +01:00
Daniel Molkentin
b65fd11a36
Remove superfluous include
2012-12-05 16:46:27 +01:00
Daniel Molkentin
36c9a29a7b
Move Logger into its own file, move it to libsync.
...
This fixes a linker error.
2012-12-05 16:45:28 +01:00
Klaas Freitag
6ba098d26d
Make use of the new csync_set_module_properties and remove stuff from
...
before.
2012-12-05 12:30:28 +01:00
Daniel Molkentin
214261e764
pimpl folderwatcher
2012-12-04 18:24:25 +01:00
Klaas Freitag
b74cfcfec5
Add missing ifdef QTKEYCHAIN.
2012-12-04 18:11:24 +01:00
Daniel Molkentin
bc67756ff6
Fix typo
2012-12-04 17:48:14 +01:00
Daniel Molkentin
eccd12923b
factor inotify out of folderwatcher
2012-12-04 17:48:14 +01:00
Klaas Freitag
5d958a4c07
Make use of QKeyChain if its there.
2012-12-04 17:27:59 +01:00
Klaas Freitag
22128781be
Use new logging api of csync.
2012-12-04 17:24:46 +01:00
Klaas Freitag
34dcff4ce2
Add a ownCloudWizard finished slot.
2012-12-04 17:05:17 +01:00
Klaas Freitag
bcbdfdd7ab
Some cleanups to avoid build warnings under win32.
2012-12-04 17:05:17 +01:00
Dominik Schmidt
097be61c9f
Fix QT_STRICT_ITERATOR errors
2012-11-28 23:31:03 +01:00
Daniel Molkentin
b349caeab1
Build with ancient GCC (4.2 on Mac OS)
2012-11-28 12:03:36 +01:00
Klaas Freitag
593636f135
User feedback on wrong passwd from KeyStore.
2012-11-28 10:44:25 +01:00
Klaas Freitag
70ea325c75
Do not commit devel hardcoded to KeyChain
2012-11-28 10:44:25 +01:00
Klaas Freitag
1a9a9cb402
More QtKeyChain integration.
2012-11-28 10:44:25 +01:00
Dominik Schmidt
2b2eb853fc
Add qtkeychain to cmake - WIP read password from keychain.
...
Conflicts:
CMakeLists.txt
2012-11-27 19:28:03 +01:00
Klaas Freitag
f20bbe05bd
Allow alias setting in Settings group name.
2012-11-22 12:32:07 +01:00
Klaas Freitag
c560fc5959
Escape [ and ] in Folder alias and file name.
2012-11-22 12:32:06 +01:00
Klaas Freitag
ee9e814f41
Getter and Setter for the config file name.
2012-11-22 12:32:06 +01:00
Klaas Freitag
01ccf679bd
Fix Qt 46 build
2012-11-20 10:56:20 +01:00
dragotin
b55d6742fe
Merge pull request #94 from owncloud/qt46fixurl
...
Fix url encoding in Qt46, Bug #93
2012-11-20 01:39:04 -08:00
Daniel Molkentin
be367eb94b
Do not prepopulate the user field, it's usually wrong
...
Especially without LDAP, or in cases where the login
is an email address. If we ever want this again,
we need to make this cleverer.
2012-11-19 12:10:46 +01:00
Daniel Molkentin
aa577ce038
Remove placeholder texts for username and password
...
User names might be misleading, since they might be
email addresses, SMB logins including domain, etc.
2012-11-19 12:10:46 +01:00
Daniel Molkentin
53b0b96627
setup wizard: Remove subtitles
2012-11-19 12:10:46 +01:00
Daniel Molkentin
5173de5798
Theme: allow enforced locale
2012-11-19 12:10:46 +01:00
Klaas Freitag
afa48b0cc2
Fix url encoding in Qt46, Bug #93
2012-11-17 16:46:31 +01:00
Daniel Molkentin
8fc1b38359
dialog title == menu item title
2012-11-16 13:36:16 +01:00
Klaas Freitag
9e66de07f9
Better error message for propagate fail.
2012-11-16 12:32:07 +01:00
Daniel Molkentin
e4ae794bac
Remove and do not try to commit temp editor files
2012-11-15 12:50:52 +01:00
Klaas Freitag
01e8c9dbbe
Fix credentialstore on startup, promote credentials back on setup.
...
This fixes https://github.com/owncloud/mirall/issues/81
2012-11-15 11:43:43 +01:00
Daniel Molkentin
c5739b4d53
Remove extraneous legalese.
2012-11-15 01:07:51 +01:00
Klaas Freitag
39dc4cb46c
Use CredentialStore also for Qt4.6 based builds.
2012-11-13 15:01:05 +01:00
Klaas Freitag
a8dbed989b
Use CredentialStore to manage user credentials.
...
This fixes the bug that if the password is not stored in the cfg
file the user could not cancel the auth dialog. Moreover it handles
various credential backends better and gives a better user experience.
2012-11-13 11:19:34 +01:00
Daniel Molkentin
59969c3574
Qt is not C.
2012-11-05 11:44:22 +01:00
Klaas Freitag
5519bc7cbb
Try to create local dir if not existing.
2012-11-05 11:36:39 +01:00
Klaas Freitag
c31f0885a4
Remove bogus space
2012-11-05 11:36:38 +01:00
Klaas Freitag
2501cc57d5
Display error status in statusdialog.
2012-11-05 11:36:38 +01:00
Klaas Freitag
fbb46b64f9
Check if local folder is proper and set error stat accordingly.
2012-11-05 11:36:38 +01:00
Klaas Freitag
4d08605b5b
Also compute overall status for disabled folders.
2012-11-05 11:36:38 +01:00
Klaas Freitag
764c352c8f
Calculate overallSyncStartup on startup.
2012-11-05 11:36:38 +01:00
Daniel Molkentin
7cc3e7e392
Debug: fix typo
2012-11-02 16:32:26 +01:00
Daniel Molkentin
46a82b69c5
Show user name for connection in statusdialog
...
Move server version purely to tooltip.
Fixes issue #8 .
2012-11-02 14:09:23 +01:00
Klaas Freitag
0224c3fbd6
Compare absolute path in fileStatus.
2012-10-29 14:35:02 +01:00
Klaas Freitag
78c1bc6b22
Cleanup of sync result treewalk, build up journal in owncloudfolder.
2012-10-29 12:24:20 +01:00
Klaas Freitag
993d33f779
Fix fileStatus API.
...
Conflicts:
src/mirall/owncloudfolder.cpp
2012-10-29 12:23:01 +01:00
Klaas Freitag
0aa403eca3
Clean merge problems.
2012-10-29 12:20:57 +01:00
Klaas Freitag
8d1c7ddb9f
Make sure that path() has a trailing slash.
2012-10-29 12:20:57 +01:00
Daniel Molkentin
6d4f712f83
Make SSL error dialog more intuitive
2012-10-27 17:05:01 +02:00
Daniel Molkentin
d2ebcd065e
Fix tab order in setup page
2012-10-27 17:04:49 +02:00
Daniel Molkentin
28e15f5420
Escape HTML tags in self-signed certs
2012-10-27 17:04:49 +02:00
Daniel Molkentin
a315a3b5c7
There always must be both kinds of hashes, simplify code
2012-10-27 17:04:49 +02:00
Bartek Przybylski
55c9c3bf12
remove compilation warning
2012-10-25 23:20:00 +02:00
Daniel Molkentin
efa8d7670c
Show hashes of unknown certs
2012-10-24 01:44:13 +02:00
Daniel Molkentin
2cbcd52f35
Do not allow the selection of a target in single folder mode
2012-10-22 11:32:53 +02:00
Daniel Molkentin
b0801d469c
If present, select first item in status dialog
...
The old behavior is confusing and there is no real
reason to not have an object that is default-selected.
2012-10-20 14:58:49 +02:00
Daniel Molkentin
8fbc0e7c46
Show wizard with intro when starting without account
...
The message box was complicated and not even correct
on some OSes. The intro page is omitted if the wizard
gets called via the "Configure" menu item.
2012-10-20 13:58:37 +02:00
Daniel Molkentin
d8728a56bc
Pre-setup, disable irrelevant items in context menu
2012-10-20 13:58:37 +02:00
Daniel Molkentin
379da4ed0d
Proper workaround for bug in Ubuntu's Qt SNI bridge.
2012-10-17 23:16:59 +02:00
Klaas Freitag
cff0fcee16
Escape the folder alias as used in QSetting and as file name.
2012-10-17 16:33:19 +02:00
Daniel Molkentin
257896969a
Clean up argument handling
...
- Allow to retrospectively open log window
- Don't waste init time if only help is requested.
2012-10-16 19:06:23 +02:00
Klaas Freitag
fe665f234d
Use better default value instead of constant number.
2012-10-16 10:11:24 +02:00
Daniel Molkentin
bb76365a3a
Make sure SSL errors are always handled
2012-10-16 10:09:38 +02:00
Daniel Molkentin
b7433ccad6
Revert "Hide remove button in singleFolder mode"
...
This reverts commit 8939e08ce1
.
2012-10-12 14:44:21 +02:00
Daniel Molkentin
72f3b5457e
Use HTTPS for update check
2012-10-09 17:46:41 +02:00
Daniel Molkentin
e45dfdb3b2
Dirty qnam/proxy export is no longer required
2012-10-09 17:19:09 +02:00
Daniel Molkentin
19a4f8fc64
_accessManager is already initialized in the ctor
2012-10-09 17:15:46 +02:00
Daniel Molkentin
a8d6c083e3
Make code more readable.
2012-10-09 10:10:41 +02:00
Daniel Molkentin
861a66f8cb
Make PAC work on Windows
2012-10-09 03:08:39 +02:00
Daniel Molkentin
3db60b4fe7
Massive simplification of proxy support.
...
Purposefully separated from last commit, but
associated with it: No more need for special
cases after libocsync got fixed do adhere properly.
2012-10-09 02:35:08 +02:00
Daniel Molkentin
c93721258e
Working PAC support
...
This goes along with e0f02c in csync/dav.
2012-10-09 02:35:08 +02:00
Klaas Freitag
48d5261ba7
Use Max instead of Min of course
2012-10-08 20:43:16 +02:00
Klaas Freitag
23c598a907
Only replace the scheme at the beginning of string
2012-10-08 16:21:18 +02:00
Daniel Molkentin
d7b94c7f96
Use HttpProxy instead of Socks5Proxy.
2012-10-08 11:08:01 +02:00
Daniel Molkentin
34b8c39878
Quick hack: do not crash on windows when pausing sync
2012-10-05 22:53:42 +02:00
Daniel Molkentin
0ee938ac9b
Prepend slash to remote folder
2012-10-05 22:42:35 +02:00
Klaas Freitag
06b2e1f645
Simplify url string from textfield to avoid unwanted spaces.
2012-10-05 22:33:16 +02:00
Daniel Molkentin
06a1cfe642
Anther fix for sync pausing
2012-10-05 12:59:58 +02:00
Daniel Molkentin
3a983b428f
Fix bug when trying to pause a running sync
2012-10-04 14:08:23 +02:00
Daniel Molkentin
c42f77cf23
Consistency fix: name ui and src alike
2012-10-03 00:45:54 +02:00
Daniel Molkentin
d169bc24bf
ownCloudInfo must not include sslErrorDialog
2012-10-03 00:43:43 +02:00
Klaas Freitag
4d11e41e97
Merge branch 'master' of github.com:owncloud/mirall
2012-10-02 17:42:56 +02:00
Klaas Freitag
0007579ab8
Initialize pointer before use.
2012-10-02 17:42:37 +02:00
Daniel Molkentin
1752c23002
Use themed app name in password dialog.
2012-10-02 16:54:46 +02:00
Klaas Freitag
fabb353158
Use Qt proxy setting in csync in case its "default proxy"
2012-10-02 13:24:10 +02:00
Klaas Freitag
11706c4e3e
Fix header.
2012-10-02 13:17:37 +02:00
Klaas Freitag
de60d53a78
Merge branch 'sslerrordialog' of https://github.com/sebasje/mirall into sebasje-sslerrordialog
...
Conflicts:
src/mirall/application.cpp
src/mirall/application.h
src/mirall/owncloudinfo.cpp
2012-10-02 12:34:06 +02:00
Klaas Freitag
1c326029a3
More theming fixes.
2012-09-28 15:19:42 +02:00
Klaas Freitag
4ac85b0702
Removed more hardcoded program names and replaced by theme appName.
2012-09-28 14:22:43 +02:00
Klaas Freitag
8939e08ce1
Hide remove button in singleFolder mode
2012-09-28 13:47:43 +02:00
Klaas Freitag
7156e47355
Introduce defaultServerFolder and defaultClientFolder.
2012-09-28 13:42:22 +02:00
Klaas Freitag
94ceb95045
Remove unneeded settings-code for win32.
2012-09-28 11:36:39 +02:00
Klaas Freitag
b41d8c3c12
Removed app name from strings even more and replaced by theme string.
2012-09-27 17:22:08 +02:00
Klaas Freitag
9d3d789890
Rename ownCloudClient.ini to custom.ini and put it to /etc/ownCloud.
2012-09-27 15:28:49 +02:00
Klaas Freitag
d09693f191
Read sync-exclude.lst from /etc/ownCloud, renamed from exclude.lst.
2012-09-27 13:16:14 +02:00
Klaas Freitag
e4024015a4
Merge branch 'master' of github.com:owncloud/mirall
2012-09-27 12:30:27 +02:00
Klaas Freitag
180b99c02e
Change the csync config dir to the users app path, not longer .csync.
2012-09-27 12:27:40 +02:00
Daniel Molkentin
32579dd25a
Brown paper bag fix.
2012-09-27 12:22:27 +02:00
Daniel Molkentin
740370b106
Do not translate application name, it's a brand
...
Another reason: File system and registry names depend on it
2012-09-27 11:52:58 +02:00
Daniel Molkentin
3d6a2a4966
Partial revert of 261731
...
An experimental change sneaked in.
2012-09-26 18:24:07 +02:00
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
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
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
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
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
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
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
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
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
bacc70a299
Use the correct icon for sync ok
2012-05-02 17:12:45 +02:00
Klaas Freitag
7fc409152f
Display a proper tray icon at app startup
2012-05-02 17:05:31 +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
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
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