remove bookmark settings (no longer used)

resources/etc/OpenBoard.config

@@ -147,11 +147,8 @@ ReplyPlusMaxKeypads=100
 ReplyWWSerialPort=3
 
 [Web]
-AddBookmarkURL="http://www.myuniboard.com/bookmarks/save/?url="
-BookmarksPage=http://www.myuniboard.com
 HistoryLimit=15
 Homepage=http://www.openboard.ch
-ShowAddBookmarkButton=true
 ShowPageImediatelyOnMirroredScreen=false
 UseExternalBrowser=false
 

src/core/UBSettings.cpp

@@ -361,9 +361,6 @@ void UBSettings::init()
     webShowPageImmediatelyOnMirroredScreen = new UBSetting(this, "Web", "ShowPageImediatelyOnMirroredScreen", defaultShowPageImmediatelyOnMirroredScreen);
 
     webHomePage = new UBSetting(this, "Web", "Homepage", softwareHomeUrl);
-    webBookmarksPage = new UBSetting(this, "Web", "BookmarksPage", "http://www.myuniboard.com");
-    webAddBookmarkUrl = new UBSetting(this, "Web", "AddBookmarkURL", "http://www.myuniboard.com/bookmarks/save/?url=");
-    webShowAddBookmarkButton = new UBSetting(this, "Web", "ShowAddBookmarkButton", false);
 
     pageCacheSize = new UBSetting(this, "App", "PageCacheSize", 20);
 

src/core/UBSettings.h

@@ -329,9 +329,6 @@ class UBSettings : public QObject
         UBSetting* webShowPageImmediatelyOnMirroredScreen;
 
         UBSetting* webHomePage;
-        UBSetting* webBookmarksPage;
-        UBSetting* webAddBookmarkUrl;
-        UBSetting* webShowAddBookmarkButton;
 
         UBSetting* pageCacheSize;
 

src/web/UBWebController.cpp

@@ -141,10 +141,6 @@ void UBWebController::webBrowserInstance()
             UBApplication::app()->insertSpaceToToolbarBeforeAction(mMainWindow->webToolBar, mMainWindow->actionBoard, 32);
             UBApplication::app()->decorateActionMenu(mMainWindow->actionMenu);
 
-            bool showAddBookmarkButtons = UBSettings::settings()->webShowAddBookmarkButton->get().toBool();
-            mMainWindow->actionBookmarks->setVisible(showAddBookmarkButtons);
-            mMainWindow->actionAddBookmark->setVisible(showAddBookmarkButtons);
-
             showTabAtTop(UBSettings::settings()->appToolBarPositionedAtTop->get().toBool());
 
             adaptToolBar();

src/web/browser/WBBrowserWindow.cpp

@@ -248,9 +248,6 @@ void WBBrowserWindow::setupToolBar()
     mWebToolBar->insertSeparator(mUniboardMainWindow->actionWebBigger);
 
     connect(mUniboardMainWindow->actionHome, SIGNAL(triggered()), this , SLOT(slotHome()));
-
-    connect(mUniboardMainWindow->actionBookmarks, SIGNAL(triggered()), this , SLOT(bookmarks()));
-    connect(mUniboardMainWindow->actionAddBookmark, SIGNAL(triggered()), this , SLOT(addBookmark()));
     connect(mUniboardMainWindow->actionWebBigger, SIGNAL(triggered()), this , SLOT(slotViewZoomIn()));
     connect(mUniboardMainWindow->actionWebSmaller, SIGNAL(triggered()), this , SLOT(slotViewZoomOut()));
 
@@ -514,18 +511,6 @@ void WBBrowserWindow::tabCurrentChanged(int index)
 }
 
 
-void WBBrowserWindow::bookmarks()
-{
-    loadPage(UBSettings::settings()->webBookmarksPage->get().toString());
-}
-
-
-void WBBrowserWindow::addBookmark()
-{
-    loadPage(UBSettings::settings()->webAddBookmarkUrl->get().toString() + currentTabWebView()->url().toString());
-}
-
-
 WBWebView* WBBrowserWindow::paintWidget()
 {
     return mTabWidget->currentWebView();

src/web/browser/WBBrowserWindow.h

@@ -121,9 +121,6 @@ class WBBrowserWindow : public QWidget
 
         void tabCurrentChanged(int);
 
-        void bookmarks();
-        void addBookmark();
-
         void showTabAtTop(bool attop);
 
         void aboutToShowBackMenu();