Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
Fixed indentation for main.cpp
authorSteve Brokenshire <sbrokenshire@xestia.co.uk>
Tue, 17 Nov 2015 19:29:01 +0000 (19:29 +0000)
committerSteve Brokenshire <sbrokenshire@xestia.co.uk>
Tue, 17 Nov 2015 19:29:01 +0000 (19:29 +0000)
source/main.cpp

index 1c4ccb1..2a6c518 100644 (file)
@@ -46,120 +46,122 @@ bool XestiaABApp::OnInit()
 
 #endif
 
-    static const wxCmdLineEntryDesc g_cmdLineDesc [] =
-    {
-         { wxCMD_LINE_SWITCH, wxT_2("h"), wxT_2("help"), wxTRANSLATE("Displays help on command line parameters"),
-             wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
-         { wxCMD_LINE_OPTION, wxT_2("e"), wxT_2("edit"), wxTRANSLATE("Edit a vCard 4.0 formatted contact"),
-             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-         { wxCMD_LINE_SWITCH, wxT_2("s"), wxT_2("search"), wxTRANSLATE("Display the search window instead of starting normally"),
-             wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-         { wxCMD_LINE_SWITCH, wxT_2("v"), wxT_2("version"), wxTRANSLATE("Displays version number"),
-             wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-         { wxCMD_LINE_NONE }
-    };
-
-    wxString wxSContactFilename;
-    wxCmdLineParser XABArgs (g_cmdLineDesc, argc, argv);
-    XABArgs.Parse();
+       static const wxCmdLineEntryDesc g_cmdLineDesc [] =
+       {
+               { wxCMD_LINE_SWITCH, wxT_2("h"), wxT_2("help"), wxTRANSLATE("Displays help on command line parameters"),
+                       wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
+               { wxCMD_LINE_OPTION, wxT_2("e"), wxT_2("edit"), wxTRANSLATE("Edit a vCard 4.0 formatted contact"),
+                       wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+               { wxCMD_LINE_SWITCH, wxT_2("s"), wxT_2("search"), wxTRANSLATE("Display the search window instead of starting normally"),
+                       wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
+               { wxCMD_LINE_SWITCH, wxT_2("v"), wxT_2("version"), wxTRANSLATE("Displays version number"),
+                       wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
+               { wxCMD_LINE_NONE }
+       };
+
+       wxString wxSContactFilename;
+       wxCmdLineParser XABArgs (g_cmdLineDesc, argc, argv);
+       XABArgs.Parse();
+    
+       if (XABArgs.Found(wxT("h"))){
     
-    if (XABArgs.Found(wxT("h"))){
+               // Print out the list of help commands.
     
-       return false;
+               return false;
     
-    }
+       }
     
-    if (XABArgs.Found(wxT("v"))){
+       if (XABArgs.Found(wxT("v"))){
     
-       wxPuts(XSDAB_VERSION);
-       exit(0);
+               // Print out the version number.    
+
+               wxPuts(XSDAB_VERSION);
+               exit(0);
     
-    }
+       }
     
-    wxInitAllImageHandlers();
+       wxInitAllImageHandlers();
     
-    if (XABArgs.Found(wxT("s"))){
+       if (XABArgs.Found(wxT("s"))){
     
-       // Open up the search window.
+               // Open up the search window.
        
-       frmSearch *frmSearchPtr = new frmSearch( NULL );
-       frmSearchPtr->Show(true);
-       frmSearchPtr->SetSearchMode(true);
-       return true;
+               frmSearch *frmSearchPtr = new frmSearch( NULL );
+               frmSearchPtr->Show(true);
+               frmSearchPtr->SetSearchMode(true);
+               return true;
     
-    }
+       }
     
-    if (XABArgs.Found(wxT("e"), &wxSContactFilename)){
+       if (XABArgs.Found(wxT("e"), &wxSContactFilename)){
 
-       // Check if the filename exists.
+               // Check if the filename exists.
 
-       wxFileName contactfile(wxSContactFilename);
+               wxFileName contactfile(wxSContactFilename);
        
-       if (!contactfile.FileExists()){
+               if (!contactfile.FileExists()){
        
-               wxMessageBox(_("The file with the filename given does not exist."), _("Error loading contact"), wxICON_ERROR);
-               return false;
+                       wxMessageBox(_("The file with the filename given does not exist."), _("Error loading contact"), wxICON_ERROR);
+                       return false;
        
-       }
+               }
        
-       // Check if file is in the user's Xestia Address Book data storage
-       // path. If it is, refuse to open it.
+               // Check if file is in the user's Xestia Address Book data storage
+               // path. If it is, refuse to open it.
        
-       wxString UserDir = GetUserDir();
-       long UserDirLength = UserDir.Len();
+               wxString UserDir = GetUserDir();
+               long UserDirLength = UserDir.Len();
        
-       if (UserDir == contactfile.GetFullPath().Mid(0, UserDirLength)){
+               if (UserDir == contactfile.GetFullPath().Mid(0, UserDirLength)){
        
-               wxMessageBox(_("The file with the filename given is in the directories that Xestia Address Book stores it's data and cannot be opened directly."), _("Error loading contact"), wxICON_ERROR);
-               return false;
+                       wxMessageBox(_("The file with the filename given is in the directories that Xestia Address Book stores it's data and cannot be opened directly."), _("Error loading contact"), wxICON_ERROR);
+                       return false;
        
-       }
+               }
        
-       wxMemoryInputStream istream(bigimgs_contactpersonicon48_png, sizeof(bigimgs_contactpersonicon48_png));
-       wxImage bigimgs_contactpersonicon48i(istream, wxBITMAP_TYPE_PNG);
-       wxBitmap contacticonbmp(bigimgs_contactpersonicon48i, -1);
-       wxIcon contacticon;
-       contacticon.CopyFromBitmap(contacticonbmp); 
-
-       // Get the filename of the selected contact.
-
-       frmContactEditor *ContactEditor = new frmContactEditor( NULL );
-       ContactEditor->SetupHeaders();
-       ContactEditor->SetMode(TRUE);
-       ContactEditor->LoadContact(wxSContactFilename);
-       //ContactEditor->SetupContact(ActiveAccount);
-       ContactEditor->SetIcon(contacticon);
-       ContactEditor->Show(true);
+               wxMemoryInputStream istream(bigimgs_contactpersonicon48_png, sizeof(bigimgs_contactpersonicon48_png));
+               wxImage bigimgs_contactpersonicon48i(istream, wxBITMAP_TYPE_PNG);
+               wxBitmap contacticonbmp(bigimgs_contactpersonicon48i, -1);
+               wxIcon contacticon;
+               contacticon.CopyFromBitmap(contacticonbmp); 
+
+               // Get the filename of the selected contact.
+
+               frmContactEditor *ContactEditor = new frmContactEditor( NULL );
+               ContactEditor->SetupHeaders();
+               ContactEditor->SetMode(TRUE);
+               ContactEditor->LoadContact(wxSContactFilename);
+               ContactEditor->SetIcon(contacticon);
+               ContactEditor->Show(true);
        
-       SetTopWindow(ContactEditor);
+               SetTopWindow(ContactEditor);
        
-       return true;
+               return true;
     
-    }
+       }
     
-    // Setup default settings and accounts if they don't exist.
+       // Setup default settings and accounts if they don't exist.
     
-    SetupDirectories();
-    SetupDefaultSettings();
-    SetupDefaultAddressBook();
-
-    //wxImage::AddHandler(new wxPNGHandler); 
-    wxMemoryInputStream istream(bigimgs_appicon48_png, sizeof(bigimgs_appicon_png));
-    wxImage bigimgs_appicon48i(istream, wxBITMAP_TYPE_PNG);
-    wxBitmap appiconbmp(bigimgs_appicon48i, -1);    
-    wxIcon appicon;
+       SetupDirectories();
+       SetupDefaultSettings();
+       SetupDefaultAddressBook();
+
+       wxMemoryInputStream istream(bigimgs_appicon48_png, sizeof(bigimgs_appicon_png));
+       wxImage bigimgs_appicon48i(istream, wxBITMAP_TYPE_PNG);
+       wxBitmap appiconbmp(bigimgs_appicon48i, -1);    
+       wxIcon appicon;
     
-    appicon.CopyFromBitmap(appiconbmp);
-    frmMain *frame = new frmMain( NULL );
+       appicon.CopyFromBitmap(appiconbmp);
+       frmMain *frame = new frmMain( NULL );
        frame->Show(true);
-    frmActivityMgr *frameActMgr = new frmActivityMgr ( frame );
-    frame->SetupPointers(frameActMgr);
-    frame->SetupForm();
-    frame->SetIcon(appicon);
+       frmActivityMgr *frameActMgr = new frmActivityMgr ( frame );
+       frame->SetupPointers(frameActMgr);
+       frame->SetupForm();
+       frame->SetIcon(appicon);
    
-    SetTopWindow(frame);
+       SetTopWindow(frame);
    
-    return true;
+       return true;
 
 }
 
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy