Sankore 427

src/core/UBApplicationController.cpp

@@ -368,7 +368,7 @@ void UBApplicationController::showInternet()
     if (UBSettings::settings()->webUseExternalBrowser->get().toBool())
     {
         showDesktop(true);
-        UBApplication::webController->show(UBWebController::WebBrowser); 
+        UBApplication::webController->show(UBWebController::WebBrowser);
         // really no have emit mainModeChanged here ? potential problem with virtual keyboard ?
     }
     else
@@ -460,6 +460,7 @@ void UBApplicationController::showTutorial()
         UBApplication::boardController->hide();
     }
 
+    // it's needed not to duplicate webbrowser search in web mode. If I've breaked smbd's code let Ivan know
     UBApplication::webController->show(UBWebController::Tutorial);
 
     mMainWindow->webToolBar->hide();
@@ -488,7 +489,8 @@ void UBApplicationController::showSankoreEditor()
         UBApplication::boardController->hide();
     }
 
-    UBApplication::webController->show(UBWebController::Paraschool);
+// it's needed not to duplicate webbrowser search in web mode. If I've breaked smbd's code let Ivan know
+        UBApplication::webController->show(UBWebController::Paraschool);
 
     mMainWindow->webToolBar->hide();
     mMainWindow->boardToolBar->hide();

src/web/UBWebController.cpp

@@ -148,6 +148,8 @@ void UBWebController::webBrowserInstance()
 
             (*mCurrentWebBrowser)->tabWidget()->tabBar()->show();
             (*mCurrentWebBrowser)->tabWidget()->lineEdits()->show();
+//            (*mCurrentWebBrowser)->tabWidget()->tabBar()->hide();
+//            (*mCurrentWebBrowser)->tabWidget()->lineEdits()->hide();
         }
 
         UBApplication::applicationController->setMirrorSourceWidget((*mCurrentWebBrowser)->paintWidget());
@@ -192,7 +194,7 @@ void UBWebController::tutorialWebInstance()
     else
     {
         mCurrentWebBrowser = &mWebBrowserList[Tutorial];
-        mToolsCurrentPalette = &mToolsPaletteList[Tutorial];
+//        mToolsCurrentPalette = &mToolsPaletteList[Tutorial];
 //        mKeyboardCurrentPalette = &mKeyboardPaletteList[Tutorial];
         mToolsPalettePositionned = &mToolsPalettePositionnedList[Tutorial];
         if (!(*mCurrentWebBrowser))

src/web/browser/WBBrowserWindow.cpp

@@ -97,11 +97,11 @@ WBBrowserWindow::WBBrowserWindow(QWidget *parent, Ui::MainWindow* uniboardMainWi
     defaultSettings->setAttribute(QWebSettings::PluginsEnabled, true);
 
     setupMenu();
-//    if(!isViewerWebInstance)
+    if(!isViewerWebInstance)
         setupToolBar();
-//    else{
+    else{
-//        setupToolBarForTutorial();
+        setupToolBarForTutorial();
-//    }
+    }
 
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setSpacing(0);
@@ -205,8 +205,6 @@ void WBBrowserWindow::setupToolBar()
     connect(mSearchToolBar, SIGNAL(search(const QUrl&)), SLOT(loadUrl(const QUrl&)));
 
     mChaseWidget = new WBChaseWidget(this);
-    mWebToolBar->insertWidget(mUniboardMainWindow->actionWebBigger, mChaseWidget);
-
     mWebToolBar->insertSeparator(mUniboardMainWindow->actionWebBigger);
 
     connect(mUniboardMainWindow->actionHome, SIGNAL(triggered()), this , SLOT(slotHome()));

src/web/browser/WBTabWidget.cpp

@@ -251,7 +251,6 @@ WBTabWidget::WBTabWidget(QWidget *parent)
     mLineEdits->setMinimumWidth(200);
     QSizePolicy spolicy = mLineEdits->sizePolicy();
     mLineEdits->setSizePolicy(QSizePolicy::Maximum, spolicy.verticalPolicy());
-
 }
 
 void WBTabWidget::clear()

src/web/browser/WBTabWidget.h

@@ -138,7 +138,7 @@ class WBWebActionMapper : public QObject
  */
 class WBTabWidget : public QTabWidget
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     signals:
         // tab widget signals
@@ -171,8 +171,10 @@ class WBTabWidget : public QTabWidget
         QByteArray saveState() const;
         bool restoreState(const QByteArray &state);
 
-        WBTabBar* tabBar() { return mTabBar; };
+        WBTabBar* tabBar() { return mTabBar; }
-        QStackedWidget* lineEdits() { return mLineEdits; };
+        QStackedWidget* lineEdits() { return mLineEdits; }
+
+        void setLineEditStackVisible(bool visible) {mLineEdits->setVisible(visible);mLineEdits->hide();}
     protected:
         void mouseDoubleClickEvent(QMouseEvent *event);
         void contextMenuEvent(QContextMenuEvent *event);