summaryrefslogtreecommitdiff
path: root/src/sync/synchosttypewidget.cpp
diff options
context:
space:
mode:
authorSiteshwar Vashisht <siteshwar@gmail.com>2012-04-23 01:18:01 +0200
committerAndrea Diamantini <adjam7@gmail.com>2012-04-23 01:46:11 +0200
commitcd6eee46a7405bc2365ada5ca7cd2daab01e06c0 (patch)
treef9c35fedba651e15fa2550804bcd9261c5aa1a91 /src/sync/synchosttypewidget.cpp
parentFix opensearch add shortcut handling (diff)
downloadrekonq-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/synchosttypewidget.cpp')
-rw-r--r--src/sync/synchosttypewidget.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/sync/synchosttypewidget.cpp b/src/sync/synchosttypewidget.cpp
index 0810182e..32fd1f9f 100644
--- a/src/sync/synchosttypewidget.cpp
+++ b/src/sync/synchosttypewidget.cpp
@@ -42,6 +42,8 @@ SyncHostTypeWidget::SyncHostTypeWidget(QWidget *parent)
if (ReKonfig::syncType() == 0)
ftpRadioButton->setChecked(true);
+ else if(ReKonfig::syncType() == 1)
+ googleRadioButton->setChecked(true);
else
nullRadioButton->setChecked(true);
}
@@ -55,9 +57,14 @@ int SyncHostTypeWidget::nextId() const
ReKonfig::setSyncType(0);
return SyncAssistant::Page_FTP_Settings;
}
+ else if (googleRadioButton->isChecked())
+ {
+ ReKonfig::setSyncType(1);
+ return SyncAssistant::Page_Google_Settings;
+ }
else
{
- ReKonfig::setSyncType(1);
+ ReKonfig::setSyncType(2);
return SyncAssistant::Page_Check;
}