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
