[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [parley/viewsinlibrary] src: Replace BrowserWidget with KEduVocBrowserWidget
From:       Rahul Chowdhury <rahulc93 () gmail ! com>
Date:       2015-08-07 19:32:56
Message-ID: E1ZNnNw-0004dD-3S () scm ! kde ! org
[Download RAW message or body]

Git commit b481e4ee2c2fd2c6f1874663e35ae32870953584 by Rahul Chowdhury.
Committed on 07/08/2015 at 19:32.
Pushed by rahulc into branch 'viewsinlibrary'.

Replace BrowserWidget with KEduVocBrowserWidget

M  +2    -2    src/CMakeLists.txt
M  +5    -2    src/editor/editor.cpp

http://commits.kde.org/parley/b481e4ee2c2fd2c6f1874663e35ae32870953584

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2dfb749..0e24e51 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ set(parley_LIB_SRCS
     collection/testentry.cpp
     collection/entryfilter.cpp
     editor/editor.cpp
-    editor/browserwidget.cpp
+    #editor/browserwidget.cpp
     practice/abstractwidget.cpp
     practice/sessionmanagerbase.cpp
     practice/sessionmanagercontinuous.cpp
@@ -83,7 +83,7 @@ set(parley_LIB_SRCS
 
 ki18n_wrap_ui(parley_LIB_SRCS
     collection/entryfilter.ui
-    editor/browserwidget.ui
+    #editor/browserwidget.ui
     practice/practicesummarywidget.ui
     practice/practice_mainwindow.ui
     practice/practice_widget_comparison.ui
diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp
index 2d48f0d..4ea688e 100644
--- a/src/editor/editor.cpp
+++ b/src/editor/editor.cpp
@@ -21,7 +21,6 @@
 // Qt models on top of the KEduVocDocument
 
 
-#include "browserwidget.h"
 #include "parleymainwindow.h"
 
 #include "settings/parleyprefs.h"
@@ -44,6 +43,7 @@
 #include <keduvocwordtypeview.h>
 #include <keduvoclessonview.h>
 #include <keduvocaudiowidget.h>
+#include <keduvocbrowserwidget.h>
 #include <keduvocmultiplechoicewidget.h>
 #include <keduvoccomparisonwidget.h>
 #include <keduvocinflectionwidget.h>
@@ -58,6 +58,7 @@
 #include <KToggleAction>
 #include <KActionMenu>
 #include <KCharSelect>
+#include <KLocalizedString>
 
 #include <QTimer>
 #include <QSignalMapper>
@@ -68,6 +69,8 @@
 #include <QScrollArea>
 #include <QLineEdit>
 #include <QLabel>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 
 using namespace Editor;
 
@@ -377,7 +380,7 @@ void EditorWindow::initDockWidgets()
     QDockWidget *browserDock = new QDockWidget(i18n("Internet"), this);
     browserDock->setObjectName("BrowserDock");
     //TinyWebBrowser *browserWidget = new TinyWebBrowser(this);
-    BrowserWidget *htmlPart = new BrowserWidget(browserDock);
+    KEduVocBrowserWidget *htmlPart = new KEduVocBrowserWidget( browserDock );
     QScrollArea *browserScrollArea = new QScrollArea(this);
     browserScrollArea->setWidgetResizable(true);
     //browserScrollArea->setWidget(htmlPart);
[prev in list] [next in list] [prev in thread] [next in thread]