chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-24 16:42:46 +01:00
Code
1,382 Commits 4 Branches 173 Tags 91 MiB
v1.3.0-beta2
Commit Graph

787 Commits

Author SHA1 Message Date
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
fee9616708 OS X: Remove "make install" requirment for csync 2012-10-10 16:05:17 +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
ae93e2aa10 Fix OS X bundle generation 2012-10-05 11:59:50 +02:00
Daniel Molkentin
7d52884699 Fix cmake for windows wrt libocsync renaming 2012-10-05 12:10:33 +04: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
9ce10e7fe7 removed wrong header from filelist. 2012-10-02 13:18:36 +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
Daniel Molkentin
663a1886e9 CMake: Centralize all application-specific parameters. 2012-09-20 17:31:18 +02:00
Klaas Freitag
dd5d407198 Fix activation of list entries in status dialog (thanks kyle-f). 2012-09-20 18:14:22 +03:00
Daniel Molkentin
aa34331489 Remove unused declaration. 2012-09-20 11:12:52 +02:00
Daniel Molkentin
50166424c8 Fix crash on exit on X11. 2012-09-20 11:12:52 +02:00
Klaas Freitag
8f40b2a276 Use delete[] to free mem from qstrdup, thanks valgrind. 2012-09-19 13:51:27 +03:00
Klaas Freitag
d195ad3072 Fix ownCloud icon and a layout issue. 2012-09-19 13:31:42 +03:00
Klaas Freitag
75554a2ed6 Removed hackish beta version marker in status dialog. 2012-09-19 13:02:28 +03:00
Klaas Freitag
45d224e922 Handle the themed singleSyncFolder-mode correctly. 2012-09-19 12:58:34 +03:00
Klaas Freitag
09d8fb9483 Add a theme switch to only allow a single sync folder for the client. 2012-09-19 12:58:02 +03:00
Klaas Freitag
a526035273 Add a method to set the enabled status of the buttons correctly. 2012-09-19 12:57:12 +03:00
Klaas Freitag
090bdcab68 Use the THEME_CLASS macro in config file class. 2012-09-18 13:55:58 +03:00
Klaas Freitag
29f3a002c4 Merge branch 'master' of github.com:owncloud/mirall 2012-09-18 13:53:42 +03:00
Klaas Freitag
a9c7b9304e Use a macro THEME_CLASS from CMakeLists.txt instead of ifdefs. 2012-09-18 13:52:52 +03:00
Daniel Molkentin
aab1c94e44 Simplify version display. 
Reduces amount of required helper macros.
 2012-09-17 21:23:56 +02:00
Daniel Molkentin
6d13b1b2fb Added a simple about dialog. 2012-09-17 21:06:20 +02:00
Daniel Molkentin
ff4a119c0c Don't swallow ':' when entered. 
Treat entering 'http(s)://' gracefully by
removing the substring and flipping the
checkbox.
 2012-09-17 19:23:53 +02:00
Kyle Fazzari
4dbd8ee016 Forgot to comform to ownCloud coding standards. Fixed. 2012-09-13 22:51:47 -04:00
Kyle Fazzari
2652a744d0 Damino requested that QUrl be used to parse the URL, along with toString(QUrl::RemoveScheme). QUrl::RemoveScheme doesn't remove the slashes, so extra code was thrown in to ensure they were removed if they were present. 2012-09-13 22:47:39 -04:00
Kyle Fazzari
7f6d39383e Found a much slicker solution to the problem of the OC URL 
containing the protocol when the back button is used. Instead
of moving to two separate URL fields, a slot was created and
connected to the textChanged signal of the OCUrl LineEdit.
This slot simply ensures the protocol is not present.
 2012-09-11 18:56:32 -04:00
Sebastian Kügler
591b71cf18 Return QNetworkReply from remote mkdir 
This patch allows the client implementation to react to specific results
of mkdir requests

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

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

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

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

Merge? *puppy eyes*
 2012-09-10 23:53:49 +02:00
