Author: kirilla Date: 2009-10-16 00:09:37 +0200 (Fri, 16 Oct 2009) New Revision: 33605 Changeset: http://dev.haiku-os.org/changeset/33605/haiku Modified: haiku/trunk/src/apps/codycam/CodyCam.cpp haiku/trunk/src/apps/codycam/CodyCam.h Log: Make use of BWindow::CenterIn() for placing the error alert. Partial clean-up. Modified: haiku/trunk/src/apps/codycam/CodyCam.cpp =================================================================== --- haiku/trunk/src/apps/codycam/CodyCam.cpp 2009-10-15 21:01:57 UTC (rev 33604) +++ haiku/trunk/src/apps/codycam/CodyCam.cpp 2009-10-15 22:09:37 UTC (rev 33605) @@ -58,15 +58,8 @@ ErrorAlert(const char* message, status_t err, BWindow *window = NULL) { BAlert *alert = new BAlert("", message, "OK"); - if (window != NULL) { - alert->MoveTo( - window->Frame().left + - window->Bounds().right / 2 - - alert->Bounds().right / 2, - window->Frame().top + - window->Bounds().bottom / 2 - - alert->Bounds().bottom / 2); - } + if (window != NULL) + alert->CenterIn(window->Frame()); alert->Go(); printf("%s\n%s [%lx]", message, strerror(err), err); @@ -158,19 +151,13 @@ void CodyCam::ReadyToRun() { - /* create the window for the app */ fWindow = new VideoWindow(BRect(28, 28, 28, 28), (const char*) "CodyCam", B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS, &fPort); - /* set up the node connections */ status_t status = _SetUpNodes(); - if (status != B_OK) { - // This error is not needed because _SetUpNodes handles displaying any - // errors it runs into. -// ErrorAlert("Error setting up nodes", status); + if (status != B_OK) return; - } ((VideoWindow*)fWindow)->ApplyControls(); @@ -329,7 +316,6 @@ /* set time sources */ - status = fMediaRoster->SetTimeSourceFor(fProducerNode.node, fTimeSourceNode.node); if (status != B_OK) { ErrorAlert("Can't set the timesource for the video source", status); @@ -833,26 +819,36 @@ { fSettings = new Settings(filename, dirname); - fSettings->Add(fServerSetting = new StringValueSetting("Server", "ftp.my.server", - "server address expected", "")); - fSettings->Add(fLoginSetting = new StringValueSetting("Login", "loginID", - "login ID expected", "")); - fSettings->Add(fPasswordSetting = new StringValueSetting("Password", "password", - "password expected", "")); - fSettings->Add(fDirectorySetting = new StringValueSetting("Directory", "web/images", - "destination directory expected", "")); - fSettings->Add(fPassiveFtpSetting = new BooleanValueSetting("PassiveFtp", 1)); - fSettings->Add(fFilenameSetting = new StringValueSetting("StillImageFilename", - "codycam.jpg", "still image filename expected", "")); - fSettings->Add(fImageFormatSettings = new StringValueSetting("ImageFileFormat", - "JPEG Image", "image file format expected", "")); - fSettings->Add(fCaptureRateSetting = new EnumeratedStringValueSetting("CaptureRate", + fServerSetting = new StringValueSetting("Server", "ftp.my.server", + "server address expected", ""); + fLoginSetting = new StringValueSetting("Login", "loginID", + "login ID expected", ""); + fPasswordSetting = new StringValueSetting("Password", "password", + "password expected", ""); + fDirectorySetting = new StringValueSetting("Directory", "web/images", + "destination directory expected", ""); + fPassiveFtpSetting = new BooleanValueSetting("PassiveFtp", 1); + fFilenameSetting = new StringValueSetting("StillImageFilename", + "codycam.jpg", "still image filename expected", ""); + fImageFormatSettings = new StringValueSetting("ImageFileFormat", + "JPEG Image", "image file format expected", ""); + fCaptureRateSetting = new EnumeratedStringValueSetting("CaptureRate", "Every 5 minutes", kCaptureRate, "capture rate expected", - "unrecognized capture rate specified")); - fSettings->Add(fUploadClientSetting = new EnumeratedStringValueSetting("UploadClient", + "unrecognized capture rate specified"); + fUploadClientSetting = new EnumeratedStringValueSetting("UploadClient", "FTP", kUploadClient, "upload client name expected", - "unrecognized upload client specified")); + "unrecognized upload client specified"); + fSettings->Add(fServerSetting); + fSettings->Add(fLoginSetting); + fSettings->Add(fPasswordSetting); + fSettings->Add(fDirectorySetting); + fSettings->Add(fPassiveFtpSetting); + fSettings->Add(fFilenameSetting); + fSettings->Add(fImageFormatSettings); + fSettings->Add(fCaptureRateSetting); + fSettings->Add(fUploadClientSetting); + fSettings->TryReadingSettings(); } @@ -945,3 +941,4 @@ app.Run(); return 0; } + Modified: haiku/trunk/src/apps/codycam/CodyCam.h =================================================================== --- haiku/trunk/src/apps/codycam/CodyCam.h 2009-10-15 21:01:57 UTC (rev 33604) +++ haiku/trunk/src/apps/codycam/CodyCam.h 2009-10-15 22:09:37 UTC (rev 33605) @@ -1,4 +1,3 @@ -/* CodyCam.h */ #ifndef CODYCAM_H #define CODYCAM_H @@ -18,7 +17,6 @@ #include <Window.h> - class BMediaRoster; @@ -86,98 +84,104 @@ class CodyCam : public BApplication { - public: - CodyCam(); - virtual ~CodyCam(); +public: + CodyCam(); + virtual ~CodyCam(); - void ReadyToRun(); - virtual bool QuitRequested(); - virtual void MessageReceived(BMessage* message); + void ReadyToRun(); + virtual bool QuitRequested(); + virtual void MessageReceived(BMessage* message); - private: - status_t _SetUpNodes(); - void _TearDownNodes(); +private: + status_t _SetUpNodes(); + void _TearDownNodes(); - BMediaRoster* fMediaRoster; - media_node fTimeSourceNode; - media_node fProducerNode; - VideoConsumer* fVideoConsumer; - media_output fProducerOut; - media_input fConsumerIn; - BWindow* fWindow; - port_id fPort; - BWindow* fVideoControlWindow; + BMediaRoster* fMediaRoster; + media_node fTimeSourceNode; + media_node fProducerNode; + VideoConsumer* fVideoConsumer; + media_output fProducerOut; + media_input fConsumerIn; + BWindow* fWindow; + port_id fPort; + BWindow* fVideoControlWindow; }; class VideoWindow : public BWindow { - public: - VideoWindow(BRect frame, const char* title, window_type type, - uint32 flags, port_id* consumerport); - ~VideoWindow(); +public: + VideoWindow(BRect frame, const char* title, + window_type type, uint32 flags, + port_id* consumerport); + ~VideoWindow(); - virtual bool QuitRequested(); - virtual void MessageReceived(BMessage* message); + virtual bool QuitRequested(); + virtual void MessageReceived(BMessage* message); - void ApplyControls(); + void ApplyControls(); - BView* VideoView(); - BStringView* StatusLine(); + BView* VideoView(); + BStringView* StatusLine(); - private: - void _BuildCaptureControls(BView* theView); +private: + void _BuildCaptureControls(BView* theView); - void _SetUpSettings(const char* filename, const char* dirname); - void _QuitSettings(); + void _SetUpSettings(const char* filename, + const char* dirname); + void _QuitSettings(); - private: - media_node* fProducer; - port_id* fPortPtr; +private: + media_node* fProducer; + port_id* fPortPtr; - BView* fView; - BView* fVideoView; + BView* fView; + BView* fVideoView; - BTextControl* fFileName; - BBox* fCaptureSetupBox; - BMenu* fCaptureRateMenu; - BMenuField* fCaptureRateSelector; - BMenu* fImageFormatMenu; - BMenuField* fImageFormatSelector; - BMenu* fUploadClientMenu; - BMenuField* fUploadClientSelector; - BBox* fFtpSetupBox; - BTextControl* fServerName; - BTextControl* fLoginId; - BTextControl* fPassword; - BTextControl* fDirectory; - BCheckBox* fPassiveFtp; - BBox* fStatusBox; - BStringView* fStatusLine; + BTextControl* fFileName; + BBox* fCaptureSetupBox; + BMenu* fCaptureRateMenu; + BMenuField* fCaptureRateSelector; + BMenu* fImageFormatMenu; + BMenuField* fImageFormatSelector; + BMenu* fUploadClientMenu; + BMenuField* fUploadClientSelector; + BBox* fFtpSetupBox; + BTextControl* fServerName; + BTextControl* fLoginId; + BTextControl* fPassword; + BTextControl* fDirectory; + BCheckBox* fPassiveFtp; + BBox* fStatusBox; + BStringView* fStatusLine; - ftp_msg_info fFtpInfo; + ftp_msg_info fFtpInfo; - Settings* fSettings; - StringValueSetting* fServerSetting; - StringValueSetting* fLoginSetting; - StringValueSetting* fPasswordSetting; - StringValueSetting* fDirectorySetting; - BooleanValueSetting* fPassiveFtpSetting; - StringValueSetting* fFilenameSetting; - StringValueSetting* fImageFormatSettings; - EnumeratedStringValueSetting* fUploadClientSetting; - EnumeratedStringValueSetting* fCaptureRateSetting; + Settings* fSettings; + + StringValueSetting* fServerSetting; + StringValueSetting* fLoginSetting; + StringValueSetting* fPasswordSetting; + StringValueSetting* fDirectorySetting; + BooleanValueSetting* fPassiveFtpSetting; + StringValueSetting* fFilenameSetting; + StringValueSetting* fImageFormatSettings; + + EnumeratedStringValueSetting* fUploadClientSetting; + EnumeratedStringValueSetting* fCaptureRateSetting; }; class ControlWindow : public BWindow { - public: - ControlWindow(const BRect& frame, BView* controls, media_node node); - void MessageReceived(BMessage* message); - bool QuitRequested(); +public: + ControlWindow(const BRect& frame, BView* controls, + media_node node); + void MessageReceived(BMessage* message); + bool QuitRequested(); - private: - BView* fView; - media_node fNode; +private: + BView* fView; + media_node fNode; }; #endif // CODYCAM_H +