Merge lp:~benoit.soyeux/tomdroid/notebookFilter into lp:~tomdroid-maintainers/tomdroid/main

[Benoit Soyeux]

Hello

I had the ability to filter notes from the notebook.
To do it, you can press on option button and click on display.
After there is a page with all notebook and you can check or uncheck notebook that you want show.
At the end you must press OK button to save and see the note list filtered by notebook selected before.

I use a standard android icon because I don't how create a svg picture file.

How can I add notebook in the template notes in the SD card image ?

I hope this new future will enjoy you

If you want test it, you can download the apk file with this link : http://www.starbusiness.fr/android/projets/Tomdroid/2011-09-23/Tomdroid-notebookFilter.apk

Best Reagards

[Stefan Hammer (j-4-deactivatedaccount)]

Hi!

I had a quick view at your branch. Why is the minimal target sdk set to android-8? I reverted it to android-4 for testing.

There are already notes in different notebooks in our test samples. You should see at least two notebooks when using the samples. I also couldn't see them with your Filtering mechanism... maybe displaying the notebooks does not properly work with our test samples?

I also thought, that it isn't necessary to have a own activity just for choosing which notebook to display. Too many activities just confuse users. I would just do a Dialog box. http://developer.android.com/guide/topics/ui/dialogs.html
There you just set which notebook to display in the main note list and done. I for myself also think radio buttons are better - even tomboy can only display one notebook after the other, or all notes, which I would do as first entry in the list.
To display the notebook title, use the title in actionbar. It is not necessary, that there is Tomdorid written... everybody knows this from the icon.

I am sorry for criticizing your work that much. I just think, that one could do this feature much more simple for the user. Just a menu button "notebooks" which displays a dialog box showing a radio button list of all notebooks and "all notes". The result is displayed in the main note list activity - the actionbar title shows the current notebook (maybe even with clicking enabled to show the dialog again).

I would have loved to discuss this details in a Blueprint first, before you now already invested so much time in programming.

I haven't managed to run your branch in my Android 2.3 virtual machine, the application crashed on startup.

[lp:~benoit.soyeux/tomdroid/notebookFilter]

263. By Benoit Soyeux on 2011-09-27

I hope that fix a crash a the start up

264. By Benoit Soyeux on 2011-09-27

change text of notebook menu button

[Benoit Soyeux (benoit.soyeux)]

Hello

Thank you for your remark

I have try to fix you start up crash. Could you test ?
If you still get a crash could you send me the log ?

I also change the text of the menu button to notebook as you propose me.

If you need to download apk, you can use this link : http://www.starbusiness.fr/android/projets/Tomdroid/2011-09-27/Tomdroid-notebookFilter.apk

From my view, I prefer to allow select which notebook I want to show than to select just one.
It is why I use check box rather than radio button.

Best regards

[lp:~benoit.soyeux/tomdroid/notebookFilter]

265. By Benoit Soyeux on 2011-10-05

Add a new version to select notebook with dialog (not finish)

[Benoit Soyeux (benoit.soyeux)]

Hello

Do you have the time to test my fix to your crash ?

I Commit a new version, not finish with a second version using dialog instead activity to select notebook but I don't know how change check box in my dialog when somebody click on.

Best regards

[Benoit Soyeux (benoit.soyeux)]

Sorry I test new version on my phone and when i click on check box, the value change.
On my AVD, if I click on check box, I don't see some change.

[lp:~benoit.soyeux/tomdroid/notebookFilter]

266. By Benoit Soyeux on 2011-10-06

Finish to select notebook with a dialog interface

[Stefan Hammer (j-4-deactivatedaccount)]

Hi!

I don't get the crash on startup any more and i really love the dialog box. It is much nicer this way - 100% clearer and easier to use! Checking and unchecking works on all my virtual machines when syncing with Ubuntu One. When adding a new notebook, it is displayed properly.
When unchecking all notebooks in Dialogbox, no note should be shown - but all notes are displayed. Alternatively, unchecking of all notebooks should not be allowed, as it is in the filter-activity.

There is a minor problem with some xml tags: The font of the Dialog list is white (names of the notebooks), it just is black while the onclick event. This just appears in Android 1.6, not in 2.3.

What doesn't work at the moment is displaying Notebooks when syncing with our test SD-Card img file. There should be two notebooks displayed, but no notebook is shown at all. The list is empty, which doesn't look good at all, but this is another problem.
Now i pushed my own notes to an img file and mounted it as SD Card and it seems, that the whole notebook filtering does not work when syncing with the SD Card. My notes are shown, but my three notebooks not - the list is empty.

Great work otherwise - I am sure you can also fix the remaining bugs.
As you can see, I am not looking at the code atm. I am sure Olivier can do this much better than me.

[Benoit Soyeux (benoit.soyeux)]

Hello

I had a control to forbid no selection in the dialog box (for notebook filter).
This method is not the best solution but I don't know if it possible to disable OK button in the dialog box

In my project, I cannot synchronise with sd card. Is it normal ?

Best Regard
Benoit Soyeux

[lp:~benoit.soyeux/tomdroid/notebookFilter]

267. By Benoit Soyeux on 2011-10-20

Add a control to forbid 0 checkbox checked in the notebook selection

[Olivier Bilodeau (plaxx)]

Nice work Benoit! It'll need little things here and there so I'll need to branch it into the ~tomdroid-dev team so I can make changes to it.

[Benoit Soyeux (benoit.soyeux)]

Good news !

Thank you

> Nice work Benoit! It'll need little things here and there so I'll need to
> branch it into the ~tomdroid-dev team so I can make changes to it.

Unmerged revisions

267. By Benoit Soyeux on 2011-10-20

Add a control to forbid 0 checkbox checked in the notebook selection

266. By Benoit Soyeux on 2011-10-06

Finish to select notebook with a dialog interface

265. By Benoit Soyeux on 2011-10-05

Add a new version to select notebook with dialog (not finish)

264. By Benoit Soyeux on 2011-09-27

change text of notebook menu button

263. By Benoit Soyeux on 2011-09-27

