Olivier Goffart
8cb3a77022
Merge remote-tracking branch 'origin/avatar_pics'
...
Also fix compilation because of 22370fdbdadd06f0cacd249a8d7a32f0d3c1374e
Pull request #5482
2017-04-13 11:54:28 +02:00
Klaas Freitag
5e33898a08
Avatar: Use QImage instead of QPixmap to avoid dep on QApplication.
...
That fixes the test suite.
2017-03-09 22:34:36 +01:00
Olivier Goffart
7bfe061382
Verify that all strings are properly escaped ( #5558 )
...
- I checked every occurence of a '%2' and make correct use of the
QString::arg overload that takes several argument instead of chaining
them, because the first argument can contains a '%1'
- I tried to look for every label that they either use plain text or richtext
and escape the user provided strings in there.
2017-02-23 14:54:17 +01:00
Klaas Freitag
e95b73dfac
Avatar: Set a circle mask around the avatar image.
...
The server displays the avatar cut into a circle, and so we do.
2017-01-23 21:36:18 +01:00
Klaas Freitag
d466a05915
SettingsDialog: Display the user avatar as action icon if available.
...
The avatar image is fetched from the server async, thus connect a signal
from the account if the avatar changes.
Server feature https://github.com/owncloud/core/pull/26872 is needed.
2017-01-22 13:58:36 +01:00
Christian Kamm
db24f60ae3
License: Adjust license of GPLv2 source files to GPLv2+
...
See #5180
2016-10-25 11:06:54 +02:00
Klaas Freitag
6b0d535120
Merge branch 'notifications'
2016-04-04 10:40:33 +02:00
Christian Kamm
e05819370b
Fix invalid read on account removal
2016-03-31 09:00:32 +02:00
Klaas Freitag
b9663456d8
Notifications: Refresh the notifications based on a config value.
...
Pulls a timer that polls for new notifications regularly. Add
Config file method for the interval value.
2016-03-18 16:28:20 +01:00
Olivier Goffart
bb6a50be02
SettingsDialog: show "Account" for the tab name for branded client
...
https://github.com/owncloud/enterprise/issues/863
2016-01-07 17:59:21 +01:00
Klaas Freitag
c607707580
Backport of #4245
2015-12-22 10:26:13 +01:00
Christian Kamm
fbb85fab81
Activity tab doesn't vanish with too many accounts #4188
...
The bug was introduced by a bad merge.
2015-12-10 09:43:16 +01:00
Christian Kamm
3de8f27a02
Force account wizard when last account is deleted #4266
2015-12-09 11:41:43 +01:00
Christian Kamm
9e66a6bec6
Settings dialog: Fix crash when deleting account #4202
2015-11-26 13:27:20 +01:00
Markus Goetz
709da37be2
Activities: Only emit debug when actually refreshing
2015-11-23 21:48:25 +01:00
Klaas Freitag
87aa1de67a
Merge branch 'newactivity'
2015-11-16 17:02:05 +01:00
Klaas Freitag
aa38f7a4f2
ActivityWidget: implement removeAccount.
2015-11-12 15:39:07 +01:00
Klaas Freitag
0e0b6026fc
Activity: Unify the GUI, and reactivate copy to clipboard for all.
2015-11-10 15:12:35 +01:00
Christian Kamm
9955b0756a
Settings: Show first account page on startup #4036
2015-11-10 12:20:08 +01:00
Klaas Freitag
cf9fec73cf
ActivityView: Add a second treeview for sync issues.
...
So there are three views now: One displaying the server activities, one for
the sync protocol and a third one for ignored files and issues.
2015-11-06 11:43:43 +01:00
Klaas Freitag
cb1571c6c5
ActivityWidget: Rather use accountState pointer directly.
...
Do not use it via a smart pointer class.
2015-11-04 16:40:22 +01:00
Klaas Freitag
060f4f291b
SettingsDialog: Add a tab with the SyncProtocol to ActivityWidget.
2015-11-02 15:46:00 +01:00
Klaas Freitag
3b8e1dcd89
SettingsDialog: Make ActivityWidget a member.
2015-11-01 22:30:46 +01:00
Klaas Freitag
9279bcdba4
Add a tabwidget to Settings dialog for activity.
2015-10-30 13:26:27 +01:00
Olivier Goffart
84a04de7be
Settings Dialog: don't put padding on the toolbar extension
...
Otherwise the extension just disapear with some styles (see Issue #3795 )
2015-10-27 13:42:25 +01:00
Olivier Goffart
42a6b242c7
SettingsDialog: use QWidgetAction for the toolbar so the extension works
...
When the toolbar is full because there is no enough room, make the extension
of the toolbar work, by using QWidgetAction::createWidget instead of
QToolBar::insertWidget
There should not be prolem when the window is too narrow.
Relates #3832
2015-10-23 16:23:37 +02:00
Daniel Molkentin
899f52be4f
Revert "Settings dialog: remove the close button #3713 "
...
This reverts commit ebee6f0bc2
2015-10-22 16:20:59 +02:00
Klaas Freitag
c66c259447
SettingsDialog: Add new widet called ActivityWidget.
...
This is the new widget to display server activity.
2015-10-19 14:41:53 +02:00
Phil Davis
b8ccbbc72a
GUI comment and message typos for master
2015-10-05 10:06:19 +05:45
Olivier Goffart
ebee6f0bc2
Settings dialog: remove the close button #3713
2015-09-01 11:32:59 +02:00
Olivier Goffart
1a0d0c0a31
Account Settings: rework the toolbar
...
Modifications ask by Jan:
- Elide the label in the actions
- Minimum sizes for the actions
- No separatcions between the accounts
Issue #3516
2015-08-30 15:31:13 +02:00
Christian Kamm
0711a2fc12
SettingsDialog: Fix typo in showFirstPage()
2015-08-20 11:57:44 +02:00
Christian Kamm
73785d0473
SettingsDialog: Activate the first page on startup
2015-08-19 15:51:48 +02:00
Daniel Molkentin
a9acb185a0
SettingsDialog: Fixup default action setting
...
This broke silently when switching from pure actions to widgets
2015-08-11 21:45:27 +02:00
Daniel Molkentin
3267c15aff
SettingsDialog: Use separator instead of custom spacer
...
... and make sure to hide if when there are no accounts
2015-08-11 21:44:35 +02:00
Daniel Molkentin
f25df3311c
Remove debug output
2015-08-11 21:42:30 +02:00
Daniel Molkentin
379beb268f
More improvements for high contrast themes
...
- Invert icon color depending on the darkness of the theme
- Ensure icons and colors are changed when theme or colors
get changed during application run
Final patch for #3582
2015-08-11 17:56:11 +02:00
Christian Kamm
0dd20ccf3b
Remove deleted accounts from tool bar #3583
2015-08-11 11:33:04 +02:00
Daniel Molkentin
9698324c4e
More color scheme adjustments
2015-08-11 11:32:00 +02:00
Daniel Molkentin
fad9a3056c
Settings dialog: Try to improve adherance to high contrast schemes
...
Adresses #3582
2015-08-11 07:42:52 +02:00
Daniel Molkentin
6b4a9d9cd9
Settings dialog: improve layout a bit
2015-08-10 10:51:05 +02:00
Olivier Goffart
646890abb3
SettingsDialog: use the same short display name on Win/Linux than on Mac
...
Issue #3516
2015-08-05 15:33:51 +02:00
Olivier Goffart
76903fb55a
Settings: Aling the non-accounts button on the right
2015-07-03 11:04:03 +02:00
Olivier Goffart
e587c8e2dc
multi-account: compile with Qt4
2015-06-02 19:57:41 +02:00
Olivier Goffart
e5ad1b27b4
Settings dialog: show the first account page at start
2015-04-28 11:39:27 +02:00
Christian Kamm
28306e5dfb
Move AccountState::displayName to Account.
2015-04-23 15:47:49 +02:00
Olivier Goffart
a932eac832
Multi-account WIP
2015-04-17 17:56:17 +02:00
Markus Goetz
f13dfc19a0
OS X: Fix UI glitches related to sync folder
...
For #2113 and #2947
2015-03-11 16:42:12 +01:00
Daniel Molkentin
2423aa592f
Add new icons by Jan
2015-02-16 14:47:32 +01:00
Daniel Molkentin
9e945eb471
Settings dialog: better color for separator line
2015-02-06 08:30:51 +01:00
Olivier Goffart
414838cae8
Settings dialog: remove the code that was updating the account icon
...
I just wanted to fix the warning:
QObject::connect: No such slot OCC::SettingsDialog::slotUpdateAccountIcon(QIcon) in settingsdialog.cpp:108
It turns out we don't need anymore the signal or any of the code that
was updating the account icon in the settings dialog since it we now have a fixed icon
2014-12-16 11:36:52 +01:00
Daniel Molkentin
a2b817f0c0
mirall.qrc -> client.qrc
2014-12-08 18:00:29 +01:00
Daniel Molkentin
3016844dd7
Merge branch 'master' into rename_client
...
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
Daniel Molkentin
afee1ee1c0
Make all ptr-based members either const or check for their existance
2014-12-01 13:08:49 +01:00
Daniel Molkentin
714599aeaa
Refactor generic settings dialog
...
- move items on top like on Mac OS (right is free for accounts now)
- The account icon no longer reflects the current status (in prep for multi-account)
2014-12-01 11:37:06 +01:00
Daniel Molkentin
2db17a57d2
Fix header names
2014-11-09 23:25:57 +01:00
Daniel Molkentin
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01:00
Daniel Molkentin
f2eadacf09
Remove "Mirall" from class names
2014-11-09 22:30:29 +01:00
Olivier Goffart
50e718b1e7
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/socketapi.cpp
translations/mirall_ca.ts
translations/mirall_cs.ts
translations/mirall_de.ts
translations/mirall_el.ts
translations/mirall_en.ts
translations/mirall_es.ts
translations/mirall_es_AR.ts
translations/mirall_et.ts
translations/mirall_eu.ts
translations/mirall_fa.ts
translations/mirall_fi.ts
translations/mirall_fr.ts
translations/mirall_gl.ts
translations/mirall_hu.ts
translations/mirall_it.ts
translations/mirall_ja.ts
translations/mirall_nl.ts
translations/mirall_pl.ts
translations/mirall_pt.ts
translations/mirall_pt_BR.ts
translations/mirall_ru.ts
translations/mirall_sk.ts
translations/mirall_sl.ts
translations/mirall_sv.ts
translations/mirall_th.ts
translations/mirall_tr.ts
translations/mirall_uk.ts
translations/mirall_zh_CN.ts
translations/mirall_zh_TW.ts
2014-09-18 17:10:21 +02:00
Daniel Molkentin
902bb7a198
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
2014-08-26 11:29:42 +02:00
Daniel Molkentin
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
