[Libreoffice-commits] core.git: Branch 'distro/collabora/viewer2' - 13 commits - android/CustomTarget_lo_android.mk android/experimental
android/CustomTarget_lo_android.mk
|2
android/experimental/LOAndroid3/res/layout/file_list_item.xml
| 24 -
android/experimental/LOAndroid3/res/menu/view_menu.xml
|4
android/experimental/LOAndroid3/res/values/strings.xml
|6
android/experimental/LOAndroid3/res/values/themes.xml
|6
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|2
android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
|3
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
| 205 --
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java
| 124 +++---
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
| 34 -
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
| 166
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/ListItemAdapter.java
| 178
12 files changed, 292 insertions(+), 462 deletions(-)
New commits:
commit 14bf4870120857eca5ae4f6da15899418f6bc9a3
Author: Siqi Liu m...@siqi.fr
Date: Thu Apr 23 15:22:31 2015 +0200
intent preference overrides default prefs.
Change-Id: I315d283f6c000d971421a098264e9c594930283e
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index fd08574..938a259 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -501,6 +501,27 @@ public class LibreOfficeUIActivity extends
ActionBarActivity implements ActionBa
sortMode = prefs.getInt(SORT_MODE_KEY, FileUtilities.SORT_AZ);
SharedPreferences defaultPrefs =
PreferenceManager.getDefaultSharedPreferences(getBaseContext());
filterMode = Integer.valueOf(defaultPrefs.getString(FILTER_MODE_KEY ,
-1));
+
+Intent i = this.getIntent();
+if (i.hasExtra(CURRENT_DIRECTORY_KEY)) {
+try {
+currentDirectory = documentProvider.createFromUri(new URI(
+i.getStringExtra(CURRENT_DIRECTORY_KEY)));
+} catch (URISyntaxException e) {
+currentDirectory = documentProvider.getRootDirectory();
+}
+Log.d(LOGTAG, CURRENT_DIRECTORY_KEY);
+}
+
+if (i.hasExtra(FILTER_MODE_KEY)) {
+filterMode = i.getIntExtra( FILTER_MODE_KEY, FileUtilities.ALL);
+Log.d(LOGTAG, FILTER_MODE_KEY);
+}
+
+if (i.hasExtra(EXPLORER_VIEW_TYPE_KEY)) {
+viewMode = i.getIntExtra( EXPLORER_VIEW_TYPE_KEY, GRID_VIEW);
+Log.d(LOGTAG, EXPLORER_VIEW_TYPE_KEY);
+}
}
@Override
commit 1ef31fdf5eabd3c4b14d828021652d53da054c66
Author: Siqi Liu m...@siqi.fr
Date: Thu Apr 23 15:19:28 2015 +0200
load default prefs once and use new sortmode/filter mode on refresh.
Change-Id: I54c3e25e960ade172eeb0f4bf24104b3b06e2ee2
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 3c269bf..fd08574 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -107,6 +107,7 @@ public class LibreOfficeUIActivity extends
ActionBarActivity implements ActionBa
DocumentProviderFactory.initialize(this);
documentProviderFactory = DocumentProviderFactory.getInstance();
+readPreferences();
// init UI and populate with contents from the provider
createUI();
switchToDocumentProvider(documentProviderFactory.getDefaultProvider());
@@ -496,11 +497,10 @@ public class LibreOfficeUIActivity extends
ActionBarActivity implements ActionBa
public void readPreferences(){
prefs = getSharedPreferences(EXPLORER_PREFS_KEY, MODE_PRIVATE);
-viewMode = prefs.getInt( EXPLORER_VIEW_TYPE_KEY, GRID_VIEW);
-sortMode = prefs.getInt( SORT_MODE_KEY, FileUtilities.SORT_AZ );
-SharedPreferences defaultPrefs =
PreferenceManager.getDefaultSharedPreferences( getBaseContext() );
-filterMode = Integer.valueOf( defaultPrefs.getString
[Libreoffice-commits] core.git: 2 commits - android/README libreofficekit/README
android/README| 20 +++- libreofficekit/README | 18 +- 2 files changed, 36 insertions(+), 2 deletions(-) New commits: commit 6bea14a701d1b9d4442e442dd5fe1ddb8c4c4aba Author: Siqi Liu m...@siqi.fr Date: Tue Apr 14 21:14:46 2015 +0200 add gdb debugging info on gtktiledviewer Change-Id: I1460131d25212266b910d76a7713d1e973f7c415 diff --git a/libreofficekit/README b/libreofficekit/README index 8e32e62..669cb80 100644 --- a/libreofficekit/README +++ b/libreofficekit/README @@ -23,7 +23,7 @@ functionality as in LibreOfficeKit.h.) An example program (currently using the older shim.c/static library integration) can be seen on: -https://github.com/ojwb/lloconv +https://github.com/ojwb/lloconv Tiled Rendering --- @@ -86,6 +86,22 @@ once a feature works there, then implement the Android part, with its slower development iteration (slow uploading to the device, the need to link all object files into a single .so, etc). +* Debugging with gdb and gtktiledviewer + +To run gtktiledviewer: + +bin/run gtktiledviewer $PWD/instdir/program path/to/test.odt + +To receive all incoming evetns from core use G_MESSAGES_DEBUG=all + +G_MESSAGES_DEBUG=all bin/run gtktiledviewer $PWD/instdir/program ../test.odt + +To debug with gdb: + +export LO_TRACE='gdb --tui --args' + +before bin/run, this will run gtktiledviewer in the debugger instead. + LibreOfficeKitGtk * commit 2932bf06be3676af81c9433eb99372031080b636 Author: Siqi Liu m...@siqi.fr Date: Tue Apr 14 21:09:16 2015 +0200 add debugging missing services to README Change-Id: Ib30a0e3d56ca9ebd07ee55e0aee9b13c0474a060 diff --git a/android/README b/android/README index 0989cf6..6b5e22b 100644 --- a/android/README +++ b/android/README @@ -145,7 +145,7 @@ Overlay Overlay elements like cursor and selections aren't drawn by the LO core, instead the core only provides data (cursor position, selection rectangles) and the app needs to draw them. DocumentOverlay (org.libreoffice.overlay.DocumentOverlay) and DocumentOverlayView -(org.libreoffice.overlay.DocumentOverlayView) are the classes that provide the overlay over +(org.libreoffice.overlay.DocumentOverlayView) are the classes that provide the overlay over the document, where selections and the cursor is drawn. Emulator and debugging notes @@ -239,6 +239,24 @@ started debuggable application. Assuming that you're already in the LOAndroid3 directory in your shell. +* Debugging the missing services + +Android library only include essential services that are compiled for +LibreOffice in order to reduce the size of the apk. When developing, +some services might become useful and we should add those services +to the combined library. + +In order to identify missing services, we need to be able to receive +SAL_INFO from cppuhelper/source/shlib.cxx in logcat and therefore identify +what services are missing. To do so, you may want add the following +when configuring the build. + +--enable-selective-debuginfo=cppuhelper/ sal/ + +Which services are combined in the android lib is determined by + +solenv/bin/native-code.py + * Common Errors / Gotchas lo_dlneeds: Could not read ELF header of /data/data/org.libreoffice...libfoo.so ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |4 1 file changed, 4 insertions(+) New commits: commit d0113938fc1d3996921c683c1fd2ce244083cb02 Author: Siqi Liu m...@siqi.fr Date: Tue Apr 14 14:31:31 2015 +0200 add missing services to allow writer to save. Change-Id: Ica21cefb705f4140b9f298e09be04b4950407b78 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index f48c8e0..adb7eaa 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -271,10 +271,14 @@ writer_constructor_list = [ com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation, # sw/util/sw.component com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation, +com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation, com_sun_star_comp_Writer_XMLOasisImporter_get_implementation, com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation, +com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation, com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation, +com_sun_star_comp_Writer_XMLOasisSettingsExporter_get_implementation, com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation, +com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation, # sw/util/swd.component com_sun_star_comp_writer_FormatDetector_get_implementation, # writerfilter/util/writerfilter.component ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/res/values/strings.xml
|3 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 17 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
| 13 +++
3 files changed, 27 insertions(+), 6 deletions(-)
New commits:
commit bbfe124bfb37ac6b99f4016da02bd105c26177d0
Author: Siqi Liu m...@siqi.fr
Date: Tue Apr 14 15:10:15 2015 +0200
disable saving on .tmp files.
Change-Id: I80af505d0dd9a71eda5d640dd336a034288a574d
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml
b/android/experimental/LOAndroid3/res/values/strings.xml
index ffce3d8..d7a430e 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -8,6 +8,7 @@
string name=app_descriptionLibreOffice Viewer is a document viewer
based on LibreOffice./string
string name=app_creditshttp://www.libreoffice.org/string
string name=app_vendorThis release was supplied by $VENDOR./string
+string name=temp_file_saving_disabledThis file is read-only, saving is
disabled./string
string name=about_licenseShow License/string
string name=about_noticeShow Notice/string
@@ -34,6 +35,8 @@
!-- Document provider names --
string name=local_documentsLocal documents/string
string name=local_file_systemLocal file system/string
+
+!-- Edit action names --
string name=action_boldBold/string
string name=action_underlineUnderline/string
string name=action_italicItalic/string
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index e0d4098..8f4e480 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -70,6 +70,11 @@ public class LibreOfficeMainActivity extends
ActionBarActivity {
// Inflate the menu; this adds items to the action bar if it is
present.
getMenuInflater().inflate(R.menu.main, menu);
mToolbarController.setOptionMenu(menu);
+
+if (mTempFile != null) {
+mToolbarController.disableMenuItem(R.id.action_save, true);
+Toast.makeText(this,
getString(R.string.temp_file_saving_disabled), Toast.LENGTH_LONG).show();
+}
return super.onCreateOptionsMenu(menu);
}
@@ -124,6 +129,12 @@ public class LibreOfficeMainActivity extends
ActionBarActivity {
mMainHandler = new Handler();
+setContentView(R.layout.activity_main);
+
+Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+setSupportActionBar(toolbar);
+mToolbarController = new ToolbarController(this,
getSupportActionBar(), toolbar);
+
if (getIntent().getData() != null) {
if
(getIntent().getData().getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
if (copyFileToTemp() mTempFile != null) {
@@ -138,12 +149,6 @@ public class LibreOfficeMainActivity extends
ActionBarActivity {
mInputFile = DEFAULT_DOC_PATH;
}
-setContentView(R.layout.activity_main);
-
-Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-setSupportActionBar(toolbar);
-mToolbarController = new ToolbarController(this,
getSupportActionBar(), toolbar);
-
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
index 1201b40..dde1a61 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
@@ -38,6 +38,19 @@ public class ToolbarController {
switchToViewMode();
}
+public void disableMenuItem(final int menuItemId, final boolean disabled) {
+LOKitShell.getMainHandler().post(new Runnable() {
+public void run() {
+MenuItem menuItem = mOptionsMenu.findItem(menuItemId);
+if (menuItem != null) {
+menuItem.setEnabled(!disabled);
+} else {
+Log.e(LOGTAG, MenuItem not found.);
+}
+}
+});
+}
+
public void onToggleStateChanged(int type, boolean pressed) {
MenuItem menuItem = null;
Bitmap icon = null;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source sd/source sfx2/source
sc/inc/document.hxx|1 +
sc/source/ui/docshell/docsh.cxx| 10 ++
sc/source/ui/inc/docsh.hxx |3 +++
sd/source/ui/docshell/docshell.cxx | 15 +++
sd/source/ui/inc/DrawDocShell.hxx |3 +++
sfx2/source/doc/objcont.cxx|1 +
6 files changed, 33 insertions(+)
New commits:
commit afb82d3729bda2754d0add08cc6c4dce1dc76d59
Author: Siqi Liu m...@siqi.fr
Date: Tue Apr 14 00:55:04 2015 +0200
implement SfxObjectShell subclasses' LOK interface
Change-Id: Iee2fbf71375631a349992a90c67c1c4c34e6ba3b
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index a9f5380..b88ffec 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -766,6 +766,7 @@ public:
SfxBindings*GetViewBindings();
SfxObjectShell* GetDocumentShell() const{ return pShell; }
SC_DLLPUBLIC ScDrawLayer* GetDrawLayer() { return pDrawLayer; }
+SC_DLLPUBLIC const ScDrawLayer* GetDrawLayer() const { return pDrawLayer;
}
SfxBroadcaster* GetDrawBroadcaster(); // to avoid header
voidBeginDrawUndo();
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 1261dab..79ce486 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3181,4 +3181,14 @@ bool ScDocShell::GetProtectionHash( /*out*/
::com::sun::star::uno::Sequence sal
return bRes;
}
+void ScDocShell::libreOfficeKitCallback(int nType, const char* pPayload) const
+{
+aDocument.GetDrawLayer()-libreOfficeKitCallback(nType, pPayload);
+}
+
+bool ScDocShell::isTiledRendering() const
+{
+return aDocument.GetDrawLayer()-isTiledRendering();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 340508c..5cd1d00 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -430,6 +430,9 @@ public:
virtual boolGetProtectionHash( /*out*/
::com::sun::star::uno::Sequence sal_Int8 rPasswordHash ) SAL_OVERRIDE;
void SnapVisArea( Rectangle rRect ) const;
+
+virtual void libreOfficeKitCallback(int nType, const char* pPayload) const
SAL_OVERRIDE;
+virtual bool isTiledRendering() const SAL_OVERRIDE;
};
void UpdateAcceptChangesDialog();
diff --git a/sd/source/ui/docshell/docshell.cxx
b/sd/source/ui/docshell/docshell.cxx
index b848bec..f51d934 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -468,6 +468,21 @@ void DrawDocShell::ClearUndoBuffer()
pUndoManager-Clear();
}
+void DrawDocShell::libreOfficeKitCallback(int nType, const char* pPayload)
const
+{
+if (mpDoc)
+mpDoc-libreOfficeKitCallback(nType, pPayload);
+}
+
+bool DrawDocShell::isTiledRendering() const
+{
+if (!mpDoc)
+return false;
+return mpDoc-isTiledRendering();
+}
+
+
+
} // end of namespace sd
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/DrawDocShell.hxx
b/sd/source/ui/inc/DrawDocShell.hxx
index bd7fec4..5b25bb8 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -204,6 +204,9 @@ public:
voidClearUndoBuffer();
+virtual void libreOfficeKitCallback(int nType, const char* pPayload) const
SAL_OVERRIDE;
+virtual bool isTiledRendering() const SAL_OVERRIDE;
+
protected:
SdDrawDocument* mpDoc;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 40d1e19..6fdc691 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -646,6 +646,7 @@ bool SfxObjectShell::IsModifyPasswordEntered()
void SfxObjectShell::libreOfficeKitCallback(SAL_UNUSED_PARAMETER int nType,
SAL_UNUSED_PARAMETER const char* pPayload) const {
SAL_WARN(tiled-rendering, LOK callback interface not overridden for
SfxObjectShell subclass typeId: typeid(*this).name());
}
+
bool SfxObjectShell::isTiledRendering() const {
SAL_WARN(tiled-rendering, LOK callback interface not overridden for
SfxObjectShell subclass typeId: typeid(*this).name());
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - android/Bootstrap android/experimental include/LibreOfficeKit include/sfx2 libreofficekit/source sfx2/source sw/inc sw/source
android/Bootstrap/src/org/libreoffice/kit/Document.java
| 10 +
android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
| 23 +++
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|6
android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
| 63 +-
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/ImageUtils.java
| 24 +++
include/LibreOfficeKit/LibreOfficeKitEnums.h
|9 +
include/sfx2/objsh.hxx
| 11 +
include/sfx2/unoctitm.hxx
|2
libreofficekit/source/gtk/lokdocview.cxx
|6
sfx2/source/control/unoctitm.cxx
| 54 ++--
sfx2/source/doc/objcont.cxx
| 12 +
sw/inc/docsh.hxx
|5
sw/source/uibase/app/docsh.cxx
| 19 +++
13 files changed, 230 insertions(+), 14 deletions(-)
New commits:
commit 5cb2d709d6532929d3bc6a9e666c73975657ab4d
Author: Siqi Liu m...@siqi.fr
Date: Mon Apr 13 16:30:42 2015 +0200
format changes
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 41a20fe..f8c8ed0 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1017,7 +1017,8 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16
nSID, SfxItemState eSt
aEvent.Requery = sal_False;
aEvent.State = aState;
-if (pDispatcher pDispatcher-GetFrame()) {
+if (pDispatcher pDispatcher-GetFrame())
+{
InterceptLOKStateChangeEvent(
pDispatcher-GetFrame()-GetObjectShell(), aEvent);
}
@@ -1047,14 +1048,14 @@ void SfxDispatchController_Impl::StateChanged(
sal_uInt16 nSID, SfxItemState eSt
void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const
SfxObjectShell* objSh, const ::com::sun::star::frame::FeatureStateEvent
aEvent) const
{
-if (!objSh || !objSh-isTiledRendering()) {
+if (!objSh || !objSh-isTiledRendering())
return;
-}
if (aEvent.FeatureURL.Path == Bold ||
-aEvent.FeatureURL.Path == Italic ||
-aEvent.FeatureURL.Path == Underline ||
-aEvent.FeatureURL.Path == StrikeOut) {
+aEvent.FeatureURL.Path == Italic ||
+aEvent.FeatureURL.Path == Underline ||
+aEvent.FeatureURL.Path == StrikeOut)
+{
OUStringBuffer aBuffer;
aBuffer.append(aEvent.FeatureURL.Complete);
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 9df4e54..aadb707 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1302,15 +1302,15 @@ bool SwDocShell::GetProtectionHash( /*out*/
::com::sun::star::uno::Sequence sal
void SwDocShell::libreOfficeKitCallback(int nType, const char* pPayload) const
{
-if (!m_pDoc) {
+if (!m_pDoc)
return;
-}
SwDrawModel* pDrawModel =
m_pDoc-getIDocumentDrawModelAccess().GetDrawModel();
pDrawModel-libreOfficeKitCallback(nType, pPayload);
}
-bool SwDocShell::isTiledRendering() const {
+bool SwDocShell::isTiledRendering() const
+{
SwDrawModel* pDrawModel =
m_pDoc-getIDocumentDrawModelAccess().GetDrawModel();
return pDrawModel-isTiledRendering();
}
commit 0632f77ee8059f2d65ad72bf148da88901732dc2
Author: Siqi Liu m...@siqi.fr
Date: Mon Apr 13 16:23:32 2015 +0200
LOK_STATE_CHANGED callback implemented with sfx events interception.
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index 385fab5..26ab856 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -4,6 +4,7 @@ import android.content.Intent;
import android.graphics.PointF;
import android.graphics.RectF;
import android.net.Uri;
+import android.util.Log;
import org.libreoffice.canvas.SelectionHandle;
import org.libreoffice.kit.Document;
@@ -73,19 +74,26 @@ public class InvalidationHandler implements
Document.MessageCallback {
LibreOfficeMainActivity.mAppContext.startActivity(urlIntent);
break;
case Document.CALLBACK_STATE_CHANGED:
-Log.d(Document.CALLBACK_STATE_CHANGED: + payload);
-String[] parts = payload.split(:);
-boolean pressed = Boolean.parseBoolean(parts[1
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 3 commits - android/Bootstrap android/experimental include/LibreOfficeKit include/sfx2 libreofficekit/source sfx2/source sw/inc sw/sour
android/Bootstrap/src/org/libreoffice/kit/Document.java
| 10 +
android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
| 23 +++
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|6
android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
| 63 +-
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/ImageUtils.java
| 24 +++
include/LibreOfficeKit/LibreOfficeKitEnums.h
|9 +
include/sfx2/objsh.hxx
| 11 +
include/sfx2/unoctitm.hxx
|2
libreofficekit/source/gtk/lokdocview.cxx
|6
sfx2/source/control/unoctitm.cxx
| 55 ++--
sfx2/source/doc/objcont.cxx
| 12 +
sw/inc/docsh.hxx
|5
sw/source/uibase/app/docsh.cxx
| 19 +++
13 files changed, 230 insertions(+), 15 deletions(-)
New commits:
commit d7e7111d5cfd881c91c66d1634000def4521
Author: Siqi Liu m...@siqi.fr
Date: Mon Apr 13 16:00:08 2015 +0200
minor indent change
Change-Id: I594f99721ab58abcfe4ac73ee71c3231a4f100ca
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 41a20fe..d610ff4 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1052,9 +1052,9 @@ void
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
}
if (aEvent.FeatureURL.Path == Bold ||
-aEvent.FeatureURL.Path == Italic ||
-aEvent.FeatureURL.Path == Underline ||
-aEvent.FeatureURL.Path == StrikeOut) {
+aEvent.FeatureURL.Path == Italic ||
+aEvent.FeatureURL.Path == Underline ||
+aEvent.FeatureURL.Path == StrikeOut) {
OUStringBuffer aBuffer;
aBuffer.append(aEvent.FeatureURL.Complete);
commit 567231ebf9cf937a7a9d6c98eac4d5bc46f0bce1
Author: Siqi Liu m...@siqi.fr
Date: Mon Apr 13 15:56:36 2015 +0200
LOK_STATE_CHANGED callback implemented with sfx events interception.
Change-Id: I2fdbb5bc8325761ac3dc567fcc5b51712dc5858e
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index 1d38882..b443a21 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -4,6 +4,7 @@ import android.content.Intent;
import android.graphics.PointF;
import android.graphics.RectF;
import android.net.Uri;
+import android.util.Log;
import org.libreoffice.canvas.SelectionHandle;
import org.libreoffice.kit.Document;
@@ -73,19 +74,26 @@ public class InvalidationHandler implements
Document.MessageCallback {
LibreOfficeMainActivity.mAppContext.startActivity(urlIntent);
break;
case Document.CALLBACK_STATE_CHANGED:
-Log.d(Document.CALLBACK_STATE_CHANGED: + payload);
-String[] parts = payload.split(:);
-boolean pressed = Boolean.parseBoolean(parts[1]);
-if (parts[0].equals(Bold)) {
-
LOKitShell.getToolbarController().onToggleStateChanged(Document.BOLD, pressed);
-} else if (parts[0].equals(Italic)) {
-
LOKitShell.getToolbarController().onToggleStateChanged(Document.ITALIC,
pressed);
-} else if (parts[0].equals(Underline)) {
-
LOKitShell.getToolbarController().onToggleStateChanged(Document.UNDERLINE,
pressed);
-} else if (parts[0].equals(Strikeout)) {
-
LOKitShell.getToolbarController().onToggleStateChanged(Document.STRIKEOUT,
pressed);
-}
+stateChanged(payload);
break;
+default:
+Log.d(LOGTAG, LOK_CALLBACK uncatched: + messageID + : +
payload);
+}
+}
+
+private void stateChanged(String payload) {
+String[] parts = payload.split(=);
+boolean pressed = Boolean.parseBoolean(parts[1]);
+if (parts[0].equals(.uno:Bold)) {
+
LOKitShell.getToolbarController().onToggleStateChanged(Document.BOLD, pressed);
+} else if (parts[0].equals(.uno:Italic)) {
+
LOKitShell.getToolbarController().onToggleStateChanged(Document.ITALIC,
pressed);
+} else if (parts[0].equals(.uno:Underline
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental
android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png |binary android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png |binary android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png |binary android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png |binary android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png |binary android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png |binary android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png |binary android/experimental/LOAndroid3/res/menu/main.xml | 14 +- android/experimental/LOAndroid3/res/values/strings.xml |2 + android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java |6 dev/null |binary 16 files changed, 21 insertions(+), 1 deletion(-) New commits: commit b4e48845662a3c4fde6f9c4fb2219f676cdd693c Author: Siqi Liu m...@siqi.fr Date: Mon Apr 6 11:58:49 2015 +0200 add italic/underline button with icons for different screen res Change-Id: Ib158f32af7ef8d65d4ddd822839b260161a74343 diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png b/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png new file mode 100644 index 000..950d615 Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png differ diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png b/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png new file mode 100644 index 000..399bb9c Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png differ diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png b/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png new file mode 100644 index 000..09f8b20 Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png differ diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png b/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png new file mode 100644 index 000..bc60968 Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png differ diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png b/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png new file mode 100644 index 000..6394cf9 Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png differ diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png b/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png new file mode 100644 index 000..3b6c7f6 Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png differ diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png new file mode 100644 index 000..95c985e Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png differ diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png new file mode 100644 index 000..e4366f4 Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png differ diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png new file mode 100644 index 000..421a750 Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png differ diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png new file mode 100644 index 000..c5256f5 Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png differ diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png b/android
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental
android/experimental/LOAndroid3/res/menu/main.xml
|8 ++--
android/experimental/LOAndroid3/res/values/strings.xml
|1 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|4
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 9d7142cd2615d1365b36d831be81d2adbde010bc
Author: Siqi Liu m...@siqi.fr
Date: Mon Apr 6 12:10:09 2015 +0200
add saving action placeholder
Change-Id: Ibb4595e297a4328f2bb108e1b9e71bb50843e3b9
diff --git a/android/experimental/LOAndroid3/res/menu/main.xml
b/android/experimental/LOAndroid3/res/menu/main.xml
index 1a1c22a..979bbd1 100644
--- a/android/experimental/LOAndroid3/res/menu/main.xml
+++ b/android/experimental/LOAndroid3/res/menu/main.xml
@@ -28,11 +28,15 @@
android:orderInCategory=100
app:showAsAction=always/
-item android:id=@+id/action_about
-android:title=@string/action_about
+item android:id=@+id/action_save
+android:title=@string/action_save
android:orderInCategory=100 /
item android:id=@+id/action_parts
android:title=@string/action_parts
android:orderInCategory=100 /
+
+item android:id=@+id/action_about
+android:title=@string/action_about
+android:orderInCategory=100 /
/menu
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml
b/android/experimental/LOAndroid3/res/values/strings.xml
index 939804d..0b9e7a2 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -38,5 +38,6 @@
string name=action_underlineUnderline/string
string name=action_italicItalic/string
string name=action_keyboardShow keyboard/string
+string name=action_saveSave/string
/resources
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index ed87f8c..4664687 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -16,6 +16,7 @@ import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
import android.widget.ListView;
+import android.widget.Toast;
import org.libreoffice.overlay.TextCursorLayer;
import org.mozilla.gecko.ZoomConstraints;
@@ -90,6 +91,9 @@ public class LibreOfficeMainActivity extends
ActionBarActivity {
case R.id.action_about:
mAbout.showAbout();
return true;
+case R.id.action_save:
+Toast.makeText(this, saving the document...,
Toast.LENGTH_SHORT).show();
+return true;
case R.id.action_parts:
mDrawerLayout.openDrawer(mDrawerList);
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental
android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png
|binary
android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png
|binary
android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png
|binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
|binary
android/experimental/LOAndroid3/res/menu/main.xml
|6 ++
android/experimental/LOAndroid3/res/values/strings.xml
|1 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|6 +-
7 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit c2418ab28f5593593468100549cf81e96d99b221
Author: Siqi Liu m...@siqi.fr
Date: Mon Apr 6 14:03:35 2015 +0200
implement strike out and .uno:Save
.uno:Save works out of box for when tested against documents (impress,
calc) loaded directly from dropbox for example. However, it doesn't work
with
impress/calc documents loaded from local files. Writer documents won't
save, either locally or from network resources. More research needed.
Change-Id: Ibdcc209a71f14ec91ba9c1152b305e0278787713
diff --git
a/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png
new file mode 100644
index 000..f7682ab
Binary files /dev/null and
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png
new file mode 100644
index 000..955f1cb
Binary files /dev/null and
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png
new file mode 100644
index 000..e9eccc8
Binary files /dev/null and
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
new file mode 100644
index 000..0b2c39f
Binary files /dev/null and
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
differ
diff --git a/android/experimental/LOAndroid3/res/menu/main.xml
b/android/experimental/LOAndroid3/res/menu/main.xml
index 979bbd1..09314f5 100644
--- a/android/experimental/LOAndroid3/res/menu/main.xml
+++ b/android/experimental/LOAndroid3/res/menu/main.xml
@@ -16,6 +16,12 @@
android:orderInCategory=100
app:showAsAction=always/
+item android:id=@+id/action_strikeout
+ android:title=@string/action_strikeout
+ android:icon=@drawable/action_strikeout
+ android:orderInCategory=100
+ app:showAsAction=always/
+
item android:id=@+id/action_underline
android:title=@string/action_underline
android:icon=@drawable/action_underline
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml
b/android/experimental/LOAndroid3/res/values/strings.xml
index 0b9e7a2..ffce3d8 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -37,6 +37,7 @@
string name=action_boldBold/string
string name=action_underlineUnderline/string
string name=action_italicItalic/string
+string name=action_strikeoutStrike Out/string
string name=action_keyboardShow keyboard/string
string name=action_saveSave/string
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 4664687..c831977 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -85,6 +85,9 @@ public class LibreOfficeMainActivity extends
ActionBarActivity {
case R.id.action_underline:
LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND,
.uno:Underline));
return true;
+case R.id.action_strikeout:
+LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND,
.uno:StrikeOut));
+return true;
case R.id.action_keyboard:
showSoftKeyboard();
break;
@@ -92,7 +95,8 @@ public class LibreOfficeMainActivity extends
ActionBarActivity {
mAbout.showAbout();
return true;
case R.id.action_save:
-Toast.makeText(this, saving the document
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - sc/inc sc/source sd/source
sc/inc/global.hxx |2 ++
sc/source/core/data/global.cxx | 14 +-
sc/source/ui/view/gridwin.cxx |3 +--
sd/source/ui/func/fusel.cxx|9 +
4 files changed, 25 insertions(+), 3 deletions(-)
New commits:
commit bcce230b1035e0409368f34c93a7562458719001
Author: Siqi Liu m...@siqi.fr
Date: Tue Mar 10 20:38:04 2015 +0100
make format consistent with the rest of the file...
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 6c4904a..c90ac59 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2291,10 +2291,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent
rMEvt )
// ScGlobal::OpenURL() only understands Calc A1 style syntax.
// Convert it to Calc A1 before calling OpenURL().
-
-if (pDoc-GetAddressConvention() ==
formula::FormulaGrammar::CONV_OOO) {
+if (pDoc-GetAddressConvention() ==
formula::FormulaGrammar::CONV_OOO)
ScGlobal::OpenURL(pViewData-GetDocument()-GetDrawLayer(),
aUrl, aTarget);
-}
else
{
ScAddress aTempAddr;
commit 6e85234a6e15f6a2f809a246ac2d36ad249a3256
Author: Siqi Liu m...@siqi.fr
Date: Tue Mar 10 20:32:00 2015 +0100
tdf#89705: make hyperlinks clickable on impress/calc
Change-Id: I3d35918a43dff789fad703cfc6b594a6dd3df47b
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 2c6c612..6b03dc4b 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -576,6 +576,8 @@ public:
static void SetUserList( const ScUserList* pNewList );
SC_DLLPUBLIC static const OUString GetRscString( sal_uInt16 nIndex
);
static void OpenURL( const OUString rURL, const OUString
rTarget );
+// Check if tiled-rendering, and leave clients to handle the openURL
action if that's the case, OpenURL otherwise.
+static void OpenURL( const SdrModel* pDrawLayer, const
OUString rURL, const OUString rTarget );
SC_DLLPUBLIC static OUStringGetAbsDocName( const OUString
rFileName,
SfxObjectShell* pShell );
SC_DLLPUBLIC static OUStringGetDocTabName( const OUString
rFileName,
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 6a0aaf0..81b28d5 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -44,6 +44,7 @@
#include time.h
#include ctype.h
#include numeric
+#include svx/svdmodel.hxx
#include i18nlangtag/mslangid.hxx
#include com/sun/star/lang/Locale.hpp
@@ -57,6 +58,8 @@
#include unotools/syslocale.hxx
#include unotools/transliterationwrapper.hxx
+#include LibreOfficeKit/LibreOfficeKitEnums.h
+
#include global.hxx
#include scresid.hxx
#include autoform.hxx
@@ -127,7 +130,6 @@ longScGlobal::nLastColWidthExtra=
STD_EXTRA_WIDTH;
static sal_uInt16 nPPTZoom = 0; // ScreenZoom used to determine nScreenPPTX/Y
-class SfxViewShell;
SfxViewShell* pScActiveViewShell = NULL; //FIXME: Make this a member
sal_uInt16 nScClickMouseModifier = 0;//FIXME: This too
sal_uInt16 nScFillModeMouseModifier = 0; //FIXME: And this
@@ -865,6 +867,16 @@ bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
return false;
}
+
+void ScGlobal::OpenURL( const SdrModel* pDrawLayer, const OUString rURL,
const OUString rTarget ) {
+if (pDrawLayer pDrawLayer-isTiledRendering()) {
+pDrawLayer-libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
rURL.toUtf8().getStr());
+return;
+}
+// Proceed to openURL if not tiled rendering.
+OpenURL(rURL, rTarget);
+}
+
void ScGlobal::OpenURL( const OUString rURL, const OUString rTarget )
{
// OpenURL is always called in the GridWindow by mouse clicks in some way
or another.
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index d980dfc..6c4904a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2292,8 +2292,9 @@ void ScGridWindow::MouseButtonUp( const MouseEvent rMEvt
)
// ScGlobal::OpenURL() only understands Calc A1 style syntax.
// Convert it to Calc A1 before calling OpenURL().
-if (pDoc-GetAddressConvention() ==
formula::FormulaGrammar::CONV_OOO)
-ScGlobal::OpenURL(aUrl, aTarget);
+if (pDoc-GetAddressConvention() ==
formula::FormulaGrammar::CONV_OOO) {
+ScGlobal::OpenURL(pViewData-GetDocument()-GetDrawLayer(),
aUrl, aTarget);
+}
else
{
ScAddress aTempAddr;
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index cba2104..1ace237 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -71,6 +71,8 @@
#include svx/sdrhittesthelper.hxx
+#include LibreOfficeKit/LibreOfficeKitEnums.h
+
using
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/wrtsh/wrtsh2.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 7ef570780a4ebb07e128681a96c35d6268c5e658
Author: Siqi Liu m...@siqi.fr
Date: Mon Mar 9 12:51:54 2015 +0100
use toUtf8 instead for string conversion
Change-Id: I1ec96957fba161a35ec2cf44f197ed3d7199dd89
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 01fab7a..4b26692 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -472,10 +472,8 @@ void LoadURL( SwViewShell rVSh, const OUString rURL,
sal_uInt16 nFilter,
return;
// We are doing tiledRendering, let the client handles the URL loading.
-if (rVSh.isTiledRendering())
-{
-rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
-OUStringToOString(rURL, RTL_TEXTENCODING_UTF8).getStr());
+if (rVSh.isTiledRendering()) {
+rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
rURL.toUtf8().getStr());
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/wrtsh/wrtsh2.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 8513f4f76ac1769533fe65a686fcd4eae739547b
Author: Siqi Liu m...@siqi.fr
Date: Sun Mar 8 23:11:16 2015 +0100
tdf#89705 hyperlink clickable in writer (not in impress, yet)
Change-Id: Ifaa6c0de7d9b91706985667b72195bcfc2d610cd
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 489aeba..a2bb960 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -66,6 +66,8 @@
#include xmloff/odffields.hxx
#include boost/scoped_ptr.hpp
+#include LibreOfficeKit/LibreOfficeKitEnums.h
+
void SwWrtShell::Insert(SwField rFld)
{
ResetCursorStack();
@@ -469,9 +471,17 @@ void LoadURL( SwViewShell rVSh, const OUString rURL,
sal_uInt16 nFilter,
if ( !rVSh.ISA(SwCrsrShell) )
return;
+// We are doing tiledRendering, let the client handles the URL loading.
+if (rVSh.isTiledRendering()) {
+rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
+OUStringToOString(rURL, RTL_TEXTENCODING_UTF8).getStr());
+return;
+}
+
//A CrsrShell is always a WrtShell
SwWrtShell rSh = static_castSwWrtShell(rVSh);
+
SwDocShell* pDShell = rSh.GetView().GetDocShell();
OSL_ENSURE( pDShell, No DocShell?!);
OUString sTargetFrame(rTargetFrameName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/Bootstrap android/experimental include/LibreOfficeKit
android/Bootstrap/src/org/libreoffice/kit/Document.java
|2 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 18 +-
include/LibreOfficeKit/LibreOfficeKitEnums.h
|8 +++-
3 files changed, 26 insertions(+), 2 deletions(-)
New commits:
commit ab934a73748a6f8b393f386968b6ce94e4f6a884
Author: Siqi Liu m...@siqi.fr
Date: Fri Mar 6 13:35:34 2015 +0100
tdf#89705: provides callback for url handling on android.
Change-Id: Ie28cd768519fbdc305f98e1d764d05bd209951ca
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 8c20f70..56d92b0 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -40,6 +40,8 @@ public class Document {
public static final int CALLBACK_TEXT_SELECTION_START = 3;
public static final int CALLBACK_TEXT_SELECTION_END = 4;
public static final int CALLBACK_CURSOR_VISIBLE = 5;
+// LOK_CALLBACK_GRAPHIC_SELECTION = 6
+public static final int CALLBACK_HYPERLINK_CLICKED = 7;
/**
* Text selection types
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 0ef12c6..179c6ff 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -5,6 +5,8 @@ import android.graphics.PointF;
import android.graphics.RectF;
import android.util.Log;
import android.view.KeyEvent;
+import android.net.Uri;
+import android.content.Intent;
import org.libreoffice.kit.DirectBufferAllocator;
import org.libreoffice.kit.Document;
@@ -411,10 +413,24 @@ public class LOKitTileProvider implements TileProvider,
Document.MessageCallback
*/
@Override
public void messageRetrieved(int messageID, String payload) {
+/**
+ * Handles messages that do not require entering editing mode.
+ */
+switch (messageID) {
+case Document.CALLBACK_HYPERLINK_CLICKED:
+if (!payload.startsWith(http://;)
+!payload.startsWith(https://;))
+payload = http://; + payload;
+
+Intent url_intent = new Intent(Intent.ACTION_VIEW);
+url_intent.setData(Uri.parse(payload));
+LibreOfficeMainActivity.mAppContext.startActivity(url_intent);
+return;
+}
+
if (!LOKitShell.isEditingEnabled()) {
return;
}
-
mInvalidationHandler.processMessage(messageID, payload);
}
}
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index cc5a32b..b8ab5f6 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -94,7 +94,13 @@ typedef enum
*
* Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
*/
-LOK_CALLBACK_GRAPHIC_SELECTION
+LOK_CALLBACK_GRAPHIC_SELECTION,
+
+/**
+ * User clicked on an hyperlink that should be handled by other
+ * applications accordingly.
+ */
+LOK_CALLBACK_HYPERLINK_CLICKED
}
LibreOfficeKitCallbackType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 3 commits - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|1
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
| 347 --
2 files changed, 174 insertions(+), 174 deletions(-)
New commits:
commit 6a7b05fb8c80786c9659aafbc6dd798ecf0d486e
Author: Siqi Liu m...@siqi.fr
Date: Fri Mar 6 11:48:03 2015 +0100
add missing Activity import
Change-Id: I892b66265b411ea6f727bdacf41b45de055b2a37
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 0634c1d..2f2eada 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -1,5 +1,6 @@
package org.libreoffice;
+import android.app.Activity;
import android.app.AlertDialog;
import android.content.ContentResolver;
import android.content.Context;
commit baa2330a321629c82ce2e18e63ace0f2b19ef606
Author: Siqi Liu m...@siqi.fr
Date: Fri Mar 6 11:47:21 2015 +0100
reapply changes to LayerView
Change-Id: I597621a0a68cf484d5117a5f5b77c3d122b14822
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
index 3f0fb78..88d93ca 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -28,6 +28,7 @@ import android.widget.FrameLayout;
import org.libreoffice.LibreOfficeMainActivity;
import org.libreoffice.R;
import org.mozilla.gecko.OnInterceptTouchListener;
+import org.mozilla.gecko.OnSlideSwipeListener;
/**
* A view rendered by the layer compositor.
@@ -110,6 +111,7 @@ public class LayerView extends FrameLayout {
setFocusableInTouchMode(true);
createGLThread();
+setOnTouchListener(new OnSlideSwipeListener(getContext(),
mLayerClient));
}
public void show() {
commit d70dfd380684dbc9dbee55be11576905e40b5a34
Author: Siqi Liu m...@siqi.fr
Date: Fri Mar 6 11:39:43 2015 +0100
revert changes on LayerView
Change-Id: I724a5bbc3dcb3372a3bf3810306658f4427b95a0
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
index c5b24fd..3f0fb78 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -28,7 +28,6 @@ import android.widget.FrameLayout;
import org.libreoffice.LibreOfficeMainActivity;
import org.libreoffice.R;
import org.mozilla.gecko.OnInterceptTouchListener;
-import org.mozilla.gecko.OnSlideSwipeListener;
/**
* A view rendered by the layer compositor.
@@ -111,349 +110,347 @@ public class LayerView extends FrameLayout {
setFocusableInTouchMode(true);
createGLThread();
-
-setOnTouchListener(new OnSlideSwipeListener(getContext(),
mLayerClient));
}
public void show() {
-// Fix this if TextureView support is turned back on above
-mSurfaceView.setVisibility(View.VISIBLE);
+// Fix this if TextureView support is turned back on above
+mSurfaceView.setVisibility(View.VISIBLE);
}
public void hide() {
-// Fix this if TextureView support is turned back on above
-mSurfaceView.setVisibility(View.INVISIBLE);
+// Fix this if TextureView support is turned back on above
+mSurfaceView.setVisibility(View.INVISIBLE);
}
public void destroy() {
-if (mLayerClient != null) {
-mLayerClient.destroy();
-}
-if (mRenderer != null) {
-mRenderer.destroy();
-}
+if (mLayerClient != null) {
+mLayerClient.destroy();
+}
+if (mRenderer != null) {
+mRenderer.destroy();
+}
}
public void setTouchIntercepter(final OnInterceptTouchListener
touchIntercepter) {
-// this gets run on the gecko thread, but for thread safety we
want the assignment
-// on the UI thread.
-post(new Runnable() {
-public void run() {
-mTouchIntercepter = touchIntercepter;
-}
-});
+// this gets run on the gecko thread, but for thread safety we want
the assignment
+// on the UI thread.
+post(new Runnable() {
+public void run() {
+mTouchIntercepter = touchIntercepter;
+}
+});
}
public void setInputConnectionHandler
[Libreoffice-commits] core.git: Branch 'distro/collabora/viewer' - 3 commits - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 17
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 13
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
|5
android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
| 62 -
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
|5
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
| 85 ++
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
| 349 +-
7 files changed, 282 insertions(+), 254 deletions(-)
New commits:
commit b5c0ecc7c4821df800b69aad0e14f2fddac2be96
Author: Siqi Liu m...@siqi.fr
Date: Thu Mar 5 14:26:03 2015 +0100
add getPartsCount() to TileProvider
Change-Id: I8f1f61110d06333bc1140caf13d9e96e669fc231
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index c37fdff..6550cc2 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -10,6 +10,7 @@ import org.libreoffice.kit.DirectBufferAllocator;
import org.libreoffice.kit.Document;
import org.libreoffice.kit.LibreOfficeKit;
import org.libreoffice.kit.Office;
+import org.libreoffice.R;
//import org.mozilla.gecko.TextSelection;
//import org.mozilla.gecko.TextSelectionHandle;
@@ -19,6 +20,7 @@ import org.mozilla.gecko.gfx.GeckoLayerClient;
import org.mozilla.gecko.gfx.IntSize;
import org.mozilla.gecko.gfx.LayerView;
+
import java.nio.ByteBuffer;
/**
@@ -144,19 +146,22 @@ public class LOKitTileProvider implements TileProvider,
Document.MessageCallback
}
@Override
+public int getPartsCount() {
+return mDocument.getParts();
+}
+
+@Override
public void onSwipeLeft() {
-Log.d(LOGTAG, onSwipeLeft received);
-if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION
- getCurrentPartNumber() mDocument.getParts()-1) {
+if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION
+getCurrentPartNumber() getPartsCount()-1) {
LOKitShell.sendChangePartEvent(getCurrentPartNumber()+1);
}
}
@Override
public void onSwipeRight() {
-Log.d(LOGTAG, onSwipeRight received);
-if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION
- getCurrentPartNumber() 0) {
+if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION
+getCurrentPartNumber() 0) {
LOKitShell.sendChangePartEvent(getCurrentPartNumber()-1);
}
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
index cb86ef0..c3cb586 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
@@ -114,6 +114,11 @@ public class MockTileProvider implements TileProvider {
}
@Override
+public int getPartsCount() {
+return 0;
+}
+
+@Override
public void onSwipeLeft() {
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
index 15a66dd..d7bcc7f 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
@@ -43,6 +43,11 @@ public interface TileProvider {
*/
int getCurrentPartNumber();
+/**
+ * Get the total number of parts.
+ */
+int getPartsCount();
+
Bitmap thumbnail(int size);
/**
commit da4367b2bd50f12a12b371a95bbeb4251234fb46
Author: Siqi Liu m...@siqi.fr
Date: Thu Mar 5 13:58:15 2015 +0100
tdf#89174:disable swipe gesture when zoomed in.
Change-Id: I0c3a565a3ae276fb60bf99ec32941715f1556127
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
index 176faa5..0f231b0 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
@@ -9,15 +9,19 @@ import android.view.View.OnTouchListener;
import android.util.Log;
import org.libreoffice.LOKitShell;
+import org.mozilla.gecko.gfx.GeckoLayerClient;
+import org.mozilla.gecko.gfx.ImmutableViewportMetrics
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - android/experimental android/mobile-config.py
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
|5 +
android/mobile-config.py
|5 +
2 files changed, 10 insertions(+)
New commits:
commit 17552aaeff1d1d939fe99e2cbd5c5c6beddc863d
Author: Siqi Liu m...@siqi.fr
Date: Thu Mar 5 23:43:54 2015 +0100
tdf#89705: disable Ctrl+Click for mobile apps.
Change-Id: I7478b8e6be110ad226743281ac8fa6d77a2c15a0
diff --git a/android/mobile-config.py b/android/mobile-config.py
index aa5d86f..704b1e9 100755
--- a/android/mobile-config.py
+++ b/android/mobile-config.py
@@ -94,6 +94,11 @@ if __name__ == '__main__':
for value in prop.findall(value):
value.text = false
+# Disable follow link with Ctrl+Click, use Click only for mobile app.
+for prop in
root.findall('%(component-schema)s[@%(name)s=Common]/component/group[@%(name)s=Security]/group[@%(name)s=Scripting]/prop[@%(name)s=HyperlinksWithCtrlClick]'
% nsDict):
+for value in prop.findall(value):
+value.text = false
+
# Disable Impress View - Slide Pane
for prop in
root.findall('%(component-data)s[@%(name)s=Impress]/node[@%(name)s=MultiPaneGUI]/node[@%(name)s=SlideSorterBar]/node[@%(name)s=Visible]/prop[@%(name)s=ImpressView]'
% nsDict):
for value in prop.findall(value):
commit 62dcc4e15d5dfcd5103f4a7541bb40cd7a4bbd9e
Author: Siqi Liu m...@siqi.fr
Date: Thu Mar 5 20:43:48 2015 +0100
add license header
Change-Id: I9becbedb305daa95b39ebb084e358408df3d4d09
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
index 0f231b0..13dfca5 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
@@ -1,3 +1,8 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
package org.mozilla.gecko;
import android.content.Context;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/viewer' - 3 commits - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
|2
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
|8 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 14 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 20 +++
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 13 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
|8 +
android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
| 62 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
| 11 +
8 files changed, 138 insertions(+)
New commits:
commit db4209bf18ce52a825ccebd2fe78ead599a494b5
Author: Siqi Liu m...@siqi.fr
Date: Sat Feb 28 22:07:36 2015 +0100
remove unused boolean (propagating touchEvent instead of intercepting it)
Change-Id: If05cf04414572fea809104c7fed309afb2438bfd
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
index 1dc33f6..b1ee37e 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
@@ -27,7 +27,6 @@ public class OnSlideSwipeListener implements OnTouchListener {
@Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velX,
float velY) {
-boolean result = false;
try {
float diffY = e2.getY() - e1.getY();
float diffX = e2.getX() - e1.getX();
@@ -40,7 +39,6 @@ public class OnSlideSwipeListener implements OnTouchListener {
onSwipeLeft();
}
}
-result = true;
}
} catch (Exception exception) {
exception.printStackTrace();
commit d694ec67967d2ac29ca4d7106f68af48fa32fc21
Author: Siqi Liu m...@siqi.fr
Date: Sat Feb 28 21:50:12 2015 +0100
implement swiping gesture as a generic event
Conflicts:
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
Change-Id: I024db339bada34a544fdcc1def107c7b06332847
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
index 807d0d0..c7babde 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
@@ -21,6 +21,8 @@ public class LOEvent implements ComparableLOEvent {
public static final int TILE_INVALIDATION = 9;
public static final int TOUCH = 10;
public static final int KEY_EVENT = 11;
+public static final int SWIPE_RIGHT = 12;
+public static final int SWIPE_LEFT = 13;
public final int mType;
public int mPriority = 0;
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
index 2037e9d..ec0d701 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
@@ -101,6 +101,14 @@ public class LOKitShell {
LOKitShell.sendEvent(new LOEvent(LOEvent.SIZE_CHANGED, width, height));
}
+public static void sendSwipeRightEvent() {
+LOKitShell.sendEvent(new LOEvent(LOEvent.SWIPE_RIGHT));
+}
+
+public static void sendSwipeLeftEvent() {
+LOKitShell.sendEvent(new LOEvent(LOEvent.SWIPE_LEFT));
+}
+
public static void sendChangePartEvent(int part) {
LOKitShell.sendEvent(new LOEvent(LOEvent.CHANGE_PART, part));
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 9ec76be..63ee8e7 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -198,6 +198,12 @@ public class LOKitThread extends Thread {
case LOEvent.TILE_REEVALUATION_REQUEST:
tileReevaluationRequest(event.mComposedTileLayer);
break;
+case LOEvent.SWIPE_LEFT:
+onSwipeLeft();
+break;
+case LOEvent.SWIPE_RIGHT:
+onSwipeRight();
+break;
}
}
@@ -214,6 +220,14 @@ public class LOKitThread extends Thread
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 3 commits - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 17
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 13
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
|5
android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
| 62 -
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
|5
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
| 85 ++
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
| 349 +-
7 files changed, 282 insertions(+), 254 deletions(-)
New commits:
commit b7e150abc18f3de707e1392c746eaf7679fc2247
Author: Siqi Liu m...@siqi.fr
Date: Thu Mar 5 14:26:03 2015 +0100
add getPartsCount() to TileProvider
Change-Id: I8f1f61110d06333bc1140caf13d9e96e669fc231
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index f9fe8c3..0ef12c6 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -10,6 +10,7 @@ import org.libreoffice.kit.DirectBufferAllocator;
import org.libreoffice.kit.Document;
import org.libreoffice.kit.LibreOfficeKit;
import org.libreoffice.kit.Office;
+import org.libreoffice.R;
import org.mozilla.gecko.TextSelection;
import org.mozilla.gecko.TextSelectionHandle;
@@ -19,6 +20,7 @@ import org.mozilla.gecko.gfx.GeckoLayerClient;
import org.mozilla.gecko.gfx.IntSize;
import org.mozilla.gecko.gfx.LayerView;
+
import java.nio.ByteBuffer;
/**
@@ -147,19 +149,22 @@ public class LOKitTileProvider implements TileProvider,
Document.MessageCallback
}
@Override
+public int getPartsCount() {
+return mDocument.getParts();
+}
+
+@Override
public void onSwipeLeft() {
-Log.d(LOGTAG, onSwipeLeft received);
-if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION
- getCurrentPartNumber() mDocument.getParts()-1) {
+if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION
+getCurrentPartNumber() getPartsCount()-1) {
LOKitShell.sendChangePartEvent(getCurrentPartNumber()+1);
}
}
@Override
public void onSwipeRight() {
-Log.d(LOGTAG, onSwipeRight received);
-if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION
- getCurrentPartNumber() 0) {
+if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION
+getCurrentPartNumber() 0) {
LOKitShell.sendChangePartEvent(getCurrentPartNumber()-1);
}
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
index 09e12ef..8c34038 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
@@ -129,6 +129,11 @@ public class MockTileProvider implements TileProvider {
}
@Override
+public int getPartsCount() {
+return 0;
+}
+
+@Override
public void onSwipeLeft() {
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
index 7fb51d2..29e64a8 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
@@ -43,6 +43,11 @@ public interface TileProvider {
*/
int getCurrentPartNumber();
+/**
+ * Get the total number of parts.
+ */
+int getPartsCount();
+
Bitmap thumbnail(int size);
/**
commit 944deb5ab00b5f686070b03336e93cf7ba63ab07
Author: Siqi Liu m...@siqi.fr
Date: Thu Mar 5 13:58:15 2015 +0100
tdf#89174:disable swipe gesture when zoomed in.
Change-Id: I0c3a565a3ae276fb60bf99ec32941715f1556127
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
index 176faa5..0f231b0 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
@@ -9,15 +9,19 @@ import android.view.View.OnTouchListener;
import android.util.Log;
import org.libreoffice.LOKitShell;
+import org.mozilla.gecko.gfx.GeckoLayerClient;
+import org.mozilla.gecko.gfx.ImmutableViewportMetrics
[Libreoffice-commits] core.git: 47 commits - android/Bootstrap android/experimental desktop/source include/LibreOfficeKit include/vcl libreofficekit/qa libreofficekit/source sc/inc sc/source sd/source
android/Bootstrap/src/org/libreoffice/kit/Document.java |8 android/Bootstrap/src/org/libreoffice/kit/Office.java |8 android/experimental/LOAndroid3/res/drawable/text_cursor.xml |6 android/experimental/LOAndroid3/res/layout/text_selection_handles.xml |5 android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java | 224 ++ android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java | 50 +- android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java | 34 + android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java | 60 ++ android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java | 159 ++- android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java | 13 android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java | 23 + android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java | 62 ++ android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorLayer.java | 12 android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java | 109 +++- android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java | 17 android/experimental/LOAndroid3/src/java/org/libreoffice/TileProviderFactory.java |5 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java | 40 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DrawTimingQueue.java | 95 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java |8 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanningPerfAPI.java | 93 desktop/source/lib/init.cxx | 58 +- desktop/source/lib/lokandroid.cxx | 14 include/LibreOfficeKit/LibreOfficeKit.h |8 include/LibreOfficeKit/LibreOfficeKit.hxx | 26 - include/vcl/window.hxx |2 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 26 + libreofficekit/source/gtk/lokdocview.c | 20 sc/inc/docuno.hxx | 22 sc/source/ui/app/inputhdl.cxx |9 sc/source/ui/inc/gridwin.hxx |3 sc/source/ui/inc/inputhdl.hxx |2 sc/source/ui/inc/tabvwsh.hxx |1 sc/source/ui/unoobj/docuno.cxx | 12 sc/source/ui/view/gridwin4.cxx | 44 + sc/source/ui/view/tabvwsh4.cxx | 95 ++-- sd/source/ui/inc/ViewShell.hxx |5 sd/source/ui/inc/unomodel.hxx |2 sd/source/ui/unoidl/unomodel.cxx | 24 + sd/source/ui/view/sdwindow.cxx | 13 sd/source/ui/view/viewshel.cxx | 32 + sw/inc/viscrs.hxx | 10 sw/source/core/crsr/viscrs.cxx | 48 +- sw/source/core/view/viewsh.cxx | 13 sw/source/uibase/docvw/edtwin.cxx |4 vcl/source/window/mouse.cxx |9 45 files changed, 976 insertions(+), 557 deletions(-) New commits: commit ef990c71e4f4eb703bc8175e26e3853b0d6486ca Author: Siqi Liu m...@siqi.fr Date: Sat Feb 28 22:07:36 2015 +0100 remove unused boolean (propagating touchEvent instead of intercepting it) Change-Id: If05cf04414572fea809104c7fed309afb2438bfd diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java b/android
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
|2
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
|8 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 14 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 20 +++
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 13 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
|8 +
android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
| 64 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
| 11 +
8 files changed, 140 insertions(+)
New commits:
commit 961a13bc0edf7c1fbfe4d57bc54688112368534e
Author: Siqi Liu m...@siqi.fr
Date: Sat Feb 28 21:50:12 2015 +0100
implement swiping gesture as a generic event
Change-Id: I024db339bada34a544fdcc1def107c7b06332847
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
index a046988..18b821e 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
@@ -21,6 +21,8 @@ public class LOEvent implements ComparableLOEvent {
public static final int TOUCH = 8;
public static final int KEY_EVENT = 9;
public static final int CHANGE_HANDLE_POSITION = 10;
+public static final int SWIPE_RIGHT = 11;
+public static final int SWIPE_LEFT = 12;
public final int mType;
public int mPriority = 0;
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
index 68ab523..84123a5 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
@@ -102,6 +102,14 @@ public class LOKitShell {
LOKitShell.sendEvent(new LOEvent(LOEvent.SIZE_CHANGED));
}
+public static void sendSwipeRightEvent() {
+LOKitShell.sendEvent(new LOEvent(LOEvent.SWIPE_RIGHT));
+}
+
+public static void sendSwipeLeftEvent() {
+LOKitShell.sendEvent(new LOEvent(LOEvent.SWIPE_LEFT));
+}
+
public static void sendChangePartEvent(int part) {
LOKitShell.sendEvent(new LOEvent(LOEvent.CHANGE_PART, part));
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 334cd44..099d0f2 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -208,6 +208,12 @@ public class LOKitThread extends Thread {
case LOEvent.CHANGE_HANDLE_POSITION:
changeHandlePosition(event.mHandleType,
event.mDocumentCoordinate);
break;
+case LOEvent.SWIPE_LEFT:
+onSwipeLeft();
+break;
+case LOEvent.SWIPE_RIGHT:
+onSwipeRight();
+break;
}
}
@@ -237,6 +243,14 @@ public class LOKitThread extends Thread {
mTileProvider.sendKeyEvent(keyEvent);
}
+private void onSwipeLeft() {
+mTileProvider.onSwipeLeft();
+}
+
+private void onSwipeRight() {
+mTileProvider.onSwipeRight();
+}
+
/**
* Processes touch events.
*/
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 146b761..f9fe8c3 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -94,30 +94,6 @@ public class LOKitTileProvider implements TileProvider,
Document.MessageCallback
// Writer documents always have one part, so hide the navigation
drawer.
if (mDocument.getDocumentType() != Document.DOCTYPE_TEXT) {
-
-// Set left/right swipe listener for presentation only.
-if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION) {
-LayerView layerView = mLayerClient.getView();
-layerView.setOnTouchListener(new
OnSlideSwipeListener(LibreOfficeMainActivity.mAppContext) {
-@Override
-public void onSwipeRight() {
-if (getCurrentPartNumber() mDocument.getParts()-1) {
-
LOKitShell.sendChangePartEvent(getCurrentPartNumber()+1
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
|2 --
1 file changed, 2 deletions(-)
New commits:
commit f58a6fe9971acc6b7639e47444eb3674faa6934d
Author: Siqi Liu m...@siqi.fr
Date: Sat Feb 28 22:07:36 2015 +0100
remove unused boolean (propagating touchEvent instead of intercepting it)
Change-Id: If05cf04414572fea809104c7fed309afb2438bfd
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
index 1dc33f6..b1ee37e 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/OnSlideSwipeListener.java
@@ -27,7 +27,6 @@ public class OnSlideSwipeListener implements OnTouchListener {
@Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velX,
float velY) {
-boolean result = false;
try {
float diffY = e2.getY() - e1.getY();
float diffX = e2.getX() - e1.getX();
@@ -40,7 +39,6 @@ public class OnSlideSwipeListener implements OnTouchListener {
onSwipeLeft();
}
}
-result = true;
}
} catch (Exception exception) {
exception.printStackTrace();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/3364/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/6039/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/65/3365/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/6039/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/6038/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/6038/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/3366/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/6037/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/6037/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Avahi Support on Linux
Hello, The code using avahi_client_new is already in LibreOffice (I've pushed it during last summer). I've tried to make a separate version of that same code broadcasting a _impressremote._tcp service alone. Even though the code compiles fine using dlopen, it does get an error code that I've never encountered before... In theory avahi.cxx will broadcast avahi service in a event loop thread, does dlopen change anything with respect to that? Also, internally avahi is based on dbus, not sure if that has anything to do with the issue. For now, the problem is that the service can not get committed using avahi_entry_group_commit(). I've attached the code if you have some time to check if I've used dlopen correctly. The command that I've used to compile it is as follow g++ avahi.cxx -I/usr/include/dbus-1.0 \ -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include \ -I/usr/include/glib-2.0 \ -I/usr/lib/x86_64-linux-gnu/glib-2.0/include/ \ -ldbus-1 \ -ldbus-glib-1 \ -lavahi-glib -lavahi-common -lavahi-core -lavahi-client -ldl Thanks! Siqi On Wed, Jan 29, 2014 at 12:09 PM, Caolán McNamara caol...@redhat.comwrote: On Fri, 2014-01-24 at 22:51 +0100, Siqi Liu wrote: For example, I can dlsym this function and get the void * to it, but how can I use it if I don't have access to the struct AvahiClient (declaired in the shared object)? AvahiClient* avahi_client_new ( const AvahiPoll * poll_api, AvahiClientFlags flags, AvahiClientCallback callback, void * userdata, int * error Well, it depends on usage if you can get away with including the headers. e.g. if you just need to manipulate the returned thing through a pointer to it and dlsymed functions then you can just shove e.g. typedef struct _AvahiClient AvahiClient; into your .cxx and that'll work. e.g. see vcl/unx/gtk/window/xid_fullscreen_on_all_monitors.c for an example Is the code using avahi_client_new that you want to make runtime optional already in LibreOffice or is it new code you want to add ? C. -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Pointer feature on android impress remote app
Hello all, During a conversation on IRC with cloph, I'm reminded of the fact that the android app doesn't have the laser pointer feature yet. However, it's certainly not a feature related to android/ios. Actually the API has been documented and to make use of it, just send the proper instruction with proper parameters and it's done. If my memory serves well, there are two parameters to send X and Y in percentage with respect to the size of the slide (0.5, 0.5 and the pointer will appear on the center of the slide). Basically we only need to retrieve the position of users' touch event on the phone and send it to the server. Personally I don't have much time for hacking on the android app now, just a reminder that it's not hard at all to support it on android, maybe someone can take a look at that? It would be really cool if it also works with the android app. Cheers, Siqi -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Avahi Support on Linux
Hello Caolan, Tor, I've done some research and I've more or less understood how it works now. Now, with Avahi, I am supposed to use dlsym to import several functions from libavahi-client.so.3 and libavahi-common.so.3 during the runtime. However, the dlsym should return a pointer to the function which, in order to be used, need to be casted with correct return type/argument types. The problem is, these types are declared in the shared object and I still don't have access to them. For example, I can dlsym this function and get the void * to it, but how can I use it if I don't have access to the struct AvahiClient (declaired in the shared object)? AvahiClienthttp://avahi.org/download/doxygen/client_8h.html#a3d65e9ea7182c44fa8df04a72f1a56bb * avahi_client_newhttp://avahi.org/download/doxygen/client_8h.html#a07b2a33a3e7cbb18a0eb9d00eade6ae6 (const AvahiPoll http://avahi.org/download/doxygen/struct_avahi_poll.html * poll_api, AvahiClientFlagshttp://avahi.org/download/doxygen/client_8h.html#a46a797e5d352f6f98261834ae3b1a3ed flags,AvahiClientCallbackhttp://avahi.org/download/doxygen/client_8h.html#a24ece0cd8c27c269a1ddd3cf3acf6444 callback,void * userdata, int * error ) Am I on the right track ? Any help or link to some tutorials would be appreciated! Thanks! Siqi On Thu, Jan 9, 2014 at 4:57 PM, Caolán McNamara caol...@redhat.com wrote: On Tue, 2014-01-07 at 15:31 +0100, Siqi Liu wrote: Tor pushed a quick fix for that and disabled avahi temporarily so that it doesn't get compiled unless specified. I'm thinking of fixing that but not sure how to load Avahi dynamically depending on the presence of Avahi library on the distribution. Any pointers on how to achieve that? We've done stuff like this plenty of times in the past. One current one is sc/source/core/opencl/clcc.cxx see the dlopen, dlsym hackery. C. -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Avahi Support on Linux
Hello all, During this summer I've implemented Zeroconf service with Avahi on Linux distro, though it worked on my Ubuntu box, it doesn't seem to be supported on all distributions, and it has thus broken quite a lot of tinderboxes at that time... Tor pushed a quick fix for that and disabled avahi temporarily so that it doesn't get compiled unless specified. I'm thinking of fixing that but not sure how to load Avahi dynamically depending on the presence of Avahi library on the distribution. Any pointers on how to achieve that? Thanks! -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/field.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit d6fdb0b4666fa92c937593a704ef40348803ff62
Author: Siqi LIU m...@siqi.fr
Date: Sat Jan 4 00:08:27 2014 +0100
fdo#72666 fix for brocken NumericBox constructor
Change-Id: I6c9a981f8de35314edb51cc5f0fc11adfe6c1b5b
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 26d3cff..aa8e06b 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -889,6 +889,8 @@ NumericBox::NumericBox( Window* pParent, WinBits nWinStyle
) :
{
SetField( this );
Reformat();
+if ( !(nWinStyle WB_HIDE ) )
+Show();
}
NumericBox::NumericBox( Window* pParent, const ResId rResId ) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/en.lproj/iPad_autosize.storyboard |6 +-- ios/iosremote/en.lproj/iPad_autosize_old.storyboard |6 +-- ios/iosremote/fr.lproj/iPad_autosize.storyboard |2 - ios/iosremote/fr.lproj/iPad_autosize_old.storyboard |2 - ios/iosremote/iosremote/Communication/Client.m |2 - ios/iosremote/iosremote/Communication/CommandInterpreter.m | 16 +++--- ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard |2 - ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard |2 - ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard |2 - ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard |2 - ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard |2 - ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard |2 - 12 files changed, 21 insertions(+), 25 deletions(-) New commits: commit 28aaa622c72bbb4897c9d886aa98707229d510ff Author: Siqi LIU m...@siqi.fr Date: Sat Jan 4 00:41:42 2014 +0100 make marker default to 1 to avoid dead loop Change-Id: I3a6d3ae1797e76b8aed14ca46d35c2ea7bd99960 diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard index 0c9ad1b..5612427 100644 --- a/ios/iosremote/en.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=UTF-8 standalone=no? -document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4510 systemVersion=12F37 targetRuntime=iOS.CocoaTouch.iPad propertyAccessControl=none initialViewController=XiK-Ye-iB8 +document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4514 systemVersion=13B42 targetRuntime=iOS.CocoaTouch.iPad propertyAccessControl=none initialViewController=XiK-Ye-iB8 dependencies deployment defaultVersion=1280 identifier=iOS/ -plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3742/ +plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3747/ /dependencies scenes !--About View Controller-- @@ -341,7 +341,7 @@ autoresizingMask key=autoresizingMask widthSizable=YES flexibleMinY=YES/ subviews scrollView clipsSubviews=YES multipleTouchEnabled=YES contentMode=scaleToFill directionalLockEnabled=YES bounces=NO alwaysBounceHorizontal=YES pagingEnabled=YES showsHorizontalScrollIndicator=NO showsVerticalScrollIndicator=NO id=DUv-gH-oAo -rect key=frame x=0.0 y=-1.0062 width=698 height=102/ +rect key=frame x=0.0 y=-1 width=698 height=102/ autoresizingMask key=autoresizingMask widthSizable=YES flexibleMaxX=YES flexibleMinY=YES heightSizable=YES/ subviews view contentMode=scaleToFill id=JaD-yW-hWg userLabel=View - StopWatch diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard index 0c9ad1b..5612427 100644 --- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=UTF-8 standalone=no? -document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4510 systemVersion=12F37 targetRuntime=iOS.CocoaTouch.iPad propertyAccessControl=none initialViewController=XiK-Ye-iB8 +document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4514 systemVersion=13B42 targetRuntime=iOS.CocoaTouch.iPad propertyAccessControl=none initialViewController=XiK-Ye-iB8 dependencies deployment defaultVersion=1280 identifier=iOS/ -plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3742/ +plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3747/ /dependencies scenes !--About View Controller-- @@ -341,7 +341,7 @@ autoresizingMask key=autoresizingMask widthSizable=YES flexibleMinY=YES/ subviews scrollView clipsSubviews=YES multipleTouchEnabled=YES contentMode=scaleToFill directionalLockEnabled=YES bounces=NO alwaysBounceHorizontal=YES pagingEnabled=YES showsHorizontalScrollIndicator=NO showsVerticalScrollIndicator=NO id=DUv-gH-oAo -rect key=frame x=0.0 y=-1.0062 width=698 height=102/ +rect key=frame x=0.0 y=-1 width
Re: Localization of iOS Impress Remote
Hello Andras, Indeed the localization process in iOS development was quite broken before iOS6. Actually when I set out to build this app, iOS7 was not yet released so I tried my best to keep the app compatible with iOS5 and iOS6. It's now compatible with iOS7 as well but keeping it compatible with iOS5 devices also brings some side effects: iOS5 doesn't support base storyboard (one UI file+one localization strings file for each language) and therefore each time we support a new language, we need to create a separate storyboard (iOS's UI design file) for that. In order to avoid the pain keeping storyborads for different languages in sync, I've used a python script which propagates all UI changes in the English storyboard to all other languages's storyboard and remplace all strings in these storyboards accordingly at the end of each compilation. So here is how it works for now: 1. For strings that are displayed programmatically, the Localizable.strings files would be used. For each language, there should be one *Localizable.strings* file. 2. For strings in the Storyboard, the python script will go through the whole file and extract all the strings in the storyboards. We translate those files from English to another language and then, we build the project again and the python script would take care of replacing all the strings into storyboard files accordingly. Therefore, there would be two files here, *iPad_autosize.strings* and *iPhone_autosize.strings*. For the time being this solution (or a hack xD) is still a workable solution to keep backward compatibility with iOS5, so it might be worthwhile to keep it that way for now. With future releases from Apple, this might provoke some problems and we can consider dropping iOS5 support then. However I'm not as experienced in terms of software management and it might be better to just drop the iOS5 support now, so don't hesitate to give me your advice on that. Final word: I will push some updates to the localizations files and hopefully the three localization files that I've underlined would be ready to be uploaded to Pootle. I will send you an email when it's ready. All the best! Siqi 2013/11/17 Andras Timar tima...@gmail.com Hi Siqi, I'm working on the localization of mobile Impress Remote applications. Unfortunately I'm a newbie at iOS development. I did not understand the current directory structure under ios/iosremote, and I'm not sure, if all localizable strings are extracted. How do you generate .strings files? Why are there two locations for localizable stuff -- ios/iosremote/en.lproj and ios/iosremote/iosremote/en.lproj? I ran git grep NSLocalizedString, and it seems that strings from ios/iosremote/InAppSettingsKit are not in Localized.strings. In the end, I think we should have 3 English files: Localized.strings iPad_autosize.strings iPhone_autosize.strings I want to upload them to Pootle, then merge back translations into source, and push to git. Thanks for you help in advance. Andras -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
Hello all, From what I've understood, the server end support for remote control app would be included in the next release? What would be the exact date of the this release? Also, I've tried out the 4.1.3 and apparently the Bonjour/Avahi Service has not yet been included in the build, is there a plan to test this build with the iOS app? Thanks! ATB, Siqi 2013/11/19 David Tardon dtar...@redhat.com Hi, On Sat, Nov 16, 2013 at 11:40:31AM +0200, Tor Lillqvist wrote: + turn on mergedlibs LTO for Windows - any objections ? (Michael) Anyway, I tried building on Windows with --enable-mergelibs=all, did not succeed. Build stops when linking the chartcontrollerlo library, no imerged.lib found. And indeed I don't see any *merge*.lib anywhere in workdir or instdir. Incidentally, this does not work on Linux either. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - ios/iosremote
ios/iosremote/Settings.bundle/Root.plist |6 +
ios/iosremote/Settings.bundle/en.lproj/Root.strings |binary
ios/iosremote/Settings.bundle/fr.lproj/Root.strings |binary
ios/iosremote/iosremote/Classes/ServerListViewController.m |2
ios/iosremote/iosremote/Classes/ServerListViewController~ipad.h | 15 +++
ios/iosremote/iosremote/Classes/ServerListViewController~ipad.m | 46
++
ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m |4
ios/iosremote/iosremote/Classes/WalkThroughPageViewController.m | 14 +--
ios/iosremote/iosremote/Communication/Client.m |2
ios/iosremote/iosremote/Communication/CommandInterpreter.m | 14 ++-
ios/iosremote/iosremote/en.lproj/Localizable.strings |binary
11 files changed, 89 insertions(+), 14 deletions(-)
New commits:
commit 631d6a8e1520393d3a7b7d74236f1e4b9fcf8226
Author: Siqi LIU m...@siqi.fr
Date: Thu Nov 21 00:59:34 2013 +0100
regenerated complete localizable.strings in English, to be translated
Change-Id: I267c79dc1e5c48006901354e1d32647096a893d7
diff --git a/ios/iosremote/iosremote/en.lproj/Localizable.strings
b/ios/iosremote/iosremote/en.lproj/Localizable.strings
index 037830d..6f4e09f 100644
Binary files a/ios/iosremote/iosremote/en.lproj/Localizable.strings and
b/ios/iosremote/iosremote/en.lproj/Localizable.strings differ
commit da126099281331309caff0f6e65b3dca6ae979db
Author: Siqi LIU m...@siqi.fr
Date: Thu Nov 21 00:59:00 2013 +0100
app setting localization experiment
Change-Id: I862b93cd9f3a60fbf8249985bab0008325e4f68a
diff --git a/ios/iosremote/Settings.bundle/Root.plist
b/ios/iosremote/Settings.bundle/Root.plist
index 12eb920..368da38 100644
--- a/ios/iosremote/Settings.bundle/Root.plist
+++ b/ios/iosremote/Settings.bundle/Root.plist
@@ -62,6 +62,9 @@
integer20/integer
integer30/integer
integer40/integer
+ integer45/integer
+ integer50/integer
+ integer60/integer
/array
keyTitles/key
array
@@ -72,6 +75,9 @@
string20/string
string30/string
string40/string
+ string45/string
+ string50/string
+ string60/string
/array
keyType/key
stringPSMultiValueSpecifier/string
diff --git a/ios/iosremote/Settings.bundle/en.lproj/Root.strings
b/ios/iosremote/Settings.bundle/en.lproj/Root.strings
index 8cd87b9..e55eb4a 100644
Binary files a/ios/iosremote/Settings.bundle/en.lproj/Root.strings and
b/ios/iosremote/Settings.bundle/en.lproj/Root.strings differ
diff --git a/ios/iosremote/Settings.bundle/fr.lproj/Root.strings
b/ios/iosremote/Settings.bundle/fr.lproj/Root.strings
new file mode 100644
index 000..5209730
Binary files /dev/null and
b/ios/iosremote/Settings.bundle/fr.lproj/Root.strings differ
commit 8232dfd5206da20546780ec0a2d3e7ea490fdb07
Author: Siqi LIU m...@siqi.fr
Date: Thu Nov 21 00:58:10 2013 +0100
plain strings in in-app tuto to localized strings
Change-Id: I20cf3a3095015a72a8db46248a196c70f399f84f
diff --git a/ios/iosremote/iosremote/Classes/ServerListViewController.m
b/ios/iosremote/iosremote/Classes/ServerListViewController.m
index 0012921..15bdf86 100644
--- a/ios/iosremote/iosremote/Classes/ServerListViewController.m
+++ b/ios/iosremote/iosremote/Classes/ServerListViewController.m
@@ -484,7 +484,7 @@
if (indexPath.section == 0){
if ([self.comManager.autoDiscoveryServers count] == 0){
-cell.textLabel.text = NSLocalizedString(self.searchStateText, nil);
+cell.textLabel.text = self.searchStateText;
cell.textLabel.lineBreakMode = UILineBreakModeClip;
cell.selectionStyle = self.style;
diff --git
a/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m
b/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m
index 49c7c03..6bc9f9d 100644
--- a/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m
+++ b/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m
@@ -40,11 +40,11 @@
[[self view] addSubview:self.pageController.view];
[self.pageController didMoveToParentViewController:self];
-UIBarButtonItem *backButton = [[UIBarButtonItem alloc]
initWithTitle:NSLocalizedString(@Ok, thanks, nil)
style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)];
+UIBarButtonItem *backButton = [[UIBarButtonItem alloc]
initWithTitle:NSLocalizedString
Re: Localization of iOS Impress Remote
Hello again, I've done some clean up and here are what should be translated for each language: English (default app language): * libreoffice/core/ios/iosremote/en.lproj/iPad_autosize.strings for iPad storyboard (UI design file) * libreoffice/core/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings for iPhone storyboard (UI design file) * libreoffice/core/ios/iosremote/iosremote/en.lproj/Localizable.strings strings for programmatically displayed strings * libreoffice/core/ios/iosremote/Settings.bundle/en.lproj/Root.strings strings for settings menus For each language, these four files should be translated accordingly, and I can take care of the rest. For the UI design file though, note that only the string itself should be replaced, all other identifiers etc. should not be modified since they are used to locate corresponding strings in the storyboard. Let me know if I can of any further help! Thank you, Siqi Liu 2013/11/20 Siqi Liu m...@siqi.fr Hello Andras, Indeed the localization process in iOS development was quite broken before iOS6. Actually when I set out to build this app, iOS7 was not yet released so I tried my best to keep the app compatible with iOS5 and iOS6. It's now compatible with iOS7 as well but keeping it compatible with iOS5 devices also brings some side effects: iOS5 doesn't support base storyboard (one UI file+one localization strings file for each language) and therefore each time we support a new language, we need to create a separate storyboard (iOS's UI design file) for that. In order to avoid the pain keeping storyborads for different languages in sync, I've used a python script which propagates all UI changes in the English storyboard to all other languages's storyboard and remplace all strings in these storyboards accordingly at the end of each compilation. So here is how it works for now: 1. For strings that are displayed programmatically, the Localizable.strings files would be used. For each language, there should be one *Localizable.strings* file. 2. For strings in the Storyboard, the python script will go through the whole file and extract all the strings in the storyboards. We translate those files from English to another language and then, we build the project again and the python script would take care of replacing all the strings into storyboard files accordingly. Therefore, there would be two files here, *iPad_autosize.strings* and *iPhone_autosize.strings*. For the time being this solution (or a hack xD) is still a workable solution to keep backward compatibility with iOS5, so it might be worthwhile to keep it that way for now. With future releases from Apple, this might provoke some problems and we can consider dropping iOS5 support then. However I'm not as experienced in terms of software management and it might be better to just drop the iOS5 support now, so don't hesitate to give me your advice on that. Final word: I will push some updates to the localizations files and hopefully the three localization files that I've underlined would be ready to be uploaded to Pootle. I will send you an email when it's ready. All the best! Siqi 2013/11/17 Andras Timar tima...@gmail.com Hi Siqi, I'm working on the localization of mobile Impress Remote applications. Unfortunately I'm a newbie at iOS development. I did not understand the current directory structure under ios/iosremote, and I'm not sure, if all localizable strings are extracted. How do you generate .strings files? Why are there two locations for localizable stuff -- ios/iosremote/en.lproj and ios/iosremote/iosremote/en.lproj? I ran git grep NSLocalizedString, and it seems that strings from ios/iosremote/InAppSettingsKit are not in Localized.strings. In the end, I think we should have 3 English files: Localized.strings iPad_autosize.strings iPhone_autosize.strings I want to upload them to Pootle, then merge back translations into source, and push to git. Thanks for you help in advance. Andras -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/fr.lproj/iPad_autosize.storyboard |2 +- ios/iosremote/fr.lproj/iPad_autosize_old.storyboard |2 +- ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard |2 +- ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard |2 +- ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard |2 +- ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard |2 +- ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard |2 +- ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard |2 +- 8 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 794ec0cd7068d3eb3637b14cfb0270f8e44c9397 Author: Siqi LIU m...@siqi.fr Date: Thu Nov 21 01:21:13 2013 +0100 misc Change-Id: Ie81184b9d155e47f0c5e69a11f02618e357764ab diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard index df5e2e4..4f4a57e 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard @@ -2,7 +2,7 @@ document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4514 systemVersion=13A603 targetRuntime=iOS.CocoaTouch.iPad propertyAccessControl=none initialViewController=XiK-Ye-iB8 dependencies deployment defaultVersion=1280 identifier=iOS/ -plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3746/ +plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3747/ /dependencies scenes !--About View Controller-- diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard index df5e2e4..4f4a57e 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard @@ -2,7 +2,7 @@ document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4514 systemVersion=13A603 targetRuntime=iOS.CocoaTouch.iPad propertyAccessControl=none initialViewController=XiK-Ye-iB8 dependencies deployment defaultVersion=1280 identifier=iOS/ -plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3746/ +plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3747/ /dependencies scenes !--About View Controller-- diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard index e849b11..c5a1d4e 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard @@ -2,7 +2,7 @@ document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4514 systemVersion=13A603 targetRuntime=iOS.CocoaTouch propertyAccessControl=none initialViewController=qoG-TN-hN0 dependencies deployment version=1552 defaultVersion=1280 identifier=iOS/ -plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3746/ +plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3747/ /dependencies scenes !--Walk Through Container View Controller-- diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard index e849b11..c5a1d4e 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard @@ -2,7 +2,7 @@ document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4514 systemVersion=13A603 targetRuntime=iOS.CocoaTouch propertyAccessControl=none initialViewController=qoG-TN-hN0 dependencies deployment version=1552 defaultVersion=1280 identifier=iOS/ -plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3746/ +plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3747/ /dependencies scenes !--Walk Through Container View Controller-- diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard index eda008f..f64b637 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard @@ -2,7 +2,7 @@ document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4514 systemVersion=13A603 targetRuntime=iOS.CocoaTouch propertyAccessControl=none initialViewController=qoG-TN-hN0 dependencies deployment version=1552 defaultVersion=1280 identifier=iOS/ -plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3746
Re: [Libreoffice-qa] minutes of ESC call ...
Hello all, From what I've understood, the server end support for remote control app would be included in the next release? What would be the exact date of the this release? Also, I've tried out the 4.1.3 and apparently the Bonjour/Avahi Service has not yet been included in the build, is there a plan to test this build with the iOS app? Thanks! ATB, Siqi 2013/11/19 David Tardon dtar...@redhat.com Hi, On Sat, Nov 16, 2013 at 11:40:31AM +0200, Tor Lillqvist wrote: + turn on mergedlibs LTO for Windows - any objections ? (Michael) Anyway, I tried building on Windows with --enable-mergelibs=all, did not succeed. Build stops when linking the chartcontrollerlo library, no imerged.lib found. And indeed I don't see any *merge*.lib anywhere in workdir or instdir. Incidentally, this does not work on Linux either. D. ___ LibreOffice mailing list libreoff...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/fr.lproj/iPad_autosize.storyboard |4 ++-- ios/iosremote/fr.lproj/iPad_autosize_old.storyboard |4 ++-- ios/iosremote/iosremote/Classes/PinValidationViewController.m|2 ++ ios/iosremote/iosremote/Classes/ServerListViewController.m |2 +- ios/iosremote/iosremote/Communication/CommandInterpreter.m |8 ++-- ios/iosremote/iosremote/Communication/CommunicationManager.h |2 ++ ios/iosremote/iosremote/Communication/CommunicationManager.m |2 +- ios/iosremote/iosremote/Communication/Server.h |5 +++-- ios/iosremote/iosremote/Communication/Server.m | 10 +++--- ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 10 +- ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard | 10 +- ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard | 10 +- ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard | 10 +- ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard | 10 +- ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard | 10 +- ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard |4 ++-- ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard |4 ++-- 17 files changed, 60 insertions(+), 47 deletions(-) New commits: commit 2f3b37b6d1c1941a2a7a9937dab140dec361f488 Author: Siqi LIU m...@siqi.fr Date: Sun Oct 27 10:39:27 2013 +0100 client end takes care of server version Change-Id: I4d72a403971efb863a077d6ed6f1129ef0384e7b diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard index 5ea1573..df5e2e4 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=UTF-8 standalone=no? -document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4510 systemVersion=12F37 targetRuntime=iOS.CocoaTouch.iPad propertyAccessControl=none initialViewController=XiK-Ye-iB8 +document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4514 systemVersion=13A603 targetRuntime=iOS.CocoaTouch.iPad propertyAccessControl=none initialViewController=XiK-Ye-iB8 dependencies deployment defaultVersion=1280 identifier=iOS/ -plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3742/ +plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3746/ /dependencies scenes !--About View Controller-- diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard index 5ea1573..df5e2e4 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard @@ -1,8 +1,8 @@ ?xml version=1.0 encoding=UTF-8 standalone=no? -document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4510 systemVersion=12F37 targetRuntime=iOS.CocoaTouch.iPad propertyAccessControl=none initialViewController=XiK-Ye-iB8 +document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=4514 systemVersion=13A603 targetRuntime=iOS.CocoaTouch.iPad propertyAccessControl=none initialViewController=XiK-Ye-iB8 dependencies deployment defaultVersion=1280 identifier=iOS/ -plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3742/ +plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=3746/ /dependencies scenes !--About View Controller-- diff --git a/ios/iosremote/iosremote/Classes/PinValidationViewController.m b/ios/iosremote/iosremote/Classes/PinValidationViewController.m index 35f165e..b0383cc 100644 --- a/ios/iosremote/iosremote/Classes/PinValidationViewController.m +++ b/ios/iosremote/iosremote/Classes/PinValidationViewController.m @@ -10,6 +10,8 @@ #import SlideShow.h #import CommandInterpreter.h #import CommunicationManager.h +#import Client.h +#import Server.h @interface PinValidationViewController () diff --git a/ios/iosremote/iosremote/Classes/ServerListViewController.m b/ios/iosremote/iosremote/Classes/ServerListViewController.m index 76b2565..0012921 100644 --- a/ios/iosremote/iosremote/Classes/ServerListViewController.m +++ b/ios/iosremote/iosremote/Classes/ServerListViewController.m @@ -99,7 +99,7 @@ int port = socketAddress-sin_port; NSLog(@Resolved at %@:%u, ipString, port); -[self.comManager connectToServer:[[Server alloc] initWithProtocol:NETWORK atAddress:ipString ofName:sender.name]]; +[self.comManager connectToServer:[[Server alloc] initWithProtocol:NETWORK
Re: Test failure
Hello all, I've been investigating on this issue and I've tried the patch from Julien and it still doesn't seem to fix the problem. There unit test always fails on the equality assertion even if we reverse that as well. Here is what I've got: When we check against sal_Int32(0xD99594) (i.e. 14259604 in decimal) for start color aGradient.StartColor equality assertion failed - Expected: 14259604 - Actual : 12603469 and When we check against sal_Int32(0xC0504D) (i.e. 12603469 in decimal) for start color aGradient.StartColor equality assertion failed - Expected: 12603469 - Actual : 14259604 That is, whenever we reverse the hex value (the expected value) for the unit test, the actual value coming out of the test is surprisingly reversed as well!! Which I failed to explain... I have to assume that there are other filters that are tested against this unit test (which in this case needs to reverse the startColor/endColor as I have done in the ooxmlexport filter) or there are some hidden mechanism in this unit test that changes the actual value when we change the expected value... My previous patch was tested (on OSX so without unit tests) during the Milano hackathon and it has solved an interoperability bug so presumbly we should keep this patch. Now I guess we need some qa experts to shed some light on the mechanism of this unit test ... Cheers, Siqi 2013/10/7 Siqi Liu m...@siqi.fr Hello all, Sorry for the late response! This was a patch that I've submitted during the hackathon in Milan and it fixes the #fdo65295 on bugzilla. Actually we've analyzed the content of the .docx exported by writer and it seems that the startColor and the endColor were accidentally reversed so that each time we import and export a docx with gradient background, we reverse the start and end color in the exported .docx file. I would test the patch above to see if that solves the problem when I'm back home. Sorry for the broken build :P ATB, Siqi 2013/10/6 julien2412 serval2...@yahoo.fr Hi, If StartColor and EndColor have been reversed, perhaps it was the same for qa part? So what about this patch? diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index f771ef9..8fdb7fb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -733,8 +733,8 @@ void Test::testTextframeGradient() uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_GRADIENT, getPropertydrawing::FillStyle(xFrame, FillStyle)); awt::Gradient aGradient = getPropertyawt::Gradient(xFrame, FillGradient); -CPPUNIT_ASSERT_EQUAL(sal_Int32(0xC0504D), aGradient.StartColor); -CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD99594), aGradient.EndColor); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD99594), aGradient.StartColor); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xC0504D), aGradient.EndColor); CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aGradient.Style); Julien -- View this message in context: http://nabble.documentfoundation.org/Test-failure-tp4076788p4076897.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Test failure
Hello all, Sorry for the late response! This was a patch that I've submitted during the hackathon in Milan and it fixes the #fdo65295 on bugzilla. Actually we've analyzed the content of the .docx exported by writer and it seems that the startColor and the endColor were accidentally reversed so that each time we import and export a docx with gradient background, we reverse the start and end color in the exported .docx file. I would test the patch above to see if that solves the problem when I'm back home. Sorry for the broken build :P ATB, Siqi 2013/10/6 julien2412 serval2...@yahoo.fr Hi, If StartColor and EndColor have been reversed, perhaps it was the same for qa part? So what about this patch? diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index f771ef9..8fdb7fb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -733,8 +733,8 @@ void Test::testTextframeGradient() uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_GRADIENT, getPropertydrawing::FillStyle(xFrame, FillStyle)); awt::Gradient aGradient = getPropertyawt::Gradient(xFrame, FillGradient); -CPPUNIT_ASSERT_EQUAL(sal_Int32(0xC0504D), aGradient.StartColor); -CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD99594), aGradient.EndColor); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD99594), aGradient.StartColor); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xC0504D), aGradient.EndColor); CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aGradient.Style); Julien -- View this message in context: http://nabble.documentfoundation.org/Test-failure-tp4076788p4076897.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iosremote/en.lproj/Localizable.strings |binary 1 file changed New commits: commit 762274102c74169b3be5518bc69b5fb03708ea9c Author: Siqi LIU m...@siqi.fr Date: Wed Sep 25 20:23:01 2013 +0200 translation fix Change-Id: I7def33cbd6f638c564de0a872a5b3b7d3c3a90e1 Reviewed-on: https://gerrit.libreoffice.org/6038 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/ios/iosremote/iosremote/en.lproj/Localizable.strings b/ios/iosremote/iosremote/en.lproj/Localizable.strings index 91d55d4..0686174 100644 Binary files a/ios/iosremote/iosremote/en.lproj/Localizable.strings and b/ios/iosremote/iosremote/en.lproj/Localizable.strings differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/en.lproj/iPad_autosize.storyboard |4 ++-- ios/iosremote/en.lproj/iPad_autosize_old.storyboard |4 ++-- ios/iosremote/fr.lproj/iPad_autosize.storyboard |4 ++-- ios/iosremote/fr.lproj/iPad_autosize_old.storyboard |4 ++-- ios/iosremote/iosremote/Classes/BasePresentationViewController.m |4 ++-- ios/iosremote/iosremote/Classes/ControlVariables.h |8 +--- ios/iosremote/iosremote/Classes/HorizontalSlideCell.h|1 + ios/iosremote/iosremote/Classes/NewServerViewController.h|5 + ios/iosremote/iosremote/Classes/SlideShowPreviewViewController.h |5 + ios/iosremote/iosremote/Classes/SlideShowSwipeInList~ipad.m |7 +++ ios/iosremote/iosremote/Classes/Timer.h |3 ++- ios/iosremote/iosremote/Communication/CommandInterpreter.h |1 + ios/iosremote/iosremote/Communication/CommunicationManager.h |8 +++- ios/iosremote/iosremote/Communication/SlideShow.h|8 +++- ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard |2 +- ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard |2 +- ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard |4 ++-- ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard |4 ++-- 18 files changed, 44 insertions(+), 34 deletions(-) New commits: commit f8cf0e8af3fe734461492400ca2b84bddc73a214 Author: Siqi LIU m...@siqi.fr Date: Sun Sep 22 01:00:17 2013 +0200 adding some comments Change-Id: Ie730db1fd926bd8bd7a4b05a08d0dd672c9ee094 Reviewed-on: https://gerrit.libreoffice.org/6037 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard index da90368..04bc217 100644 --- a/ios/iosremote/en.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard @@ -559,10 +559,10 @@ autoresizingMask key=autoresizingMask/ subviews imageView userInteractionEnabled=NO tag=1 contentMode=scaleToFill image=Default.png id=dn1-99-Dde -rect key=frame x=44 y=3.5 width=233 height=163/ +rect key=frame x=44 y=7 width=233 height=163/ /imageView label opaque=NO clipsSubviews=YES userInteractionEnabled=NO tag=2 contentMode=left text=1 textAlignment=center lineBreakMode=tailTruncation baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO id=b5V-aR-n9S -rect key=frame x=245 y=145 width=32 height=21/ +rect key=frame x=245 y=149 width=32 height=21/ autoresizingMask key=autoresizingMask flexibleMaxX=YES flexibleMaxY=YES/ color key=backgroundColor white=0.8014655565996 alpha=1 colorSpace=calibratedWhite/ fontDescription key=fontDescription type=system pointSize=17/ diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard index da90368..04bc217 100644 --- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard @@ -559,10 +559,10 @@ autoresizingMask key=autoresizingMask/ subviews imageView userInteractionEnabled=NO tag=1 contentMode=scaleToFill image=Default.png id=dn1-99-Dde -rect key=frame x=44 y=3.5 width=233 height=163/ +rect key=frame x=44 y=7 width=233 height=163/ /imageView label opaque=NO clipsSubviews=YES userInteractionEnabled=NO tag=2 contentMode=left text=1 textAlignment=center lineBreakMode=tailTruncation baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO id=b5V-aR-n9S -rect key=frame x=245 y=145 width=32 height=21/ +rect key=frame x=245 y=149 width=32 height=21/ autoresizingMask key=autoresizingMask flexibleMaxX=YES flexibleMaxY=YES/ color key=backgroundColor white=0.8014655565996 alpha=1 colorSpace=calibratedWhite/ fontDescription key=fontDescription type=system
[Libreoffice-ux-advise] iOS remote app icons
Hello all, Here are some of the icons currently used in iOS remote control app that might need some retouch. https://dl.dropboxusercontent.com/u/14237130/iosremote_icons.zip Please try to stick to the same image sizes so that it would behave correctly on iOS devices. Also, in some icons, there are some transparent borders are left there on purpose so please take those into account as well. gear_transparent are used for iPhone server list page (which contains a popover with About Impress Remote, Connection Help more_icon are used for iPhone's slides sidebar more_ipad are used for the button on the bottom right side of the iPad's control page. which reveals a popover which contains Stop presentation, restart etc... WTConnecting is used in the connection help page, the gradient in the Impress icon might need to be removed. Feel free to contact me if you have any questions on these icons ^^ Send them back to me and I will take some screenshots in order to give you a feeling of it. Thanks! -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-commits] core.git: 2 commits - ios/iosremote
ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib | 117
--
ios/iosremote/InAppSettingsKit/Xibs/IASKSpecifierValuesView.xib | 92 ++-
ios/iosremote/iosremote/Timer.m |3
ios/iosremote/iosremote/slideShowSwipeInList_iphone.m |2
ios/iosremote/iosremote/slideShow_vc_iphone.m | 19 -
5 files changed, 80 insertions(+), 153 deletions(-)
New commits:
commit a3abd12f1f20fed25f7719d613a8e287ec1e5e06
Author: Siqi LIU m...@siqi.fr
Date: Mon Sep 16 22:04:23 2013 +0200
change setting bundle background to stay consistent
Change-Id: Idf131349f91c949af57bdb79929f73b7a202ab93
diff --git a/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
b/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
index 74720fa..7ba3bea 100755
--- a/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
+++ b/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
@@ -1,14 +1,14 @@
?xml version=1.0 encoding=UTF-8?
archive type=com.apple.InterfaceBuilder3.CocoaTouch.XIB version=7.10
data
- int key=IBDocument.SystemTarget1280/int
- string key=IBDocument.SystemVersion11B26/string
- string key=IBDocument.InterfaceBuilderVersion1934/string
- string key=IBDocument.AppKitVersion1138/string
- string key=IBDocument.HIToolboxVersion566.00/string
+ int key=IBDocument.SystemTarget1552/int
+ string key=IBDocument.SystemVersion12E55/string
+ string key=IBDocument.InterfaceBuilderVersion3084/string
+ string key=IBDocument.AppKitVersion1187.39/string
+ string key=IBDocument.HIToolboxVersion626.00/string
object class=NSMutableDictionary
key=IBDocument.PluginVersions
string
key=NS.key.0com.apple.InterfaceBuilder.IBCocoaTouchPlugin/string
- string key=NS.object.0931/string
+ string key=NS.object.02083/string
/object
object class=NSArray
key=IBDocument.IntegratedClassDependencies
bool key=EncodedWithXMLCoderYES/bool
@@ -38,67 +38,10 @@
int key=NSvFlags274/int
string key=NSFrameSize{320, 460}/string
reference key=NSSuperview/
- reference key=NSNextKeyView/
+ reference key=NSWindow/
object class=NSColor
key=IBUIBackgroundColor
- int key=NSColorSpace10/int
- object class=NSImage key=NSImage
- int
key=NSImageFlags549453824/int
- string key=NSSize{512,
1}/string
- object class=NSMutableArray
key=NSReps
- bool
key=EncodedWithXMLCoderYES/bool
- object class=NSArray
- bool
key=EncodedWithXMLCoderYES/bool
- integer
value=0/
- object
class=NSBitmapImageRep
- object
class=NSData key=NSTIFFRepresentation
-
bytes
key=NS.bytesTU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
-y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
-xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
-xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
-xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
-xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
-xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
-y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
-y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
-xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
-xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
-xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
-xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
-xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
-y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
-y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P
[Libreoffice-commits] core.git: 2 commits - ios/iosremote
ios/iosremote/UIView+Shadowing.h| 10
++--
ios/iosremote/UIView+Shadowing.m| 10
++--
ios/iosremote/WalkThroughContainerViewController.h | 10
++--
ios/iosremote/WalkThroughContainerViewController.m | 10
++--
ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.h |4
-
ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.m |1
ios/iosremote/iosremote/Timer.m | 21
--
ios/iosremote/iosremote/UIImageView+setImageAnimated.h | 10
++--
ios/iosremote/iosremote/UIImageView+setImageAnimated.m | 10
++--
ios/iosremote/iosremote/UIViewController+LibOStyling.h |1
ios/iosremote/iosremote/UIViewController+LibOStyling.m |1
ios/iosremote/iosremote/WalkThroughPageViewController.h | 10
++--
ios/iosremote/iosremote/WalkThroughPageViewController.m | 10
++--
ios/iosremote/iosremote/slideShowSwipeInList_iphone.m |1
ios/iosremote/iosremote/slideShow_vc_iphone.m |1
ios/iosremote/iosremote/stopWatch.m |1
16 files changed, 62 insertions(+), 49 deletions(-)
New commits:
commit c755f71b8b5b009573a673f3f757609ca0ef5ffd
Author: Siqi LIU m...@siqi.fr
Date: Sun Sep 8 12:42:17 2013 +0200
various bug fixes related to countdown timer
Change-Id: Ie1feb26c1b4d72b37d8767c30644f2411dbd2121
diff --git
a/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.h
b/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.h
index dc7e144..1610fef 100755
--- a/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.h
+++ b/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.h
@@ -60,6 +60,8 @@ typedef enum
@interface SWRevealViewController : UIViewController StopWatchDelegate,
TimerDelegate
+- (void)startTimePickerwithTimer:(Timer *) timer;
+
// Object instance init and rear view setting
- (id)initWithRearViewController:(UIViewController *)rearViewController
frontViewController:(UIViewController *)frontViewController;
@@ -173,8 +175,6 @@ typedef enum
@property (strong) void(^performBlock)( SWRevealViewControllerSegue* segue,
UIViewController* svc, UIViewController* dvc );
-- (void)startTimePickerwithTimer:(Timer *) timer;
-
@end
diff --git
a/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.m
b/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.m
index 922f83c..3414114 100755
--- a/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.m
+++ b/ios/iosremote/iosremote/SWRevealViewController/SWRevealViewController.m
@@ -436,7 +436,6 @@ const int FrontViewPositionNone = 0xff;
- (void)startTimePickerwithTimer:(Timer *) timer
{
-NSLog(@Fired by : %@, [timer class]);
[self callDP:self];
}
diff --git a/ios/iosremote/iosremote/Timer.m b/ios/iosremote/iosremote/Timer.m
index 57c5f7a..6e866d4 100644
--- a/ios/iosremote/iosremote/Timer.m
+++ b/ios/iosremote/iosremote/Timer.m
@@ -34,7 +34,7 @@ int initSecondsLeft;
self = [super init];
self.state = TIMER_STATE_CLEARED;
self.set = NO;
-secondsLeft = 30;
+secondsLeft = 0;
return self;
}
@@ -70,10 +70,19 @@ int initSecondsLeft;
[self.startButton addTarget:self action:@selector(start)
forControlEvents:UIControlEventTouchUpInside];
[self.clearButton addTarget:self action:@selector(clear)
forControlEvents:UIControlEventTouchUpInside];
// Sending the sender as well, so that we get a handle on the Timer itself
--- allow us to update seconds left
-[self.setTimeButton addTarget:self.delegate
action:@selector(startTimePickerwithTimer:)
forControlEvents:UIControlEventTouchUpInside];
+[self.setTimeButton addTarget:self
action:@selector(startTimePickerwithTimer)
forControlEvents:UIControlEventTouchUpInside];
self.set = YES;
}
+- (void)startTimePickerwithTimer
+{
+if (self.state == TIMER_STATE_RUNNING) {
+// If running, we switch it to pause before setting a new duration
+[self start];
+}
+[self.delegate startTimePickerwithTimer:self];
+}
+
- (void)updateTimer
{
// Create date from the elapsed time
@@ -106,6 +115,10 @@ int initSecondsLeft;
case TIMER_STATE_RUNNING:
self.state = TIMER_STATE_PAUSED;
[self.timerTimer invalidate];
+if (secondsLeft == 0) {
+[self.timeLabel setText:@00:00:00];
+}
+[self.delegate setTitle:@ sender:self];
break;
case TIMER_STATE_PAUSED:
self.state = TIMER_STATE_RUNNING;
@@ -121,6 +134,8 @@ int initSecondsLeft;
secondsLeft++;
[self
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iosremote/Communication/CommandTransmitter.m | 11 ---
ios/iosremote/iosremote/slideShowSwipeInList_iphone.m |8 ++--
ios/iosremote/iosremote/slideShow_vc_iphone.m |3 +++
3 files changed, 17 insertions(+), 5 deletions(-)
New commits:
commit 7c7d898b6e8f09f066817399214e51f454ff7982
Author: Siqi LIU m...@siqi.fr
Date: Sun Sep 8 13:33:42 2013 +0200
disable pangesture recognizer when pointer image is displayed
Change-Id: Iea5895b98a05faee0772569665c980eac716927b
diff --git a/ios/iosremote/iosremote/Communication/CommandTransmitter.m
b/ios/iosremote/iosremote/Communication/CommandTransmitter.m
index 111c1ec..31d82c2 100644
--- a/ios/iosremote/iosremote/Communication/CommandTransmitter.m
+++ b/ios/iosremote/iosremote/Communication/CommandTransmitter.m
@@ -13,18 +13,19 @@
@interface CommandTransmitter()
@property (nonatomic, weak) Client* client;
-
+@property NSInteger pointerCount;
@end
@implementation CommandTransmitter
+@synthesize pointerCount = _pointerCount;
@synthesize client = _client;
- (CommandTransmitter*) initWithClient:(Client *)client
{
self = [self init];
self.client = client;
-
+
return self;
}
@@ -51,11 +52,15 @@
- (void) setPointerVisibleAt: (CGPoint)aPoint
{
[self.client sendCommand:[NSString
stringWithFormat:@pointer_started\n%f\n%f\n\n, aPoint.x, aPoint.y]];
+self.pointerCount++;
}
- (void) setPointerDismissed
{
-[self.client sendCommand:@pointer_dismissed\n\n];
+if (self.pointerCount 0) {
+[self.client sendCommand:@pointer_dismissed\n\n];
+self.pointerCount--;
+}
}
/**
diff --git a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
index 01fbb9c..ff65812 100644
--- a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
+++ b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
@@ -169,8 +169,12 @@ dispatch_queue_t backgroundQueue;
UIPageControl * pageControl = [[UIPageControl alloc]
initWithFrame:CGRectMake(self.revealViewController.rearViewRevealWidth - 20,
view.frame.origin.y + 3, 40, 20)];
pageControl.numberOfPages = 2;
pageControl.currentPage = self.currentPage;
-pageControl.currentPageIndicatorTintColor = [UIColor whiteColor];
-pageControl.pageIndicatorTintColor = [UIColor lightGrayColor];
+
+if ([[[UIDevice currentDevice] systemVersion] floatValue] = 6.0)
+{
+pageControl.currentPageIndicatorTintColor = [UIColor whiteColor];
+pageControl.pageIndicatorTintColor = [UIColor colorWithRed:1.0
green:1.0 blue:1.0 alpha:0.7];
+}
pageControl.tag = -100;
view.tag = -99;
label.tag = -98;
diff --git a/ios/iosremote/iosremote/slideShow_vc_iphone.m
b/ios/iosremote/iosremote/slideShow_vc_iphone.m
index 1d8f2db..de33023 100644
--- a/ios/iosremote/iosremote/slideShow_vc_iphone.m
+++ b/ios/iosremote/iosremote/slideShow_vc_iphone.m
@@ -184,6 +184,9 @@
CGPoint p = self.view.center;
p.y -= 50;
self.touchPointerImage.center = p;
+[self.view
removeGestureRecognizer:self.revealViewController.panGestureRecognizer];
+} else {
+[self.view
addGestureRecognizer:self.revealViewController.panGestureRecognizer];
}
[self.touchPointerImage fadeInfadeOutwithDuration:0.0 maxAlpha:1.0];
[self.blockingView fadeInfadeOutwithDuration:0.0 maxAlpha:0.7];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/README_REMOTE sd/source
sd/README_REMOTE| 17 -
sd/source/ui/remotecontrol/Receiver.cxx |5 -
2 files changed, 16 insertions(+), 6 deletions(-)
New commits:
commit c41920416c22bfccf7fdeeefcd69baf6eadedaa3
Author: Siqi LIU m...@siqi.fr
Date: Mon Sep 2 09:14:27 2013 +0200
extend documentation with gsoc2013 updates
diff --git a/sd/README_REMOTE b/sd/README_REMOTE
index 56561c5..9e303e4 100644
--- a/sd/README_REMOTE
+++ b/sd/README_REMOTE
@@ -69,6 +69,17 @@ Any lines in [square brackets] are optional, and should be
omitted if not needed
[Colour String] // Colour the screen will show (default: black).
Not
// implemented, and format hasn't yet been defined.
+# As of gsoc2013, these commands are extended to the existing protocol, since
server-end are tolerant with unknown commands, these extensions doesn't break
backward compatibility
+* pointer_started // create a red dot on screen at initial position
(x,y)
+ initial_x // This should be called when user first touch the
screen
+ initial_y // note that x, y are in percentage (from 0.0 to
1.0) with respect to the slideshow size
+* pointer_dismissed // This dismiss the pointer red dot on screen,
should be called when user stop touching screen
+* pointer_coordination // This update pointer's position to current (x,y)
+ current_x // note that x, y are in percentage (from 0.0 to
1.0) with respect to the slideshow size
+ current_y // unless screenupdater's perfomance is
significantly improved, we should consider limit the update frequency on the
+// remote-end
+
+
Status/Data (Server to Client)
--
@@ -89,4 +100,8 @@ Status/Data (Server to Client)
* slide_preview // Supplies a preview image for a slide.
slideNumber
- image // A Base 64 Encoded png image.
\ No newline at end of file
+ image // A Base 64 Encoded png image.
+
+# As of gsoc2013, these commands are extended to the existing protocol, since
remote-end also ignore all unknown commands (which is the case of gsoc2012
android implementation), backward compatibility is kept.
+* slideshow_info// once paired, the server-end will send back the
title of the current presentation
+ Title
\ No newline at end of file
commit b5e374622f1313629685b2b2a1d3ab859bb7ae61
Author: Siqi LIU m...@siqi.fr
Date: Mon Sep 2 09:14:05 2013 +0200
remove unused comments
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index 593ff99..a68501a 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -157,7 +157,6 @@ void Receiver::executeCommand( const std::vectorOString
aCommand )
if (xSlideShow.is()) try
{
-// std::cerr pointer_started in the is std::endl;
xSlideShow-setProperty(
beans::PropertyValue( PointerVisible ,
-1,
@@ -174,11 +173,9 @@ void Receiver::executeCommand( const std::vectorOString
aCommand )
}
else if (aCommand[0].equals( pointer_dismissed ))
{
-// std::cerr pointer_dismissed std::endl;
SolarMutexGuard aSolarGuard;
if (xSlideShow.is()) try
{
-// std::cerr pointer_dismissed in the is std::endl;
xSlideShow-setProperty(
beans::PropertyValue( PointerVisible ,
-1,
@@ -200,12 +197,10 @@ void Receiver::executeCommand( const std::vectorOString
aCommand )
SAL_INFO( sdremote, Pointer at (x,y) );
const ::com::sun::star::geometry::RealPoint2D pos(x,y);
-// std::cerr Pointer at (pos.X,pos.Y) std::endl;
SolarMutexGuard aSolarGuard;
if (xSlideShow.is()) try
{
-// std::cerr pointer_coordination in the is std::endl;
xSlideShow-setProperty(
beans::PropertyValue( PointerPosition ,
-1,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - ios/.DS_Store ios/iosremote
dev/null |binary ios/.DS_Store|binary ios/iosremote/en.lproj/iPad_autosize.storyboard | 42 +-- ios/iosremote/en.lproj/iPad_autosize_old.storyboard | 42 +-- ios/iosremote/fr.lproj/iPad_autosize.storyboard | 42 +-- ios/iosremote/fr.lproj/iPad_autosize_old.storyboard | 42 +-- ios/iosremote/iosremote.xcodeproj/project.pbxproj| 18 -- ios/iosremote/iosremote/BasePresentationViewController.h |2 ios/iosremote/iosremote/BasePresentationViewController.m | 11 +++ ios/iosremote/iosremote/more_ipad.png|binary ios/iosremote/iosremote/more_i...@2x.png |binary ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard | 42 +-- ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard | 42 +-- 13 files changed, 119 insertions(+), 164 deletions(-) New commits: commit 401d2d3ea3f1f958a24bb834e751f6c024deca1b Author: Siqi LIU m...@siqi.fr Date: Sat Aug 31 12:00:56 2013 +0200 menu icon diff --git a/ios/iosremote/iosremote/more_ipad.png b/ios/iosremote/iosremote/more_ipad.png new file mode 100644 index 000..20227aa Binary files /dev/null and b/ios/iosremote/iosremote/more_ipad.png differ diff --git a/ios/iosremote/iosremote/more_i...@2x.png b/ios/iosremote/iosremote/more_i...@2x.png new file mode 100644 index 000..23d37e1 Binary files /dev/null and b/ios/iosremote/iosremote/more_i...@2x.png differ commit fd8ef5e7ac7760a5c2e061b6bf4fd55b46b10c4f Author: Siqi LIU m...@siqi.fr Date: Sat Aug 31 12:00:23 2013 +0200 replace more_icon for ipad diff --git a/ios/.DS_Store b/ios/.DS_Store index 3776bea..121d1d8 100644 Binary files a/ios/.DS_Store and b/ios/.DS_Store differ diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard index 1210c72..4048405 100644 --- a/ios/iosremote/en.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard @@ -365,29 +365,24 @@ action selector=stopWatchClear: destination=VQa-vM-8pF eventType=touchUpInside id=aD5-Wp-WRC/ /connections /button +button opaque=NO contentMode=scaleToFill contentHorizontalAlignment=center contentVerticalAlignment=center lineBreakMode=middleTruncation id=jBq-0A-D38 +rect key=frame x=736 y=23 width=58 height=59/ +autoresizingMask key=autoresizingMask flexibleMinX=YES flexibleMinY=YES/ +fontDescription key=fontDescription type=boldSystem pointSize=15/ +state key=normal backgroundImage=more_ipad.png +color key=titleColor red=0.1960784345999 green=0.3098039329002 blue=0.5215686560002 alpha=1 colorSpace=calibratedRGB/ +color key=titleShadowColor white=0.5 alpha=1 colorSpace=calibratedWhite/ +/state +state key=highlighted +color key=titleColor white=1 alpha=1 colorSpace=calibratedWhite/ +/state +connections +action selector=popOverUp: destination=TYh-Hw-m1Q eventType=touchUpInside id=0Zm-gv-gne/ +/connections +/button /subviews color key=backgroundColor white=1 alpha=1 colorSpace=calibratedWhite/ /view -button opaque=NO contentMode=scaleToFill contentHorizontalAlignment=center contentVerticalAlignment=center lineBreakMode=middleTruncation id=jBq-0A-D38 -rect key=frame x=683 y=898 width=97 height=59/ -autoresizingMask key=autoresizingMask flexibleMinX=YES flexibleMinY=YES/ -fontDescription key=fontDescription type=boldSystem pointSize=15/ -state key=normal backgroundImage=gear.png -color key=titleColor red=0.1960784345999 green=0.3098039329002 blue=0.5215686560002 alpha=1 colorSpace=calibratedRGB/ -color key=titleShadowColor white=0.5 alpha=1 colorSpace=calibratedWhite/ -/state -state key=highlighted backgroundImage=gear_pressed -color
[Libreoffice-commits] core.git: 2 commits - .gitignore ios/iosremote
.gitignore |3 ++- ios/iosremote/en.lproj/iPad_autosize.storyboard |2 ++ ios/iosremote/en.lproj/iPad_autosize_old.storyboard |4 +++- ios/iosremote/fr.lproj/iPad_autosize.storyboard |4 +++- ios/iosremote/fr.lproj/iPad_autosize_old.storyboard |2 +- ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard |4 +++- ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard |2 +- 7 files changed, 15 insertions(+), 6 deletions(-) New commits: commit d91d6f0bb1146fc5293070c16f8dfde5f4252746 Author: Siqi LIU m...@siqi.fr Date: Sat Aug 31 12:05:09 2013 +0200 minor diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard index 4048405..713c135 100644 --- a/ios/iosremote/en.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard @@ -520,7 +520,9 @@ class className=BasePresentationViewController superclassName=UIViewController source key=sourceIdentifier type=project relativePath=./Classes/BasePresentationViewController.h/ relationships +relationship kind=action name=nextSlideAction:/ relationship kind=action name=popOverUp:/ +relationship kind=action name=previousSlideAction:/ relationship kind=outlet name=NoteWebView candidateClass=UIWebView/ relationship kind=outlet name=NotesView candidateClass=UIView/ relationship kind=outlet name=clearButton candidateClass=UIButton/ diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard index f8dd5ec..713c135 100644 --- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard @@ -508,7 +508,7 @@ image name=Default.png width=320 height=480/ image name=WTPairingScreenshot.png width=474 height=312/ image name=add.png width=30 height=30/ -image name=more_ipad.png width=120 height=120/ +image name=more_ipad.png width=60 height=60/ image name=nextButton_normal.png width=42 height=230/ image name=nextButton_pressed.png width=42 height=230/ image name=previousButton_normal.png width=42 height=230/ @@ -520,7 +520,9 @@ class className=BasePresentationViewController superclassName=UIViewController source key=sourceIdentifier type=project relativePath=./Classes/BasePresentationViewController.h/ relationships +relationship kind=action name=nextSlideAction:/ relationship kind=action name=popOverUp:/ +relationship kind=action name=previousSlideAction:/ relationship kind=outlet name=NoteWebView candidateClass=UIWebView/ relationship kind=outlet name=NotesView candidateClass=UIView/ relationship kind=outlet name=clearButton candidateClass=UIButton/ diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard index e4d2e85..052e4e1 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard @@ -508,7 +508,7 @@ image name=Default.png width=320 height=480/ image name=WTPairingScreenshot.png width=474 height=312/ image name=add.png width=30 height=30/ -image name=more_ipad.png width=120 height=120/ +image name=more_ipad.png width=60 height=60/ image name=nextButton_normal.png width=42 height=230/ image name=nextButton_pressed.png width=42 height=230/ image name=previousButton_normal.png width=42 height=230/ @@ -520,7 +520,9 @@ class className=BasePresentationViewController superclassName=UIViewController source key=sourceIdentifier type=project relativePath=./Classes/BasePresentationViewController.h/ relationships +relationship kind=action name=nextSlideAction:/ relationship kind=action name=popOverUp:/ +relationship kind=action name=previousSlideAction:/ relationship kind=outlet name=NoteWebView candidateClass=UIWebView/ relationship kind=outlet name=NotesView candidateClass=UIView/ relationship kind=outlet name=clearButton candidateClass=UIButton/ diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard index 3bc753d..e4d2e85 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard @@ -508,7 +508,7 @@ image name=Default.png width=320 height=480/ image name=WTPairingScreenshot.png width=474 height=312/ image name=add.png width=30 height=30/ -image name=more_ipad.png
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 5512bdd0e734e6fe2ad1420e78b9837a5eaf7dde Author: Siqi LIU m...@siqi.fr Date: Sat Aug 31 12:08:07 2013 +0200 add DS_Store to gitignore diff --git a/.gitignore b/.gitignore index e4a4b35..db3d622 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ __pycache__ # iOS remote control specific UserInterfaceState.xcuserstate +.DS_Store ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit a53ee72988f6b0330622c71d636b9add9fc4b24a Author: Siqi LIU m...@siqi.fr Date: Sat Aug 31 12:12:05 2013 +0200 move iosremote specific rules to iosremote level diff --git a/ios/iosremote/.gitignore b/ios/iosremote/.gitignore new file mode 100644 index 000..fa09e0d --- /dev/null +++ b/ios/iosremote/.gitignore @@ -0,0 +1 @@ +UserInterfaceState.xcuserstate ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore ios/.DS_Store ios/iosremote
.gitignore |2 -- dev/null |binary 2 files changed, 2 deletions(-) New commits: commit 7cc4ee76256897cd2f401173a1546737556a3c96 Author: Siqi LIU m...@siqi.fr Date: Sat Aug 31 12:13:59 2013 +0200 remove all DS_Store 'that have crept in' diff --git a/.gitignore b/.gitignore index db3d622..f13d6e1 100644 --- a/.gitignore +++ b/.gitignore @@ -77,6 +77,4 @@ /moz/zipped/*.zip __pycache__ -# iOS remote control specific -UserInterfaceState.xcuserstate .DS_Store diff --git a/ios/.DS_Store b/ios/.DS_Store deleted file mode 100644 index 121d1d8..000 Binary files a/ios/.DS_Store and /dev/null differ diff --git a/ios/iosremote/TestFlightSDK1.2.6/.DS_Store b/ios/iosremote/TestFlightSDK1.2.6/.DS_Store deleted file mode 100644 index 177ff60..000 Binary files a/ios/iosremote/TestFlightSDK1.2.6/.DS_Store and /dev/null differ diff --git a/ios/iosremote/iosremote/.DS_Store b/ios/iosremote/iosremote/.DS_Store deleted file mode 100644 index b7fa8dd..000 Binary files a/ios/iosremote/iosremote/.DS_Store and /dev/null differ diff --git a/ios/iosremote/iosremote/SWRevealViewController/.DS_Store b/ios/iosremote/iosremote/SWRevealViewController/.DS_Store deleted file mode 100644 index dbfa06c..000 Binary files a/ios/iosremote/iosremote/SWRevealViewController/.DS_Store and /dev/null differ diff --git a/ios/iosremote/iosremote/en.lproj/.DS_Store b/ios/iosremote/iosremote/en.lproj/.DS_Store deleted file mode 100644 index 28fd33c..000 Binary files a/ios/iosremote/iosremote/en.lproj/.DS_Store and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore ios/experimental ios/iosremote
.gitignore |7 +++ ios/experimental/LibreOffice/.gitignore |4 ios/iosremote/.gitignore|1 - 3 files changed, 7 insertions(+), 5 deletions(-) New commits: commit c073bc096267fe5c39139d53696a946937a586df Author: Siqi LIU m...@siqi.fr Date: Sat Aug 31 12:21:44 2013 +0200 move XCode specific gitignore to top level so that all XCode projects are clean diff --git a/.gitignore b/.gitignore index f13d6e1..d4526a9 100644 --- a/.gitignore +++ b/.gitignore @@ -77,4 +77,11 @@ /moz/zipped/*.zip __pycache__ +# OSX specific .DS_Store + +# Xcode specific +build +project.xcworkspace +xcuserdata +*.xuserstate diff --git a/ios/experimental/LibreOffice/.gitignore b/ios/experimental/LibreOffice/.gitignore deleted file mode 100644 index 8c1326f..000 --- a/ios/experimental/LibreOffice/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.DS_Store -build -project.xcworkspace -xcuserdata diff --git a/ios/iosremote/.gitignore b/ios/iosremote/.gitignore deleted file mode 100644 index fa09e0d..000 --- a/ios/iosremote/.gitignore +++ /dev/null @@ -1 +0,0 @@ -UserInterfaceState.xcuserstate ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - ios/iosremote
dev/null |binary
ios/iosremote/.DS_Store |binary
ios/iosremote/fr.lproj/iPad_autosize_old.storyboard |4 ++--
ios/iosremote/iosremote.xcodeproj/project.pbxproj| 12
ios/iosremote/iosremote/WTcontrol~ipad.png |binary
ios/iosremote/iosremote/WTcontrol~iphone.png |binary
ios/iosremote/iosremote/WalkThroughPageViewController.m |5 -
ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard |4 ++--
8 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 756b6040ca24702cca2482086e358080e20eb6d2
Author: Siqi LIU m...@siqi.fr
Date: Fri Aug 30 16:16:51 2013 +0200
remove old WalkthroughControl image
Change-Id: Id5680fde392a731da15889d3869e234fbf072068
diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store
index a75cbd5..85b6552 100644
Binary files a/ios/iosremote/.DS_Store and b/ios/iosremote/.DS_Store differ
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index d5cf0ab..c5770a0 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -105,6 +105,8 @@
8CAD659C17A3EFE700CFB661 /* arrow_right.png in Resources */ =
{isa = PBXBuildFile; fileRef = 8CAD659817A3EFE700CFB661 /* arrow_right.png */;
};
8CAD659D17A3EFE700CFB661 /* arrow_ri...@2x.png in Resources */
= {isa = PBXBuildFile; fileRef = 8CAD659917A3EFE700CFB661 /* arrow_ri...@2x.png
*/; };
8CAD65A017A3F76300CFB661 /* slideShowSwipeInList_ipad.m in
Sources */ = {isa = PBXBuildFile; fileRef = 8CAD659F17A3F76300CFB661 /*
slideShowSwipeInList_ipad.m */; };
+ 8CAF3DDF17D0DFFD00F931E5 /* WTcontrol~ipad.png in Resources */
= {isa = PBXBuildFile; fileRef = 8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png
*/; };
+ 8CAF3DE017D0DFFD00F931E5 /* WTcontrol~iphone.png in Resources
*/ = {isa = PBXBuildFile; fileRef = 8CAF3DDE17D0DFFD00F931E5 /*
WTcontrol~iphone.png */; };
8CD6EC6817CBBAF40071827A /* WalkThroughPageViewController.m in
Sources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6617CBBAF40071827A /*
WalkThroughPageViewController.m */; };
8CD6EC6917CBBAF40071827A /* WalkThroughPageViewController.xib
in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6717CBBAF40071827A /*
WalkThroughPageViewController.xib */; };
8CD6EC7017CC3FA00071827A /*
WalkThroughContainerViewController.m in Sources */ = {isa = PBXBuildFile;
fileRef = 8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */;
};
@@ -117,7 +119,6 @@
8CD6EC8217CF40200071827A /* WTconnecting.png in Resources */ =
{isa = PBXBuildFile; fileRef = 8CD6EC8117CF40200071827A /* WTconnecting.png */;
};
8CD6EC8417CF46930071827A /* WTPairing.png in Resources */ =
{isa = PBXBuildFile; fileRef = 8CD6EC8317CF46930071827A /* WTPairing.png */; };
8CD6EC8817CF4ABA0071827A /*
WalkThroughPageViewMainImageController.xib in Resources */ = {isa =
PBXBuildFile; fileRef = 8CD6EC8717CF4ABA0071827A /*
WalkThroughPageViewMainImageController.xib */; };
- 8CD6EC8A17CF67300071827A /* WTcontrol.png in Resources */ =
{isa = PBXBuildFile; fileRef = 8CD6EC8917CF67300071827A /* WTcontrol.png */; };
BE9EBD071765BF0800283FD2 /* CoreImage.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = BE9EBD061765BF0800283FD2 /*
CoreImage.framework */; };
/* End PBXBuildFile section */
@@ -272,6 +273,8 @@
8CAD659917A3EFE700CFB661 /* arrow_ri...@2x.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; name = arrow_ri...@2x.png;
path = iosremote/arrow_ri...@2x.png; sourceTree = group; };
8CAD659E17A3F76300CFB661 /* slideShowSwipeInList_ipad.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
name = slideShowSwipeInList_ipad.h; path =
iosremote/slideShowSwipeInList_ipad.h; sourceTree = group; };
8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; name = slideShowSwipeInList_ipad.m; path =
iosremote/slideShowSwipeInList_ipad.m; sourceTree = group; };
+ 8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; name = WTcontrol~ipad.png;
path = iosremote/WTcontrol~ipad.png; sourceTree = group; };
+ 8CAF3DDE17D0DFFD00F931E5 /* WTcontrol~iphone.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; name = WTcontrol~iphone.png;
path = iosremote/WTcontrol~iphone.png; sourceTree = group; };
8CD6EC6517CBBAF40071827A /* WalkThroughPageViewController.h */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType
[Libreoffice-commits] core.git: ios/iosremote slideshow/source
ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard | 68 -- ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard | 68 -- ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard | 68 -- ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard | 68 -- ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard | 68 -- slideshow/source/engine/pointersymbol.cxx|3 6 files changed, 2 insertions(+), 341 deletions(-) New commits: commit 1d1626f284790be9bf5dd2c6a7c148f2e05c8957 Author: Siqi LIU m...@siqi.fr Date: Fri Aug 23 19:07:38 2013 +0800 replace requestImmediateUpdate with normal notifyUpdate Change-Id: I8f9421cf9c9ec4c5e9e4bb47aff6f18ad3dcafc6 diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard index dbed94e..21db2eb 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard @@ -1,7 +1,6 @@ ?xml version=1.0 encoding=UTF-8 standalone=no? document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=2.0 toolsVersion=3084 systemVersion=12E55 targetRuntime=iOS.CocoaTouch propertyAccessControl=none initialViewController=qoG-TN-hN0 dependencies -deployment defaultVersion=1552 identifier=iOS/ development version=4600 identifier=xcode/ plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=2083/ /dependencies @@ -514,73 +513,6 @@ image name=timer_clear_btn.png width=60 height=60/ image name=timer_start_btn.png width=60 height=60/ /resources -classes -class className=EditableTableViewCell superclassName=UITableViewCell -source key=sourceIdentifier type=project relativePath=./Classes/EditableTableViewCell.h/ -/class -class className=LibONavigationController superclassName=UINavigationController -source key=sourceIdentifier type=project relativePath=./Classes/LibONavigationController.h/ -/class -class className=SWRevealViewController superclassName=UIViewController -source key=sourceIdentifier type=project relativePath=./Classes/SWRevealViewController.h/ -/class -class className=newServerViewController superclassName=UITableViewController -source key=sourceIdentifier type=project relativePath=./Classes/newServerViewController.h/ -relationships -relationship kind=action name=save:/ -relationship kind=outlet name=saveButton candidateClass=UIBarButtonItem/ -/relationships -/class -class className=pinValidation_vc superclassName=UIViewController -source key=sourceIdentifier type=project relativePath=./Classes/pinValidation_vc.h/ -relationships -relationship kind=outlet name=pinLabel candidateClass=UILabel/ -relationship kind=outlet name=statusLabel candidateClass=UILabel/ -/relationships -/class -class className=server_list_vc superclassName=UITableViewController -source key=sourceIdentifier type=project relativePath=./Classes/server_list_vc.h/ -relationships -relationship kind=outlet name=serverTable candidateClass=UITableView/ -/relationships -/class -class className=slideShowPreviewTable_vc superclassName=UITableViewController -source key=sourceIdentifier type=project relativePath=./Classes/slideShowPreviewTable_vc.h/ -relationships -relationship kind=action name=startPresentationAction:/ -relationship kind=outlet name=optionsTable candidateClass=UITableView/ -/relationships -/class -class className=slideShowPreviewTable_vc_iphone superclassName=slideShowPreviewTable_vc -source key=sourceIdentifier type=project relativePath=./Classes/slideShowPreviewTable_vc_iphone.h/ -relationships -relationship kind=outlet name=titleLabel candidateClass=UILabel/ -/relationships -/class -class className=slideShowSwipeInList superclassName=UITableViewController -source key=sourceIdentifier type=project relativePath=./Classes/slideShowSwipeInList.h/ -/class -class className=slideShow_vc superclassName=UIViewController -source key=sourceIdentifier type=project relativePath=./Classes/slideShow_vc.h/ -relationships -relationship kind=action name=accPointerAction:/ -relationship kind=action name=nextSlideAction:/ -relationship kind=action name=pointerAction:/ -relationship kind
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/slideview.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 22b1a83712e65ef2eec3d0d568533ec5d18f6863
Author: Siqi LIU m...@siqi.fr
Date: Fri Aug 23 11:22:39 2013 +0800
remove unused comment
Change-Id: I4076738c7186aeea2ab00a3d0424c86b7c005dbe
diff --git a/slideshow/source/engine/slideview.cxx
b/slideshow/source/engine/slideview.cxx
index db2e471..0d147b9 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -491,7 +491,6 @@ public:
virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset()
const
{
-std::cerr slideshow/source/engine/slideview.cxx:522 std::endl;
basegfx::B2DRectangle aTmpRect;
canvas::tools::calcTransformedRectBounds( aTmpRect,
maLayerBounds,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - icon-themes/galaxy offapi/com sdext/source sd/source slideshow/source
icon-themes/galaxy/sd/res/pointericon.png |binary
offapi/com/sun/star/presentation/XSlideShowView.idl | 14 +++
sd/source/ui/slideshow/slideshowviewimpl.cxx| 12 +
sd/source/ui/slideshow/slideshowviewimpl.hxx|2 +
sdext/source/presenter/PresenterSlideShowView.cxx |7 +
sdext/source/presenter/PresenterSlideShowView.hxx |3 ++
slideshow/source/engine/pointersymbol.cxx | 11 +---
slideshow/source/engine/slide/layermanager.cxx |5
slideshow/source/engine/slideview.cxx | 25
slideshow/source/inc/viewlayer.hxx |3 ++
10 files changed, 78 insertions(+), 4 deletions(-)
New commits:
commit 6aac349140436a40cfbe84e3fce61a8dc7be4b3f
Author: Siqi LIU m...@siqi.fr
Date: Fri Aug 23 10:54:42 2013 +0800
misc
Change-Id: I24736c4bd05644ed61e6df50f2267f6a2cd2f7f3
diff --git a/slideshow/source/engine/slide/layermanager.cxx
b/slideshow/source/engine/slide/layermanager.cxx
index 91bdb7b..bbe4578 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -636,6 +636,11 @@ namespace slideshow
OSL_FAIL( BitmapView::setPriority(): This method is not
supposed to be called! );
}
+virtual ::com::sun::star::geometry::IntegerSize2D
getTranslationOffset() const
+{
+return geometry::IntegerSize2D(0,0);
+}
+
virtual ::basegfx::B2DHomMatrix getTransformation() const
{
return mpCanvas-getTransformation();
diff --git a/slideshow/source/engine/slideview.cxx
b/slideshow/source/engine/slideview.cxx
index 250de4e..db2e471 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -489,6 +489,25 @@ public:
}
}
+virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset()
const
+{
+std::cerr slideshow/source/engine/slideview.cxx:522 std::endl;
+basegfx::B2DRectangle aTmpRect;
+canvas::tools::calcTransformedRectBounds( aTmpRect,
+ maLayerBounds,
+ maTransformation );
+geometry::IntegerSize2D offset(0, 0);
+
+// Add translation according to the origin of aTmpRect. Ignore the
+// translation when aTmpRect was not properly initialized.
+if ( ! aTmpRect.isEmpty())
+{
+offset.Width = basegfx::fround(aTmpRect.getMinX());
+offset.Height = basegfx::fround(aTmpRect.getMinY());
+}
+return offset;
+}
+
private:
// ViewLayer interface
// --
@@ -700,6 +719,7 @@ private:
virtual cppcanvas::CustomSpriteSharedPtr createSprite( const
::basegfx::B2DSize rSpriteSizePixel,
double
nPriority ) const;
virtual void setPriority( const basegfx::B1DRange rRange );
+virtual geometry::IntegerSize2D getTranslationOffset() const;
virtual ::basegfx::B2DHomMatrix getTransformation() const;
virtual basegfx::B2DHomMatrix getSpriteTransformation() const;
virtual void setClip( const ::basegfx::B2DPolyPolygon rClip );
@@ -960,6 +980,11 @@ basegfx::B2DHomMatrix SlideView::getTransformation() const
return maViewTransform * aMatrix;
}
+geometry::IntegerSize2D SlideView::getTranslationOffset() const
+{
+return mxView-getTranslationOffset();
+}
+
basegfx::B2DHomMatrix SlideView::getSpriteTransformation() const
{
return getTransformation();
diff --git a/slideshow/source/inc/viewlayer.hxx
b/slideshow/source/inc/viewlayer.hxx
index bddb210..f47f18a 100644
--- a/slideshow/source/inc/viewlayer.hxx
+++ b/slideshow/source/inc/viewlayer.hxx
@@ -22,6 +22,7 @@
#include sal/config.h
#include boost/shared_ptr.hpp
+#include com/sun/star/geometry/IntegerSize2D.hpp
namespace basegfx
{
@@ -128,6 +129,8 @@ namespace slideshow
*/
virtual basegfx::B2DHomMatrix getTransformation() const = 0;
+virtual ::com::sun::star::geometry::IntegerSize2D
getTranslationOffset() const = 0;
+
/** Get the overall view transformation.
Same transformation as with getTransformation(), only
commit 1e7918feeb088008a266edc493731dad361fecbc
Author: Siqi LIU m...@siqi.fr
Date: Fri Aug 23 10:40:27 2013 +0800
getTransilationOffset Impl
Change-Id: Ie02e1c4d2ab1357469213f13971ab04632611d67
diff --git a/slideshow/source/engine/pointersymbol.cxx
b/slideshow/source/engine/pointersymbol.cxx
index d0e7fce..f825bbc 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -28,6 +28,7 @@
#include basegfx/vector/b2dvector.hxx
#include com/sun/star
Re: Signed Up For iOS Testing
Hi Dave, Sorry for the late response as I was trying to stay focused on the mDNSResponder support thing on Windows, which is to me an essential feature to develop. I was on a trip also and I kept your email tagged to respond to you as soon as I've pushed an update to testflight for the iOS app. The port that I've used was indeed 1599. You might want to open 1598 as well because that was marked in an older implementation, but I'm not sure that would be helpful in your case... Actually if I understand correctly, the problem might be related to the mDNSResponder implementation: each running Impress instance will advertise a impressremote service, and if multiple services of the same type are advertised on the same IP address with the same name (i.e. device's name), there might be a case where multiple instances will fight for the 1599 port... This is only a guess since I am not sure exactly how the advertisement works in terms of choosing the port. Also, do you have a fresh build from the master branch? The Bonjour/Avahi advertising support is only available on the MASTER as far as I know. If it doesn't cause any trouble, could you describe briefly your network configuration? It may be interesting to know how the Bonjour/Avahi will work under a more complicated network configuration. 2013/8/13 Dave Richards drich...@largo.com Hi Siqi, I was able to get port 1599 opened on our firewall, but unable to get the iPad to find the Impress session. Can you confirm 100% that this is the right port? Otherwise we're going to have to do some wireshark work to find it. + Another suggestion please, put the exact version and build number on the first screen which has the [ Connect ] button so that it's easy to see if this is the most recent code. It can be a small font, but right now it's impossible to know the version. Thank you for pointing this out! I've noted this on my TO-DOs. Actually I will move on to more UI/UX improvements in the following weeks so I've kept all UI/UX improvements up till now. I've also updated the server-list finding process based on your previous comments. You can try the latest build on testflight. Thanks! Dave Richards City of Largo, FL Thank you. Siqi -- *From: *Siqi Liu m...@siqi.fr *To: *Dave Richards drich...@largo.com *Sent: *Friday, August 2, 2013 12:05:11 PM *Subject: *Re: Signed Up For iOS Testing Hello Dave, Thanks for your feedback! I think you've raised a good point, I will add a toggle for that in the next version. The port being used is 1599 if I remember well. Thank you, Siqi 2013/8/2 Dave Richards drich...@largo.com I got it and right now until I work our networking guy, it's not going to work. There is a firewall rule I need added between our WiFi and the LO server. Initial thoughts + Nice art on the connect splash and icon. - On the connection manager screen, it would be nice to have radio buttons or a toggle that disables the top section completely so that it does not scan that network for automatic connection if so desired. In our case, it will never find the server and is needlessly looking. WiFi is 192.168 and the inside connection is a different IP that has a route on that network. I was able to hard code in the IP and that will work once I have a firewall rule. Can you tell me what port is being used? Very cool project and start! Dave -- *From: *Siqi Liu m...@siqi.fr *To: *Dave Richards drich...@largo.com *Sent: *Friday, August 2, 2013 10:16:44 AM *Subject: *Re: Signed Up For iOS Testing Hi Dave, You should have received an email to install and test it on your iPad. The SSH support has not yet been developed for now and I can not promise you if we will have the time to develop it since it will change the current protocol and it is not covered in this year's gsoc program. But I will try to find some time to implement that if possible. Happy testing and let me know if there are any problems! Thank you, Siqi 2013/8/2 Dave Richards drich...@largo.com Hi Siqi I'm dave_largo and chatted with you on the IRC about multi-user servers. So I just sent you the Google form with my UDID for testing the remote control.I can test this from a more enterprise perspective and let you know how it works. Thanks Dave Disclaimer: According to Florida Public Records Law, email correspondence to and from the City of Largo, including email addresses and other personal information, is public record and must be made available to public and media upon request, unless otherwise exempt by the Public Records Law. -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- Disclaimer: According to Florida Public Records
[Libreoffice-commits] core.git: icon-themes/galaxy
icon-themes/galaxy/sd/res/pointericon.png |binary 1 file changed New commits: commit fc395e6b312f80976b25a25990791e7fa3d2aa39 Author: Siqi LIU m...@siqi.fr Date: Sat Aug 17 00:44:37 2013 +0800 pointericon png Change-Id: I18f86c35b8efaeb70ba03b37cecb0cef00757ca2 diff --git a/icon-themes/galaxy/sd/res/pointericon.png b/icon-themes/galaxy/sd/res/pointericon.png new file mode 100644 index 000..4184c06 Binary files /dev/null and b/icon-themes/galaxy/sd/res/pointericon.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSOC] iOS Impress remote app weekly report
Hello all, Here is what I've done during the past week: * The theme of the iOS app has been tuned to stay coherent with iOS7 UI guidelines (or almost) on previous versions of iOS. * The app has been tested and adjusted accordingly on iOS7 with actual devices for iPad and simulator for iPhone. This will assure a smooth transition to iOS7 in future releases. * The app support three languages now, namely en, fr and zh-hans (need some verification for the translation of course). I'm also interested to know how the LO-translation system works? As filmsi has pointed outhttp://siqi43.wordpress.com/2013/08/10/a-slightly-flattened-version-of-ios-impress-remote/comment-page-1/#comment-42 that this app will finally go through the .po files used internally in LibO. I would like to know how can I integrate it with iOS localization system. * The iOS5 support for storyboard localization is really poor in my view... it basically consists of copy-paste storyboards and thus one change in a storyboard will not be propagated to other storyboards accordingly. For that effect, I've used a python script to run alongside the build system to sync all storyboards based on the English one. This requires updates in build settings if anyone else is interested in building the app on their machines. * In summary, the app has been tested on iOS5, 6, 7 with localization to a certain extent. I will try my best to maintain maximum compatibility for now and consider dropping iOS5 support after iOS7's release. I'm currently working on the Bonjour support for Windows as I can finally build it on my windows machine. Cheers, Siqi -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] [GSOC] iOS remote control design
Hello Mirek, What's your take on the new screens? Eager to hear from you on them. You can find them here: http://siqi43.wordpress.com/2013/08/10/a-slightly-flattened-version-of-ios-impress-remote Do you want me to tint all buttons/icons in orange to stay in line with the Android app? I've taken blue only because it's one of the default on iOS7. Also, Fitoschido http://fitoschido.wordpress.com/ has made a good point in his comment I think. What's your opinion on that? Cheers, Siqi 2013/8/8 Siqi Liu m...@siqi.fr Hi Mirek, On Aug 7, 2013 7:55 PM, Mirek M. maz...@gmail.com wrote: Hi Siqi, On Mon, Aug 5, 2013 at 2:28 PM, Siqi Liu m...@siqi.fr wrote: Hi Mirek, Thanks for you feedbacks! I've responded inline for certain issues that you have pointed out. On Aug 5, 2013 11:45 AM, Mirek M. maz...@gmail.com wrote: Hi again, I was hoping someone else would comment, because I'm not well-versed in the iOS HIG and I don't care much for the platform. It doesn't help that the iOS 7 HIG is hidden behind an Apple ID login, which I don't have -- if you have one, take a look at the HIG [1] and the iOS 7 UI transition guide [2]. Me neither, I'm fairly new to iOS dev actually ^^ I will take a look at it. OK, good. Based on what I've gathered from articles, screens, and videos about iOS, though, here are my comments and concerns: * The swipe-in sidebar might not work on iOS 7 devices, as the swipe from the left side of the screen is used to go back. I'd recommend installing an iOS 7 beta to test out your app, and instead of a swipe-in sidebar, how about a pinch-out overview like on the Android app? As a plus, it won't be possible to accidentally show the sidebar when you meant to go to the last slide. Actually the swipe in sidebar is activated only by the detail button on the upper right corner since I don't want users to accidentally activate it by a swipe gesture. However I do need to swap the position of stop presentation button (on the left) and the detail button (on the right), didn't know why I placed them in wrong positions :-P OK. * The style seems to be an odd combination of iOS 6 and iOS 7 styles. Please pick one and go with it (I would say iOS 7 is a better choice). It would be good to use orange as the accent color, like we do on Android. Ok, I will change the accent to orange throughout the app, which was green before. In terms of styling, I personally don't have any iOS 7 compatible device to test on so I can either test it in the iOS7 simulator (which is still in Dev preview) or really just customize all the iOS 6 elements to make them feel like iOS7...which doesn't appear to be a good choice to me... iOS 7 simulator sounds good. Don't customize the iOS 6 elements -- that would probably not give accurate results. Actually if we release the app as an iOS6 app, (which would be the case) it would continue to use iOS 6 ui elements on iOS7 devices. For now I've just customized some elements to be similar to the one used in ios 7, and it turns out fine since basically we are removing old styles components (gradients, shadow etc to get flatter). I have tested on iOS6 and iOS5 devices and both work fine. I've also borrowed an iOS7 device to test on and it works as expected though some tweaks are necessary to make the feeling more coherent throughout the app. But yes, I will investigate into how to make the design style transition between iOS6 based app and iOS7 based app. For now, all the customized elements are designed to be similar to the iOS7 because, ...let's admit it, the iOS6 UI is just too boring...I'm kind of struggling here as well. * I don't quite understand the layout slide show control pad. Why is the next slide shown on the left whan one gets to it by swiping to the right? Why is it shown at all? First, I did not stick to the Android app which used a coverflow to change between slides because it's to me a little bit trickier to change to next slide by swiping. It doesn't seem to be as reliable as to simply click on a button. With a button, users don't even need to look at the app to know if they have swiped to the next slide or the next next slide... It was pointed out by Michael M during the initial proposition period as well and that's also why I made two big buttons for users to reliably control the next/previous slide. This would be good to test out. On the one hand, tapping is simpler, on the other, it requires the presenter to look at the screen to hit the target area, whereas, with swiping, the whole screen is the actionable area. Hmm..this still doesn't convince me... Scrolling is designed to easily browse through multiples items (in a nonlinear way like pick a music album) , and here the most used functionality is next/previous slide for a normal presentation. It doesn't feel right to put a cover-flow in such a prominent place...if users need
Re: [Libreoffice-ux-advise] [GSOC] iOS remote control design
Hi Mirek, On Aug 7, 2013 7:55 PM, Mirek M. maz...@gmail.com wrote: Hi Siqi, On Mon, Aug 5, 2013 at 2:28 PM, Siqi Liu m...@siqi.fr wrote: Hi Mirek, Thanks for you feedbacks! I've responded inline for certain issues that you have pointed out. On Aug 5, 2013 11:45 AM, Mirek M. maz...@gmail.com wrote: Hi again, I was hoping someone else would comment, because I'm not well-versed in the iOS HIG and I don't care much for the platform. It doesn't help that the iOS 7 HIG is hidden behind an Apple ID login, which I don't have -- if you have one, take a look at the HIG [1] and the iOS 7 UI transition guide [2]. Me neither, I'm fairly new to iOS dev actually ^^ I will take a look at it. OK, good. Based on what I've gathered from articles, screens, and videos about iOS, though, here are my comments and concerns: * The swipe-in sidebar might not work on iOS 7 devices, as the swipe from the left side of the screen is used to go back. I'd recommend installing an iOS 7 beta to test out your app, and instead of a swipe-in sidebar, how about a pinch-out overview like on the Android app? As a plus, it won't be possible to accidentally show the sidebar when you meant to go to the last slide. Actually the swipe in sidebar is activated only by the detail button on the upper right corner since I don't want users to accidentally activate it by a swipe gesture. However I do need to swap the position of stop presentation button (on the left) and the detail button (on the right), didn't know why I placed them in wrong positions :-P OK. * The style seems to be an odd combination of iOS 6 and iOS 7 styles. Please pick one and go with it (I would say iOS 7 is a better choice). It would be good to use orange as the accent color, like we do on Android. Ok, I will change the accent to orange throughout the app, which was green before. In terms of styling, I personally don't have any iOS 7 compatible device to test on so I can either test it in the iOS7 simulator (which is still in Dev preview) or really just customize all the iOS 6 elements to make them feel like iOS7...which doesn't appear to be a good choice to me... iOS 7 simulator sounds good. Don't customize the iOS 6 elements -- that would probably not give accurate results. Actually if we release the app as an iOS6 app, (which would be the case) it would continue to use iOS 6 ui elements on iOS7 devices. For now I've just customized some elements to be similar to the one used in ios 7, and it turns out fine since basically we are removing old styles components (gradients, shadow etc to get flatter). I have tested on iOS6 and iOS5 devices and both work fine. I've also borrowed an iOS7 device to test on and it works as expected though some tweaks are necessary to make the feeling more coherent throughout the app. But yes, I will investigate into how to make the design style transition between iOS6 based app and iOS7 based app. For now, all the customized elements are designed to be similar to the iOS7 because, ...let's admit it, the iOS6 UI is just too boring...I'm kind of struggling here as well. * I don't quite understand the layout slide show control pad. Why is the next slide shown on the left whan one gets to it by swiping to the right? Why is it shown at all? First, I did not stick to the Android app which used a coverflow to change between slides because it's to me a little bit trickier to change to next slide by swiping. It doesn't seem to be as reliable as to simply click on a button. With a button, users don't even need to look at the app to know if they have swiped to the next slide or the next next slide... It was pointed out by Michael M during the initial proposition period as well and that's also why I made two big buttons for users to reliably control the next/previous slide. This would be good to test out. On the one hand, tapping is simpler, on the other, it requires the presenter to look at the screen to hit the target area, whereas, with swiping, the whole screen is the actionable area. Hmm..this still doesn't convince me... Scrolling is designed to easily browse through multiples items (in a nonlinear way like pick a music album) , and here the most used functionality is next/previous slide for a normal presentation. It doesn't feel right to put a cover-flow in such a prominent place...if users need to switch to another slide, it isn't really complicated to use the sidebar to do that. However if you do think it's a better way to go I can try that, no problem here. BTW, on Android, there's also the option to use volume buttons to switch slides. Good point, I'll check if this is doable on iOS since they are known to be more strict on APIs. :-P Second, the reason I show a secondary slideshow preview is twofold: 1. It can be helpful for users to know what's the next slide, especially when the presentation is at the last slide, in which case the next slide will be black with a big SlideShow Finished on it 2
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate
|binary
ios/iosremote/iosremote/BasePresentationViewController.m
|2 ++
ios/iosremote/iosremote/serverList_vc.m
|2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ca367bd5f8851f6492ae2a5fb922b75f24c3850d
Author: Siqi LIU m...@siqi.fr
Date: Wed Aug 7 12:49:03 2013 +0800
fix for popOverMenu on iPad
Change-Id: I31180bfe086b339ad0b11ad28e770bdf3335d423
diff --git
a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate
b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate
index 0728360..4224f6d 100644
Binary files
a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate
and
b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate
differ
diff --git a/ios/iosremote/iosremote/BasePresentationViewController.m
b/ios/iosremote/iosremote/BasePresentationViewController.m
index f586146..186e0e5 100644
--- a/ios/iosremote/iosremote/BasePresentationViewController.m
+++ b/ios/iosremote/iosremote/BasePresentationViewController.m
@@ -492,6 +492,7 @@ static BOOL isBlank = NO;
break;
case 1:
[self.comManager.transmitter gotoSlide:0];
+break;
case 2:
if (!isBlank){
[self.comManager.transmitter blankScreen];
@@ -499,6 +500,7 @@ static BOOL isBlank = NO;
[self.comManager.transmitter resume];
}
isBlank = !isBlank;
+break;
default:
break;
}
diff --git a/ios/iosremote/iosremote/serverList_vc.m
b/ios/iosremote/iosremote/serverList_vc.m
index 65ff409..6a9d357 100644
--- a/ios/iosremote/iosremote/serverList_vc.m
+++ b/ios/iosremote/iosremote/serverList_vc.m
@@ -288,7 +288,7 @@
sectionHeader.font = [UIFont boldSystemFontOfSize:18];
sectionHeader.textColor = [UIColor darkTextColor];
sectionHeader.text = sectionName;
-
+sectionHeader
UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0,
tableView.bounds.size.width, [self tableView:tableView
heightForHeaderInSection:section])];
[view addSubview:sectionHeader];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore ios/iosremote
.gitignore |2 +- dev/null |binary 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit bf825affb3f3ee769ccf044b2b847ad48f790b94 Author: Siqi LIU m...@siqi.fr Date: Wed Aug 7 12:57:18 2013 +0800 remove userstate from the repo Change-Id: I60c7d5c74f919bc165e1c2629f7b05aad2442eb7 diff --git a/.gitignore b/.gitignore index 10bb787..57caeba 100644 --- a/.gitignore +++ b/.gitignore @@ -77,4 +77,4 @@ /moz/zipped/*.zip __pycache__ -ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate +ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 4224f6d..000 Binary files a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - ios/iosremote
ios/iosremote/iosremote.xcodeproj/project.pbxproj |4 +
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 12 ++--
ios/iosremote/iosremote/newServer_vc.m | 22 ++--
ios/iosremote/iosremote/slideShowSwipeInList_iphone.h |4 +
ios/iosremote/iosremote/slideShowSwipeInList_iphone.m |1
ios/iosremote/iosremote/slideShow_vc_iphone.m | 13
ios/iosremote/iosremote/stopWatch.h |1
ios/iosremote/iosremote/stopWatch.m | 33 +++-
8 files changed, 64 insertions(+), 26 deletions(-)
New commits:
commit e289eb655fb0d750b09c74dfd9811ab27243a207
Author: Siqi LIU m...@siqi.fr
Date: Mon Aug 5 19:40:20 2013 +0200
minor
Change-Id: Ia80ef855dc83bb60dfe484d95e8199679bd58d44
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index f3db340..3937a05 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -597,7 +597,7 @@
simulatedScreenMetrics key=destination type=retina4/
/simulatedMetricsContainer
inferredMetricsTieBreakers
-segue reference=UPp-kY-X3T/
+segue reference=eIY-4P-1sI/
segue reference=EWS-Nn-mQc/
/inferredMetricsTieBreakers
/document
\ No newline at end of file
commit b8e7ab20d2bb79d54c6ac431d3e8d689b4a3447a
Author: Siqi LIU m...@siqi.fr
Date: Mon Aug 5 19:37:07 2013 +0200
remove timer on slideshow navbar when cleared
Change-Id: I6b56880e64c4f0bcf7883817f2fb60c2dced4fe3
diff --git a/ios/iosremote/iosremote/stopWatch.m
b/ios/iosremote/iosremote/stopWatch.m
index b6d80f9..3f66c9b 100644
--- a/ios/iosremote/iosremote/stopWatch.m
+++ b/ios/iosremote/iosremote/stopWatch.m
@@ -26,14 +26,12 @@
@synthesize lastInterval = _lastInterval;
-dispatch_queue_t backgroundQueue;
- (stopWatch *) init
{
self = [super init];
self.state = TIMER_STATE_CLEARED;
self.set = NO;
-backgroundQueue = dispatch_queue_create(com.libreoffice.iosremote,
DISPATCH_QUEUE_CONCURRENT);
return self;
}
@@ -70,7 +68,6 @@ dispatch_queue_t backgroundQueue;
- (void)updateTimer
{
-dispatch_async(backgroundQueue, ^(void) {
// Create date from the elapsed time
NSDate *currentDate = [NSDate date];
NSTimeInterval timeInterval = [currentDate
timeIntervalSinceDate:self.startDate] + self.lastInterval;
@@ -83,11 +80,8 @@ dispatch_queue_t backgroundQueue;
// Format the elapsed time and set it to the label
NSString *timeString = [dateFormatter stringFromDate:timerDate];
-dispatch_async(dispatch_get_main_queue(), ^{
-self.timeLabel.text = timeString;
-self.barItem.title = timeString;
-});
-});
+self.timeLabel.text = timeString;
+self.barItem.title = timeString;
}
commit fd83796313aa431788066e3f33c0fff546d4f30f
Author: Siqi LIU m...@siqi.fr
Date: Mon Aug 5 19:34:49 2013 +0200
display timer on the main slideshow screen runloop fix
Change-Id: I4ea660a151992c74afb321f1bae19fdd2c5ee40e
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index 02363de..f3db340 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -284,12 +284,12 @@
autoresizingMask key=autoresizingMask
widthSizable=YES flexibleMaxY=YES/
subviews
imageView userInteractionEnabled=NO
contentMode=scaleAspectFit verticalCompressionResistancePriority=1000
id=bZq-z2-OKU
-rect key=frame x=97 y=8
width=220 height=167/
+rect key=frame x=3 y=8
width=220 height=167/
autoresizingMask
key=autoresizingMask flexibleMinX=YES widthSizable=YES
heightSizable=YES/
color key=backgroundColor white=1
alpha=1 colorSpace=calibratedWhite/
/imageView
view contentMode=scaleToFill
id=Y1f-iI-63a
-rect key=frame x=3 y=3
width=86 height=172/
+rect key=frame x=231 y=3
width=86 height=172/
autoresizingMask
key=autoresizingMask widthSizable=YES flexibleMaxX=YES
heightSizable=YES/
subviews
imageView
contentMode=scaleAspectFit verticalCompressionResistancePriority=1000
id=B2g-rO-b9G
@@ -301,7 +301,7
[Libreoffice-commits] core.git: 2 commits - sd/source slideshow/Library_slideshow.mk slideshow/source
sd/source/ui/remotecontrol/Receiver.cxx | 88 --
slideshow/Library_slideshow.mk|1
slideshow/source/engine/pointersymbol.cxx | 37 +---
slideshow/source/engine/pointersymbol.hxx | 11 ++-
slideshow/source/engine/slideshowimpl.cxx | 36
slideshow/source/engine/waitsymbol.cxx|2
6 files changed, 158 insertions(+), 17 deletions(-)
New commits:
commit 731f3d986eb13468681ae9a7ef491897a078f675
Author: Siqi LIU m...@siqi.fr
Date: Sun Aug 4 14:17:55 2013 +0200
request immdiateupdate for pointerSymbol, but bad performance
Change-Id: I943019f6f6c6aaddeb40bf7f56bd0ffefff8a6b3
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index f7a3f8c..593ff99 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -132,11 +132,32 @@ void Receiver::executeCommand( const std::vectorOString
aCommand )
}
else if (aCommand[0].equals( pointer_started ))
{
-std::cerr pointer_started std::endl;
+// std::cerr pointer_started std::endl;
+float x = aCommand[1].toFloat();
+float y = aCommand[2].toFloat();
SolarMutexGuard aSolarGuard;
+
+const ::com::sun::star::geometry::RealPoint2D pos(x,y);
+// std::cerr Pointer at (pos.X,pos.Y) std::endl;
+
+if (xSlideShow.is()) try
+{
+// std::cerr pointer_coordination in the is std::endl;
+xSlideShow-setProperty(
+beans::PropertyValue( PointerPosition ,
+-1,
+makeAny( pos ),
+beans::PropertyState_DIRECT_VALUE ) );
+}
+catch ( Exception )
+{
+SAL_WARN( sd.slideshow,
sd::SlideShowImpl::setPointerPosition(),
+exception caught: comphelper::anyToString(
cppu::getCaughtException() ));
+}
+
if (xSlideShow.is()) try
{
-std::cerr pointer_started in the is std::endl;
+// std::cerr pointer_started in the is std::endl;
xSlideShow-setProperty(
beans::PropertyValue( PointerVisible ,
-1,
@@ -148,15 +169,16 @@ void Receiver::executeCommand( const std::vectorOString
aCommand )
SAL_WARN( sd.slideshow, sd::SlideShowImpl::setPointerMode(),
exception caught: comphelper::anyToString(
cppu::getCaughtException() ));
}
+
SAL_INFO( sdremote, Pointer started, we display the pointer on
screen );
}
else if (aCommand[0].equals( pointer_dismissed ))
{
-std::cerr pointer_dismissed std::endl;
+// std::cerr pointer_dismissed std::endl;
SolarMutexGuard aSolarGuard;
if (xSlideShow.is()) try
{
-std::cerr pointer_dismissed in the is std::endl;
+// std::cerr pointer_dismissed in the is std::endl;
xSlideShow-setProperty(
beans::PropertyValue( PointerVisible ,
-1,
@@ -178,12 +200,12 @@ void Receiver::executeCommand( const std::vectorOString
aCommand )
SAL_INFO( sdremote, Pointer at (x,y) );
const ::com::sun::star::geometry::RealPoint2D pos(x,y);
-std::cerr Pointer at (pos.X,pos.Y) std::endl;
+// std::cerr Pointer at (pos.X,pos.Y) std::endl;
SolarMutexGuard aSolarGuard;
if (xSlideShow.is()) try
{
-std::cerr pointer_coordination in the is std::endl;
+// std::cerr pointer_coordination in the is std::endl;
xSlideShow-setProperty(
beans::PropertyValue( PointerPosition ,
-1,
diff --git a/slideshow/source/engine/pointersymbol.cxx
b/slideshow/source/engine/pointersymbol.cxx
index 8629ea7..d0e7fce 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -119,11 +119,15 @@ basegfx::B2DPoint PointerSymbol::calcSpritePos(
const uno::Referencerendering::XBitmap xBitmap(
rView-getCanvas()-getUNOCanvas(),
uno::UNO_QUERY_THROW );
const geometry::IntegerSize2D realSize( xBitmap-getSize() );
-return basegfx::B2DPoint(
+
+basegfx::B2DPoint newPos(
// pos.X pos.Y are given in 0..1, beginning from the upper left corner
of the currentSlide.
-std::minsal_Int32( realSize.Width * pos.X, LEFT_BORDER_SPACE ),
-std::maxsal_Int32( 0, realSize.Height * (1-pos.Y) -
mxBitmap-getSize().Height
-- LOWER_BORDER_SPACE ) );
+realSize.Width * pos.X,
+realSize.Height * pos.Y);
+
+// std::cerr calcSpritePos : ( newPos.getX() ,newPos.getY()
) std::endl;
+
+return newPos;
}
void PointerSymbol
[GSOC] iOS remote control for Impress progress report
Hello all, First, I'm excited to learn that I've passed the mid-term evaluation and a big thank to all who've helped me in the process. The app is out for beta-test now, click herehttp://siqi43.wordpress.com/2013/07/31/call-of-beta-testers-for-ios-impress-remote-control/for more information and registration. I think it's also time to revise my plan for the rest of the program. For now I've in front of me the following tasks need to be done: 1. Bonjour integration for Windows (still trying to build on Windows 8, and it fails at CppunitTest_writerfilter_rtftok now) 2. Pointer drawing with XSprite on LibO instance (tried to follow WaitSymbol as an example as suggested by Thorsten, but still need to find out how to call the drawing functions from Receiver) 3. Migrate avahi/bonjour service to an Impress specific library instead of sd, which is draw-specific. Otherwise this will create unnecessary dependencies for Draw users. (Any suggestions on appropriate locations for this? ) 4. Continue and expand beta-test base for the remote control (only 4 testers now all testing with iPads, we definitely need more testers. especially for iPhone users since it's a totally different app in a sense.) Thanks in advance for all potential suggestions! Cheers, Siqi -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ios/iosremote sd/source
ios/iosremote/iPad_autosize.storyboard | 94 --- ios/iosremote/iosremote/Communication/CommandInterpreter.m | 10 + ios/iosremote/iosremote/Communication/CommunicationManager.h |2 ios/iosremote/iosremote/Communication/SlideShow.h|4 ios/iosremote/iosremote/Communication/SlideShow.m| 11 + ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 29 --- ios/iosremote/iosremote/slideShowPreviewTable_vc.h |2 ios/iosremote/iosremote/slideShowPreviewTable_vc.m |1 ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.h |1 ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m | 15 + ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.h|1 ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m| 16 + sd/source/ui/remotecontrol/AvahiNetworkService.cxx |8 sd/source/ui/remotecontrol/AvahiNetworkService.hxx |8 sd/source/ui/remotecontrol/Communicator.cxx | 11 + sd/source/ui/remotecontrol/OSXNetworkService.hxx |8 sd/source/ui/remotecontrol/Transmitter.cxx |1 sd/source/ui/remotecontrol/ZeroconfService.hxx |8 18 files changed, 114 insertions(+), 116 deletions(-) New commits: commit b042a78d9847753d95560749dab2159d9cfbd7ae Author: Siqi LIU m...@siqi.fr Date: Thu Aug 1 12:55:07 2013 +0200 send out presentation title during the preview page Change-Id: I6acf7d6a690f9b29d11b4af9ea027e34170fbfdb diff --git a/ios/iosremote/iPad_autosize.storyboard b/ios/iosremote/iPad_autosize.storyboard index b06f4f8..804740f 100644 --- a/ios/iosremote/iPad_autosize.storyboard +++ b/ios/iosremote/iPad_autosize.storyboard @@ -171,33 +171,12 @@ autoresizingMask key=autoresizingMask widthSizable=YES flexibleMaxY=YES/ subviews label opaque=NO clipsSubviews=YES userInteractionEnabled=NO contentMode=left text=Title of the presentation(TODO) textAlignment=center lineBreakMode=tailTruncation numberOfLines=5 baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO id=JEW-I6-sw5 -rect key=frame x=22 y=30 width=424 height=44/ +rect key=frame x=20 y=20 width=428 height=168/ autoresizingMask key=autoresizingMask widthSizable=YES heightSizable=YES flexibleMaxY=YES/ fontDescription key=fontDescription type=boldSystem pointSize=28/ color key=textColor cocoaTouchSystemColor=darkTextColor/ nil key=highlightedColor/ /label -label opaque=NO clipsSubviews=YES userInteractionEnabled=NO contentMode=left text=Last modified: 3 Jul 2013 lineBreakMode=tailTruncation baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO id=0je-bV-nk1 -rect key=frame x=21 y=129 width=416 height=20/ -autoresizingMask key=autoresizingMask widthSizable=YES flexibleMinY=YES heightSizable=YES/ -fontDescription key=fontDescription type=system pointSize=19/ -color key=textColor name=alternateSelectedControlColor catalog=System colorSpace=catalog/ -nil key=highlightedColor/ -/label -label opaque=NO clipsSubviews=YES userInteractionEnabled=NO contentMode=left text=Author: author name lineBreakMode=tailTruncation baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO id=vfH-4C-Sag -rect key=frame x=21 y=97 width=1664 height=20/ -autoresizingMask key=autoresizingMask widthSizable=YES flexibleMinY=YES heightSizable=YES/ -fontDescription key=fontDescription type=system pointSize=19/ -color key=textColor name=alternateSelectedControlColor catalog=System colorSpace=catalog/ -nil key=highlightedColor/ -/label -label opaque=NO clipsSubviews=YES userInteractionEnabled=NO contentMode=left text=Current slide: 5 of 22 lineBreakMode=tailTruncation baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO id=mRZ-fv-RAC -rect key=frame x=21 y=165 width=392 height=20
[Libreoffice-commits] core.git: 3 commits - include/sal sd/source
include/sal/log-areas.dox |1 +
sd/source/ui/remotecontrol/AvahiNetworkService.cxx |4 ++--
sd/source/ui/remotecontrol/Receiver.cxx|7 ---
sd/source/ui/remotecontrol/Server.cxx |7 +++
4 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 1cfa65ccaf73993caa2b6fbae1501232f1d96ae8
Author: Siqi LIU m...@siqi.fr
Date: Thu Aug 1 16:25:33 2013 +0200
enable WiFi support for sdremote
Change-Id: I753b94413262cea6dd094b16a7ae03e8952f2522
diff --git a/sd/source/ui/remotecontrol/Server.cxx
b/sd/source/ui/remotecontrol/Server.cxx
index 9266ed3..0c9c51f 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -79,7 +79,7 @@ void RemoteServer::execute()
uno::Reference uno::XComponentContext xContext =
comphelper::getProcessComponentContext();
if (!xContext.is()/* ||
!officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)*/)
{
-SAL_INFO(sdremote, not in experimental mode, disabling TCP server);
+// SAL_INFO(sdremote, not in experimental mode, disabling TCP
server);
spServer = NULL;
return;
}
@@ -311,10 +311,9 @@ sal_Bool RemoteServer::connectClient( ClientInfo* pClient,
OUString aPin )
void SdDLL::RegisterRemotes()
{
-// Disable unless in experimental mode for now
SAL_INFO( sdremote, SdDLL::RegisterRemotes called );
uno::Reference uno::XComponentContext xContext =
comphelper::getProcessComponentContext();
-if ( xContext.is() /*
!officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) */)
+if ( xContext.is()
!officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) )
return;
sd::RemoteServer::setup();
commit e32798d63bdf0c9fbcc13df06c4afdfc5b0f4dd5
Author: Siqi LIU m...@siqi.fr
Date: Thu Aug 1 15:23:19 2013 +0200
add new debug area and use SAL_INFO instead for debug info
Change-Id: If719f3340ac585d162e1bb40847ce17e67415869
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 2041e7e..0699da6 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -103,6 +103,7 @@ certain functionality.
@li @c sd.slideshow
@li @c sdremote
@li @c sdremote.bluetooth
+@li @c sdremote.wifi
@section editeng
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
index 2f44cb1..6835433 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
@@ -41,7 +41,7 @@ static void entry_group_callback(AvahiEntryGroup *g,
AvahiEntryGroupState state,
switch (state) {
case AVAHI_ENTRY_GROUP_ESTABLISHED :
/* The entry group has been established successfully */
-std::cerr Service avahiService-getName().c_str()
successfully established.\n;
+SAL_INFO( sdremote.wifi, Service
avahiService-getName().c_str() successfully established. );
break;
case AVAHI_ENTRY_GROUP_COLLISION : {
@@ -52,7 +52,7 @@ static void entry_group_callback(AvahiEntryGroup *g,
AvahiEntryGroupState state,
n =
avahi_alternative_service_name(avahiService-getName().c_str());
avahiService-setName(n);
-std::cerr Service name collision, renaming service to
avahiService-getName() std::endl;
+SAL_INFO( sdremote.wifi, Service name collision, renaming
service to avahiService-getName() );
/* And recreate the services */
create_services(avahi_entry_group_get_client(g));
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index 40fc734..f5a7617 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -122,18 +122,19 @@ void Receiver::executeCommand( const std::vectorOString
aCommand )
else if (aCommand[0].equals( pointer_started ))
{
// xSlideShowController-setPointerMode(true);
-std::cerr Pointer started, we display the pointer on screen
std::endl;
+SAL_INFO( sdremote, Pointer started, we display the pointer on
screen );
}
else if (aCommand[0].equals( pointer_dismissed ))
{
// xSlideShowController-setPointerMode(false);
-std::cerr Pointer dismissed, we hide the pointer on screen
std::endl;
+SAL_INFO( sdremote, Pointer dismissed, we hide the pointer on
screen );
}
else if (aCommand[0].equals( pointer_coordination ))
{
float x = aCommand[1].toFloat();
float y = aCommand[2].toFloat();
-std::cerr (x,y) std::endl;
+
+SAL_INFO( sdremote, Pointer at (x,y) );
const ::com::sun::star::geometry::RealPoint2D pos(x,y);
// Same problem here...
// xSlideShowController-setPointerPosition(pos);
commit
[GSOC] Call of beta-testers for iOS Impress Remote control
Hello all, I've recently ported the iOS remote app to iPad and I think it's time to start some beta-testing at this stage so that I can identify problems as early as possible. The app has been tested mainly on an iPad1 running iOS5.1.1 and occasionally on an iPad2 running iOS6. All other tests are done on the simulator --- That's why I'm eager to hear from you about your experiences on other physical devices! The app should support all devices running iOS5 and later. Please join me to make this app better by registering on this formhttps://docs.google.com/forms/d/1XXpZWnPoIZEsyVG9Q-9TuvinjvjtuzeirEFY0WwRrJA/viewform. According to Apple's policy, I will have to register your devices' UDID before distributing it to you. You can find instructions on how to obtain the UDID by clicking herehttp://siqi43.wordpress.com/2013/07/15/how-to-find-your-idevices-udid/ Additional Information and instructions are available in the description in the gdoc. You will be informed once your devices have been added to the list. Thank you in advance and prepare for all the bugscrash that you may (and I'm sure you will :-P) encounter. As always, contact me on IRC (siqi) or by email if any questions/problems. Happy testing! -- Cordialement, Siqi LIU Étudiant Ingénieur, École Supérieure d'Électricité -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iPad_autosize.storyboard| 81 -- ios/iosremote/iosremote.xcodeproj/project.pbxproj | 53 +- ios/iosremote/iosremote/AppDelegate.m |2 ios/iosremote/iosremote/AppDelegate_ipad.h| 10 - ios/iosremote/iosremote/AppDelegate_ipad.m| 10 - ios/iosremote/iosremote/BasePresentationViewController.h | 10 - ios/iosremote/iosremote/BasePresentationViewController.m | 10 - ios/iosremote/iosremote/Communication/SlideShow.m |1 ios/iosremote/iosremote/ControlVariables.h| 10 - ios/iosremote/iosremote/HorizontalSlideCell.h | 10 - ios/iosremote/iosremote/HorizontalSlideCell.m | 10 - ios/iosremote/iosremote/MainSplitViewController.h | 10 - ios/iosremote/iosremote/MainSplitViewController.m | 10 - ios/iosremote/iosremote/autoDismissKeyboardNavigationViewController.h | 10 - ios/iosremote/iosremote/autoDismissKeyboardNavigationViewController.m | 10 - ios/iosremote/iosremote/server_list_vc_ipad.h | 10 - ios/iosremote/iosremote/server_list_vc_ipad.m | 10 - ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.h | 10 - ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m | 10 - ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.h | 10 - ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m | 10 - ios/iosremote/iosremote/slideShowSwipeInList_ipad.h | 10 - ios/iosremote/iosremote/slideShowSwipeInList_ipad.m | 10 - ios/iosremote/iosremote/stopWatch.h | 10 - ios/iosremote/iosremote/stopWatch.m | 10 - 25 files changed, 191 insertions(+), 156 deletions(-) New commits: commit 6a45fc1e3ebb016d0c6691af2d0f1a4d5eb635c1 Author: Siqi LIU m...@siqi.fr Date: Wed Jul 31 12:32:24 2013 +0200 license update Change-Id: I7e89b88694b0875b33fa5541acbdb73aff28f53c diff --git a/ios/iosremote/iPad_autosize.storyboard b/ios/iosremote/iPad_autosize.storyboard index 2028340..b06f4f8 100644 --- a/ios/iosremote/iPad_autosize.storyboard +++ b/ios/iosremote/iPad_autosize.storyboard @@ -338,17 +338,6 @@ rect key=frame x=0.0 y=458 width=129 height=768/ autoresizingMask key=autoresizingMask/ color key=backgroundColor white=0.1 alpha=1 colorSpace=calibratedWhite/ -prototypes -tableViewCell contentMode=scaleToFill selectionStyle=blue hidesAccessoryWhenEditing=NO indentationLevel=1 indentationWidth=0.0 id=zSs-IC-htx -rect key=frame x=0.0 y=22 width=129 height=44/ -autoresizingMask key=autoresizingMask/ -view key=contentView opaque=NO clipsSubviews=YES multipleTouchEnabled=YES contentMode=center -rect key=frame x=0.0 y=0.0 width=129 height=43/ -autoresizingMask key=autoresizingMask/ -color key=backgroundColor white=0.0 alpha=0.0 colorSpace=calibratedWhite/ -/view -/tableViewCell -/prototypes connections outlet property=dataSource destination=TYh-Hw-m1Q id=42R-0X-OyE/ outlet property=delegate destination=TYh-Hw-m1Q id=mMV-1F-8OM/ @@ -565,6 +554,76 @@ image name=timer_clear_btn.png width=74 height=74/ image name=timer_start_btn.png width=74 height=74/ /resources +classes +class className=BasePresentationViewController superclassName=UIViewController +source key=sourceIdentifier type=project relativePath=./Classes/BasePresentationViewController.h/ +relationships +relationship kind=action name=startConnectionModal:/ +relationship kind=outlet name=NoteWebView candidateClass=UIWebView/ +relationship kind=outlet name=NotesView candidateClass=UIView/ +relationship kind=outlet name=clearButton candidateClass=UIButton/ +relationship kind=outlet name=currentSlideImageView candidateClass=UIImageView/ +relationship kind=outlet name=horizontalTableView candidateClass=UITableView/ +relationship kind=outlet name=movingPointer
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iosremote.xcodeproj/project.pbxproj |6 +++
ios/iosremote/iosremote/Communication/SlideShow.m |6 +--
ios/iosremote/iosremote/UIImageView+setImageAnimated.h | 16
ios/iosremote/iosremote/UIImageView+setImageAnimated.m | 31 +
4 files changed, 56 insertions(+), 3 deletions(-)
New commits:
commit abfddb389930ef7ea80e33f22e48342e0c8ef473
Author: Siqi LIU m...@siqi.fr
Date: Wed Jul 31 15:13:11 2013 +0200
add category for imageView disolve transition
Change-Id: I25ca4ab5d69b129e08544a27d4d27f7cde90baed
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index 3d3ee78..9baef73 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -51,6 +51,7 @@
57DF0A85178FFFAB008B2D3D /* iPhone_autosize.storyboard in
Resources */ = {isa = PBXBuildFile; fileRef = 57DF0A83178FFFAB008B2D3D /*
iPhone_autosize.storyboard */; };
57FE71E31785C61400B50125 /* pinValidation_vc.m in Sources */ =
{isa = PBXBuildFile; fileRef = 57FE71E21785C61400B50125 /* pinValidation_vc.m
*/; };
57FE71E917861A9000B50125 /* slideShowPreviewTable_vc.m in
Sources */ = {isa = PBXBuildFile; fileRef = 57FE71E817861A9000B50125 /*
slideShowPreviewTable_vc.m */; };
+ 8C0323AB17A943720037432E /* UIImageView+setImageAnimated.m in
Sources */ = {isa = PBXBuildFile; fileRef = 8C0323AA17A943720037432E /*
UIImageView+setImageAnimated.m */; };
8C0DC83A17A4177C0099E5AE /* nextButton_pressed.png in Resources
*/ = {isa = PBXBuildFile; fileRef = 8C0DC83617A4177C0099E5AE /*
nextButton_pressed.png */; };
8C0DC83B17A4177C0099E5AE /* nextbutton_pres...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83717A4177C0099E5AE /*
nextbutton_pres...@2x.png */; };
8C0DC83C17A4177C0099E5AE /* previousButton_pressed.png in
Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83817A4177C0099E5AE /*
previousButton_pressed.png */; };
@@ -151,6 +152,8 @@
57FE71E21785C61400B50125 /* pinValidation_vc.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name
= pinValidation_vc.m; path = iosremote/Communication/pinValidation_vc.m;
sourceTree = group; };
57FE71E717861A9000B50125 /* slideShowPreviewTable_vc.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = slideShowPreviewTable_vc.h; sourceTree = group; };
57FE71E817861A9000B50125 /* slideShowPreviewTable_vc.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = slideShowPreviewTable_vc.m; sourceTree = group; };
+ 8C0323A917A943720037432E /* UIImageView+setImageAnimated.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
name = UIImageView+setImageAnimated.h; path =
iosremote/UIImageView+setImageAnimated.h; sourceTree = group; };
+ 8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; name = UIImageView+setImageAnimated.m; path =
iosremote/UIImageView+setImageAnimated.m; sourceTree = group; };
8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; path = nextButton_pressed.png;
sourceTree = group; };
8C0DC83717A4177C0099E5AE /* nextbutton_pres...@2x.png */ = {isa
= PBXFileReference; lastKnownFileType = image.png; path =
nextbutton_pres...@2x.png; sourceTree = group; };
8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
previousButton_pressed.png; sourceTree = group; };
@@ -419,6 +422,8 @@
8C26E5CF17A58703007DA4B7 /*
HorizontalSlideCell.m */,
8C26E5D517A68154007DA4B7 /* stopWatch.h */,
8C26E5D617A68154007DA4B7 /* stopWatch.m */,
+ 8C0323A917A943720037432E /*
UIImageView+setImageAnimated.h */,
+ 8C0323AA17A943720037432E /*
UIImageView+setImageAnimated.m */,
);
name = Support;
sourceTree = group;
@@ -635,6 +640,7 @@
8C26E5C917A5731D007DA4B7 /*
autoDismissKeyboardNavigationViewController.m in Sources */,
8C26E5D017A58703007DA4B7 /*
HorizontalSlideCell.m in Sources */,
8C26E5D717A68154007DA4B7 /* stopWatch.m in
Sources */,
+ 8C0323AB17A943720037432E /*
UIImageView+setImageAnimated.m in Sources
[Libreoffice-qa] [GSOC] Call of beta-testers for iOS Impress Remote control
Hello all, I've recently ported the iOS remote app to iPad and I think it's time to start some beta-testing at this stage so that I can identify problems as early as possible. The app has been tested mainly on an iPad1 running iOS5.1.1 and occasionally on an iPad2 running iOS6. All other tests are done on the simulator --- That's why I'm eager to hear from you about your experiences on other physical devices! The app should support all devices running iOS5 and later. Please join me to make this app better by registering on this formhttps://docs.google.com/forms/d/1XXpZWnPoIZEsyVG9Q-9TuvinjvjtuzeirEFY0WwRrJA/viewform. According to Apple's policy, I will have to register your devices' UDID before distributing it to you. You can find instructions on how to obtain the UDID by clicking herehttp://siqi43.wordpress.com/2013/07/15/how-to-find-your-idevices-udid/ Additional Information and instructions are available in the description in the gdoc. You will be informed once your devices have been added to the list. Thank you in advance and prepare for all the bugscrash that you may (and I'm sure you will :-P) encounter. As always, contact me on IRC (siqi) or by email if any questions/problems. Happy testing! -- Cordialement, Siqi LIU Étudiant Ingénieur, École Supérieure d'Électricité -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-commits] core.git: setup_native/source
setup_native/source/mac/ooo/DS_Store |binary 1 file changed New commits: commit ba7be1c9efec35efdd716aecc9a0fb0c568d831e Author: Siqi LIU m...@siqi.fr Date: Tue Jul 30 23:49:03 2013 +0200 put back DS_Store Change-Id: I10d1203cb81ffd96c5447082884e71cb8b9eb2f7 diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store new file mode 100644 index 000..fec0edc Binary files /dev/null and b/setup_native/source/mac/ooo/DS_Store differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iosremote/Communication/CommandTransmitter.h |5 +
ios/iosremote/iosremote/Communication/CommandTransmitter.m |9 +
ios/iosremote/iosremote/slideShow_vc.m |6 ++
3 files changed, 20 insertions(+)
New commits:
commit 666fe3e96c6715e455c6ab3e509e5e1c271cf9d9
Author: Siqi LIU m...@siqi.fr
Date: Fri Jul 26 10:52:41 2013 +0200
send proper pointer visibility command when touch begins/ ends
Change-Id: I2427f1857ca8189db39c20009103d93b935dd5bb
diff --git a/ios/iosremote/iosremote/Communication/CommandTransmitter.h
b/ios/iosremote/iosremote/Communication/CommandTransmitter.h
index f0243b3..b93cf7b 100644
--- a/ios/iosremote/iosremote/Communication/CommandTransmitter.h
+++ b/ios/iosremote/iosremote/Communication/CommandTransmitter.h
@@ -27,6 +27,11 @@
- (void) startPresentation;
- (void) stopPresentation;
+// Update pointer position
- (void) pointerCoordination:(CGPoint) aPoint;
+// Set pointer to the proper position and set it to visible on screen.
+- (void) setPointerVisibleAt: (CGPoint)aPoint;
+// Dismiss the pointer when touch ended.
+- (void) setPointerDismissed;
@end
diff --git a/ios/iosremote/iosremote/Communication/CommandTransmitter.m
b/ios/iosremote/iosremote/Communication/CommandTransmitter.m
index 07cdc9a..111c1ec 100644
--- a/ios/iosremote/iosremote/Communication/CommandTransmitter.m
+++ b/ios/iosremote/iosremote/Communication/CommandTransmitter.m
@@ -48,6 +48,15 @@
[self.client sendCommand:[NSString
stringWithFormat:@pointer_coordination\n%f\n%f\n\n, aPoint.x, aPoint.y]];
}
+- (void) setPointerVisibleAt: (CGPoint)aPoint
+{
+[self.client sendCommand:[NSString
stringWithFormat:@pointer_started\n%f\n%f\n\n, aPoint.x, aPoint.y]];
+}
+
+- (void) setPointerDismissed
+{
+[self.client sendCommand:@pointer_dismissed\n\n];
+}
/**
* Blank the screen to the default colour (set server-side), which is
diff --git a/ios/iosremote/iosremote/slideShow_vc.m
b/ios/iosremote/iosremote/slideShow_vc.m
index f66e279..5fb3350 100644
--- a/ios/iosremote/iosremote/slideShow_vc.m
+++ b/ios/iosremote/iosremote/slideShow_vc.m
@@ -191,6 +191,11 @@
CGPoint loc = [touch locationInView:self.touchPointerImage];
if (loc.x = 0 loc.x = self.touchPointerImage.frame.size.width
loc.y = 0 loc.y =
self.touchPointerImage.frame.size.height){
+CGPoint pointerInPercentage;
+pointerInPercentage.x = loc.x /
self.touchPointerImage.frame.size.width;
+pointerInPercentage.y = loc.y /
self.touchPointerImage.frame.size.height;
+[self.comManager.transmitter
setPointerVisibleAt:pointerInPercentage];
+
CGPoint p;
p.x = loc.x + self.touchPointerImage.frame.origin.x;
p.y = loc.y + self.touchPointerImage.frame.origin.y;
@@ -230,6 +235,7 @@
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
{
[self.movingPointer setHidden:YES];
+[self.comManager.transmitter setPointerDismissed];
}
#pragma mark - System defaults
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Impress Remote and Bonjour
Hello Michael and Thorsten, I'm now working on refactoring the Avahi/Bonjour integration to get a platform independent abstraction for publishing zeroconf service. And I will move on to continue with the pointer functionality once I've finished the Avahi/Bonjour one. I've already attempted to follow the example of engine/slideshow/waitsymbol.cxx as pointed out by Thorsten but I am a bit lost here when it comes to calling the setPointerVisble and setPointerPosition methods that I've defined in ui/source/slideshow/slideshowImpl, from within the Receiver.cxx class in source/remotecontrol. The problem is that I only have access to XPresentation2 and XSlideShowController interface and I don't know how can we call those methods defined in the slideshowImpl...I've git grep for other methods defined in the slideshowImp but it seems that they are called from no where outside the class itself... maybe I've made some silly mistakes by defining those methods in the slideshowImpl in the first place? It has become much more complicated when it comes to coding on the LibreOffice code base itself than coding in my little corner for the iOS ^^ But I'll try to get up to speed here. Siqi 2013/7/25 Michael Meeks michael.me...@suse.com On Thu, 2013-07-25 at 10:51 +0200, Thorsten Behrens wrote: Michael Meeks wrote: Has anyone managed to help you with some code pointers here yet ? Was talking that over with Siqi on irc already - for something that moves on screen, XSprite is the thing to use. ;) Thanks - sorry for duplicating that ;-) Siqi - do you have the structural overview of what you need and/or how to couple that into the remote code ? :-) I guess the nominally thread-safe UNO API for slideshow might be a help here, though I'd be rather tempted to do idle rendering / dispatch of anything graphical in the main UI thread and not trust the thread-safety: it already caused significant problems around thumbnailing IIRC. Anyhow - looking forward to seeing this feature ;-) IMHO it's a really neat one. ATB, Michael. -- michael .me...@suse.com , Pseudo Engineer, itinerant idiot -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] Impress Remote and Bonjour
2013/7/22 Artur Dryomov artur.dryo...@gmail.com Hi All, Siqi, the current implementation works fine with Android and commenting things or removing them is actually breaking existing clients. It would be great if you’ll do all protocol-related changes via Gerrit and always CC me and Michael. These changes shouldn’t be silent because there are thousands of active Android users using remote client. If you have any questions about the Android implementation — poke me and I’ll give you my opinion, it is highly welcome. The second thing is about the protocol itself — it would be great if you‘ll write down all known bugs and desired features to the wiki page so I can fix them or implement them. It is great that you post things to the mailing list but I just can forget to read some thread and then bug or feature will be missed, that’s why there is a wiki page for that (and Bugzilla as well). I hope that my words are reasonable and I’m sorry if they sound harsh — I didn’t mean that. Hi Artur, I've already restored the old implementation a couple of days ago so it should work as before now. Sorry that I've commented that out since it seemed like it doesn't work on my device. You can pull the master branch and it should be working with the android app. However, as I said earlier, the current implementation is still less reliable than the Bonjour/Avahi service, but if that is too complicated to use on the android then it's fine to stick to the old implementation, that's up to you. I will try to remember to put what bugs that I've found on the wiki page so that you can find them easily. Just didn't have the time to organize them. Maybe you can create a filter (if you use gmail) which put all mails from Micheal, Andrzej and me together so that you don't miss them ^^ That's what I've done, maybe it can comes handy to you as well. There is absolutely no problem to stay direct with me :-P I mean we are all gsoc students so we both have a lot to learn. ^^ Andrzej, can you post the timeout bug to Bugzilla and CC me? I’ll try to test it on the NG version. Thanks for mentioning firewall issues — I saw a related comment at the Google Play page, I’m adding it to my TODO list. And let me be the most pessimistic guy in the room about Zeroconf — it becomes a tradition, huh ;-) Well, the Zeroconf conception is great. It worked perfectly since the first versions of OS X and it always was an example for me about how things should work in real world for people who doesn’t know what IP addresses are and what to do to connect to computers and share files. You don’t need that — just patch a cable or connect to WiFi and you are already set. So I’m not against it at all. The point is that world is not ideal. I don’t really know how to make Bonjour work on Windows but I think it is tricky at least. What I know is Avahi sometimes is not installed on Linux stations — and if it is that doesn’t mean Avahi actually work because it just could be not active as a daemon. I’m not sure that an additional dependency for just discovering via remote clients for a very small (I think so and have no statistics) percentage of users is a great idea as well. Actually Avahi comes with most of the modern Linux distro and Bonjour comes with Mac OSX. But yes, on Windows it can be tricky but it seems that a lot of widely used software needs that service as well, so we can probably find a way to handle that as well. For now, I've implemented the Mac OSX with bonjour and Avahi on Linux just needs some modifications to be able to build with some CFLAGS. I'm working on that. The network service discovery support is available only starting Android 4.1 [1] which is not acceptable because there are a lot of users using older Android versions [2]. There is an external library [3] but is seems not updated for a while. Also I don’t know is it a great idea to put an external dependency for the client — we had a talk with Michael about that already ;-) Yep, on Android there is always a problem of fragmentation and maybe at least you can make it conditional on the android app? If (version4.1) Bonjour resolution else ... Otherwise I suppose the IP resolution should be really easy as it's just several lines of code on iOS. Does that make sense? Regards, Artur. [1]: https://developer.android.com/reference/android/net/nsd/package-summary.html [2]: http://developer.android.com/about/dashboards/index.html [3]: http://jmdns.sourceforge.net/ Happy coding! -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/DiscoveryService.cxx | 83 +++-
sd/source/ui/remotecontrol/DiscoveryService.hxx |4 -
2 files changed, 43 insertions(+), 44 deletions(-)
New commits:
commit d3cbcbad7d160c7b44182cc5142c5cd4e0e1a034
Author: Siqi LIU m...@siqi.fr
Date: Sun Jul 21 14:09:10 2013 +0200
restore old implementation of autodiscovery to keep android app happy ^^
Change-Id: I33d856c5654cedb0d6bf437bf4653fac8830369c
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index b5d4544..cfe7691 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -45,18 +45,13 @@ using namespace osl;
using namespace rtl;
using namespace sd;
-void SAL_CALL DiscoveryService::run()
-{
-
-}
-
DiscoveryService::DiscoveryService()
{
- #ifdef MACOSX
+#ifdef MACOSX
OSXNetworkService * service = [[OSXNetworkService alloc] init];
[service publishImpressRemoteServiceOnLocalNetworkWithName: @];
- #endif
- /*
+#endif
+// #else
mSocket = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
sockaddr_in aAddr;
@@ -79,9 +74,9 @@ DiscoveryService::DiscoveryService()
multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY);
rc = setsockopt( mSocket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-#ifdef WNT
+ #ifdef WNT
(const char*)
-#endif
+ #endif
multicastRequest, sizeof(multicastRequest));
if (rc)
@@ -89,43 +84,47 @@ DiscoveryService::DiscoveryService()
SAL_WARN(sd, DiscoveryService: setsockopt failed: errno);
return; // would be better to throw, but unsure if caller handles that
}
-*/
+// #endif
}
DiscoveryService::~DiscoveryService()
{
-// #ifdef WNT
-// closesocket( mSocket );
-// #else
-// close( mSocket );
+// #ifndef MACOSX
+ #ifdef WNT
+ closesocket( mSocket );
+ #else
+ close( mSocket );
+ #endif
+// #endif
+}
+
+void SAL_CALL DiscoveryService::run()
+{
+// #ifndef MACOSX
+char aBuffer[BUFFER_SIZE];
+while ( true )
+{
+memset( aBuffer, 0, sizeof(char) * BUFFER_SIZE );
+sockaddr_in aAddr;
+socklen_t aLen = sizeof( aAddr );
+recvfrom( mSocket, aBuffer, BUFFER_SIZE, 0, (sockaddr*) aAddr, aLen
);
+OString aString( aBuffer, strlen( LOREMOTE_SEARCH ) );
+if ( aString == LOREMOTE_SEARCH )
+{
+OStringBuffer aStringBuffer(LOREMOTE_ADVERTISE\n);
+aStringBuffer.append( OUStringToOString(
+osl::SocketAddr::getLocalHostname(), RTL_TEXTENCODING_UTF8 ) )
+.append( \n\n );
+if ( sendto( mSocket, aStringBuffer.getStr(),
+aStringBuffer.getLength(), 0, (sockaddr*) aAddr,
+ sizeof(aAddr) ) = 0 )
+{
+// Read error or closed socket -- we are done.
+return;
+}
+}
+}
// #endif
-// }
-
-// void SAL_CALL DiscoveryService::run()
-// {
-// char aBuffer[BUFFER_SIZE];
-// while ( true )
-// {
-// memset( aBuffer, 0, sizeof(char) * BUFFER_SIZE );
-// sockaddr_in aAddr;
-// socklen_t aLen = sizeof( aAddr );
-// recvfrom( mSocket, aBuffer, BUFFER_SIZE, 0, (sockaddr*) aAddr,
aLen );
-// OString aString( aBuffer, strlen( LOREMOTE_SEARCH ) );
-// if ( aString == LOREMOTE_SEARCH )
-// {
-// OStringBuffer aStringBuffer(LOREMOTE_ADVERTISE\n);
-// aStringBuffer.append( OUStringToOString(
-// osl::SocketAddr::getLocalHostname(), RTL_TEXTENCODING_UTF8
) )
-// .append( \n\n );
-// if ( sendto( mSocket, aStringBuffer.getStr(),
-// aStringBuffer.getLength(), 0, (sockaddr*) aAddr,
-// sizeof(aAddr) ) = 0 )
-// {
-// // Read error or closed socket -- we are done.
-// return;
-// }
-// }
-// }
}
DiscoveryService *sd::DiscoveryService::spService = NULL;
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.hxx
b/sd/source/ui/remotecontrol/DiscoveryService.hxx
index a50454b..846b211 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.hxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.hxx
@@ -47,8 +47,8 @@ namespace sd
static DiscoveryService *spService;
virtual void SAL_CALL run();
-// osl::DatagramSocket mSocket;
-// int mSocket;
+// osl::DatagramSocket mSocket;
+int mSocket;
};
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Impress Remote and Bonjour
Hello all again, I've just restored the old implementation and also keep the bonjour service available for Mac OSX as an extra. I've done several tests today and I've found that the old implementation indeed works under certain conditions, so I've restored it. However, it only seems to work when the LibreOffice instance is already launched on the PC and only then, when we start the android app, we can see that. And when we close the LibO instance, it doesn't disappear either. Anyway, I think it would be great to make android app compatible with the avahi/bonjour service (not really sure if that's possible) so that we can get it to work more reliably not the other way around... Also, I've had some troubles compiling DiscoveryService.cxx with avahi in it, it seems that I need to pass in some flags for this to work. I've tried to put this in the sd/Library_sd.mk sd/source/ui/remotecontrol/DiscoveryService, \ -lavahi-common \ -lavahi-client \ -fpermissive \ but it doesn't seem to work ... any helps on how to pass flags in .mk files? Cheers, Siqi 2013/7/20 Siqi Liu m...@siqi.fr Hello all, Sorry if I've broken something unexpectedly :P Actually I've commented the current implementation out since it doesn't seem to work during my tests with the android app... I mean, the auto discovery for Bluetooth connections works well but the one with WiFi doesn't seem to work for me (correct me here since I've done the tests before the gsoc actually, maybe I've missed something :-P). Also need confirmation from Ahunt (I've cc Ahunt also), since he has implemented this part I guess. Do let me know if it works in your tests, in that case I will try to put them back to keep it compatible with older implementation. Concerning the backward compatibility, it doesn't seem to be an issue for now because I've basically replaced some code that doesn't seem to work (for me) with a new version backed by Bonjour/Avahi service, but in case it prevents some functionalities to work, please let me know ^^. On the server end, what I've done for now is: 1. Bonjour service publishing for Mac OSX 2. I've add some code to handle pointer feature, which follow the protocol like this: pointer_coordination\nx\ny\n\n, where x and y are in percentage (0-1), taking upper left corner as the origin. 3. Try to correct the bug which gives the remote control false currentSlideIndex in the presentation_started message What I'm doing now: 1. Implement Avahi service publish for Linux and Bonjour for Windows build. Still need a lot of research here :-P What I've wanted to do but failed: 1. Draw a point on the running slideshow (like the pen feature), based on the pointer_coordination x y command. I've tried to find out how to do some drawing on the canvas but I didn't really understand the code there... not sure if we can add a small red rectangle and move that to the position corresponding to the pointer_coordination, for now it just prints out the coordination received. 2. The problem with currentSlideIndex seems to take place whenever we connect the PC to an external display and we start a presentation for middle. The remote app will always receive 0 instead of the real currentSlideIndex. The reasons, as far as I know, is related to the UpdateCurrentSlide(0); in sdext/source/presenter/PresenterController.cxx. Actually every time we launch the presentation, the thread which initiate the presenter will reset currentSlide to 0 due to some reasons (don't know why we need to UpdatecurrentSlide(0);) and the thread which sends presentation_started to the remote will ask for the currentSlideIndex after that, so it gets 0. What would be great to improve on the server-end: 1. Add some version information during the hand-shake phase. 2. Add some screen size information (or just small, medium, big flags) during the handshake, so that we can modify the preview size in the ImagePreparer.cxx accordingly. In case when I build the iPad version of the app, we will have some beautiful previews pictures instead of an over-enlarged one... On the android end, it seems that it's also possible to benefit from the Bonjour Service discovery http://developer.android.com/training/connect-devices-wirelessly/nsd-wifi-direct.html maybe this can help ^^ But if the old implementation of WiFi auto-discovery works already on your device, I will try to restore it so that we don't need to change anything on the android app. All the best! and Happy Coding! Siqi On Saturday, July 20, 2013, Michael Meeks wrote: Hi guys, On Sat, 2013-07-20 at 03:11 +0300, Artur Dryomov wrote:Hi guys, I noticed your commit which comments the current discovery service and replaces it with the Bonjour calls. Probably it is not a great idea — I mean commenting the current version — because it will break all Android applications which expect to get responses
Re: [GSoC] Impress Remote and Bonjour
Hello all, Sorry if I've broken something unexpectedly :P Actually I've commented the current implementation out since it doesn't seem to work during my tests with the android app... I mean, the auto discovery for Bluetooth connections works well but the one with WiFi doesn't seem to work for me (correct me here since I've done the tests before the gsoc actually, maybe I've missed something :-P). Also need confirmation from Ahunt (I've cc Ahunt also), since he has implemented this part I guess. Do let me know if it works in your tests, in that case I will try to put them back to keep it compatible with older implementation. Concerning the backward compatibility, it doesn't seem to be an issue for now because I've basically replaced some code that doesn't seem to work (for me) with a new version backed by Bonjour/Avahi service, but in case it prevents some functionalities to work, please let me know ^^. On the server end, what I've done for now is: 1. Bonjour service publishing for Mac OSX 2. I've add some code to handle pointer feature, which follow the protocol like this: pointer_coordination\nx\ny\n\n, where x and y are in percentage (0-1), taking upper left corner as the origin. 3. Try to correct the bug which gives the remote control false currentSlideIndex in the presentation_started message What I'm doing now: 1. Implement Avahi service publish for Linux and Bonjour for Windows build. Still need a lot of research here :-P What I've wanted to do but failed: 1. Draw a point on the running slideshow (like the pen feature), based on the pointer_coordination x y command. I've tried to find out how to do some drawing on the canvas but I didn't really understand the code there... not sure if we can add a small red rectangle and move that to the position corresponding to the pointer_coordination, for now it just prints out the coordination received. 2. The problem with currentSlideIndex seems to take place whenever we connect the PC to an external display and we start a presentation for middle. The remote app will always receive 0 instead of the real currentSlideIndex. The reasons, as far as I know, is related to the UpdateCurrentSlide(0); in sdext/source/presenter/PresenterController.cxx. Actually every time we launch the presentation, the thread which initiate the presenter will reset currentSlide to 0 due to some reasons (don't know why we need to UpdatecurrentSlide(0);) and the thread which sends presentation_started to the remote will ask for the currentSlideIndex after that, so it gets 0. What would be great to improve on the server-end: 1. Add some version information during the hand-shake phase. 2. Add some screen size information (or just small, medium, big flags) during the handshake, so that we can modify the preview size in the ImagePreparer.cxx accordingly. In case when I build the iPad version of the app, we will have some beautiful previews pictures instead of an over-enlarged one... On the android end, it seems that it's also possible to benefit from the Bonjour Service discovery http://developer.android.com/training/connect-devices-wirelessly/nsd-wifi-direct.html maybe this can help ^^ But if the old implementation of WiFi auto-discovery works already on your device, I will try to restore it so that we don't need to change anything on the android app. All the best! and Happy Coding! Siqi On Saturday, July 20, 2013, Michael Meeks wrote: Hi guys, On Sat, 2013-07-20 at 03:11 +0300, Artur Dryomov wrote:Hi guys, I noticed your commit which comments the current discovery service and replaces it with the Bonjour calls. Probably it is not a great idea — I mean commenting the current version — because it will break all Android applications which expect to get responses from server. First - Siqi - just to say I've been really impressed with your work :-) it's great to see the iOS remote looking so nice making good progress. Or I just don’t understand the idea? I thought Bonjour could work for OS X as an addition and not as a replacement. I guess we would want to add Bonjour support for all platforms (perhaps via some cleanish platform abstraction ?) since the iOS remote really has to use WiFi / Bonjour IIRC to work. Siqi - clearly we want to keep back-wards compatibility; though my greatest concern is only one-directional: IMHO it is trivial for people to update their remote on their mobile: it's a tiny app and updates in a few tens of seconds, also I think we can expect them to test that before they present (at least after a LibreOffice upgrade). So - we should put most effort into making sure that newer remotes talk to older libreoffice's - rather than the other way around :-) It would be great to hear Michael’s thoughts. Should we CC the devs list ? Yes of course; I've added that :-) I also thought to place all protocol-related changes to Gerrit and
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iosremote.xcodeproj/project.pbxproj |8 ---
ios/iosremote/iosremote/Communication/Client.h|2 -
ios/iosremote/iosremote/serverList_vc.m | 23 ++
3 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit 5e723eb8477264d0ea6a2d0f467bce67e2423fde
Author: Siqi LIU m...@siqi.fr
Date: Sat Jul 20 15:42:51 2013 +0200
differ the resolution of service address
Change-Id: I68e620939f27708cc483c584bf7aa389f6ec1199
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index bba51b0..63d5412 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -491,6 +491,7 @@
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CODE_SIGN_IDENTITY = iPhone Developer;
CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone
Developer;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -506,6 +507,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
ONLY_ACTIVE_ARCH = YES;
+ PROVISIONING_PROFILE = ;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 1,2;
};
@@ -523,8 +525,8 @@
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- CODE_SIGN_IDENTITY = iPhone Distribution;
- CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone
Distribution;
+ CODE_SIGN_IDENTITY = iPhone Developer;
+ CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone
Developer: Siqi Liu (SS3MXKAL2F);
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -533,7 +535,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
OTHER_CFLAGS = -DNS_BLOCK_ASSERTIONS=1;
PROVISIONING_PROFILE = ;
- PROVISIONING_PROFILE[sdk=iphoneos*] = ;
+ PROVISIONING_PROFILE[sdk=iphoneos*] =
141469F2-2E5D-43DA-9152-98C3F3CFEF69;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 1,2;
VALIDATE_PRODUCT = YES;
diff --git a/ios/iosremote/iosremote/Communication/Client.h
b/ios/iosremote/iosremote/Communication/Client.h
index 50f1d40..12a3641 100644
--- a/ios/iosremote/iosremote/Communication/Client.h
+++ b/ios/iosremote/iosremote/Communication/Client.h
@@ -17,7 +17,7 @@
@property BOOL connected;
@property (nonatomic, strong) NSNumber* pin;
@property (nonatomic, strong) NSString* name;
-@property (nonatomic, weak) Server* server;
+@property (nonatomic, strong) Server* server;
- (void) connect;
- (void) disconnect;
diff --git a/ios/iosremote/iosremote/serverList_vc.m
b/ios/iosremote/iosremote/serverList_vc.m
index 78f5d3b..5c158e8 100644
--- a/ios/iosremote/iosremote/serverList_vc.m
+++ b/ios/iosremote/iosremote/serverList_vc.m
@@ -46,15 +46,19 @@
int port = socketAddress-sin_port;
NSLog(@Resolved at %@:%u, ipString, port);
-[self.comManager.autoDiscoveryServers
replaceObjectAtIndex:[self.comManager.autoDiscoveryServers count]-1
- withObject:[[Server
alloc] initWithProtocol:NETWORK atAddress:ipString ofName:sender.name]];
-[self.tableView reloadData];
+[self.comManager connectToServer:[[Server alloc]
initWithProtocol:NETWORK atAddress:ipString ofName:sender.name]];
}
}
-(void) netService:(NSNetService *)sender didNotResolve:(NSDictionary
*)errorDict
{
NSLog(@Failed to resolve);
+UIAlertView *message = [[UIAlertView alloc] initWithTitle:@Failed to
reach the computer
+ message:@Please restart
your application or wait the application to refresh.
+ delegate:self
+cancelButtonTitle:@OK
+otherButtonTitles:nil];
+[message show];
}
#pragma mark - bonjour service discovery
@@ -89,7 +93,6 @@
NSLog(@Got service %p with hostname %@\n, aNetService
[Libreoffice-commits] core.git: 2 commits - ios/iosremote sd/source
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard |1
sd/source/ui/remotecontrol/DiscoveryService.mm |1
sd/source/ui/remotecontrol/OSXNetworkService.h | 33 +
sd/source/ui/remotecontrol/OSXNetworkService.mm | 43
4 files changed, 77 insertions(+), 1 deletion(-)
New commits:
commit dcae25c5edf083b4beabcd91215df686d7aa24f6
Author: Siqi LIU m...@siqi.fr
Date: Fri Jul 19 19:06:17 2013 +0200
server-end bonjour protocol implementation
Change-Id: I2676d5ebb7da232141769c44b7e5de13c257954d
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.mm
b/sd/source/ui/remotecontrol/DiscoveryService.mm
new file mode 100644
index 000..3cad7cd
--- /dev/null
+++ b/sd/source/ui/remotecontrol/DiscoveryService.mm
@@ -0,0 +1 @@
+#include DiscoveryService.cxx
\ No newline at end of file
diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.h
b/sd/source/ui/remotecontrol/OSXNetworkService.h
new file mode 100644
index 000..f0af0da
--- /dev/null
+++ b/sd/source/ui/remotecontrol/OSXNetworkService.h
@@ -0,0 +1,33 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_OSXNETWORKSERVICE_H
+#define INCLUDED_OSXNETWORKSERVICE_H
+
+#include sys/socket.h
+#include netinet/in.h
+
+ #include premac.h
+ #import CoreFoundation/CoreFoundation.h
+ #import Foundation/NSNetServices.h
+ #import Foundation/NSRunLoop.h
+ #include postmac.h
+
+@interface OSXNetworkService : NSObjectNSNetServiceDelegate
+{
+NSNetService *netService;
+}
+
+- (void) publishImpressRemoteServiceOnLocalNetworkWithName:(NSString *)sName;
+
+@end
+
+#endif /* INCLUDED_OSXNETWORKSERVICE_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.mm
b/sd/source/ui/remotecontrol/OSXNetworkService.mm
new file mode 100644
index 000..0cbfb3e
--- /dev/null
+++ b/sd/source/ui/remotecontrol/OSXNetworkService.mm
@@ -0,0 +1,43 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include osl/conditn.hxx // Include this early to avoid error as check()
gets defined by some SDK header to empty
+
+#include premac.h
+ #import CoreFoundation/CoreFoundation.h
+ #import OSXNetworkService.h
+#include postmac.h
+
+@implementation OSXNetworkService
+
+- (void) publishImpressRemoteServiceOnLocalNetworkWithName:(NSString *)sName
+{
+netService = [[NSNetService alloc] initWithDomain:@local
type:@_impressremote._tcp name:sName port:1599];
+
+ if (netService != nil)
+ {
+[netService setDelegate:self];
+[netService scheduleInRunLoop:[NSRunLoop currentRunLoop]
forMode:NSDefaultRunLoopMode];
+[netService publish];
+ }
+}
+
+-(void)netService:(NSNetService *)aNetService
+didNotPublish:(NSDictionary *)dict {
+NSLog(@Service did not publish: %@, dict);
+}
+
+- (void)dealloc {
+[netService stop];
+[netService release];
+[super dealloc];
+}
+
+@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6037852b701d42217e934eba4f1a53d1a7a6cfd1
Author: Siqi LIU m...@siqi.fr
Date: Fri Jul 19 19:05:44 2013 +0200
plain tableview to grouped tableview
Change-Id: I561eaf841b04ab2eb7721b385689110a7191d2c1
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index e03f4bf..e18dbff 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -584,7 +584,6 @@
class className=slideShowPreviewTable_vc
superclassName=UITableViewController
source key=sourceIdentifier type=project
relativePath=./Classes/slideShowPreviewTable_vc.h/
relationships
-relationship kind=action name=startPresentationAction:/
relationship kind=outlet name=optionsTable
candidateClass=UITableView/
/relationships
/class
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/iosremote sd/Library_sd.mk sd/source
ios/iosremote/iosremote/Communication/Client.m |2
ios/iosremote/iosremote/Communication/CommunicationManager.h |1
ios/iosremote/iosremote/Communication/CommunicationManager.m |3
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 74 +++
ios/iosremote/iosremote/serverList_vc.m | 219 ++-
sd/Library_sd.mk |6
sd/source/ui/remotecontrol/BluetoothServer.mm|2
sd/source/ui/remotecontrol/DiscoveryService.cxx | 86 ++--
sd/source/ui/remotecontrol/DiscoveryService.hxx |2
9 files changed, 336 insertions(+), 59 deletions(-)
New commits:
commit 793f19d17111af6b79713f98a1e841d6e132248f
Author: Siqi LIU m...@siqi.fr
Date: Fri Jul 19 18:58:42 2013 +0200
bonjour autodiscovery for mac osx, let me know if it crashes on other build
Change-Id: Ibbaa7b583aaf48b28a913dfd8c12742b76c31d82
diff --git a/ios/iosremote/iosremote/Communication/Client.m
b/ios/iosremote/iosremote/Communication/Client.m
index 4ad51f8..417b418 100644
--- a/ios/iosremote/iosremote/Communication/Client.m
+++ b/ios/iosremote/iosremote/Communication/Client.m
@@ -202,8 +202,6 @@ int count = 0;
}
}
}
-//NSLog(@Command:%@, str);
-
backgroundQueue =
dispatch_queue_create(com.libreoffice.iosremote, DISPATCH_QUEUE_CONCURRENT);
dispatch_async(backgroundQueue, ^(void) {
NSArray *commands = [str componentsSeparatedByString:@\n];
diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.h
b/ios/iosremote/iosremote/Communication/CommunicationManager.h
index d4a1f75..af7b6c0 100644
--- a/ios/iosremote/iosremote/Communication/CommunicationManager.h
+++ b/ios/iosremote/iosremote/Communication/CommunicationManager.h
@@ -72,6 +72,7 @@ enum ConnectionState : NSInteger {
@property ConnectionState state;
@property (nonatomic, strong) id delegate;
@property (atomic, strong) NSMutableArray* servers;
+@property (atomic, strong) NSMutableArray* autoDiscoveryServers;
@property (nonatomic, strong) Client* client;
@property (nonatomic, strong) CommandInterpreter* interpreter;
@property (nonatomic, strong) CommandTransmitter* transmitter;
diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.m
b/ios/iosremote/iosremote/Communication/CommunicationManager.m
index 199f69c..c2c0332 100644
--- a/ios/iosremote/iosremote/Communication/CommunicationManager.m
+++ b/ios/iosremote/iosremote/Communication/CommunicationManager.m
@@ -30,6 +30,7 @@
@synthesize transmitter = _transmitter;
@synthesize servers = _servers;
@synthesize delegate = _delegate;
+@synthesize autoDiscoveryServers = _autoDiscoveryServers;
+ (CommunicationManager *)sharedComManager
{
@@ -116,7 +117,7 @@
selector:
@selector(connectionStatusHandler:)
name:
@connection.status.disconnected
object: nil];
-
+self.autoDiscoveryServers = [[NSMutableArray alloc] init];
return self;
}
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index 5a17393..e03f4bf 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -8,15 +8,15 @@
scene sceneID=5
objects
viewController id=2 customClass=server_list_vc
sceneMemberID=viewController
-tableView key=view clipsSubviews=YES
contentMode=scaleToFill alwaysBounceVertical=YES dataMode=prototypes
style=plain showsSelectionImmediatelyOnTouchBegin=NO rowHeight=44
sectionHeaderHeight=22 sectionFooterHeight=22 id=naQ-T4-jWV
+tableView key=view clipsSubviews=YES
contentMode=scaleToFill alwaysBounceVertical=YES dataMode=prototypes
style=grouped separatorStyle=singleLineEtched
showsSelectionImmediatelyOnTouchBegin=NO rowHeight=44
sectionHeaderHeight=10 sectionFooterHeight=10 id=naQ-T4-jWV
rect key=frame x=0.0 y=64 width=320
height=504/
-color key=backgroundColor white=1 alpha=1
colorSpace=calibratedWhite/
+color key=backgroundColor
cocoaTouchSystemColor=groupTableViewBackgroundColor/
prototypes
tableViewCell contentMode=scaleToFill
selectionStyle=blue hidesAccessoryWhenEditing=NO indentationLevel=1
indentationWidth=0.0 reuseIdentifier=server_item_cell
editingAccessoryType=disclosureIndicator textLabel=Rg3-PU-OuS
detailTextLabel=9Mc-gD-acc style=IBUITableViewCellStyleValue1
id=Pvl-Uw-Ghs
-rect key=frame x=0.0 y=22 width=320
height=44
[Libreoffice-commits] core.git: 2 commits - ios/iosremote sdext/source
ios/iosremote/iosremote/serverList_vc.m| 40 -
sdext/source/presenter/PresenterController.cxx |3 +
2 files changed, 35 insertions(+), 8 deletions(-)
New commits:
commit d9e8255e6453568247dbdaa45e7a40cfb58f
Author: Siqi LIU m...@siqi.fr
Date: Sat Jul 20 01:06:54 2013 +0200
remove server if no longer visible
Change-Id: I75902afe3040304155d164fd0502a00869e4f9d7
diff --git a/ios/iosremote/iosremote/serverList_vc.m
b/ios/iosremote/iosremote/serverList_vc.m
index 9d25bb8..78f5d3b 100644
--- a/ios/iosremote/iosremote/serverList_vc.m
+++ b/ios/iosremote/iosremote/serverList_vc.m
@@ -76,8 +76,9 @@
- (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser
didNotSearch:(NSDictionary *)errorDict
{
NSLog(@search error);
-UITableViewCell * cell = [self.tableView
cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
-[(UIActivityIndicatorView *)[cell viewWithTag:5] stopAnimating];
+//UITableViewCell * cell = [self.tableView
cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+//[(UIActivityIndicatorView *)[cell viewWithTag:5] stopAnimating];
+[self.serviceBrowser searchForServicesOfType:@_impressRemote._tcp
inDomain:@local];
}
- (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser
@@ -104,11 +105,34 @@
didRemoveService:(NSNetService *)aNetService
moreComing:(BOOL)moreComing
{
+NSLog(@Did remove);
+NSString * ipString;
+
+if ([[aNetService addresses] count] 0){
+NSData * address = [[aNetService addresses] objectAtIndex: 0];
+struct sockaddr_in *socketAddress = (struct sockaddr_in *) [address
bytes];
+ipString = [NSString stringWithFormat:
@%s,inet_ntoa(socketAddress-sin_addr)];
+}
+
+for (Server * s in self.comManager.autoDiscoveryServers) {
+if (ipString){
+if ([s.serverName isEqualToString:aNetService.name]
[s.serverAddress isEqualToString:ipString])
+[self.comManager.autoDiscoveryServers
removeObjectIdenticalTo:s];
+} else {
+if ([s.serverName isEqualToString:aNetService.name])
+[self.comManager.autoDiscoveryServers
removeObjectIdenticalTo:s];
+}
+}
+// in case any residuous netServices still stay in the list
[self.comManager.autoDiscoveryServers removeObject:aNetService];
if(!moreComing)
{
[self.tableView reloadData];
+if ([self.comManager.autoDiscoveryServers count] == 0) {
+UITableViewCell * cell = [self.tableView
cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+[(UIActivityIndicatorView *)[cell viewWithTag:5] startAnimating];
+}
}
}
@@ -170,6 +194,8 @@
- (void) viewWillDisappear:(BOOL)animated
{
[self disableSpinner];
+[self.serviceBrowser stop];
+[self.serviceBrowser removeFromRunLoop:[NSRunLoop currentRunLoop]
forMode:NSDefaultRunLoopMode];
[super viewWillDisappear:animated];
}
@@ -266,13 +292,13 @@
- (UIView *)tableView:(UITableView *)tableView
viewForFooterInSection:(NSInteger)section {
if ([self.comManager.servers count] == 0 section == 1) {
-UILabel *sectionFooter = [[UILabel alloc] initWithFrame:CGRectMake(20,
10, tableView.frame.size.width - 50, 40)];
-[sectionFooter setLineBreakMode:NSLineBreakByCharWrapping];
+UILabel *sectionFooter = [[UILabel alloc] initWithFrame:CGRectMake(20,
10, tableView.frame.size.width - 50, 60)];
+[sectionFooter setLineBreakMode:NSLineBreakByWordWrapping];
[sectionFooter setNumberOfLines:5];
sectionFooter.backgroundColor = [UIColor clearColor];
sectionFooter.font = [UIFont systemFontOfSize:14];
sectionFooter.textColor = [UIColor colorWithRed:0.22 green:0.33
blue:0.53 alpha:1.0];
-sectionFooter.text = @Please manually add a computer with its IP
address.;
+sectionFooter.text = @In case your computer does not appear in the
section above, manually add a computer with its IP address.;
UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0,
tableView.bounds.size.width, [self tableView:tableView
heightForHeaderInSection:section])];
[view addSubview:sectionFooter];
@@ -331,7 +357,7 @@
[cell.detailTextLabel setText:[s serverAddress]];
} else if ([s isKindOfClass:[NSNetService class]]){
[cell.textLabel setText:[s name]];
-[cell.detailTextLabel setText:@loading...];
+[cell.detailTextLabel setText:@Resolving...];
}
}
}
diff --git a/sdext/source/presenter/PresenterController.cxx
b/sdext/source/presenter/PresenterController.cxx
index d105f90..f0bbc53 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -176,7 +176,7 @@ PresenterController
[Libreoffice-commits] core.git: sdext/source
sdext/source/presenter/PresenterController.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1d1189b4aeb19fe4c8ac0dc869d286cb89a1f077
Author: Siqi LIU m...@siqi.fr
Date: Sat Jul 20 01:11:00 2013 +0200
oups.. forgot to comment out a debug line
Change-Id: Ib22428a305d834a635f198f94b7b82088a718893
diff --git a/sdext/source/presenter/PresenterController.cxx
b/sdext/source/presenter/PresenterController.cxx
index f0bbc53..6e41996 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -255,7 +255,7 @@ void PresenterController::disposing (void)
void PresenterController::UpdateCurrentSlide (const sal_Int32 nOffset)
{
-std::cerr Updating current Slide to nOffset std::endl;
+// std::cerr Updating current Slide to nOffset std::endl;
GetSlides(nOffset);
UpdatePaneTitles();
UpdateViews();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - ios/iosremote sdext/source sd/source
ios/iosremote/iosremote/Communication/Client.m |2
ios/iosremote/iosremote/Communication/CommandTransmitter.h |2
ios/iosremote/iosremote/Communication/CommandTransmitter.m |5
ios/iosremote/iosremote/Communication/CommunicationManager.m | 28 +++-
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 63 ---
ios/iosremote/iosremote/slideShow_vc.m |5
sd/source/ui/remotecontrol/Receiver.cxx |9 +
sdext/source/presenter/PresenterController.cxx |2
8 files changed, 43 insertions(+), 73 deletions(-)
New commits:
commit 1bf276ba6e0486bc8ccc74a219dd2db8acfcff03
Author: Siqi LIU m...@siqi.fr
Date: Thu Jul 18 21:45:55 2013 +0200
add pointer in receiver...but don't know how to draw that point
Change-Id: I49493e87a0dab66a6b5abeb086afb51f5631b456
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index c3fe6fc..b5f06e7 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -119,6 +119,15 @@ void Receiver::executeCommand( const std::vectorOString
aCommand )
xSlideShowController-blankScreen( aColour );
}
}
+// pointer_coordination
+// x
+// y
+else if (aCommand[0].equals( pointer_coordination ))
+{
+float x = aCommand[1].toFloat();
+float y = aCommand[2].toFloat();
+std::cerr (x,y) std::endl;
+}
else if ( aCommand[0].equals( presentation_resume ) )
{
if ( xSlideShowController.is() )
commit 0025dd19c997d121c82c54a5af546256de32d413
Author: Siqi LIU m...@siqi.fr
Date: Thu Jul 18 21:41:22 2013 +0200
Ask users to reconnect if connection lost
Change-Id: I8b2da585e506e6ff529e0650c27429bb460185c8
diff --git a/ios/iosremote/iosremote/Communication/Client.m
b/ios/iosremote/iosremote/Communication/Client.m
index 4416986..4ad51f8 100644
--- a/ios/iosremote/iosremote/Communication/Client.m
+++ b/ios/iosremote/iosremote/Communication/Client.m
@@ -214,9 +214,7 @@ int count = 0;
} break;
default:
{
-
}
-
}
}
diff --git a/ios/iosremote/iosremote/Communication/CommandTransmitter.h
b/ios/iosremote/iosremote/Communication/CommandTransmitter.h
index 95821c9..f0243b3 100644
--- a/ios/iosremote/iosremote/Communication/CommandTransmitter.h
+++ b/ios/iosremote/iosremote/Communication/CommandTransmitter.h
@@ -27,4 +27,6 @@
- (void) startPresentation;
- (void) stopPresentation;
+- (void) pointerCoordination:(CGPoint) aPoint;
+
@end
diff --git a/ios/iosremote/iosremote/Communication/CommandTransmitter.m
b/ios/iosremote/iosremote/Communication/CommandTransmitter.m
index a359f5e..07cdc9a 100644
--- a/ios/iosremote/iosremote/Communication/CommandTransmitter.m
+++ b/ios/iosremote/iosremote/Communication/CommandTransmitter.m
@@ -43,6 +43,11 @@
[self.client sendCommand:[NSString stringWithFormat:@goto_slide\n%u\n\n,
slide]];
}
+- (void) pointerCoordination:(CGPoint) aPoint
+{
+[self.client sendCommand:[NSString
stringWithFormat:@pointer_coordination\n%f\n%f\n\n, aPoint.x, aPoint.y]];
+}
+
/**
* Blank the screen to the default colour (set server-side), which is
diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.m
b/ios/iosremote/iosremote/Communication/CommunicationManager.m
index 5538736..199f69c 100644
--- a/ios/iosremote/iosremote/Communication/CommunicationManager.m
+++ b/ios/iosremote/iosremote/Communication/CommunicationManager.m
@@ -59,14 +59,26 @@
if (self.state != DISCONNECTED) {
NSLog(@Connection Failed);
self.state = DISCONNECTED;
-dispatch_async(dispatch_get_main_queue(), ^{
-UIAlertView *message = [[UIAlertView alloc]
initWithTitle:@Failed to reach server
-
message:@Please verify your IP address and make sure that LibreOffice Impress
is running with impress remote feature enabled.
- delegate:self
-cancelButtonTitle:@OK
-
otherButtonTitles:@Help, nil];
-[message show];
-});
+if ([self.delegate isKindOfClass:[server_list_vc class]]){
+dispatch_async(dispatch_get_main_queue(), ^{
+UIAlertView *message = [[UIAlertView alloc]
initWithTitle:@Failed to reach server
+
message:@Please verify your IP address and make sure that LibreOffice Impress
is running with impress remote feature enabled.
+
delegate:self
Re: [Libreoffice-ux-advise] [GSOC] iOS remote control design
Hello Mirek, Thank you for creating the whiteboard page! I've filled out the page with screenshots based on the current implementation and some explications accordingly. Let me know if further information is needed. I've also joined the IRC channel and I will post on the mailing list tomorrow. Btw, I've changed it to call for proposal but it doesn't seem to appear in the call for proposal list. Is that normal? Siqi 2013/7/18 Mirek M. maz...@gmail.com: Hi Siqi, On Sat, Jul 13, 2013 at 5:51 PM, Siqi Liu m...@siqi.fr wrote: Hello all, This summer I will be working on an iOS application which allows users to control their slide shows right from their iOS devices. A complete proposal and estimated timetable is available here. I've already implemented all basic functionalities on the iOS5 with two iterations of UI design but I would absolutely like to have some feedbacks from you ! You can find my first set of design here and a second iteration here. Note that the second one are screenshots from actual implementation while the first one is a photoshoped draft. Besides, shall I open up a whiteboard specific to this project so that we can have more discussion there? What should I do to start it? Here you go: https://wiki.documentfoundation.org/Design/Whiteboards/Impress_remote_for_iOS . Please add the scope, which will determine what people should and shouldn't include in their design and then you can make the status Call for Proposals, add the proposal section, and add your mockups. Discussion shouldn't take place there, but rather on the Design team mailing list [1] or on our weekly IRC chat [2]. Be sure to link to the Design list thread on the whiteboard if you start one. If you're not sure how the whiteboard should be structured, use https://wiki.documentfoundation.org/Design/Whiteboards/Impress_remote_2 as a guideline. Finally, you can follow my progress on this feed: http://siqi43.wordpress.com/category/libreoffice/feed or contact me on IRC (nickname: siqi) Looking forward to your feedbacks and suggestions ! [1] http://nabble.documentfoundation.org/Design-f1935996.html [2] https://wiki.documentfoundation.org/Design/Meetings -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
Re: [GSOC] iOS remote control weekly update 5 (workable milestone)
Hello Jonathan, Tor and all LibO developers and QA testers, I've just integrated TestFlight into the app and now I need to register beta-testers' iOS devices in order to distribute this beta-testing version to you. For that I've created a gdoc to gather unique identifiers from all beta testers which is available here: https://docs.google.com/forms/d/1XXpZWnPoIZEsyVG9Q-9TuvinjvjtuzeirEFY0WwRrJA/edit?usp=sharing Please, feel free to register your iOS devices as testing devices so that I can register your devices for the ad-hoc distribution. You will then get a copy of the beta-testing distribution (.ipa) and try out this new app on your devices :-D This app gets better because of you! Happy testing and poke me for all questions you may have. Please also let me know if there is any mailing list that might be more appropriate for this matter. Thank you! Siqi 2013/7/14 Jonathan Aquilina eagles051...@gmail.com For app testing there is a website that allows testing of ios apps called test flight. https://testflightapp.com/ On Sun, Jul 14, 2013 at 10:50 AM, Tor Lillqvist t...@iki.fi wrote: The progress is really impressive! Also, should I publish this version on the app store so that people don't have to compile it? Or export it to an ipa file? I don't think it is a good idea to publish it before it is ready for real use; one is not supposed to publish beta test versions in the App Store. I would assume any hint at it being a test version in its description or in the app itself will automatically mean it won't get approved into the store. And on the other hand, if you publish it, knowing it has still problems, but without being able to tell so to customers, that will just generate bad press for it, LibreOffice published their Impress Remote for iOS but it doesn't work. Better to use the ad-hoc distribution mechanism, I think, where if I understand correctly you specifically add provisioning to the app to run on up to 100 named tester devices, and then distribute the app to these testers. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC] iOS remote control weekly update 5 (workable milestone)
Hello Jonathan, For now I've only tested it against iOS5.0 and later so I don't think it's compatible with iOS4.1. The app is pretty much based on storyBoard which is one of the main features of iOS5, so sadly iOS4 will not be compatible :'-( Siqi 2013/7/15 Jonathan Aquilina eagles051...@gmail.com What is the oldest version of iOS this will work with as i have an older ipod touch with 4.1 on it. On Mon, Jul 15, 2013 at 2:39 PM, Siqi Liu m...@siqi.fr wrote: Hello Jonathan, Tor and all LibO developers and QA testers, I've just integrated TestFlight into the app and now I need to register beta-testers' iOS devices in order to distribute this beta-testing version to you. For that I've created a gdoc to gather unique identifiers from all beta testers which is available here: https://docs.google.com/forms/d/1XXpZWnPoIZEsyVG9Q-9TuvinjvjtuzeirEFY0WwRrJA/edit?usp=sharing Please, feel free to register your iOS devices as testing devices so that I can register your devices for the ad-hoc distribution. You will then get a copy of the beta-testing distribution (.ipa) and try out this new app on your devices :-D This app gets better because of you! Happy testing and poke me for all questions you may have. Please also let me know if there is any mailing list that might be more appropriate for this matter. Thank you! Siqi 2013/7/14 Jonathan Aquilina eagles051...@gmail.com For app testing there is a website that allows testing of ios apps called test flight. https://testflightapp.com/ On Sun, Jul 14, 2013 at 10:50 AM, Tor Lillqvist t...@iki.fi wrote: The progress is really impressive! Also, should I publish this version on the app store so that people don't have to compile it? Or export it to an ipa file? I don't think it is a good idea to publish it before it is ready for real use; one is not supposed to publish beta test versions in the App Store. I would assume any hint at it being a test version in its description or in the app itself will automatically mean it won't get approved into the store. And on the other hand, if you publish it, knowing it has still problems, but without being able to tell so to customers, that will just generate bad press for it, LibreOffice published their Impress Remote for iOS but it doesn't work. Better to use the ad-hoc distribution mechanism, I think, where if I understand correctly you specifically add provisioning to the app to run on up to 100 named tester devices, and then distribute the app to these testers. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- -- Jonathan Aquilina -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] [GSOC] iOS remote control weekly update 5 (workable milestone)
Hello Jonathan, Tor and all LibO developers and QA testers, I've just integrated TestFlight into the app and now I need to register beta-testers' iOS devices in order to distribute this beta-testing version to you. For that I've created a gdoc to gather unique identifiers from all beta testers which is available here: https://docs.google.com/forms/d/1XXpZWnPoIZEsyVG9Q-9TuvinjvjtuzeirEFY0WwRrJA/edit?usp=sharing Please, feel free to register your iOS devices as testing devices so that I can register your devices for the ad-hoc distribution. You will then get a copy of the beta-testing distribution (.ipa) and try out this new app on your devices :-D This app gets better because of you! Happy testing and poke me for all questions you may have. Please also let me know if there is any mailing list that might be more appropriate for this matter. Thank you! Siqi 2013/7/14 Jonathan Aquilina eagles051...@gmail.com For app testing there is a website that allows testing of ios apps called test flight. https://testflightapp.com/ On Sun, Jul 14, 2013 at 10:50 AM, Tor Lillqvist t...@iki.fi wrote: The progress is really impressive! Also, should I publish this version on the app store so that people don't have to compile it? Or export it to an ipa file? I don't think it is a good idea to publish it before it is ready for real use; one is not supposed to publish beta test versions in the App Store. I would assume any hint at it being a test version in its description or in the app itself will automatically mean it won't get approved into the store. And on the other hand, if you publish it, knowing it has still problems, but without being able to tell so to customers, that will just generate bad press for it, LibreOffice published their Impress Remote for iOS but it doesn't work. Better to use the ad-hoc distribution mechanism, I think, where if I understand correctly you specifically add provisioning to the app to run on up to 100 named tester devices, and then distribute the app to these testers. --tml ___ LibreOffice mailing list libreoff...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [GSOC] iOS remote control weekly update 5 (workable milestone)
Hello Jonathan, For now I've only tested it against iOS5.0 and later so I don't think it's compatible with iOS4.1. The app is pretty much based on storyBoard which is one of the main features of iOS5, so sadly iOS4 will not be compatible :'-( Siqi 2013/7/15 Jonathan Aquilina eagles051...@gmail.com What is the oldest version of iOS this will work with as i have an older ipod touch with 4.1 on it. On Mon, Jul 15, 2013 at 2:39 PM, Siqi Liu m...@siqi.fr wrote: Hello Jonathan, Tor and all LibO developers and QA testers, I've just integrated TestFlight into the app and now I need to register beta-testers' iOS devices in order to distribute this beta-testing version to you. For that I've created a gdoc to gather unique identifiers from all beta testers which is available here: https://docs.google.com/forms/d/1XXpZWnPoIZEsyVG9Q-9TuvinjvjtuzeirEFY0WwRrJA/edit?usp=sharing Please, feel free to register your iOS devices as testing devices so that I can register your devices for the ad-hoc distribution. You will then get a copy of the beta-testing distribution (.ipa) and try out this new app on your devices :-D This app gets better because of you! Happy testing and poke me for all questions you may have. Please also let me know if there is any mailing list that might be more appropriate for this matter. Thank you! Siqi 2013/7/14 Jonathan Aquilina eagles051...@gmail.com For app testing there is a website that allows testing of ios apps called test flight. https://testflightapp.com/ On Sun, Jul 14, 2013 at 10:50 AM, Tor Lillqvist t...@iki.fi wrote: The progress is really impressive! Also, should I publish this version on the app store so that people don't have to compile it? Or export it to an ipa file? I don't think it is a good idea to publish it before it is ready for real use; one is not supposed to publish beta test versions in the App Store. I would assume any hint at it being a test version in its description or in the app itself will automatically mean it won't get approved into the store. And on the other hand, if you publish it, knowing it has still problems, but without being able to tell so to customers, that will just generate bad press for it, LibreOffice published their Impress Remote for iOS but it doesn't work. Better to use the ad-hoc distribution mechanism, I think, where if I understand correctly you specifically add provisioning to the app to run on up to 100 named tester devices, and then distribute the app to these testers. --tml ___ LibreOffice mailing list libreoff...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- -- Jonathan Aquilina -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[GSOC] iOS remote control weekly update 5 (workable milestone)
Hello all, This week I've had some important progresses that I would like to share with you! I'm copying this to the QA mailing list as I've promised to let you know once this app is ready for tests. What have been done during the last week: - the app handles server connection more smoothly, it is now a two step procedure (connection with a timeout of 3 secs and if connected, another 5 secs are allowed to wait for the initial pairing instruction sent from server) as I notice that on Windows the initial pairing message from server comes significantly slower than on Mac OS or Linux. - slide show preview page now provides two user options: 1. auto-start timer, 2. touch pointer. - Touch pointer means that users can touch the enlarged image directly and we will track the movement and send the coordinates to the server accordingly. This is much easier to code, more reliable to use for now and I will use this mode for server-end hacking. - accelerometer based pointer is still in its infancy, I've implemented an experimental version and it's not really usable for now (it reflects approximately where you point at if you calibrate the phone in the right way and don't move your phone... ). I've discussed this issue with Norbert Thiebaud and Andrzej J.R. Hunt and received some nice tips but I would rather save that at the end when everything else is ready as it's quite a crazy idea to implement xD - And finally, the app has been updated to be stay compatible with iOS5 onwards! What I'll be working on next week: - Fix the bug that I've discussed with Andrzej, that is, if the computer is connected to an external display, the currentSlideshow number sent initially would be most of the time 0 instead the real slidenumber (if we starts the slideshow from the middle for ex.). - Implement the pointer feature on the server end discuss with Artur in order to stay in consistency with the android app. - eventually other bug fixes bonjour service implementation on the server A final word: if you have an iOS device (for now it's iPhone only but it also works on iPad in a much smaller way :-P), feel free to do some test and let me know if any bugssuggestions. Also, should I publish this version on the app store so that people don't have to compile it? Or export it to an ipa file? That's it for now, Cheers, Siqi - -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] Impress Remote Protocol
Hello Artur, No worry about that ^^ I was just thinking of implementing them so that I can see my pointer actually flying on the big screen :-P. However, do let me know the what protocol you will adopt for this functionality and post it on your wiki page so that I can make the client conform to your design. (x, y in percentage relative to the width and height of the screen? And we take the left upper corner as the origin (0,0)? ) Otherwise, here are several functionalities that I'm looking to implement: 1. The pointer feature support 2. Is it possible to send to client some basic informations like the current presentation filename, author, etc before the users hit start presentation? Since (as Michael Meeks pointed out) it's much harder to send previews before the beginning of the presentation, this would be a great alternative solution. I will leave the protocol improvements to you then, but do send me a message over IRC or by email should you need someone to work on that with you. I will keep you updated should I need some further server-end features. ATB and happy coding! Cheers, Siqi 2013/7/13 Artur Dryomov artur.dryo...@gmail.com Hey Siqi, Your progress is huge, you are working pretty fast ;-) I haven’t worked on the server-side unfortunately. My plan was to implement the redesign of the client and then to work on the server. The idea was about implementing things with the current version of the protocol and only then move forward. That strategy gave me a better understanding of how the protocol works actually. The work on the client is going not so fast as I expected — most of the work is done and I hope to finish it soon, but a lot of time gone for debugging and optimizing. Protocol-related changes are part of my proposal actually. I have fears that if you’ll implement them I can fail the GSoC. Can you spend some more time on polishing, posting screenshots to the ux-advise list, QA, implementing iPad version, planning the Bonjour support? The design for the iOS 7 would be great as well — it is possibly coming this fall ;-) I’ll speed up and try to finish the redesign as fast as possible. Sorry for slowing things down — I just want to finish the GSoC successfully as much as you are ;-) What do you think? Regards, Artur. -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-qa] [GSOC] iOS remote control weekly update 5 (workable milestone)
Hello all, This week I've had some important progresses that I would like to share with you! I'm copying this to the QA mailing list as I've promised to let you know once this app is ready for tests. What have been done during the last week: - the app handles server connection more smoothly, it is now a two step procedure (connection with a timeout of 3 secs and if connected, another 5 secs are allowed to wait for the initial pairing instruction sent from server) as I notice that on Windows the initial pairing message from server comes significantly slower than on Mac OS or Linux. - slide show preview page now provides two user options: 1. auto-start timer, 2. touch pointer. - Touch pointer means that users can touch the enlarged image directly and we will track the movement and send the coordinates to the server accordingly. This is much easier to code, more reliable to use for now and I will use this mode for server-end hacking. - accelerometer based pointer is still in its infancy, I've implemented an experimental version and it's not really usable for now (it reflects approximately where you point at if you calibrate the phone in the right way and don't move your phone... ). I've discussed this issue with Norbert Thiebaud and Andrzej J.R. Hunt and received some nice tips but I would rather save that at the end when everything else is ready as it's quite a crazy idea to implement xD - And finally, the app has been updated to be stay compatible with iOS5 onwards! What I'll be working on next week: - Fix the bug that I've discussed with Andrzej, that is, if the computer is connected to an external display, the currentSlideshow number sent initially would be most of the time 0 instead the real slidenumber (if we starts the slideshow from the middle for ex.). - Implement the pointer feature on the server end discuss with Artur in order to stay in consistency with the android app. - eventually other bug fixes bonjour service implementation on the server A final word: if you have an iOS device (for now it's iPhone only but it also works on iPad in a much smaller way :-P), feel free to do some test and let me know if any bugssuggestions. Also, should I publish this version on the app store so that people don't have to compile it? Or export it to an ipa file? That's it for now, Cheers, Siqi - -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
