Daniel Molkentin
d169bc24bf
ownCloudInfo must not include sslErrorDialog
2012-10-03 00:43:43 +02:00
Klaas Freitag
4d11e41e97
Merge branch 'master' of github.com:owncloud/mirall
2012-10-02 17:42:56 +02:00
Klaas Freitag
0007579ab8
Initialize pointer before use.
2012-10-02 17:42:37 +02:00
Daniel Molkentin
1752c23002
Use themed app name in password dialog.
2012-10-02 16:54:46 +02:00
Klaas Freitag
fabb353158
Use Qt proxy setting in csync in case its "default proxy"
2012-10-02 13:24:10 +02:00
Klaas Freitag
9ce10e7fe7
removed wrong header from filelist.
2012-10-02 13:18:36 +02:00
Klaas Freitag
11706c4e3e
Fix header.
2012-10-02 13:17:37 +02:00
Klaas Freitag
de60d53a78
Merge branch 'sslerrordialog' of https://github.com/sebasje/mirall into sebasje-sslerrordialog
...
Conflicts:
src/mirall/application.cpp
src/mirall/application.h
src/mirall/owncloudinfo.cpp
2012-10-02 12:34:06 +02:00
Klaas Freitag
1c326029a3
More theming fixes.
2012-09-28 15:19:42 +02:00
Klaas Freitag
4ac85b0702
Removed more hardcoded program names and replaced by theme appName.
2012-09-28 14:22:43 +02:00
Klaas Freitag
8939e08ce1
Hide remove button in singleFolder mode
2012-09-28 13:47:43 +02:00
Klaas Freitag
7156e47355
Introduce defaultServerFolder and defaultClientFolder.
2012-09-28 13:42:22 +02:00
Klaas Freitag
94ceb95045
Remove unneeded settings-code for win32.
2012-09-28 11:36:39 +02:00
Klaas Freitag
b41d8c3c12
Removed app name from strings even more and replaced by theme string.
2012-09-27 17:22:08 +02:00
Klaas Freitag
9d3d789890
Rename ownCloudClient.ini to custom.ini and put it to /etc/ownCloud.
2012-09-27 15:28:49 +02:00
Klaas Freitag
d09693f191
Read sync-exclude.lst from /etc/ownCloud, renamed from exclude.lst.
2012-09-27 13:16:14 +02:00
Klaas Freitag
e4024015a4
Merge branch 'master' of github.com:owncloud/mirall
2012-09-27 12:30:27 +02:00
Klaas Freitag
180b99c02e
Change the csync config dir to the users app path, not longer .csync.
2012-09-27 12:27:40 +02:00
Daniel Molkentin
32579dd25a
Brown paper bag fix.
2012-09-27 12:22:27 +02:00
Daniel Molkentin
740370b106
Do not translate application name, it's a brand
...
Another reason: File system and registry names depend on it
2012-09-27 11:52:58 +02:00
Daniel Molkentin
3d6a2a4966
Partial revert of 261731
...
An experimental change sneaked in.
2012-09-26 18:24:07 +02:00
Daniel Molkentin
6e1deab0ae
Supplemental: less hardcoded uses of "ownCloud"
2012-09-26 17:01:33 +02:00
Daniel Molkentin
5df5d55fa4
Make code more readable
2012-09-26 17:01:25 +02:00
Daniel Molkentin
991a04abc5
remove arguments from ownCloudInfo ctor
...
its only caller is the singletons instance() method
2012-09-26 16:59:53 +02:00
Daniel Molkentin
261731c841
Consistency fixes for single folder mode
2012-09-26 16:59:47 +02:00
Daniel Molkentin
1b0744dac6
icon improvements
...
- more sizes
- rename state icons due to a cmake limitation
(it globs owncloud-icon-* for mac and windows icons,
which causes the state icons to appear as app icons)
- adjust resourcefile and theme accordingly
2012-09-25 17:14:21 +02:00
Daniel Molkentin
bcf9bb8238
Reuse Theme singleton
2012-09-24 19:42:48 +02:00
Daniel Molkentin
bc08f81683
More use of appName() in tr()'s.
2012-09-24 19:21:55 +02:00
Daniel Molkentin
e3a9081181
Fix default implementation of Folder::nativeSecondPath().
2012-09-24 19:20:16 +02:00
Daniel Molkentin
2de9cc9590
Use the themes appName() instead of "ownCloud".
...
This turns the Theme class into a singleton.
2012-09-24 17:57:20 +02:00
Daniel Molkentin
d0a66b70f4
Defer handling of pretty remote path to subclasses.
...
The base class cannot reasonably assume anything about
pretty printing. The subclasses know a lot better.
2012-09-21 18:33:11 +02:00
Daniel Molkentin
663a1886e9
CMake: Centralize all application-specific parameters.
2012-09-20 17:31:18 +02:00
Klaas Freitag
dd5d407198
Fix activation of list entries in status dialog (thanks kyle-f).
2012-09-20 18:14:22 +03:00
Daniel Molkentin
aa34331489
Remove unused declaration.
2012-09-20 11:12:52 +02:00
Daniel Molkentin
50166424c8
Fix crash on exit on X11.
2012-09-20 11:12:52 +02:00
Klaas Freitag
8f40b2a276
Use delete[] to free mem from qstrdup, thanks valgrind.
2012-09-19 13:51:27 +03:00
Klaas Freitag
d195ad3072
Fix ownCloud icon and a layout issue.
2012-09-19 13:31:42 +03:00
Klaas Freitag
75554a2ed6
Removed hackish beta version marker in status dialog.
2012-09-19 13:02:28 +03:00
Klaas Freitag
45d224e922
Handle the themed singleSyncFolder-mode correctly.
2012-09-19 12:58:34 +03:00
Klaas Freitag
09d8fb9483
Add a theme switch to only allow a single sync folder for the client.
2012-09-19 12:58:02 +03:00
Klaas Freitag
a526035273
Add a method to set the enabled status of the buttons correctly.
2012-09-19 12:57:12 +03:00
Klaas Freitag
090bdcab68
Use the THEME_CLASS macro in config file class.
2012-09-18 13:55:58 +03:00
Klaas Freitag
29f3a002c4
Merge branch 'master' of github.com:owncloud/mirall
2012-09-18 13:53:42 +03:00
Klaas Freitag
a9c7b9304e
Use a macro THEME_CLASS from CMakeLists.txt instead of ifdefs.
2012-09-18 13:52:52 +03:00
Daniel Molkentin
aab1c94e44
Simplify version display.
...
Reduces amount of required helper macros.
2012-09-17 21:23:56 +02:00
Daniel Molkentin
6d13b1b2fb
Added a simple about dialog.
2012-09-17 21:06:20 +02:00
Daniel Molkentin
ff4a119c0c
Don't swallow ':' when entered.
...
Treat entering 'http(s)://' gracefully by
removing the substring and flipping the
checkbox.
2012-09-17 19:23:53 +02:00
Kyle Fazzari
4dbd8ee016
Forgot to comform to ownCloud coding standards. Fixed.
2012-09-13 22:51:47 -04:00
Kyle Fazzari
2652a744d0
Damino requested that QUrl be used to parse the URL, along with toString(QUrl::RemoveScheme). QUrl::RemoveScheme doesn't remove the slashes, so extra code was thrown in to ensure they were removed if they were present.
2012-09-13 22:47:39 -04:00
Kyle Fazzari
7f6d39383e
Found a much slicker solution to the problem of the OC URL
...
containing the protocol when the back button is used. Instead
of moving to two separate URL fields, a slot was created and
connected to the textChanged signal of the OCUrl LineEdit.
This slot simply ensures the protocol is not present.
2012-09-11 18:56:32 -04:00