I hope that fix a crash a the start up

262. By Benoit Soyeux on 2011-09-23

test to commit

261. By Benoit Soyeux on 2011-09-23

test

260. By Benoit Soyeux on 2011-09-23

Fix a bug on display / hide OK button on notebook filter page

259. By Benoit Soyeux on 2011-09-20

Add Bouton to validate notebook choices
Add title

258. By Benoit Soyeux on 2011-09-19

Add notebook filter by selecting it

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2011-09-05 21:45:57 +0000
+++ AndroidManifest.xml	2011-10-20 12:03:25 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.tomdroid"
-      android:versionName="0.5.0" android:versionCode="7">
+      android:versionCode="7" android:versionName="0.5.1">
 
 	<uses-sdk android:minSdkVersion="3"
 	          android:targetSdkVersion="4" />
@@ -59,6 +59,9 @@
             android:authorities="org.tomdroid.notes"
         />
         
+        <provider android:name="NotebookProvider" android:authorities="org.tomdroid.notebooks"/>
+        <activity android:name=".ui.Notebooks" android:label="@string/app_name"></activity>
+        
         <activity android:name=".ui.PreferencesActivity" android:label="@string/app_name">
 
     	</activity>

=== modified file 'default.properties'
--- default.properties	2010-05-24 06:36:42 +0000
+++ default.properties	2011-10-20 12:03:25 +0000
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-4
+target=android-8
 apk-configurations=

=== added file 'res/drawable-hdpi/ic_menu_view.png'
Binary files res/drawable-hdpi/ic_menu_view.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/ic_menu_view.png	2011-10-20 12:03:25 +0000 differ
=== added file 'res/drawable-mdpi/ic_menu_view.png'
Binary files res/drawable-mdpi/ic_menu_view.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/ic_menu_view.png	2011-10-20 12:03:25 +0000 differ
=== added file 'res/drawable/icon_notebookfilter.png'
Binary files res/drawable/icon_notebookfilter.png	1970-01-01 00:00:00 +0000 and res/drawable/icon_notebookfilter.png	2011-10-20 12:03:25 +0000 differ
=== added file 'res/layout/notebooks.xml'
--- res/layout/notebooks.xml	1970-01-01 00:00:00 +0000
+++ res/layout/notebooks.xml	2011-10-20 12:03:25 +0000
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ Tomdroid
+ Tomboy on Android
+ http://www.launchpad.net/tomdroid
+
+ Copyright 2011 Benoit Soyeux <[e-mail]>
+ 
+ This file is part of Tomdroid.
+ 
+ Tomdroid 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.
+ 
+ Tomdroid 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 Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:orientation="vertical"
+    	>
+    	
+    <include android:id="@+id/actionbar" layout="@layout/actionbar" />
+    
+    <ListView android:id="@android:id/android:list"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:divider="#FFCCCCCC"
+              android:dividerHeight="1px"
+              android:cacheColorHint="#ffdddddd"
+              />
+              
+  	<TextView android:id="@android:id/android:empty"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="@string/strListEmptyNoNotebooks"
+              />
+              
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:gravity="bottom"
+              android:layout_weight="1"> 
+              
+              <Button android:id="@+id/buttonOk"
+                    android:text="@string/btnOk"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:onClick="validate"
+                     />    
+                    
+              <Button android:id="@+id/buttonCancel"
+                    android:text="@string/btnCancel"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:onClick="close" />      
+     
+  </LinearLayout>
+              
+</LinearLayout>
\ No newline at end of file

=== added file 'res/layout/notebooks_list_item.xml'
--- res/layout/notebooks_list_item.xml	1970-01-01 00:00:00 +0000
+++ res/layout/notebooks_list_item.xml	2011-10-20 12:03:25 +0000
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ Tomdroid
+ Tomboy on Android
+ http://www.launchpad.net/tomdroid
+
+ Copyright 2011 Benoit Soyeux <[e-mail]>
+ 
+ This file is part of Tomdroid.
+ 
+ Tomdroid 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.
+ 
+ Tomdroid 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 Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content" >
+  
+	<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/notebook_name" 
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:textStyle="bold"
+		android:textColor="#FF555555"
+		android:textSize="18dp"
+		android:paddingTop="5dip"
+		android:paddingLeft="5dip"
+		android:paddingRight="5dip"
+		/>
+    <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/notebook_checkbox" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:textSize="18dp"
+        android:paddingTop="5dip"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip"
+        android:onClick="changeDisplay"
+        />
+    
+    
+</RelativeLayout>
\ No newline at end of file

=== modified file 'res/menu/main.xml'
--- res/menu/main.xml	2011-09-05 17:34:35 +0000
+++ res/menu/main.xml	2011-10-20 12:03:25 +0000
@@ -22,12 +22,17 @@
  along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item 
+            android:icon="@drawable/ic_menu_view"   
+            android:id="@+id/menuFilterNotebook" 
+            android:title="@string/menuFilterNotebook"/> 
 
 	<item 
 			android:icon="@android:drawable/ic_menu_search"
 			android:title="@string/menuSearch"
 			android:id="@+id/menuSearch"/>
 
+
 	<item 
 			android:icon="@android:drawable/ic_menu_info_details"
 			android:title="@string/menuAbout"

=== modified file 'res/values-fr/strings.xml'
--- res/values-fr/strings.xml	2011-09-05 21:44:12 +0000
+++ res/values-fr/strings.xml	2011-10-20 12:03:25 +0000
@@ -91,10 +91,13 @@
 	<string name="titleDefaultSorting">Choix du tri par défaut</string>
 	<string name="prefDefaultSorting">Tri par défaut</string>
 	
-	<!-- NoteFiltering -->
-    <string name="menuFilterNotebook">Filtrer</string>
+	<!-- NotebookFiltering -->
+    <string name="menuFilterNotebook">Bloc-notes</string>
+    <string name="menuFilterNotebookv2">Bloc-notes (dialog)</string>
     <string name="strListEmptyNoNotebooks">Il n\'y a aucun bloc-note dans la base de donnèes</string>
     <string name="allNotebooksFilter">Tous les bloc-notes</string>
+    <string name="notebookSelectTitle">Bloc-notes à afficher</string>
+    <string name="notebookMustSelectOne">Vous devez selectionner au moins un bloc-note</string>
     
     <!-- List Longpress Menu -->
     <string name="view">Voir</string>

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2011-09-05 21:44:12 +0000
+++ res/values/strings.xml	2011-10-20 12:03:25 +0000
@@ -91,9 +91,12 @@
 	<string name="prefDefaultSorting">Default sort</string>
 	
 	<!-- NotebookFiltering -->
-    <string name="menuFilterNotebook">Filter</string>
-    <string name="strListEmptyNoNotebooks">There are no notebooks in the database.</string>
+    <string name="menuFilterNotebook">Notebooks</string>
+    <string name="menuFilterNotebookv2">Notebooks (dialog)</string>
+    <string name="strListEmptyNoNotebooks">There are no notebook in the database.</string>
     <string name="allNotebooksFilter">All notebooks</string>
+    <string name="notebookSelectTitle">Notebooks to display.</string>
+    <string name="notebookMustSelectOne">You must selection at least one notebook</string>
     
     <!-- List Longpress Menu -->
     <string name="view">View</string>

=== added file 'src/org/tomdroid/DbManager.java'
--- src/org/tomdroid/DbManager.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/DbManager.java	2011-10-20 12:03:25 +0000
@@ -0,0 +1,54 @@
+package org.tomdroid;
+
+import org.tomdroid.ui.Tomdroid;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+public class DbManager extends SQLiteOpenHelper {
+	private String TAG = "dbManager";
+
+	private static final String DATABASE_NAME = "tomdroid-notes.db";
+	private static final int DB_VERSION = 3;
+
+	public DbManager(Context context) {
+		super(context, DATABASE_NAME, null, DB_VERSION);
+	}
+
+
+	@Override
+	public void onCreate(SQLiteDatabase db) {
+		 db.execSQL("CREATE TABLE " + Note.DB_TABLE	 + " ("
+                 + Note.ID + " INTEGER PRIMARY KEY,"
+                 + Note.GUID + " TEXT,"
+                 + Note.TITLE + " TEXT,"
+                 + Note.FILE + " TEXT,"
+                 + Note.NOTE_CONTENT + " TEXT,"
+                 + Note.MODIFIED_DATE + " STRING,"
+                 + Note.TAGS + " STRING"
+                 + ");");
+		if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Table note has been created");
+		 
+		db.execSQL("CREATE TABLE " + Notebook.DB_TABLE + " (" + 
+        		Notebook.ID + " INTEGER PRIMARY KEY, " + 
+        		Notebook.NAME + " STRING, " + 
+        		Notebook.DISPLAY + " INTEGER" + 
+        		");");
+		if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Table notebook has been created");
+
+	}
+
+	@Override
+	public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+		if (Tomdroid.LOGGING_ENABLED) {
+    		Log.d(TAG, "Upgrading database from version " + oldVersion + " to " + newVersion + ", which will destroy all old data");
+    	}
+		
+        db.execSQL("DROP TABLE IF EXISTS " + Note.DB_TABLE);
+        db.execSQL("DROP TABLE IF EXISTS " + Notebook.DB_TABLE);
+        onCreate(db);
+
+	}
+}

=== modified file 'src/org/tomdroid/Note.java'
--- src/org/tomdroid/Note.java	2011-09-05 19:47:25 +0000
+++ src/org/tomdroid/Note.java	2011-10-20 12:03:25 +0000
@@ -48,6 +48,7 @@
 	public static final String FILE = "file";
 	public static final String TAGS = "tags";
 	public static final String NOTE_CONTENT = "content";
+	public static final String DB_TABLE = "notes";
 	
 	// Logging info
 	private static final String TAG = "Note";

=== modified file 'src/org/tomdroid/NoteManager.java'
--- src/org/tomdroid/NoteManager.java	2011-09-05 19:47:25 +0000
+++ src/org/tomdroid/NoteManager.java	2011-10-20 12:03:25 +0000
@@ -119,6 +119,9 @@
 			
 			if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Note updated in content provider. TITLE:"+note.getTitle()+" GUID:"+note.getGuid());
 		}
+
+		// put TAGS in notebooks table
+		NotebookManager.putNotebook(activity, note.getTags());
 	}
 	
 	public static boolean deleteNote(Activity activity, int id)
@@ -137,21 +140,29 @@
 	public static Cursor getAllNotes(Activity activity, Boolean includeNotebookTemplates) {
 		// get a cursor representing all notes from the NoteProvider
 		Uri notes = Tomdroid.CONTENT_URI;
-		String where = null;
+		String where = NotebookManager.getNotebookDisplayed(activity);
+		Log.i(TAG, "where:"+where);
+		if (where!=""){
+			where = Note.TAGS + " IN (" + where + ")";
+		} else {
+			if (!includeNotebookTemplates) {
+				where = Note.TAGS + " NOT LIKE '%" + "system:template" + "%'";
+			}
+		}
 		String orderBy;
-		if (!includeNotebookTemplates) {
-			where = Note.TAGS + " NOT LIKE '%" + "system:template" + "%'";
-		}
 		orderBy = Note.MODIFIED_DATE + " DESC";
 		return activity.managedQuery(notes, LIST_PROJECTION, where, null, orderBy);		
 	}
 	
-
 	public static ListAdapter getListAdapter(Activity activity, String querys) {
 		
-		String where;
+		String where = null;
+		String notebookFilter = NotebookManager.getNotebookDisplayed(activity);
+		
 		if (querys==null) {
-			where=null;
+			if (notebookFilter.compareTo("")!=0){
+				where = notebookFilter;
+			}
 		} else {
 			// sql statements to search notes
 			String[] query = querys.split(" ");
@@ -162,11 +173,15 @@
 				where = where + "("+Note.TITLE+" LIKE '%"+string+"%' OR "+Note.NOTE_CONTENT+" LIKE '%"+string+"%')";
 				count++;
 			}	
+			
+			if (notebookFilter.compareTo("")!=0){
+				where +=" AND " + notebookFilter;
+			}
 		}
+		Log.i(TAG, "where:"+where);
 
 		// get a cursor representing all notes from the NoteProvider
-		Uri notes = Tomdroid.CONTENT_URI;
-		Cursor notesCursor = activity.managedQuery(notes, LIST_PROJECTION, where, null, null);
+		Cursor notesCursor = activity.managedQuery(Tomdroid.CONTENT_URI, LIST_PROJECTION, where, null, null);
 		
 		// set up an adapter binding the TITLE field of the cursor to the list item
 		String[] from = new String[] { Note.TITLE };
@@ -234,4 +249,6 @@
 		
 		return xmlContent;
 	}
+	
+	
 }

=== modified file 'src/org/tomdroid/NoteProvider.java'
--- src/org/tomdroid/NoteProvider.java	2010-09-17 20:37:42 +0000
+++ src/org/tomdroid/NoteProvider.java	2011-10-20 12:03:25 +0000
@@ -51,25 +51,20 @@
 import android.content.ContentProvider;
 import android.content.ContentUris;
 import android.content.ContentValues;
-import android.content.Context;
 import android.content.UriMatcher;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.text.TextUtils;
-import android.util.Log;
 
 public class NoteProvider extends ContentProvider {
 	
 	// ContentProvider stuff
 	// --	
-	private static final String DATABASE_NAME = "tomdroid-notes.db";
 	private static final String DB_TABLE_NOTES = "notes";
-	private static final int DB_VERSION = 3;
 	private static final String DEFAULT_SORT_ORDER = Note.MODIFIED_DATE + " DESC";
 	
     private static HashMap<String, String> notesProjectionMap;
@@ -79,48 +74,14 @@
     private static final int NOTE_TITLE = 3;
 
     private static final UriMatcher uriMatcher;
-    
-    // Logging info
-    private static final String TAG = "NoteProvider";
-
-    /**
-     * This class helps open, create, and upgrade the database file.
-     */
-    private static class DatabaseHelper extends SQLiteOpenHelper {
-
-        DatabaseHelper(Context context) {
-            super(context, DATABASE_NAME, null, DB_VERSION);
-        }
-
-        @Override
-        public void onCreate(SQLiteDatabase db) {
-            db.execSQL("CREATE TABLE " + DB_TABLE_NOTES	 + " ("
-                    + Note.ID + " INTEGER PRIMARY KEY,"
-                    + Note.GUID + " TEXT,"
-                    + Note.TITLE + " TEXT,"
-                    + Note.FILE + " TEXT,"
-                    + Note.NOTE_CONTENT + " TEXT,"
-                    + Note.MODIFIED_DATE + " STRING,"
-                    + Note.TAGS + " STRING"
-                    + ");");
-        }
-
-        @Override
-        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        	if (Tomdroid.LOGGING_ENABLED) {
-        		Log.d(TAG, "Upgrading database from version " + oldVersion + " to "
-                    + newVersion + ", which will destroy all old data");
-        	}
-            db.execSQL("DROP TABLE IF EXISTS notes");
-            onCreate(db);
-        }
-    }
-
-    private DatabaseHelper dbHelper;
+
+   
+
+    private DbManager dbHelper;
 
     @Override
     public boolean onCreate() {
-        dbHelper = new DatabaseHelper(getContext());
+        dbHelper = new DbManager(getContext());
         return true;
     }
 

=== added file 'src/org/tomdroid/Notebook.java'
--- src/org/tomdroid/Notebook.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/Notebook.java	2011-10-20 12:03:25 +0000
@@ -0,0 +1,9 @@
+package org.tomdroid;
+
+public class Notebook {
+	public static final String ID = "_id";
+	public static final String NAME = "name";
+	public static final String DISPLAY = "display";
+	public static final String PATERN = "system:notebook:";
+	public static final String DB_TABLE = "notebooks";
+}