Klaas Freitag
7701805dc4 Add a warning window for/against usage of old server versions. 2012-08-30 18:52:50 +03:00
Klaas Freitag
824bd1e087 Fix memory allocation for proxy struct in thread. 2012-08-30 18:50:42 +03:00
Klaas Freitag
f78f3e0869 Set beta tag to application version. Not a pretty solution. 2012-08-30 18:48:32 +03:00
Klaas Freitag
094d563dbb Set sslCertsTrust to defined value at start. 2012-08-30 14:02:42 +03:00
Klaas Freitag
cb6b3e1d85 Setup connections to ocinfo when needed. 2012-08-30 14:02:15 +03:00
Klaas Freitag
72e14b3688 Use the remote.php/webdav url rather than files/webdav.php 2012-08-30 13:23:14 +03:00
Klaas Freitag
a723a968ba allow custom media at relative path for windows. 2012-08-27 19:09:56 +03:00
Klaas Freitag
f4bb981ad4 add application path back to translation laoding. 2012-08-27 18:59:31 +03:00
Klaas Freitag
ced6f0ed96 Fix compile problem. 2012-08-26 16:10:17 +02:00
Klaas Freitag
fd7cb38c16 Use qthread more correct, see 
http://labs.qt.nokia.com/2006/12/04/threading-without-the-headache/
 2012-08-26 11:47:45 +02:00
Klaas Freitag
a459f468a3 Use PlainTextEdit widget for more efficient log file display. 2012-08-26 11:46:59 +02:00
Klaas Freitag
5294f446a2 Merge branch 'master' of gitorious.org:owncloud/mirall 
Conflicts:
	src/mirall/owncloudinfo.cpp
	src/mirall/owncloudsetupwizard.cpp
	src/mirall/owncloudwizard.cpp
 2012-08-24 11:16:58 +02:00
