aboutsummaryrefslogtreecommitdiffstats
path: root/res/menu
diff options
context:
space:
mode:
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/choose_contact.xml10
-rw-r--r--res/menu/conference_context.xml11
-rw-r--r--res/menu/contact_context.xml14
-rw-r--r--res/menu/conversations.xml46
-rw-r--r--res/menu/manageaccounts_context.xml2
-rw-r--r--res/menu/muc_details.xml6
-rw-r--r--res/menu/newconversation.xml15
-rw-r--r--res/menu/newconversation_context.xml22
-rw-r--r--res/menu/start_conversation.xml33
9 files changed, 95 insertions, 64 deletions
diff --git a/res/menu/choose_contact.xml b/res/menu/choose_contact.xml
new file mode 100644
index 00000000..3f402664
--- /dev/null
+++ b/res/menu/choose_contact.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/action_search"
+ android:actionLayout="@layout/actionview_search"
+ android:icon="@drawable/ic_action_search"
+ android:showAsAction="collapseActionView|always"
+ android:title="@string/search"/>
+</menu> \ No newline at end of file
diff --git a/res/menu/conference_context.xml b/res/menu/conference_context.xml
new file mode 100644
index 00000000..fd898580
--- /dev/null
+++ b/res/menu/conference_context.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/context_join_conference"
+ android:title="@string/join_conference"/>
+ <item
+ android:id="@+id/context_delete_conference"
+ android:title="@string/delete_bookmark"/>
+
+</menu> \ No newline at end of file
diff --git a/res/menu/contact_context.xml b/res/menu/contact_context.xml
new file mode 100644
index 00000000..11ac7d7c
--- /dev/null
+++ b/res/menu/contact_context.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/context_start_conversation"
+ android:title="@string/start_conversation"/>
+ <item
+ android:id="@+id/context_contact_details"
+ android:title="@string/view_contact_details"/>
+ <item
+ android:id="@+id/context_delete_contact"
+ android:title="@string/delete_contact"/>
+
+</menu> \ No newline at end of file
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml
index 68bcc957..2621289a 100644
--- a/res/menu/conversations.xml
+++ b/res/menu/conversations.xml
@@ -2,48 +2,44 @@
<item
android:id="@+id/action_add"
+ android:icon="@drawable/ic_action_new"
android:orderInCategory="10"
- android:icon="@drawable/ic_action_add"
- android:showAsAction="ifRoom"
- android:title="@string/action_add" />
-
+ android:showAsAction="always"
+ android:title="@string/action_add"/>
<item
android:id="@+id/action_security"
+ android:icon="@drawable/ic_action_not_secure"
android:orderInCategory="20"
- android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_unsecure"
- android:title="@string/action_secure" />
-
+ android:showAsAction="always"
+ android:title="@string/action_secure"/>
<item
android:id="@+id/action_attach_file"
- android:orderInCategory="30"
- android:showAsAction="ifRoom"
android:icon="@drawable/ic_action_new_attachment"
- android:title="@string/attach_file" />
-
+ android:orderInCategory="30"
+ android:showAsAction="always"
+ android:title="@string/attach_file"/>
<item
android:id="@+id/action_contact_details"
android:orderInCategory="40"
- android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_person"
- android:title="@string/action_contact_details" />
- <item
+ android:showAsAction="never"
+ android:title="@string/action_contact_details"/>
+ <item
android:id="@+id/action_muc_details"
+ android:icon="@drawable/ic_action_group"
android:orderInCategory="40"
android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_group"
- android:title="@string/action_muc_details" />
- <item
+ android:title="@string/action_muc_details"/>
+ <item
android:id="@+id/action_invite"
+ android:orderInCategory="45"
android:showAsAction="never"
- android:title="@string/invite_contacts" />
-
+ android:title="@string/invite_contact"/>
<item
android:id="@+id/action_archive"
android:orderInCategory="50"
android:showAsAction="never"
android:title="@string/action_end_conversation"/>
- <item
+ <item
android:id="@+id/action_clear_history"
android:orderInCategory="60"
android:showAsAction="never"
@@ -52,13 +48,11 @@
android:id="@+id/action_accounts"
android:orderInCategory="90"
android:showAsAction="never"
- android:title="@string/action_accounts"
- />
-
+ android:title="@string/action_accounts"/>
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"
android:title="@string/action_settings"/>
-</menu>
+</menu> \ No newline at end of file
diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml
index 5f76b0e0..04ecc25f 100644
--- a/res/menu/manageaccounts_context.xml
+++ b/res/menu/manageaccounts_context.xml
@@ -8,7 +8,7 @@
android:title="@string/mgmt_account_edit"/>
<item
android:id="@+id/mgmt_account_delete"
- android:icon="@drawable/ic_action_delete"
+ android:icon="@drawable/ic_action_discard"
android:showAsAction="always"
android:title="@string/mgmt_account_delete"/>
<item
diff --git a/res/menu/muc_details.xml b/res/menu/muc_details.xml
index 4f9b6da0..685109cd 100644
--- a/res/menu/muc_details.xml
+++ b/res/menu/muc_details.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
+ android:id="@+id/action_edit_subject"
+ android:orderInCategory="10"
+ android:showAsAction="always"
+ android:icon="@drawable/ic_action_edit"
+ android:title="@string/action_edit_subject" />
+ <item
android:id="@+id/action_accounts"
android:orderInCategory="90"
android:showAsAction="never"
diff --git a/res/menu/newconversation.xml b/res/menu/newconversation.xml
deleted file mode 100644
index 4f9b6da0..00000000
--- a/res/menu/newconversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
- <item
- android:id="@+id/action_accounts"
- android:orderInCategory="90"
- android:showAsAction="never"
- android:title="@string/action_accounts"
- />
-
- <item
- android:id="@+id/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never"
- android:title="@string/action_settings"/>
-</menu>
diff --git a/res/menu/newconversation_context.xml b/res/menu/newconversation_context.xml
deleted file mode 100644
index 7492c265..00000000
--- a/res/menu/newconversation_context.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item
- android:id="@+id/action_contact_details"
- android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_person"
- android:title="@string/action_contact_details" />
- <item
- android:id="@+id/action_start_conversation"
- android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_chat"
- android:title="@string/start_conversation" />
- <item
- android:id="@+id/action_invite"
- android:showAsAction="ifRoom"
- android:title="@string/invite_contacts" />
- <item
- android:id="@+id/action_invite_to_existing"
- android:showAsAction="never"
- android:title="@string/invite_contacts_to_existing" />
-</menu>
diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml
new file mode 100644
index 00000000..271bac18
--- /dev/null
+++ b/res/menu/start_conversation.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/action_search"
+ android:actionLayout="@layout/actionview_search"
+ android:icon="@drawable/ic_action_search"
+ android:showAsAction="collapseActionView|always"
+ android:title="@string/search"/>
+
+ <item
+ android:id="@+id/action_create_contact"
+ android:icon="@drawable/ic_action_add_person"
+ android:showAsAction="always"
+ android:title="@string/create_contact"/>
+ <item
+ android:id="@+id/action_join_conference"
+ android:icon="@drawable/ic_action_add_group"
+ android:showAsAction="always"
+ android:title="@string/join_conference"/>
+
+ <item
+ android:id="@+id/action_accounts"
+ android:orderInCategory="90"
+ android:showAsAction="never"
+ android:title="@string/action_accounts"/>
+ <item
+ android:id="@+id/action_settings"
+ android:orderInCategory="100"
+ android:showAsAction="never"
+ android:title="@string/action_settings"/>
+
+</menu> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 00:51:10 +0000