=== added file 'src/org/tomdroid/NotebookManager.java'
--- src/org/tomdroid/NotebookManager.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/NotebookManager.java	2011-10-20 12:03:25 +0000
@@ -0,0 +1,108 @@
+package org.tomdroid;
+
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.util.NotebookListCursorAdapter;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.Log;
+
+public class NotebookManager {
+	private static String TAG = "NotebookManager";
+	public static final String[] FULL_PROJECTION = {Notebook.ID, Notebook.NAME,Notebook.DISPLAY};
+	public static final String[] NAME_PROJECTION = {Notebook.ID, Notebook.NAME};
+	
+	public static NotebookListCursorAdapter getNotbookListAdapter(Activity activity){
+		Log.i(TAG, "getNotbookListAdapter starting");
+		
+		// get a cursor representing all notes from the NoteProvider
+		Cursor notebooksCursor = getAllNotebooks(activity, false);
+		Log.i(TAG, "notebooksCursor OK");
+		
+		// set up an adapter binding the TITLE field of the cursor to the list item
+		String[] from = new String[] { Notebook.NAME};
+		int[] to = new int[] { R.id.notebook_name};
+		return new NotebookListCursorAdapter(activity, R.layout.notebooks_list_item, notebooksCursor, from, to);
+	}
+	
+	public static Cursor getAllNotebooks(Activity activity, Boolean includeNotebookTemplates) {
+		// get a cursor representing all notes from the NoteProvider
+		Uri notebooksUri = Tomdroid.CONTENT_URI_NOTEBOOK;
+		String order = Notebook.NAME;
+		Log.i(TAG, "getAllNotebooks :order OK");
+		return activity.managedQuery(notebooksUri, FULL_PROJECTION, null, null, order);		
+	}
+	
+	// puts a note in the content provider
+	public static void putNotebook(Activity activity, String notebook) {
+		if (notebook.compareTo("")!=0){
+			if (Tomdroid.LOGGING_ENABLED) Log.i(TAG,"putNotebook : "+notebook);
+			String[] notebooks = notebook.split(",");
+			for (int i = 0; i < notebooks.length; i++) {
+				notebook = notebooks[i];
+				
+				if (notebook.startsWith(Notebook.PATERN)){
+					notebook = notebook.substring(Notebook.PATERN.length());
+					// verify if the notebook is already in the content provider
+					
+					// TODO make the query prettier (use querybuilder)
+					Uri uriNotebooks = Tomdroid.CONTENT_URI_NOTEBOOK;
+					String[] whereArgs = new String[1];
+					whereArgs[0] = notebook;
+					
+					
+					// The note identifier is the guid
+					if (Tomdroid.LOGGING_ENABLED) Log.d(TAG,"Query database if this notebook already exist");
+					ContentResolver cr = activity.getContentResolver();
+					Cursor managedCursor = cr.query(uriNotebooks,NoteManager.EMPTY_PROJECTION,Notebook.NAME + "= ?",whereArgs, null);
+					activity.startManagingCursor(managedCursor);
+					
+					// Preparing the values to be either inserted or updated
+					// depending on the result of the previous query
+					
+					if (managedCursor.getCount() == 0) {
+						if (Tomdroid.LOGGING_ENABLED) Log.d(TAG,"This notebook does not exist in the db. It will be insert into the db");
+						ContentValues values = new ContentValues();
+						values.put(Notebook.NAME, notebook);
+						values.put(Notebook.DISPLAY, 1);
+						
+						// This note is not in the database yet we need to insert it
+						if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"A new notebook has been detected (not yet in db)");
+			
+						Log.i(TAG,"putNotebook : ajout de "+notebook);
+			    		Uri uri = cr.insert(uriNotebooks, values);
+			
+			    		if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"notebook inserted in content provider. ID: "+uri+" notebook:"+notebook);
+					} 
+				}				
+			}
+			
+			
+		}
+	}
+	
+	public static String getNotebookDisplayed(Activity activity){
+		String filter = "";
+		Uri notebooksUri = Tomdroid.CONTENT_URI_NOTEBOOK;
+		String order = Notebook.NAME;
+		Cursor cur =  activity.managedQuery(notebooksUri, NAME_PROJECTION, Notebook.DISPLAY + "=1", null, order);
+		if (cur.moveToFirst()){
+			int col = cur.getColumnIndex(Notebook.NAME);
+			filter+= Note.TAGS + " like '%" + cur.getString(col)+"%'";
+			while (cur.moveToNext()){
+				filter+=" OR ";
+				filter+= Note.TAGS + " like '%" + cur.getString(col)+"%'";
+			}
+			filter = "("+filter+")";
+		}
+		Log.i(TAG, "filter :"+filter);
+		
+		return filter;
+	}
+	
+	
+	
+}

