Commit b54c2f51 authored by Andreas Traczyk's avatar Andreas Traczyk

chatview: use init_18n and set button titles

Change-Id: I54e17422df7787ad32f7b91028d7dd3602992b85
parent 78ef2305
...@@ -293,11 +293,15 @@ MessageWebView::slotLoadFinished() ...@@ -293,11 +293,15 @@ MessageWebView::slotLoadFinished()
{ {
insertStyleSheet("chatcss", Utils::QByteArrayFromFile(":/chatview.css")); insertStyleSheet("chatcss", Utils::QByteArrayFromFile(":/chatview.css"));
insertStyleSheet("chatwin",Utils::QByteArrayFromFile(":/chatview-windows.css")); insertStyleSheet("chatwin",Utils::QByteArrayFromFile(":/chatview-windows.css"));
page()->runJavaScript(Utils::QByteArrayFromFile(":/jed.js"), QWebEngineScript::MainWorld);
page()->runJavaScript(Utils::QByteArrayFromFile(":/linkify.js"), QWebEngineScript::MainWorld); page()->runJavaScript(Utils::QByteArrayFromFile(":/linkify.js"), QWebEngineScript::MainWorld);
page()->runJavaScript(Utils::QByteArrayFromFile(":/linkify-html.js"), QWebEngineScript::MainWorld); page()->runJavaScript(Utils::QByteArrayFromFile(":/linkify-html.js"), QWebEngineScript::MainWorld);
page()->runJavaScript(Utils::QByteArrayFromFile(":/linkify-string.js"), QWebEngineScript::MainWorld); page()->runJavaScript(Utils::QByteArrayFromFile(":/linkify-string.js"), QWebEngineScript::MainWorld);
page()->runJavaScript(Utils::QByteArrayFromFile(":/qwebchannel.js"), QWebEngineScript::MainWorld); page()->runJavaScript(Utils::QByteArrayFromFile(":/qwebchannel.js"), QWebEngineScript::MainWorld);
page()->runJavaScript(Utils::QByteArrayFromFile(":/chatview.js"), QWebEngineScript::MainWorld); page()->runJavaScript(Utils::QByteArrayFromFile(":/chatview.js"), QWebEngineScript::MainWorld);
QString s = QString::fromLatin1("init_i18n();");
page()->runJavaScript(s, QWebEngineScript::MainWorld);
} }
void void
......
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
<file alias="chatview.css">../lrc/src/web-chatview/chatview.css</file> <file alias="chatview.css">../lrc/src/web-chatview/chatview.css</file>
<file alias="chatview.html">../lrc/src/web-chatview/chatview.html</file> <file alias="chatview.html">../lrc/src/web-chatview/chatview.html</file>
<file alias="chatview.js">../lrc/src/web-chatview/chatview.js</file> <file alias="chatview.js">../lrc/src/web-chatview/chatview.js</file>
<file alias="jed.js">../lrc/src/web-chatview/jed.js</file>
<file alias="linkify.js">../lrc/src/web-chatview/linkify.js</file> <file alias="linkify.js">../lrc/src/web-chatview/linkify.js</file>
<file alias="linkify-html.js">../lrc/src/web-chatview/linkify-html.js</file> <file alias="linkify-html.js">../lrc/src/web-chatview/linkify-html.js</file>
<file alias="linkify-string.js">../lrc/src/web-chatview/linkify-string.js</file> <file alias="linkify-string.js">../lrc/src/web-chatview/linkify-string.js</file>
......
...@@ -841,6 +841,7 @@ del /s /q $(OutDir)\Jami.exp</Command> ...@@ -841,6 +841,7 @@ del /s /q $(OutDir)\Jami.exp</Command>
<None Include="..\lrc\src\web-chatview\chatview.css" /> <None Include="..\lrc\src\web-chatview\chatview.css" />
<None Include="..\lrc\src\web-chatview\chatview.html" /> <None Include="..\lrc\src\web-chatview\chatview.html" />
<None Include="..\lrc\src\web-chatview\chatview.js" /> <None Include="..\lrc\src\web-chatview\chatview.js" />
<None Include="..\lrc\src\web-chatview\jed.js" />
<None Include="..\lrc\src\web-chatview\linkify-html.js" /> <None Include="..\lrc\src\web-chatview\linkify-html.js" />
<None Include="..\lrc\src\web-chatview\linkify-string.js" /> <None Include="..\lrc\src\web-chatview\linkify-string.js" />
<None Include="..\lrc\src\web-chatview\linkify.js" /> <None Include="..\lrc\src\web-chatview\linkify.js" />
......
...@@ -684,6 +684,9 @@ ...@@ -684,6 +684,9 @@
<None Include="..\lrc\src\web-chatview\qwebchannel.js"> <None Include="..\lrc\src\web-chatview\qwebchannel.js">
<Filter>Resource Files\web</Filter> <Filter>Resource Files\web</Filter>
</None> </None>
<None Include="..\lrc\src\web-chatview\jed.js">
<Filter>Resource Files\web</Filter>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<QtUic Include="aboutdialog.ui"> <QtUic Include="aboutdialog.ui">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment