kit/ForKit.cpp | 3 ++- kit/Kit.cpp | 7 +++---- loleaflet/dist/toolbar/toolbar.js | 8 ++++---- loleaflet/src/control/Control.Menubar.js | 4 +++- loolwsd-systemplate-setup | 2 ++ 5 files changed, 14 insertions(+), 10 deletions(-)
New commits: commit 416c4a526731113b241b61c07bc1c1ea17f82b0e Author: Henry Castro <hcas...@collabora.com> Date: Fri Dec 16 22:34:53 2016 -0400 Revert "disable 'Insert Special Character' for Impress" This reverts commit 0e786d14a0681e5ff9e8b421704593972e0c0a27. diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index bd24fb5..c122c59 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -825,8 +825,8 @@ map.on('doclayerinit', function () { case 'presentation': var presentationToolbar = w2ui['presentation-toolbar']; presentationToolbar.show('presentation', 'presentationbreak', 'insertpage', 'duplicatepage', 'deletepage'); - toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending', 'specialcharacter'); - toolbarUpMore.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending', 'specialcharacter'); + toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); + toolbarUpMore.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); statusbar.insert('left', [ {type: 'break', id:'break1'}, {type: 'html', id: 'PageStatus', @@ -834,8 +834,8 @@ map.on('doclayerinit', function () { ]); break; case 'drawing': - toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending', 'specialcharacter'); - toolbarUpMore.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending', 'specialcharacter'); + toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); + toolbarUpMore.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); break; } toolbarUp.refresh(); diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 4da078a..e854d5b 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -187,7 +187,9 @@ L.Control.Menubar = L.Control.extend({ {name: _('Reset zoom'), id: 'zoomreset', type: 'action'}] }, {name: _('Insert'), type: 'menu', menu: [ - {name: _('Image'), id: 'insertgraphic', type: 'action'}] + {name: _('Image'), id: 'insertgraphic', type: 'action'}, + {type: 'separator'}, + {name: _('Special character...'), id: 'specialcharacter', type: 'action'}] }, {name: _('Tables'), type: 'menu', menu: [ {name: _('Insert'), type: 'menu', menu: [ commit 20f6d8cdc77659cbce9b4b8f508b61cc9bf18b3e Author: Henry Castro <hcas...@collabora.com> Date: Fri Dec 16 22:32:05 2016 -0400 kit: cosmetic Required to custom lokit process debug diff --git a/kit/Kit.cpp b/kit/Kit.cpp index 5da9d5b..8c7b95d 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -1612,10 +1612,6 @@ void lokit_main(const std::string& childRoot, assert(loKit); LOG_INF("Process is ready."); - // Open websocket connection between the child process and WSD. - HTTPClientSession cs("127.0.0.1", MasterPortNumber); - cs.setTimeout(0); - std::string requestUrl = std::string(NEW_CHILD_URI) + "pid=" + pid; if (queryVersion) { @@ -1629,6 +1625,9 @@ void lokit_main(const std::string& childRoot, free(versionInfo); } + // Open websocket connection between the child process and WSD. + HTTPClientSession cs("127.0.0.1", MasterPortNumber); + cs.setTimeout(0); HTTPRequest request(HTTPRequest::HTTP_GET, requestUrl); HTTPResponse response; auto ws = std::make_shared<LOOLWebSocket>(cs, request, response); commit e71c0046e7be46d41dcaeca729417f2e595400cb Author: Henry Castro <hcas...@collabora.com> Date: Fri Dec 16 22:25:02 2016 -0400 kit: save first lokit PID This is required to debug preinit stage diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp index b727817..60595b1 100644 --- a/kit/ForKit.cpp +++ b/kit/ForKit.cpp @@ -393,7 +393,8 @@ int main(int argc, char** argv) // We must have at least one child, more are created dynamically. // Ask this first child to send version information to master process - if (createLibreOfficeKit(childRoot, sysTemplate, loTemplate, loSubPath, true) < 0) + Process::PID forKitPid = createLibreOfficeKit(childRoot, sysTemplate, loTemplate, loSubPath, true); + if (forKitPid < 0) { Log::fatal("Failed to create a kit process."); std::_Exit(Application::EXIT_SOFTWARE); commit 8fdee3fca817598c14dffbfe03325fba8757f7d2 Author: Henry Castro <hcas...@collabora.com> Date: Fri Dec 16 22:17:44 2016 -0400 script: copy additional documents This is only for debugging purpose diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup index 0d30524..9a47b40 100755 --- a/loolwsd-systemplate-setup +++ b/loolwsd-systemplate-setup @@ -91,7 +91,9 @@ fi if test "z$ENABLE_DEBUG" != "z" -a "z$HOME" != "z"; then echo "Copying development users's fonts into systemplate" mkdir -p $CHROOT/$HOME + mkdir -p $CHROOT/$HOME/docs test -d $HOME/.fonts && cp -r -p -L $HOME/.fonts $CHROOT/$HOME + test -d $HOME/docs && cp -r -p -L $HOME/docs $CHROOT/$HOME fi exit 0 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits