-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 6819085..03c96c8 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -937,121 +937,121 @@ void AddressbookWindow::slotSetCategory( int c ) | |||
937 | else | 937 | else |
938 | // Checkmark Category Menu Item Selected | 938 | // Checkmark Category Menu Item Selected |
939 | for ( unsigned int i = 3; i < catMenu->count(); i++ ) | 939 | for ( unsigned int i = 3; i < catMenu->count(); i++ ) |
940 | catMenu->setItemChecked( i, c == (int)i ); | 940 | catMenu->setItemChecked( i, c == (int)i ); |
941 | 941 | ||
942 | // Now switch to the selected category | 942 | // Now switch to the selected category |
943 | for ( unsigned int i = 1; i < catMenu->count(); i++ ) { | 943 | for ( unsigned int i = 1; i < catMenu->count(); i++ ) { |
944 | if (catMenu->isItemChecked( i )) { | 944 | if (catMenu->isItemChecked( i )) { |
945 | if ( i == 1 ){ // default List view | 945 | if ( i == 1 ){ // default List view |
946 | book = QString::null; | 946 | book = QString::null; |
947 | view = AbView::TableView; | 947 | view = AbView::TableView; |
948 | }else if ( i == 2 ){ | 948 | }else if ( i == 2 ){ |
949 | book = tr( "Cards" ); | 949 | book = tr( "Cards" ); |
950 | view = AbView::CardView; | 950 | view = AbView::CardView; |
951 | // }else if ( i == 3 ){ | 951 | // }else if ( i == 3 ){ |
952 | // book = tr( "Personal" ); | 952 | // book = tr( "Personal" ); |
953 | // view = AbView:: PersonalView; | 953 | // view = AbView:: PersonalView; |
954 | }else if ( i == 3 ){ // default All Categories | 954 | }else if ( i == 3 ){ // default All Categories |
955 | cat = QString::null; | 955 | cat = QString::null; |
956 | }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled | 956 | }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled |
957 | cat = "Unfiled"; | 957 | cat = "Unfiled"; |
958 | qWarning ("Unfiled selected!"); | 958 | qWarning ("Unfiled selected!"); |
959 | }else{ | 959 | }else{ |
960 | cat = m_abView->categories()[i - 4]; | 960 | cat = m_abView->categories()[i - 4]; |
961 | } | 961 | } |
962 | } | 962 | } |
963 | } | 963 | } |
964 | 964 | ||
965 | // Switch to the selected View | 965 | // Switch to the selected View |
966 | slotViewSwitched( view ); | 966 | slotViewSwitched( view ); |
967 | 967 | ||
968 | // Tell the view about the selected category | 968 | // Tell the view about the selected category |
969 | m_abView -> setShowByCategory( cat ); | 969 | m_abView -> setShowByCategory( cat ); |
970 | 970 | ||
971 | if ( book.isEmpty() ) | 971 | if ( book.isEmpty() ) |
972 | book = "List"; | 972 | book = "List"; |
973 | if ( cat.isEmpty() ) | 973 | if ( cat.isEmpty() ) |
974 | cat = "All"; | 974 | cat = "All"; |
975 | 975 | ||
976 | setCaption( tr( "Contacts" ) + " - " + book + " - " + tr( cat ) ); | 976 | setCaption( tr( "Contacts" ) + " - " + book + " - " + tr( cat ) ); |
977 | } | 977 | } |
978 | 978 | ||
979 | void AddressbookWindow::slotViewSwitched( int view ) | 979 | void AddressbookWindow::slotViewSwitched( int view ) |
980 | { | 980 | { |
981 | qWarning( "void AddressbookWindow::slotViewSwitched( %d )", view ); | 981 | qWarning( "void AddressbookWindow::slotViewSwitched( %d )", view ); |
982 | int menu = 0; | 982 | int menu = 0; |
983 | 983 | ||
984 | // Switch to selected view | 984 | // Switch to selected view |
985 | switch ( view ){ | 985 | switch ( view ){ |
986 | case AbView::TableView: | 986 | case AbView::TableView: |
987 | menu = 1; | 987 | menu = 1; |
988 | m_tableViewButton->setOn(true); | 988 | m_tableViewButton->setOn(true); |
989 | m_cardViewButton->setOn(false); | 989 | m_cardViewButton->setOn(false); |
990 | break; | 990 | break; |
991 | case AbView::CardView: | 991 | case AbView::CardView: |
992 | menu = 2; | 992 | menu = 2; |
993 | m_tableViewButton->setOn(false); | 993 | m_tableViewButton->setOn(false); |
994 | m_cardViewButton->setOn(true); | 994 | m_cardViewButton->setOn(true); |
995 | break; | 995 | break; |
996 | } | 996 | } |
997 | for ( unsigned int i = 1; i < 3; i++ ){ | 997 | for ( unsigned int i = 1; i < 3; i++ ){ |
998 | if ( catMenu ) | 998 | if ( catMenu ) |
999 | catMenu->setItemChecked( i, menu == (int)i ); | 999 | catMenu->setItemChecked( i, menu == (int)i ); |
1000 | } | 1000 | } |
1001 | 1001 | ||
1002 | // Tell the view about the selected view | 1002 | // Tell the view about the selected view |
1003 | m_abView -> setShowToView ( (AbView::Views) view ); | 1003 | m_abView -> setShowToView ( (AbView::Views) view ); |
1004 | active_view = view; | 1004 | active_view = view; |
1005 | } | 1005 | } |
1006 | 1006 | ||
1007 | 1007 | ||
1008 | void AddressbookWindow::slotListView() | 1008 | void AddressbookWindow::slotListView() |
1009 | { | 1009 | { |
1010 | slotViewSwitched( AbView::TableView ); | 1010 | slotViewSwitched( AbView::TableView ); |
1011 | } | 1011 | } |
1012 | 1012 | ||
1013 | void AddressbookWindow::slotCardView() | 1013 | void AddressbookWindow::slotCardView() |
1014 | { | 1014 | { |
1015 | slotViewSwitched( AbView::CardView ); | 1015 | slotViewSwitched( AbView::CardView ); |
1016 | } | 1016 | } |
1017 | 1017 | ||
1018 | void AddressbookWindow::slotSetLetter( char c ) { | 1018 | void AddressbookWindow::slotSetLetter( char c ) { |
1019 | 1019 | ||
1020 | m_abView->setShowByLetter( c, m_config.letterPickerSearch() ); | 1020 | m_abView->setShowByLetter( c, m_config.letterPickerSearch() ); |
1021 | 1021 | ||
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | 1024 | ||
1025 | void AddressbookWindow::populateCategories() | 1025 | void AddressbookWindow::populateCategories() |
1026 | { | 1026 | { |
1027 | catMenu->clear(); | 1027 | catMenu->clear(); |
1028 | 1028 | ||
1029 | int id, rememberId; | 1029 | int id, rememberId; |
1030 | id = 1; | 1030 | id = 1; |
1031 | rememberId = 0; | 1031 | rememberId = 0; |
1032 | 1032 | ||
1033 | catMenu->insertItem( Resource::loadPixmap( "datebook/weeklst" ), tr( "List" ), id++ ); | 1033 | catMenu->insertItem( Resource::loadPixmap( "addressbook/listview" ), tr( "List" ), id++ ); |
1034 | catMenu->insertItem( Resource::loadPixmap( "day" ), tr( "Cards" ), id++ ); | 1034 | catMenu->insertItem( Resource::loadPixmap( "addressbook/cardview" ), tr( "Cards" ), id++ ); |
1035 | // catMenu->insertItem( tr( "Personal" ), id++ ); | 1035 | // catMenu->insertItem( tr( "Personal" ), id++ ); |
1036 | catMenu->insertSeparator(); | 1036 | catMenu->insertSeparator(); |
1037 | 1037 | ||
1038 | catMenu->insertItem( tr( "All" ), id++ ); | 1038 | catMenu->insertItem( tr( "All" ), id++ ); |
1039 | QStringList categories = m_abView->categories(); | 1039 | QStringList categories = m_abView->categories(); |
1040 | categories.append( tr( "Unfiled" ) ); | 1040 | categories.append( tr( "Unfiled" ) ); |
1041 | for ( QStringList::Iterator it = categories.begin(); | 1041 | for ( QStringList::Iterator it = categories.begin(); |
1042 | it != categories.end(); ++it ) { | 1042 | it != categories.end(); ++it ) { |
1043 | catMenu->insertItem( *it, id ); | 1043 | catMenu->insertItem( *it, id ); |
1044 | if ( *it == m_abView -> showCategory() ) | 1044 | if ( *it == m_abView -> showCategory() ) |
1045 | rememberId = id; | 1045 | rememberId = id; |
1046 | ++id; | 1046 | ++id; |
1047 | } | 1047 | } |
1048 | 1048 | ||
1049 | 1049 | ||
1050 | if ( m_abView -> showCategory().isEmpty() ) { | 1050 | if ( m_abView -> showCategory().isEmpty() ) { |
1051 | slotSetCategory( 3 ); | 1051 | slotSetCategory( 3 ); |
1052 | } | 1052 | } |
1053 | else { | 1053 | else { |
1054 | slotSetCategory( rememberId ); | 1054 | slotSetCategory( rememberId ); |
1055 | } | 1055 | } |
1056 | } | 1056 | } |
1057 | 1057 | ||