Modified Hiearchy of packages (clean up)
Modified AccountSelectionButton to Spinner
Modified build instructions
Added make-glue.sh to generate interfaces (using dbusxx)
diff --git a/res/layout/account_management_layout.xml b/res/layout/account_management_layout.xml
deleted file mode 100644
index 004b63e..0000000
--- a/res/layout/account_management_layout.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
-
-Author: Alexandre Savard <alexandre.savard@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:orientation="vertical"
- android:gravity="center_horizontal"
- android:layout_below="@+id/editTo"
- android:id="@+id/accountManagementLayout"
- android:weightSum="1.0"
- android:paddingLeft="8dp"
- android:paddingRight="8dp" >
-
- <Button
- android:id="@+id/buttonAddAccount"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:onClick="onClick"
- android:text="Add Account" />
-
- <Button
- android:id="@+id/buttonRemoveAccount"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:onClick="onClick"
- android:text="Remove Account" />
-
-</LinearLayout>
diff --git a/res/layout/call_activity_layout.xml b/res/layout/activity_call_layout.xml
similarity index 100%
rename from res/layout/call_activity_layout.xml
rename to res/layout/activity_call_layout.xml
diff --git a/res/layout/activity_sflphone_home.xml b/res/layout/activity_sflphone_home.xml
index 29edf5d..22f8022 100644
--- a/res/layout/activity_sflphone_home.xml
+++ b/res/layout/activity_sflphone_home.xml
@@ -56,6 +56,7 @@
android:id="@+id/phoneNumberTextEntry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:inputType="phone"
android:hint="Type phone number"
android:layout_below="@+id/buttonCall"/>
@@ -72,6 +73,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".5"
+ android:layout_margin="10dp"
android:background="@drawable/call_button"
android:gravity="center_vertical"
android:onClick="onClick"
@@ -82,6 +84,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".5"
+ android:layout_margin="10dp"
android:background="@drawable/hangup_button"
android:gravity="center_vertical"
android:onClick="onClick"
diff --git a/res/layout/test_layout.xml b/res/layout/frag_button_section.xml
similarity index 98%
rename from res/layout/test_layout.xml
rename to res/layout/frag_button_section.xml
index 07e58f9..f8b6890 100644
--- a/res/layout/test_layout.xml
+++ b/res/layout/frag_button_section.xml
@@ -107,7 +107,7 @@
<include layout="@layout/dialpad"/>
</LinearLayout>
-->
- <com.savoirfairelinux.sflphone.client.Numpad
+ <com.savoirfairelinux.sflphone.model.Numpad
android:id="@+id/numPad"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/layout/call_element_list.xml b/res/layout/frag_call_element.xml
similarity index 94%
rename from res/layout/call_element_list.xml
rename to res/layout/frag_call_element.xml
index 5517004..5f5bd84 100644
--- a/res/layout/call_element_list.xml
+++ b/res/layout/frag_call_element.xml
@@ -37,11 +37,10 @@
android:paddingLeft="8dp"
android:paddingRight="8dp" >
- <com.savoirfairelinux.sflphone.utils.AccountSelectionButton
+ <com.savoirfairelinux.sflphone.account.AccountSelectionSpinner
android:id="@+id/account_selection_button"
android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="No Account Selected (for now)"/>
+ android:layout_width="match_parent"/>
<ListView
android:id="@id/android:list"
diff --git a/res/layout/call_element_list.xml b/res/layout/frag_contact_list.xml
similarity index 90%
copy from res/layout/call_element_list.xml
copy to res/layout/frag_contact_list.xml
index 5517004..015f1b4 100644
--- a/res/layout/call_element_list.xml
+++ b/res/layout/frag_contact_list.xml
@@ -37,12 +37,6 @@
android:paddingLeft="8dp"
android:paddingRight="8dp" >
- <com.savoirfairelinux.sflphone.utils.AccountSelectionButton
- android:id="@+id/account_selection_button"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="No Account Selected (for now)"/>
-
<ListView
android:id="@id/android:list"
android:layout_width="match_parent"
diff --git a/res/layout/call_element.xml b/res/layout/item_contact.xml
similarity index 100%
rename from res/layout/call_element.xml
rename to res/layout/item_contact.xml
diff --git a/res/layout/numpad.xml b/res/layout/numpad.xml
index d7cbb82..c149042 100644
--- a/res/layout/numpad.xml
+++ b/res/layout/numpad.xml
@@ -1,38 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
-
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent" >
+
<TableRow
android:layout_width="match_parent"
android:layout_height="0px"
- android:layout_weight="1">
- <Button android:id="@+id/numButton1"/>
- <Button android:id="@+id/numButton2"/>
- <Button android:id="@+id/numButton3"/>
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/numButton1"
+ style="?android:attr/buttonBarButtonStyle" />
+
+ <Button android:id="@+id/numButton2" />
+
+ <Button android:id="@+id/numButton3" />
</TableRow>
+
<TableRow
android:layout_width="match_parent"
android:layout_height="0px"
- android:layout_weight="1">
- <Button android:id="@+id/numButton4"/>
- <Button android:id="@+id/numButton5"/>
- <Button android:id="@+id/numButton6"/>
+ android:layout_weight="1" >
+
+ <Button android:id="@+id/numButton4" />
+
+ <Button android:id="@+id/numButton5" />
+
+ <Button android:id="@+id/numButton6" />
</TableRow>
+
<TableRow
android:layout_width="match_parent"
android:layout_height="0px"
- android:layout_weight="1">
- <Button android:id="@+id/numButton7"/>
- <Button android:id="@+id/numButton8"/>
- <Button android:id="@+id/numButton9"/>
+ android:layout_weight="1" >
+
+ <Button android:id="@+id/numButton7" />
+
+ <Button android:id="@+id/numButton8" />
+
+ <Button android:id="@+id/numButton9" />
</TableRow>
+
<TableRow
android:layout_width="match_parent"
android:layout_height="0px"
- android:layout_weight="1">
- <Button android:id="@+id/numButtonStar"/>
- <Button android:id="@+id/numButton0"/>
- <Button android:id="@+id/numButtonSharp"/>
+ android:layout_weight="1" >
+
+ <Button android:id="@+id/numButtonStar" />
+
+ <Button android:id="@+id/numButton0" />
+
+ <Button android:id="@+id/numButtonSharp" />
</TableRow>
-</merge>
+
+</merge>
\ No newline at end of file
diff --git a/res/layout/pref_management_layout.xml b/res/layout/pref_management_layout.xml
deleted file mode 100644
index 95593aa..0000000
--- a/res/layout/pref_management_layout.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
-
-Author: Alexandre Savard <alexandre.savard@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:orientation="vertical"
- android:gravity="center_horizontal"
- android:layout_below="@+id/editTo"
- android:id="@+id/prefManagementLayout"
- android:weightSum="1.0"
- android:paddingLeft="8dp"
- android:paddingRight="8dp" >
-
- <Button
- android:id="@+id/buttonCodecUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:text="Codec Up" />
-
- <Button
- android:id="@+id/buttonCodecDown"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:text="Codec Down" />
-
-</LinearLayout>