summaryrefslogtreecommitdiffstats
path: root/android/source/res
diff options
context:
space:
mode:
authorXimeng Zu <uznomis@yahoo.com>2017-07-12 09:20:56 -0500
committerTomaž Vajngerl <quikee@gmail.com>2017-08-07 14:41:02 +0200
commitf45cdbc9f3dd877a2ebda1e2718c59e83faf3c6a (patch)
tree8b0e7d388883cc5a0a74dc2bf30bf7ca31dbd5e1 /android/source/res
parentTSCP: simplify toolbar to only one combo box + configuration (diff)
downloadcore-f45cdbc9f3dd877a2ebda1e2718c59e83faf3c6a.tar.gz
core-f45cdbc9f3dd877a2ebda1e2718c59e83faf3c6a.zip
[Android Viewer] Add header funcs to Calc
Added insert/delete/hide/show/optimal width or height /adjust width or heigth to Calc. These options show in a floating menu near the headers when the user taps on the headers. Also added selection on headers, i.e., user can drag on headers to select multiple columns/rows. Change-Id: I7e1994d1fa81d80c110def035c2c065e838b49ac Reviewed-on: https://gerrit.libreoffice.org/40684 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'android/source/res')
-rw-r--r--android/source/res/layout/calc_header_popup.xml90
-rw-r--r--android/source/res/values/strings.xml17
2 files changed, 107 insertions, 0 deletions
diff --git a/android/source/res/layout/calc_header_popup.xml b/android/source/res/layout/calc_header_popup.xml
new file mode 100644
index 000000000000..8e563af27d0a
--- /dev/null
+++ b/android/source/res/layout/calc_header_popup.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical" android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/doorhanger_background_dark">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <Button
+ android:id="@+id/calc_header_popup_insert"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@string/calc_insert_before"/>
+
+ <Button
+ android:id="@+id/calc_header_popup_delete"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@string/calc_delete"/>
+
+ <Button
+ android:id="@+id/calc_header_popup_hide"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@string/calc_hide"/>
+
+ <Button
+ android:id="@+id/calc_header_popup_show"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@string/calc_show"/>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <Button
+ android:id="@+id/calc_header_popup_optimal_length"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@string/calc_optimal_length"/>
+
+ <Button
+ android:id="@+id/calc_header_popup_adjust_length"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@string/calc_adjust_length"/>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/calc_header_popup_optimal_length_dialog"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:visibility="gone">
+
+ <EditText
+ android:id="@+id/calc_header_popup_optimal_length_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:hint="@string/calc_optimal_length_default_text"/>
+
+ <Button
+ android:id="@+id/calc_header_popup_optimal_length_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text = "@string/calc_optimal_length_confirm"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+</ScrollView> \ No newline at end of file
diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml
index ad4d2699684a..04f1be3cc029 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -130,9 +130,26 @@
<!-- Create New Document Dialog Strings -->
<string name="create_new_document_title">Enter file name</string>
<string name="action_create">CREATE</string>
+
+ <!-- Presentation Mode Strings -->
<string name="action_presentation">Slide show</string>
<string name="alert_copy_svg_slide_show_to_clipboard">Your Android device doesn\'t support in-app svg slideshow. We copied the slideshow link to clipboard. Please press home button, open a modern web browser, paste in the address bar, and go.</string>
<string name="alert_copy_svg_slide_show_to_clipboard_dismiss">OK</string>
<string name="slideshow_action_back">Back</string>
+ <!-- Calc Header Menu Strings -->
+ <string name="calc_insert_before">Insert</string>
+ <string name="calc_delete">Delete</string>
+ <string name="calc_hide">Hide</string>
+ <string name="calc_show">Show</string>
+ <string name="calc_optimal_length">Optimal Length</string>
+ <string name="calc_adjust_length">Adjust Length</string>
+ <string name="calc_adjust_height">Adjust Height</string>
+ <string name="calc_adjust_width">Adjust Width</string>
+ <string name="calc_optimal_height">Optimal Height</string>
+ <string name="calc_optimal_width">Optimal Width</string>
+ <string name="calc_optimal_length_confirm">OK</string>
+ <string name="calc_optimal_length_default_text">Enter Extra Length in 100th/mm</string>
+ <string name="calc_alert_double_click_optimal_length">Hint: Double tap on a header sets optimal width/height.</string>
+
</resources>