Klaas Freitag
d733aac0e8 Fix QLatin1String issues. 2012-08-17 18:13:17 +03:00
Klaas Freitag
a8296a6b6e Removed unneeded win32 headers. 2012-08-17 18:00:03 +03:00
Klaas Freitag
094f791400 Removed unused file temporarydir. 2012-08-17 17:55:15 +03:00
Klaas Freitag
58d75e7bfe Show pathes in platform specific notation 2012-08-15 18:16:44 +03:00
Klaas Freitag
1b7ad22e2e Fix setup dialog: Use https if checkbox is activated. 2012-08-14 13:23:06 +03:00
Klaas Freitag
74c6c4e7c9 cleanups and improved error messaging on proxy problems. 2012-08-09 15:13:20 +03:00
Klaas Freitag
9e30fe4ea5 Do not stop syncing if local directories are write protected. 2012-08-09 12:12:54 +03:00
Klaas Freitag
d743f7f4b3 Fixed and cleaned redirect bug, make sync work again. 2012-08-08 23:11:07 +03:00
Klaas Freitag
8117b9802b Connect ocInfo only if needed in ownCloud setup wizard. 2012-08-08 16:52:12 +03:00
Klaas Freitag
08d925a8fa read proxy setting from cfg file rather than from Qt proxy object. 2012-08-08 16:48:21 +03:00
Klaas Freitag
58ca49c8bd QLatin1String fix. 2012-08-08 16:47:56 +03:00
Klaas Freitag
aeb0499833 read proxy settings from config file rather than from Qt proxy obj. 2012-08-08 16:47:25 +03:00
Klaas Freitag
80f2699c80 handle proxy port correctly. 2012-08-06 17:44:23 +03:00
Klaas Freitag
70838442c9 Fixed error handling on remote dir create. 2012-08-06 17:43:24 +03:00
Klaas Freitag
d694525d8f Simplify loading of the exclude file on various platforms. 2012-08-06 16:13:35 +03:00
Klaas Freitag
c916f5cbd9 connect owncloudinfo signals more selective. 2012-08-06 15:00:22 +03:00
Klaas Freitag
83bda2c8d5 handle HTTP status 301 -> redirect. 2012-08-06 14:59:59 +03:00
Klaas Freitag
a00086759e connect the owncloudinfo signals more selective. 2012-08-06 14:59:18 +03:00
Klaas Freitag
4b869cfb10 do not write CA Certs on its own, use methods in mirallconfigfile. 2012-08-06 14:58:24 +03:00
Klaas Freitag
f5717348f8 QLatin1String fix 2012-08-06 14:58:11 +03:00
Klaas Freitag
4cad29331f - set ownCloudUrl and known CA Certs. 2012-08-06 14:57:26 +03:00
Klaas Freitag
84a588ccf0 Fix signal connection and initialize the dialog pointer to zero. 2012-08-06 11:13:26 +03:00
Klaas Freitag
2c2fe38ad0 Fix app name back to "ownCloud" to load existing configs again. 2012-08-03 15:03:57 +03:00
Klaas Freitag
bdb35f508a QLatin1String fixes all over. 2012-08-02 12:17:24 +03:00
Klaas Freitag
35e92030f8 Fix size of dialog. 2012-08-02 12:16:18 +03:00
Klaas Freitag
9fe003df78 Restructured the tray context menu. 2012-08-02 12:15:57 +03:00
Klaas Freitag
ba856bf2d4 Fix proper placeholding patches in oC connection wizard. 2012-08-02 12:11:02 +03:00
Klaas Freitag
d867cfacb4 Some translation changes. 2012-08-02 12:09:37 +03:00
Klaas Freitag
eecb444772 Replace some delete calls with QObject parenting. 2012-08-02 12:08:27 +03:00
Klaas Freitag
42283e4684 Some code cleanups for the proxy dialog. 2012-08-02 12:07:14 +03:00
Klaas Freitag
343f646660 Fix load self signed certs into NetworkManager (#oc-843) 2012-08-02 12:02:46 +03:00
Klaas Freitag
d3bb223898 Proceed proxy settings to csync thread. 2012-08-02 11:17:15 +03:00
Daniel Molkentin
62d1f281c3 Fix SSL support in ownCloud wizard 
- honor secure connect option
- fix connects in ctor of singleton
- don't crash
 2012-08-01 18:33:19 +02:00
Thomas Mueller
eb2d93de38 read proxy settings from config on dialog startup 2012-07-31 11:03:52 +02:00
Thomas Mueller
e4da16b9d6 support Qt 4.6 2012-07-31 10:43:38 +02:00
Klaas Freitag
5bde3262d6 Merge branch 'master' of gitorious.org:owncloud/mirall 2012-07-31 11:18:43 +03:00
Klaas Freitag
bfb99d2078 Qt part of proxy support - contributed by Thomas Mueller. 2012-07-31 11:17:52 +03:00
Dominik Schmidt
8fef939a1a Extend wizard raising hack to OS X. 2012-07-31 01:57:02 +02:00
Klaas Freitag
5275238f51 Added 3rdpart QtSingleApplication class. Fixed some overall-status 
issues.
 2012-07-30 17:10:48 +03:00
Klaas Freitag
ae847e46e7 Added support method statusToString 2012-07-30 17:09:49 +03:00
Klaas Freitag
1ff94e86bd Fix build with UNICODE under windows, fix USE_INOTIFY initialization. 2012-07-30 17:08:42 +03:00
Klaas Freitag
90c4e422d8 Merge commit 'refs/merge-requests/7' of git://gitorious.org/owncloud/mirall into merge-requests/7 2012-07-26 11:45:30 +03:00
Klaas Freitag
0112bb1e05 Merge branch 'master' of gitorious.org:owncloud/mirall 2012-07-26 11:40:06 +03:00
Klaas Freitag
b7993a43fd Removed Log Window Button 2012-07-26 11:38:14 +03:00
Klaas Freitag
b2580b4b0e Merge branch 'master' of gitorious.org:owncloud/mirall 2012-07-26 10:16:59 +02:00
Klaas Freitag
e3f83f4bda converted ownCloudInfo to Singleton pattern to fix crashes. 2012-07-26 10:16:18 +02:00
Klaas Freitag
66d70c0835 More custom media for the connect dialog. 2012-07-26 11:01:43 +03:00
Klaas Freitag
0c89dd9555 Store GUI customizations at system place. 2012-07-25 18:47:31 +03:00
Klaas Freitag
64e83cb287 Added a new setup page in the ownCloud connection wizard. Also added 
the ability for custom images and text in  the setup assistant.
 2012-07-25 17:51:29 +03:00
Klaas Freitag
37359969e4 Fix for bug #oc-1318, crash through accessing zero pointer. 2012-07-25 16:00:18 +03:00
Klaas Freitag
4ef948bf3c Use a better inotify implementation and use config.h. Fixes oCB #713. 2012-07-20 17:13:23 +02:00
Klaas Freitag
4b33997678 Check the system for inotify in cmake and use a config.h file. 2012-07-20 17:12:29 +02:00
Klaas Freitag
2433b35727 Merge branch 'mirall-kde' 2012-07-20 11:56:50 +02:00
Klaas Freitag
75835c45a3 emit folderChange after initial setup. 2012-07-20 11:37:54 +02:00
Klaas Freitag
d225dd124b Fixed icon setup. Theme now really supports icons in various sizes. 2012-07-18 17:29:06 +02:00
Klaas Freitag
3244a922e3 fixed overall sync state calculation for tray . 2012-07-18 17:28:30 +02:00
Dominik Schmidt
d7fb6fa749 Fix installation on all platforms + bundle on osx 2012-07-17 15:16:02 +02:00
Michael Georg Hansen
9c64b5e753 Add a clear button to the log window. 2012-07-16 21:11:19 +02:00
Klaas Freitag
c3c8e512c8 Fix library build for windows, un-QOBJECTed the theme class. 2012-07-12 14:33:58 +02:00
Klaas Freitag
973c2c1786 remove the push atomar method call for csync. 2012-07-10 16:21:51 +02:00
Klaas Freitag
324a9d2480 Isolate a library to add a dbus interface around. 2012-07-10 15:59:06 +02:00
Klaas Freitag
dd4f76c5c7 replace URL by Link in user string 2012-07-02 11:03:41 +02:00
Klaas Freitag
40a3b1e4e8 Use absolute path function for directory comparison 2012-06-26 12:27:50 +02:00
Klaas Freitag
c8ac719752 Remove csync db in case the local path gets removed. 2012-06-25 15:31:13 +02:00
Klaas Freitag
928ef731c9 Better protection against remote folder delete. 2012-06-25 14:18:13 +02:00
Klaas Freitag
0e418b2f68 Fix a missing delete. 2012-06-22 15:36:04 +02:00
Klaas Freitag
6ad89d98a9 - Add csync push atomar switch 
- Fix a wording if the directory does not exist.
 2012-06-22 15:35:22 +02:00
Klaas Freitag
34cf97a827 Also clear error list in folders for the inotify case. 2012-06-20 12:52:21 +02:00
Klaas Freitag
bccb17ce41 Clear error list on start of non local sync. 2012-06-20 12:50:46 +02:00
Klaas Freitag
5e2729ddef Fix a typo in ssl dialog 2012-06-18 18:27:06 +02:00
Klaas Freitag
5d0aada871 Fix translations loading under win32 2012-06-18 17:45:04 +02:00
Klaas Freitag
689ef1254b MacOS: Move translations to the right place 2012-06-18 15:52:56 +02:00
Klaas Freitag
cb99ccf75d Load translations correctly. 2012-06-18 15:50:17 +02:00
Klaas Freitag
5ca9d5b915 Install i18n files in MacOS installer 2012-06-18 15:18:08 +02:00
Klaas Freitag
8384fe477a Simplified LogBrowser 2012-06-18 14:51:49 +02:00
Klaas Freitag
8fe20369af Some more usefull debug output 2012-06-18 10:42:30 +02:00
Klaas Freitag
9901d3a736 Added --help option with output 2012-06-15 13:36:38 +02:00
Klaas Freitag
c90eb1cca6 Log to file added, with flush option 2012-06-15 13:04:23 +02:00
Klaas Freitag
4d1fed3d00 Rejecting the SSL dialog means untrusting. 2012-06-15 11:18:16 +02:00
Klaas Freitag
4807c355e5 Fixed wording in setup assistant 2012-06-15 10:58:15 +02:00
Klaas Freitag
ce50043524 Improved some grammar based on Matts proposals. 2012-06-15 10:51:51 +02:00
Klaas Freitag
36ad4fdc83 More encoding fixes to make win32 with special chars work. 2012-06-13 17:34:20 +02:00
Klaas Freitag
a39fb310e1 use UTF-8 encoding in the settings file. 2012-06-13 17:33:48 +02:00
Klaas Freitag
d5d0c472ed store the custom config for each reply object. 2012-06-13 11:37:20 +02:00
Klaas Freitag
f0bae07a2c make ssldialog aware of custom configs. 2012-06-13 11:36:56 +02:00
Klaas Freitag
5953d36297 Fixed removeAllFolders: Terminate running syncs before removal. 2012-06-13 11:30:26 +02:00
Klaas Freitag
2dcbb54095 Use UTF8 to read password and username rather than local8bit. 2012-06-13 11:29:38 +02:00
Klaas Freitag
6d8956f68a Make setup wizard really cancel if user clicks cancel and accept 
only if the user finally accepts the dialog.
Remove all sync folder definitions if a new oC connection was done.
 2012-06-12 12:30:05 +02:00
Klaas Freitag
f219b0613c Added method to drop all sync folder definitions. 2012-06-12 12:29:39 +02:00
Klaas Freitag
d55900561b only restart folderman if the setup wizard was closed with accept. 2012-06-12 12:28:58 +02:00
Klaas Freitag
e82681c47f Added ability to work with the custom config file. 2012-06-12 12:28:07 +02:00
Klaas Freitag
408b44913e Added ability to work with a custom config file different from the 
master one to test temporar connections in the setup wizard.
 2012-06-12 12:27:02 +02:00
Klaas Freitag
1af154fc96 Merge branch 'extlogging' 2012-06-11 10:14:52 +02:00
Klaas Freitag
06b3a50e84 Wipe the csync statedb after a sync definition is removed. 2012-06-11 10:10:07 +02:00
Georg Ehrke
469a7a997c fix spelling of password 2012-06-10 21:27:31 +02:00
Klaas Freitag
8b38131b4b Provide proper return value for getauth 2012-06-05 18:37:48 +02:00
Klaas Freitag
c0cf575ada Fix csync log encoding 2012-06-05 16:30:55 +02:00
Klaas Freitag
9d0a8d35d8 - created setupLogBrowser method in application 
- removed unused config variable code
 2012-06-05 15:49:53 +02:00
Klaas Freitag
926f7ce4a5 Added a window for log output. 
Added log handlers for both the cmake logging and the mirall logging.
Push all logging to a log window with the ability to save to a file.
 2012-06-05 15:11:29 +02:00
Klaas Freitag
59f821f728 Make krazy2 build target optional if krazy is installed. 2012-06-04 16:44:49 +02:00
Klaas Freitag
3052506d31 Read poll timer settings from config file. 2012-05-26 14:37:21 +02:00
Klaas Freitag
dc7c6d1913 Fix win32 build again. 2012-05-26 13:25:05 +02:00
Dominik Schmidt
b7b617ac28 Add krazy target 2012-05-21 18:12:25 +02:00
Klaas Freitag
6f7165f9f0 A lot of krazy2 (codechecker) fixes. 2012-05-21 16:48:49 +02:00
Klaas Freitag
6cf6e1dcba fix exclude.lst reading on MacOSX 2012-05-16 15:13:51 +02:00
Klaas Freitag
be7a1ca111 Find exclude.lst under MacOS 2012-05-16 14:55:19 +02:00
Klaas Freitag
0fdc3cb205 Add system info to updatedetector on Linux. 2012-05-16 11:56:05 +02:00
Klaas Freitag
d2adecbaac Fix QDesktopServices::openURL for Win32, Qt bug. 2012-05-16 11:54:14 +02:00
Klaas Freitag
bbef2ef30e Fix open the local folder action on Win32, workarounded a Qt bug. 2012-05-16 11:42:47 +02:00
Klaas Freitag
f9b060fe82 Added open ownCloud action to tray menu 2012-05-15 18:29:12 +02:00
Klaas Freitag
8510d1fc32 Use pause and resume instead of enable and disable 2012-05-15 18:03:53 +02:00
Klaas Freitag
0527f997c0 Push status window to front if you click on tray icon. 2012-05-15 17:52:30 +02:00
Klaas Freitag
c475fb644b Merge branch 'master' of gitorious.org:owncloud/mirall 2012-05-15 08:20:30 +02:00
Klaas Freitag
7690734052 Enhanced version parsing from status.php 2012-05-14 16:22:30 +02:00
Klaas Freitag
f2888274f9 simplified url assembly for folderman. 2012-05-14 16:18:08 +02:00
Klaas Freitag
5a443bde70 Fix tray tooltip again 2012-05-14 13:23:04 +02:00
Klaas Freitag
f913790f29 Fix try message for disabled folders. 2012-05-14 11:51:47 +02:00
Klaas Freitag
64e94708df If a sync folder is removed, terminate if its currently running. 2012-05-14 11:09:01 +02:00
Klaas Freitag
f7e5f021c7 Fix icon install again, renaming. 2012-05-11 10:50:43 +02:00
Klaas Freitag
5bc6e080de Fix icon install. 2012-05-11 10:30:35 +02:00
Klaas Freitag
d5ebf0477b Install both application icons 2012-05-11 10:28:33 +02:00
Klaas Freitag
aa86561f31 write version set in VERSION.cmake to version.h 2012-05-11 10:19:15 +02:00
Klaas Freitag
9706d6e545 use QLatin1String rather than QString::from... 2012-05-11 10:10:23 +02:00
Klaas Freitag
3e99f25578 more useful debug output with network reply. 2012-05-11 10:09:57 +02:00
Klaas Freitag
f7fd9928b7 added a debug line without WIN32 marker. 2012-05-11 10:09:27 +02:00
Klaas Freitag
bacc70a299 Use the correct icon for sync ok 2012-05-02 17:12:45 +02:00
Klaas Freitag
cd6d3644b9 set owncloud compile flag for mac osx 2012-05-02 17:06:30 +02:00
Klaas Freitag
7fc409152f Display a proper tray icon at app startup 2012-05-02 17:05:31 +02:00
Klaas Freitag
496572314d Fix the app icon to be ownclouds 2012-05-02 16:33:07 +02:00
Klaas Freitag
8d33a470b1 Fixed theming: Made a mirall and a ownCloud icon theme working. 2012-05-02 15:50:01 +02:00
Klaas Freitag
125d2a4533 Make OWNCLOUD_CLIENT compile flag depending on the compile target. 2012-05-02 15:45:38 +02:00
Klaas Freitag
69e6096d14 Fixed encoding issue: Do not double encode. 2012-05-02 11:40:39 +02:00
Klaas Freitag
f8efb1fc99 - Added an open status entry into the tray menu 
- fixed some menu glitches on the mac os platform.
 2012-04-30 16:38:00 +02:00
Klaas Freitag
9c4613e5d2 Allow to interrupt running sync task, incl. some cleanups. 2012-04-30 08:56:56 +02:00
Klaas Freitag
31b636a423 Add a win32 debug line to CMakeLists 2012-04-23 10:58:21 +02:00
Klaas Freitag
603151fe08 Add proper error message if the owncloud module could not be loaded. 2012-04-23 10:58:21 +02:00
Thomas Müller
527bece4a9 Backport to Qt 4.6 finished - test against a local installation of owncloud via http 2012-04-21 21:03:29 +02:00
Klaas Freitag
633e50e776 Removed unsused variable 2012-04-21 11:50:20 +02:00
Klaas Freitag
eb4fd865d5 Fix missing return values for bool functions. 2012-04-21 11:22:03 +02:00
Klaas Freitag
d8bb48bcee Fix tray context menu after a folder has been added or removed. 2012-04-21 11:22:03 +02:00
Klaas Freitag
4c192d0960 initialize polltimercnt with one lower than exceed to start syncing 
quickly on program startup.
 2012-04-21 11:22:03 +02:00
Klaas Freitag
fda234cfb8 initialize sync status correctly. 2012-04-21 11:22:03 +02:00
Klaas Freitag
a875d14671 Improved startup logging with version and lang 2012-04-21 11:22:03 +02:00
Thomas Müller
c52a3f290b continue backport Qt 4.6: place holder text was introduced in Qt 4.7 2012-04-21 01:07:22 +02:00
Thomas Müller
8695b8fb3c implement MKCOL with QHttp to make it work with Qt 4.6 2012-04-20 23:58:09 +02:00
Klaas Freitag
9e163a3c28 Fix QApp contructor singature 2012-04-20 13:17:48 +02:00
Klaas Freitag
a81ad4acdc Translation and wording fixes. 2012-04-18 15:21:55 +02:00
Klaas Freitag
3f027cda73 Handle translation files correct. 2012-04-18 13:59:03 +02:00
Klaas Freitag
d4b264acbc Log the system name used for translations 2012-04-18 12:10:14 +02:00
Klaas Freitag
2c90a368f9 minor fixes and changes. 2012-04-18 11:59:56 +02:00
Klaas Freitag
1cb23ecb26 fixed wording. 2012-04-17 17:03:46 +02:00
Klaas Freitag
5c07363335 fix status dialog status display and overall status display. 2012-04-17 15:02:18 +02:00
Klaas Freitag
61ddff840a Fix display status dialog: Do not flicker on local runs if polling. 
handle syncresult object in folder consistent.
 2012-04-17 13:18:14 +02:00
Klaas Freitag
3f379b5671 removed useless double include. 2012-04-17 13:18:14 +02:00
Klaas Freitag
3c3bdeec5b added clearError and flag to indicate local run methods. 2012-04-17 13:18:14 +02:00
Klaas Freitag
e521d0f53c fix check if INOTIFY flag was given on cmake command line. 2012-04-17 13:18:14 +02:00