=== added file 'src/org/tomdroid/NotebookProvider.java'
--- src/org/tomdroid/NotebookProvider.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/NotebookProvider.java	2011-10-20 12:03:25 +0000
@@ -0,0 +1,211 @@
+package org.tomdroid;
+
+import java.util.HashMap;
+
+import org.tomdroid.ui.Tomdroid;
+
+import android.content.ContentUris;
+import android.content.UriMatcher;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteQueryBuilder;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
+
+public class NotebookProvider extends ContentProvider {
+	
+	// ContentProvider stuff
+	// --	
+	
+	private static final String DEFAULT_SORT_ORDER = Notebook.NAME;
+	
+    private static HashMap<String, String> notesProjectionMap;
+
+    private static final int NOTEBOOKS = 1;
+    private static final int NOTEBOOK_ID = 2;
+    private static final int NOTEBOOK_TITLE = 3;
+    
+    private static final UriMatcher uriMatcher;
+	
+    // Logging info
+    private static final String TAG = "NotebookProvider";
+   
+   
+    private DbManager dbHelper;
+
+
+	@Override
+	public boolean onCreate() {
+        dbHelper = new DbManager(getContext());
+		return false;
+	}
+	
+	@Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
+
+    	qb.setTables(Notebook.DB_TABLE);
+        qb.setProjectionMap(notesProjectionMap);
+        switch (uriMatcher.match(uri)) {
+        case NOTEBOOKS:
+            break;
+
+        case NOTEBOOK_ID:
+            qb.appendWhere(Notebook.ID + "=" + uri.getPathSegments().get(1));
+            break;
+            
+        case NOTEBOOK_TITLE:
+        	qb.appendWhere(Notebook.NAME + " LIKE '" + uri.getLastPathSegment()+"'");
+        	break;
+
+        default:
+            throw new IllegalArgumentException("Unknown URI " + uri);
+        }
+
+        // If no sort order is specified use the default
+        String orderBy;
+        if (TextUtils.isEmpty(sortOrder)) {
+            orderBy = DEFAULT_SORT_ORDER;
+        } else {
+            orderBy = sortOrder;
+        }
+
+        // Get the database and run the query
+        SQLiteDatabase db = dbHelper.getReadableDatabase();
+        for (int i = 0; i < projection.length; i++) {
+            Log.i(TAG, "projection:"+projection[i]);
+		}
+        Log.i(TAG, "selection:"+selection);
+        if (selectionArgs==null){
+        	 Log.i(TAG, "selectionArgs:"+selectionArgs);
+        }else{
+	        for (int i = 0; i < selectionArgs.length; i++) {
+	            Log.i(TAG, "selectionArgs:"+selectionArgs[i]);
+			}
+        }
+        Cursor c = qb.query(db, projection, selection, selectionArgs, null, null, orderBy);
+
+        // Tell the cursor what uri to watch, so it knows when its source data changes
+        c.setNotificationUri(getContext().getContentResolver(), uri);
+        return c;
+    }
+	
+	  @Override
+	    public String getType(Uri uri) {
+		  	Log.i(TAG,"getType");
+	        switch (uriMatcher.match(uri)) {
+	        case NOTEBOOKS:
+	            return Tomdroid.CONTENT_TYPE;
+	
+	        case NOTEBOOK_ID:
+	            return Tomdroid.CONTENT_ITEM_TYPE;
+	            
+	        case NOTEBOOK_TITLE:
+	        	return Tomdroid.CONTENT_ITEM_TYPE;
+	
+	        default:
+	            throw new IllegalArgumentException("Unknown URI " + uri);
+	        }
+	    }
+	  
+	
+	// TODO the following method is probably never called and probably wouldn't work
+	    @Override
+	    public Uri insert(Uri uri, ContentValues initialValues) {
+	        // Validate the requested uri
+	    	if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"insert into notebook");
+	        if (uriMatcher.match(uri) != NOTEBOOKS) {
+	            throw new IllegalArgumentException("Unknown URI " + uri);
+	        }
+
+	        ContentValues values;
+	        if (initialValues != null) {
+	            values = new ContentValues(initialValues);
+	        } else {
+	            values = new ContentValues();
+	        }
+	      
+
+	        // TODO does this make sense?
+	        if (values.containsKey(Notebook.NAME) == false) {
+	            Resources r = Resources.getSystem();
+	            values.put(Notebook.NAME, r.getString(android.R.string.untitled));
+	        }
+	        
+	        if (values.containsKey(Notebook.DISPLAY) == false) {
+	            values.put(Notebook.DISPLAY, 1);
+	        }
+
+	        SQLiteDatabase db = dbHelper.getWritableDatabase();
+	        long rowId = db.insert(Notebook.DB_TABLE, Notebook.NAME, values); // not so sure I did the right thing here
+	        if (rowId > 0) {
+	            Uri notebookUri = ContentUris.withAppendedId(Tomdroid.CONTENT_URI_NOTEBOOK, rowId);
+	            getContext().getContentResolver().notifyChange(notebookUri, null);
+	            return notebookUri;
+	        }
+
+	        throw new SQLException("Failed to insert row into " + uri);
+	    }
+
+	    @Override
+	    public int delete(Uri uri, String where, String[] whereArgs) {
+	        SQLiteDatabase db = dbHelper.getWritableDatabase();
+	        int count;
+	        switch (uriMatcher.match(uri)) {
+	        case NOTEBOOKS:
+	            count = db.delete(Notebook.DB_TABLE, where, whereArgs);
+	            break;
+
+	        case NOTEBOOK_ID:
+	            String notebookId = uri.getPathSegments().get(1);
+	            count = db.delete(Notebook.DB_TABLE, Notebook.ID + "=" + notebookId + (!TextUtils.isEmpty(where) ? " AND (" + where + ')' : ""), whereArgs);
+	            break;
+
+	        default:
+	            throw new IllegalArgumentException("Unknown URI " + uri);
+	        }
+
+	        getContext().getContentResolver().notifyChange(uri, null);
+	        return count;
+	    }
+
+	    @Override
+	    public int update(Uri uri, ContentValues values, String where, String[] whereArgs) {
+	        SQLiteDatabase db = dbHelper.getWritableDatabase();
+	        int count;
+	        switch (uriMatcher.match(uri)) {
+	        case NOTEBOOKS:
+	            count = db.update(Notebook.DB_TABLE, values, where, whereArgs);
+	            break;
+
+	        case NOTEBOOK_ID:
+	            String noteId = uri.getPathSegments().get(1);
+	            count = db.update(Notebook.DB_TABLE, values, Notebook.ID + "=" + noteId + (!TextUtils.isEmpty(where) ? " AND (" + where + ')' : ""), whereArgs);
+	            break;
+
+	        default:
+	            throw new IllegalArgumentException("Unknown URI " + uri);
+	        }
+
+	        getContext().getContentResolver().notifyChange(uri, null);
+	        return count;
+	    }
+
+	    static {
+	        uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+	        uriMatcher.addURI(Tomdroid.AUTHORITY_NOTEBOOK, "notebooks", NOTEBOOKS);
+	        uriMatcher.addURI(Tomdroid.AUTHORITY_NOTEBOOK, "notebooks/#", NOTEBOOK_ID);
+	        uriMatcher.addURI(Tomdroid.AUTHORITY_NOTEBOOK, "notebooks/*", NOTEBOOK_TITLE);
+
+	        notesProjectionMap = new HashMap<String, String>();
+	        notesProjectionMap.put(Notebook.ID, Notebook.ID);
+	        notesProjectionMap.put(Notebook.NAME, Notebook.NAME);
+	        notesProjectionMap.put(Notebook.DISPLAY, Notebook.DISPLAY);
+	    }
+
+}

=== added file 'src/org/tomdroid/ui/Notebooks.java'
--- src/org/tomdroid/ui/Notebooks.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/ui/Notebooks.java	2011-10-20 12:03:25 +0000
@@ -0,0 +1,114 @@
+package org.tomdroid.ui;
+
+import org.tomdroid.Notebook;
+import org.tomdroid.NotebookManager;
+import org.tomdroid.R;
+import org.tomdroid.util.NotebookListCursorAdapter;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+public class Notebooks extends ListActivity {
+	
+	// Logging info
+	private static final String	TAG					= "Notebooks";
+	
+	// UI to data model glue
+	private NotebookListCursorAdapter adapter;
+	
+	/** Called when the activity is created. */
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.notebooks);
+		Log.i(TAG, "setContentView OK");
+		
+		// adapter that binds the ListView UI to the notebooks in the note manager
+		adapter = NotebookManager.getNotbookListAdapter(this);
+		setListAdapter(adapter);		
+		
+		TextView title = (TextView) findViewById(R.id.title);
+		title.setText(getString(R.string.notebookSelectTitle));
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		return super.onOptionsItemSelected(item);
+	}
+	
+	public void onResume() {
+		super.onResume();
+	}
+	
+
+	@Override
+	protected void onListItemClick(ListView l, View v, int position, long id) {
+		Log.i(TAG,"onListItemClick");
+		
+		Cursor item = (Cursor) adapter.getItem(position);
+		String notebook = item.getString(item.getColumnIndexOrThrow(Notebook.NAME));
+		
+		Bundle bundle = new Bundle();
+		bundle.putString("notebook", notebook);
+
+		Intent i = new Intent(this.getApplicationContext(), Tomdroid.class);
+		i.putExtras(bundle);
+		startActivity(i);
+		
+		//Intent i = new Intent(Intent.ACTION_VIEW,Tomdroid.CONTENT_URI, this, Tomdroid.class);
+		//startActivity(i);
+	}
+	
+	public void changeDisplay(View v){
+		Log.i(TAG, "changeDisplay:");
+		CheckBox checkBox = (CheckBox) v;
+		if (checkBox.isChecked()){
+			Log.i(TAG, "changeDisplay:a afficher");
+		} else {
+			Log.i(TAG, "changeDisplay:a masquer");
+		}
+		RelativeLayout parent = (RelativeLayout) v.getParent();
+		Log.i(TAG, "nb child:"+parent.getChildCount());
+		TextView name = (TextView) parent.getChildAt(0);
+		String notebook = (String) name.getText();
+		Log.i(TAG, "name:"+notebook);
+
+		Button button = (Button) findViewById(R.id.buttonOk);
+		if (adapter.changeValue(notebook, (checkBox.isChecked()) ? 1 : 0)==0){
+			button.setEnabled(false);
+		} else {
+			button.setEnabled(true);
+		}
+	}
+
+	public void validate(View v){
+		Log.i(TAG, "validate");
+		if (adapter.getNbCheck()==0){
+			Log.i(TAG, "There is no notebook checked ! You must check one or more to continue");
+		} else {
+			adapter.updateChange(this);
+			this.finish();
+			//this.startActivity(new Intent(this,Tomdroid.class));
+		}
+	}
+	
+	public void close(View v){
+		this.finish();
+	}
+}

