impl 'remove from favorites

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@874 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index c75549a..cd04ef2 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -566,7 +566,11 @@ void KitaMainWindow::loadFavorites()
     QString favoritesConfigPath = locateLocal( "appdata", "favorites.xml" );
     QFile file( favoritesConfigPath );
     if ( file.open( IO_ReadOnly ) ) {
-        FavoriteThreads::fromXml( QString::fromUtf8( file.readAll().data() ) );
+        QTextStream stream( &file );
+        stream.setEncoding( QTextStream::UnicodeUTF8 );
+        
+        QString xml = stream.read();
+        FavoriteThreads::fromXml( xml );
     }
 }
 

diff --git a/kita/src/kitaboardview.cpp b/kita/src/kitaboardview.cpp
index 68d1462..61fe923 100644 (file)
--- a/kita/src/kitaboardview.cpp
+++ b/kita/src/kitaboardview.cpp
@@ -207,8 +207,12 @@ void KitaBoardView::slotContextMenuRequested( QListViewItem* item, const QPoint&
   KPopupMenu popup( 0 );
   popup.insertItem( i18n("Open with Web Browser"), 0 );
   popup.insertItem( i18n("Open with New Tab"), 1 );
-  popup.insertItem( i18n("Add to Favorites"), 2 );
-
+  if( item->parent() == m_favorites ) {
+      popup.insertItem( i18n( "Remove from Favorites"), 3 );
+  } else {
+      popup.insertItem( i18n("Add to Favorites"), 2 );
+  }
+  
   KURL url = item->text(1);
 
   switch( popup.exec( point ) ) {
@@ -222,6 +226,10 @@ void KitaBoardView::slotContextMenuRequested( QListViewItem* item, const QPoint&
     Kita::FavoriteBoards::append( url );
     refreshFavoriteBoards();
     break;
+  case 3:
+    Kita::FavoriteBoards::remove( url );
+    refreshFavoriteBoards();
+    break;
   default:
     break;
   }