summaryrefslogtreecommitdiff
authortille <tille>2002-12-08 16:47:12 (UTC)
committer tille <tille>2002-12-08 16:47:12 (UTC)
commitaea4a628b4500f8551255d715c9f8696c6ad3280 (patch) (unidiff)
tree96fbc930732b4574490fe7e59fa19a35fb5b8596
parenta2840f80792c7e40ee3b44be0ec48302d8816cc0 (diff)
downloadopie-aea4a628b4500f8551255d715c9f8696c6ad3280.zip
opie-aea4a628b4500f8551255d715c9f8696c6ad3280.tar.gz
opie-aea4a628b4500f8551255d715c9f8696c6ad3280.tar.bz2
do not close ab while in cardview, rather switch back to listview
as the old version did
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/addressbook.cpp8
-rw-r--r--core/pim/addressbook/addressbook.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 055124c..60db2b4 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -746,9 +746,13 @@ void AddressbookWindow::flush()
746 746
747 747
748void AddressbookWindow::closeEvent( QCloseEvent *e ) 748void AddressbookWindow::closeEvent( QCloseEvent *e )
749{ 749{
750 750 if(active_view == AbView::CardView){
751 slotViewSwitched( AbView::TableView );
752 e->ignore();
753 return;
754 }
751 if(syncing) { 755 if(syncing) {
752 /* shouldn't we save, I hear you say? well its already been set 756 /* shouldn't we save, I hear you say? well its already been set
753 so that an edit can not occur during a sync, and we flushed 757 so that an edit can not occur during a sync, and we flushed
754 at the start of the sync, so there is no need to save 758 at the start of the sync, so there is no need to save
@@ -893,9 +897,9 @@ void AddressbookWindow::slotViewSwitched( int view )
893 } 897 }
894 898
895 // Tell the view about the selected view 899 // Tell the view about the selected view
896 m_abView -> setShowToView ( (AbView::Views) view ); 900 m_abView -> setShowToView ( (AbView::Views) view );
897 901 active_view = view;
898} 902}
899 903
900 904
901void AddressbookWindow::slotListView() 905void AddressbookWindow::slotListView()
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index 4c1e2f2..2bedc0b 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -131,7 +131,9 @@ private:
131 AbConfig m_config; 131 AbConfig m_config;
132 132
133 QAction* m_tableViewButton; 133 QAction* m_tableViewButton;
134 QAction* m_cardViewButton; 134 QAction* m_cardViewButton;
135
136 int active_view;
135}; 137};
136 138
137#endif 139#endif