=== modified file 'src/org/tomdroid/ui/Tomdroid.java'
--- src/org/tomdroid/ui/Tomdroid.java	2011-09-04 17:48:08 +0000
+++ src/org/tomdroid/ui/Tomdroid.java	2011-10-20 12:03:25 +0000
@@ -26,6 +26,8 @@
 
 import org.tomdroid.Note;
 import org.tomdroid.NoteManager;
+import org.tomdroid.Notebook;
+import org.tomdroid.NotebookManager;
 import org.tomdroid.R;
 import org.tomdroid.sync.ServiceAuth;
 import org.tomdroid.sync.SyncManager;
@@ -34,9 +36,12 @@
 import org.tomdroid.util.Preferences;
 import org.tomdroid.util.Send;
 
+import android.R.bool;
 import android.app.AlertDialog;
 import android.app.ListActivity;
 import android.app.ProgressDialog;
+import android.content.ContentResolver;
+import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -58,15 +63,19 @@
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
 public class Tomdroid extends ListActivity {
 
 	// Global definition for Tomdroid
 	public static final String	AUTHORITY			= "org.tomdroid.notes";
+	public static final String	AUTHORITY_NOTEBOOK	= "org.tomdroid.notebooks";
 	public static final Uri		CONTENT_URI			= Uri
 															.parse("content://" + AUTHORITY
 																	+ "/notes");
+	public static final Uri		CONTENT_URI_NOTEBOOK= Uri.parse("content://" + AUTHORITY_NOTEBOOK + "/notebooks");
+
 	public static final String	CONTENT_TYPE		= "vnd.android.cursor.dir/vnd.tomdroid.note";
 	public static final String	CONTENT_ITEM_TYPE	= "vnd.android.cursor.item/vnd.tomdroid.note";
 	public static final String	PROJECT_HOMEPAGE	= "http://www.launchpad.net/tomdroid/";
@@ -76,7 +85,7 @@
 	public static final String	NOTES_PATH			= Environment.getExternalStorageDirectory()
 															+ "/tomdroid/";
 	// Logging should be disabled for release builds
-	public static final boolean	LOGGING_ENABLED		= false;
+	public static final boolean	LOGGING_ENABLED		= true;
 	// Set this to false for release builds, the reason should be obvious
 	public static final boolean	CLEAR_PREFERENCES	= false;
 
@@ -114,7 +123,9 @@
 				}
 			}).setIcon(R.drawable.icon).show();
 		}
-
+		
+		
+		
 		// adapter that binds the ListView UI to the notes in the note manager
 		adapter = NoteManager.getListAdapter(this);
 		setListAdapter(adapter);
@@ -151,6 +162,11 @@
 			case R.id.menuSearch:
 				startSearch(null, false, null, false);
 				return true;
+
+			case R.id.menuFilterNotebook:
+				//startActivity(new Intent(this, Notebooks.class));
+				selectNotebook();
+				return true;
 		}
 
 		return super.onOptionsItemSelected(item);
@@ -216,6 +232,9 @@
 		
 		SyncManager.setActivity(this);
 		SyncManager.setHandler(this.syncMessageHandler);
+		
+		adapter = NoteManager.getListAdapter(this);
+		setListAdapter(adapter);
 	}
 
 	private void showAboutDialog() {
@@ -273,5 +292,96 @@
 			.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
 	    }
 	}
