1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-04-03 18:11:32 +02:00

Compare commits

..

1171 Commits

Author SHA1 Message Date
Daniel Molkentin
07db03d6bc 1.2.3 2013-04-02 15:27:37 +02:00
Daniel Molkentin
d68c4b379f Unbreak self-signed certificate handling 2013-04-02 15:22:27 +02:00
Daniel Molkentin
396a12dfde Amend ChangeLog 2013-04-02 10:14:02 +02:00
Jenkins for ownCloud
c79f4f91a8 [tx-robot] updated from transifex 2013-04-02 00:05:14 +02:00
Klaas Freitag
bec2f7c9b9 Removed verbose logging on Win32. 2013-03-28 11:14:16 +01:00
Jenkins for ownCloud
d4c8cad0e2 [tx-robot] updated from transifex 2013-03-27 00:11:52 +01:00
Daniel Molkentin
0ad2bd4b91 Add favlink generation support for Nautilus 2013-03-25 18:00:58 +01:00
Daniel Molkentin
dcc8f9fa6c Fix favlink manual test 2013-03-25 18:00:25 +01:00
Markus Goetz
d7a93c74aa OS X: Fix creation of Finder Favorite 2013-03-25 14:57:34 +01:00
Daniel Molkentin
408547611b Manual test for favlinks 2013-03-25 12:53:40 +01:00
Jenkins for ownCloud
3e45147497 [tx-robot] updated from transifex 2013-03-23 00:07:09 +01:00
Daniel Molkentin
48310d3f5e Add 1.2.2 changelog 2013-03-22 14:59:22 +01: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
Jenkins for ownCloud
a766a44bcf [tx-robot] updated from transifex 2013-03-22 12:08:57 +01:00
Jenkins for ownCloud
287f1c55ff [tx-robot] updated from transifex 2013-03-22 00:05:37 +01:00
Daniel Molkentin
1c6523bcec Add plugin for screenreader support 2013-03-21 17:49:03 +03: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
Jenkins for ownCloud
4a57957420 [tx-robot] updated from transifex 2013-03-21 00:05:23 +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
Daniel Molkentin
db95e7291d bump version 2013-03-19 16:30:17 +01:00
Klaas Freitag
ae54c27805 Added office doc lock files. 2013-03-19 16:20:00 +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
Jenkins for ownCloud
2554a67cc7 [tx-robot] updated from transifex 2013-03-15 00:08:00 +01:00
Jenkins for ownCloud
e2cccd8615 [tx-robot] updated from transifex 2013-03-13 00:07:52 +01:00
Jenkins for ownCloud
948a98a871 [tx-robot] updated from transifex 2013-03-12 00:15:38 +01:00
Daniel Molkentin
b50d201154 Merge pull request #423 from hefee/master
adding WITH_DOC parameter to cmake
2013-03-11 08:28:51 -07:00
hefee
25a3ceb94d adding WITH_DOC parameter to cmake
Fixes #412
2013-03-11 16:18:20 +01:00
Jenkins for ownCloud
c514fe371a [tx-robot] updated from transifex 2013-03-10 00:08:00 +01:00
Jenkins for ownCloud
9169c70efe [tx-robot] updated from transifex 2013-03-09 00:07:47 +01:00
Jenkins for ownCloud
3c07cea229 [tx-robot] updated from transifex 2013-03-08 00:27:56 +01:00
Klaas Freitag
d3f51c611f Some more troubleshooting details. 2013-03-06 08:51:04 +01:00
Jenkins for ownCloud
21123bb029 [tx-robot] updated from transifex 2013-03-04 00:09:00 +01:00
Jenkins for ownCloud
fb8d11650c [tx-robot] updated from transifex 2013-03-03 00:08:15 +01:00
Jan-Christoph Borchardt
2c250050d5 add http and https icons for connection feedback 2013-03-01 16:09:10 +01:00
Jenkins for ownCloud
e9b3cbf3f7 [tx-robot] updated from transifex 2013-02-28 00:07:02 +01:00
Jenkins for ownCloud
d31a6e6179 [tx-robot] updated from transifex 2013-02-27 00:10:59 +01:00
Klaas Freitag
26d8c213b0 Updated Changelog. 2013-02-26 12:08:40 +01:00
Daniel Molkentin
bcb9491f6a RC1 -> final 2013-02-26 11:32:32 +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
Jenkins for ownCloud
dd4aa14a8c [tx-robot] updated from transifex 2013-02-23 00:06:50 +01:00
Jenkins for ownCloud
99814539eb [tx-robot] updated from transifex 2013-02-22 00:10:10 +01:00
Daniel Molkentin
dbec98ff48 Manual update of avail translations 2013-02-21 18:35:33 +03:00
Daniel Molkentin
e2e14f2184 Do not install docs on OS X 2013-02-21 15:26:31 +01:00
Daniel Molkentin
e85291c4ba en language is implied 2013-02-21 15:17:13 +01:00
Klaas Freitag
58a5405343 Dont do the doc build step on every build. 2013-02-21 14:01:16 +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
Jenkins for ownCloud
0b0b762c6c [tx-robot] updated from transifex 2013-02-21 00:13:24 +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
Jenkins for ownCloud
75f075feb0 [tx-robot] updated from transifex 2013-02-20 00:04:39 +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
Jenkins for ownCloud
2a6e084219 [tx-robot] updated from transifex 2013-02-19 00:08:08 +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
Jenkins for ownCloud
406254cd04 [tx-robot] updated from transifex 2013-02-18 00:07:57 +01:00
Jenkins for ownCloud
f01eeed9d0 [tx-robot] updated from transifex 2013-02-17 00:27:55 +01:00
Jenkins for ownCloud
5b6439e29d [tx-robot] updated from transifex 2013-02-16 00:07:02 +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
Jenkins for ownCloud
365dfd5380 [tx-robot] updated from transifex 2013-02-15 00:08:10 +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
Jenkins for ownCloud
a7303205b4 [tx-robot] updated from transifex 2013-02-14 00:08:08 +01:00
Jenkins for ownCloud
8a06b2d136 [tx-robot] updated from transifex 2013-02-13 00:06:54 +01:00
Daniel Molkentin
7ba8a55fa5 Merge pull request #313 from hefee/doc2default
creating doc to default target
2013-02-12 11:48:00 -08:00
Daniel Molkentin
ee7dc8e1c5 Merge pull request #312 from hefee/master
usefull manpages for owncloud and mirall
2013-02-12 11:47:41 -08:00
Jenkins for ownCloud
3556f90d68 [tx-robot] updated from transifex 2013-02-12 00:20:28 +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
Jenkins for ownCloud
5a3bc7af9a [tx-robot] updated from transifex 2013-02-11 00:05:57 +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
9297b3b850 Add chrome download file to exclude list 2013-02-10 14:48:17 +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
Jenkins for ownCloud
28fcd75494 [tx-robot] updated from transifex 2013-02-10 00:11:52 +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
hefee
17901e7bc7 fixing typo in mirall.1.rst 2013-02-09 12:28:43 +01:00
hefee
0ea16c04cc moving description of config file and client optinos to own files.
* split usage to three files: usage, conffile, options
* fixing minor typos in mirall.1.rst and owncloud1.rst
* owncloud.1 uses include conffile, options
* mirall.1 uses include conffile, options
* Fixes: #183
2013-02-09 12:23:32 +01:00
Klaas Freitag
f1e0cd1c9c Cleaned up used icons. 2013-02-09 10:32:29 +01:00
hefee
e1f404a011 adding maclocation 2013-02-09 10:30:56 +01:00
hefee
69715d2182 merging from owncloud/master 2013-02-09 10:16:38 +01:00
hefee
0285213140 removing asciidoc, now creating manpages via sphinx again 2013-02-09 10:10:23 +01:00
hefee
1a907f23f0 moving generation of manpages to sphinx
--HG--
rename : doc/mirall.1.txt => doc/mirall.1.rst
rename : doc/owncloud.1.txt => doc/owncloud.1.rst
2013-02-09 10:05:45 +01:00
Jenkins for ownCloud
1296be71ed [tx-robot] updated from transifex 2013-02-09 00:15:51 +01:00
hefee
0ebcdbbb3f no more different cmake parameter is needed 2013-02-08 18:57:25 +01:00
dragotin
891ced0fca Merge pull request #318 from LukeOwncloud/patch-1
Update doc/usage.rst
2013-02-08 09:45:30 -08:00
dragotin
6276bb3873 Merge pull request #322 from hefee/soname
adding soname version to libowncloudsync and libmirallsync
2013-02-08 09:42:32 -08:00
Klaas Freitag
dbb0cbaff8 Removed build of obsolete mirallsync lib which is equal to owncloudsync. 2013-02-08 19:18:36 +01:00
Sandro Knauß
cfa777260c removing version for mirallsync (it is'nt build anymore :) 2013-02-08 18:37:29 +01:00
Sandro Knauß
66fc273db6 merging with default 2013-02-08 18:36:26 +01:00
hefee
9c9e377cf4 adding soname version to libowncloudsync and libmirallsync 2013-02-08 18:21:59 +01:00
Jenkins for ownCloud
f75eb24bfe [tx-robot] updated from transifex 2013-02-08 00:14:28 +01:00
LukeOwncloud
a617a04295 Update doc/usage.rst 2013-02-07 08:50:49 +01:00
Jenkins for ownCloud
dc16f277ce [tx-robot] updated from transifex 2013-02-07 00:12:34 +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
Klaas Freitag
cece465947 Link libdl explicitely. 2013-02-06 10:09:02 +02:00
Jenkins for ownCloud
3f97047abc [tx-robot] updated from transifex 2013-02-06 00:07:36 +01:00
Daniel Molkentin
b6d5213880 Add suffix, to be added with -DVERSION_SUFFIX=... 2013-02-05 15:42:53 +01: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
Klaas Freitag
7734656ae3 Make mirall packager for win bundle the new openSSL dlls. 2013-02-05 14:37:39 +01:00
Klaas Freitag
c14e17e271 Set to version 1.2.1pre 2013-02-05 14:37:39 +01:00
hefee
1f4ea2c60e only add instalation dir if we are creating doc 2013-02-04 18:31:48 +01:00
hefee
edb4ff6b98 adding doc to default if CREATEDOC is set 2013-02-04 18:10:51 +01:00
Sandro Knauß
279bb47ab4 add creating manpages to CMakeLists 2013-02-04 17:36:56 +01:00
Sandro Knauß
7ef92748ea adding manpages for mirall and owncloud 2013-02-04 16:56:39 +01:00
Sandro Knauß
0e6e614318 adding --monoicons option to usage.rst 2013-02-04 16:55:50 +01:00
Jenkins for ownCloud
a5b6c3add7 [tx-robot] updated from transifex 2013-02-04 00:07:05 +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
Jenkins for ownCloud
58ace7c774 [tx-robot] updated from transifex 2013-02-02 00:09:05 +01:00
Jenkins for ownCloud
a07444412b [tx-robot] updated from transifex 2013-02-01 00:20:42 +01:00
mjkent
339f59a4e8 Merge pull request #284 from mjkent/854852959c95935efd8902f05d9935b04bb9f04c
Improve command line argument handling
2013-01-31 15:00:37 -08:00
Jenkins for ownCloud
4beb9b3efc [tx-robot] updated from transifex 2013-01-31 00:33:28 +01:00
Daniel Molkentin
a04cf32a69 No need to ship ocsync.conf 2013-01-30 09:48:45 +01:00
Jenkins for ownCloud
746c0359d2 [tx-robot] updated from transifex 2013-01-30 00:27:40 +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
1e1751e451 sign_dmg.sh: increase wait time for dmg mount 2013-01-28 21:04:43 +01:00
Jenkins for ownCloud
7cd0179adc [tx-robot] updated from transifex 2013-01-28 00:06:52 +01:00
Jenkins for ownCloud
c0543cdbaf [tx-robot] updated from transifex 2013-01-27 00:07:31 +01:00
Daniel Molkentin
d681066dc2 Results bubble: _localPrefix might not end in a separator 2013-01-26 20:47:20 +01:00
Jenkins for ownCloud
b81939bff5 [tx-robot] updated from transifex 2013-01-26 00:11:18 +01:00
Daniel Molkentin
f8685c97f1 CPack: more parameterization 2013-01-25 15:59:13 +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
Daniel Molkentin
bfee6402a6 Simplify NSIS template 2013-01-25 12:56:00 +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
Jenkins for ownCloud
d780055b0e [tx-robot] updated from transifex 2013-01-25 00:07:05 +01:00
Jenkins for ownCloud
3f5c53425b [tx-robot] updated from transifex 2013-01-24 00:08:40 +01:00
Jenkins for ownCloud
08f90ce3a6 [tx-robot] updated from transifex 2013-01-23 16:25:33 +01:00
Jenkins for ownCloud
6ee70a852a [tx-robot] updated from transifex 2013-01-23 16:06:47 +01:00
Klaas Freitag
4908dbdee8 Updated Changelog for the 1.2.0 release. 2013-01-23 16:04:29 +01:00
Jenkins for ownCloud
a6573c21e7 [tx-robot] updated from transifex 2013-01-23 15:30:18 +01:00
Daniel Molkentin
aca965f111 Fix favlink generation on windows 2013-01-23 17:22:38 +03:00
Klaas Freitag
01a8ab7bf0 Set version to final version 1.2.0 2013-01-23 15:19:26 +01: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
Klaas Freitag
4ea4c70443 Minor: Fixed a typo. 2013-01-23 10:57:45 +01:00
Jenkins for ownCloud
ec1946a9ff [tx-robot] updated from transifex 2013-01-23 00:07:29 +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
1385aab65d Changed FindCSync module to not check relative pathes + docu. 2013-01-22 15:08:56 +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
b9fe6f2aed bump version (pre-beta3) 2013-01-21 13:35:42 +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
381aa701ce Add a another default Category to make desktop file check happy. 2013-01-21 11:43:40 +01:00
Klaas Freitag
76653fcedb Minor: removed bogus stuff. 2013-01-21 11:43:39 +01:00
Jenkins for ownCloud
dd0cfec225 [tx-robot] updated from transifex 2013-01-21 00:06:38 +01:00
Jenkins for ownCloud
67b64e0816 [tx-robot] updated from transifex 2013-01-20 00:07:44 +01:00
Jenkins for ownCloud
7552f5e5da [tx-robot] updated from transifex 2013-01-19 00:06:40 +01:00
Daniel Molkentin
9af862b455 Fix make install, clean up 2013-01-18 22:15:08 +01:00
Jenkins for ownCloud
f26f7646ba [tx-robot] updated from transifex 2013-01-18 00:05:58 +01:00
Daniel Molkentin
0f36dc03c4 FileItemDialog: Add copy to clipboard functionality 2013-01-17 10:35:08 +01:00
Jenkins for ownCloud
36b385ed54 [tx-robot] updated from transifex 2013-01-17 00:29:16 +01:00
Daniel Molkentin
5e3f2cf25a Remove legacy configuration options.
They were not used anyway.
2013-01-16 18:03:40 +01:00
Daniel Molkentin
8b0cfab2b2 Ignore Mac OS custom folder icons 2013-01-16 17:51:25 +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
635cb4dc7c NSIS: Remove GnuTLS remainders 2013-01-16 14:41:12 +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
Jenkins for ownCloud
d3c55c2b7c [tx-robot] updated from transifex 2013-01-16 00:22:56 +01:00
Klaas Freitag
bc3938daa7 A new sync file protocol dialog. 2013-01-15 20:42:09 +01:00
Jenkins for ownCloud
4d4b509ac3 [tx-robot] updated from transifex 2013-01-15 00:06:13 +01:00
Lukas Reschke
304b484529 Typo 2013-01-14 16:40:01 +01:00
Daniel Molkentin
7025d612c1 Fix c&p error 2013-01-14 16:28:07 +01:00
Daniel Molkentin
2eb9406611 add CONTRIBUTING.md and reporting template for mirall 2013-01-14 12:33:49 +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
Klaas Freitag
72ba4213d5 Push to beta version 2. 2013-01-14 12:13:50 +01:00
Klaas Freitag
11dbacab60 Exclude desktop file handling for windows platform. 2013-01-14 12:13:50 +01:00
Jenkins for ownCloud
90e39e34e9 [tx-robot] updated from transifex 2013-01-14 00:19:22 +01:00
Jenkins for ownCloud
9a7171068d [tx-robot] updated from transifex 2013-01-13 00:09:52 +01:00
Jenkins for ownCloud
bb2a3590ad [tx-robot] updated from transifex 2013-01-12 00:12:20 +01:00
Daniel Molkentin
280dd205d9 setup wizard: Improve wording and context 2013-01-11 17:10:31 +01:00
Jenkins for ownCloud
2a722644b2 [tx-robot] updated from transifex 2013-01-11 00:07:26 +01:00
Daniel Molkentin
de69bb9448 build fix 2013-01-10 17:24:06 +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
Jenkins for ownCloud
6af1a52305 [tx-robot] updated from transifex 2013-01-10 00:06:57 +01:00
Klaas Freitag
703002bafa Set path to neon-config file in cmake toolchain file. 2013-01-09 15:08:25 +01:00
Jenkins for ownCloud
8104e4bde9 [tx-robot] updated from transifex 2013-01-08 00:33:20 +01:00
Jenkins for ownCloud
763dbfc397 [tx-robot] updated from transifex 2013-01-04 13:26:11 +01:00
Jenkins for ownCloud
f714759ec7 [tx-robot] updated from transifex 2013-01-02 00:06:16 +01:00
Jenkins for ownCloud
8168e9cca1 [tx-robot] updated from transifex 2012-12-31 00:06:30 +01:00
Jenkins for ownCloud
be470b71ea [tx-robot] updated from transifex 2012-12-30 00:06:49 +01:00
Jenkins for ownCloud
216f39e9bc [tx-robot] updated from transifex 2012-12-29 00:09:42 +01:00
Jenkins for ownCloud
486c4481d8 [tx-robot] updated from transifex 2012-12-28 00:21:26 +01:00
Jenkins for ownCloud
6a154c139f [tx-robot] updated from transifex 2012-12-27 00:06:31 +01:00
Jenkins for ownCloud
d559ac513e [tx-robot] updated from transifex 2012-12-26 00:13:40 +01:00
Jenkins for ownCloud
c2c89c6c6b [tx-robot] updated from transifex 2012-12-25 00:12:20 +01:00
Jenkins for ownCloud
af76c77b18 [tx-robot] updated from transifex 2012-12-24 00:13:14 +01:00
Jenkins for ownCloud
c4be5107df [tx-robot] updated from transifex 2012-12-23 00:11:23 +01:00
Jenkins for ownCloud
c13218d647 [tx-robot] updated from transifex 2012-12-22 00:28:19 +01:00
Daniel Molkentin
4ce55a44ba Klaas > Danimo, I am rather unpolite...
Also, fix whitespace errors
2012-12-21 01:16:54 +01:00
Jenkins for ownCloud
905891683b [tx-robot] updated from transifex 2012-12-21 00:13:21 +01:00
Klaas Freitag
f4019f5a5a Show backend error messages to user. 2012-12-20 20:51:43 +01:00
Daniel Molkentin
b7aec51ed8 Bump to 1.2.0beta1 2012-12-20 20:43:41 +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
Jenkins for ownCloud
91b58bdb3f [tx-robot] updated from transifex 2012-12-20 00:14:32 +01:00
Jenkins for ownCloud
b97d9a4fa9 [tx-robot] updated from transifex 2012-12-19 00:05:10 +01:00
Jenkins for ownCloud
83a1663750 [tx-robot] updated from transifex 2012-12-18 00:17:17 +01:00
Jenkins for ownCloud
76f571f9a9 [tx-robot] updated from transifex 2012-12-16 00:13:18 +01:00
Jenkins for ownCloud
8c53f6ff49 [tx-robot] updated from transifex 2012-12-15 00:13:14 +01:00
Daniel Molkentin
08ab13dc4b Doc: More missing packages 2012-12-14 21:11:19 +01:00
Daniel Molkentin
aac9b770fc Details on windows builds 2012-12-14 20:42:59 +01:00
Jenkins for ownCloud
552d979039 [tx-robot] updated from transifex 2012-12-14 00:18:50 +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
Jenkins for ownCloud
5c918a486c [tx-robot] updated from transifex 2012-12-13 00:16:51 +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
Jenkins for ownCloud
e939c6f91a [tx-robot] updated from transifex 2012-12-12 00:15:35 +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
Jenkins for ownCloud
bee3605275 [tx-robot] updated from transifex 2012-12-11 00:05:32 +01:00
Jenkins for ownCloud
243567bdbb [tx-robot] updated from transifex 2012-12-10 00:13:29 +01:00
Jenkins for ownCloud
52b22b3c58 [tx-robot] updated from transifex 2012-12-09 00:14:14 +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
Jenkins for ownCloud
cb1a9aef3c [tx-robot] updated from transifex 2012-12-08 00:12:08 +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
ff1706c729 Add libqtkeychain dll to NSIS 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
09793fcd59 Bump version to 1.2.0pre 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
Jenkins for ownCloud
59b722f663 [tx-robot] updated from transifex 2012-12-06 00:13:28 +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
Jenkins for ownCloud
fbf25c1529 [tx-robot] updated from transifex 2012-12-05 00:06:11 +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
Daniel Molkentin
8f9ad524c2 Find inotify on multiarch debian/ubuntu 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
Jenkins for ownCloud
ee0125eff6 [tx-robot] updated from transifex 2012-12-04 00:08:09 +01:00
Jenkins for ownCloud
e6409b09a3 [tx-robot] updated from transifex 2012-12-03 00:06:39 +01:00
Jenkins for ownCloud
9c015de00b [tx-robot] updated from transifex 2012-12-02 00:04:29 +01:00
Jenkins for ownCloud
3a04778f97 [tx-robot] updated from transifex 2012-11-30 00:06:15 +01:00
Daniel Molkentin
53aea61184 doc: Fix PDF generation here, too 2012-11-29 12:25:32 +01:00
Jenkins for ownCloud
b424247daf [tx-robot] updated from transifex 2012-11-29 00:06:14 +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
Klaas Freitag
9d05a53c89 Fix cmake checks on QtKeyChain. 2012-11-28 10:44:25 +01:00
Jenkins for ownCloud
56794e8d7c [tx-robot] updated from transifex 2012-11-28 00:12:19 +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
bf2181f111 Minor doc fix. 2012-11-27 15:46:17 +01:00
Jenkins for ownCloud
bd0882ccd5 [tx-robot] updated from transifex 2012-11-27 00:11:51 +01:00
Klaas Freitag
0c2564df86 Ready for 1.1.2 Release: Set version. 2012-11-26 14:44:38 +01:00
Jenkins for ownCloud
824c97d618 [tx-robot] updated from transifex 2012-11-26 00:03:28 +01:00
Daniel Molkentin
271d4fa22e Show last updated timestamp 2012-11-25 02:07:12 +01:00
Daniel Molkentin
a3a0202752 Fix copy/paste error 2012-11-25 01:20:25 +01:00
Daniel Molkentin
0da93f3eb5 Remove doc from the default target
The doc target requires strict parallel execution. Make it
a separate target unless we figure out how to do this with cmake.
2012-11-25 01:00:21 +01:00
Daniel Molkentin
78c7dc95a0 Add doc cmake targets (HTML, PDF, QtHelp, CHM, man)
make doc will build all of the above, except for CHM,
which needs manual preparation and can be built with
make doc-chm. See doc/scripts/README.rst for details.

We do our best to ensure to detect the required tools
before adding targets, so a build should always succeed.

Exception: On Debian and Ubuntu, the following packages are
required to build the PDF target (in addition to pdflatex
itself, which is autodetected):

* texlive-latex-recommended
* texlive-latex-extra
* texlive-fonts-recommended

If pdflatex is present, but those are not, the doc target
will fail.

Results can be found in $BUILDDIR/doc/$format.
2012-11-25 00:38:47 +01:00
Jenkins for ownCloud
f7b7669be6 [tx-robot] updated from transifex 2012-11-25 00:04:10 +01:00
Daniel Molkentin
f607cf55c6 doc: Make fit for use with make latexpdf 2012-11-24 02:35:18 +01:00
Jenkins for ownCloud
6a33b6ec33 [tx-robot] updated from transifex 2012-11-23 00:04:25 +01:00
Daniel Molkentin
e1bf2cc626 Ready for Release Candidate 2012-11-22 15:58:56 +01:00
Klaas Freitag
d15c0d046b Remove pre marker for version. 2012-11-22 12:34:21 +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
Jenkins for ownCloud
9e3d22af2d [tx-robot] updated from transifex 2012-11-22 00:03:15 +01:00
Klaas Freitag
c8ff747194 More changelog entries for 1.1.2 2012-11-21 16:39:25 +01:00
Daniel Molkentin
da64639f39 Update doc/building.rst
move packages into correct section
2012-11-21 15:20:15 +01:00
Daniel Molkentin
faa0f06fe3 Improve building section based on user feedback 2012-11-21 14:57:40 +01:00
Jenkins for ownCloud
2b9262f653 [tx-robot] updated from transifex 2012-11-21 00:03:40 +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
Jenkins for ownCloud
fc6350cb9a [tx-robot] updated from transifex 2012-11-20 00:03:26 +01:00
Daniel Molkentin
9b8b656720 doc: Add Qt dependency to build instructions 2012-11-19 18:49:10 +01:00
Daniel Molkentin
8c9f8bdb6d doc: Fix build instructions; hint make package 2012-11-19 18:15:25 +01: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
Daniel Molkentin
6457153bda Mac: Do not deploy DMG background, doesn't work 2012-11-19 12:10:45 +01:00
Daniel Molkentin
f8f188add4 Mac: Deploy sync-exclude.lst to bundle at build time 2012-11-19 12:10:45 +01:00
Jenkins for ownCloud
b6dfdc4c57 [tx-robot] updated from transifex 2012-11-19 00:02:43 +01:00
Jenkins for ownCloud
385f35d356 [tx-robot] updated from transifex 2012-11-18 00:02:57 +01:00
Klaas Freitag
afa48b0cc2 Fix url encoding in Qt46, Bug #93 2012-11-17 16:46:31 +01:00
Jenkins for ownCloud
94ed186b4c [tx-robot] updated from transifex 2012-11-17 00:03:22 +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
Jenkins for ownCloud
2a53abbc20 [tx-robot] updated from transifex 2012-11-16 00:04:51 +01:00
Daniel Molkentin
ba9a07c2f2 Upate build docs 2012-11-15 14:42:10 +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
Jenkins for ownCloud
158859006b [tx-robot] updated from transifex 2012-11-15 00:04:24 +01:00
Klaas Freitag
1a5a015eb4 More changes to the Changelog. 2012-11-14 15:03:14 +01:00
Klaas Freitag
1acea008c2 Fixed package download link. 2012-11-14 15:03:14 +01:00
Jenkins for ownCloud
59a1cc4596 [tx-robot] updated from transifex 2012-11-14 00:04:41 +01:00
Klaas Freitag
39dc4cb46c Use CredentialStore also for Qt4.6 based builds. 2012-11-13 15:01:05 +01:00
Klaas Freitag
9c3b9b84ae Prepare some entries for 1.1.2 2012-11-13 11:19:34 +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
Klaas Freitag
78be11b3cf Push Version to 1.1.2 pre 2012-11-13 11:19:34 +01:00
Jenkins for ownCloud
6f8824eacb [tx-robot] updated from transifex 2012-11-13 00:06:33 +01:00
Jenkins for ownCloud
12b5ad644d [tx-robot] updated from transifex 2012-11-12 00:03:18 +01:00
Jenkins for ownCloud
35b0a2b116 [tx-robot] updated from transifex 2012-11-10 00:03:27 +01:00
Jenkins for ownCloud
6442c7e5f7 [tx-robot] updated from transifex 2012-11-09 00:04:31 +01:00
Jenkins for ownCloud
8a394dd471 [tx-robot] updated from transifex 2012-11-08 00:04:24 +01:00
Jenkins for ownCloud
02e990b2c5 [tx-robot] updated from transifex 2012-11-07 00:04:15 +01:00
Jenkins for ownCloud
64177df3d9 [tx-robot] updated from transifex 2012-11-06 00:02:48 +01:00
Daniel Molkentin
df219dd09b Doc: use correct cmake vars 2012-11-05 14:44:10 +01:00
Daniel Molkentin
59969c3574 Qt is not C. 2012-11-05 11:44:22 +01:00
Klaas Freitag
3b9f4bf825 Merge branch 'master' of github.com:owncloud/mirall 2012-11-05 11:38:16 +01:00
Daniel Molkentin
80ecd71fc7 Doc: more trouble shooting 2012-11-05 11:36:48 +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
Jenkins for ownCloud
61b9b44fa7 [tx-robot] updated from transifex 2012-11-05 00:04:23 +01:00
Daniel Molkentin
7d6eb61f1b doc: wording 2012-11-04 00:46:02 +01:00
Jenkins for ownCloud
6d17b9de4e [tx-robot] updated from transifex 2012-11-04 00:02:33 +01:00
Jenkins for ownCloud
ce45c7876c [tx-robot] updated from transifex 2012-11-03 00:03:25 +01:00
Daniel Molkentin
7cc3e7e392 Debug: fix typo 2012-11-02 16:32:26 +01:00
Daniel Molkentin
3a165ad654 Doc: add troubleshooting section 2012-11-02 16:26:56 +01:00
Daniel Molkentin
f04cf3a31e Bump version of master to 1.2pre 2012-11-02 16:14:51 +01:00
Daniel Molkentin
4fbfe7bfef Installer: Only show license on special request
GPL is a distribution license, and should thus
not be required to be accepted upon installation.
2012-11-02 16:14:33 +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
Jenkins for ownCloud
0de3ae32c0 [tx-robot] updated from transifex 2012-11-02 00:05:49 +01:00
Daniel Molkentin
06e7864174 Doc: Require sphinx todo extension 2012-11-01 19:10:51 +01:00
Daniel Molkentin
8b60726a48 Doc: Introduce chapter on Architecture, Glossary 2012-11-01 19:10:01 +01:00
Daniel Molkentin
855597bfd9 Doc: formatting 2012-11-01 17:24:25 +01:00
Daniel Molkentin
827a31fa02 doc: formatting fix 2012-11-01 17:03:58 +01:00
Daniel Molkentin
20f04ec6d9 doc: small improvements 2012-11-01 16:52:07 +01:00
Daniel Molkentin
83180310af doc: add chapter on (soft-)branding 2012-11-01 16:33:27 +01:00
Jenkins for ownCloud
829bb7c5a9 [tx-robot] updated from transifex 2012-11-01 00:03:01 +01:00
Daniel Molkentin
9feb9b5262 Doc: fix typo 2012-10-31 17:22:03 +01:00
Daniel Molkentin
f2cfabcdb8 Doc: improve build instructions 2012-10-31 15:19:00 +01:00
Daniel Molkentin
6b2be97c22 Docs: add build chapter 2012-10-31 14:44:59 +01:00
Jenkins for ownCloud
616d8d39b7 [tx-robot] updated from transifex 2012-10-31 00:03:16 +01:00
Jenkins for ownCloud
69b3e9b10d [tx-robot] updated from transifex 2012-10-30 00:02:40 +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
Jenkins for ownCloud
01e601db14 [tx-robot] updated from transifex 2012-10-29 00:03:36 +01:00
Jenkins for ownCloud
0184993795 [tx-robot] updated from transifex 2012-10-28 00:03:12 +02:00
Daniel Molkentin
6b0abed4ee Remove file checked-in by accident 2012-10-27 19:30:37 +02:00
Daniel Molkentin
bf8b9246fe Add docs 2012-10-27 17:05:01 +02: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
Jenkins for ownCloud
10766182bc [tx-robot] updated from transifex 2012-10-27 00:02:51 +02:00
Dominik Schmidt
351f9aedfb Add testing skeleton 2012-10-26 20:24:12 +02:00
Jenkins for ownCloud
6757db2e53 [tx-robot] updated from transifex 2012-10-26 02:07:36 +02:00
Bartek Przybylski
55c9c3bf12 remove compilation warning 2012-10-25 23:20:00 +02:00
Jenkins for ownCloud
e52d43f68b [tx-robot] updated from transifex 2012-10-25 02:11:05 +02:00
Jenkins for ownCloud
cfe9a2476b [tx-robot] updated from transifex 2012-10-24 02:10:48 +02:00
Daniel Molkentin
efa8d7670c Show hashes of unknown certs 2012-10-24 01:44:13 +02:00
Jenkins for ownCloud
8ddba655df [tx-robot] updated from transifex 2012-10-23 02:08:12 +02:00
Daniel Molkentin
5c13115fee Remove 0% translations. 2012-10-22 16:39:56 +02:00
Thomas Müller
f948ce4015 [tx] minimum_perc = 70 2012-10-22 15:16:57 +03:00
Daniel Molkentin
2cbcd52f35 Do not allow the selection of a target in single folder mode 2012-10-22 11:32:53 +02:00
Jenkins for ownCloud
09405fc9f7 [tx-robot] updated from transifex 2012-10-22 02:08:53 +02:00
Jenkins for ownCloud
651517c3a7 [tx-robot] updated from transifex 2012-10-21 02:09:50 +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
Jenkins for ownCloud
3e150ee47b [tx-robot] updated from transifex 2012-10-20 02:06:35 +02:00
Jenkins for ownCloud
ddc337303c [tx-robot] updated from transifex 2012-10-19 02:10:42 +02:00
Daniel Molkentin
574b6f49c2 Add .gitattributes, needed for clean git export 2012-10-18 13:42:47 +04:00
Daniel Molkentin
18a06506b8 ChangeLog updates for 1.1.1 2012-10-18 10:11:58 +02:00
Jenkins for ownCloud
bbdc7423b9 [tx-robot] updated from transifex 2012-10-18 02:11:56 +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
Jenkins for ownCloud
94346fc12f [tx-robot] updated from transifex 2012-10-17 02:08:28 +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
Jenkins for ownCloud
dfe30c16c1 [tx-robot] updated from transifex 2012-10-16 02:10:50 +02:00
Jenkins for ownCloud
824a14ebb5 [tx-robot] updated from transifex 2012-10-15 02:11:39 +02:00
Jenkins for ownCloud
6fa9b86ee7 [tx-robot] updated from transifex 2012-10-14 02:12:35 +02:00
Jenkins for ownCloud
0955e8cc1f [tx-robot] updated from transifex 2012-10-13 02:11:26 +02:00
Daniel Molkentin
aad21c8c4a Add license to Windows installer 2012-10-12 14:44:21 +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
04642b3c6d Export repo revision indicator
To be used with git export.
2012-10-12 14:44:21 +02:00
Jenkins for ownCloud
85ac69dbe6 [tx-robot] updated from transifex 2012-10-12 02:09:27 +02:00
Jenkins for ownCloud
c491b9c064 [tx-robot] updated from transifex 2012-10-11 02:10:00 +02:00
Daniel Molkentin
d52d32f1b3 add helper script to sign app bundle 2012-10-10 16:57:07 +02:00
Daniel Molkentin
fee9616708 OS X: Remove "make install" requirment for csync 2012-10-10 16:05:17 +02:00
Daniel Molkentin
62a36cd3bb CMake: Also set CSYNC_BINARY_DIR
...so NSIS finds its resource in the right place.
2012-10-10 15:15:19 +02:00
Daniel Molkentin
60f16896ed Merge branch 'master' of github.com:owncloud/mirall 2012-10-10 14:20:17 +02:00
Daniel Molkentin
aa63a789dc Fix for prev. commmit 2012-10-10 14:19:29 +02:00
Daniel Molkentin
d599c4532c replace relative csync buildir detection magic
If you do not want to run make install for lib(o)csync,
pass -DCSYNC_LIBRARY_PATH=$your_csync_builddir
and  -DCSYNC_INCLUDE_PATH=$your_csync_srcdir/src
to cmake when building mirall.
2012-10-10 14:04:24 +02:00
Daniel Molkentin
a6acb2a4d0 Remove beta flag in preparation for packaging 2012-10-10 11:53:43 +02:00
Daniel Molkentin
824368e504 Update change log with client changes 2012-10-10 11:51:38 +02:00
Jenkins for ownCloud
c91cc8e411 [tx-robot] updated from transifex 2012-10-10 02:13:22 +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
Jenkins for ownCloud
088a6412b1 [tx-robot] updated from transifex 2012-10-09 02:10:53 +02:00
Daniel Molkentin
6459f574cc Prepare for Mac package signing. 2012-10-09 01:40:43 +02:00
Daniel Molkentin
fdfafb6e70 NSI: add proper version of ocsync.conf 2012-10-09 01:40:43 +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
Jenkins for ownCloud
3b5bc2c13f [tx-robot] updated from transifex 2012-10-07 02:10:33 +02:00
Jenkins for ownCloud
0b885b3cb4 [tx-robot] updated from transifex 2012-10-06 02:10:14 +02:00
Klaas Freitag
20a875a682 Fix SYCCONFIGDIR => SYSCONFDIR. 2012-10-05 23:01:43 +02:00
Daniel Molkentin
34b8c39878 Quick hack: do not crash on windows when pausing sync 2012-10-05 22:53:42 +02:00
Klaas Freitag
a646f72980 Merge branch 'master' of github.com:owncloud/mirall 2012-10-05 22:47:54 +02:00
Klaas Freitag
aa56d1ebea Fix SYSCONFIGDIR install of the sync-exclude file. 2012-10-05 22:47:08 +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
Klaas Freitag
7e1c58b602 Fix include path search. 2012-10-05 17:13:23 +02:00
Klaas Freitag
e0a21ebfd6 Fix to find the header even from installed ocsync packages. 2012-10-05 17:02:39 +02:00
Daniel Molkentin
06a1cfe642 Anther fix for sync pausing 2012-10-05 12:59:58 +02:00
Daniel Molkentin
cb6d056a1f Don't hardcode packag name on Mac 2012-10-05 12:18:45 +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
Klaas Freitag
1442b4d42c Merge branch 'master' of github.com:owncloud/mirall 2012-10-05 10:03:50 +02:00
Klaas Freitag
736a8dc457 fixed name of the csync owncloud module. 2012-10-05 10:03:16 +02:00
Jenkins for ownCloud
b06ab27711 [tx-robot] updated from transifex 2012-10-05 02:08:37 +02:00
Daniel Molkentin
3a983b428f Fix bug when trying to pause a running sync 2012-10-04 14:08:23 +02:00
Klaas Freitag
e50479cae5 Push version to 1.1.0 beta3 2012-10-04 13:09:00 +02:00
Jenkins for ownCloud
a8307abe64 [tx-robot] updated from transifex 2012-10-04 02:09:59 +02:00
Jenkins for ownCloud
1e96c1b7bd [tx-robot] updated from transifex 2012-10-03 02: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
732ed57360 Merge branch 'master' of github.com:owncloud/mirall 2012-10-02 13:25:28 +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
Jenkins for ownCloud
4256d0fd8a [tx-robot] updated from transifex 2012-10-02 02:08:21 +02:00
Jenkins for ownCloud
5587da946f [tx-robot] updated from transifex 2012-10-01 02:11:06 +02:00
Lukas Reschke
0b06982929 Optimize PNG files
This lossless optimization, reduces the filesize at about 25% for each
image
2012-09-30 15:27:46 +02:00
Lukas Reschke
e220de5236 Add .htaccess to sync exclude
ownCloud Server blacklists .htaccess files for security reasons - so it's useless to try to sync it.

See isBlacklisted() - fed34aecfa/lib/filesystem.php (L388)
2012-09-30 16:20:50 +03:00
Jenkins for ownCloud
3fc8e1c339 [tx-robot] updated from transifex 2012-09-30 02:08:03 +02:00
Jenkins for ownCloud
d21407181b [tx-robot] updated from transifex 2012-09-29 02:07:39 +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
42d7a48df9 Added missing 's' - thanks Lukas :) 2012-09-28 11:02:21 +02:00
Klaas Freitag
4691a6cae1 Merge branch 'master' of github.com:owncloud/mirall 2012-09-28 11:01:35 +02:00
Klaas Freitag
2a46a8a1ed Changelog update. 2012-09-28 11:01:06 +02:00
Jenkins for ownCloud
ee7099f8fd [tx-robot] updated from transifex 2012-09-28 02:08:28 +02:00
Klaas Freitag
dc5452a315 more useful entries for the exclude list. 2012-09-27 17:38:36 +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
b34d5ca3de Deleted for the benefit of sync-exclude.lst 2012-09-27 15:33:40 +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
af99be4cd5 NSIS: shut down binary before uninstall 2012-09-27 10:38:31 +02:00
Daniel Molkentin
d9d0432187 nicer Setup images 2012-09-27 10:36:43 +02:00
Jenkins for ownCloud
888181145a [tx-robot] updated from transifex 2012-09-27 02:05:13 +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
5adcc7d12f CMake: Finding files requires reference to srcdir 2012-09-26 11:29:55 +02:00
Jenkins for ownCloud
73374cb810 [tx-robot] updated from transifex 2012-09-26 02:09:01 +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
9d479f9061 Installers on Windows are called Setup
Also remove bogus manual line break.
2012-09-24 07:19:09 +02:00
Daniel Molkentin
783207fa40 At least the Program group should be in 'Minimal'. 2012-09-24 03:45:12 +02:00
Daniel Molkentin
ea123b1705 Fix typo 2012-09-24 03:44:32 +02:00
Daniel Molkentin
8233c0c82a Add autostart section 2012-09-24 03:44:03 +02:00
Daniel Molkentin
95f28eca5b Rename win installer BMPs as a consequence of renaming the package 2012-09-24 00:42:30 +02:00
Daniel Molkentin
00f7b10b0f Drop the -client suffix. 2012-09-23 23:39:26 +02:00
Jenkins for ownCloud
2d87466217 [tx-robot] updated from transifex 2012-09-25 02:07:37 +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
Jenkins for ownCloud
a7a744eb6f [tx-robot] updated from transifex 2012-09-24 02:05:47 +02:00
Jenkins for ownCloud
6f027460d1 [tx-robot] updated from transifex 2012-09-23 02:06:37 +02:00
Jenkins for ownCloud
f1d95323b2 [tx-robot] updated from transifex 2012-09-22 02:03:37 +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
a05a4c3741 More templatization. 2012-09-21 13:10:55 +02:00
Jenkins for ownCloud
5255a32fac [tx-robot] updated from transifex 2012-09-21 02:07:04 +02:00
Daniel Molkentin
a94e6dbe8c NSIS: Remove stray file 2012-09-20 17:32:13 +02:00
Daniel Molkentin
663a1886e9 CMake: Centralize all application-specific parameters. 2012-09-20 17:31:18 +02:00
Klaas Freitag
1a603bd800 Update version to 1.1.0 beta2 2012-09-20 18:17:07 +03: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
8a56a90d16 NSIS: fix typo, expand variables properly. 2012-09-20 12:21:21 +02:00
Daniel Molkentin
2c44915db9 ignore more build/IDE artifacts 2012-09-20 11:12:52 +02: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
Jenkins for ownCloud
7e4ff7dc86 [tx-robot] updated from transifex 2012-09-20 02:12:07 +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
d9f5b681cb Merge branch 'master' of github.com:owncloud/mirall 2012-09-19 12:59:20 +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
Jenkins for ownCloud
f8cb8f31de [tx-robot] updated from transifex 2012-09-19 02:09:07 +02: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
Jenkins for ownCloud
0b75075a4f [tx-robot] updated from transifex 2012-09-18 02:05:38 +02:00
Daniel Molkentin
881f8463e8 OS X: reintroduce LSUIElement in Info.plist 2012-09-17 21:55:57 +02:00
Daniel Molkentin
92ea6a2bef Tiny fix to previous commit 2012-09-17 21:50:30 +02:00
Daniel Molkentin
f1cd510058 Fix up Info.plist metadata for OS X
- behave correctly on retina displays
- fix focus policy
- insert correct version info from cmake
2012-09-17 21:46:18 +02: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
Jenkins for ownCloud
910803cacf [tx-robot] updated from transifex 2012-09-15 02:07:51 +02:00
Daniel Molkentin
55e1ef2cc5 Merge pull request #3 from kyle-f/master
Owncloud client wizard setup page doesn't handle back button presses.
2012-09-14 01:29:53 -07: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
Jenkins for ownCloud
5ecab55781 [tx-robot] updated from transifex 2012-09-14 02:04:51 +02:00
Jenkins for ownCloud
825bd72050 [tx-robot] updated from transifex 2012-09-12 02:04:30 +02: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
Jenkins for ownCloud
f27a3c3224 [tx-robot] updated from transifex 2012-09-11 02:05:39 +02: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
Jenkins for ownCloud
7b6063f964 [tx-robot] updated from transifex 2012-09-10 02:06:51 +02:00
Jenkins for ownCloud
719c8e2435 [tx-robot] updated from transifex 2012-09-09 02:05:36 +02:00
Jenkins for ownCloud
3ea107792e [tx-robot] updated from transifex 2012-09-08 02:07:36 +02:00
Jenkins for ownCloud
aa67c0e75e [tx-robot] updated from transifex 2012-09-07 02:09:29 +02:00
Jenkins for ownCloud
d13fc42b47 [tx-robot] updated from transifex 2012-09-06 02:08:33 +02:00
Jenkins for ownCloud
541ae99f91 [tx-robot] updated from transifex 2012-09-05 02:07:34 +02:00
Jenkins for ownCloud
a9cd49277b [tx-robot] updated from transifex 2012-09-04 02:05:08 +02:00
Jenkins for ownCloud
e687a63997 [tx-robot] updated from transifex 2012-09-01 13:27:27 +02:00
Jenkins for ownCloud
0006ab14ae [tx-robot] updated from transifex 2012-08-31 02:09:05 +02:00
Klaas Freitag
ca7c25009e Update to version 1.1.0 beta1 2012-08-30 18:53:39 +03: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
912f440176 Added win dir to most hackish solution ever. 2012-08-30 18:47:43 +03:00
Klaas Freitag
d346438718 Merge branch 'master' of github.com:owncloud/mirall 2012-08-30 14:03:30 +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
Jenkins for ownCloud
266e1988f6 [tx-robot] updated from transifex 2012-08-30 02:08:04 +02:00
Jenkins for ownCloud
8fe4ca4f07 [tx-robot] updated from transifex 2012-08-29 02:06:58 +02:00
Jenkins for ownCloud
7c167ae49a [tx-robot] updated from transifex 2012-08-28 02:05:21 +02: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
a2b5596ee1 removed wrong path piece "win" 2012-08-27 18:56:34 +03:00
Jenkins for ownCloud
dba0332bc0 [tx-robot] updated from transifex 2012-08-27 12:04:48 +02: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
Lukas Reschke
803f3e4a14 Change the link to the oC repository. 2012-08-26 01:51:47 +03:00
Jenkins for ownCloud
e3e163d453 [tx-robot] updated from transifex 2012-08-25 02:04:37 +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
Jenkins for ownCloud
dd2ac61200 [tx-robot] updated from transifex 2012-08-24 02:03:36 +02:00
Jenkins for ownCloud
d2c7087395 [tx-robot] updated from transifex 2012-08-23 02:02:45 +02:00
Jenkins for ownCloud
6836732a5c [tx-robot] updated from transifex 2012-08-22 16:25:50 +02:00
Jenkins for ownCloud
bd39fbeefd [tx-robot] updated from transifex 2012-08-21 02:03:27 +02:00
Jenkins for ownCloud
d5570ab55e [tx-robot] updated from transifex 2012-08-20 02:02:42 +02:00
Jenkins for ownCloud
e52b51b5d6 [tx-robot] updated from transifex 2012-08-19 02:03:13 +02:00
Jenkins for ownCloud
e6e0dd35a3 [tx-robot] updated from transifex 2012-08-18 02:03:05 +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
Jenkins for ownCloud
6ff09ddfd7 [tx-robot] updated from transifex 2012-08-17 02:03:02 +02:00
Jenkins for ownCloud
6497ee701a [tx-robot] updated from transifex 2012-08-16 02:04:24 +02:00
Klaas Freitag
3669b43332 Merge branch 'master' of gitorious.org:owncloud/mirall 2012-08-15 18:17:02 +03:00
Klaas Freitag
58d75e7bfe Show pathes in platform specific notation 2012-08-15 18:16:44 +03:00
Jenkins for ownCloud
706b9e4e09 [tx-robot] updated from transifex 2012-08-15 02:04:21 +02:00
Klaas Freitag
dc54fa563f Update to version 1.0.5 with Changelog entry. 2012-08-14 13:26:24 +03:00
Klaas Freitag
1b7ad22e2e Fix setup dialog: Use https if checkbox is activated. 2012-08-14 13:23:06 +03:00
Klaas Freitag
e975ec6200 Merge branch 'master' of gitorious.org:owncloud/mirall 2012-08-14 12:23:45 +03:00
Jenkins for ownCloud
4e62abe542 [tx-robot] updated from transifex 2012-08-14 02:03:03 +02:00
Klaas Freitag
6b98958de6 Fatal error if svn2ico is missing. 2012-08-13 15:05:40 +03:00
Jenkins for ownCloud
3f360c7e7b [tx-robot] updated from transifex 2012-08-13 02:02:27 +02:00
Thomas Mueller
2827a4724b removing mirall_zh_CN.GB2312.ts as this file format is not supported and causes conflicts with mirall_zh_CN.ts 2012-08-12 23:47:51 +02:00
Jenkins for ownCloud
b9a7ce65a7 [tx-robot] updated from transifex 2012-08-12 23:33:05 +02:00
Thomas Mueller
6a69200ae7 transifex configuration added 2012-08-12 23:31:27 +02:00
Klaas Freitag
4012e3ff25 Updated translation list in installer template 2012-08-10 13:25:36 +03:00
Klaas Freitag
32a8866218 New translations added. 2012-08-10 12:22:30 +03:00
Klaas Freitag
ff7f20ec8e updated changelog for version 1.0.4 2012-08-10 12:21:53 +03:00
Klaas Freitag
a34601f0ba Updated translations german and russian. 2012-08-10 12:20:46 +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
c4a6827ab3 Add libproxy dlls. 2012-08-08 16:46:00 +03:00
Klaas Freitag
01ec65441e Merge branch 'master' of gitorious.org:owncloud/mirall 2012-08-06 17:44:53 +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
Dominik Schmidt
5d6c9339f8 Disable not building in bundle mode on OSX. Unless someone tests that codepath, it's probably better not to allow anyone to build it especially not by default 2012-08-06 16:01:43 +02: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
54c2368dbb Push version to upcoming version 1.0.4 2012-08-06 14:54:47 +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
Dominik Schmidt
336f8fbbd3 Fix error message. Thanks to Danimo for the heads up. 2012-07-31 01:43:41 +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
9c2224f8e9 More endings to exlude.lst 2012-07-26 11:56:48 +03:00
Klaas Freitag
36b162aa53 Merge commit 'refs/merge-requests/3' of git://gitorious.org/owncloud/mirall into merge-requests/3 2012-07-26 11:54:06 +03:00
Klaas Freitag
eb83604995 Merge commit 'refs/merge-requests/4' of git://gitorious.org/owncloud/mirall into merge-requests/4 2012-07-26 11:51:56 +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
a89f8fd2ce Merge commit 'refs/merge-requests/9' of git://gitorious.org/owncloud/mirall into merge-requests/9 2012-07-26 11:43:18 +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
a84361afd3 Merge commit 'refs/merge-requests/8' of git://gitorious.org/owncloud/mirall into merge-requests/8 2012-07-26 11:35:58 +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
5246a6fad4 Fix SYSCONFIGDIR check, Patch from Riddell 2012-07-20 12:33: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
Michael Georg Hansen
324120e69c Make building of tests configurable via configuration switch.
This commit makes building of tests configurable via a configuration switch given to CMake: -DUNIT_TESTING=true

Therefore, making changes to CMakeLists.txt for enabling tests is not necessary any more. It is done the same way in CSync.
2012-07-18 22:59:22 +02:00
Michael Georg Hansen
eae20fc537 Configure version.h into the build directory, not the source directory. 2012-07-18 22:46: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
Klaas Freitag
11b4b36c3f Add sync.dll to Windows bundler. 2012-07-18 17:26:58 +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
8154c4513e updated german translation 2012-06-26 12:53:33 +02:00
Klaas Freitag
40a3b1e4e8 Use absolute path function for directory comparison 2012-06-26 12:27:50 +02:00
Klaas Freitag
c6aad551aa Added change. 2012-06-25 16:12:35 +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
07ecd8527d Back to SYSCONFDIR again :-/ 2012-06-22 15:39:17 +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
pokoli
047e2b3a4a Add spanish translations from transifex 2012-06-20 13:23:51 +02:00
pokoli
43e927d156 Added catalan translation from transifex 2012-06-20 13:19:14 +02:00
Klaas Freitag
7e30319040 Merge branch 'master' of gitorious.org:owncloud/mirall 2012-06-20 12:52:57 +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
Thomas Mueller
89b9e55945 second possible header name added 2012-06-19 00:13:58 +02:00
Thomas Mueller
963e76dea4 added HINTS to a path which can be specified via a environment setting 2012-06-18 23:21:12 +02:00
Klaas Freitag
5e2729ddef Fix a typo in ssl dialog 2012-06-18 18:27:06 +02:00
Klaas Freitag
17377fc92d Updated Changelog 2012-06-18 17:45:33 +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
60f966e9c2 updated german translation (with mixins from transifex) 2012-06-18 14:51:12 +02:00
Klaas Freitag
d26120bfbf added mac specific files to exclude. 2012-06-18 14:50:01 +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
1de7296261 Fix package building for non apple platforms. 2012-06-05 16:31:51 +02:00
Klaas Freitag
9502f10689 bump version to next version 1.0.3 2012-06-05 16:31:28 +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
428ef9aba3 Install exclude list to /etc 2012-05-16 17:07:03 +02:00
Klaas Freitag
1a24266f2b Updated changelog 2012-05-16 16:26:30 +02:00
Klaas Freitag
93ef3954ab Fixed CPack Bundle check for MacOSX 2012-05-16 15:36:33 +02:00
Klaas Freitag
6cf6e1dcba fix exclude.lst reading on MacOSX 2012-05-16 15:13:51 +02:00
Klaas Freitag
57923529a5 osx: don't allow building a bundle when built without
BUILD_OWNCLOUD_OSX_BUNDLE
2012-05-16 15:11:30 +02:00
Klaas Freitag
be7a1ca111 Find exclude.lst under MacOS 2012-05-16 14:55:19 +02:00
Klaas Freitag
1f3fb4b30e Update Changelog 2012-05-16 12:10:14 +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
9202d66590 Added entries for version 1.0.2 2012-05-14 11:05:44 +02:00
Klaas Freitag
b34da1cd40 Updated windows pics for installer 2012-05-11 11:25:06 +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
eb6dd2bacf Merge branch 'master' of gitorious.org:owncloud/mirall 2012-05-11 10:19:55 +02:00
Klaas Freitag
aa86561f31 write version set in VERSION.cmake to version.h 2012-05-11 10:19:15 +02:00
Klaas Freitag
f0541171ce updated translations 2012-05-11 10:18:56 +02:00
Klaas Freitag
4c4d293125 Moved version to 1.0.2 2012-05-11 10:17:57 +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
Thomas Mueller
3e79a3b1e5 ignoring qt-creator files 2012-05-03 21:12:36 +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
1a2152859d updated owncloud 128 icon. 2012-05-02 16:45:38 +02:00
Klaas Freitag
496572314d Fix the app icon to be ownclouds 2012-05-02 16:33:07 +02:00
Klaas Freitag
bfedc2c18b fixed an icon name typo. 2012-05-02 15:54:55 +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
c2f0459a36 Add russian translation contributed by cas@altlinux.ru
Fixed cmake to glob all translation files
2012-04-30 12:47:54 +02:00
Klaas Freitag
9c4613e5d2 Allow to interrupt running sync task, incl. some cleanups. 2012-04-30 08:56:56 +02:00
Dominik Schmidt
f96fa3dbeb win: allow building the installer from local csync build dir and from installed csync as well 2012-04-26 17:16:34 +02:00
Dominik Schmidt
f02a018711 win: remove klaasi haasi's harcoded paths from the nsi 2012-04-26 16:55:14 +02:00
Dominik Schmidt
b5f43a89ea win: copy exclude.lst from correct location into the installer 2012-04-26 16:37:00 +02:00
Dominik Schmidt
2cf667f055 Handle SYSCONFDIR correctly 2012-04-26 16:32:50 +02:00
Dominik Schmidt
c03c112193 Add a CMake toolchain file for cross-compiling in openSUSE. 2012-04-26 14:45:40 +02:00
Dominik Schmidt
aca5eae6d0 Improve version handling in cmake 2012-04-26 13:58:22 +02:00
Klaas Freitag
31b636a423 Add a win32 debug line to CMakeLists 2012-04-23 10:58:21 +02:00
Klaas Freitag
8e1ee5c19f Decreased the needed cmake version to 2.6 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
Klaas Freitag
5a4554d4aa Changelog entry backport 4.6 2012-04-21 22:01:35 +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
9109d7b5ac Add missing GNUInstallDirs module for cmake. 2012-04-21 11:22:03 +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
1fefd09e1a Install exclude.lst to /etc, not to /usr/etc. 2012-04-18 16:24:42 +02:00
Klaas Freitag
e2bde7a768 Changelog file 2012-04-18 16:03:38 +02:00
Klaas Freitag
e8aaa02ba6 Merge branch 'master' of gitorious.org:owncloud/mirall 2012-04-18 15:22:37 +02:00
Klaas Freitag
a81ad4acdc Translation and wording fixes. 2012-04-18 15:21:55 +02:00
Klaas Freitag
43edad2c9d fix version. Probably this file can be dropped. Check. 2012-04-18 15:21:28 +02:00
Klaas Freitag
3f027cda73 Handle translation files correct. 2012-04-18 13:59:03 +02:00
Thomas Mueller
7a9ab6e753 Qt version requirement is 4.7 2012-04-18 13:47:03 +02:00
Klaas Freitag
9f8e3194e4 Push version to 1.0.1 for installers 2012-04-18 12:24:32 +02:00
Klaas Freitag
d4b264acbc Log the system name used for translations 2012-04-18 12:10:14 +02:00
Klaas Freitag
d7e161a161 Added a testplan to test systematically. 2012-04-18 12:00:29 +02:00
Klaas Freitag
2c90a368f9 minor fixes and changes. 2012-04-18 11:59:56 +02:00
Klaas Freitag
313a56f6d6 added crypto dlls for windows package 2012-04-17 17:04:09 +02:00
Klaas Freitag
1cb23ecb26 fixed wording. 2012-04-17 17:03:46 +02:00
Klaas Freitag
5c07363335 fix status dialog status display and overall status display. 2012-04-17 15:02:18 +02:00
Klaas Freitag
61ddff840a Fix display status dialog: Do not flicker on local runs if polling.
handle syncresult object in folder consistent.
2012-04-17 13:18:14 +02:00
Klaas Freitag
3f379b5671 removed useless double include. 2012-04-17 13:18:14 +02:00
Klaas Freitag
3c3bdeec5b added clearError and flag to indicate local run methods. 2012-04-17 13:18:14 +02:00
Klaas Freitag
e521d0f53c fix check if INOTIFY flag was given on cmake command line. 2012-04-17 13:18:14 +02:00
Klaas Freitag
2f5a3b849c - Restrict authentication to the configured ownCloud URL
- catch wrong username error correctly and report to user.
2012-04-17 13:06:25 +02:00
Klaas Freitag
b92c22b6df use thread save implementation of error codes in csync. 2012-04-17 12:34:19 +02:00
Dominik Schmidt
ccac3dcf95 Make it buildable as bundle on OSX 2012-04-16 13:03:20 +02:00
Florian Reinhard
508d05336b cmake fix. 2012-04-15 18:30:31 +02:00
Klaas Freitag
77fff8e1bf Caught additional error messages 2012-04-15 16:49:11 +02:00
Klaas Freitag
29a38b82ad Replace USE_WATCHER with USE_INOTIFY 2012-04-15 14:47:43 +02:00
Klaas Freitag
4a89768d02 Removed obsolete QWebdav class from CMake 2012-04-15 14:43:50 +02:00
Klaas Freitag
8cec736fea Fix mkdir in owncloudsetupwizard 2012-04-15 14:36:24 +02:00
Klaas Freitag
bf61aba351 Enable activation of status dialog entries on macos 2012-04-15 14:14:16 +02:00
Klaas Freitag
c71ad3072f Removed mirallwebdav header 2012-04-15 14:07:00 +02:00
Klaas Freitag
ccd93036fb Removed obsolete class MirallWebDav 2012-04-15 14:06:27 +02:00
Klaas Freitag
c04315805f clearifications in ownCloudInfo 2012-04-15 13:54:16 +02:00
Klaas Freitag
7c6ec3de93 Created WebDAV MkCol request on ownCloudInfo, QWebDav-Lib ready to
be deleted.
2012-04-14 19:08:53 +02:00
Klaas Freitag
28aa90444a Fixed a missing return type. 2012-04-14 12:56:45 +02:00
Dominik Schmidt
b6472ce1af Make USE_WATCHER configurable from CMake 2012-04-14 14:31:46 +02:00
Klaas Freitag
7acf400436 Removed path from csync include 2012-04-14 12:16:30 +02:00
Klaas Freitag
93b0f3e6ca removed a compile warning non void return type. 2012-04-14 12:09:08 +02:00
Klaas Freitag
74abe2fa7a explicitely enable the finish button. 2012-04-14 11:20:12 +02:00
Dominik Schmidt
91d374c514 Use CMAKE_INSTALL_SYSCONFDIR instead of /etc 2012-04-14 04:43:04 +02:00
Dominik Schmidt
f7c34ea652 Try some stuff with FindCsync.cmake 2012-04-14 04:19:52 +02:00
Klaas Freitag
590f563150 Pushed to version 1.0.1 2012-04-12 21:34:04 +02:00
Klaas Freitag
fe45804c37 Save password base64 encoded instead of plain text 2012-04-12 21:30:47 +02:00
Klaas Freitag
cb9fcb00bd fixed password storage field when writing config. 2012-04-12 14:48:45 +02:00
Klaas Freitag
b8434a8d56 Support for password not stored locally. 2012-04-12 14:06:59 +02:00
Klaas Freitag
3fede657b9 SSL Connection Warning dialog working. 2012-04-12 11:37:48 +02:00
Klaas Freitag
0d0783ba5c Fixed owncloudinfo to handle multiple connections, workarounded a
few 'interesting' behaviours of QNetworkAccessManager.
2012-04-10 20:55:50 +02:00
Klaas Freitag
21a385ab4a - passed whole NetworkReply object to not-found slots to give more
descriptive error messages.
- Improved error messages for users if ownCloud is unreachable.
- Fixed a crash with ownCloudInfo getting deleted by Statusdialog.
2012-04-10 14:51:45 +02:00
Klaas Freitag
9fbc97503e Fix build, early stage. 2012-04-06 09:00:15 +02:00
Klaas Freitag
5ac5d6ee5f SSL Support WIP - not yet functionable. 2012-04-06 08:53:57 +02:00
Klaas Freitag
5da0859cea enable install of exclude.lst again 2012-04-02 20:20:19 +02:00
Klaas Freitag
2e8c963d21 remove test setting of own version. 2012-04-02 20:19:01 +02:00
Klaas Freitag
df8afe1c31 Update german translation. 2012-04-02 20:15:09 +02:00
Klaas Freitag
663e352956 Added an update check that queries an oC server for new versions. 2012-04-02 20:10:29 +02:00
Klaas Freitag
bfe35d5d47 bump windows installer version to 1.0.0 as well. 2012-04-02 20:06:26 +02:00
Klaas Freitag
d85d72d712 Updated translations german 2012-04-02 15:20:16 +02:00
Klaas Freitag
1ca83a4a02 install exclude list to /etc. 2012-04-02 14:05:23 +02:00
Klaas Freitag
b79aff6b65 install the exclude list. 2012-04-02 13:56:32 +02:00
Klaas Freitag
6f49d20785 - enable WIN32 build
- enable cpack changes.
2012-04-02 13:47:53 +02:00
Klaas Freitag
95f6f90cb5 Add win32 packaging with nsi 2012-04-02 13:44:24 +02:00
Klaas Freitag
43a9d1dcd0 added app icon 2012-04-02 13:44:00 +02:00
Klaas Freitag
596e824b54 Fixed sync start after ownCloud initial configuration. 2012-04-02 13:21:13 +02:00
Klaas Freitag
eb1fd2d5f8 Set verion to 1.0.0 2012-04-02 13:15:53 +02:00
Klaas Freitag
225753b150 Win32: Open local urls in Explorer correctly. 2012-04-02 12:13:55 +02:00
Klaas Freitag
41cc1b9377 search alternative places for the global exclude list 2012-04-01 15:09:04 +02:00
Klaas Freitag
cd817940ae - added a new icon to display the waiting-to-be-synced state
- fixed the status display if the status dialog opens
2012-03-31 12:44:22 +02:00
Klaas Freitag
c196f77732 - Fixed the tray icon on all platforms.
- Simplified the application icon method in the theme
- Set a Window Icon
2012-03-31 11:31:28 +02:00
Klaas Freitag
ccd1623528 Added check on correct oC Credentials on startup. 2012-03-30 20:42:40 +02:00
Klaas Freitag
903c8ca220 Provide better error messages in owncloud for csync bugs. 2012-03-30 15:34:56 +02:00
Klaas Freitag
8e637bd8c7 - fixed local file change detection in win poller
- fixed context menu at startup.
2012-03-30 13:57:02 +02:00
Klaas Freitag
3fb471edad Changed the folder queue to use QString instead of folder ptrs.
Delete folder after finished if its syncing at deletion time.
2012-03-29 10:13:19 +02:00
Klaas Freitag
d938c531c8 - added ocInfo check on startup to prevent folder syncing without
valid ownCloud connection
- fixed folder remove
2012-03-29 09:41:30 +02:00
Klaas Freitag
3d114f5b91 Use a large icon because QIcon does scale down but never up. 2012-03-28 17:28:50 +02:00
Klaas Freitag
bfc96b0783 Set Edit-Trigger to nothing. Do not let start editing by doubleclick. 2012-03-28 17:28:08 +02:00
Klaas Freitag
109bb10110 Initialise the resource code in the main function. 2012-03-28 17:27:28 +02:00
Klaas Freitag
3a36f54096 Added WIN32 switch to avoid the konsole window for production. 2012-03-28 17:26:54 +02:00
Klaas Freitag
ffc5895ba1 Poll folder watcher: compare to last seen file. 2012-03-28 15:13:08 +02:00
Klaas Freitag
84ffebe26c Let folderwatcher use the exclude list file.
simplified naming in mirallconfigfile class.
2012-03-28 12:23:34 +02:00
Klaas Freitag
47f5c51a87 Let csync load the exclude list file 2012-03-28 11:26:51 +02:00
Klaas Freitag
a89122d214 Fixed some mirall->ownCloud namings 2012-03-26 15:19:40 +02:00
Klaas Freitag
9dcc948b3b Disabled some logging 2012-03-26 14:38:48 +02:00
Klaas Freitag
248a0cfed8 - removed the sitecopy files and last references
- Fix status dialog:
 * display local and remote folder names
 * fixed status icon
 * fixed sizing when font size changes
 * fixed enable/disable buttons
- moved second path to folder base class
- added remote folder role to status dellegate
2012-03-26 13:20:15 +02:00
Klaas Freitag
b9a861c95c added internationalization support in application object. 2012-03-26 11:02:01 +02:00
Klaas Freitag
3cee1275b9 Removed confusing open... button in status dialog, link added 2012-03-26 11:01:04 +02:00
Klaas Freitag
5259ae1565 added translations of the application. 2012-03-26 09:48:30 +02:00
Klaas Freitag
5f3d82288d pushed version to 0.2.5 for next beta. 2012-03-26 09:34:46 +02:00
Klaas Freitag
5a4caef2db Update folder list in status dialog without wiping selection. 2012-03-23 15:31:46 +01:00
Klaas Freitag
bdbb85f245 Big changes: queue sync requests of folders and do in one thread
only to avoid thread clottering. Improve error reporting from the
csync thread.
2012-03-22 16:22:08 +01:00
Klaas Freitag
c6a9fb02d0 A more secure csync thread implementation (part1) 2012-03-21 18:03:49 +01:00
Klaas Freitag
c5c3e2ecb1 prevent thread from crashing if len is less than zero. 2012-03-19 16:08:18 +01:00
Klaas Freitag
8f94ea9f6a bumped version to next beta. 2012-03-17 13:48:29 +01:00
Klaas Freitag
91cab8f15f allow 202 reply from server on mkcol request. 2012-03-16 15:20:50 +01:00
Klaas Freitag
08991a5177 fix memory leak in folderinfo 2012-03-16 15:16:45 +01:00
Klaas Freitag
cceb350582 Fix remote dir check by starting the timer in initialize of the page.
Use showWarn everywhere.
2012-03-16 14:43:37 +01:00
Klaas Freitag
a074e4433e Fix signal and slot arguments in Folder add wizard. 2012-03-16 12:54:56 +01:00
Klaas Freitag
838272240c Fix detection of parent folders when adding a new folder. 2012-03-16 11:02:44 +01:00
Klaas Freitag
b7eae107ae Fixed crash when removing folders.
Simplified code to achieve that, removed a slot from status dia.
2012-03-16 10:39:20 +01:00
Klaas Freitag
16a9a73ea3 - removed constants.h as not longer needed because of themes.
- tray icons from theme now.
2012-03-15 18:09:00 +01:00
Klaas Freitag
1b12e6590f Built a portable version of FindCSync that finds dev setup stuff. 2012-03-14 15:26:22 +01:00
Klaas Freitag
759e2fff9d Added missing Q_OBJECTs 2012-03-14 11:57:08 +01:00
Klaas Freitag
ad6b3504ee Added automatic creation of a sync after connect. 2012-03-14 11:26:00 +01:00
Klaas Freitag
e30ed86153 Add mirall version to user agent 2012-03-14 10:02:52 +01:00
Klaas Freitag
ac2df346ac Handle empty oC-Url from setup correctly. 2012-03-14 09:56:47 +01:00
Klaas Freitag
3bbfeaee93 - do connection check to owncloud in the show event.
- fix deletion of the check object
2012-03-14 09:52:18 +01:00
Klaas Freitag
cc25ee62cc Set strict permission on cfg file. 2012-03-13 17:52:23 +01:00
Klaas Freitag
ba13437fce Remove user and passwd from ownCloud url and implement a callback.
Added static data to CSyncThread to hold user and passwd, which is
asked for in the callback.
2012-03-13 17:37:43 +01:00
Klaas Freitag
4699093c06 Fix tray icon loading if no share is defined. 2012-03-13 16:30:37 +01:00
Klaas Freitag
1a20d42424 use portable QTimer to initialize the rand function. 2012-03-13 15:45:10 +01:00
Klaas Freitag
753be4d2bc version to new internal beta 0.2.3 2012-03-13 15:39:50 +01:00
Klaas Freitag
2882b49676 More elegant status dialog update 2012-03-13 15:39:04 +01:00
Klaas Freitag
2ae1b5dc84 move the poll timer stop to the correct place just before starting
to sync.
2012-03-12 17:37:18 +01:00
Klaas Freitag
09fdcf2053 add a path hint for the locally built version of csync to findcsync. 2012-03-12 17:36:38 +01:00
Klaas Freitag
c61c7962f7 introduce a proper model for the status dialog. 2012-03-08 13:40:55 +01:00
Klaas Freitag
5908cd9377 open a folder on double click in status dialog. 2012-03-08 12:08:53 +01:00
Klaas Freitag
949b33a6d1 Set a variable poll timer interval, useful for multiple folders.
Start polltimer again after folder add.
2012-03-08 11:39:31 +01:00
Klaas Freitag
df2d745747 Add a hint to find the development time csync libs and includes. 2012-03-08 11:38:15 +01:00
Klaas Freitag
cf4130caf9 fix more include dirs and link commands for csync. 2012-03-08 11:37:36 +01:00
Klaas Freitag
118370de63 Correct version on the splash screen. 2012-03-03 11:01:53 +01:00
Klaas Freitag
98a3fff9b9 Removed an unused comment 2012-03-03 11:01:36 +01:00
Klaas Freitag
dbf02772c3 Fixed tray icon, use theme for this
Fixed folder enable/disable.
2012-03-03 10:51:06 +01:00
Klaas Freitag
1f12f3d181 Next beta version 0.2.2 2012-03-03 10:18:47 +01:00
Klaas Freitag
f494492459 Refresh status dialog after removal of a folder 2012-03-03 10:18:03 +01:00
Klaas Freitag
660abb491d Add install target for owncloud 2012-03-02 15:03:35 +01:00
Klaas Freitag
1fc60f8797 Set version to internal beta version 0.2.1 2012-03-02 11:49:01 +01:00
Klaas Freitag
afe6180a88 Fixed some glitches in CMakeLists.txt for Unix 2012-03-01 16:56:08 +01:00
Klaas Freitag
8c9e364eec Removed moc includes as this is fixed in the build process. 2012-03-01 16:15:29 +01:00
Klaas Freitag
65f80c655c Fixes for inotify includes on win
removed moc include
2012-03-01 16:14:44 +01:00
Klaas Freitag
d1f0578bf8 some changes to get inotify out of win build.
removed moc include.
2012-03-01 16:13:50 +01:00
Klaas Freitag
060b2ddfa5 Use undef instead of numeric define for USE_WATCHER 2012-03-01 16:12:44 +01:00
Klaas Freitag
dd1c947c38 added missing include stdint.h 2012-03-01 16:11:56 +01:00
Klaas Freitag
f892212acf Changes to build for mingw32 properly. 2012-03-01 16:10:08 +01:00
Klaas Freitag
96ac39601c Fixed ignore handling, do not allow hidden files to trigger sync. 2012-02-29 16:25:38 +01:00
Klaas Freitag
1fc19647e5 Added #ifdef USE_WATCHER to switch between INotify and Polling
depending on the platform environment var set by Qt.
2012-02-29 15:25:16 +01:00
Klaas Freitag
f6846a2107 Added local polling to owncloud folder, based on csync. 2012-02-28 16:49:13 +01:00
Klaas Freitag
59b8af2aef removed the INotify initialisation. 2012-02-28 15:14:35 +01:00
Klaas Freitag
e06867f155 disabled a log line 2012-02-28 15:13:59 +01:00
Klaas Freitag
c9597c8fb9 Added a splashscreen. 2012-02-23 11:44:44 +01:00
Klaas Freitag
94481a672a button to add a new sync folder added to status dialog. 2012-02-21 13:26:39 +01:00
Klaas Freitag
267f444dd1 Hide some buttons in status dialog which are currently not needed,
show ownCloud info on status dialog
2012-02-21 12:40:46 +01:00
Klaas Freitag
da482e742b removed all GUI related stuff finally away from the folder class,
last thing were the openActions, which went to the GUI class.
2012-02-21 11:50:19 +01:00
Klaas Freitag
5e08f15aca more elaborated version macros, moved version to theme class 2012-02-21 10:48:18 +01:00
Klaas Freitag
4c655684a0 introduced theming in the status dialog, removed the syncState again
and moved it to the SyncResult object to simplify code, removed
icon code from folders (WIP), removed some unused code.
2012-02-20 16:45:27 +01:00
Klaas Freitag
34f28bb4ad Display status "Sync running" in status dialog correctly. 2012-02-18 21:58:12 +01:00
Klaas Freitag
e63fcdc9f0 simplified the folder change notification to the GUI app: Reduced
to one signal stateChanged(), provided an easy api to get the
new state and last sync result by alias in folderman.
2012-02-18 21:21:58 +01:00
Klaas Freitag
b52f9f534d removed ownCloudDirCheck class and enhanced ownCloudInfo class to take
its functionality. Added defaultConnectionName() and AuthHeader to the
config file class. Fixed folderwizard to create ownCloud folder again.
2012-02-18 17:02:10 +01:00
Klaas Freitag
0001b9088a - WIP ownCloud connect wizard: added a test call to check if the
connect really works, better error checking
2012-02-17 15:54:39 +01:00
Klaas Freitag
ddf062ee14 - set app name correctly in config file class
- fix link to newly  installed ownCloud
2012-02-17 12:16:48 +01:00
Klaas Freitag
d31877a448 - fix config file location
- writing ownCloud config works again
2012-02-17 11:56:27 +01:00
Klaas Freitag
2c6c2625bf WIP:
- split up owncloudsetup class to have a wizard class and a class that
delivers plain config data
- renamed ownCloudSetup -> ownCloudSetupWizard
- added new class MirallConfigFile
- made mirall config file (which currently only contains the owncloud
connection) multi-connection aware
- removed some sitecopy code
- removed fetch- and push slots
- adopted readFolderConfigFromFile to new file format
2012-02-17 11:11:18 +01:00
Klaas Freitag
04841c940d WIP: introduce folder manager to separate folder management from
GUI and ease the Application object
2012-02-17 09:48:31 +01:00
Klaas Freitag
591054ed8f introduced a theming class to build the traditional mirall client
as well as an ownCloud client
2012-02-16 10:42:44 +01:00
Klaas Freitag
07cfc08823 Use a hash to store inotified pathes. 2012-02-15 22:36:52 +01:00
Klaas Freitag
d2f989566d removed sitecopy code from application and fixed url setting bug 2012-02-15 21:45:11 +01:00
dragotin
9da08610ee Merge pull request #3 from dschmidt/master
fix static linking to libmirall/qwebdav
2012-02-15 05:48:13 -08:00
Klaas Freitag
c55f0201fc remove accidentially added sync client and add owncloud folder 2012-02-15 14:44:09 +01:00
Klaas Freitag
0c46382b6b moved CsyncThread class to its own file 2012-02-15 09:30:37 +01:00
Juan Carlos Cornejo
486bb0f5ef Missed this file in last commit. 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
5541ec44a9 Recover from error if trying to upload a file that is already locked. 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
40c1f93205 Defaults to using no password manager if KWallet or gnome-keyring
not compiled in, or not available
2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
a1fe2d9089 Quick implementation of Select all local/server wins on Conflict resolution window. 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
dae3af1196 Small typo that prevented compiling. It was due to a misplaced quotation mark. Thanks to Bugzy for pointing it out. 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
01629d5d4b Implemented locking and unlocking of a file automatically when a put statement is requested. 2012-02-15 08:55:15 +01:00
unknown
309760ab36 Some restructuring that allows proper compilation on Windows systems.
Still not stable on Windows.  Need to resolve sqlite3 issues.
2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
efee4de678 Updated instructions for building. Make sure that if you have build the
program prior to this, to re-run qmake and do a Clean All. This is
because of a large change in the way KWallet is handled.
2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
23cb3ed30b Added a README file with compilation instructions. One thing I did not
make clear when I made a change to the password manager is that by
default no password manager is enabled. You must enable Kwallet by
adding the argument "DEFINES += OC_USE_KWALLET" to the qmake build step.
2012-02-15 08:55:15 +01:00
Florian Jacob
e648dcd8a4 Added the tasklist file Juan send me to the repo.
Added myself for the task of loading the filters from a file instead of
hardcoding them.
2012-02-15 08:55:15 +01:00
Florian Jacob
b170150db3 Use QDir::cleanPath() to get unified input paths.
Paths stored are now always without trailing "/" or double "/" within
them.
2012-02-15 08:55:15 +01:00
Florian Jacob
faf912b29d Added kate-swp files to the filter list. 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
f9e19d85c1 Implemented locking/unlocking in QWebDAV. 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
c4cdb9cc26 Fix compilation error 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
0b75747aed Ooops, added an extra } to last commit. Now fixed. 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
e7c6882aea Silence QWebDav complaining about delete requests. 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
39b1ce7189 Default to saving password to database if no valid wallet is available. 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
9f2925a41f Check to see if KDE or Gnome is running (currently Gnome keyring still
not implemented).
2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
a4a8fa10d5 Reorganized the password manager in order to implement other support for
Gnome Keyring, OS X key chain and something for windows.
2012-02-15 08:55:15 +01:00
Florian Jacob
e0965f2b5c Fix for not enabling the save button after toggling "Encrypted". 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
99492b1f4e Fixed kwallet header location. Thanks Pavel! 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
57f10a9cee Updated to fix bug where it would not work well with owncloud being a
subdirectory on a remote host.
2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
454ca25f11 Consolidated all menu configuration into one screen. All are now in the
configurations window.
2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
fcee6235a3 Renamed the desktop file to match that of the executable 2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
20a24f680e Added a What's New message box that also warns users of the beta nature
of the software.
2012-02-15 08:55:15 +01:00
Juan Carlos Cornejo
1a63ad67f0 Fixed a bug where at startup, the client attempted to re-download
already deleted files.
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
8be1e86eec Updated internal filter lists. 2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
b5075b26ae Minor debugging output silenced 2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
0fd2df2e40 Implemented the global filter list. 2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
bb5c50e1d4 Ooops, in the last commit I accidentally disabled the recently added
feature :D Now is enabled again.
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
c653a203de Implemented a global included list. This list are common temporary and
lock files that should be ignored. The user can enable and disable them
if they so wish.

Additionally, set the ground for a later inclusion of a global list,
which the user enters and applies to all accounts.
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
9505b119b1 Added the ability to quit mid-sync (even if paused). 2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
309d3a0adc Re-enable show/hide on start setting that accidentally got bypassed when
I moved loadApplicationSettings() further up in the queue.
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
867b247af5 Implemented a soft pause. Meaning, it will pause as soon as it finishes
transfering the current transfer. Further tests need to be made to see
if SabreDAV can successfully resume a transfer paused midway.
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
ff9a6826ac Changed he database, and updated all references to the database where
appropriate. Paving the ground for implementing a pause/resume feature.
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
76ca736e43 Changing paths due to the new directory structure 2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
de07b02950 Moved everything under the owncloud_sync_qt directory in preparation for
merge onto the OwnCloud clients repository
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
c34d585a6c Changed the default debugging option from only printing to the terminal
to allowing a configuration that will display it in the SyncWindow also.

Now, instead of calling qDebug(), one would call syncDebug() with the same
syntax as qDebug().
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
7bcbeb6578 Updated account editing/creation page to be more clear about the format of
the hostname.
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
d14150b910 A quick fix to try to get 32 bit libraries loaded when compiling under 32 bits, rather than the 64 libraries 2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
b43d452a99 Uploads to a temp file name, then renames it after the upload. 2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
125a0e2cfc Removing (hopefully) the last of the memory bugs. This time in file
upload and download.
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
1db4fc9fd4 Forgot this minor change in the last commit. This is needed otherwise the memory is not really freed :D 2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
44fdffce41 Fixed another memory leak. This time when uploading files. 2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
e655ce7547 Bump patch version to 0.5.2 2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
5b441314f1 Some code clean up removing old commented code. 2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
b171f33e59 Fix a bug where if the local directory specified does not exist, create
it.
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
cfa98f9f88 Realized I was leaking memory every time a WebDAV request was made to
list the directory. Ooops.  This should be fixed now!
2012-02-15 08:55:14 +01:00
Juan Carlos Cornejo
535aa119f7 Minor bug fix dealing with paths 2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
f481c02876 Fixed a small bug that prevented creating the properly named local
directory.
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
a0b3249419 Fixed bug where local files and directories where not properly deleted.
Also added proper parent to the QMessageBox
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
da60594a5e Bump patch version to 0.5.1 (despite the fact that last changes were
big, they *were* mostly bugfixes).
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
18d32bda91 Major bugfixes.
1) Fixed a bug that prevented directories on the server to be properly
deleted.

2) Fixed a bug that would cause files and directories to be deleted
often, and then re-uploaded. This was due to a missing comparison.

3) Serialized the directory creation, making sure that it was successful
before trying to create the next one, which may have been a
subdirectory.

4) Fixed the issue with the GUI freezing when it was waiting for a sync
to happen if the user tried to quit.

5) Fixed an issue that if a directory existed with the same Remote or
Local directory name, weird stuff would happen! This was due to an
incorrect comparison.

6) Fixed the issue where the system tray icon would not change when a
conflict occurred. (Apparently I had accidentally removed this when I
made the change to multiple accounts).

7) Added two new buttons to clear the log and clear & save the log.
Useful when debugging :) But useful in general, I suppose.

Possibly some other fixes, but now I forget them exactly. Probably just
some lost pointers and the like that I found :)
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
a006cc170e Bump version to 0.5.0 2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
929b6afa1a Implemented KWallet password storage for Linux. On Linux they are no
longer saved to the database file.
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
ed4fc09592 Updating the files that belong to this project in QtCreator. 2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
2c3373d7d9 Contacted the author of the sqlite3_util.cpp function and found out
it was placed in the public domain. Made the changes to the header
and cpp file to reflect that.

Also renamed LICENSE to COPYING-GPL and made not of the overall
project license in COPYING
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
ccd96a5edd Bump patch version to 0.4.3 2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
11836e4788 Reimplemented the file progress that apparently I accidentally disabled
when I made the change to multiple accounts.  Should be working again.
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
6e2986a16d Implemented a proper timeout for the network requests. If it times out,
it will continue where it left off on the next sync cycle.

Also removed a bug that prevented the program from closing if the
requests timed out.
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
2b746ba6ec Clean up of some debug codes and output.
Made sure that all messages sent to the GUI (not the command line) use
the tr() function for proper translation later (if needed).
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
ec9cadd474 Bump patch version to 0.4.2 2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
1581ea3135 Fixed typo on database name. Should be filters, not filter. 2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
2ee038b207 Fixed a bug that allowed one to enter filters before the account was created. Now the filters list is disabled until one saves the account.
Also, fixed a small bug in which new accounts would display the last used filters.
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
6b43bbb989 Changed the desktop file to point to the new correct installation
location of /usr/bin
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
61708eab0a Added two missing images to the repository. 2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
42004a3377 Fixed the installation path for owncloud_sync to be in /usr/bin by
default.

Bumped version number to 0.4.1
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
0e004ec570 Fixed a bug in the conflict resolution screen. I accidentally selected
the wrong table when I made the change to allow multiple accounts.

Minor GUI enhancements on the conflict resolution screen.
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
a9ba915972 Added a menu option to select the default behavior of when the user
closes the window.

By the fault, the window is hidden when the window is closed. But the
user may change it to their likings.
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
9b9b7b17ef Added ability to remove an account. User must enable the button from the
menu bar in order to remove the account.  Note, files will not be
deleted but all synchronization information will be lost.
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
84e60b20cd Made the hide on start configurable. Now a user checks the checkbox in
the menu to decide if they want to hide the window at start or not.
Note, the window will show if no accounts are configured, regardless of
the user setting.
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
7601e2f52c Added a context menu to the tray icon and the application. Now clicking
the close button will hide the application window. One must go to the
menu on either the tray icon or the application menu to quit.
2012-02-15 08:55:13 +01:00
Juan Carlos Cornejo
c1568f52ed Added notice indicating why program will exit if another instance is
running.

Also, minor changes to what OwnCloudSync class sends to the log.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
dce757f94f Minor typo fix on the license. Removed reference to Foobar, the default
template name for the program.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
71c3c93500 Added the GPL copyright notice ontop of *most* libraries. I still have
to figure out what the sqlite3_util file is.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
3d4d8081b3 Minor UI improvements. Status bar now has more information, window title
now reflects the program name and there is at tool tip on the system
tray icon.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
af0f00d115 Added versioning information (it was about time). Currently set to
version 0.3 and this is displayed in the status bar.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
dd1b49aed1 Added a confirmation when the user closes the window if he/she wants to
truly quit.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
fabf7532ef Implemented file filters. The only wildcard accepted is *. 2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
856d257adc Fixed the debugging option that saved logs after every 10th sync.
Changed that a more manageable 1000 syncs.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
a4da328368 A drastic change required to allow for multiple accounts, and choosing
server folder to sync. It turned out to be harder than anticipated.

But now multiple accounts can be created (no way to remove them yet,
that wil come next).

On account configuration page, one can now select the remote file server
to sync. Leave blank to sync root folder.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
c11ea04c96 Fixed bug that prevented files from being deleted properly accross all
clients. It had to do with not setting the found variable properly.

Additionally, more output is added to the log regarding file deltion
both locally and server wise.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
602e6914a4 Now the username, password and hostname are checked before a
synchronization is attempted.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
fb53edfd41 Logs are now saved to file and cleared from the screen every 1000th sync 2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
3f0ccf1748 Implemented a user required conflict resolution when files where edited
locally AND in the server.  The files will not be updated until the user
selects which of the two files is the newest one. Note that at this
time, other clients may be updating the server. So the client should
take caution to select the proper new file.

The server file is downloaded to disk and prepended with _ocs_conflict.
so that the user can open both files and compare accordingly.

A message appears notifying the user of the conflict, and the clouds
turn red. They will not be reverted back to blue until all conflicts are
cleared.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
6265ed0ab9 Autohide window if SystemTray is available and we are fully configured. 2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
add4cf24e3 Implemented a file dialog for choosing the Sync Directory.
Disable and enable save button as appropriate.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
41c9e90852 Implemented a trick to allow only one instance of the application to
run. This should hopefully prevent corruption of the sync directory.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
07685110b9 Implemented file deletion. Now files are deleted on both sides when one
side deletes theirs. This does not yet implement file moving. If files
are moved, it will just reupload or download them because it will treat
them as new files.

A minor bug fix also. Now the watcher is removed for files that are
being downloaded or deleted. Then added again if appropriate. This
prevented the watcher from annoucing a change and attempting to upload
the changes to the server.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
5e3a475a87 Found a function online at
http://www.qtcentre.org/threads/36131-Attempting-to-use-Sqlite-backup-api-from-driver-handle-fails
on a post by chemmalion that allows one to save a memory sqlite3 database to file.

This is really neat because now the strain on the hardrive is gone!

This version loads the database on startup and saves it every 3 minutes to disk.
The database is saved upon closing the program as well.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
da7795437b Major fixes in this version. Apparently there were a lot of bugs in
comparing files between the server.  Now it is more reasonable.

Also, less use of the hardisk because now I implemented a
QFileSystemWatch instance. This is much better and lets me know of file
changes. Though, there is still a strain on the HD due to the constant
SQLite access that I use.

I can't figure out a nice way to find out what files were added (removed
will be fore later) without listing the entire directory and comparing
against the DB.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
cb1740ee4a Initial commit.
This version does synchronization, but does not tolerate any file deletions.
It will chew your files up!!

May contain bugs!!
2012-02-15 08:55:12 +01:00
Klaas Freitag
ad0be9f6ee - Added info dialog with file listing
- Added overall status display on the tray icon plus tooltip
-> patches from Alvaro Soliverez
2012-01-23 22:10:01 +01:00
Klaas Freitag
128223553c added a windows compatible implementation 2012-01-20 10:21:49 +01:00
Dominik Schmidt
7e988d2e08 win32: fix static linking to libmirall/qwebdav 2012-01-19 14:10:18 +01:00
Klaas Freitag
e168eeae46 more useful user feedback about sync state, patch provided by Alvaro Soliverez 2011-12-29 09:31:45 +01:00
Klaas Freitag
bb2baeb1d2 Two patches sent by Alvaro Soliverez <asoliverez@kde.org>:
- fixed refresh of the folder list in the status dialog
- show enabled status in the status dialog
2011-12-25 21:55:29 +01:00
Klaas Freitag
0c9c2962c2 Enable/Disable button, patch submitted by Alvaro Soliverez 2011-12-12 17:47:30 +01:00
Klaas Freitag
c23c96cdc6 - add exclude patterns to sitecopy config, Patch contributed by Alvaro
Soliverez
2011-12-12 17:26:13 +01:00
Klaas Freitag
a3fa419f82 Bump version 2011-12-05 12:03:16 +01:00
Klaas Freitag
180c06b39e Patch sent in by Alvaro Soliverez: Add a "upload" button to the
Status dialog to solve conflict situations from local -> cloud
2011-12-05 12:01:39 +01:00
Klaas Freitag
bf40e0aafc - added icon defaults for systems without icon theming bnc#730834
- fixed some bugs with ownCloud status check fails
- bumped version to 0.1.2
2011-11-28 14:53:34 +01:00
Klaas Freitag
56a30af52d virtual inheritance not supported, fix compile problem 2011-11-28 13:35:46 +01:00
Klaas Freitag
37d6fb6022 Version string added 2011-11-24 16:38:12 +01:00
Klaas Freitag
cb4c5e31b1 - fix ownCloud sourcepackage download from owncloud.org
- fix installation output in setup dialog
2011-11-24 16:26:24 +01:00
Klaas Freitag
cd281bc552 Correct COPYING file from FSF website, rpmlint found an old address
in the previous one.
2011-11-22 22:45:14 +01:00
Klaas Freitag
b9ce7d037f - renamed icons to mirall instead of ownCloud
- install of desktop file icon added
2011-11-22 18:31:44 +01:00
Klaas Freitag
7b9bd33bea Update to a consistent COPYING file 2011-11-22 17:35:22 +01:00
Klaas Freitag
782cda05dc Merge branch 'master' of github.com:dragotin/mirall 2011-11-07 17:09:18 +01:00
Klaas Freitag
b7ca0ef36a Added install target, thanks to Dominik Schmidt <dev@dominik-schmidt.de> for the patch 2011-11-07 17:09:02 +01:00
Klaas Freitag
cd4528324c error handling: sitecopy not installed 2011-11-04 11:41:49 +01:00
Klaas Freitag
869152424c Polished the ui, stop syncing during user actions. 2011-11-03 16:06:40 +01:00
Klaas Freitag
b7f5b8c2d8 Fix authentication loop if ownCloud does not accept the basic auth header 2011-11-02 15:07:34 +01:00
Klaas Freitag
e660fe25b1 Use the new owncloud-admin version 2011-11-02 14:44:53 +01:00
Klaas Freitag
aa8ba76e3c deleted unused files 2011-10-26 14:00:28 +02:00
Klaas Freitag
4c002a127f added webdav support utilizing qtwebdav-qnetworkmanager 2011-10-26 13:59:06 +02:00
Klaas Freitag
de8d7bb87c Added open ownCloud button to status dialog 2011-10-20 11:48:41 +02:00
Klaas Freitag
267d74b381 More polish and bugfixing 2011-10-20 10:26:40 +02:00
Klaas Freitag
71873df369 Use icons depending on the backend 2011-10-19 13:10:43 +02:00
Klaas Freitag
9c27edc6b6 - polished the folder wizard
- bugfixes
- added user warnings if remote root dir is picked.
2011-10-19 11:53:12 +02:00
Klaas Freitag
9d3a0e8596 Implemented folder fetching. 2011-10-18 10:22:24 +02:00
Klaas Freitag
90f722e2da - fix alias bug in folderwizard
- call restart before showing folderwizard
- ask for admin credentials for ftp install
2011-10-14 18:13:34 +02:00
Klaas Freitag
95eadf2cb9 some more smaller fixes 2011-10-14 16:39:53 +02:00
Klaas Freitag
4911a528c4 Error publishing in the status dialog 2011-10-13 16:41:24 +02:00
Klaas Freitag
a2c564306f Enable secure connection via sitecopy 2011-10-13 13:58:46 +02:00
Klaas Freitag
cb359ba89d removal of folders added 2011-10-13 13:55:52 +02:00
Klaas Freitag
ced69489a5 WIP status dialog 2011-10-12 16:58:54 +02:00
Klaas Freitag
c4b24ab952 Show warning on wrong remote folder 2011-10-12 15:14:39 +02:00
Klaas Freitag
91b12c7eb3 Show a warning text in folder wizard 2011-10-11 15:39:25 +02:00
Klaas Freitag
91bf272c9b Don't allow to pick local directories or aliases twice. 2011-10-11 14:23:32 +02:00
Klaas Freitag
ecc3a9edd5 remote folder check for oC finished 2011-10-07 16:01:58 +02:00
Klaas Freitag
f4c5b9adbb added check for the owncloud folder - WIP 2011-10-06 16:55:28 +02:00
Klaas Freitag
f3123b6c02 - simplified the folder wizard
- live check of the ownCloud connect
2011-10-06 10:54:54 +02:00
Klaas Freitag
60c304667f added online check 2011-10-05 17:49:03 +02:00
Klaas Freitag
2dec870eaa Use nice empty icon 2011-10-05 15:56:56 +02:00
Klaas Freitag
f582c19c67 - fixed some Ownclouds -> ownCloud
- start wizard if mirall config missing
2011-10-05 15:48:30 +02:00
Klaas Freitag
e0f8499484 Setup of local folder with initial sync 2011-10-05 12:11:10 +02:00
Klaas Freitag
5a42aa3028 Added some gpl headers to sourcefiles 2011-09-30 17:42:28 +02:00
Klaas Freitag
c9de9810e2 Fix url parameter, add http 2011-09-30 15:35:19 +02:00
Klaas Freitag
35aee0de00 Create the local sync folder successfully 2011-09-30 14:19:26 +02:00
Klaas Freitag
7452f1956e Added owncloud credentials page 2011-09-30 12:51:56 +02:00
Klaas Freitag
3f860709bc fix slash mixmax in url assembling for remote key in sitecopyrc 2011-09-30 12:04:17 +02:00
dragotin
3b04c4725b Merge pull request #1 from cartman/master
A typo fix and make mirall reparse configuration when configuration is changed externally
2011-09-30 03:02:39 -07:00
İsmail Dönmez
682325f977 Reparse configuration files when folders added/removed 2011-09-30 11:49:19 +02:00
İsmail Dönmez
37c6276197 Merge branch 'master' of git://github.com/dragotin/mirall 2011-09-30 11:46:56 +02:00
Klaas Freitag
96eaeb2c62 read oc url from config file. 2011-09-30 10:24:01 +02:00
Klaas Freitag
9043e69d27 - write mirall config file
- check on valid parameters in owncloud wizard.
2011-09-29 19:05:49 +02:00
Klaas Freitag
b7c7b8a566 - handle empty password in .sitecopyrc.
- check for the owncloud admin script and warn if its not there.
2011-09-29 17:17:50 +02:00
Klaas Freitag
e8dcfe4a3c Installation of local computer and ftp based works. 2011-09-29 16:36:27 +02:00
Klaas Freitag
68b966256e WIP: OC installation wizard integration 2011-09-28 18:14:48 +02:00
İsmail Dönmez
20bed61446 Fix typo 2011-09-28 12:14:14 +02:00
Klaas Freitag
292965c6a3 Wizard for owncloud configuration 2011-09-27 19:10:01 +02:00
Klaas Freitag
ace9e9d690 Error counting added 2011-09-27 08:15:30 +02:00
Klaas Freitag
defda477c4 status dialog work 2011-09-26 21:46:26 +02:00
Klaas Freitag
b3eecf54a5 improved error handling 2011-09-26 18:19:01 +02:00
Klaas Freitag
0000caa632 - various code cleanups
- fix alias usage in sitecopy config file
2011-09-26 16:20:53 +02:00
Klaas Freitag
627a2691ad Statusdialog added 2011-09-26 15:00:12 +02:00
Klaas Freitag
83613f4576 Add a sitecopy backend to mirall, some GUI cleanups 2011-09-26 13:12:00 +02:00
Duncan Mac-Vicar P
87ac6cae2b add support for the conflict copy feature available on csync git 2011-09-13 14:18:47 +02:00
Duncan Mac-Vicar P
7f8d1b633c Update README 2011-04-08 13:35:24 +02:00
Duncan Mac-Vicar P
9569ff1dc6 link Qt to the static library 2011-04-08 12:03:09 +02:00
314 changed files with 118689 additions and 1989 deletions

4
.gitattributes vendored Normal file
View File

@@ -0,0 +1,4 @@
.tag export-subst
.gitignore export-ignore
.gitattributes export-ignore
.commit-template export-ignore

8
.gitignore vendored
View File

@@ -1,3 +1,7 @@
build
*build*/
*flymake*
CMakeLists.txt.user*
*.patch
*~
*.autosave
doc/_build/*

1
.tag Normal file
View File

@@ -0,0 +1 @@
$Format:%H$

View File

@@ -1,24 +1,75 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.6)
project(mirall)
set(PACKAGE "mirall")
set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
include ( ${OEM_THEME_DIR}/OEM.cmake )
else ()
include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
endif()
include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" )
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")
find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest REQUIRED )
include(GNUInstallDirs)
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
# if we cannot get it from git, directly try .tag (packages)
# this will work if the tar balls have been properly created
# via git-archive.
if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
if (NOT ${sha1_candidate} STREQUAL "$Format:%H$")
message("${sha1_candidate}")
set (GIT_SHA1 "${sha1_candidate}")
endif()
endif()
## stupid, we should upstream this
if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" AND NOT CMAKE_INSTALL_SYSCONFDIR)
set(CMAKE_INSTALL_SYSCONFDIR "/etc")
endif()
#####
## handle BUILD_OWNCLOUD_OSX_BUNDLE
# BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX
if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE))
set(BUILD_OWNCLOUD_OSX_BUNDLE ON)
set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app")
# BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX
elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
message(FATAL_ERROR "Building in non-bundle mode on OSX is currently not supported. Comment this error out if you want to work on/test it.")
# any other platform
else()
set(BUILD_OWNCLOUD_OSX_BUNDLE OFF)
endif()
#####
#### find libs
find_package(Qt4 4.6.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest REQUIRED )
find_package(Csync)
if(UNIX)
find_package(INotify REQUIRED)
else()
find_package(INotify)
endif()
find_package(Sphinx)
find_package(PdfLatex)
find_package(QtKeychain)
if(CSYNC_FOUND)
add_definitions(-DWITH_CSYNC)
endif(CSYNC_FOUND)
set(WITH_CSYNC CSYNC_FOUND)
set(WITH_QTKEYCHAIN ${QTKEYCHAIN_FOUND})
set(USE_INOTIFY ${INOTIFY_FOUND})
macro(add_tests)
foreach( loop_var ${ARGV} )
qt4_automoc(test${loop_var}.cpp)
add_executable(test${loop_var} test${loop_var}.cpp)
target_link_libraries(test${loop_var} ${QT_LIBRARIES} mirall_static)
add_test(test${loop_var} ${CMAKE_CURRENT_BINARY_DIR}/test${loop_var} --catch_system_errors=no)
endforeach( loop_var )
endmacro(add_tests)
configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
set(CPACK_SOURCE_IGNORE_FILES
# hidden files
@@ -38,14 +89,33 @@ set(CPACK_SOURCE_IGNORE_FILES
"\\\\.la$"
"Makefile\\\\.in$"
)
set(CPACK_PACKAGE_VENDOR "Duncan Mac-Vicar P.")
set(CPACK_GENERATOR "TBZ2")
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" )
include(CPack)
include(CTest)
enable_testing()
include(OwnCloudCPack.cmake)
#
# This cmake builds two targets (aka apps), mirall and owncloud. For the owncloud
# target, OWNCLOUD_CLIENT needs to be a compile flag. It is set in src/CMakeLists.txt
# but if that fails because cmake is too old, uncomment this here if you want to build
# owncloud.
# add_definitions(-DOWNCLOUD_CLIENT)
add_definitions(-DUNICODE)
add_definitions(-D_UNICODE)
# Handle Translations, pick all mirall_* files from trans directory.
file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/mirall_*.ts)
set(TRANSLATIONS ${TRANS_FILES})
add_subdirectory(src)
add_subdirectory(test)
add_subdirectory(doc)
if(UNIT_TESTING)
include(CTest)
enable_testing()
add_subdirectory(test)
endif(UNIT_TESTING)
if(BUILD_OWNCLOUD_OSX_BUNDLE)
configure_file(sync-exclude.lst ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
else()
install( FILES sync-exclude.lst DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} )
endif()

48
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,48 @@
## Submitting Desktop Client issues
If you have questions about how to use the ownCloud Desktop Client, please
direct these to the [mailing list][mailinglist] or our [forum][forum].
We are also available on [IRC][irc].
### Guidelines
* Report the issue using our [template][template], it includes all the
informations we need to track down the issue.
* This repository is *only* for issues within the ownCloud desktop client.
Issues in other compontents should be reported in their own repositores:
- [ownCloud server](https://github.com/owncloud/core/issues)
- [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
Contacts...)
- [Android client](https://github.com/owncloud/android/issues)
- [iOS client](https://github.com/owncloud/ios-issues/issues)
* Search the existing issues first, it's likely that your issue was already
reported.
If your issue appears to be a bug, and hasn't been reported, open a new issue.
Help us to maximize the effort we can spend fixing issues and adding new
features, by not reporting duplicate issues.
[template]: https://raw.github.com/owncloud/mirall/master/issue_template.md
[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
[forum]: http://forum.owncloud.org/
[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
## Contributing to Source Code
Thanks for wanting to contribute source code to ownCloud. That's great!
Before we're able to merge your code to mirall, you need to sign
our [Contributor Agreement][agreement].
Please read the [Desktop Client Manual][mirallman] and the [Developer
Manuals][devmanual] to get useful infos like how to create your first
application or how to test the ownCloud code with phpunit.
[agreement]: http://owncloud.org/about/contributor-agreement/
[devmanual]: http://owncloud.org/dev/
[mirallman]: http://doc.owncloud.org/desktop/1.1/
## Translations
Please submit translations via [Transifex][transifex].
[transifex]: https://www.transifex.com/projects/p/owncloud/

873
COPYING
View File

@@ -1,622 +1,281 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Version 2, June 1991
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
13. Use with the GNU Affero General Public License.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
14. Revised Versions of this License.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
NO WARRANTY
15. Disclaimer of Warranty.
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
@@ -628,15 +287,15 @@ free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -644,31 +303,37 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

319
COPYING.documentation Normal file
View File

@@ -0,0 +1,319 @@
Creative Commons Legal Code
Attribution 3.0 Unported
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
DAMAGES RESULTING FROM ITS USE.
License
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
CONDITIONS.
1. Definitions
a. "Adaptation" means a work based upon the Work, or upon the Work and
other pre-existing works, such as a translation, adaptation,
derivative work, arrangement of music or other alterations of a
literary or artistic work, or phonogram or performance and includes
cinematographic adaptations or any other form in which the Work may be
recast, transformed, or adapted including in any form recognizably
derived from the original, except that a work that constitutes a
Collection will not be considered an Adaptation for the purpose of
this License. For the avoidance of doubt, where the Work is a musical
work, performance or phonogram, the synchronization of the Work in
timed-relation with a moving image ("synching") will be considered an
Adaptation for the purpose of this License.
b. "Collection" means a collection of literary or artistic works, such as
encyclopedias and anthologies, or performances, phonograms or
broadcasts, or other works or subject matter other than works listed
in Section 1(f) below, which, by reason of the selection and
arrangement of their contents, constitute intellectual creations, in
which the Work is included in its entirety in unmodified form along
with one or more other contributions, each constituting separate and
independent works in themselves, which together are assembled into a
collective whole. A work that constitutes a Collection will not be
considered an Adaptation (as defined above) for the purposes of this
License.
c. "Distribute" means to make available to the public the original and
copies of the Work or Adaptation, as appropriate, through sale or
other transfer of ownership.
d. "Licensor" means the individual, individuals, entity or entities that
offer(s) the Work under the terms of this License.
e. "Original Author" means, in the case of a literary or artistic work,
the individual, individuals, entity or entities who created the Work
or if no individual or entity can be identified, the publisher; and in
addition (i) in the case of a performance the actors, singers,
musicians, dancers, and other persons who act, sing, deliver, declaim,
play in, interpret or otherwise perform literary or artistic works or
expressions of folklore; (ii) in the case of a phonogram the producer
being the person or legal entity who first fixes the sounds of a
performance or other sounds; and, (iii) in the case of broadcasts, the
organization that transmits the broadcast.
f. "Work" means the literary and/or artistic work offered under the terms
of this License including without limitation any production in the
literary, scientific and artistic domain, whatever may be the mode or
form of its expression including digital form, such as a book,
pamphlet and other writing; a lecture, address, sermon or other work
of the same nature; a dramatic or dramatico-musical work; a
choreographic work or entertainment in dumb show; a musical
composition with or without words; a cinematographic work to which are
assimilated works expressed by a process analogous to cinematography;
a work of drawing, painting, architecture, sculpture, engraving or
lithography; a photographic work to which are assimilated works
expressed by a process analogous to photography; a work of applied
art; an illustration, map, plan, sketch or three-dimensional work
relative to geography, topography, architecture or science; a
performance; a broadcast; a phonogram; a compilation of data to the
extent it is protected as a copyrightable work; or a work performed by
a variety or circus performer to the extent it is not otherwise
considered a literary or artistic work.
g. "You" means an individual or entity exercising rights under this
License who has not previously violated the terms of this License with
respect to the Work, or who has received express permission from the
Licensor to exercise rights under this License despite a previous
violation.
h. "Publicly Perform" means to perform public recitations of the Work and
to communicate to the public those public recitations, by any means or
process, including by wire or wireless means or public digital
performances; to make available to the public Works in such a way that
members of the public may access these Works from a place and at a
place individually chosen by them; to perform the Work to the public
by any means or process and the communication to the public of the
performances of the Work, including by public digital performance; to
broadcast and rebroadcast the Work by any means including signs,
sounds or images.
i. "Reproduce" means to make copies of the Work by any means including
without limitation by sound or visual recordings and the right of
fixation and reproducing fixations of the Work, including storage of a
protected performance or phonogram in digital form or other electronic
medium.
2. Fair Dealing Rights. Nothing in this License is intended to reduce,
limit, or restrict any uses free from copyright or rights arising from
limitations or exceptions that are provided for in connection with the
copyright protection under copyright law or other applicable laws.
3. License Grant. Subject to the terms and conditions of this License,
Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
perpetual (for the duration of the applicable copyright) license to
exercise the rights in the Work as stated below:
a. to Reproduce the Work, to incorporate the Work into one or more
Collections, and to Reproduce the Work as incorporated in the
Collections;
b. to create and Reproduce Adaptations provided that any such Adaptation,
including any translation in any medium, takes reasonable steps to
clearly label, demarcate or otherwise identify that changes were made
to the original Work. For example, a translation could be marked "The
original work was translated from English to Spanish," or a
modification could indicate "The original work has been modified.";
c. to Distribute and Publicly Perform the Work including as incorporated
in Collections; and,
d. to Distribute and Publicly Perform Adaptations.
e. For the avoidance of doubt:
i. Non-waivable Compulsory License Schemes. In those jurisdictions in
which the right to collect royalties through any statutory or
compulsory licensing scheme cannot be waived, the Licensor
reserves the exclusive right to collect such royalties for any
exercise by You of the rights granted under this License;
ii. Waivable Compulsory License Schemes. In those jurisdictions in
which the right to collect royalties through any statutory or
compulsory licensing scheme can be waived, the Licensor waives the
exclusive right to collect such royalties for any exercise by You
of the rights granted under this License; and,
iii. Voluntary License Schemes. The Licensor waives the right to
collect royalties, whether individually or, in the event that the
Licensor is a member of a collecting society that administers
voluntary licensing schemes, via that society, from any exercise
by You of the rights granted under this License.
The above rights may be exercised in all media and formats whether now
known or hereafter devised. The above rights include the right to make
such modifications as are technically necessary to exercise the rights in
other media and formats. Subject to Section 8(f), all rights not expressly
granted by Licensor are hereby reserved.
4. Restrictions. The license granted in Section 3 above is expressly made
subject to and limited by the following restrictions:
a. You may Distribute or Publicly Perform the Work only under the terms
of this License. You must include a copy of, or the Uniform Resource
Identifier (URI) for, this License with every copy of the Work You
Distribute or Publicly Perform. You may not offer or impose any terms
on the Work that restrict the terms of this License or the ability of
the recipient of the Work to exercise the rights granted to that
recipient under the terms of the License. You may not sublicense the
Work. You must keep intact all notices that refer to this License and
to the disclaimer of warranties with every copy of the Work You
Distribute or Publicly Perform. When You Distribute or Publicly
Perform the Work, You may not impose any effective technological
measures on the Work that restrict the ability of a recipient of the
Work from You to exercise the rights granted to that recipient under
the terms of the License. This Section 4(a) applies to the Work as
incorporated in a Collection, but this does not require the Collection
apart from the Work itself to be made subject to the terms of this
License. If You create a Collection, upon notice from any Licensor You
must, to the extent practicable, remove from the Collection any credit
as required by Section 4(b), as requested. If You create an
Adaptation, upon notice from any Licensor You must, to the extent
practicable, remove from the Adaptation any credit as required by
Section 4(b), as requested.
b. If You Distribute, or Publicly Perform the Work or any Adaptations or
Collections, You must, unless a request has been made pursuant to
Section 4(a), keep intact all copyright notices for the Work and
provide, reasonable to the medium or means You are utilizing: (i) the
name of the Original Author (or pseudonym, if applicable) if supplied,
and/or if the Original Author and/or Licensor designate another party
or parties (e.g., a sponsor institute, publishing entity, journal) for
attribution ("Attribution Parties") in Licensor's copyright notice,
terms of service or by other reasonable means, the name of such party
or parties; (ii) the title of the Work if supplied; (iii) to the
extent reasonably practicable, the URI, if any, that Licensor
specifies to be associated with the Work, unless such URI does not
refer to the copyright notice or licensing information for the Work;
and (iv) , consistent with Section 3(b), in the case of an Adaptation,
a credit identifying the use of the Work in the Adaptation (e.g.,
"French translation of the Work by Original Author," or "Screenplay
based on original Work by Original Author"). The credit required by
this Section 4 (b) may be implemented in any reasonable manner;
provided, however, that in the case of a Adaptation or Collection, at
a minimum such credit will appear, if a credit for all contributing
authors of the Adaptation or Collection appears, then as part of these
credits and in a manner at least as prominent as the credits for the
other contributing authors. For the avoidance of doubt, You may only
use the credit required by this Section for the purpose of attribution
in the manner set out above and, by exercising Your rights under this
License, You may not implicitly or explicitly assert or imply any
connection with, sponsorship or endorsement by the Original Author,
Licensor and/or Attribution Parties, as appropriate, of You or Your
use of the Work, without the separate, express prior written
permission of the Original Author, Licensor and/or Attribution
Parties.
c. Except as otherwise agreed in writing by the Licensor or as may be
otherwise permitted by applicable law, if You Reproduce, Distribute or
Publicly Perform the Work either by itself or as part of any
Adaptations or Collections, You must not distort, mutilate, modify or
take other derogatory action in relation to the Work which would be
prejudicial to the Original Author's honor or reputation. Licensor
agrees that in those jurisdictions (e.g. Japan), in which any exercise
of the right granted in Section 3(b) of this License (the right to
make Adaptations) would be deemed to be a distortion, mutilation,
modification or other derogatory action prejudicial to the Original
Author's honor and reputation, the Licensor will waive or not assert,
as appropriate, this Section, to the fullest extent permitted by the
applicable national law, to enable You to reasonably exercise Your
right under Section 3(b) of this License (right to make Adaptations)
but not otherwise.
5. Representations, Warranties and Disclaimer
UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
7. Termination
a. This License and the rights granted hereunder will terminate
automatically upon any breach by You of the terms of this License.
Individuals or entities who have received Adaptations or Collections
from You under this License, however, will not have their licenses
terminated provided such individuals or entities remain in full
compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
survive any termination of this License.
b. Subject to the above terms and conditions, the license granted here is
perpetual (for the duration of the applicable copyright in the Work).
Notwithstanding the above, Licensor reserves the right to release the
Work under different license terms or to stop distributing the Work at
any time; provided, however that any such election will not serve to
withdraw this License (or any other license that has been, or is
required to be, granted under the terms of this License), and this
License will continue in full force and effect unless terminated as
stated above.
8. Miscellaneous
a. Each time You Distribute or Publicly Perform the Work or a Collection,
the Licensor offers to the recipient a license to the Work on the same
terms and conditions as the license granted to You under this License.
b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
offers to the recipient a license to the original Work on the same
terms and conditions as the license granted to You under this License.
c. If any provision of this License is invalid or unenforceable under
applicable law, it shall not affect the validity or enforceability of
the remainder of the terms of this License, and without further action
by the parties to this agreement, such provision shall be reformed to
the minimum extent necessary to make such provision valid and
enforceable.
d. No term or provision of this License shall be deemed waived and no
breach consented to unless such waiver or consent shall be in writing
and signed by the party to be charged with such waiver or consent.
e. This License constitutes the entire agreement between the parties with
respect to the Work licensed here. There are no understandings,
agreements or representations with respect to the Work not specified
here. Licensor shall not be bound by any additional provisions that
may appear in any communication from You. This License may not be
modified without the mutual written agreement of the Licensor and You.
f. The rights granted under, and the subject matter referenced, in this
License were drafted utilizing the terminology of the Berne Convention
for the Protection of Literary and Artistic Works (as amended on
September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
and the Universal Copyright Convention (as revised on July 24, 1971).
These rights and subject matter take effect in the relevant
jurisdiction in which the License terms are sought to be enforced
according to the corresponding provisions of the implementation of
those treaty provisions in the applicable national law. If the
standard suite of rights granted under applicable copyright law
includes additional rights not granted under this License, such
additional rights are deemed to be included in the License; this
License is not intended to restrict the license of any rights under
applicable law.
Creative Commons Notice
Creative Commons is not a party to this License, and makes no warranty
whatsoever in connection with the Work. Creative Commons will not be
liable to You or any party on any legal theory for any damages
whatsoever, including without limitation any general, special,
incidental or consequential damages arising in connection to this
license. Notwithstanding the foregoing two (2) sentences, if Creative
Commons has expressly identified itself as the Licensor hereunder, it
shall have all rights and obligations of Licensor.
Except for the limited purpose of indicating to the public that the
Work is licensed under the CCPL, Creative Commons does not authorize
the use by either party of the trademark "Creative Commons" or any
related trademark or logo of Creative Commons without the prior
written consent of Creative Commons. Any permitted use will be in
compliance with Creative Commons' then-current trademark usage
guidelines, as may be published on its website or otherwise made
available upon request from time to time. For the avoidance of doubt,
this trademark restriction does not form part of this License.
Creative Commons may be contacted at http://creativecommons.org/.

35
CPackOptions.cmake.in Normal file
View File

@@ -0,0 +1,35 @@
# This file is configured at cmake time, and loaded at cpack time.
# To pass variables to cpack from cmake, they must be configured
# in this file.
if(CPACK_GENERATOR MATCHES "NSIS")
SET( CPACK_PACKAGE_ICON @CMAKE_SOURCE_DIR@/admin/win/nsi/installer.ico ) # A branding image that will be displayed on the top bar inside the installer. installer.bmp
SET( CPACK_NSIS_COMPRESSOR "/SOLID lzma" ) # The arguments that will be passed to the NSIS SetCompressor command. /SOLID lzma
endif(CPACK_GENERATOR MATCHES "NSIS")
set( CMAKE_SOURCE_DIR @CMAKE_SOURCE_DIR@ )
set( CMAKE_BINARY_DIR @CMAKE_BINARY_DIR@ )
set( OEM_THEME_DIR @OEM_THEME_DIR@ )
if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
include ( ${OEM_THEME_DIR}/OEM.cmake )
else ()
include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
endif()
set( CSYNC_BINARY_DIR @CSYNC_BINARY_DIR@ )
set( MINGW_ROOT @CMAKE_FIND_ROOT_PATH@ )
if(CSYNC_BINARY_DIR)
set( CSYNC_LIBRARY_DIR "${CSYNC_BINARY_DIR}/src" )
set( CSYNC_PLUGIN_DIR "${CSYNC_BINARY_DIR}/modules" )
set( CSYNC_CONFIG_DIR "${CSYNC_BINARY_DIR}/config" )
else()
set( CSYNC_LIBRARY_DIR "${MINGW_ROOT}/bin" )
set( CSYNC_PLUGIN_DIR "${MINGW_ROOT}/plugins-0" ) #FIXME: whatever it is
set( CSYNC_CONFIG_DIR "${MINGW_ROOT}/etc/ocsync" )
endif()
set( BUILD_OWNCLOUD_OSX_BUNDLE @BUILD_OWNCLOUD_OSX_BUNDLE@)
if(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
message( FATAL_ERROR "You're trying to build a bundle although you haven't built mirall in bundle mode.\n Add -DBUILD_OWNCLOUD_OSX_BUNDLE=ON")
endif()

187
ChangeLog Normal file
View File

@@ -0,0 +1,187 @@
ChangeLog
=========
version 1.2.3 (release 2013-04-02 ), csync 0.70.5 required
* [Fixes] Unbreak self-signed certificate handling
version 1.2.2 (release 2013-04-02 ), csync 0.70.5 required
* [Fixes] Do not crash when local file tree contains symlinks
* [Fixes] Correctly handle locked files on Windows
* [Fixes] Display errors in all members of the SSL chain
* [Fixes] Enable Accessibility features on Windows
* [Fixes] Make setupFavLink work properly on Mac OS
* [Fixes] Ignore temporary files created by MS Office
* [Gui] Support Nautilus in setupFavLink
version 1.2.1 (release 2013-02-26 ), csync 0.70.4 required
* [Fixes] Leave configured folders on configuration changes.
* [Fixes] Do not allow to finish the setup dialog if connection can't be established.
* [Fixes] Better handling of credentials in setup dialog.
* [Fixes] Do not leak fd's to /dev/null when using gnutls
* [Fixes] Stop sync scheduling when configuration wizard starts.
* [Fixes] Clear pending network requests when stepping back in config wizard.
* [Fixes] User password dialog asynchronous issues.
* [Fixes] Make folderman starting and stoping the scheduling.
* [Fixes] Various minor fixes and cleanups.
* [Fixes] Crash on pausing sync
* [Fixes] Stale lock file after pausing sync
* [App] Load translations from app dir or bundle as well.
* [Platform] Build fixes and simplifications, ie. build only one lib.
* [Platform] Added some getter/setters for configuration values.
* [Platform] Added man pages.
* [Platform] Simplified/fixed credential store usage and custom configs.
* [Platform] Added soname version to libowncloudsync.
* [Platform] Pull in Qt translations
* [Gui] Make sync result popups less annoyingq
* [Gui] Fix for result popup
version 1.2.0 (release 2013-01-24 ), csync 0.70.2 required
* [GUI] New status dialog to show a detailed list of synced files.
* [GUI] New tray notifications about synced files.
* [GUI] New platform specific icon set.
* [App] Using cross platform QtKeychain library to store credentials crypted.
* [App] Use cross platform notification for changes in the local file system rather than regular poll.
* [Fixes] Improved SSL Certificate handling and SSL fixes troughout syncing.
* [Fixes] Fixed proxy authentication.
* [Fixes] Allow brackets in folder name alias.
* [Fixes] Lots of other minor fixes.
* [Platform] cmake fixes.
* [Platform] Improved, more detailed error reporting.
version 1.1.4 (release 2012-12-19 ), csync 0.60.4 required
* No changes to mirall, only csync fixes.
version 1.1.3 (release 2012-11-30 ), csync 0.60.3 required
* No changes to mirall, only csync fixes.
version 1.1.2 (release 2012-11-26 ), csync 0.60.2 required
* [Fixes] Allow to properly cancel the password dialog.
* [Fixes] Share folder name correctly percent encoded with old Qt
4.6 builds ie. Debian.
* [Fixes] If local sync dir is not existing, create it.
* [Fixes] lots of other minor fixes.
* [GUI] Display error messages in status dialog.
* [GUI] GUI fixes for the connection wizard.
* [GUI] Show username for connection in statusdialog.
* [GUI] Show intro wizard on new connection setup.
* [APP] Use CredentialStore to better support various credential
backends.
* [APP] Handle missing local folder more robust: Create it if
missing instead of ignoring.
* [APP] Simplify treewalk code.
* [Platform] Fix Mac building
version 1.1.1 (release 2012-10-18), csync 0.60.1 required
* [GUI] Allow changing folder name in single folder mode
* [GUI] Windows: Add license to installer
* [GUI] owncloud --logwindow will bring up the log window
in an already running instance
* [Fixes] Make sure SSL errors are always handled
* [Fixes] Allow special characters in folder alias
* [Fixes] Proper workaround for Menu bug in Ubuntu
* [Fixes] csync: Fix improper memory cleanup which could
cause memory leaks and crashes
* [Fixes] csync: Fix memory leak
* [Fixes] csync: Allow single quote (') in file names
* [Fixes] csync: Remove stray temporary files
* [GUI] Reworked tray context menu.
* [GUI] Users can now sync the server root folder.
* [Fixes] Proxy support: now supports Proxy Auto-Configuration (PAC)
on Windows, reliability fixes across all OSes.
* [Fixes] Url entry field in setup assistant handles http/https correctly.
* [Fixes] Button enable state in status dialog.
* [Fixes] Crash fixed on ending the client, tray icon related.
* [Fixes] Crash through wrong delete operator.
* [MacOS] behave correctly on retina displays.
* [MacOS] fix focus policy.
* [MacOS] Packaging improvements.
* [MacOS] Packaging improvements.
* [Platform] Windows: Setup closes client prior to uninstall.
* [Platform] Windows: ownCloud gets added to autorun by default.
* [Platform] insert correct version info from cmake.
* [Platform] csync conf file and database were moved to the users app data
directory, away from the .csync dir.
* Renamed exclude.lst to sync-exclude.lst and moved it to
/etc/appName()/ for more clean packaging. From the user path,
still exclude.lst is read if sync-exclude.lst is not existing.
* Placed custom.ini with customization options to /etc/appName()
version 1.0.5 (release 2012-08-14), csync 0.50.8 required
* [Fixes] Fixed setup dialog: Really use https if checkbox is activated.
version 1.0.4 (release 2012-08-10), csync 0.50.8 required
* [APP] ownCloud is now a single instance app, can not start twice any more.
* [APP] Proxy support
* [APP] Handle HTTP redirection correctly, note new url.
* [APP] More relaxed handling of read only directories in the sync paths.
* [APP] Started to split off a library with sync functionality, eg for KDE
* [APP] Make ownCloud Info class a singleton, more robust.
* [GUI] New, simplified connection wizard.
* [GUI] Added ability for customized theming.
* [GUI] Improved icon size handling.
* [GUI] Removed Log Window Button, log available through command line.
* [GUI] Proxy configuration dialog added.
* [GUI] Added Translations to languages Slovenian, Polish, Catalan,
Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak,
French, Russian, Japanese, Swedish, Portuguese (Portugal)
all with translation rate >90%.
* [Fixes] Loading of self signed certs into Networkmanager (#oc-843)
* [Fixes] Win32: Handle SSL dll loading correctly.
* [Fixes] Many other small fixes and improvements.
version 1.0.3 (release 2012-06-19), csync 0.50.7 required
* [GUI] Added a log window which catches the logging if required and
allows to save for information.
* [CMI] Added options --help, --logfile and --logflush
* [APP] Allow to specify sync frequency in the config file.
* [Fixes] Do not use csync database files from a sync before.
* [Fixes] In Connection wizard, write the final config onyl if
the user really accepted. Also remove the former database.
* [Fixes] More user expected behaviour deletion of sync folder local
and remote.
* [Fixes] Allow special characters in the sync directory names
* [Fixes] Win32: Fixed directory removal with special character dirs.
* [Fixes] MacOS: Do not flood the system log any more
* [Fixes] MacOS: Put app translations to correct places
* [Fixes] Win32: Fix loading of csync state db.
* [Fixes] Improved some english grammar.
* [Platform] Added krazy2 static code checks.
version 1.0.2 (release 2012-05-18), csync 0.50.6 required
* [GUI] New icon set for ownCloud client
* [GUI] No splashscreen any more (oC Bug #498)
* [GUI] Russian translation added
* [GUI] Added 'open ownCloud' to traymenu
* [GUI] "Pause" and "Resume" instead of Enable/Disable
* [Fixes] Long running syncs can be interrupted now.
* [Fixes] Dialogs comes to front on click
* [Fixes] Open local sync folder from tray and status for win32
* [Fixes] Load exclude.lst correctly on MacOSX
+ csync fixes.
version 1.0.1 (release 2012-04-18), csync 0.50.5 required
* [Security] Support SSL Connections
* [Security] SSL Warning dialog
* [Security] Do not store password in clear text anymore
* [Security] Restrict credentials to the configured host
* [Security] Added ability to forbid local password storage.
* [Fixes] Various fixes of the startup behaviour.
* [Fixes] Various fixes in sync status display
* [GUI] Various error messages for user display improved.
* [GUI] fixed terms and Translations
* [GUI] fixed translation loading
* [Intern] Migrate old credentials to new format
* [Intern] Some code refactorings, got rid of rotten QWebDav lib
* [Intern] lots of cmake cleanups
* [Intern] Backport to Qt Version 4.6 for compat. with older distros.
* [Platform] MacOSX porting efforts
* [Platform] MacOSX Bundle creation added
* [Platform] Enabled ranslations on Windows.
ChangeLog
=========
version 1.2.1 (release 2013-02-26 ), csync 0.70.4 required

10
OWNCLOUD.cmake Normal file
View File

@@ -0,0 +1,10 @@
set( APPLICATION_SHORTNAME "owncloud" )
set( APPLICATION_NAME "ownCloud" )
set( APPLICATION_EXECUTABLE "owncloud" )
set( APPLICATION_DOMAIN "owncloud.com" )
set( APPLICATION_VENDOR "ownCloud, Inc" )
set( THEME_CLASS "ownCloudTheme" )
set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
set( WIN_SETUP_BITMAP_PATH "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
# set( THEME_INCLUDE "${OEM_THEME_DIR}/mytheme.h" )
# set( APPLICATION_LICENSE "${OEM_THEME_DIR}/license.txt )

66
OwnCloudCPack.cmake Normal file
View File

@@ -0,0 +1,66 @@
include( InstallRequiredSystemLibraries )
set( CPACK_PACKAGE_CONTACT "Dominik Schmidt <domme@tomahawk-player.org>" )
if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
include ( "${OEM_THEME_DIR}/OEM.cmake" )
else ()
include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
endif()
include( VERSION.cmake )
set( CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR} )
set( CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR} )
set( CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH} )
set( CPACK_PACKAGE_VERSION ${VERSION} )
if(APPLE)
set( CPACK_GENERATOR "DragNDrop" )
set( CPACK_SOURCE_GENERATOR "")
set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION} )
set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/ownCloud.icns)
set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
# set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
set( CPACK_DMG_FORMAT "UDBZ" )
set( CPACK_DMG_VOLUME_NAME "${APPLICATION_NAME}")
# did not work with cmake 2.8.7, so we override MacOSXBundleInfo.plist.in
#set( CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/admin/osx/Info.plist )
# do we need these?
#set( CPACK_SYSTEM_NAME "OSX" )
#set( CPACK_PACKAGE_NAME "FOO" )
#set( CPACK_BUNDLE_NAME "BAR" )
endif()
if(WIN32)
set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION}-setup )
# Package file name without extension. Also a directory of installer cmake-2.5.0-Linux-i686
# CPACK_GENERATOR CPack generator to be used STGZ;TGZ;TZ
# CPACK_INCLUDE_TOPLEVEL_DIRECTORY Controls whether CPack adds a top-level directory, usually of the form ProjectName-Version-OS, to the top of package tree. 0 to disable, 1 to enable
# CPACK_INSTALL_CMAKE_PROJECTS List of four values: Build directory, Project Name, Project Component, Directory in the package /home/andy/vtk/CMake-bin;CMake;ALL;/
set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" ) # File used as a description of a project /path/to/project/ReadMe.txt
set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "${APPLICATION_NAME} Syncing Client" ) # Description summary of a project
# CPACK_PACKAGE_EXECUTABLES List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts. ccmake;CMake
set( CPACK_PACKAGE_INSTALL_DIRECTORY ${APPLICATION_NAME} ) # Installation directory on the target system -> C:\Program Files\fellody
set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_NAME} ) # Registry key used when installing this project CMake 2.5.0
set( CPACK_PACKAGE_NAME ${APPLICATION_NAME} ) # Package name, defaults to the project name
set( CPACK_PACKAGE_VENDOR "http://${APPLICATION_DOMAIN}" ) # Package vendor name
endif()
# set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt" ) # License file for the project, used by the STGZ, NSIS, and PackageMaker generators. /home/andy/vtk/CMake/Copyright.txt
set( CPACK_TOPLEVEL_TAG "unused" ) # Directory for the installed files. - needed to provide anything to avoid an error# CPACK_INSTALL_COMMANDS Extra commands to install components.
# Set the options file that needs to be included inside CMakeCPackOptions.cmake
configure_file("${CMAKE_SOURCE_DIR}/CPackOptions.cmake.in"
"${CMAKE_BINARY_DIR}/CPackOptions.cmake" @ONLY)
set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CPackOptions.cmake") # File included at cpack time, once per generator after setting CPACK_GENERATOR to the actual generator being used; allows per-generator setting of CPACK_* variables at cpack time. ${PROJECT_BINARY_DIR}/CPackOptions.cmake
include(CPack)

View File

@@ -1,4 +1,3 @@
# Mirall
## Introduction
@@ -16,16 +15,18 @@ Mirall is in early stages of development, and may still eat your
files or hang your computer.
* Network location awareness not implemented yet
* Current version supports local and remote (SSH) folders.
* It is powered by the great unison (http://www.cis.upenn.edu/~bcpierce/unison/), however
* Current version supports local and remote (sftp and smb) folders.
* It is powered by csync (http://www.csync.org), however
the user does not know and other tools will be incorporated to provide other
functionality.
## Current issues
* No sane way to backup conflicting versions yet
Workaround: delete ~/.local/share/data/Mirall/folders/$ALIAS and restart
* No sane way to backup conflicting versions yet, this should be solved
in a near csync release (--conflictcopy, available in Jann's branch).
Right now the newest copy wins.
* You can't remove folder configurations
Workaround: delete ~/.local/share/data/Mirall/folders/$alias and restart
* Some tasks block the GUI (initial setup of watchers)
* May be some concurrency issues
@@ -46,13 +47,11 @@ files or hang your computer.
### openSUSE
* 1-click install available in software.opensuse.org
http://software.opensuse.org/search?q=mirall&baseproject=ALL&lang=en&include_home=true&exclude_debug=true
* Refer to the download page http://owncloud.org/sync-clients/
### Source code
* http://github.com/dmacvicar/mirall
* https://github.com/owncloud/mirall
## Building the source code
@@ -73,6 +72,8 @@ To generate a tarball:
## Authors
* Duncan Mac-Vicar P. <duncan@kde.org>
* Klaas Freitag <freitag@owncloud.com>
* Daniel Molkentin <danimo@owncloud.com>
## License

View File

@@ -1 +1,6 @@
set(VERSION "0.0.2")
set( VERSION_MAJOR 1 )
set( VERSION_MINOR 2 )
set( VERSION_PATCH 3 )
set( VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
set( SOVERSION 0 )

BIN
admin/osx/DMGBackground.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
admin/osx/DS_Store.in Normal file

Binary file not shown.

20
admin/osx/sign_dmg.sh Executable file
View File

@@ -0,0 +1,20 @@
#!/bin/sh -x
[ "$#" -lt 2 ] && echo "Usage: sign_dmg.sh <dmg> <identity>" && exit
src_dmg=$1
tmp_dmg=writable_$1
signed_dmg=signed_$1
identity=$2
mount="/Volumes/$(basename $src_dmg|cut -d"-" -f1)"
test -e $tmp_dmg && rm -rf $tmp_dmg
hdiutil convert $src_dmg -format UDRW -o $tmp_dmg
open $tmp_dmg
sleep 12s
pushd $mount
codesign -s "$identity" $mount/*.app
popd
diskutil eject $mount
test -e $signed_dmg && rm -rf $signed_dmg
hdiutil convert $tmp_dmg -format UDBZ -o $signed_dmg

View File

@@ -0,0 +1,38 @@
SET(MINGW_PREFIX "i686-w64-mingw32")
# this one is important
SET(CMAKE_SYSTEM_NAME Windows)
# specify the cross compiler
SET(CMAKE_C_COMPILER ${MINGW_PREFIX}-gcc)
SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}-g++)
SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}-windres)
# where is the target environment containing libraries
SET(CMAKE_FIND_ROOT_PATH /usr/${MINGW_PREFIX}/sys-root/mingw)
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
## configure qt variables
# generic
SET(QMAKESPEC win32-g++-cross)
# dirs
SET(QT_LIBRARY_DIR /usr/${MINGW_PREFIX}/bin)
SET(QT_PLUGINS_DIR ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins)
SET(QT_MKSPECS_DIR ${CMAKE_FIND_ROOT_PATH}/share/qt4/mkspecs)
SET(QT_QT_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/include)
# qt tools
SET(QT_QMAKE_EXECUTABLE ${MINGW_PREFIX}-qmake )
SET(QT_MOC_EXECUTABLE ${MINGW_PREFIX}-moc)
SET(QT_RCC_EXECUTABLE ${MINGW_PREFIX}-rcc)
SET(QT_UIC_EXECUTABLE ${MINGW_PREFIX}-uic)
SET(QT_LRELEASE_EXECUTABLE ${MINGW_PREFIX}-lrelease)
# neon config
SET(NEON_CONFIG_EXECUTABLE ${CMAKE_FIND_ROOT_PATH}/bin/neon-config)
# /usr/i686-w64-mingw32/sys-root/mingw/bin/neon-config

3
admin/win/nsi/.directory Normal file
View File

@@ -0,0 +1,3 @@
[Dolphin]
PreviewsShown=true
Timestamp=2012,4,1,13,48,38

View File

BIN
admin/win/nsi/installer.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

View File

@@ -0,0 +1,35 @@
{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f39\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Verdana;}
{\f172\froman\fcharset238\fprq2 Times New Roman CE;}{\f173\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f175\froman\fcharset161\fprq2 Times New Roman Greek;}{\f176\froman\fcharset162\fprq2 Times New Roman Tur;}
{\f177\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f178\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f179\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f180\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
{\f562\fswiss\fcharset238\fprq2 Verdana CE;}{\f563\fswiss\fcharset204\fprq2 Verdana Cyr;}{\f565\fswiss\fcharset161\fprq2 Verdana Greek;}{\f566\fswiss\fcharset162\fprq2 Verdana Tur;}{\f569\fswiss\fcharset186\fprq2 Verdana Baltic;}
{\f570\fswiss\fcharset163\fprq2 Verdana (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;
\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{
\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\*\cs15 \additive \ul\cf2 \sbasedon10 \styrsid7485074 Hyperlink;}}
{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid6712196\rsid7485074\rsid11352300\rsid15940516}{\*\generator Microsoft Word 11.0.5604;}{\info{\title Processes v1}{\author Hardwired}{\operator Hardwired}{\creatim\yr2004\mo12\dy12\hr23\min42}
{\revtim\yr2004\mo12\dy12\hr23\min51}{\version2}{\edmins9}{\nofpages1}{\nofwords80}{\nofchars458}{\nofcharsws537}{\vern24689}}\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180
\dgvspace180\dghorigin1800\dgvorigin1440\dghshow1\dgvshow1
\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
\asianbrkrule\rsidroot7485074\newtblstyruls\nogrowautofit \fet0\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}
{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}
{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain
\qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid7485074 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f39\insrsid7485074\charrsid7485074 Processes v1.0}{\f39\insrsid7485074\charrsid7485074 .0.1
\par }{\f39\fs20\insrsid7485074
\par }\pard \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid15940516 {\f39\fs20\insrsid15940516 This software binaries and source-code are free for any kind of use, including commercial use. }{
\f39\fs20\insrsid7485074\charrsid7485074 There is no restriction and no guaranty for using}{\f39\fs20\insrsid7485074\charrsid7485074 t}{\f39\fs20\insrsid7485074\charrsid7485074 his software}{\f39\fs20\insrsid7485074\charrsid7485074 and/or it
s source-code. }{\f39\fs20\insrsid15940516
\par I}{\f39\fs20\insrsid7485074\charrsid7485074 f you use the plug}{\f39\fs20\insrsid7485074\charrsid7485074 -}{\f39\fs20\insrsid7485074\charrsid7485074 in }{\f39\fs20\insrsid7485074\charrsid7485074 and/}{\f39\fs20\insrsid7485074\charrsid7485074 or it}{
\f39\fs20\insrsid7485074\charrsid7485074 s}{\f39\fs20\insrsid7485074\charrsid7485074 source-code, I would }{\f39\fs20\insrsid7485074\charrsid7485074 appreciate }{\f39\fs20\insrsid7485074\charrsid7485074 if my name is mentioned.}{
\f39\fs20\insrsid7485074\charrsid7485074
\par }\pard \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid7485074 {\f39\fs20\insrsid7485074\charrsid7485074
\par }{\b\f39\fs20\insrsid7485074\charrsid7485074 Andrei Ciubotaru [Hardwired]
\par }{\f39\fs20\insrsid7485074\charrsid7485074 Lead Developer ICode&Ideas SRL (}{\field\flddirty{\*\fldinst {\f39\fs20\insrsid7485074\charrsid7485074 HYPERLINK "http://www.icode.ro/" }{\f39\fs20\insrsid7485074\charrsid7485074 {\*\datafield
00d0c9ea79f9bace118c8200aa004ba90b02000000170000001500000068007400740070003a002f002f007700770077002e00690063006f00640065002e0072006f002f000000e0c9ea79f9bace118c8200aa004ba90b2a00000068007400740070003a002f002f007700770077002e00690063006f00640065002e007200
6f002f000000}}}{\fldrslt {\cs15\f39\fs20\ul\cf2\insrsid7485074\charrsid7485074 http://www.icode.ro/}}}{\f39\fs20\insrsid7485074\charrsid7485074 )
\par }{\field{\*\fldinst {\f39\fs20\insrsid7485074 HYPERLINK "hardwiredteks@gmail.com" }{\f39\fs20\insrsid15940516\charrsid7485074 {\*\datafield
00d0c9ea79f9bace118c8200aa004ba90b02000000010000000303000000000000c00000000000004600001800000068617264776972656474656b7340676d61696c2e636f6d00ffffadde000000000000000000000000000000000000000000000000}}}{\fldrslt {
\cs15\f39\fs20\ul\cf2\insrsid7485074\charrsid7485074 hardwiredteks@gmail.com}}}{\f39\fs20\insrsid7485074\charrsid7485074 , }{\field{\*\fldinst {\f39\fs20\insrsid7485074 HYPERLINK "hardwired@icode.ro" }{\f39\fs20\insrsid15940516\charrsid7485074
{\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b02000000010000000303000000000000c0000000000000460000130000006861726477697265644069636f64652e726f00ffffadde000000000000000000000000000000000000000000000000}}}{\fldrslt {
\cs15\f39\fs20\ul\cf2\insrsid7485074\charrsid7485074 hardwired@icode.ro}}}{\f39\fs20\insrsid7485074\charrsid7485074
\par }}

View File

@@ -0,0 +1,122 @@
----------------------------------------------------------------
----------------------------------------------------------------
Processes (Processes.dll)
Version: 1.0.1.0
Release: 24.february.2005
Description: Nullsoft Installer (NSIS) plug-in for managing?!
Windows processes.
Copyright: © 2004-2005 Hardwired. No rights reserved.
There is no restriction and no guaranty for using
this software.
Author: Andrei Ciubotaru [Hardwired]
Lead Developer ICode&Ideas SRL (http://www.icode.ro/)
hardwiredteks@gmail.com, hardwired@icode.ro
----------------------------------------------------------------
----------------------------------------------------------------
INTRODUCTION
The Need For Plug-in - I need it for the one of my installers.
Briefly: Use it when you need to find\kill a process when
installing\uninstalling some application. Also, use it when you
need to test the presence of a device driver.
SUPPORT
Supported platforms are: WinNT,Win2K,WinXP and Win2003 Server.
DESCRIPTION
Processes::FindProcess <process_name> ;without ".exe"
Searches the currently running processes for the given
process name.
return: 1 - the process was found
0 - the process was not found
Processes::KillProcess <process_name> ; without ".exe"
Searches the currently running processes for the given
process name. If the process is found then the it gets
killed.
return: 1 - the process was found and killed
0 - the process was not found or the process
cannot be killed (insuficient rights)
Processes::FindDevice <device_base_name>
Searches the installed devices drivers for the given
device base name.
(important: I said BASE NAME not FILENAME)
return: 1 - the device driver was found
0 - the device driver was not found
USAGE
First of all, does not matter where you use it. Ofcourse, the
routines must be called inside of a Section/Function scope.
Processes::FindProcess "process_name"
Pop $R0
StrCmp $R0 "1" make_my_day noooooo
make_my_day:
...
noooooo:
...
Processes::KillProcess "process_name"
Pop $R0
StrCmp $R0 "1" dead_meat why_wont_you_die
dead_meat:
...
why_wont_you_die:
...
Processes::FindDevice "device_base_name"
Pop $R0
StrCmp $R0 "1" blabla more_blabla
blabla:
...
more_blabla:
...
THANKS
Sunil Kamath for inspiring me. I wanted to use its FindProcDLL
but my requirements made it imposible.
Nullsoft for creating this very powerfull installer. One big,
free and full-featured (hmmm... and guiless for the moment) mean
install machine!:)
ME for being such a great coder...
... HAHAHAHAHAHAHA!
ONE MORE THING
If you use the plugin or it's source-code, I would apreciate
if my name is mentioned.
----------------------------------------------------------------
----------------------------------------------------------------

View File

@@ -0,0 +1,8 @@
// stdafx.cpp : source file that includes just the standard includes
// KillProcDLL.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
#include "stdafx.h"
// TODO: reference any additional headers you need in STDAFX.H
// and not in this file

View File

@@ -0,0 +1,34 @@
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, but
// are changed infrequently
//
#if !defined(AFX_STDAFX_H__780690DC_E128_403D_BC07_780D1B2CC101__INCLUDED_)
#define AFX_STDAFX_H__780690DC_E128_403D_BC07_780D1B2CC101__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <windows.h>
#include <string> // String management...
//From exam28.cpp
#include <tlhelp32.h>
//#include <iostream.h>
#ifdef BORLANDC
#include <string.h>
#include <ctype.h>
#endif
//To make it a NSIS Plug-In
#include "exdll.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_STDAFX_H__780690DC_E128_403D_BC07_780D1B2CC101__INCLUDED_)

View File

@@ -0,0 +1,37 @@
#include <windows.h>
#include "exdll.h"
HINSTANCE g_hInstance;
HWND g_hwndParent;
void __declspec(dllexport) myFunction(HWND hwndParent, int string_size,
char *variables, stack_t **stacktop)
{
g_hwndParent=hwndParent;
EXDLL_INIT();
// note if you want parameters from the stack, pop them off in order.
// i.e. if you are called via exdll::myFunction file.dat poop.dat
// calling popstring() the first time would give you file.dat,
// and the second time would give you poop.dat.
// you should empty the stack of your parameters, and ONLY your
// parameters.
// do your stuff here
{
char buf[1024];
wsprintf(buf,"$0=%s\n",getuservariable(INST_0));
MessageBox(g_hwndParent,buf,0,MB_OK);
}
}
BOOL WINAPI _DllMainCRTStartup(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
{
g_hInstance=hInst;
return TRUE;
}

View File

@@ -0,0 +1,136 @@
#ifndef _EXDLL_H_
#define _EXDLL_H_
//
// only include this file from one place in your DLL.
// (it is all static, if you use it in two places it will fail)
//
#define EXDLL_INIT() { \
g_stringsize = string_size; \
g_stacktop = stacktop; \
g_variables = variables; }
//
// For page showing plug-ins
//
#define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)
#define WM_NOTIFY_CUSTOM_READY (WM_USER+0xd)
#define NOTIFY_BYE_BYE 'x'
typedef struct _stack_t
{
struct _stack_t *next;
char text[1]; // this should be the length of string_size
} stack_t;
static unsigned int g_stringsize;
static stack_t **g_stacktop;
static char *g_variables;
enum
{
INST_0, // $0
INST_1, // $1
INST_2, // $2
INST_3, // $3
INST_4, // $4
INST_5, // $5
INST_6, // $6
INST_7, // $7
INST_8, // $8
INST_9, // $9
INST_R0, // $R0
INST_R1, // $R1
INST_R2, // $R2
INST_R3, // $R3
INST_R4, // $R4
INST_R5, // $R5
INST_R6, // $R6
INST_R7, // $R7
INST_R8, // $R8
INST_R9, // $R9
INST_CMDLINE, // $CMDLINE
INST_INSTDIR, // $INSTDIR
INST_OUTDIR, // $OUTDIR
INST_EXEDIR, // $EXEDIR
INST_LANG, // $LANGUAGE
__INST_LAST
};
//
// utility functions (not required but often useful)
//
static int popstring( char *str )
{
stack_t *th;
if( !g_stacktop ||
!*g_stacktop )
return 1;
th = (*g_stacktop);
lstrcpy( str, th->text );
*g_stacktop = th->next;
GlobalFree( (HGLOBAL)th );
return 0;
}
static void pushstring( char *str )
{
stack_t *th;
if( !g_stacktop )
return;
th = (stack_t*)GlobalAlloc( GPTR, sizeof(stack_t) + g_stringsize );
lstrcpyn( th->text, str, g_stringsize );
th->next = *g_stacktop;
*g_stacktop = th;
}
static char *getuservariable( int varnum )
{
if( varnum < 0 ||
varnum >= __INST_LAST )
return NULL;
return (g_variables + varnum*g_stringsize);
}
static void setuservariable( int varnum, char *var )
{
if( var != NULL &&
varnum >= 0 &&
varnum < __INST_LAST )
lstrcpy( g_variables + varnum*g_stringsize, var );
}
#endif//_EXDLL_H_

View File

@@ -0,0 +1,411 @@
#include "stdafx.h"
#include "processes.h"
#include "string.h"
//-------------------------------------------------------------------------------------------
// global variables
lpfEnumProcesses EnumProcesses;
lpfEnumProcessModules EnumProcessModules;
lpfGetModuleBaseName GetModuleBaseName;
lpfEnumDeviceDrivers EnumDeviceDrivers;
lpfGetDeviceDriverBaseName GetDeviceDriverBaseName;
HINSTANCE g_hInstance;
HWND g_hwndParent;
HINSTANCE g_hInstLib;
//-------------------------------------------------------------------------------------------
// main DLL entry
BOOL WINAPI _DllMainCRTStartup( HANDLE hInst,
ULONG ul_reason_for_call,
LPVOID lpReserved )
{
g_hInstance = (struct HINSTANCE__ *)hInst;
return TRUE;
}
//-------------------------------------------------------------------------------------------
// loads the psapi routines
bool LoadPSAPIRoutines( void )
{
if( NULL == (g_hInstLib = LoadLibraryA( "PSAPI.DLL" )) )
return false;
EnumProcesses = (lpfEnumProcesses) GetProcAddress( g_hInstLib, "EnumProcesses" );
EnumProcessModules = (lpfEnumProcessModules) GetProcAddress( g_hInstLib, "EnumProcessModules" );
GetModuleBaseName = (lpfGetModuleBaseName) GetProcAddress( g_hInstLib, "GetModuleBaseNameA" );
EnumDeviceDrivers = (lpfEnumDeviceDrivers) GetProcAddress( g_hInstLib, "EnumDeviceDrivers" );
GetDeviceDriverBaseName = (lpfGetDeviceDriverBaseName) GetProcAddress( g_hInstLib, "GetDeviceDriverBaseNameA" );
if( ( NULL == EnumProcesses ) ||
( NULL == EnumProcessModules ) ||
( NULL == EnumDeviceDrivers ) ||
( NULL == GetModuleBaseName ) ||
( NULL == GetDeviceDriverBaseName ) )
{
FreeLibrary( g_hInstLib );
return false;
}
return true;
}
//-------------------------------------------------------------------------------------------
// free the psapi routines
bool FreePSAPIRoutines( void )
{
EnumProcesses = NULL;
EnumProcessModules = NULL;
GetModuleBaseName = NULL;
EnumDeviceDrivers = NULL;
if( FALSE == FreeLibrary( g_hInstLib ) )
return false;
return true;
}
//-------------------------------------------------------------------------------------------
// find a process by name
// return value: true - process was found
// false - process not found
bool FindProc( char *szProcess )
{
char szProcessName[ 1024 ];
char szCurrentProcessName[ 1024 ];
DWORD dPID[ 1024 ];
DWORD dPIDSize( 1024 );
DWORD dSize( 1024 );
HANDLE hProcess;
HMODULE phModule[ 1024 ];
//
// make the name lower case
//
memset( szProcessName, 0, 1024*sizeof(char) );
sprintf( szProcessName, "%s", szProcess );
strlwr( szProcessName );
//
// load PSAPI routines
//
if( false == LoadPSAPIRoutines() )
return false;
//
// enumerate processes names
//
if( FALSE == EnumProcesses( dPID, dSize, &dPIDSize ) )
{
FreePSAPIRoutines();
return false;
}
//
// walk trough and compare see if the process is running
//
for( int k( dPIDSize / sizeof( DWORD ) ); k >= 0; k-- )
{
memset( szCurrentProcessName, 0, 1024*sizeof(char) );
if( NULL != ( hProcess = OpenProcess( PROCESS_ALL_ACCESS, FALSE, dPID[ k ] ) ) )
{
if( TRUE == EnumProcessModules( hProcess, phModule, sizeof(HMODULE)*1024, &dPIDSize ) )
if( GetModuleBaseName( hProcess, phModule[ 0 ], szCurrentProcessName, 1024 ) > 0 )
{
strlwr( szCurrentProcessName );
if( NULL != strstr( szCurrentProcessName, szProcessName ) )
{
FreePSAPIRoutines();
CloseHandle( hProcess );
return true;
}
}
CloseHandle( hProcess );
}
}
//
// free PSAPI routines
//
FreePSAPIRoutines();
return false;
}
//-------------------------------------------------------------------------------------------
// kills a process by name
// return value: true - process was found
// false - process not found
bool KillProc( char *szProcess )
{
char szProcessName[ 1024 ];
char szCurrentProcessName[ 1024 ];
DWORD dPID[ 1024 ];
DWORD dPIDSize( 1024 );
DWORD dSize( 1024 );
HANDLE hProcess;
HMODULE phModule[ 1024 ];
//
// make the name lower case
//
memset( szProcessName, 0, 1024*sizeof(char) );
sprintf( szProcessName, "%s", szProcess );
strlwr( szProcessName );
//
// load PSAPI routines
//
if( false == LoadPSAPIRoutines() )
return false;
//
// enumerate processes names
//
if( FALSE == EnumProcesses( dPID, dSize, &dPIDSize ) )
{
FreePSAPIRoutines();
return false;
}
//
// walk trough and compare see if the process is running
//
for( int k( dPIDSize / sizeof( DWORD ) ); k >= 0; k-- )
{
memset( szCurrentProcessName, 0, 1024*sizeof(char) );
if( NULL != ( hProcess = OpenProcess( PROCESS_ALL_ACCESS, FALSE, dPID[ k ] ) ) )
{
if( TRUE == EnumProcessModules( hProcess, phModule, sizeof(HMODULE)*1024, &dPIDSize ) )
if( GetModuleBaseName( hProcess, phModule[ 0 ], szCurrentProcessName, 1024 ) > 0 )
{
strlwr( szCurrentProcessName );
if( NULL != strstr( szCurrentProcessName, szProcessName ) )
{
FreePSAPIRoutines();
//
// kill process
//
if( false == TerminateProcess( hProcess, 0 ) )
{
CloseHandle( hProcess );
return true;
}
//
// refresh systray
//
UpdateWindow( FindWindow( NULL, "Shell_TrayWnd" ) );
//
// refresh desktop window
//
UpdateWindow( GetDesktopWindow() );
CloseHandle( hProcess );
return true;
}
}
CloseHandle( hProcess );
}
}
//
// free PSAPI routines
//
FreePSAPIRoutines();
return false;
}
//-------------------------------------------------------------------------------------------
bool FindDev( char *szDriverName )
{
char szDeviceName[ 1024 ];
char szCurrentDeviceName[ 1024 ];
LPVOID lpDevices[ 1024 ];
DWORD dDevicesSize( 1024 );
DWORD dSize( 1024 );
TCHAR tszCurrentDeviceName[ 1024 ];
DWORD dNameSize( 1024 );
//
// make the name lower case
//
memset( szDeviceName, 0, 1024*sizeof(char) );
sprintf( szDeviceName, "%s", strlwr( szDriverName ) );
//
// load PSAPI routines
//
if( false == LoadPSAPIRoutines() )
return false;
//
// enumerate devices
//
if( FALSE == EnumDeviceDrivers( lpDevices, dSize, &dDevicesSize ) )
{
FreePSAPIRoutines();
return false;
}
//
// walk trough and compare see if the device driver exists
//
for( int k( dDevicesSize / sizeof( LPVOID ) ); k >= 0; k-- )
{
memset( szCurrentDeviceName, 0, 1024*sizeof(char) );
memset( tszCurrentDeviceName, 0, 1024*sizeof(TCHAR) );
if( 0 != GetDeviceDriverBaseName( lpDevices[ k ], tszCurrentDeviceName, dNameSize ) )
{
sprintf( szCurrentDeviceName, "%S", tszCurrentDeviceName );
if( 0 == strcmp( strlwr( szCurrentDeviceName ), szDeviceName ) )
{
FreePSAPIRoutines();
return true;
}
}
}
//
// free PSAPI routines
//
FreePSAPIRoutines();
return false;
}
//-------------------------------------------------------------------------------------------
extern "C" __declspec(dllexport) void FindProcess( HWND hwndParent,
int string_size,
char *variables,
stack_t **stacktop )
{
char szParameter[ 1024 ];
g_hwndParent = hwndParent;
EXDLL_INIT();
{
popstring( szParameter );
if( true == FindProc( szParameter ) )
wsprintf( szParameter, "1" );
else
wsprintf( szParameter, "0" );
setuservariable( INST_R0, szParameter );
}
}
//-------------------------------------------------------------------------------------------
extern "C" __declspec(dllexport) void KillProcess( HWND hwndParent,
int string_size,
char *variables,
stack_t **stacktop )
{
char szParameter[ 1024 ];
g_hwndParent = hwndParent;
EXDLL_INIT();
{
popstring( szParameter );
if( true == KillProc( szParameter ) )
wsprintf( szParameter, "1" );
else
wsprintf( szParameter, "0" );
setuservariable( INST_R0, szParameter );
}
}
//-------------------------------------------------------------------------------------------
extern "C" __declspec(dllexport) void FindDevice( HWND hwndParent,
int string_size,
char *variables,
stack_t **stacktop )
{
char szParameter[ 1024 ];
g_hwndParent = hwndParent;
EXDLL_INIT();
{
popstring( szParameter );
if( true == FindDev( szParameter ) )
wsprintf( szParameter, "1" );
else
wsprintf( szParameter, "0" );
setuservariable( INST_R0, szParameter );
}
}

View File

@@ -0,0 +1,49 @@
#pragma once
//-------------------------------------------------------------------------------------------
// PSAPI function pointers
typedef BOOL (WINAPI *lpfEnumProcesses) ( DWORD *, DWORD, DWORD * );
typedef BOOL (WINAPI *lpfEnumProcessModules) ( HANDLE, HMODULE *, DWORD, LPDWORD );
typedef DWORD (WINAPI *lpfGetModuleBaseName) ( HANDLE, HMODULE, LPTSTR, DWORD );
typedef BOOL (WINAPI *lpfEnumDeviceDrivers) ( LPVOID *, DWORD, LPDWORD );
typedef BOOL (WINAPI *lpfGetDeviceDriverBaseName)( LPVOID, LPTSTR, DWORD );
//-------------------------------------------------------------------------------------------
// Internal use routines
bool LoadPSAPIRoutines( void );
bool FreePSAPIRoutines( void );
bool FindProc( char *szProcess );
bool KillProc( char *szProcess );
bool FindDev( char *szDriverName );
//-------------------------------------------------------------------------------------------
// Exported routines
extern "C" __declspec(dllexport) void FindProcess( HWND hwndParent,
int string_size,
char *variables,
stack_t **stacktop );
extern "C" __declspec(dllexport) void KillProcess( HWND hwndParent,
int string_size,
char *variables,
stack_t **stacktop );
extern "C" __declspec(dllexport) void FindDevice( HWND hwndParent,
int string_size,
char *variables,
stack_t **stacktop );

Binary file not shown.

View File

@@ -0,0 +1,103 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,1
PRODUCTVERSION 1,0,0,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "NSIS Plug-in for Windows process management. Only WinNT, Win2K, WinXP and Win2003 Server supported."
VALUE "CompanyName", "Andrei Ciubotaru [Hardwired]"
VALUE "FileDescription", "Windows Processes Management"
VALUE "FileVersion", "1, 0, 0, 1"
VALUE "InternalName", "Processes"
VALUE "LegalCopyright", "Copyright (c) 2004 Hardwired. No rights reserved."
VALUE "OriginalFilename", "Processes.dll"
VALUE "ProductName", "Processes"
VALUE "ProductVersion", "1, 0, 0, 1"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View File

@@ -0,0 +1,21 @@
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processes", "processes.vcproj", "{3438467F-A719-46DC-93E5-137A8B691727}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{3438467F-A719-46DC-93E5-137A8B691727}.Debug.ActiveCfg = Debug|Win32
{3438467F-A719-46DC-93E5-137A8B691727}.Debug.Build.0 = Debug|Win32
{3438467F-A719-46DC-93E5-137A8B691727}.Release.ActiveCfg = Release|Win32
{3438467F-A719-46DC-93E5-137A8B691727}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal

View File

@@ -0,0 +1,122 @@
----------------------------------------------------------------
----------------------------------------------------------------
Processes (Processes.dll)
Version: 1.0.0.1
Release: 12.december.2004
Description:Nullsoft Installer (NSIS) plug-in for managing?!
Windows processes.
Copyright: © 2004 Hardwired. No rights reserved.
There is no restriction and no guaranty for using
this software.
Author: Andrei Ciubotaru [Hardwired]
Lead Developer ICode&Ideas SRL (http://www.icode.ro)
hardwiredteks@gmail.com, hardwired@icode.ro
----------------------------------------------------------------
----------------------------------------------------------------
INTRODUCTION
The Need For Plug-in - I need it for the one of my installers.
Briefly: Use it when you need to find\kill a process when
installing\uninstalling some application. Also, use it when you
need to test the presence of a device driver.
SUPPORT
Supported platforms are: WinNT,Win2K,WinXP and Win2003 Server.
DESCRIPTION
Processes::FindProcess <process_name.exe>
Searches the currently running processes for the given
process name.
return: 1 - the process was found
0 - the process was not found
Processes::KillProcess <process_name.exe>
Searches the currently running processes for the given
process name. If the process is found then the it gets
killed.
return: 1 - the process was found and killed
0 - the process was not found or the process
cannot be killed (insuficient rights)
Processes::FindDevice <device_base_name>
Searches the installed devices drivers for the given
device base name.
(important: I said BASE NAME not FILENAME)
return: 1 - the device driver was found
0 - the device driver was not found
USAGE
First of all, does not matter where you use it. Ofcourse, the
routines must be called inside of a Section/Function scope.
Processes::FindProcess "process_name.exe"
Pop $R0
StrCmp $R0 "1" make_my_day noooooo
make_my_day:
...
noooooo:
...
Processes::KillProcess "process_name.exe"
Pop $R0
StrCmp $R0 "1" dead_meat why_wont_you_die
dead_meat:
...
why_wont_you_die:
...
Processes::FindDevice "device_base_name"
Pop $R0
StrCmp $R0 "1" blabla more_blabla
blabla:
...
more_blabla:
...
THANKS
Sunil Kamath for inspiring me. I wanted to use its FindProcDLL
but my requirements made it imposible.
Nullsoft for creating this very powerfull installer. One big,
free and full-featured (hmmm... and guiless for the moment) mean
install machine!:)
ME for being such a great coder...
... HAHAHAHAHAHAHA!
ONE MORE THING
If you use the plugin or it's source-code, I would apreciate
if my name is mentioned.
----------------------------------------------------------------
----------------------------------------------------------------

View File

@@ -0,0 +1,222 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="processes"
SccProjectName="processes"
SccLocalPath=".">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FINDPROCDLL_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\Debug/processes.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile=".\Debug/processes.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/processes.pdb"
ImportLibrary=".\Debug/processes.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\Debug/processes.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1034"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="..\bin"
IntermediateDirectory="..\bin\processes"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2"
WholeProgramOptimization="TRUE">
<Tool
Name="VCCLCompilerTool"
Optimization="3"
GlobalOptimizations="TRUE"
InlineFunctionExpansion="1"
FavorSizeOrSpeed="1"
OptimizeForWindowsApplication="TRUE"
PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;FINDPROCDLL_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="0"
StructMemberAlignment="1"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="..\bin\processes/processes.pch"
AssemblerListingLocation="..\bin\processes/"
ObjectFile="..\bin\processes/"
ProgramDataBaseFileName="..\bin\processes/"
WarningLevel="4"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libc.lib"
OutputFile="..\bin/Processes.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreAllDefaultLibraries="FALSE"
ProgramDatabaseFile="..\bin/processes.pdb"
OptimizeForWindows98="1"
ImportLibrary="..\bin/processes.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\Release/processes.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
RelativePath="processes.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"
BasicRuntimeChecks="3"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
PreprocessorDefinitions="NDEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"/>
</FileConfiguration>
</File>
<File
RelativePath=".\processes.rc">
</File>
<File
RelativePath="StdAfx.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"
BasicRuntimeChecks="3"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
PreprocessorDefinitions="NDEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"
UsePrecompiledHeader="1"/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
RelativePath="exdll.h">
</File>
<File
RelativePath=".\processes.h">
</File>
<File
RelativePath=".\resource.h">
</File>
<File
RelativePath="StdAfx.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
</Filter>
<File
RelativePath="processes.txt">
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@@ -0,0 +1,15 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by processes.rc
//
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -0,0 +1,102 @@
History:
--------
v0.0.11d - 20090705 (AndersK)
*Fixed UAC_RealWorldFullyLoadedDualModeExample.nsi so installing as admin will allow both modes
v0.0.11c - 20090124 (AndersK)
*Checks for seclogon service on NT5 and returns ERROR_SERVICE_NOT_ACTIVE in $0 if not running
v0.0.11b - 20090102 (AndersK)
*Fixed unicode compile bugs
v0.0.11 - 20081021 (AndersK)
+Added UAC_GetUserShellFolderPath.nsi (Uses the new UAC::GetShellFolderPath)
v0.0.10a - 20081004 (AndersK)
+Added SEE_MASK_NOZONECHECKS flag (experimental)
v0.0.10 - 20080812 (AndersK)
+Added ugly hook hack to the shells run-as dialog on xp, defaults to other user
v0.0.9 - 20080721 (AndersK)
*Fixed UAC_RealWorldFullyLoadedDualModeExample.nsi related bug (Thanks Case)
v0.0.8 - 20080310 (AndersK)
+HTML Readme
+Added UAC::GetOuterHwnd (used by UAC_RealWorldFullyLoadedDualModeExample.nsi)
*Fixed UAC_RealWorldFullyLoadedDualModeExample.nsi
*Major code cleanup in UAC.cpp
-Removed UAC::RunElevatedAndProcessMessages (UAC::RunElevated now supports non NULL $HWNDParent)
-Removed several useless sample scripts
v0.0.7e - 20080229 (AndersK)
*Added ugly hack for hackwnd to find correct title and give us a proper taskbar so the elevation dialog does not get lost (2000,XP (This also fixed Alt-Tab icon on Vista))
*Should compile with MSVC2005 now (Thanks Case)
*More unicode fixes, this time even tested with NSIS Unicode (Only RunElevated and Exec tested)
v0.0.7d - 20080226 (AndersK)
*Fixed a couple of unicode version bugs (Unicode version still untested)
*Fixed weird XP string length bug (Thanks kfank)
v0.0.7c - 20080218 (AndersK)
*Fixed SyncVars string length bug
v0.0.7b - 20080205 (AndersK)
*Fixed DelayLoadDlls() problem on NT4
v0.0.7 - 20080120 (AndersK)
+Added UAC::StackPush (For use with ExecCodeSegment)
v0.0.6d - 20071108 (AndersK)
+Now syncs basic registers/variables before calling UAC::*Exec* and UAC::ExecCodeSegment (r0-r9,R0-R9,$CMDLINE,$INSTDIR,$OUTDIR,$EXEDIR,$LANGUAGE)
+Added UAC::RunElevatedAndProcessMessages, this can be called after .onInit (Very experimental, DO NOT USE)
+New include file with helper macros: UAC.nsh
*Replazed Clammerz hack with a better version
v0.0.6c - 20071014 (AndersK)
+Check for and split up "domain\user" style input in RunAs.cpp for CreateProcessWithLogonW
*Added a ugly hack to trick messagebox'es in .OnInit to appear correctly on Vista (Thanks Clammerz)
v0.0.6b - 20070523 (AndersK)
*Fixed showwindow flag (Thanks for the help kichik)
v0.0.6 - 20070512 (AndersK)
+Added basic language support for MyRunAs dialog.
v0.0.5e - 20070509 (AndersK)
*Fixed detection of UAC mode?
+IPC window is visible (but offscreen) during elevation to help with SetForegroundWindow/Focus problems
v0.0.5d - 20070324 (AndersK)
*Fixed stupid IsAdmin bug
v0.0.5c - 20070304 (AndersK)
*_IsAdmin now uses CheckTokenMembership if it exists ( MSKB:Q118626 / http://blogs.msdn.com/larryosterman/archive/2007/03/14/why-does-kb-118626-use-accesscheck-to-check-if-you-re-a-member-of-the-administrators-group.aspx )
v0.0.5b - 20070301 (AndersK)
*Fixed ExecCodeSegment (Thread now calls CoInitialize)
v0.0.5 - 20070228 (AndersK)
+Added ExecCodeSegment (You can now call ANY code in the context of the original user)
v0.0.4b - 20070226 (AndersK)
*Fixed (My)RunAs font (http://blogs.msdn.com/oldnewthing/archive/2005/02/04/366987.aspx)
v0.0.4 - 20070225 (AndersK)
+Added (My)RunAs dialog, used on Vista when running as LUA with UAC off
+Always uses /NCRC for elevated instance
*Now compiles as UNICODE (Untested, no UnicodeNSIS to test on)
v0.0.3 - 20070224 (AndersK)
+Added Exec/ExecWait
+Added Verb & ShowWindow support for ShellExec[Wait]
v0.0.2 - 20070219 (AndersK)
+Added ShellExecWait
*IPC srv wnd now has its own thread and msg loop
*Removed CRT dependency
*Hopefully loads on Win95 now
v0.0.1 - 20070215 (AndersK)
*Initial release

View File

@@ -0,0 +1,14 @@
This software is provided 'as-is', without any express or implied warranty.
ZLIB/LIBPNG LICENSE
-------------------
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.

149
admin/win/nsi/nsis_uac/NSISUtil.h Executable file
View File

@@ -0,0 +1,149 @@
/*
Alternative to ExDll.h
v0.0.1 - 20060811 (AndersK)
*/
#pragma once
#include <TChar.h>
typedef TCHAR NSISCH;
#define NSISCALL __stdcall
namespace NSIS {
__forceinline void* NSISCALL MemAlloc(SIZE_T cb) {return GlobalAlloc(LPTR,cb);}
__forceinline void NSISCALL MemFree(void* p) {GlobalFree(p);}
enum {
INST_0, // $0
INST_1, // $1
INST_2, // $2
INST_3, // $3
INST_4, // $4
INST_5, // $5
INST_6, // $6
INST_7, // $7
INST_8, // $8
INST_9, // $9
INST_R0, // $R0
INST_R1, // $R1
INST_R2, // $R2
INST_R3, // $R3
INST_R4, // $R4
INST_R5, // $R5
INST_R6, // $R6
INST_R7, // $R7
INST_R8, // $R8
INST_R9, // $R9
INST_CMDLINE, // $CMDLINE
INST_INSTDIR, // $INSTDIR
INST_OUTDIR, // $OUTDIR
INST_EXEDIR, // $EXEDIR
INST_LANG, // $LANGUAGE
__INST_LAST,
VIDX_TEMP=(INST_LANG+1), //#define state_temp_dir g_usrvars[25]
VIDX_PLUGINSDIR,//# define state_plugins_dir g_usrvars[26]
VIDX_EXEPATH,//#define state_exe_path g_usrvars[27]
VIDX_EXEFILENAME,//#define state_exe_file g_usrvars[28]
VIDX_STATECLICKNEXT,//#define state_click_next g_usrvars[30]
__VIDX_UNDOCLAST
};
typedef struct _stack_t {
struct _stack_t *next;
NSISCH text[ANYSIZE_ARRAY];
} stack_t;
typedef struct {
int autoclose;
int all_user_var;
int exec_error;
int abort;
int exec_reboot;
int reboot_called;
int XXX_cur_insttype; // deprecated
int XXX_insttype_changed; // deprecated
int silent;
int instdir_error;
int rtl;
int errlvl;
//NSIS v2.3x ?
int alter_reg_view;
int status_update;
} exec_flags_type;
typedef struct {
exec_flags_type *exec_flags;
int (NSISCALL *ExecuteCodeSegment)(int, HWND);
void (NSISCALL *validate_filename)(char *);
} extra_parameters;
extern UINT StrSize;
extern stack_t **StackTop;
extern NSISCH*Vars;
inline bool NSISCALL SetErrLvl(extra_parameters*pExtraParams,int ErrLevel) {return pExtraParams? ((pExtraParams->exec_flags->errlvl=ErrLevel)||true):false;}
inline bool NSISCALL SetErrorFlag(extra_parameters*pExtraParams) {return pExtraParams? ((pExtraParams->exec_flags->exec_error=1)||true):false;}
inline bool NSISCALL ClearErrorFlag(extra_parameters*pExtraParams) {return pExtraParams?((pExtraParams->exec_flags->exec_error=0)||true):false;}
__forceinline int NSISCALL ExecuteCodeSegment(extra_parameters*pExtraParams,int pos,HWND hwndProgress=NULL) {
return pExtraParams?pExtraParams->ExecuteCodeSegment(pos,hwndProgress):(/*EXEC_ERROR*/0x7FFFFFFF);
}
static NSISCH* __fastcall GetVar(const int varnum)
{
//ASSERT(NSIS::Vars && NSIS::StrSize);
if (varnum < 0 || varnum >= __VIDX_UNDOCLAST) return NULL;
return NSIS::Vars+(varnum*NSIS::StrSize);
}
inline void NSISCALL SetVarUINT(const int varnum,UINT Value) {
wsprintf(GetVar(varnum),_T("%u"),Value);
}
static stack_t* NSISCALL StackPop() {
if (NSIS::StackTop && *NSIS::StackTop) {
stack_t*s=(*NSIS::StackTop);
*NSIS::StackTop=(*NSIS::StackTop)->next;
return s;
}
return 0;
}
__forceinline void NSISCALL StackFreeItem(stack_t*pStackItem) {NSIS::MemFree(pStackItem);}
static DWORD NSISCALL StackPush(NSISCH*InStr,UINT StackStrSize=NSIS::StrSize) {
if (!NSIS::StackTop)return ERROR_INVALID_PARAMETER;
stack_t*sNew=(stack_t*)NSIS::MemAlloc(sizeof(stack_t)+(StackStrSize*sizeof(NSISCH)));
if (!sNew)return ERROR_OUTOFMEMORY;
lstrcpyn(sNew->text,InStr,StackStrSize);
sNew->next=*NSIS::StackTop;
*NSIS::StackTop=sNew;
return NO_ERROR;
}
}; /* namespace */
#define NSISUTIL_INIT() namespace NSIS {static UINT StrSize;static stack_t **StackTop;static NSISCH*Vars;}//Call in only ONE source file
#define NSISUTIL_INITEXPORT(_v,_strsize,_stackt) NSIS::Vars=_v;NSIS::StrSize=_strsize;NSIS::StackTop=_stackt
//#define NSISEXPORT4(_func,_h,_strsize,_v,_stackt) extern "C" void __declspec(dllexport) __cdecl \
// _func (HWND _h,int _strsize,NSISCH*_v,NSIS::stack_t **_stackt) { NSISUTIL_INITEXPORT(_v,_strsize,_stackt); TRACE("EXPORT::" #_func "\n");
//#define NSISEXPORT5(_func,_h,_strsize,_v,_stackt,_eparams) extern "C" void __declspec(dllexport) __cdecl \
// _func (HWND _h,int _strsize,NSISCH*_v,NSIS::stack_t **_stackt,NSIS::extra_parameters* _eparams) { NSISUTIL_INITEXPORT(_v,_strsize,_stackt); TRACE("EXPORT::" #_func "\n");
//#define NSISEXPORT NSISEXPORT5
#ifdef _MSC_VER
# define EXPORTNSISFUNC extern "C" void __declspec(dllexport) __cdecl
# else
# error EXPORTNSISFUNC needs compiler goo, you are on your own!
# endif
#define NSISFUNCSTART4(_h,_strsize,_v,_stackt) {NSISUTIL_INITEXPORT(_v,_strsize,_stackt);
#define NSISFUNCSTART5(_h,_strsize,_v,_stackt,_eparams) NSISFUNCSTART4(_h,_strsize,_v,_stackt)
#define NSISFUNCSTART NSISFUNCSTART5
#define NSISFUNCEND() }

Binary file not shown.

Binary file not shown.

277
admin/win/nsi/nsis_uac/RunAs.cpp Executable file
View File

@@ -0,0 +1,277 @@
//Copyright (C) 2007 Anders Kjersem. Licensed under the zlib/libpng license, see License.txt for details.
/*
If UAC is disabled, the runas verb is broken (Vista RTM) so when running as LUA there is no way to elevate so
we provide our own dialog.
*/
#include "UAC.h"
#ifdef FEAT_CUSTOMRUNASDLG
#include <Lmcons.h>//UNLEN && GNLEN && PWLEN
#include <WindowsX.h>
#include "resource.h"
#include "NSISUtil.h"
using namespace NSIS;
#define ERRAPP_TRYAGAIN (0x20000000|1)
#define MYMAX_DOMAIN (2+max(GNLEN,MAX_COMPUTERNAME_LENGTH)+1)
static LPCTSTR g_RunAsDlgTitle=_T("Run as");
static LPCTSTR g_RunAsHelpText=_T("You may not have the necessary permissions to use all the features of the program you are about to run. You may run this program as a different user or continue to run the program as the current user.");
static LPCTSTR g_RunAsCurrUsrFmt=_T("&Current user (%s)");//Max 50 chars!
static LPCTSTR g_RunAsSpecHelp=_T("Run the program as the &following user:");
FORCEINLINE bool MySetDlgItemText(HWND hDlg,int id,LPCTSTR s) {return MySndDlgItemMsg(hDlg,id,WM_SETTEXT,0,(LPARAM)s)!=0;}
typedef struct {
SHELLEXECUTEINFO*pSEI;
bool AsSelf;
} RUNASDLGDATA;
void MyRunAsFmtCurrUserRadio(HWND hDlg,LPCTSTR Fmt) {
TCHAR bufFullName[MYMAX_DOMAIN+UNLEN+1];
TCHAR buf[50+MYMAX_DOMAIN+UNLEN+1];
*bufFullName=0;
ULONG cch;
if ((!_GetUserNameEx || !_GetUserNameEx(NameSamCompatible,bufFullName,&(cch=COUNTOF(bufFullName)))) &&
!_GetUserName(bufFullName,&(cch=COUNTOF(bufFullName))) ) {
*bufFullName=0;
}
wsprintf(buf,Fmt,*bufFullName?bufFullName:_T("?"));
MySetDlgItemText(hDlg,IDC_RUNASCURR,buf);
// default the "User name:" to Administrator from shell32
if (LoadString(GetModuleHandle(_T("SHELL32.dll")),21763, bufFullName, COUNTOF(bufFullName)) > 0) {
MySetDlgItemText(hDlg,IDC_USERNAME,bufFullName);
}
}
#ifdef FEAT_CUSTOMRUNASDLG_TRANSLATE
void MyRunAsTranslateDlgString(LPCTSTR StrID,LPTSTR Ini,HWND hDlg,INT_PTR DlgItemId,int special=0) {
TCHAR buf[MAX_PATH*2];
DWORD len=GetPrivateProfileString(_T("MyRunAsStrings"),StrID,0,buf,ARRAYSIZE(buf),Ini);
if (len) {
if (IDC_RUNASCURR==special)
MyRunAsFmtCurrUserRadio(hDlg,buf);
else
(DlgItemId==-1) ? SetWindowText(hDlg,buf) : MySetDlgItemText(hDlg,DlgItemId,buf);
}
}
void MyRunAsTranslateDlg(HWND hDlg) {
DWORD len;
TCHAR buf[MAX_PATH*2];
HMODULE hDll=GetWindowInstance(hDlg);ASSERT(hDll);
if ( (len=GetModuleFileName(hDll,buf,ARRAYSIZE(buf))) <1)return;
buf[len-3]=0;
lstrcat(buf,_T("lng"));
MyRunAsTranslateDlgString(_T("DlgTitle"),buf,hDlg,-1);
MyRunAsTranslateDlgString(_T("HelpText"),buf,hDlg,IDC_HELPTEXT);
MyRunAsTranslateDlgString(_T("OptCurrUser"),buf,hDlg,IDC_RUNASCURR,IDC_RUNASCURR);
MyRunAsTranslateDlgString(_T("OptOtherUser"),buf,hDlg,IDC_RUNASSPEC);
MyRunAsTranslateDlgString(_T("Username"),buf,hDlg,IDC_LBLUSER);
MyRunAsTranslateDlgString(_T("Pwd"),buf,hDlg,IDC_LBLPWD);
MyRunAsTranslateDlgString(_T("OK"),buf,hDlg,IDOK);
MyRunAsTranslateDlgString(_T("Cancel"),buf,hDlg,IDCANCEL);
HWND h=GetDlgItem(hDlg,IDC_RUNASCURR);
if (GetPrivateProfileInt(_T("MyRunAsCfg"),_T("DisableCurrUserOpt"),false,buf))EnableWindow(h,false);
if (GetPrivateProfileInt(_T("MyRunAsCfg"),_T("HideCurrUserOpt"),false,buf))ShowWindow(h,false);
}
#endif
bool ErrorIsLogonError(DWORD err) {
switch (err) {
case ERROR_LOGON_FAILURE:
case ERROR_ACCOUNT_RESTRICTION:
case ERROR_INVALID_LOGON_HOURS:
case ERROR_INVALID_WORKSTATION:
case ERROR_PASSWORD_EXPIRED:
case ERROR_ACCOUNT_DISABLED:
case ERROR_NONE_MAPPED:
case ERROR_NO_SUCH_USER:
case ERROR_INVALID_ACCOUNT_NAME:
return true;
}
return false;
}
void VerifyOKBtn(HWND hDlg,RUNASDLGDATA*pRADD) {
const bool HasText=pRADD?(pRADD->AsSelf?true:MySndDlgItemMsg(hDlg,IDC_USERNAME,WM_GETTEXTLENGTH)>0):false;
EnableWindow(GetDlgItem(hDlg,IDOK),HasText);
}
void SetDlgState(HWND hDlg,bool AsSelf,RUNASDLGDATA*pRADD) {
if (pRADD)pRADD->AsSelf=AsSelf;
MySndDlgItemMsg(hDlg,IDC_RUNASCURR,BM_SETCHECK,AsSelf?BST_CHECKED:BST_UNCHECKED);
MySndDlgItemMsg(hDlg,IDC_RUNASSPEC,BM_SETCHECK,!AsSelf?BST_CHECKED:BST_UNCHECKED);
int ids[]={IDC_USERNAME,IDC_PASSWORD,IDC_LBLUSER,IDC_LBLPWD};
for (int i=0; i<COUNTOF(ids);++i)EnableWindow(GetDlgItem(hDlg,ids[i]),!AsSelf);
VerifyOKBtn(hDlg,pRADD);
}
INT_PTR CALLBACK MyRunAsDlgProc(HWND hwnd,UINT uMsg,WPARAM wp,LPARAM lp) {
RUNASDLGDATA*pRADD=(RUNASDLGDATA*)GetWindowLongPtr(hwnd,GWLP_USERDATA);
switch(uMsg) {
//case WM_DESTROY:
// break;
case WM_CLOSE:
return DestroyWindow(hwnd);
case WM_INITDIALOG:
{
pRADD=(RUNASDLGDATA*)lp;ASSERT(pRADD);
SetWindowLongPtr(hwnd,GWLP_USERDATA,lp);
Edit_LimitText(GetDlgItem(hwnd,IDC_USERNAME),UNLEN+1+MYMAX_DOMAIN); //room for "foo@BAR" or "BAR\foo"
Edit_LimitText(GetDlgItem(hwnd,IDC_PASSWORD),PWLEN);
const HINSTANCE hSh32=GetModuleHandle(_T("SHELL32.dll"));
const HICON hIco=(HICON)LoadImage(hSh32,MAKEINTRESOURCE(194),IMAGE_ICON,32,32,LR_SHARED);
MySndDlgItemMsg(hwnd,IDC_SHICON,STM_SETICON,(WPARAM)hIco);
SendMessage(hwnd,WM_SETTEXT,0,(LPARAM)g_RunAsDlgTitle);
MySetDlgItemText(hwnd,IDC_HELPTEXT,g_RunAsHelpText);
MyRunAsFmtCurrUserRadio(hwnd,g_RunAsCurrUsrFmt);
MySetDlgItemText(hwnd,IDC_RUNASSPEC,g_RunAsSpecHelp);
#ifdef FEAT_CUSTOMRUNASDLG_TRANSLATE
MyRunAsTranslateDlg(hwnd);
#endif
SetDlgState(hwnd,false,pRADD);
#if defined(BUILD_DBG) && 0 //auto login used during testing ;)
SetDlgItemText(hwnd,IDC_USERNAME,_T("root"));
SetDlgItemText(hwnd,IDC_PASSWORD,_T("???"));
Sleep(1);PostMessage(hwnd,WM_COMMAND,IDOK,0);
#endif
}
return true;
case WM_COMMAND:
{
switch(HIWORD(wp)) {
case EN_CHANGE:
VerifyOKBtn(hwnd,pRADD);
break;
case EN_SETFOCUS:
case BN_CLICKED:
if (LOWORD(wp)<=IDCANCEL)break;
SetDlgState(hwnd,LOWORD(wp)==IDC_RUNASCURR,pRADD);
return FALSE;
}
INT_PTR exitcode=!pRADD?-1:IDCANCEL;
switch(LOWORD(wp)) {
case IDOK:
if (pRADD) {
SHELLEXECUTEINFO&sei=*pRADD->pSEI;
PROCESS_INFORMATION pi={0};
DWORD ec=NO_ERROR;
WCHAR*wszExec;//Also used as TCHAR buffer in AsSelf mode
bool PerformTCharFmt=pRADD->AsSelf;
//const DWORD CommonStartupInfoFlags=STARTF_FORCEONFEEDBACK;
#ifdef UNICODE
PerformTCharFmt=true;
#endif
wszExec=(WCHAR*)NSIS::MemAlloc( (pRADD->AsSelf?sizeof(TCHAR):sizeof(WCHAR)) *(lstrlen(sei.lpFile)+1+lstrlen(sei.lpParameters)+1));
if (!wszExec)ec=ERROR_OUTOFMEMORY;
if (PerformTCharFmt)wsprintf((TCHAR*)wszExec,_T("%s%s%s"),sei.lpFile,((sei.lpParameters&&*sei.lpParameters)?_T(" "):_T("")),sei.lpParameters);
if (!ec) {
if (pRADD->AsSelf) {
STARTUPINFO si={sizeof(si)};
TRACEF("MyRunAs:CreateProcess:%s|\n",wszExec);
ec=(CreateProcess(0,(TCHAR*)wszExec,0,0,false,0,0,0,&si,&pi)?NO_ERROR:GetLastError());
}
else {
//All Wide strings!
WCHAR wszPwd[PWLEN+1];
WCHAR wszUName[UNLEN+1+MYMAX_DOMAIN+1];
STARTUPINFOW siw={sizeof(siw)};
WCHAR*p;
#ifndef UNICODE
//Build unicode string, we already know the buffer is big enough so no error handling
p=wszExec;
MultiByteToWideChar(CP_THREAD_ACP,0,sei.lpFile,-1,p,0xFFFFFF);
if (sei.lpParameters && *sei.lpParameters) {
p+=lstrlen(sei.lpFile);*p++=L' ';*p=0;
MultiByteToWideChar(CP_THREAD_ACP,0,sei.lpParameters,-1,p,0xFFFFFF);
}
#endif
SendMessageW(GetDlgItem(hwnd,IDC_USERNAME),WM_GETTEXT,COUNTOF(wszUName),(LPARAM)wszUName);
SendMessageW(GetDlgItem(hwnd,IDC_PASSWORD),WM_GETTEXT,COUNTOF(wszPwd),(LPARAM)wszPwd);
//Try to find [\\]domain\user and split into username and domain strings
WCHAR*pUName=wszUName,*pDomain=0;
p=wszUName;
//if (*p==p[1]=='\\')pUName=(p+=2);else \ //Should we still split things up if the string starts with \\ ? Is it possible to use \\machine\user at all?
++p;//Don't parse "\something", require at least one char before backslash "?[*\]something"
while(*p && *p!='\\')++p;
if (*p=='\\') {
pDomain=pUName;
pUName=p+1;*p=0;
}
TRACEF("MyRunAs:CreateProcessWithLogonW:%ws|%ws|%ws|%ws|\n",pUName,pDomain?pDomain:L"NO?DOMAIN",wszPwd,wszExec);
ec=(_CreateProcessWithLogonW(pUName,pDomain?pDomain:0,wszPwd,LOGON_WITH_PROFILE,0,wszExec,0,0,0,&siw,&pi)?NO_ERROR:GetLastError());
TRACEF("MyRunAs:CreateProcessWithLogonW: ret=%u\n",ec);
SecureZeroMemory(wszPwd,sizeof(wszPwd));//if (wszPwd) {volatile WCHAR*_p=wszPwd;for(;_p&&*_p;++_p)*_p=1;if (_p)*wszPwd=0;}//Burn password (And attempt to prevent compiler from removing it)
if (ec && ErrorIsLogonError(ec)) {
LPTSTR szMsg;
DWORD ret=FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,0,ec,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&szMsg,0,0);
if (ret) {
ec=ERRAPP_TRYAGAIN;
MessageBox(hwnd,szMsg,0,MB_ICONWARNING);
LocalFree(szMsg);
}
else ec=GetLastError();
}
}
}
NSIS::MemFree(wszExec);
if (pi.hThread)CloseHandle(pi.hThread);
if (ERRAPP_TRYAGAIN==ec)break;
if (ec) {
SetLastError(ec);
exitcode=-1;
}
else {
pRADD->pSEI->hProcess=pi.hProcess;
exitcode=IDOK;
}
}
case IDCANCEL:
EndDialog(hwnd,exitcode);
}
}
break;
}
return FALSE;
}
DWORD MyRunAs(HINSTANCE hInstDll,SHELLEXECUTEINFO&sei) {
INT_PTR ec;
ASSERT(sei.cbSize>=sizeof(SHELLEXECUTEINFO) && hInstDll);
if (ec=DelayLoadDlls())return ec;
ASSERT(_CreateProcessWithLogonW && _GetUserName);
RUNASDLGDATA radd={0};
radd.pSEI=&sei;
ec=DialogBoxParam(hInstDll,MAKEINTRESOURCE(IDD_MYRUNAS),sei.hwnd,MyRunAsDlgProc,(LPARAM)&radd);
TRACEF("MyRunAs returned %d (%s|%s)\n",ec,sei.lpFile,sei.lpParameters);
switch(ec) {
case 0:
return ERROR_INVALID_HANDLE;//DialogBoxParam returns 0 on bad hwnd
case IDOK:
return NO_ERROR;
case IDCANCEL:
return ERROR_CANCELLED;
}
//TODO:BUGBUG: on vista, the last error seems to get lost, should probably put it in RUNASDLGDATA and always return IDOK
return GetLastError();
}
#ifdef BUILD_DBG
// RunDll exports are __stdcall, we dont care about that for this debug export, rundll32.exe is able to handle this mistake
extern "C" void __declspec(dllexport) __cdecl DBGRDMyRunAs(HWND hwnd,HINSTANCE hinst,LPTSTR lpCmdLine,int nCmdShow) {
SHELLEXECUTEINFO sei={sizeof(sei)};
sei.lpFile=_T("Notepad.exe");//sei.lpParameters=_T("param1");
TRACEF("ec=%d\n",MyRunAs(GetModuleHandle(_T("UAC.dll")),sei));
}
#endif
#endif /* FEAT_CUSTOMRUNASDLG */

View File

@@ -0,0 +1,222 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html><head>
<title>UAC plug-in readme</title>
<script type="text/javascript">
function NavGL(q){window.open("http://www.google.com/search?hl=en&btnI=I&num=2&q="+escape(q));return 0;}
</script>
<style type="text/css">
html,body {background-color:#FFF; color:#000;}
a:link, a:visited, a:active {color:#00F;}
h2 {border-bottom:0.1em solid #000;}
#docHdrHdln{text-align:center;}
.importanttxt {color:#e00;}
.code {font-family:monospace;}
.nsisvar {color:#C00;}
.str {color:#390}
.inifile {background-color:#EEE;border:1px solid #000;padding:0.2em;}
.inicomment {background-color:#f5f5c5;color:#555;}
table.piexport {text-align:left;margin-bottom:1em;}
table.piexport td {vertical-align:top;}
table.piexport table.ret {padding:0;margin:0;border:0;}
</style>
</head><body>
<h1 id="docHdrHdln">UAC plug-in</h1>
<code><pre>
Interactive User (MediumIL) Admin user(HighIL)
+++[Setup.exe]++++++++++++++ +++[Setup.exe]++++++++++++++
+ + + +
+ ***[.OnInit]************ + + ***[.OnInit]************ +
+ * UAC::RunElevated >---+-+------>+ * * +
+ * NSIS.Quit() * + + * * +
+ ************************ + + ***********||*********** +
+ + + || +
+ + + \/ +
+ ***[Sections]*********** + + ***[Sections]*********** +
+ * * + /--+-+-< UAC::Exec * +
+ ************************ + | + ************************ +
+ + | + +
+ Win32.CreateProcess() <-+----/ + +
+ + + +
++++++++++++++++++++++++++++ ++++++++++++++++++++++++++++
</pre></code>
<h2>Contents</h2>
<ul>
<li><a href="#exports">Plugin Functions</a>
<li><a href="#lang">Language support</a>
<li><a href="#knownissues">Known Issues</a>
<li><a href="#glossary">Glossary</a>
</ul>
<a name="exports"><h2>Plugin Functions</h2></a><div class="CntSec"><p>
Every function will try to emulate the basic NSIS instruction (of similar name) when UAC::RunElevated has not "succeeded" or running on a system that does not support elevation (Win9x/NT4)</p>
<table class="piexport"><tr><th colspan=2>UAC::RunElevated</th></tr>
<tr><td>Parameters:</td><td></td></tr>
<tr><td>Returns:</td><td>
<table class="ret">
<tr><td><span class="nsisvar">$0</span></td><td>Win32 error code (0 on success, 1223 if user aborted elevation dialog, anything else should be treated as a fatal error)</td></tr>
<tr><td><span class="nsisvar">$1</span></td><td><span class="code">If <span class="nsisvar">$0</span>==0</span>:
<table class="ret">
<tr><td>0</td><td>UAC is not supported by the OS</td></tr>
<tr><td>1</td><td>Started a elevated child process, the current process should act like a wrapper (Call Quit without any further processing)</td></tr>
<tr><td>2</td><td>The process is already running @ HighIL (Member of admin group)</td></tr>
<tr><td>3</td><td>You should call RunElevated again (This can happen if a user without admin priv. is used in the runas dialog)</td></tr>
</table>
</td></tr>
<tr><td><span class="nsisvar">$2</span></td><td><span class="code">If <span class="nsisvar">$0</span>==0 && <span class="nsisvar">$1</span>==1</span>: ExitCode of the elevated fork process (The NSIS errlvl is also set)</td></tr>
<tr><td><span class="nsisvar">$3</span></td><td><span class="code">If <span class="nsisvar">$0</span>==0</span>: 1 if the user is a member of the admin group or 0 otherwise</td></tr>
</table></td></tr>
<tr><td>Description:</td><td>Allows non-admin/UAC.LUA users to re-spawn the installer as another user and UAC.Admin users to elevate.</td></tr>
</table>
<!--table class="piexport"><tr><th colspan=2>UAC::RunElevatedAndProcessMessages <i style="font-size:smaller;">(Experimental)</i></th></tr>
<tr><td>Parameters:</td><td></td></tr>
<tr><td>Returns:</td><td><i>See UAC::RunElevated</i></td></tr>
<tr><td>Description:</td><td>Version of UAC::RunElevated that can be called from a page</td></tr>
</table-->
<table class="piexport"><tr><th colspan=2>UAC::Unload</th></tr>
<tr><td>Parameters:</td><td></td></tr>
<tr><td>Returns:</td><td></td></tr>
<tr><td>Description:</td><td>Cleanup, you must call this function in .OnInstFailed, .onUserAbort and .OnInstSuccess</td></tr>
</table>
<table class="piexport"><tr>
<th colspan=2>UAC::Exec</th></tr>
<tr><td>Parameters:</td><td>&lt;INT:ShowWindow&gt; &lt;STR:App&gt; &lt;STR:Parameters&gt; &lt;STR:WorkingDir&gt;</td></tr>
<tr><td>Returns:</td><td>
<table class="ret">
<tr><td><span class="nsisvar">$0</span></td><td>Win32 error code, 0 on success (ErrorFlag is also set on error)</td></tr>
</table></td></tr>
</table>
<table class="piexport"><tr>
<th colspan=2>UAC::ExecWait</th></tr>
<tr><td>Parameters:</td><td>&lt;INT:ShowWindow&gt; &lt;STR:App&gt; &lt;STR:Parameters&gt; &lt;STR:WorkingDir&gt;</td></tr>
<tr><td>Returns:</td><td>
<table class="ret">
<tr><td><span class="nsisvar">$0</span></td><td>Win32 error code, 0 on success (ErrorFlag is also set on error)</td></tr>
<tr><td><span class="nsisvar">$1</span></td><td>Exitcode of new process</td></tr>
</table></td></tr>
</table>
<table class="piexport"><tr>
<th colspan=2>UAC::ShellExec</th></tr>
<tr><td>Parameters:</td><td>&lt;STR:Verb&gt; &lt;INT:ShowWindow&gt; &lt;STR:App&gt; &lt;STR:Parameters&gt; &lt;STR:WorkingDir&gt;</td></tr>
<tr><td>Returns:</td><td>
<table class="ret">
<tr><td><span class="nsisvar">$0</span></td><td>Win32 error code, 0 on success (ErrorFlag is also set on error)</td></tr>
</table></td></tr>
</table>
<table class="piexport"><tr>
<th colspan=2>UAC::ShellExecWait</th></tr>
<tr><td>Parameters:</td><td>&lt;STR:Verb&gt; &lt;INT:ShowWindow&gt; &lt;STR:App&gt; &lt;STR:Parameters&gt; &lt;STR:WorkingDir&gt;</td></tr>
<tr><td>Returns:</td><td>
<table class="ret">
<tr><td><span class="nsisvar">$0</span></td><td>Win32 error code, 0 on success (ErrorFlag is also set on error)</td></tr>
<tr><td><span class="nsisvar">$1</span></td><td>Exitcode of new process</td></tr>
</table></td></tr>
</table>
<table class="piexport"><tr><th colspan=2>UAC::IsAdmin</th></tr>
<tr><td>Parameters:</td><td></td></tr>
<tr><td>Returns:</td><td><span class="nsisvar">$0</span> (BOOL) result</td></tr>
<tr><td>Description:</td><td>Check current thread/process token for a non-deny admin group SID entry</td></tr>
</table>
<table class="piexport"><tr><th colspan=2>UAC::ExecCodeSegment</th></tr>
<tr><td>Parameters:</td><td>&lt;INT:NSISFunctionAddress&gt;</td></tr>
<tr><td>Returns:</td><td>[None] (ErrorFlag is set on error)</td></tr>
<tr><td>Description:</td><td>Calls NSIS function in LUA/outer instance (If you use instructions that alter the UI or the stack/variables in the code segment (StrCpy,Push/Pop/Exch,DetailPrint etc.) they will affect the hidden wrapper installer and not "your" installer instance)</td></tr>
</table>
<table class="piexport"><tr><th colspan=2>UAC::StackPush</th></tr>
<tr><td>Parameters:</td><td>&lt;STR:String&gt;</td></tr>
<tr><td>Returns:</td><td>[None] (ErrorFlag is set on error)</td></tr>
<tr><td>Description:</td><td>Push to outer instance stack (For use with UAC::ExecCodeSegment)</td></tr>
</table>
<table class="piexport"><tr><th colspan=2>UAC::GetOuterHwnd</th></tr>
<tr><td>Parameters:</td><td></td></tr>
<tr><td>Returns:</td><td><span class="nsisvar">$0</span> HWNDPARENT of outer instance</td></tr>
<tr><td>Description:</td><td>For use with ${UAC.RunElevatedAndProcessMessages}</td></tr>
</table>
<table class="piexport"><tr><th colspan=2>UAC::SupportsUAC</th></tr>
<tr><td>Parameters:</td><td></td></tr>
<tr><td>Returns:</td><td><span class="nsisvar">$0</span> !=0 if supported</td></tr>
<tr><td>Description:</td><td>Check if the OS supports UAC (And the user has UAC turned on) <span class="importanttxt">This function only tests if UAC is active, will return 0 on NT5 even though runas is implemented on those platforms, will also return 0 on NT6+ if UAC is off. You should only call this function during testing, NOT to determine if you can call UAC::RunElevated</span></td></tr>
</table>
<table class="piexport"><tr><th colspan=2>UAC::GetElevationType</th></tr>
<tr><td>Parameters:</td><td></td></tr>
<tr><td>Returns:</td><td>
<table class="ret">
<tr><td><span class="nsisvar">$0</span></td><td><a href="#" OnClick="return NavGL('TOKEN_ELEVATION_TYPE Enumeration')">TOKEN_ELEVATION_TYPE</a>:
<table class="ret">
<tr><td>0</td><td>Unsupported/Failed (ErrorFlag is also set)</td></tr>
<tr><td>1</td><td>TokenElevationTypeDefault: User is not using a split token (UAC disabled)</td></tr>
<tr><td>2</td><td>TokenElevationTypeFull: UAC enabled, the (current) process is elevated</td></tr>
<tr><td>3</td><td>TokenElevationTypeLimited: UAC enabled, the process is not elevated</td></tr>
</table>
</td></tr>
</table></td></tr>
</table>
</div>
<a name="lang"><h2>Language support</h2></a><div class="CntSec">
<p>If the plugin is built with FEAT_CUSTOMRUNASDLG_TRANSLATE (Enabled by default),
you can extract a file named <span class="str">UAC.LNG</span> to <span class="nsisvar">$pluginsdir</span>.
It is a ini file with the following sections:
</p><pre class="inifile">
[MyRunAsCfg]
<span class="inicomment">;Set to 1 to disable the radio button</span>
DisableCurrUserOpt=
<span class="inicomment">;Set to 1 to hide the radio button</span>
HideCurrUserOpt=
[MyRunAsStrings]
DlgTitle=Hello There!
HelpText=Just do your thing!
<span class="inicomment">;Label for current user radio button, %s is replaced with result of GetUserNameEx(NameSamCompatible,...)</span>
OptCurrUser=Self service (%s)
OptOtherUser=Run as someone:
UserName=Who:
Pwd=PIN:
OK=Okey!
Cancel=No Way</pre>
</div>
<a name="knownissues"><h2>Known Issues</h2></a><div class="CntSec">
<ul>
<li>UACPI.KI#1: DetailPrint in outer process is ignored
<li>UACPI.KI#2: Elevation can fail if the installer is located on a remote share that requires authentication
</ul>
</div>
<a name="glossary"><h2>Glossary</h2></a><div class="CntSec">
<ul>
<li>AAM: Admin Approval Mode
<li>IL: Integrity level (Part of the new MIC/WIC security levels added to NT6)
<li>LUA: Limited/Least-privilege User Account
<li>MIC: <a href="http://en.wikipedia.org/wiki/Mandatory_Integrity_Control">Mandatory Integrity Controls</a> (Now known as WIC)
<li>UAC: User Account Control (Part of the UAP umbrella)
<li>UAP: User Account Protection
<li>WIC: <a href="http://www.securityfocus.com/infocus/1887">Windows Integrity Controls</a>
<li>Win32 error code: Standard windows error codes, ERROR_???
</ul>
</div>
</body></html>

191
admin/win/nsi/nsis_uac/UAC.nsh Executable file
View File

@@ -0,0 +1,191 @@
/*
=======================
UAC helper include file
.......................
Macros starting with UAC.I should only be called from the installer and vice versa for UAC.U macros.
*/
!ifndef UAC_HDR__INC
!define UAC_HDR__INC
!include LogicLib.nsh
!define UAC.RunElevatedAndProcessMessages 'UAC::RunElevated '
!define UAC.Unload 'UAC::Unload '
!define UAC.StackPush 'UAC::StackPush '
/*!macro _UAC.BuildOnInitElevationFunc _funcprefix
Function ${_funcprefix}onInit
!ifmacrodef
FunctionEnd
!macroend*/
!macro _UAC.GenerateSimpleFunction _funcprefix _funcName _funcCode
Function ${_funcprefix}${_funcName}
${_funcCode}
#messagebox mb_ok "${_funcprefix}${_funcName}"
FunctionEnd
!macroend
!macro _UAC.TryDef _d _v
!ifndef ${_d}
!define ${_d} "${_v}"
!endif
!macroend
!macro _UAC.InitStrings _modeprefix
!insertmacro _UAC.TryDef UACSTR.UnDataFile "UAC.dat"
!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvWinErr "Unable to elevate , error $0"
!ifNdef __UNINSTALL__
!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvAbortReqAdmin "This installer requires admin access, aborting!"
!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvMustTryAgain "This installer requires admin access, try again"
!else
!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvAbortReqAdmin "This uninstaller requires admin access, aborting!"
!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvMustTryAgain "This uninstaller requires admin access, try again"
!endif
!macroend
!ifmacroNdef _UAC.GenerateUninstallerTango
!macro _UAC.GenerateUninstallerTango UninstallerFileName
!ifdef __GLOBAL__
!error "UAC: Needs to be called inside a function"
!endif
!ifNdef __UNINSTALL__
!error "UAC: _UAC.GenerateUninstallerTango should only be called by uninstaller, see http://forums.winamp.com/showthread.php?threadid=280330"
!endif
!ifNdef UAC_UNINSTALLERTANGOFORALLPLATFORMS
!include WinVer.nsh
!endif
!insertmacro _UAC.InitStrings 'U.'
ReadIniStr $0 "$ExeDir\${UACSTR.UnDataFile}" UAC "Un.Ready"
${IF} $0 != 1
!ifNdef UAC_UNINSTALLERTANGOFORALLPLATFORMS
${AndIf} ${AtLeastWinVista}
!endif
InitPluginsDir
WriteIniStr "$PluginsDir\${UACSTR.UnDataFile}" UAC "Un.Ready" 1
CopyFiles /SILENT "$EXEPATH" "$PluginsDir\${UninstallerFileName}"
StrCpy $0 ""
${IfThen} ${Silent} ${|} StrCpy $0 "/S " ${|}
ExecWait '"$PluginsDir\${UninstallerFileName}" $0/NCRC _?=$INSTDIR' $0
SetErrorLevel $0
Quit
${EndIf}
!macroend
!endif
!ifmacroNdef _UAC.GenerateOnInitElevationCode
!macro _UAC.GenerateOnInitElevationCode _modeprefix
!ifndef __FUNCTION__
!error "UAC: Needs to be called inside a function"
!endif
!insertmacro _UAC.InitStrings ${_modeprefix}
!define _UAC.GOIECUniq L${__LINE__}
UAC_Elevate_${_UAC.GOIECUniq}:
UAC::RunElevated
StrCmp 1223 $0 UAC_ElevationAborted_${_UAC.GOIECUniq} ; UAC dialog aborted by user?
StrCmp 0 $0 0 UAC_Err_${_UAC.GOIECUniq} ; Error?
StrCmp 1 $1 0 UAC_Success_${_UAC.GOIECUniq} ;Are we the real deal or just the wrapper?
Quit
UAC_Err_${_UAC.GOIECUniq}:
MessageBox mb_iconstop "${UACSTR.${_modeprefix}ElvWinErr}"
Abort
UAC_ElevationAborted_${_UAC.GOIECUniq}:
MessageBox mb_iconstop "${UACSTR.${_modeprefix}ElvAbortReqAdmin}"
Abort
UAC_Success_${_UAC.GOIECUniq}:
# if $0==0 && $3==1, we are a member of the admin group (Any OS)
# if $0==0 && $1==0, UAC not supported (Probably <NT6), run as normal?
# if $0==0 && $1==3, we can try to elevate again
StrCmp 1 $3 /*+4*/ UAC_Done_${_UAC.GOIECUniq} ;Admin?
StrCmp 3 $1 0 UAC_ElevationAborted_${_UAC.GOIECUniq} ;Try again or abort?
MessageBox mb_iconexclamation "${UACSTR.${_modeprefix}ElvMustTryAgain}" ;Inform user...
goto UAC_Elevate_${_UAC.GOIECUniq} ;...lets try again
UAC_Done_${_UAC.GOIECUniq}:
!undef _UAC.GOIECUniq
!macroend
!endif
!define UAC.I.Elevate.AdminOnly '!insertmacro UAC.I.Elevate.AdminOnly '
!macro UAC.I.Elevate.AdminOnly
!insertmacro _UAC.GenerateOnInitElevationCode 'I.'
!macroend
!define UAC.U.Elevate.AdminOnly '!insertmacro UAC.U.Elevate.AdminOnly '
!macro UAC.U.Elevate.AdminOnly _UninstallerName
!ifNdef UAC_DISABLEUNINSTALLERTANGO
!insertmacro _UAC.GenerateUninstallerTango "${_UninstallerName}"
!endif
!insertmacro _UAC.GenerateOnInitElevationCode 'U.'
!macroend
!define UAC.AutoCodeUnload '!insertmacro UAC.AutoCodeUnload '
!macro UAC.AutoCodeUnload _HasUninstaller
!insertmacro _UAC.GenerateSimpleFunction "" .OnInstFailed '${UAC.Unload}'
!insertmacro _UAC.GenerateSimpleFunction "" .OnInstSuccess '${UAC.Unload}'
!ifNdef MUI_INCLUDED
!insertmacro _UAC.GenerateSimpleFunction "" .onUserAbort '${UAC.Unload}'
!else
!ifNdef MUI_CUSTOMFUNCTION_ABORT
!error "UAC: must call $$ {UAC.Unload} in MUI_CUSTOMFUNCTION_ABORT!"
!endif
!endif
!if "${_HasUninstaller}" != ""
!insertmacro _UAC.GenerateSimpleFunction "un" .onUninstFailed '${UAC.Unload}'
!insertmacro _UAC.GenerateSimpleFunction "un" .onUninstSuccess '${UAC.Unload}'
!ifNdef MUI_INCLUDED
!insertmacro _UAC.GenerateSimpleFunction "un" .onUserAbort '${UAC.Unload}'
!else
!ifNdef MUI_CUSTOMFUNCTION_ABORT
!error "UAC: must call $$ {UAC.Unload} in MUI_CUSTOMFUNCTION_(UN)ABORT!"
!endif
!endif
!endif
!macroend
!define UAC.FastCallFunctionAsUser '!insertmacro UAC.FastCallFunctionAsUser '
!macro UAC.FastCallFunctionAsUser _func _var
GetFunctionAddress ${_var} ${_func}
UAC::ExecCodeSegment ${_var}
!macroend
!define UAC.CallFunctionAsUser '!insertmacro UAC.CallFunctionAsUser '
!macro UAC.CallFunctionAsUser _func
push $R9
!insertmacro UAC.FastCallFunctionAsUser ${_func} $R9
pop $R9
!macroend
!define UAC.FastCallGetOuterInstanceHwndParent UAC::GetOuterHwnd
!define UAC.GetOuterInstanceHwndParent '!insertmacro UAC.GetOuterInstanceHwndParent '
!macro UAC.GetOuterInstanceHwndParent _var
push $0
${UAC.FastCallGetOuterInstanceHwndParent}
Exch $0
Pop ${_var}
!macroend
!macro _UAC.DumpEx _disp _f _fp _v
${_f} ${_fp}
DetailPrint "${_disp}=${_v}"
!macroend
!macro _UAC.Dump _f _fp _v
!insertmacro _UAC.DumpEx `${_f}` `${_f}` `${_fp}` `${_v}`
!macroend
!macro _UAC.DbgDetailPrint
push $0
push $1
System::Call /NoUnload "advapi32::GetUserName(t.r0,*i${NSIS_MAX_STRLEN})"
System::Call "Kernel32::GetComputerName(t.r1,*i${NSIS_MAX_STRLEN})"
DetailPrint "$1\$0"
;!insertmacro _UAC.DumpEx "User" System::Call "advapi32::GetUserName(t.r0,*i${NSIS_MAX_STRLEN})" $0
!insertmacro _UAC.DumpEx "CmdLine" "" "" "$CmdLine"
!insertmacro _UAC.Dump UAC::IsAdmin "" $0
!insertmacro _UAC.Dump UAC::SupportsUAC "" $0
!insertmacro _UAC.Dump UAC::GetElevationType "" $0
pop $1
pop $0
!macroend
!endif /* ifndef UAC_HDR__INC */

View File

@@ -0,0 +1,62 @@
RequestExecutionLevel user /* RequestExecutionLevel REQUIRED! */
!define APPNAME "UAC_AdminOnly"
Name "${APPNAME}"
OutFile "${APPNAME}.exe"
ShowInstDetails show
!include UAC.nsh ;<<< New headerfile that does everything for you ;)
!include LogicLib.nsh
!define UACSTR.I.ElvAbortReqAdmin "This fancy app requires admin rights fool" ;custom error string, see _UAC.InitStrings macro in uac.nsh for more
Function .OnInit
${UAC.I.Elevate.AdminOnly}
FunctionEnd
Function .OnInstFailed
${UAC.Unload}
FunctionEnd
Function .OnInstSuccess
${UAC.Unload}
FunctionEnd
Function ExecCodeSegmentTest
${If} "$1" != "666, the # of the beast"
MessageBox mb_ok "uh oh"
${EndIf}
FunctionEnd
Section "Info"
!insertmacro _UAC.DbgDetailPrint
StrCpy $1 "666, the # of the beast"
!insertmacro UAC.CallFunctionAsUser ExecCodeSegmentTest
SectionEnd
page InstFiles
/* LEGACY CODE: (now uses magic code from UAC.nsh)
Function .OnInit
UAC_Elevate:
UAC::RunElevated
StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
StrCmp 0 $0 0 UAC_Err ; Error?
StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
Quit
UAC_Err:
MessageBox mb_iconstop "Unable to elevate , error $0"
Abort
UAC_ElevationAborted:
/*System::Call "user32::CreateWindowEx(i ${WS_EX_TRANSPARENT}|${WS_EX_LAYERED}, t 'Button', t 'blah', i 0, i 10, i 10, i 10, i 10, i 0, i 0, i 0) i .r0"
ShowWindow $0 ${SW_SHOW}
System::Call "user32::SetForegroundWindow(i r0) i."
System::Call "user32::DestroyWindow(i r0) i."
* /
MessageBox mb_iconstop "This installer requires admin access, aborting!"
Abort
UAC_Success:
StrCmp 1 $3 +4 ;Admin?
StrCmp 3 $1 0 UAC_ElevationAborted ;Try again or abort?
MessageBox mb_iconstop "This installer requires admin access, try again" ;Inform user...
goto UAC_Elevate ;... and try again
FunctionEnd*/

View File

@@ -0,0 +1,45 @@
/*
This sample will try to elevate, but it will also allow non admin users to continue if they click cancel in the elevation dialog
*/
RequestExecutionLevel user /* RequestExecutionLevel REQUIRED! */
!define APPNAME "UAC_AllowLUA"
Name "${APPNAME}"
OutFile "${APPNAME}.exe"
ShowInstDetails show
!include UAC.nsh
Function .OnInstFailed
UAC::Unload ;Must call unload!
FunctionEnd
Function .OnInstSuccess
UAC::Unload ;Must call unload!
FunctionEnd
Function .OnInit
UAC::RunElevated
;MessageBox mb_iconinformation "Debug: UAC::RunElevated: $\n0(Error)=$0 $\n1(UACMode)=$1 $\n2=$2 $\nadmin=$3$\n$\n$CmdLine"
StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
StrCmp 0 $0 0 UAC_Err ; Error?
StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
Quit
UAC_Err:
MessageBox mb_iconstop "Unable to elevate , error $0"
Abort
UAC_ElevationAborted:
# elevation was aborted, we still run as normal
UAC_Success:
FunctionEnd
Section "Info"
!insertmacro _UAC.DbgDetailPrint
SectionEnd
Page InstFiles

View File

@@ -0,0 +1,30 @@
RequestExecutionLevel user /* RequestExecutionLevel REQUIRED! */
!define APPNAME "UAC_GetUserShellFolderPath"
Name "${APPNAME}"
OutFile "${APPNAME}.exe"
ShowInstDetails show
!include UAC.nsh
!include LogicLib.nsh
page instfiles
Function .onInit
${UAC.I.Elevate.AdminOnly}
FunctionEnd
!ifndef CSIDL_PERSONAL
!define CSIDL_PERSONAL 0x0005 ;My Documents
!endif
Section
/*
You can specify a fallback value in the 2nd parameter, it is used if the installer is not elevated
or running on NT4/Win9x or on errors.
If you just want to check for success, use "" as the 2nd parameter and compare $0 with ""
*/
UAC::GetShellFolderPath ${CSIDL_PERSONAL} $Documents
DetailPrint MyDocs=$0
SectionEnd

View File

@@ -0,0 +1,242 @@
/*
This sample supports two modes, installing as a normal user (single user install) AND as admin (all users install)
This sample uses the registry plugin, so you need to download that if you don't already have it
*/
!define APPNAME "UAC_RealWorldFullyLoadedDualMode"
!define ELEVATIONTITLE "${APPNAME}: Elevate" ;displayed during elevation on our custom page
!define SMSUBDIR $StartMenuFolder ;"${APPNAME}"
!define UNINSTALLER_NAME "Uninstall ${APPNAME}.exe"
!define UNINSTALLER_REGSECTION "${APPNAME}"
!define RegPath.MSUninstall "Software\Microsoft\Windows\CurrentVersion\Uninstall"
Name "${APPNAME}"
OutFile "${APPNAME}.exe"
ShowInstDetails show
SetCompressor LZMA
RequestExecutionLevel user /* RequestExecutionLevel REQUIRED! */
!include MUI.nsh
!include UAC.nsh
!include LogicLib.nsh
!include Registry.nsh
!include nsDialogs.nsh ;for our custom page
!include FileFunc.nsh ;we need to parse the command line
!insertmacro GetParameters
!insertmacro GetOptions
!define MUI_CUSTOMFUNCTION_ABORT onAbort
!define MUI_CUSTOMFUNCTION_GUIINIT onGuiInit
!define MUI_COMPONENTSPAGE_NODESC
!define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\llama-blue.ico"
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\llama-blue.ico"
!define MUI_WELCOMEPAGE_TITLE_3LINES
var InstMode # 0: Single user, 1:All users, >1:elevated instance, perform page jump
var hKey # Reg hive
var hSelModeAdminRadio
var StartMenuFolder
!macro SetMode IsAdmin
!if "${IsAdmin}" > 0
SetShellVarContext all
StrCpy $InstMode 1
StrCpy $hKey HKLM
!else
SetShellVarContext current
StrCpy $InstMode 0
StrCpy $hKey HKCU
!endif
!macroend
Function .OnInit
!insertmacro SetMode 0
${GetParameters} $R9
${GetOptions} "$R9" UAC $0 ;look for special /UAC:???? parameter (sort of undocumented)
${Unless} ${Errors}
UAC::IsAdmin
${If} $0 < 1
SetErrorLevel 666 ;special return value for outer instance so it knows we did not have admin rights
Quit
${EndIf}
!insertmacro SetMode 1
StrCpy $InstMode 2
${EndIf}
FunctionEnd
Function onGuiInit
${If} $InstMode >= 2
${UAC.GetOuterInstanceHwndParent} $0
${If} $0 <> 0
System::Call /NOUNLOAD "*(i,i,i,i)i.r1"
System::Call /NOUNLOAD 'user32::GetWindowRect(i $0,i r1)i.r2'
${If} $2 <> 0
System::Call /NOUNLOAD "*$1(i.r2,i.r3)"
System::Call /NOUNLOAD 'user32::SetWindowPos(i $hwndParent,i0,ir2,ir3,i0,i0,i 4|1)'
${EndIf}
ShowWindow $hwndParent ${SW_SHOW}
ShowWindow $0 ${SW_HIDE} ;hide outer instance installer window
System::Free $1
${EndIf}
${EndIf}
FunctionEnd
Function Un.OnInit
!insertmacro SetMode 0
ReadRegDWORD $0 HKLM "${RegPath.MSUninstall}\${UNINSTALLER_REGSECTION}" InstMode ;We saved the "mode" in the installer
${If} $0 U> 0
; If it was installed for all users, we have to be admin to uninstall it
${UAC.U.Elevate.AdminOnly} "${UNINSTALLER_NAME}"
!insertmacro SetMode 1
${EndIf}
FunctionEnd
Function onAbort
${UAC.Unload}
FunctionEnd
${UAC.AutoCodeUnload} 1 ;Auto-generate .OnInstFailed and .OnInstSuccess functions
!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipPageInElvModePreCB
!insertmacro MUI_PAGE_WELCOME
Page Custom ModeSelectionPageCreate ModeSelectionPageLeave
!define MUI_PAGE_CUSTOMFUNCTION_PRE CmpntsPreCB
!insertmacro MUI_PAGE_COMPONENTS
!define MUI_PAGE_CUSTOMFUNCTION_PRE DirPreCB
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_STARTMENU 1 $StartMenuFolder
!insertmacro MUI_PAGE_INSTFILES
!define MUI_FINISHPAGE_TITLE_3LINES
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_FUNCTION FinishRunCB
!insertmacro MUI_PAGE_FINISH
!define MUI_WELCOMEPAGE_TITLE_3LINES
!insertmacro MUI_UNPAGE_WELCOME
!insertmacro MUI_UNPAGE_INSTFILES
!insertmacro MUI_LANGUAGE "English"
Function CmpntsPreCB
GetDlgItem $0 $hwndparent 3
${IfThen} $InstMode >= 1 ${|} EnableWindow $0 0 ${|} ;prevent user from going back and selecting single user so noobs don't end up installing as the wrong user
FunctionEnd
Function SkipPageInElvModePreCB
${IfThen} $InstMode > 1 ${|} Abort ${|} ;skip this page so we get to the mode selection page
FunctionEnd
Function ModeSelectionPageCreate
${If} $InstMode > 1
StrCpy $InstMode 1
Abort ;skip this page and contine where the "parent" would have gone
${EndIf}
!insertmacro MUI_HEADER_TEXT_PAGE "Select install type" "Blah blah blah blah"
nsDialogs::Create /NOUNLOAD 1018
Pop $0
${NSD_CreateLabel} 0 20u 75% 20u "Blah blah blah blah select install type..."
Pop $0
System::Call "advapi32::GetUserName(t.r0, *i ${NSIS_MAX_STRLEN}r1) i.r2"
${NSD_CreateRadioButton} 0 40u 75% 15u "Single User ($0)"
Pop $0
${IfThen} $InstMode U< 1 ${|} SendMessage $0 ${BM_SETCHECK} 1 0 ${|}
${NSD_CreateRadioButton} 0 60u 75% 15u "All users"
Pop $hSelModeAdminRadio
${IfThen} $InstMode U> 0 ${|} SendMessage $hSelModeAdminRadio ${BM_SETCHECK} 1 0 ${|}
nsDialogs::Show
FunctionEnd
!macro EnableCtrl dlg id state
push $language
GetDlgItem $language ${dlg} ${id}
EnableWindow $language ${state}
pop $language
!macroend
Function ModeSelectionPageLeave
SendMessage $hSelModeAdminRadio ${BM_GETCHECK} 0 0 $9
UAC::IsAdmin
${If} $9 U> 0
${If} $0 <> 0
!insertmacro SetMode 1
${Else}
System::Call /NoUnload 'user32::GetWindowText(i $HwndParent,t.R1,i ${NSIS_MAX_STRLEN})' ;get original window title
System::Call /NoUnload 'user32::SetWindowText(i $HwndParent,t "${ELEVATIONTITLE}")' ;set out special title
StrCpy $2 "" ;reset special return, only gets set when sub process is executed, not when user cancels
!insertmacro EnableCtrl $HWNDParent 1 0 ;Disable next button, just because it looks good ;)
${UAC.RunElevatedAndProcessMessages}
!insertmacro EnableCtrl $HWNDParent 1 1
System::Call 'user32::SetWindowText(i $HwndParent,t "$R1")' ;restore title
${If} $2 = 666 ;our special return, the new process was not admin after all
MessageBox mb_iconExclamation "You need to login with an account that is a member of the admin group to continue..."
Abort
${ElseIf} $0 = 1223 ;cancel
Abort
${Else}
${If} $0 <> 0
${If} $0 = 1062
MessageBox mb_iconstop "Unable to elevate, Secondary Logon service not running!"
${Else}
MessageBox mb_iconstop "Unable to elevate, error $0 ($1,$2,$3)"
${EndIf}
Abort
${EndIf}
${EndIf}
Quit ;We now have a new process, the install will continue there, we have nothing left to do here
${EndIf}
${EndIf}
FunctionEnd
Function DirPreCB
${If} $InstDir == ""
${If} $InstMode U> 0
StrCpy $InstDir "$ProgramFiles\${APPNAME}"
${Else}
StrCpy $InstDir "$APPDATA\${APPNAME}"
${EndIf}
${EndIf}
FunctionEnd
Function FinishRunCB
UAC::Exec "" "Notepad.exe" "$Windir\Win.INI" "$InstDir"
FunctionEnd
Function CreateSMShortcuts
StrCpy ${SMSUBDIR} $9 ;stupid sync
CreateDirectory "$SMPrograms\${SMSUBDIR}"
CreateShortcut "$SMPrograms\${SMSUBDIR}\${APPNAME}.lnk" "$Windir\Notepad.exe"
CreateShortcut "$SMPrograms\${SMSUBDIR}\Uninstall ${APPNAME}.lnk" "$InstDir\${UNINSTALLER_NAME}"
FunctionEnd
Function CreateDeskShortcuts
CreateShortcut "$Desktop\${APPNAME}.lnk" "$Windir\Notepad.exe"
FunctionEnd
Section "!Required files"
SectionIn RO
SetOutPath -
!insertmacro _UAC.DbgDetailPrint ;some debug info, useful during testing
;Install files here...
WriteUninstaller "$InstDir\${UNINSTALLER_NAME}"
${registry::Write} "$hKey\${RegPath.MSUninstall}\${UNINSTALLER_REGSECTION}" DisplayName "${APPNAME}" REG_SZ $0
${registry::Write} "$hKey\${RegPath.MSUninstall}\${UNINSTALLER_REGSECTION}" UninstallString "$InstDir\${UNINSTALLER_NAME}" REG_SZ $0
${registry::Write} "$hKey\${RegPath.MSUninstall}\${UNINSTALLER_REGSECTION}" InstMode $InstMode REG_DWORD $0
${registry::Unload}
SectionEnd
Section "Startmenu Shortcuts"
StrCpy $9 ${SMSUBDIR} ;this is stupid as hell, we need correct ${SMSUBDIR} in the outer process, this is the only way (plugins cannot enum "custom" var's AFAIK)
${UAC.CallFunctionAsUser} CreateSMShortcuts
SectionEnd
Section "Desktop Shortcut"
${UAC.CallFunctionAsUser} CreateDeskShortcuts
SectionEnd
Section Uninstall
Delete "$InstDir\${UNINSTALLER_NAME}"
Delete "$SMPrograms\${SMSUBDIR}\${APPNAME}.lnk"
Delete "$SMPrograms\${SMSUBDIR}\Uninstall ${APPNAME}.lnk"
RMDir "$SMPrograms\${SMSUBDIR}"
Delete "$Desktop\${APPNAME}.lnk"
RMDir "$InstDir"
${registry::DeleteKey} "$hKey\${RegPath.MSUninstall}\${UNINSTALLER_REGSECTION}" $0
${registry::Unload}
SectionEnd

View File

@@ -0,0 +1,49 @@
/*
This script was made in response to http://forums.winamp.com/showthread.php?threadid=280330
It is a ugly hack and is mostly here just to have a solution right now.
Hopefully, NSIS will add support for changing the RequestExecutionLevel of the uninstaller
This code inspired the _UAC.GenerateUninstallerTango macro (called by ${UAC.U.Elevate.AdminOnly} unless you define UAC_DISABLEUNINSTALLERTANGO)
*/
RequestExecutionLevel user /* RequestExecutionLevel REQUIRED! */
!define APPNAME "UAC_Uninstaller"
Name "${APPNAME}"
OutFile "${APPNAME}.exe"
ShowInstDetails show
!include LogicLib.nsh
!define UNINSTALLER_UACDATA "uac.ini"
!define UNINSTALLER_NAME "Uninstall FooBarBaz"
Function un.onInit
ReadIniStr $0 "$ExeDir\${UNINSTALLER_UACDATA}" UAC "Un.First"
${IF} $0 != 1
;SetSilent silent
InitPluginsDir
WriteIniStr "$PluginsDir\${UNINSTALLER_UACDATA}" UAC "Un.First" 1
CopyFiles /SILENT "$EXEPATH" "$PluginsDir\${UNINSTALLER_NAME}.exe"
StrCpy $0 ""
${IfThen} ${Silent} ${|} StrCpy $0 "/S " ${|}
ExecWait '"$PluginsDir\${UNINSTALLER_NAME}.exe" $0/NCRC _?=$INSTDIR' $0
SetErrorLevel $0
Quit
${EndIf}
# UAC code goes here ...
FunctionEnd
Section
WriteUninstaller "$exedir\${UNINSTALLER_NAME}.exe"
SetAutoClose true
DetailPrint "Uninstalling..."
Sleep 1111
Exec '"$exedir\${UNINSTALLER_NAME}.exe"'
SectionEnd
Section uninstall
MessageBox mb_ok "My filename is: $EXEFILE"
Delete "$instdir\${UNINSTALLER_NAME}.exe"
Delete "$instdir\${APPNAME}.exe" ;delete generated installer aswell, this is just a sample script
SectionEnd
page InstFiles

View File

@@ -0,0 +1,24 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_MYRUNAS 101
#define IDC_RUNASCURR 1000
#define IDC_RUNASSPEC 1001
#define IDC_SHICON 1002
#define IDC_HELPTEXT 1003
#define IDC_USERNAME 1004
#define IDC_PASSWORD 1005
#define IDC_LBLUSER 1007
#define IDC_LBLPWD 1008
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1009
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -0,0 +1,109 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#include "uac.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_MYRUNAS DIALOG DISCARDABLE 0, 0, 250, 145
STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_SETFOREGROUND | DS_FIXEDSYS |
DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "&OK",IDOK,132,122,50,14
PUSHBUTTON "Ca&ncel",IDCANCEL,188,122,50,14
ICON "",IDC_SHICON,7,7,20,20
LTEXT "",IDC_HELPTEXT,34,7,204,35
CONTROL "",IDC_RUNASCURR,"Button",BS_AUTORADIOBUTTON,20,49,218,
10
CONTROL "",IDC_RUNASSPEC,"Button",BS_AUTORADIOBUTTON,20,65,218,
10
LTEXT "&User name:",IDC_LBLUSER,20,84,42,16
EDITTEXT IDC_USERNAME,63,83,175,14,ES_AUTOHSCROLL
LTEXT "&Password:",IDC_LBLPWD,20,102,42,20
EDITTEXT IDC_PASSWORD,63,100,175,14,ES_PASSWORD | ES_AUTOHSCROLL
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_MYRUNAS, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 238
TOPMARGIN, 7
BOTTOMMARGIN, 136
END
END
#endif // APSTUDIO_INVOKED
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"#include ""uac.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

1518
admin/win/nsi/nsis_uac/uac.cpp Executable file

File diff suppressed because it is too large Load Diff

169
admin/win/nsi/nsis_uac/uac.h Executable file
View File

@@ -0,0 +1,169 @@
//Copyright (C) 2007 Anders Kjersem. Licensed under the zlib/libpng license, see License.txt for details.
#pragma once
/** /#define BUILD_DBGRELEASE // Include simple debug output in release version */
/** /#define BUILD_DBGSELECTELVMODE //Test MyRunAs*/
/** /#define UNICODE // Unicode build */
/**/#define FEAT_CUSTOMRUNASDLG // Include custom runas dialog */
/**/#define FEAT_CUSTOMRUNASDLG_TRANSLATE //*/
/**/#define FEAT_MSRUNASDLGMODHACK // Default to other user radio button */
#if !defined(APSTUDIO_INVOKED) && !defined(RC_INVOKED)
#if (defined(_MSC_VER) && !defined(_DEBUG))
#pragma comment(linker,"/opt:nowin98")
#pragma comment(linker,"/ignore:4078")
#pragma comment(linker,"/merge:.rdata=.text")
//#pragma intrinsic(memset) //http://www.codeguru.com/forum/showthread.php?t=371491&page=2&pp=15 | http://www.ddj.com/windows/184416623
#endif
#if defined(UNICODE) && !defined(_UNICODE)
#define _UNICODE
#endif
#ifdef _UNICODE
#define TFUNCSUFFIX W
#else
#define TFUNCSUFFIX A
#endif
#define _PCJOIN(a,b) a##b
#define PCJOIN(a,b) _PCJOIN(a,b)
#define _WIN32_WINNT 0x0501
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <ShellAPI.h>
#include <TChar.h>
#include "NSISUtil.h"
#ifndef SEE_MASK_NOZONECHECKS
#define SEE_MASK_NOZONECHECKS 0x00800000
#endif
#define COUNTOF(___c) ( sizeof(___c)/sizeof(___c[0]) )
#ifndef ARRAYSIZE
#define ARRAYSIZE COUNTOF
#endif
#define FORCEINLINE __forceinline
#if _MSC_VER >= 1400
extern void* __cdecl memset(void*mem,int c,size_t len);
#endif
FORCEINLINE LRESULT MySndDlgItemMsg(HWND hDlg,int id,UINT Msg,WPARAM wp=0,LPARAM lp=0) {return SendMessage(GetDlgItem(hDlg,id),Msg,wp,lp);}
#ifndef UAC_NOCUSTOMIMPLEMENTATIONS
FORCEINLINE HANDLE WINAPI GetCurrentProcess(){return ((HANDLE)(-1));}
FORCEINLINE HANDLE WINAPI GetCurrentThread(){return ((HANDLE)(-2));}
#define MyTStrLen lstrlen
#undef lstrcpy
#define lstrcpy MyTStrCpy
FORCEINLINE LPTSTR MyTStrCpy(LPTSTR s1,LPCTSTR s2) {return PCJOIN(lstr,PCJOIN(cpyn,TFUNCSUFFIX))(s1,s2,0x7FFFFFFF);}
#undef lstrcat
#define lstrcat MyTStrCat
LPTSTR MyTStrCat(LPTSTR s1,LPCTSTR s2)
#ifdef UAC_INITIMPORTS
{return s1?MyTStrCpy(&s1[MyTStrLen(s1)],s2):NULL;}
#else
;
#endif //UAC_INITIMPORTS
#endif //UAC_NOCUSTOMIMPLEMENTATIONS
//DelayLoaded functions:
typedef BOOL (WINAPI*ALLOWSETFOREGROUNDWINDOW)(DWORD dwProcessId);
typedef BOOL (WINAPI*OPENPROCESSTOKEN)(HANDLE ProcessHandle,DWORD DesiredAccess,PHANDLE TokenHandle);
typedef BOOL (WINAPI*OPENTHREADTOKEN)(HANDLE ThreadHandle,DWORD DesiredAccess,BOOL OpenAsSelf,PHANDLE TokenHandle);
typedef BOOL (WINAPI*GETTOKENINFORMATION)(HANDLE hToken,TOKEN_INFORMATION_CLASS TokInfoClass,LPVOID TokInfo,DWORD TokInfoLenh,PDWORD RetLen);
typedef BOOL (WINAPI*ALLOCATEANDINITIALIZESID)(PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,BYTE nSubAuthorityCount,DWORD sa0,DWORD sa1,DWORD sa2,DWORD sa3,DWORD sa4,DWORD sa5,DWORD sa6,DWORD sa7,PSID*pSid);
typedef PVOID (WINAPI*FREESID)(PSID pSid);
typedef BOOL (WINAPI*EQUALSID)(PSID pSid1,PSID pSid2);
typedef BOOL (WINAPI*CHECKTOKENMEMBERSHIP)(HANDLE TokenHandle,PSID SidToCheck,PBOOL IsMember);
#ifdef FEAT_CUSTOMRUNASDLG
typedef BOOL (WINAPI*GETUSERNAME)(LPTSTR lpBuffer,LPDWORD nSize);
typedef BOOL (WINAPI*CREATEPROCESSWITHLOGONW)(LPCWSTR lpUsername,LPCWSTR lpDomain,LPCWSTR lpPassword,DWORD dwLogonFlags,LPCWSTR lpApplicationName,LPWSTR lpCommandLine,DWORD dwCreationFlags,LPVOID pEnv,LPCWSTR WorkDir,LPSTARTUPINFOW pSI,LPPROCESS_INFORMATION pPI);
#define SECURITY_WIN32
#include <Security.h>//NameSamCompatible
typedef BOOLEAN (WINAPI*GETUSERNAMEEX)(EXTENDED_NAME_FORMAT NameFormat,LPTSTR lpNameBuffer,PULONG nSize);
#endif
#ifdef UAC_INITIMPORTS
ALLOWSETFOREGROUNDWINDOW _AllowSetForegroundWindow=0;
OPENPROCESSTOKEN _OpenProcessToken=0;
OPENTHREADTOKEN _OpenThreadToken=0;
GETTOKENINFORMATION _GetTokenInformation=0;
ALLOCATEANDINITIALIZESID _AllocateAndInitializeSid=0;
FREESID _FreeSid=0;
EQUALSID _EqualSid=0;
CHECKTOKENMEMBERSHIP _CheckTokenMembership=0;
#ifdef FEAT_CUSTOMRUNASDLG
GETUSERNAME _GetUserName=0;
GETUSERNAMEEX _GetUserNameEx=0;
CREATEPROCESSWITHLOGONW _CreateProcessWithLogonW=0;
#endif
#else
#ifdef FEAT_CUSTOMRUNASDLG
extern GETUSERNAME _GetUserName;
extern GETUSERNAMEEX _GetUserNameEx;
extern CREATEPROCESSWITHLOGONW _CreateProcessWithLogonW;
#endif
#endif /* UAC_INITIMPORTS */
extern DWORD DelayLoadDlls();
#ifdef FEAT_CUSTOMRUNASDLG
extern DWORD MyRunAs(HINSTANCE hInstDll,SHELLEXECUTEINFO&sei);
#endif
#if !defined(NTDDI_VISTA) || defined(BUILD_OLDSDK)
//#if !defined(NTDDI_VERSION) || (NTDDI_VERSION < 0x06000000) || !defined(NTDDI_VISTA)
//#if !defined(TOKEN_ELEVATION_TYPE) || defined(BUILD_OLDSDK)
enum TOKEN_ELEVATION_TYPE {
TokenElevationTypeDefault = 1,
TokenElevationTypeFull,
TokenElevationTypeLimited
};
enum _TOKEN_INFORMATION_CLASS___VISTA {
TokenElevationType = (TokenOrigin+1),
TokenLinkedToken,
TokenElevation,
TokenHasRestrictions,
TokenAccessInformation,
TokenVirtualizationAllowed,
TokenVirtualizationEnabled,
TokenIntegrityLevel,
TokenUIAccess,
TokenMandatoryPolicy,
TokenLogonSid,
};
#endif
#if defined(_DEBUG) || defined(BUILD_DBGRELEASE)
//Simple debug helpers:
#define BUILD_DBG
/** /#define BUILD_XPTEST //Pretend UAC exists and "elevate" with NT runas */
#define DBG_RESETDBGVIEW() do{HWND hDbgView=FindWindowA("dbgviewClass",0);PostMessage(hDbgView,WM_COMMAND,40020,0);if(0)SetForegroundWindow(hDbgView);}while(0)
#define _pp_MakeStr_(x) #x
#define pp_MakeStr(x) _pp_MakeStr_(x)
#define TRACE OutputDebugStringA
#define DBGONLY(_x) _x
#ifndef ASSERT
#define ASSERT(_x) do{if(!(_x)){MessageBoxA(GetActiveWindow(),#_x##"\n\n"##__FILE__##":"## pp_MakeStr(__LINE__),"SimpleAssert",0);/*TRACE(#_x##"\n"##__FILE__##":" pp_MakeStr(__LINE__)"\n");*/}}while(0)
#endif
#define VERIFY(_x) ASSERT(_x)
static void TRACEF(const char*fmt,...) {va_list a;va_start(a,fmt);static TCHAR b[1024*4];if (sizeof(TCHAR)!=sizeof(char)){static TCHAR fmtBuf[COUNTOF(b)];VERIFY(wsprintf(fmtBuf,_T("%hs"),fmt)<COUNTOF(fmtBuf));fmt=(LPCSTR)fmtBuf;}wvsprintf(b,(TCHAR*)fmt,a);OutputDebugString(b);}
#else
#define TRACE /*(void)0*/
#define DBGONLY(_x)
#define ASSERT(_x)
#define VERIFY(_x) ((void)(_x))
#define TRACEF TRACE
#endif /* DEBUG */
#endif /* APSTUDIO_INVOKED */

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

BIN
admin/win/nsi/welcome.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 151 KiB

View File

@@ -0,0 +1,114 @@
SET(WINDRES_EXECUTABLE ${CMAKE_RC_COMPILER})
# This macro is taken from kdelibs/cmake/modules/KDE4Macros.cmake.
#
# Copyright (c) 2006-2009 Alexander Neundorf, <neundorf@kde.org>
# Copyright (c) 2006, 2007, Laurent Montel, <montel@kde.org>
# Copyright (c) 2007 Matthias Kretz <kretz@kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file [in KDE repositories].
# adds application icon to target source list
# for detailed documentation see the top of FindKDE4Internal.cmake
macro (KDE4_ADD_APP_ICON appsources pattern)
set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${appsources})
if (WIN32)
if(NOT WINCE)
find_program(PNG2ICO_EXECUTABLE NAMES png2ico)
else(NOT WINCE)
find_program(PNG2ICO_EXECUTABLE NAMES png2ico PATHS ${HOST_BINDIR} NO_DEFAULT_PATH )
endif(NOT WINCE)
find_program(WINDRES_EXECUTABLE NAMES windres)
if(MSVC)
set(WINDRES_EXECUTABLE TRUE)
endif(MSVC)
if (PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
string(REPLACE "*" "([0123456789]*)" pattern_rx "${pattern}")
file(GLOB files "${pattern}")
foreach (it ${files})
string(REGEX REPLACE "${pattern_rx}" "\\1" fn "${it}")
if (fn MATCHES ".*16.*" )
list (APPEND _icons ${it})
endif (fn MATCHES ".*16.*")
if (fn MATCHES ".*32.*" )
list (APPEND _icons ${it})
endif (fn MATCHES ".*32.*")
if (fn MATCHES ".*48.*" )
list (APPEND _icons ${it})
endif (fn MATCHES ".*48.*")
if (fn MATCHES ".*64.*" )
list (APPEND _icons ${it})
endif (fn MATCHES ".*64.*")
if (fn MATCHES ".*128.*" )
list (APPEND _icons ${it})
endif (fn MATCHES ".*128.*")
endforeach (it)
if (_icons)
add_custom_command(OUTPUT ${_outfilename}.ico ${_outfilename}.rc
COMMAND ${PNG2ICO_EXECUTABLE} ARGS --rcfile ${_outfilename}.rc ${_outfilename}.ico ${_icons}
DEPENDS ${PNG2ICO_EXECUTABLE} ${_icons}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
if (MINGW)
add_custom_command(OUTPUT ${_outfilename}_res.o
COMMAND ${WINDRES_EXECUTABLE} ARGS -i ${_outfilename}.rc -o ${_outfilename}_res.o --include-dir=${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${WINDRES_EXECUTABLE} ${_outfilename}.rc
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
list(APPEND ${appsources} ${_outfilename}_res.o)
else(MINGW)
list(APPEND ${appsources} ${_outfilename}.rc)
endif(MINGW)
else(_icons)
message(STATUS "Unable to find a related icon that matches pattern ${pattern} for variable ${appsources} - application will not have an application icon!")
endif(_icons)
else(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
message(FATAL_ERROR "Unable to find the png2ico or windres utilities - application will not have an application icon!")
endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
endif(WIN32)
if (Q_WS_MAC)
# first convert image to a tiff using the Mac OS X "sips" utility,
# then use tiff2icns to convert to an icon
find_program(SIPS_EXECUTABLE NAMES sips)
find_program(TIFF2ICNS_EXECUTABLE NAMES tiff2icns)
if (SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
file(GLOB_RECURSE files "${pattern}")
# we can only test for the 128-icon like that - we don't use patterns anymore
foreach (it ${files})
if (it MATCHES ".*128.*" )
set (_icon ${it})
endif (it MATCHES ".*128.*")
endforeach (it)
if (_icon)
# first, get the basename of our app icon
add_custom_command(OUTPUT ${_outfilename}.icns ${outfilename}.tiff
COMMAND ${SIPS_EXECUTABLE} -s format tiff ${_icon} --out ${outfilename}.tiff
COMMAND ${TIFF2ICNS_EXECUTABLE} ${outfilename}.tiff ${_outfilename}.icns
DEPENDS ${_icon}
)
# This will register the icon into the bundle
set(MACOSX_BUNDLE_ICON_FILE ${appsources}.icns)
# Append the icns file to the sources list so it will be a dependency to the
# main target
list(APPEND ${appsources} ${_outfilename}.icns)
# Install the icon into the Resources dir in the bundle
set_source_files_properties(${_outfilename}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
else(_icon)
# TODO - try to scale a non-128 icon...? Try to convert an SVG on the fly?
message(STATUS "Unable to find an 128x128 icon that matches pattern ${pattern} for variable ${appsources} - application will not have an application icon!")
endif(_icon)
else(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!")
endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
endif(Q_WS_MAC)
endmacro (KDE4_ADD_APP_ICON)

View File

@@ -1,16 +1,28 @@
FIND_LIBRARY(CSYNC_LIBRARY NAMES csync)
FIND_PATH(CSYNC_INCLUDE_PATH csync.h
HINTS "/usr/include/csync")
IF( DEFINED CSYNC_BUILD_PATH )
SET(CSYNC_LIBRARY_PATH ${CSYNC_BUILD_PATH})
SET(CSYNC_BINARY_DIR ${CSYNC_BUILD_PATH})
IF(WIN32)
SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.dll)
ELSEIF( APPLE )
SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.dylib)
ELSE()
SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.so)
ENDIF()
ELSE()
FIND_LIBRARY(CSYNC_LIBRARY NAMES ocsync HINTS $ENV{CSYNC_DIR})
ENDIF()
IF(NOT DEFINED CSYNC_INCLUDE_PATH)
FIND_PATH(CSYNC_INCLUDE_PATH NAMES csync.h HINTS $ENV{CSYNC_DIR} )
ENDIF()
SET(CSYNC_INCLUDE_DIR ${CSYNC_INCLUDE_PATH})
# handle the QUIETLY and REQUIRED arguments and set CSYNC_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Csync DEFAULT_MSG
CSYNC_LIBRARY CSYNC_INCLUDE_PATH)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Csync DEFAULT_MSG CSYNC_LIBRARY CSYNC_INCLUDE_PATH)
MARK_AS_ADVANCED(
CSYNC_INCLUDE_PATH
CSYNC_LIBRARY)
MARK_AS_ADVANCED( CSYNC_INCLUDE_PATH CSYNC_LIBRARY )

View File

@@ -0,0 +1,19 @@
# This module defines
# INOTIFY_INCLUDE_DIR, where to find inotify.h, etc.
# INOTIFY_FOUND, If false, do not try to use inotify.
# also defined, but not for general use are
# INOTIFY_LIBRARY, where to find the inotify library.
find_path(INOTIFY_INCLUDE_DIR sys/inotify.h
HINTS /usr/include/${CMAKE_LIBRARY_ARCHITECTURE})
mark_as_advanced(INOTIFY_INCLUDE_DIR)
# all listed variables are TRUE
# handle the QUIETLY and REQUIRED arguments and set INOTIFY_FOUND to TRUE if
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(INOTIFY DEFAULT_MSG INOTIFY_INCLUDE_DIR)
IF(INOTIFY_FOUND)
SET(INotify_INCLUDE_DIRS ${INOTIFY_INCLUDE_DIR})
ENDIF(INOTIFY_FOUND)

View File

@@ -0,0 +1,16 @@
find_program(PDFLATEX_EXECUTABLE NAMES pdflatex
HINTS
$ENV{PDFLATEX_DIR}
PATH_SUFFIXES bin
DOC "PDF LaTeX"
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(PdfLatex DEFAULT_MSG
PDFLATEX_EXECUTABLE
)
mark_as_advanced(
PDFLATEX_EXECUTABLE
)

View File

@@ -0,0 +1,18 @@
# - Try to find QtKeyChain
# Once done this will define
# QTKEYCHAIN_FOUND - System has QtKeyChain
# QTKEYCHAIN_INCLUDE_DIRS - The QtKeyChain include directories
# QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeyChain
# QTKEYCHAIN_DEFINITIONS - Compiler switches required for using LibXml2
find_path(QTKEYCHAIN_INCLUDE_DIR qtkeychain/keychain.h)
find_library(QTKEYCHAIN_LIBRARY NAMES libqtkeychain qtkeychain)
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set QTKEYCHAIN_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(QtKeyChain DEFAULT_MSG
QTKEYCHAIN_LIBRARY QTKEYCHAIN_INCLUDE_DIR)
mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY )

View File

@@ -0,0 +1,16 @@
find_program(SPHINX_EXECUTABLE NAMES sphinx-build
HINTS
$ENV{SPHINX_DIR}
PATH_SUFFIXES bin
DOC "Sphinx documentation generator"
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Sphinx DEFAULT_MSG
SPHINX_EXECUTABLE
)
mark_as_advanced(
SPHINX_EXECUTABLE
)

View File

@@ -0,0 +1,182 @@
# - Define GNU standard installation directories
# Provides install directory variables as defined for GNU software:
# http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
# Inclusion of this module defines the following variables:
# CMAKE_INSTALL_<dir> - destination for files of a given type
# CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
# where <dir> is one of:
# BINDIR - user executables (bin)
# SBINDIR - system admin executables (sbin)
# LIBEXECDIR - program executables (libexec)
# SYSCONFDIR - read-only single-machine data (etc)
# SHAREDSTATEDIR - modifiable architecture-independent data (com)
# LOCALSTATEDIR - modifiable single-machine data (var)
# LIBDIR - object code libraries (lib or lib64)
# INCLUDEDIR - C header files (include)
# OLDINCLUDEDIR - C header files for non-gcc (/usr/include)
# DATAROOTDIR - read-only architecture-independent data root (share)
# DATADIR - read-only architecture-independent data (DATAROOTDIR)
# INFODIR - info documentation (DATAROOTDIR/info)
# LOCALEDIR - locale-dependent data (DATAROOTDIR/locale)
# MANDIR - man documentation (DATAROOTDIR/man)
# DOCDIR - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
# install() commands for the corresponding file type. If the includer does
# not define a value the above-shown default will be used and the value will
# appear in the cache for editing by the user.
# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
# from the corresponding destination by prepending (if necessary) the value
# of CMAKE_INSTALL_PREFIX.
#=============================================================================
# Copyright 2011 Nikita Krupen'ko <krnekit@gmail.com>
# Copyright 2011 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
# Installation directories
#
if(NOT DEFINED CMAKE_INSTALL_BINDIR)
set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
endif()
if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
endif()
if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
endif()
if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
endif()
if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
endif()
if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
endif()
if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
set(_LIBDIR_DEFAULT "lib")
# Override this default 'lib' with 'lib64' iff:
# - we are on Linux system but NOT cross-compiling
# - we are NOT on debian
# - we are on a 64 bits system
# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
# Note that the future of multi-arch handling may be even
# more complicated than that: http://wiki.debian.org/Multiarch
if(CMAKE_SYSTEM_NAME MATCHES "Linux"
AND NOT CMAKE_CROSSCOMPILING
AND NOT EXISTS "/etc/debian_version")
if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
message(AUTHOR_WARNING
"Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
"Please enable at least one language before including GNUInstallDirs.")
else()
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
set(_LIBDIR_DEFAULT "lib64")
endif()
endif()
endif()
set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
endif()
if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
endif()
if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
endif()
if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
endif()
#-----------------------------------------------------------------------------
# Values whose defaults are relative to DATAROOTDIR. Store empty values in
# the cache and store the defaults in local variables if the cache values are
# not set explicitly. This auto-updates the defaults as DATAROOTDIR changes.
if(NOT CMAKE_INSTALL_DATADIR)
set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
endif()
if(NOT CMAKE_INSTALL_INFODIR)
set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
endif()
if(NOT CMAKE_INSTALL_LOCALEDIR)
set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
endif()
if(NOT CMAKE_INSTALL_MANDIR)
set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
endif()
if(NOT CMAKE_INSTALL_DOCDIR)
set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
endif()
#-----------------------------------------------------------------------------
mark_as_advanced(
CMAKE_INSTALL_BINDIR
CMAKE_INSTALL_SBINDIR
CMAKE_INSTALL_LIBEXECDIR
CMAKE_INSTALL_SYSCONFDIR
CMAKE_INSTALL_SHAREDSTATEDIR
CMAKE_INSTALL_LOCALSTATEDIR
CMAKE_INSTALL_LIBDIR
CMAKE_INSTALL_INCLUDEDIR
CMAKE_INSTALL_OLDINCLUDEDIR
CMAKE_INSTALL_DATAROOTDIR
CMAKE_INSTALL_DATADIR
CMAKE_INSTALL_INFODIR
CMAKE_INSTALL_LOCALEDIR
CMAKE_INSTALL_MANDIR
CMAKE_INSTALL_DOCDIR
)
# Result directories
#
foreach(dir
BINDIR
SBINDIR
LIBEXECDIR
SYSCONFDIR
SHAREDSTATEDIR
LOCALSTATEDIR
LIBDIR
INCLUDEDIR
OLDINCLUDEDIR
DATAROOTDIR
DATADIR
INFODIR
LOCALEDIR
MANDIR
DOCDIR
)
if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
else()
set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
endif()
endforeach()

View File

@@ -0,0 +1,123 @@
# - Returns a version string from Git
#
# These functions force a re-configure on each git commit so that you can
# trust the values of the variables in your build system.
#
# get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
#
# Returns the refspec and sha hash of the current head revision
#
# git_describe(<var> [<additional arguments to git describe> ...])
#
# Returns the results of git describe on the source tree, and adjusting
# the output so that it tests false if an error occurs.
#
# git_get_exact_tag(<var> [<additional arguments to git describe> ...])
#
# Returns the results of git describe --exact-match on the source tree,
# and adjusting the output so that it tests false if there was no exact
# matching tag.
#
# Requires CMake 2.6 or newer (uses the 'function' command)
#
# Original Author:
# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
# http://academic.cleardefinition.com
# Iowa State University HCI Graduate Program/VRAC
#
# Copyright Iowa State University 2009-2010.
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
if(__get_git_revision_description)
return()
endif()
set(__get_git_revision_description YES)
# We must run the following at "include" time, not at function call time,
# to find the path to this module rather than the path to a calling list file
get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
function(get_git_head_revision _refspecvar _hashvar)
set(GIT_PARENT_DIR "${CMAKE_SOURCE_DIR}")
set(GIT_DIR "${GIT_PARENT_DIR}/.git")
while(NOT EXISTS "${GIT_DIR}") # .git dir not found, search parent directories
set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
# We have reached the root directory, we are not in git
set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
return()
endif()
set(GIT_DIR "${GIT_PARENT_DIR}/.git")
endwhile()
set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
if(NOT EXISTS "${GIT_DATA}")
file(MAKE_DIRECTORY "${GIT_DATA}")
endif()
if(NOT EXISTS "${GIT_DIR}/HEAD")
return()
endif()
set(HEAD_FILE "${GIT_DATA}/HEAD")
configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
"${GIT_DATA}/grabRef.cmake"
@ONLY)
include("${GIT_DATA}/grabRef.cmake")
set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
endfunction()
function(git_describe _var)
if(NOT GIT_FOUND)
find_package(Git QUIET)
endif()
get_git_head_revision(refspec hash)
if(NOT GIT_FOUND)
set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
return()
endif()
if(NOT hash)
set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
return()
endif()
# TODO sanitize
#if((${ARGN}" MATCHES "&&") OR
# (ARGN MATCHES "||") OR
# (ARGN MATCHES "\\;"))
# message("Please report the following error to the project!")
# message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
#endif()
#message(STATUS "Arguments to execute_process: ${ARGN}")
execute_process(COMMAND
"${GIT_EXECUTABLE}"
describe
${hash}
${ARGN}
WORKING_DIRECTORY
"${CMAKE_SOURCE_DIR}"
RESULT_VARIABLE
res
OUTPUT_VARIABLE
out
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT res EQUAL 0)
set(out "${out}-${res}-NOTFOUND")
endif()
set(${_var} "${out}" PARENT_SCOPE)
endfunction()
function(git_get_exact_tag _var)
git_describe(out --exact-match ${ARGN})
set(${_var} "${out}" PARENT_SCOPE)
endfunction()

View File

@@ -0,0 +1,38 @@
#
# Internal file for GetGitRevisionDescription.cmake
#
# Requires CMake 2.6 or newer (uses the 'function' command)
#
# Original Author:
# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
# http://academic.cleardefinition.com
# Iowa State University HCI Graduate Program/VRAC
#
# Copyright Iowa State University 2009-2010.
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
set(HEAD_HASH)
file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
if(HEAD_CONTENTS MATCHES "ref")
# named branch
string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
if(EXISTS "@GIT_DIR@/${HEAD_REF}")
configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}")
configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
set(HEAD_HASH "${HEAD_REF}")
endif()
else()
# detached HEAD
configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
endif()
if(NOT HEAD_HASH)
file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
string(STRIP "${HEAD_HASH}" HEAD_HASH)
endif()

View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>LSUIElement</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>@APPLICATION_EXECUTABLE@</string>
<key>CFBundleIconFile</key>
<string>ownCloud.icns</string>
<key>CFBundleIdentifier</key>
<string>@APPLICATION_REV_DOMAIN@</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>@APPLICATION_NAME@ @VERSION@</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>@VERSION@</string>
<key>CFBundleShortVersionString</key>
<string>@VERSION@</string>
<key>NSHumanReadableCopyright</key>
<string>(C) 2012 @APPLICATION_VENDOR@</string>
</dict>
</plist>

View File

@@ -0,0 +1,24 @@
[Settings]
NumFields=3
[Field 1]
Type=Label
Left=0
Right=-1
Top=0
Bottom=24
[Field 2]
Type=RadioButton
Left=30
Right=-1
Top=50
Bottom=58
State=1
[Field 3]
Type=RadioButton
Left=30
Right=-1
Top=70
Bottom=78

View File

@@ -0,0 +1,726 @@
;ownCloud installer script.
!define APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@"
!define APPLICATION_NAME "@APPLICATION_NAME@"
!define APPLICATION_VENDOR "@APPLICATION_VENDOR@"
!define APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@.exe"
!define APPLICATION_DOMAIN "@APPLICATION_DOMAIN@"
!define APPLICATION_LICENSE "@APPLICATION_LICENSE@"
!define WIN_SETUP_BITMAP_PATH "@WIN_SETUP_BITMAP_PATH@"
;-----------------------------------------------------------------------------
; Some installer script options (comment-out options not required)
;-----------------------------------------------------------------------------
!if "@APPLICATION_LICENSE@" != ""
!define OPTION_LICENSE_AGREEMENT
!endif
!define OPTION_UAC_PLUGIN_ENHANCED
!define OPTION_SECTION_SC_START_MENU
!define OPTION_SECTION_SC_DESKTOP
!define OPTION_SECTION_SC_QUICK_LAUNCH
!define OPTION_SECTION_SC_AUTOSTART
!define OPTION_FINISHPAGE
!define OPTION_FINISHPAGE_LAUNCHER
; !define OPTION_FINISHPAGE_RELEASE_NOTES
;-----------------------------------------------------------------------------
; Some paths.
;-----------------------------------------------------------------------------
!ifndef MING_PATH
!define MING_PATH "/usr/i686-w64-mingw32/sys-root/mingw"
!endif
!define MING_BIN "${MING_PATH}/bin"
!define MING_LIB "${MING_PATH}/lib"
!define MING_SHARE "${MING_PATH}/share"
!define BUILD_PATH "@CMAKE_BINARY_DIR@"
!define SOURCE_PATH "@CMAKE_SOURCE_DIR@"
!define QT_DLL_PATH "${MING_BIN}"
!define ACCESSIBLE_DLL_PATH "${MING_LIB}/qt4/plugins/accessible"
!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
!define CSYNC_LIBRARY_DIR "@CSYNC_LIBRARY_DIR@"
!define CSYNC_PLUGIN_DIR "@CSYNC_PLUGIN_DIR@"
!define CSYNC_CONFIG_DIR "@CSYNC_CONFIG_DIR@"
!define NSI_PATH "${source_path}/admin/win/nsi"
;-----------------------------------------------------------------------------
; Installer version
;-----------------------------------------------------------------------------
!define VER_MAJOR "@CPACK_PACKAGE_VERSION_MAJOR@"
!define VER_MINOR "@CPACK_PACKAGE_VERSION_MINOR@"
!define VER_BUILD "@CPACK_PACKAGE_VERSION_PATCH@"
!define VERSION "@CPACK_PACKAGE_VERSION@"
;-----------------------------------------------------------------------------
; Installer build timestamp.
;-----------------------------------------------------------------------------
!define /date BUILD_TIME "built on %Y/%m/%d at %I:%M %p"
;-----------------------------------------------------------------------------
; Initial installer setup and definitions.
;-----------------------------------------------------------------------------
Name "@CPACK_NSIS_PACKAGE_NAME@"
BrandingText "${APPLICATION_NAME} ${VERSION} -- ${BUILD_TIME}"
OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
InstallDirRegKey HKCU "Software\${APPLICATION_NAME}" ""
InstType Standard
InstType Full
InstType Minimal
CRCCheck On
SetCompressor @CPACK_NSIS_COMPRESSOR@
RequestExecutionLevel user ;Now using the UAC plugin.
ReserveFile NSIS.InstallOptions.ini
ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
@CPACK_NSIS_SECTION_SELECTED_VARS@
;-----------------------------------------------------------------------------
; Include some required header files.
;-----------------------------------------------------------------------------
!include LogicLib.nsh ;Used by APPDATA uninstaller.
!include nsDialogs.nsh ;Used by APPDATA uninstaller.
!include MUI2.nsh ;Used by APPDATA uninstaller.
!include InstallOptions.nsh ;Required by MUI2 to support old MUI_INSTALLOPTIONS.
!include Memento.nsh ;Remember user selections.
!include WinVer.nsh ;Windows version detection.
!include WordFunc.nsh ;Used by VersionCompare macro function.
!include UAC.nsh ;Used by the UAC elevation to install as user or admin.
;-----------------------------------------------------------------------------
; Memento selections stored in registry.
;-----------------------------------------------------------------------------
!define MEMENTO_REGISTRY_ROOT HKLM
!define MEMENTO_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}"
;-----------------------------------------------------------------------------
; Modern User Interface (MUI) defintions and setup.
;-----------------------------------------------------------------------------
!define MUI_ABORTWARNING
!define MUI_ICON ${NSI_PATH}\installer.ico
!define MUI_UNICON ${NSI_PATH}\installer.ico
!define MUI_WELCOMEFINISHPAGE_BITMAP ${WIN_SETUP_BITMAP_PATH}/welcome.bmp
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP ${WIN_SETUP_BITMAP_PATH}/page_header.bmp
!define MUI_COMPONENTSPAGE_SMALLDESC
!define MUI_FINISHPAGE_LINK "www.${APPLICATION_DOMAIN}"
!define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}"
!define MUI_FINISHPAGE_NOREBOOTSUPPORT
!ifdef OPTION_FINISHPAGE_RELEASE_NOTES
!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NOTES.txt"
!define MUI_FINISHPAGE_SHOWREADME_TEXT "Show release notes"
!endif
!ifdef OPTION_FINISHPAGE_LAUNCHER
!define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchApplication"
!endif
;-----------------------------------------------------------------------------
; Page macros.
;-----------------------------------------------------------------------------
!insertmacro MUI_PAGE_WELCOME
!ifdef OPTION_LICENSE_AGREEMENT
!insertmacro MUI_PAGE_LICENSE "${APPLICATION_LICENSE}"
!endif
Page custom PageReinstall PageLeaveReinstall
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
!ifdef OPTION_FINISHPAGE
!insertmacro MUI_PAGE_FINISH
!endif
!insertmacro MUI_UNPAGE_CONFIRM
UninstPage custom un.UnPageUserAppData un.UnPageUserAppDataLeave
!insertmacro MUI_UNPAGE_INSTFILES
;-----------------------------------------------------------------------------
; Other MUI macros.
;-----------------------------------------------------------------------------
!insertmacro MUI_LANGUAGE "English"
##############################################################################
# #
# FINISH PAGE LAUNCHER FUNCTIONS #
# #
##############################################################################
Function LaunchApplication
${UAC.CallFunctionAsUser} LaunchApplicationAsUser
FunctionEnd
Function LaunchApplicationAsUser
Exec "$INSTDIR\${APPLICATION_EXECUTABLE}"
FunctionEnd
##############################################################################
# #
# PROCESS HANDLING FUNCTIONS AND MACROS #
# #
##############################################################################
!macro CheckForProcess processName gotoWhenFound gotoWhenNotFound
Processes::FindProcess ${processName}
StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound}
!macroend
!macro ConfirmEndProcess processName
MessageBox MB_YESNO|MB_ICONEXCLAMATION \
"Found ${processName} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?" \
IDYES process_${processName}_kill IDNO process_${processName}_ended
process_${processName}_kill:
DetailPrint "Killing ${processName} processes."
Processes::KillProcess ${processName}
Sleep 1500
StrCmp $R0 "1" process_${processName}_ended
DetailPrint "Process to kill not found!"
process_${processName}_ended:
!macroend
!macro CheckAndConfirmEndProcess processName
!insertmacro CheckForProcess ${processName} 0 no_process_${processName}_to_end
!insertmacro ConfirmEndProcess ${processName}
no_process_${processName}_to_end:
!macroend
Function EnsureOwncloudShutdown
!insertmacro CheckAndConfirmEndProcess "${APPLICATION_EXECUTABLE}"
FunctionEnd
##############################################################################
# #
# RE-INSTALLER FUNCTIONS #
# #
##############################################################################
Function PageReinstall
ReadRegStr $R0 HKLM "Software\${APPLICATION_NAME}" ""
StrCmp $R0 "" 0 +2
Abort
;Detect version
ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionMajor"
IntCmp $R0 ${VER_MAJOR} minor_check new_version older_version
minor_check:
ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionMinor"
IntCmp $R0 ${VER_MINOR} build_check new_version older_version
build_check:
ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionBuild"
IntCmp $R0 ${VER_BUILD} same_version new_version older_version
new_version:
!insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "An older version of ${APPLICATION_NAME} is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
!insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
!insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
!insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install ${APPLICATION_NAME}."
StrCpy $R0 "1"
Goto reinst_start
older_version:
!insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
!insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
!insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
!insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install ${APPLICATION_NAME}."
StrCpy $R0 "1"
Goto reinst_start
same_version:
!insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
!insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Add/Reinstall components"
!insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Uninstall ${APPLICATION_NAME}"
!insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."
StrCpy $R0 "2"
reinst_start:
!insertmacro INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
FunctionEnd
Function PageLeaveReinstall
!insertmacro INSTALLOPTIONS_READ $R1 "NSIS.InstallOptions.ini" "Field 2" "State"
StrCmp $R0 "1" 0 +2
StrCmp $R1 "1" reinst_uninstall reinst_done
StrCmp $R0 "2" 0 +3
StrCmp $R1 "1" reinst_done reinst_uninstall
reinst_uninstall:
ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "UninstallString"
HideWindow
ClearErrors
ExecWait '$R1 _?=$INSTDIR'
IfErrors no_remove_uninstaller
IfFileExists "$INSTDIR\${APPLICATION_EXECUTABLE}" no_remove_uninstaller
Delete $R1
RMDir $INSTDIR
no_remove_uninstaller:
StrCmp $R0 "2" 0 +3
UAC::Unload
Quit
BringToFront
reinst_done:
FunctionEnd
##############################################################################
# #
# INSTALLER SECTIONS #
# #
##############################################################################
Section "${APPLICATION_NAME}" SEC_OWNCLOUD
SectionIn 1 2 3 RO
SetDetailsPrint listonly
SetDetailsPrint textonly
DetailPrint "Installing ${APPLICATION_NAME} essentials."
SetDetailsPrint listonly
SetOutPath "$INSTDIR"
!ifdef INSTALL_PATH
;Main executable.
File "${INSTALL_PATH}\bin\${APPLICATION_EXECUTABLE}"
!endif
!ifndef INSTALL_PATH
;Main executable.
File "${BUILD_PATH}\bin\${APPLICATION_EXECUTABLE}"
File "${BUILD_PATH}\src\libowncloudsync.dll"
File "${BUILD_PATH}\src\mirall_ca.qm"
File "${BUILD_PATH}\src\mirall_cs_CZ.qm"
File "${BUILD_PATH}\src\mirall_da.qm"
File "${BUILD_PATH}\src\mirall_de.qm"
File "${BUILD_PATH}\src\mirall_el.qm"
File "${BUILD_PATH}\src\mirall_en.qm"
File "${BUILD_PATH}\src\mirall_eo.qm"
File "${BUILD_PATH}\src\mirall_es.qm"
File "${BUILD_PATH}\src\mirall_es_AR.qm"
File "${BUILD_PATH}\src\mirall_et_EE.qm"
File "${BUILD_PATH}\src\mirall_eu.qm"
File "${BUILD_PATH}\src\mirall_fa.qm"
File "${BUILD_PATH}\src\mirall_fi_FI.qm"
File "${BUILD_PATH}\src\mirall_fr.qm"
File "${BUILD_PATH}\src\mirall_gl.qm"
File "${BUILD_PATH}\src\mirall_he.qm"
File "${BUILD_PATH}\src\mirall_hr.qm"
File "${BUILD_PATH}\src\mirall_hu_HU.qm"
File "${BUILD_PATH}\src\mirall_it.qm"
File "${BUILD_PATH}\src\mirall_ja_JP.qm"
File "${BUILD_PATH}\src\mirall_ko.qm"
File "${BUILD_PATH}\src\mirall_lb.qm"
File "${BUILD_PATH}\src\mirall_lt_LT.qm"
File "${BUILD_PATH}\src\mirall_lv.qm"
File "${BUILD_PATH}\src\mirall_mk.qm"
File "${BUILD_PATH}\src\mirall_ms_MY.qm"
File "${BUILD_PATH}\src\mirall_nb_NO.qm"
File "${BUILD_PATH}\src\mirall_nl.qm"
File "${BUILD_PATH}\src\mirall_oc.qm"
File "${BUILD_PATH}\src\mirall_pl.qm"
File "${BUILD_PATH}\src\mirall_pt_BR.qm"
File "${BUILD_PATH}\src\mirall_pt_PT.qm"
File "${BUILD_PATH}\src\mirall_ro.qm"
File "${BUILD_PATH}\src\mirall_ru.qm"
File "${BUILD_PATH}\src\mirall_ru_RU.qm"
File "${BUILD_PATH}\src\mirall_si_LK.qm"
File "${BUILD_PATH}\src\mirall_sk_SK.qm"
File "${BUILD_PATH}\src\mirall_sl.qm"
File "${BUILD_PATH}\src\mirall_sr@latin.qm"
File "${BUILD_PATH}\src\mirall_sv.qm"
File "${BUILD_PATH}\src\mirall_ta_LK.qm"
File "${BUILD_PATH}\src\mirall_th_TH.qm"
File "${BUILD_PATH}\src\mirall_tr.qm"
File "${BUILD_PATH}\src\mirall_uk.qm"
File "${BUILD_PATH}\src\mirall_vi.qm"
File "${BUILD_PATH}\src\mirall_zh_CN.qm"
File "${BUILD_PATH}\src\mirall_zh_TW.qm"
#File "${MING_SHARE}\qt4\translations\qt_ar.qm"
File "${MING_SHARE}\qt4\translations\qt_cs.qm"
File "${MING_SHARE}\qt4\translations\qt_da.qm"
File "${MING_SHARE}\qt4\translations\qt_de.qm"
File "${MING_SHARE}\qt4\translations\qt_es.qm"
File "${MING_SHARE}\qt4\translations\qt_fa.qm"
File "${MING_SHARE}\qt4\translations\qt_fr.qm"
File "${MING_SHARE}\qt4\translations\qt_gl.qm"
File "${MING_SHARE}\qt4\translations\qt_he.qm"
File "${MING_SHARE}\qt4\translations\qt_hu.qm"
File "${MING_SHARE}\qt4\translations\qt_ja.qm"
File "${MING_SHARE}\qt4\translations\qt_ko.qm"
File "${MING_SHARE}\qt4\translations\qt_lt.qm"
File "${MING_SHARE}\qt4\translations\qt_pl.qm"
File "${MING_SHARE}\qt4\translations\qt_pt.qm"
File "${MING_SHARE}\qt4\translations\qt_ru.qm"
File "${MING_SHARE}\qt4\translations\qt_sk.qm"
File "${MING_SHARE}\qt4\translations\qt_sl.qm"
File "${MING_SHARE}\qt4\translations\qt_sv.qm"
File "${MING_SHARE}\qt4\translations\qt_uk.qm"
File "${MING_SHARE}\qt4\translations\qt_zh_CN.qm"
File "${MING_SHARE}\qt4\translations\qt_zh_TW.qm"
File "${MING_SHARE}\qt4\translations\qt_zh_TW.qm"
File "${MING_SHARE}\qt4\translations\qtkeychain_de.qm"
SetOutPath "$INSTDIR\accessible"
File "${ACCESSIBLE_DLL_PATH}\qtaccessiblewidgets4.dll"
SetOutPath "$INSTDIR\modules"
; FIXME: fix installation dir of module, currently needs manual copying to
; /usr/i686-w64-mingw32/sys-root/mingw/bin/csync_modules/
File "${CSYNC_PLUGIN_DIR}/ocsync_owncloud.dll"
SetOutPath "$INSTDIR"
!endif
;License & release notes.
File "@CPACK_RESOURCE_FILE_LICENSE@"
File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt
;QT stuff:
File "${QT_DLL_PATH}\QtCore4.dll"
File "${QT_DLL_PATH}\QtGui4.dll"
File "${QT_DLL_PATH}\QtNetwork4.dll"
File "${QT_DLL_PATH}\QtXml4.dll"
;QtKeyChain stuff
File "${MING_BIN}\libqtkeychain.dll"
File "${CSYNC_LIBRARY_DIR}/libocsync.dll"
File "${MING_BIN}\libsqlite3-0.dll"
File "${MING_BIN}\libiniparser.dll"
File "${MING_BIN}\libdl.dll"
File "${MING_BIN}\libpng15-15.dll"
; ownCloud plugin
File "${MING_BIN}\libintl-8.dll"
File "${MING_BIN}\libneon-27.dll"
File "${MING_BIN}\libproxy.dll"
File "${MING_BIN}\libmodman.dll"
File "${MING_BIN}\libxml2-2.dll"
;MinGW stuff
File "${MING_BIN}\libgcc_s_sjlj-1.dll"
File "${MING_BIN}\libstdc++-6.dll"
; Other
;File "${MING_BIN}\libpng15-15.dll"
;File "${MING_BIN}\libjpeg-8.dll"
File "${MING_BIN}\zlib1.dll"
File "${MING_BIN}\libcrypto-10.dll"
File "${MING_BIN}\libssl-10.dll"
; CSync configs
File "${SOURCE_PATH}/sync-exclude.lst"
SectionEnd
SectionGroup "Shortcuts"
!ifdef OPTION_SECTION_SC_START_MENU
${MementoSection} "Start Menu Program Group" SEC_START_MENU
SectionIn 1 2 3
SetDetailsPrint textonly
DetailPrint "Adding shortcuts for the ${APPLICATION_NAME} program group to the Start Menu."
SetDetailsPrint listonly
SetShellVarContext all
RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
CreateDirectory "$SMPROGRAMS\${APPLICATION_NAME}"
CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Release notes.lnk" "$INSTDIR\NOTES.txt"
CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
SetShellVarContext current
${MementoSectionEnd}
!endif
!ifdef OPTION_SECTION_SC_DESKTOP
${MementoSection} "Desktop Shortcut" SEC_DESKTOP
SectionIn 1 2
SetDetailsPrint textonly
DetailPrint "Creating Desktop Shortcuts"
SetDetailsPrint listonly
CreateShortCut "$DESKTOP\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
${MementoSectionEnd}
!endif
!ifdef OPTION_SECTION_SC_QUICK_LAUNCH
${MementoSection} "Quick Launch Shortcut" SEC_QUICK_LAUNCH
SectionIn 1 2
SetDetailsPrint textonly
DetailPrint "Creating Quick Launch Shortcut"
SetDetailsPrint listonly
CreateShortCut "$QUICKLAUNCH\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
${MementoSectionEnd}
!endif
SectionGroupEnd
!ifdef OPTION_SECTION_SC_AUTOSTART
${MementoSection} "Autostart" SEC_AUTOSTART
SectionIn 1 2
SetDetailsPrint textonly
DetailPrint "Creating Windows Start Entry"
SetDetailsPrint listonly
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Run" \
"${APPLICATION_NAME}" "$INSTDIR\${APPLICATION_EXECUTABLE}"
${MementoSectionEnd}
!endif
${MementoSectionDone}
; Installer section descriptions
;--------------------------------
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_APPLICATION} "${APPLICATION_NAME} essentials."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} program group."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for ${APPLICATION_NAME}."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for ${APPLICATION_NAME}."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_AUTOSTART} "Register ${APPLICATION_NAME} to run on Windows startup."
!insertmacro MUI_FUNCTION_DESCRIPTION_END
Section -post
;Uninstaller file.
SetDetailsPrint textonly
DetailPrint "Writing Uninstaller"
SetDetailsPrint listonly
WriteUninstaller $INSTDIR\uninstall.exe
;Registry keys required for installer version handling and uninstaller.
SetDetailsPrint textonly
DetailPrint "Writing Installer Registry Keys"
SetDetailsPrint listonly
;Version numbers used to detect existing installation version for comparisson.
WriteRegStr HKLM "Software\${APPLICATION_NAME}" "" $INSTDIR
WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}"
WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionRevision" "${REVISION}"
WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionBuild" "${VER_BUILD}"
;Add or Remove Programs entry.
WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "InstallLocation" "$INSTDIR"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayName" "${APPLICATION_NAME}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "Publisher" "${APPLICATION_VENDOR}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayVersion" "${VERSION}"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}.${REVISION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "URLInfoAbout" "http://${APPLICATION_DOMAIN}/"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "HelpLink" "http://${APPLICATION_DOMAIN}/"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "NoModify" "1"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "NoRepair" "1"
SetDetailsPrint textonly
DetailPrint "Finished."
SectionEnd
##############################################################################
# #
# UNINSTALLER SECTION #
# #
##############################################################################
Var UnPageUserAppDataDialog
Var UnPageUserAppDataCheckbox
Var UnPageUserAppDataCheckbox_State
Var UnPageUserAppDataEditBox
Function un.UnPageUserAppData
!insertmacro MUI_HEADER_TEXT "Uninstall ${APPLICATION_NAME}" "Remove ${APPLICATION_NAME}'s data folder from your computer."
nsDialogs::Create /NOUNLOAD 1018
Pop $UnPageUserAppDataDialog
${If} $UnPageUserAppDataDialog == error
Abort
${EndIf}
${NSD_CreateLabel} 0 0 100% 12u "Do you want to delete ${APPLICATION_NAME}'s data folder?"
Pop $0
${NSD_CreateText} 0 13u 100% 12u "$LOCALAPPDATA\${APPLICATION_NAME}"
Pop $UnPageUserAppDataEditBox
SendMessage $UnPageUserAppDataEditBox ${EM_SETREADONLY} 1 0
${NSD_CreateLabel} 0 46u 100% 24u "Leave unchecked to keep the data folder for later use or check to delete the data folder."
Pop $0
${NSD_CreateCheckbox} 0 71u 100% 8u "Yes, delete this data folder."
Pop $UnPageUserAppDataCheckbox
nsDialogs::Show
FunctionEnd
Function un.UnPageUserAppDataLeave
${NSD_GetState} $UnPageUserAppDataCheckbox $UnPageUserAppDataCheckbox_State
FunctionEnd
Function un.EnsureOwncloudShutdown
!insertmacro CheckAndConfirmEndProcess "${APPLICATION_EXECUTABLE}"
FunctionEnd
Section Uninstall
IfFileExists "$INSTDIR\${APPLICATION_EXECUTABLE}" owncloud_installed
MessageBox MB_YESNO "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES owncloud_installed
Abort "Uninstall aborted by user"
owncloud_installed:
;Delete registry keys.
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}"
DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionBuild"
DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionMajor"
DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionMinor"
DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionRevision"
DeleteRegValue HKLM "Software\${APPLICATION_NAME}" ""
DeleteRegKey HKLM "Software\${APPLICATION_NAME}"
DeleteRegKey HKCR "${APPLICATION_NAME}"
;Windows Start entry
!ifdef OPTION_SECTION_SC_AUTOSTART
DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPLICATION_NAME}"
!endif
;Start menu shortcuts.
!ifdef OPTION_SECTION_SC_START_MENU
SetShellVarContext all
RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
SetShellVarContext current
!endif
;Desktop shortcut.
!ifdef OPTION_SECTION_SC_DESKTOP
IfFileExists "$DESKTOP\${APPLICATION_NAME}.lnk" 0 +2
Delete "$DESKTOP\${APPLICATION_NAME}.lnk"
!endif
;Quick Launch shortcut.
!ifdef OPTION_SECTION_SC_QUICK_LAUNCH
IfFileExists "$QUICKLAUNCH\${APPLICATION_NAME}.lnk" 0 +2
Delete "$QUICKLAUNCH\${APPLICATION_NAME}.lnk"
!endif
;Remove all the Program Files.
RMDir /r $INSTDIR
;Uninstall User Data if option is checked, otherwise skip.
${If} $UnPageUserAppDataCheckbox_State == ${BST_CHECKED}
RMDir /r "$LOCALAPPDATA\${APPLICATION_NAME}"
${EndIf}
SetDetailsPrint textonly
DetailPrint "Finshed."
SectionEnd
##############################################################################
# #
# NSIS Installer Event Handler Functions #
# #
##############################################################################
Function .onInit
!insertmacro INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
;Remove Quick Launch option from Windows 7, as no longer applicable - usually.
${IfNot} ${AtMostWinVista}
SectionSetText ${SEC_QUICK_LAUNCH} "Quick Launch Shortcut (N/A)"
SectionSetFlags ${SEC_QUICK_LAUNCH} ${SF_RO}
SectionSetInstTypes ${SEC_QUICK_LAUNCH} 0
${EndIf}
${MementoSectionRestore}
UAC_Elevate:
UAC::RunElevated
StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
StrCmp 0 $0 0 UAC_Err ; Error?
StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
Quit
UAC_Err:
MessageBox MB_ICONSTOP "Unable to elevate, error $0"
Abort
UAC_ElevationAborted:
Abort
UAC_Success:
StrCmp 1 $3 +4 ;Admin?
StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
MessageBox MB_ICONSTOP "This installer requires admin access, try again"
goto UAC_Elevate
;Prevent multiple instances.
System::Call 'kernel32::CreateMutexA(i 0, i 0, t "owncloudInstaller") i .r1 ?e'
Pop $R0
StrCmp $R0 0 +3
MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
Abort
;Use available InstallLocation when possible. This is useful in the uninstaller
;via re-install, which would otherwise use a default location - a bug.
ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "InstallLocation"
StrCmp $R0 "" SkipSetInstDir
StrCpy $INSTDIR $R0
SkipSetInstDir:
;Shutdown ${APPLICATION_NAME} in case Add/Remove re-installer option used.
Call EnsureOwncloudShutdown
FunctionEnd
Function .onInstSuccess
${MementoSectionSave}
UAC::Unload ;Must call unload!
FunctionEnd
Function .onInstFailed
UAC::Unload ;Must call unload!
FunctionEnd
##############################################################################
# #
# NSIS Uninstaller Event Handler Functions #
# #
##############################################################################
Function un.onInit
UAC_Elevate:
UAC::RunElevated
StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
StrCmp 0 $0 0 UAC_Err ; Error?
StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
Quit
UAC_Err:
MessageBox MB_ICONSTOP "Unable to elevate, error $0"
Abort
UAC_ElevationAborted:
Abort
UAC_Success:
StrCmp 1 $3 +4 ;Admin?
StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
MessageBox MB_ICONSTOP "This uninstaller requires admin access, try again"
goto UAC_Elevate
;Prevent multiple instances.
System::Call 'kernel32::CreateMutexA(i 0, i 0, t "owncloudUninstaller") i .r1 ?e'
Pop $R0
StrCmp $R0 0 +3
MessageBox MB_OK|MB_ICONEXCLAMATION "This uninstaller is already running."
Abort
;Shutdown ${APPLICATION_NAME} in order to remove locked files.
Call un.EnsureOwncloudShutdown
FunctionEnd
Function un.onUnInstSuccess
UAC::Unload ;Must call unload!
FunctionEnd
Function un.onUnInstFailed
UAC::Unload ;Must call unload!
FunctionEnd

12
config.h.in Normal file
View File

@@ -0,0 +1,12 @@
#ifndef CONFIG_H
#define CONFIG_H
#cmakedefine USE_INOTIFY 1
#cmakedefine WITH_CSYNC 1
#cmakedefine WITH_QTKEYCHAIN 1
#cmakedefine GIT_SHA1 "@GIT_SHA1@"
#cmakedefine APPLICATION_DOMAIN @APPLICATION_DOMAIN@
#cmakedefine THEME_CLASS @THEME_CLASS@
#cmakedefine THEME_INCLUDE @THEME_INCLUDE@
#endif

79
doc/CMakeLists.txt Normal file
View File

@@ -0,0 +1,79 @@
if(SPHINX_FOUND)
# Sphinx cache with pickled ReST documents
set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
# HTML output directory
set(SPHINX_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/html")
set(SPHINX_MAN_DIR "${CMAKE_CURRENT_BINARY_DIR}/man")
set(SPHINX_PDF_DIR "${CMAKE_CURRENT_BINARY_DIR}/latex")
set(SPHINX_QCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/qthelp")
set(SPHINX_HTMLHELP_DIR "${CMAKE_CURRENT_BINARY_DIR}/htmlhelp")
set(MSHTML_COMPILER wine 'C:\\Program Files\\HTML Help Workshop\\hhc.exe')
# assets
set(LATEX_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
if(WITH_DOC)
add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...")
install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR})
else(WITH_DOC)
add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
endif(WITH_DOC)
if(PDFLATEX_FOUND)
# if this still fails on Debian/Ubuntu, run
# apt-get install texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
add_custom_target(doc-latex ${SPHINX_EXECUTABLE}
-q -c . -b latex
-d ${SPHINX_CACHE_DIR}
-D latex_logo=${LATEX_LOGO}
${CMAKE_CURRENT_SOURCE_DIR}
${SPHINX_PDF_DIR} )
add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf
DEPENDS doc-latex )
add_dependencies(doc doc-pdf)
if (WITH_DOC)
install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
endif (WITH_DOC)
endif(PDFLATEX_FOUND)
if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
-q -c . -b qthelp
-d ${SPHINX_CACHE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${SPHINX_QCH_DIR} )
add_custom_target( doc-qch ${QT_QCOLLECTIONGENERATOR_EXECUTABLE}
${SPHINX_QCH_DIR}/*.qhcp
DEPENDS doc-qch-sphinx )
add_dependencies(doc doc-qch)
if (WITH_DOC)
install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
endif (WITH_DOC)
endif()
add_custom_target( doc-html ${SPHINX_EXECUTABLE}
-q -c . -b html
-d ${SPHINX_CACHE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${SPHINX_HTML_DIR} )
add_custom_target( doc-man ${SPHINX_EXECUTABLE}
-q -c . -b man
-d ${SPHINX_CACHE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${SPHINX_MAN_DIR} )
## Building CHM files requires HTML Help Workshop. Since it requires wine
## with special dependencies, it's impossible to write a cmake check for it.
## This is why doc-chm is not a dependency for doc. Instead, run
## doc/scripts/htmlhelp.exe to install them and run this target
## explicitly.
add_custom_target( doc-chm-sphinx ${SPHINX_EXECUTABLE}
-q -c . -b htmlhelp
-D html_theme=basic
-d ${SPHINX_CACHE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${SPHINX_HTMLHELP_DIR} )
add_custom_target( doc-chm pushd ${SPHINX_HTMLHELP_DIR}; ${MSHTML_COMPILER} *.hhp; popd
DEPENDS doc-chm-sphinx )
endif(SPHINX_FOUND)

153
doc/Makefile Normal file
View File

@@ -0,0 +1,153 @@
# Makefile for Sphinx documentation
#
# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = _build
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " html to make standalone HTML files"
@echo " dirhtml to make HTML files named index.html in directories"
@echo " singlehtml to make a single large HTML file"
@echo " pickle to make pickle files"
@echo " json to make JSON files"
@echo " htmlhelp to make HTML files and a HTML help project"
@echo " qthelp to make HTML files and a qthelp project"
@echo " devhelp to make HTML files and a Devhelp project"
@echo " epub to make an epub"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@echo " latexpdf to make LaTeX files and run them through pdflatex"
@echo " text to make text files"
@echo " man to make manual pages"
@echo " texinfo to make Texinfo files"
@echo " info to make Texinfo files and run them through makeinfo"
@echo " gettext to make PO message catalogs"
@echo " changes to make an overview of all changed/added/deprecated items"
@echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
clean:
-rm -rf $(BUILDDIR)/*
html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
dirhtml:
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
singlehtml:
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
@echo
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
pickle:
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."
json:
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."
htmlhelp:
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp."
qthelp:
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/OwncloudDocumentation.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/OwncloudDocumentation.qhc"
devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/OwncloudDocumentation"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/OwncloudDocumentation"
@echo "# devhelp"
epub:
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
@echo
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."
latexpdf:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through pdflatex..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
text:
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
@echo
@echo "Build finished. The text files are in $(BUILDDIR)/text."
man:
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
@echo
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
texinfo:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
@echo "Run \`make' in that directory to run these through makeinfo" \
"(use \`make info' here to do that automatically)."
info:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo "Running Texinfo files through makeinfo..."
make -C $(BUILDDIR)/texinfo info
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
gettext:
$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
@echo
@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
changes:
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@echo
@echo "The overview file is in $(BUILDDIR)/changes."
linkcheck:
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."
doctest:
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."

108
doc/architecture.rst Normal file
View File

@@ -0,0 +1,108 @@
Architecture
============
.. index:: architecture
The ownCloud project provides desktop sync clients to synchronize the
contents of local directories on the desktop machines to the ownCloud.
The syncing is done with csync_, a bidirectional file synchronizing tool which
provides both a command line client as well as a library. A special module for
csync was written to synchronize with ownClouds built-in WebDAV server.
The ownCloud sync client is based on a tool called mirall initially written by
Duncan Mac Vicar. Later Klaas Freitag joined the project and enhanced it to work
with ownCloud server. Both mirall and ownCloud Client (oCC) build from the same
source, currently hosted in the ownCloud source repo on gitorious.
oCC is written in C++ using the `Qt Framework`_. As a result oCC runs on the
three important platforms Linux, Windows and MacOS.
.. _csync: http://www.csync.org
.. _`Qt Framework`: http://www.qt-project.org
The Sync Process
----------------
First it is important to recall what syncing is. Syncing tries to keep the files
on both repositories the same. That means if a file is added to one repository
it is going to be copied to the other repository. If a file is changed on one
repository, the change is propagated to the other repository. Also, if a file
is deleted on one side, it is deleted on the other. As a matter of fact, in
ownCloud syncing we do not have a typical client/server system where the
server is always master.
This is the major difference to other systems like a file backup where just
changes and new files are propagated but files never get deleted.
Sync Direction and Strategies
-----------------------------
.. index:: time stamps, file times, etag, unique id
Until the release of ownCloud 4.5 and ownCloud Client 1.1, ownCloud employed
a single file property to decide which file is newer and hence needs to be
synced to the other repository: the files modification time.
The *modification timestamp* is part of the files metadata. It is available on
every relevant filesystem and is the natural indicator for a file change.
modification timestamps do not require special action to create and have
a general meaning. One design goal of csync is to not require a special server
component, thats why it was chosen as the backend component.
To compare the modification times of two files from different systems,
it is needed to operate on the same base. Before version 1.1.0,
csync requires both sides running on the exact same time, which can
be achieved through enterprise standard `NTP time synchronisation`_ on all
machines.
Since this strategy is rather fragile without NTP, ownCloud 4.5 introduced a
unique number, which changes whenever the file changes. Although it is a unique
value, it is not a hash of the file, but a randomly chosen number, which it will
transmit in the Etag_ field. The client will store this number in a
per-directory database, located in the application directory (version 1.1) or
as a hidden file right in the directory to be synced (later versions).
Since the file number is guaranteed to change if the file changes, it can now be
used to determine if one of the files has changed.
.. todo:: describe what happens if both sides change
If the per-directory database gets removed, oCC's CSync backend will fall back
to a time-stamp based sync process to rebuild the database. Thus it should be
made sure that both server and client synchronized to NTP time before
restarting the client after a database removal. If time deviates, the sync
process might create faux conflict files, which only differ in their time.
Those need to be cleaned up manually later on and will not be synced back
to the server. However, no files will get deleted in this process.
Just like files, directories also hold a unique id, which changes whenever
one of the contained files or directories gets modified. Since this is a
recursive process, it significantly reduces the effort required for a sync
cycle, because the client will only walk directories with a modified unique id.
.. note:: oCC 1.1 and newer require file ID capabilities on the ownCloud server,
hence using them with a server earlier than 4.5.0 is not supported.
This table outlines the different sync methods attempted depending
on server/client combination:
.. index:: compatiblity table
+--------------------+-------------------+----------------------------+
| Server Version | Client Version | Sync Methods |
+====================+===================+============================+
| 4.0.x or earlier | 1.0.5 or earlier | Time Stamp |
+--------------------+-------------------+----------------------------+
| 4.0.x or earlier | 1.1 or later | n/a (incompatible) |
+--------------------+-------------------+----------------------------+
| 4.5 or later | 1.0.5 or earlier | Time Stamp |
+--------------------+-------------------+----------------------------+
| 4.5 or later | 1.1 or later | File ID, Time Stamp |
+--------------------+-------------------+----------------------------+
It is highly recommended to upgrade to ownCloud 4.5 or later with ownCloud
Client 1.1 or later, since the time stamp-based sync mechanism can
lead to data loss in certain edge-cases, especially when multiple clients
are involved and one of them is not in sync with NTP time.
.. _`NTP time synchronisation`: http://en.wikipedia.org/wiki/Network_Time_Protocol
.. _Etag: http://en.wikipedia.org/wiki/HTTP_ETag

164
doc/building.rst Normal file
View File

@@ -0,0 +1,164 @@
Building the Client
===================
This section explains how to build the ownCloud Client from source
for all major platforms. You should read this section if you want
to development on the desktop client.
Linux
-----
1. Add the `ownCloud repository from OBS`_.
2. Install the dependencies (as root, or via sudo):
* Debian/Ubuntu: ``apt-get update; apt-get build-dep owncloud-client``
* openSUSE: ``zypper ref; zypper si -d owncloud-client``
* Fedora/CentOS: ``yum install yum-utils; yum-builddep owncloud-client``
3. Follow the `generic build instructions`_.
Mac OS X
--------
Follow the `generic build instructions`_.
You can install the missing dependencies via MacPorts_ or Homebrew_.
This is only needed on the build machine, since non-standard libs
will be deployed in the app bundle.
The only exception to this rule is libiniparser_, which lacks a decent
build system. If you are using Homebrew_, you can just add it::
brew tap dschmidt/owncloud
brew install iniparser
Otherwise, you need to copy the header and lib files to
``/usr/local/include`` and ``/usr/local/lib`` respectively.
.. note::
You should not call ``make install`` at any time, since the product of the
mirall build is an app bundle. Call ``make package`` instead to create an
install-ready disk image.
Windows (cross-compile)
-----------------------
Due to the amount of dependencies that csync entails, building the client
for Windows is **currently only supported on openSUSE**, by using the MinGW
cross compiler. You can set up openSUSE 12.1 or 12.2 in a virtual machine
if you do not have it installed already.
In order to cross-compile, the following repositories need to be added
via YaST or ``zypper ar`` (adjust when using openSUSE 12.2)::
http://download.opensuse.org/repositories/isv:/ownCloud:/devel:/mingw:/win32/openSUSE_12.1/
http://download.opensuse.org/repositories/windows:/mingw/openSUSE_12.1/
http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_12.1/
Next, install the cross-compiler packages and the cross-compiled dependencies::
zypper si -d mingw32-csync
zypper install kdewin-png2ico mingw32-libqt4 mingw32-libqt4-devel \
mingw32-libgcrypt mingw32-libgnutls mingw32-libneon \
mingw32-libbeecrypt mingw32-libopenssl mingw32-openssl \
mingw32-libpng-devel mingw32-libsqlite mingw32-qtkeychain \
mingw32-qtkeychain-devel mingw32-iniparser mingw32-dlfcn
For the installer, the NSIS installer package is also required::
zypper install mingw32-cross-nsis
.. Usually, the following would be needed as well, but due to a bug in mingw, they
will currently not build properly from source.
mingw32-cross-nsis-plugin-processes mingw32-cross-nsis-plugin-uac
You will also need to manually download and install the following files with
``rpm -ivh <package>`` (They will also work with OpenSUSE 12.2)::
http://pmbs.links2linux.org/download/mingw:/32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm
http://pmbs.links2linux.org/download/mingw:/32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-uac-0-3.1.x86_64.rpm
Now, follow the `generic build instructions`_, but pay attention to
the following differences:
1. For building ``libocsync``, you need to use ``mingw32-cmake`` instead
of cmake.
2. Also, you need to specify *absolute pathes* for ``CSYNC_LIBRARY_PATH``
and ``CSYNC_LIBRARY_PATH`` when running ``cmake`` on mirall.
3. for building ``mirall``, you need to use ``cmake`` again, but make sure
to append the following parameter::
``-DCMAKE_TOOLCHAIN_FILE=../mirall/admin/win/Toolchain-mingw32-openSUSE.cmake``
Finally, just build by running ``make``. ``make package`` will produce
an NSIS-based installer, provided the NSIS mingw32 packages are installed.
Generic Build Instructions
--------------------------
.. _`generic build instructions`
The ownCloud Client requires Mirall and CSync_. Mirall is the GUI frontend,
while CSync is responsible for handling the actual synchronization process.
At the moment, ownCloud Client requires a forked version of CSync. Both
CMake and Mirall can be downloaded at ownCloud's `Client Download Page`_.
If you want to build the leading edge version of the client, you should
use the latest versions of Mirall and CSync via Git_, like so::
git clone git://git.csync.org/users/freitag/csync.git ocsync
git clone git://github.com/owncloud/mirall.git
Next, create build directories::
mkdir ocsync-build
mkdir mirall-build
This guide assumes that all directories are residing next to each other.
Next, make sure to check out the 'dav' branch in the newly checked out
`ocsync` directory::
cd ocsync
git checkout dav
The first package to build is CSync::
cd ocsync-build
cmake -DCMAKE_BUILD_TYPE="Debug" ../ocsync
make
You probably have to satisfy some dependencies. Make sure to install all the
needed development packages. You will need ``iniparser``, ``sqlite3`` as well as
``neon`` for the ownCloud module. Take special care about ``neon``. If that is
missing, the cmake run will succeed but silently not build the ownCloud module.
``libssh`` and ``libsmbclient`` are optional and not required for the client
to work. If you want to install the client, run ``make install`` as a final step.
Next, we build mirall::
cd ../mirall-build
cmake -DCMAKE_BUILD_TYPE="Debug" ../mirall \
-DCSYNC_BUILD_PATH=/path/to/ocsync-build \
-DCSYNC_INCLUDE_PATH=/path/to/ocsync/src
Note that it is important to use absolute pathes for the include- and library
directories. If this succeeds, call ``make``. The owncloud binary should appear
in the ``bin`` directory. You can also run ``make install`` to install the client to
``/usr/local/bin``.
To build in installer (requires the mingw32-cross-nsis packages)::
make package
Known cmake parameters:
* WITH_DOC=TRUE: create doc and manpages via running ``make``; also adds install statements to be able to install it via ``make install``.
.. _`ownCloud repository from OBS`: http://software.opensuse.org/download/package?project=isv:ownCloud:devel&package=owncloud-client
.. _CSync: http://www.csync.org
.. _`Client Download Page`: http://owncloud.org/sync-clients/
.. _Git: http://git-scm.com
.. _MacPorts: http://www.macports.org
.. _Homebrew: http://mxcl.github.com/homebrew/
.. _libiniparser: http://ndevilla.free.fr/iniparser/

290
doc/conf.py.in Normal file
View File

@@ -0,0 +1,290 @@
# -*- coding: utf-8 -*-
#
# ownCloud Documentation documentation build configuration file, created by
# sphinx-quickstart on Mon Oct 22 23:16:40 2012.
#
# This file is execfile()d with the current directory set to its containing dir.
#
# Note that not all possible configuration values are present in this
# autogenerated file.
#
# All configuration values have a default; values that are commented out
# serve to show the default.
import sys, os
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#sys.path.insert(0, os.path.abspath('.'))
# -- General configuration -----------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
#needs_sphinx = '1.0'
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.todo']
# Add any paths that contain templates here, relative to this directory.
#templates_path = ['templates']
# The suffix of source filenames.
source_suffix = '.rst'
# The encoding of source files.
#source_encoding = 'utf-8-sig'
# The master toctree document.
master_doc = 'index'
# General information about the project.
project = u'ownCloud Client Manual'
copyright = u'2012, The ownCloud developers'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '@VERSION_MAJOR@.@VERSION_MINOR@'
# The full version, including alpha/beta/rc tags.
release = '@VERSION@'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#language = None
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
#today = ''
# Else, today_fmt is used as the format for a strftime call.
#today_fmt = '%B %d, %Y'
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['_build']
# The reST default role (used for this markup: `text`) to use for all documents.
#default_role = None
# If true, '()' will be appended to :func: etc. cross-reference text.
#add_function_parentheses = True
2
# If true, the current module name will be prepended to all description
# unit titles (such as .. function::).
#add_module_names = True
# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
#show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []
# -- Options for HTML output ---------------------------------------------------
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
#html_theme_options = {}
# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = ['themes']
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#html_theme = 'bootstrap'
html_theme = 'default'
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
#html_title = None
# A shorter title for the navigation bar. Default is the same as html_title.
html_short_title = "Client Manual"
# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
#html_logo = None
# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#html_favicon = None
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
#html_static_path = ['static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
html_last_updated_fmt = '%b %d, %Y'
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
#html_use_smartypants = True
# Custom sidebar templates, maps document names to template names.
#html_sidebars = {}
# Additional templates that should be rendered to pages, maps page names to
# template names.
#html_additional_pages = {}
# If false, no module index is generated.
#html_domain_indices = True
# If false, no index is generated.
#html_use_index = True
# If true, the index is split into individual pages for each letter.
#html_split_index = False
# If true, links to the reST sources are added to the pages.
#html_show_sourcelink = True
# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
html_show_sphinx = False
# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
#html_show_copyright = True
# If true, an OpenSearch description file will be output, and all pages will
# contain a <link> tag referring to it. The value of this option must be the
# base URL from which the finished HTML is served.
#html_use_opensearch = ''
# This is the file name suffix for HTML files (e.g. ".xhtml").
#html_file_suffix = None
# Output file base name for HTML help builder.
htmlhelp_basename = 'ownCloudClientManual'
# -- Options for LaTeX output --------------------------------------------------
latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',
# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',
# Additional stuff for the LaTeX preamble.
#'preamble': '',
}
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'ownCloudClientManual.tex', u'ownCloud Client Manual',
u'The ownCloud developers', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
# the title page.
#latex_logo = None
# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
#latex_use_parts = False
# If true, show page references after internal links.
#latex_show_pagerefs = False
# If true, show URL addresses after external links.
#latex_show_urls = False
# Documents to append as an appendix to all manuals.
#latex_appendices = []
# If false, no module index is generated.
#latex_domain_indices = True
# -- Options for manual page output --------------------------------------------
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('owncloud.1', 'owncloud', u'File synchronisation desktop utility.',
[u'The ownCloud developers'], 1),
('mirall.1', 'mirall', u'File synchronisation desktop utility.',
[u'The ownCloud developers'], 1)
]
# If true, show URL addresses after external links.
man_show_urls = True
# -- Options for Texinfo output ------------------------------------------------
# Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'ownCloudClientManual', u'ownCloud Client Manual',
u'The ownCloud developers', 'ownCloud', 'The ownCloud Client Manual.',
'Miscellaneous'),
]
# Documents to append as an appendix to all manuals.
#texinfo_appendices = []
# If false, no module index is generated.
#texinfo_domain_indices = True
# How to display URL addresses: 'footnote', 'no', or 'inline'.
#texinfo_show_urls = 'footnote'
# -- Options for Epub output ---------------------------------------------------
# Bibliographic Dublin Core info.
epub_title = u'ownCloud Client Manual'
epub_author = u'The ownCloud developers'
epub_publisher = u'The ownCloud developers'
epub_copyright = u'2012, The ownCloud developers'
# The language of the text. It defaults to the language option
# or en if the language is not set.
#epub_language = ''
# The scheme of the identifier. Typical schemes are ISBN or URL.
#epub_scheme = ''
# The unique identifier of the text. This can be a ISBN number
# or the project homepage.
#epub_identifier = ''
# A unique identification for the text.
#epub_uid = ''
# A tuple containing the cover image and cover page html template filenames.
#epub_cover = ()
# HTML files that should be inserted before the pages created by sphinx.
# The format is a list of tuples containing the path and title.
#epub_pre_files = []
# HTML files shat should be inserted after the pages created by sphinx.
# The format is a list of tuples containing the path and title.
#epub_post_files = []
# A list of files that should not be packed into the epub file.
#epub_exclude_files = []
# The depth of the table of contents in toc.ncx.
#epub_tocdepth = 3
# Allow duplicate toc entries.
#epub_tocdup = True
# Include todos?
todo_include_todos = True

31
doc/conffile.rst Normal file
View File

@@ -0,0 +1,31 @@
ownCloud Client reads a configuration file.
On Linux it can be found in:
``$HOME/.local/share/data/ownCloud/owncloud.cfg``
On Windows it can be found in:
``%LOCALAPPDATA%\ownCloud\owncloud.cfg``
On Mac it can be found in:
``$HOME/Library/Application Support/ownCloud``
It contains settings in the ini file format known from Windows.
.. note:: Changes here should be done carefully as wrong settings can cause disfunctionality.
.. note:: Changes may be overwritten by using ownCloud's configuration dialog.
.. note:: The new version is less precise in this regard.
These are config settings that may be changed:
``remotePollinterval`` (default: ``30000``)
Poll time for the remote repository in milliseconds
``maxLogLines`` (default: ``20000``)
Maximum count of log lines shown in the log window
``remotePollinterval``
The frequency used for polling for remote changes on the ownCloud Server.

28
doc/glossary.rst Normal file
View File

@@ -0,0 +1,28 @@
Glossary
========
.. glossary::
:sorted:
ownCloud Client
oCC
Name of the official ownCloud syncing client for desktop, which runs on
Windows, Mac OS X and Linux. It is based Mirall, and uses the CSync
sync engine for synchronization with the ownCloud server.
ownCloud Server
The server counter part of ownCloud Client as provided by the ownCloud
community.
mtime
modification time
file modification time
File property used to determine whether the servers' or the clients' file
is more recent. Standard procedure in oCC 1.0.5 and earlier, used by
oCC 1.1 and later only when no sync database exists and files already
exist in the client directory.
unique id
ID assigned to every file starting with ownCloud server 4.5 and submitted
via the HTTP ``Etag``. Used to check if files on client and server have
changed.

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

15
doc/index.rst Normal file
View File

@@ -0,0 +1,15 @@
.. _contents:
Contents
========
.. toctree::
:maxdepth: 2
install
usage
building
architecture
troubleshooting
glossary

36
doc/install.rst Normal file
View File

@@ -0,0 +1,36 @@
Installation
============
General
-------
The latest version of ownCloud client can be obtained at
http://owncloud.org/sync-clients/.
Windows
-------
ownCloud client for Windows is provided as a NSIS-based setup file for
machine-wide install.
Mac OS X
--------
Installing the ownCloud client on your Mac follows the normal app installation
pattern:
1. Download the installation file Click ownCloud-1.1.1.dmg, a window with the
2. ownCloud icon opens In that window, drag the ownCloud application into the
3. Applications folder on the right hand side From Applications, choose
ownCloud
Linux
------
The ownCloud client is provided as in a convenient repository for a wide range
of popular Linux distributions. If you want to build the sources instead.
Supported distributions are CentOS/RHEL, Fedora, SLES, openSUSE, Ubuntu and
Debian.
To support other distributions, a source build is required.

BIN
doc/logo-blue.pdf Normal file

Binary file not shown.

190
doc/make.bat Normal file
View File

@@ -0,0 +1,190 @@
@ECHO OFF
REM Command file for Sphinx documentation
if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
)
set BUILDDIR=_build
set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
set I18NSPHINXOPTS=%SPHINXOPTS% .
if NOT "%PAPER%" == "" (
set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
)
if "%1" == "" goto help
if "%1" == "help" (
:help
echo.Please use `make ^<target^>` where ^<target^> is one of
echo. html to make standalone HTML files
echo. dirhtml to make HTML files named index.html in directories
echo. singlehtml to make a single large HTML file
echo. pickle to make pickle files
echo. json to make JSON files
echo. htmlhelp to make HTML files and a HTML help project
echo. qthelp to make HTML files and a qthelp project
echo. devhelp to make HTML files and a Devhelp project
echo. epub to make an epub
echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter
echo. text to make text files
echo. man to make manual pages
echo. texinfo to make Texinfo files
echo. gettext to make PO message catalogs
echo. changes to make an overview over all changed/added/deprecated items
echo. linkcheck to check all external links for integrity
echo. doctest to run all doctests embedded in the documentation if enabled
goto end
)
if "%1" == "clean" (
for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
del /q /s %BUILDDIR%\*
goto end
)
if "%1" == "html" (
%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
if errorlevel 1 exit /b 1
echo.
echo.Build finished. The HTML pages are in %BUILDDIR%/html.
goto end
)
if "%1" == "dirhtml" (
%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
if errorlevel 1 exit /b 1
echo.
echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
goto end
)
if "%1" == "singlehtml" (
%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
if errorlevel 1 exit /b 1
echo.
echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
goto end
)
if "%1" == "pickle" (
%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
if errorlevel 1 exit /b 1
echo.
echo.Build finished; now you can process the pickle files.
goto end
)
if "%1" == "json" (
%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
if errorlevel 1 exit /b 1
echo.
echo.Build finished; now you can process the JSON files.
goto end
)
if "%1" == "htmlhelp" (
%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
if errorlevel 1 exit /b 1
echo.
echo.Build finished; now you can run HTML Help Workshop with the ^
.hhp project file in %BUILDDIR%/htmlhelp.
goto end
)
if "%1" == "qthelp" (
%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
if errorlevel 1 exit /b 1
echo.
echo.Build finished; now you can run "qcollectiongenerator" with the ^
.qhcp project file in %BUILDDIR%/qthelp, like this:
echo.^> qcollectiongenerator %BUILDDIR%\qthelp\OwncloudDocumentation.qhcp
echo.To view the help file:
echo.^> assistant -collectionFile %BUILDDIR%\qthelp\OwncloudDocumentation.ghc
goto end
)
if "%1" == "devhelp" (
%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
if errorlevel 1 exit /b 1
echo.
echo.Build finished.
goto end
)
if "%1" == "epub" (
%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
if errorlevel 1 exit /b 1
echo.
echo.Build finished. The epub file is in %BUILDDIR%/epub.
goto end
)
if "%1" == "latex" (
%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
if errorlevel 1 exit /b 1
echo.
echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
goto end
)
if "%1" == "text" (
%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
if errorlevel 1 exit /b 1
echo.
echo.Build finished. The text files are in %BUILDDIR%/text.
goto end
)
if "%1" == "man" (
%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
if errorlevel 1 exit /b 1
echo.
echo.Build finished. The manual pages are in %BUILDDIR%/man.
goto end
)
if "%1" == "texinfo" (
%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
if errorlevel 1 exit /b 1
echo.
echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
goto end
)
if "%1" == "gettext" (
%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
if errorlevel 1 exit /b 1
echo.
echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
goto end
)
if "%1" == "changes" (
%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
if errorlevel 1 exit /b 1
echo.
echo.The overview file is in %BUILDDIR%/changes.
goto end
)
if "%1" == "linkcheck" (
%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
if errorlevel 1 exit /b 1
echo.
echo.Link check complete; look for any errors in the above output ^
or in %BUILDDIR%/linkcheck/output.txt.
goto end
)
if "%1" == "doctest" (
%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
if errorlevel 1 exit /b 1
echo.
echo.Testing of doctests in the sources finished, look at the ^
results in %BUILDDIR%/doctest/output.txt.
goto end
)
:end

38
doc/mirall.1.rst Normal file
View File

@@ -0,0 +1,38 @@
mirall(1)
---------
SYNOPSIS
========
*mirall* [`OPTIONS`...]
DESCRIPTION
===========
mirall is a file synchronisation desktop utility.
It synchronizes files on your local machine with an ownCloud Server. If you
make a change to the files on one computer, it will flow across the others
using this desktop sync clients.
Normally you start the client by click on the desktop icon or start from the
application menu. After starting an ownCloud icon appears in the system tray.
Options
=======
.. include:: options.rst
Config File
===========
.. include:: conffile.rst
BUGS
====
Please report bugs at https://github.com/owncloud/core/issues.
SEE ALSO
========
`csync(1)`, `mirall(1)`

15
doc/options.rst Normal file
View File

@@ -0,0 +1,15 @@
ownCloud Client supports the following command line switches:
``--logwindow``
open a window to show log output at startup.
``--logfile`` `<filename>`
write log output to file.
``--flushlog``
flush the log file after every write.
``--monoicons``
Use black/white pictograms for systray.

37
doc/owncloud.1.rst Normal file
View File

@@ -0,0 +1,37 @@
owncloud(1)
-----------
SYNOPSIS
========
*owncloud* [`OPTIONS`...]
DESCRIPTION
===========
owncloud is a file synchronisation desktop utility it is based on mirall.
It synchronizes files on your local machine with an ownCloud Server. If you
make a change to the files on one computer, it will flow across the others
using this desktop sync clients.
Normally you start the client by click on the desktop icon or start from the
application menu. After starting an ownCloud icon appears in the system tray.
Options
=======
.. include:: options.rst
Config File
===========
.. include:: conffile.rst
BUGS
====
Please report bugs at https://github.com/owncloud/core/issues.
SEE ALSO
========
`csync(1)`, `mirall(1)`

12
doc/scripts/README.rst Normal file
View File

@@ -0,0 +1,12 @@
Doc Build Convenience Scripts
=============================
* ``htmlhelp.sh``: A script to install Microsoft HTML Workshop on Linux or Mac OS using Wine, along with some dependencies.
* ``htmlhelp.reg``: Registry file to override some DLLs with their native version and set the right Windows version.
Those files have been taken from the HTML Help Project (http://code.google.com/p/htmlhelp/wiki/HHW4Wine).
License
-------
The HTML Help Project has licensed its software under LGPLv3 terms.

12
doc/scripts/htmlhelp.reg Executable file
View File

@@ -0,0 +1,12 @@
REGEDIT4
[HKEY_CURRENT_USER\Software\Wine]
"Version"="win2k"
[HKEY_CURRENT_USER\Software\Wine\AppDefaults\hhc.exe\DllOverrides]
"itircl"="native"
"itss"="native"
[HKEY_CURRENT_USER\Software\Wine\AppDefaults\hhw.exe\DllOverrides]
"itircl"="native"
"itss"="native"

27
doc/scripts/htmlhelp.sh Executable file
View File

@@ -0,0 +1,27 @@
#!/bin/sh
WINEPREFIX=${WINEPREFIX:=$HOME/.wine}
test -d "$WINEPREFIX" || wineprefixcreate
# Setup the registry
wine regedit htmlhelp.reg
# Install HTML Help Workshop
wget 'http://go.microsoft.com/fwlink/?LinkId=14188' -O htmlhelp.exe
wine htmlhelp.exe
# Install ITSS.DLL
cabextract -F hhupd.exe htmlhelp.exe
cabextract -F itircl.dll hhupd.exe
cabextract -F itss.dll hhupd.exe
cp -a itircl.dll "$WINEPREFIX/drive_c/windows/system32/"
cp -a itss.dll "$WINEPREFIX/drive_c/windows/system32/"
wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itircl.dll'
wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itss.dll'
# Install MFC40.DLL
wget -N http://activex.microsoft.com/controls/vc/mfc40.cab
cabextract -F mfc40.exe mfc40.cab
cabextract -F mfc40.dll mfc40.exe
cp -a mfc40.dll "$WINEPREFIX/drive_c/windows/system32/"

42
doc/troubleshooting.rst Normal file
View File

@@ -0,0 +1,42 @@
Troubleshooting
===============
:All of my desktop clients fail to connect to ownCloud:
Verify that you can log on to ownClouds WebDAV server. Assuming your ownCloud
instance is installed at ``http://yourserver.com/owncloud``, type
``http://yourserver.com/owncloud/remote.php/webdav`` into your browsers
address bar.
If you are not prompted to enter your user name and password, please verify
that your server installation is working correctly.
If you are prompted, but the authentication fails even though the credentials
your provided are correct, please ensure that your authentication backend
is configured properly.
A more sophisticated test is to use a WebDAV command line client and log
into the ownCloud WebDAV server, such as a little app called cadaver, available
on Linux. I can be used to further verify that the WebDAV server is running
properly, for example by performing PROPFIND calls:
``propget .`` called within cadaver will return some properties of the current
directory and thus be a successful WebDAV connect.
:The desktop client fails for an unknown reason:
Start the client with ``--logwindow``. You can also open a log window for an
already running session, by simply starting the client again with this
parameter. Syntax:
* Windows: ``C:\Program Files (x86)\ownCloud\owncloud.exe --logwindow``
* Mac OS X: ``/Applications/owncloud.app/Contents/MacOS/owncloud --logwindow``
* Linux: ``owncloud --logwindow``
The log output can help you with tracking down problem, and if you report
a bug, it's useful to include the output.
Also, please take a look at your webservers error log file to check if there
are problems. For apache on linux, the error logs usually can be found at
``/var/log/apache2``. A file called ``error_log`` shows errors like PHP code
problems. A file called ``access_log`` usually records all requests handled
by the server. More information about the apache logging can be found at
``http://httpd.apache.org/docs/current/logs.html``.

24
doc/usage.rst Normal file
View File

@@ -0,0 +1,24 @@
Usage
=====
.. index:: usage, client sync usage
To start ownCloud Client, click on the desktop icon or start it from the
application menu. In the system tray, an ownCloud icon appears.
.. index:: start application
A left click on the tray icon open a status dialog which gives an overview on
the configured sync folders and allows to add and remove more sync folder
connections as well as pausing a sync connection.
A right click on the tray icon gives other configuration options.
Options
-------
.. index:: command line switches, command line, options, parameters
.. include:: options.rst
Config File
-----------
.. index:: config file
.. include:: conffile.rst

48
issue_template.md Normal file
View File

@@ -0,0 +1,48 @@
### Expected behaviour
Tell us what should happen
### Actual behaviour
Tell us what happens instead
### Steps to reproduce
1.
2.
3.
### Server configuration
Operating system:
Web server:
Database:
PHP version:
ownCloud version:
### Client configuration
Client version:
Operating system:
OS language:
Installation path of client:
### Logs
#### output of `owncloud --logwindow` or `owncloud --logfile log.txt`
```
Insert your log output here
```
#### Web server error log
```
Insert your webserver log here
```
#### ownCloud log (data/owncloud.log)
```
Insert your ownCloud log here
```

7
mirall.desktop.in Normal file
View File

@@ -0,0 +1,7 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
GenericName=Folder Sync
Icon=@APPLICATION_SHORTNAME@

16
mirall.qrc Normal file
View File

@@ -0,0 +1,16 @@
<RCC>
<qresource prefix="/mirall">
<file>resources/dialog-close.png</file>
<file>resources/dialog-ok.png</file>
<file>resources/dialog-cancel.png</file>
<file>resources/folder-remote-32.png</file>
<file>resources/folder-remote.png</file>
<file>resources/folder-sync.png</file>
<file>resources/folder-grey.png</file>
<file>resources/mirall-32.png</file>
<file>resources/mirall-128.png</file>
<file>resources/mirall-48.png</file>
<file>resources/task-ongoing.png</file>
<file>resources/view-refresh.png</file>
</qresource>
</RCC>

BIN
resources/dialog-cancel.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
resources/dialog-close.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
resources/dialog-ok.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
resources/folder-grey.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 668 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
resources/folder-remote.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
resources/folder-sync.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
resources/lock-http.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 739 B

BIN
resources/lock-https.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 478 B

BIN
resources/mirall-128.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Some files were not shown because too many files have changed in this diff Show More