diff options
| author | Siteshwar Vashisht <siteshwar@gmail.com> | 2012-04-23 01:18:01 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-04-23 01:46:11 +0200 |
| commit | cd6eee46a7405bc2365ada5ca7cd2daab01e06c0 (patch) | |
| tree | f9c35fedba651e15fa2550804bcd9261c5aa1a91 /src/sync/synccheckwidget.cpp | |
| parent | Fix opensearch add shortcut handling (diff) | |
| download | rekonq-cd6eee46a7405bc2365ada5ca7cd2daab01e06c0.tar.xz | |
Google Sync Bookmarks in rekonq!
- Added UI bits to configure Google Bookamrks Sync
- Implemented sync, 2-way merging local and remote bk
- Remember to not update local history while remotely
adding bookmarks
- Encode parameters of add bookmarks request while posting data.
- (adjam) fix compile warnings
This is the squashed commit of Situ's work on Google Bookmarks Sync
SQUASHED BY: adjam ;)
REVIEW: 104673
DIGEST: Google Bookmarks Sync
REVIEWED BY: adjam
Diffstat (limited to 'src/sync/synccheckwidget.cpp')
| -rw-r--r-- | src/sync/synccheckwidget.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/sync/synccheckwidget.cpp b/src/sync/synccheckwidget.cpp index 9dbf5fc3..27f19721 100644 --- a/src/sync/synccheckwidget.cpp +++ b/src/sync/synccheckwidget.cpp @@ -60,6 +60,11 @@ void SyncCheckWidget::initializePage() syncLabel->setText(i18n("FTP")); hostLabel->setText(ReKonfig::syncHost()); } + else if (ReKonfig::syncType() == 1) + { + syncLabel->setText(i18n("Google")); + hostLabel->setText(ReKonfig::syncHost()); + } else { syncLabel->setText(i18n("No sync")); @@ -129,6 +134,8 @@ void SyncCheckWidget::initializePage() } + + void SyncCheckWidget::updateWidget(Rekonq::SyncData type, bool done, QString msg) { KIcon doneIcon(QL1S("dialog-ok-apply")); |