+	
+	private int nbNotebook = 0;
+	private String[] notebooks = null;
+	private boolean[] checks = null;
+	private boolean[] update = null;
+	private Context myContext = null;
+
+	
+	private void selectNotebook(){
+		AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+		dialogBuilder.setTitle(R.string.notebookSelectTitle);
+
+		Cursor cur = NotebookManager.getAllNotebooks(this, false);
+		nbNotebook = cur.getCount();
+		notebooks = new String[nbNotebook];
+		checks = new boolean[nbNotebook];
+		update = new boolean[nbNotebook];
+		myContext = this.getApplicationContext();
+		int i=0;
+		boolean ok = cur.moveToFirst();
+		while (ok){
+			notebooks[i] = cur.getString(cur.getColumnIndex(Notebook.NAME));
+			checks[i] = cur.getInt(cur.getColumnIndex(Notebook.DISPLAY)) == 1;
+			update[i] = false;
+			ok = cur.moveToNext();
+			i++;
+		}
+		
+		dialogBuilder.setMultiChoiceItems(notebooks,checks, new DialogInterface.OnMultiChoiceClickListener(){
+
+			public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+				checks[which] = isChecked;
+				update[which] = true;
+				if (LOGGING_ENABLED) Log.d(TAG, "which:"+which+" isChecked:"+isChecked+" notebook:"+notebooks[which]);
+				
+				boolean allUncheck = true;
+				for (int i=0; i<nbNotebook;i++){
+					if (checks[i]){
+						allUncheck = false;
+					}
+				}
+				
+				if (allUncheck){
+					if (LOGGING_ENABLED) Log.d(TAG, "All checkbox are checked");
+					checks[which] = true;
+					Toast.makeText(myContext, myContext.getString(R.string.notebookMustSelectOne), Toast.LENGTH_SHORT).show();
+				}
+				
+			}
+			
+		});
+		dialogBuilder.setPositiveButton(R.string.btnOk, new DialogInterface.OnClickListener() {
+			
+			public void onClick(DialogInterface dialog, int which) {
+				
+				ContentResolver cr = getContentResolver();
+				String[] whereArgs = new String[1];
+				
+				for (int i=0; i<nbNotebook;i++){
+					if (update[i]){
+						whereArgs[0] = notebooks[i];
+						ContentValues values = new ContentValues();
+						values.put(Notebook.DISPLAY, (checks[i]) ? 1 : 0);	
+						cr.update(Tomdroid.CONTENT_URI_NOTEBOOK, values, Notebook.NAME +" = ?", whereArgs);
+					}
+				}
+				
+				dialog.cancel();
+				updateView();
+			}
+		});
+		dialogBuilder.setNegativeButton(R.string.btnCancel, new DialogInterface.OnClickListener(){
+
+			public void onClick(DialogInterface dialog, int which) {
+				dialog.cancel();
+				
+			}
+			
+		});
+		
+		
+		
+		AlertDialog dialog  = dialogBuilder.create();
+		dialog.show();
+	}
+	
+	public void updateView(){
+		adapter = NoteManager.getListAdapter(this);
+		setListAdapter(adapter);
+	}
+	
 
 }

=== added file 'src/org/tomdroid/util/NotebookListCursorAdapter.java'
--- src/org/tomdroid/util/NotebookListCursorAdapter.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/util/NotebookListCursorAdapter.java	2011-10-20 12:03:25 +0000
@@ -0,0 +1,119 @@
+package org.tomdroid.util;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.tomdroid.Notebook;
+import org.tomdroid.R;
+import org.tomdroid.ui.Tomdroid;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.Log;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.SimpleCursorAdapter;
+import android.widget.TextView;
+
+public class NotebookListCursorAdapter extends SimpleCursorAdapter {
+	public HashMap<String,String> checkboxInit = new HashMap<String, String>();;
+	public HashMap<String,String> checkbox = new HashMap<String, String>();;
+	public ArrayList<String > notebookName = new ArrayList<String>();
+
+	private String TAG = "NotebookListCursorAdapter";
+	private int nbNotebook = 0;
+	private int nbCheck = 0;
+
+
+	public NotebookListCursorAdapter(Context context, int layout, Cursor c, String[] from, int[] to) {
+		super(context, layout, c, from, to);
+		nbNotebook = c.getCount();
+		nbCheck = 0;
+
+		if (c.moveToFirst()){
+			int colName = c.getColumnIndex(Notebook.NAME);
+			int colDipslay = c.getColumnIndex(Notebook.DISPLAY);
+			
+			checkboxInit.put(c.getString(colName), c.getString(colDipslay));
+			notebookName.add(c.getString(colName));
+			if (c.getInt(colDipslay)==1){
+				nbCheck++;
+			}
+			
+			while (c.moveToNext()){
+
+				if (c.getInt(colDipslay)==1){
+					nbCheck++;
+				}
+				checkboxInit.put(c.getString(colName), c.getString(colDipslay));
+				notebookName.add(c.getString(colName));
+			}
+			checkbox = (HashMap<String, String>) checkboxInit.clone();
+		}
+	}
+
+
+	@Override
+	public void bindView(View view, Context context, Cursor cursor) {
+		TextView name = (TextView) view.findViewById(R.id.notebook_name);
+		if (name!=null){
+			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "notebook name:"+cursor.getString(cursor.getColumnIndex(Notebook.NAME)));
+			name.setText(cursor.getString(cursor.getColumnIndex(Notebook.NAME)));
+		}
+
+		CheckBox chekbox = (CheckBox) view.findViewById(R.id.notebook_checkbox);
+		if (chekbox!=null){
+			int dipslay = cursor.getInt(cursor.getColumnIndex(Notebook.DISPLAY)); 
+			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "dipslay:"+dipslay);
+			chekbox.setChecked(dipslay==1);
+		}
+	}
+
+	public int changeValue(String notebook,int value){
+		checkbox.remove(notebook);
+		checkbox.put(notebook, ""+value);
+		
+		if (value==1){
+			nbCheck++;
+		} else {
+			nbCheck--;
+		}
+		return nbCheck; 
+	}
+	
+	public void updateChange(Activity activity){
+		Log.i(TAG, "updateChange");
+		Uri uriNotebooks = Tomdroid.CONTENT_URI_NOTEBOOK;
+		String[] whereArgs = new String[1];
+		ContentResolver cr = activity.getContentResolver();	
+		
+		for (int i = 0; i < nbNotebook; i++) {
+			String notebook = notebookName.get(i);
+			if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, "traitement :"+notebook);
+			
+			if (checkbox.get(notebook).compareTo(checkboxInit.get(notebook))!=0){
+				if (Tomdroid.LOGGING_ENABLED) Log.d(TAG, ""+notebook+" a changé");
+				whereArgs[0] = notebook;
+				
+				ContentValues values = new ContentValues();
+				values.put(Notebook.DISPLAY, Integer.parseInt(checkbox.get(notebook)));	
+				cr.update(uriNotebooks, values, Notebook.NAME +" = ?", whereArgs);
+				
+				if (Tomdroid.LOGGING_ENABLED) Log.v(TAG,"Notebook updated in content provider. Name:"+notebook);
+			}
+			
+		}
+	}
+
+
+	public int getNbCheck() {
+		return nbCheck;
+	}
+
+
+
+}