Changeset 97 for Mulberry/branches/v4.1d1/MacOS/Sources/Application/General/CMulberryApp.cp

Timestamp:

07/09/07 22:13:35 (2 years ago)

Author:

daboo

Message:

More v4.1 code. Includes experiment, though non-functioning WebKit? message
display option.

Files:

• Mulberry/branches/v4.1d1/MacOS/Sources/Application/General/CMulberryApp.cp (modified) (13 diffs)

Mulberry/branches/v4.1d1/MacOS/Sources/Application/General/CMulberryApp.cp

@@ -34 +34 @@
 #include "CAdbkManagerWindow.h"
 #include "CAdbkSearchWindow.h"
-#include "CAddressBookDoc.h"
 #include "CAddressBookWindow.h"
 #include "CAdminLock.h"
@@ -52 +51 @@
 #include "CICSupport.h"
 #include "CLetterWindow.h"
-#include "CLocalAddressBook.h"
 #include "CMacroEditDialog.h"
 #include "CMailAccountManager.h"
@@ -423 +421 @@
         else if (CAdminLock::sAdminLock.mNoQuit)
         {
-                // Look for option key
-                KeyMap km;
-                ::GetKeys(km);                  // Get keyboard state
                 // Check for option key
-                bool optionKey = (( ((unsigned char*) km)[0x3A>>3] >> (0x3A & 7) ) & 1);
-                bool shiftKey = (( ((unsigned char*) km)[0x38>>3] >> (0x38 & 7) ) & 1);
-                bool cmdKey = (( ((unsigned char*) km)[0x37>>3] >> (0x37 & 7) ) & 1);
+                UInt32 modifiers = ::GetCurrentKeyModifiers();
+                bool option_key = modifiers & optionKey;
+                bool shift_key = modifiers & shiftKey;
+                bool cmd_key = modifiers & cmdKey;
 
                 // See if allowed to quit by existing docs
-                if ((!optionKey || !shiftKey || !cmdKey) && AttemptQuit(inSaveOption))
+                if ((!option_key || !shift_key || !cmd_key) && AttemptQuit(inSaveOption))
                 {
                         // First close it
@@ -607 +603 @@
 
                 // Look for option key
-                KeyMap km;
-                ::GetKeys(km);                  // Get keyboard state
-                bool cmdKey = (( ((unsigned char*) km)[0x37>>3] >> (0x37 & 7) ) & 1);
+                bool cmd_key = ::GetCurrentKeyModifiers() & cmdKey;
                 
                 // Possible disconnect prompt
                 if (!prefs.mDisconnected.GetValue() && prefs.mPromptDisconnected.GetValue() && CTCPSocket::WillDial() ||
-                        cmdKey)
+                        cmd_key)
                 {
                         CErrorDialog::EDialogResult result = CErrorDialog::PoseDialog(CErrorDialog::eErrDialog_Caution,
@@ -792 +786 @@
 
                 // Force manager to update all accounts
-                CAddressBookManager::sAddressBookManager->StartLocal();
-                CAddressBookManager::sAddressBookManager->SyncAccounts(CPreferences::sPrefs->mAddressAccounts.GetValue());
+                CAddressBookManager::sAddressBookManager->SyncAccounts();
         }
         else
         {
                 // Force manager to update all accounts
-                CAddressBookManager::sAddressBookManager->SyncAccounts(CPreferences::sPrefs->mAddressAccounts.GetValue());
+                CAddressBookManager::sAddressBookManager->SyncAccounts();
         }
 }
@@ -982 +975 @@
                 case cmd_Preferences:
                         {
-                                // Look for option key
-                                KeyMap km;
-                                ::GetKeys(km);                  // Get keyboard state
                                 // Check for option key
-                                bool optionKey = (( ((unsigned char*) km)[0x3A>>3] >> (0x3A & 7) ) & 1);
+                                bool option_key = ::GetCurrentKeyModifiers() & optionKey;
 
                                 // If option key and logging allowed then do log prefs
-                                if (optionKey && CAdminLock::sAdminLock.mAllowLogging)
+                                if (option_key && CAdminLock::sAdminLock.mAllowLogging)
                                 {
                                         CLog::DoLoggingOptions();
@@ -1034 +1024 @@
 
                 case cmd_NewAddressBook:
-                        // Do local new if only local address books
-                        if (CAddressBookManager::sAddressBookManager->GetProtocolList().empty())
-                                MakeNewAddressBookDoc();
-                        else if (CPreferences::sPrefs->mUse3Pane.GetValue())
+                        if (CPreferences::sPrefs->mUse3Pane.GetValue())
                         {
                                 // Show three pane window and force to contacts tab
@@ -1046 +1033 @@
                                 }
                         }
-                        else if (CPreferences::sPrefs->mUse3Pane.GetValue())
+                        else
                         {
                                 // Show address book manager
@@ -1054 +1041 @@
 
                 case cmd_OpenAddressBook:
-                        // Do local open if only local address books
-                        if (CAddressBookManager::sAddressBookManager->GetProtocolList().empty())
-                                ChooseAddressBookDoc();
-                        else if (CPreferences::sPrefs->mUse3Pane.GetValue())
+                        if (CPreferences::sPrefs->mUse3Pane.GetValue())
                         {
                                 // Show three pane window and force to contacts tab
@@ -1066 +1050 @@
                                 }
                         }
-                        else if (CPreferences::sPrefs->mUse3Pane.GetValue())
+                        else
                         {
                                 // Show address book manager
@@ -1823 +1807 @@
                                 // Sync address books
                                 if (!stopped_adbk && CAddressBookManager::sAddressBookManager)
-                                        CAddressBookManager::sAddressBookManager->SyncAccounts(CPreferences::sPrefs->mAddressAccounts.GetValue());
+                                        CAddressBookManager::sAddressBookManager->SyncAccounts();
 
                                 // Sync calendars
@@ -2190 +2174 @@
                 break;
 
-        case kAddressBookDocType:
-                // Make sure prefs exists - force if not
-                if (!mPrefsLoaded) StartUp();
-
-                if (CAdminLock::sAdminLock.mNoLocalAdbks)
-                {
-                        ::SysBeep(1);
-                        break;
-                }
-
-                // Only open if not quitting
-                if (mState != programState_Quitting)
-                {
-                        // Check for existing file
-                        CAddressBook* adbk = (CAddressBook*) CAddressBookManager::sAddressBookManager->CheckLocalOpen(inMacFSSpec);
-
-                        // Does window already exist?
-                        if (adbk)
-                        {
-                                CAddressBookWindow* theWindow = CAddressBookWindow::FindWindow(adbk);
-
-                                if (theWindow)
-                                        // Found existing window so select
-                                        FRAMEWORK_WINDOW_TO_TOP(theWindow)
-
-                                adbk = NULL;
-                        }
-                        else
-                        {
-                                try
-                                {
-                                        // Create address book
-                                        adbk = new CLocalAddressBook(inMacFSSpec);
-
-                                        // Open it
-                                        adbk->Open();
-                                }
-                                catch (...)
-                                {
-                                        CLOG_LOGCATCH(...);
-
-                                        // Remove from manager
-                                        if (adbk)
-                                                adbk->Close();
-                                        delete adbk;
-                                }
-                        }
-                }
-                break;
         }
 
@@ -2267 +2202 @@
 
 } // CMulberryApp::ChooseLetterDoc
-
-// Create address book doc
-void CMulberryApp::MakeNewAddressBookDoc()
-{
-        CLocalAddressBook* adbk = NULL;
-        try
-        {
-                // Create address book
-                adbk = new CLocalAddressBook(NULL);
-
-                // New it
-                adbk->New();
-        }
-        catch (...)
-        {
-                CLOG_LOGCATCH(...);
-
-                // Remove from manager
-                if (adbk)
-                        adbk->Close();
-                delete adbk;
-        }
-}
-
-// Choose an address book document
-void CMulberryApp::ChooseAddressBookDoc()
-{
-        // Send AE for recording
-        PPx::FSObject fspec;
-        if (PP_StandardDialogs::AskOpenOneFile(kAddressBookDocType, fspec, kNavDefaultNavDlogOptions | kNavAllowPreviews | kNavAllFilesInPopup))
-                OpenDocument(&fspec);
-
-} // CMulberryApp::ChooseAddressBookDoc
 
 //      Respond to an AppleEvent