From 56c20e828b34509535ece11bd94da2ef140b13f9 Mon Sep 17 00:00:00 2001 From: Michael Pfeiffer Date: Tue, 26 Oct 2010 09:56:56 +0000 Subject: [PATCH] * Style changes. * Removed unused code. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39154 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/libs/print/libprint/JobSetupDlg.h | 101 +++++++++++----------- src/libs/print/libprint/JobSetupDlg.cpp | 39 ++++----- 2 files changed, 68 insertions(+), 72 deletions(-) diff --git a/headers/libs/print/libprint/JobSetupDlg.h b/headers/libs/print/libprint/JobSetupDlg.h index e04124ea3c..3d1e414f7c 100644 --- a/headers/libs/print/libprint/JobSetupDlg.h +++ b/headers/libs/print/libprint/JobSetupDlg.h @@ -27,64 +27,67 @@ class PagesView; class JobSetupView : public BView { public: - JobSetupView(JobData* job_data, PrinterData* printer_data, - const PrinterCap* printer_cap); - virtual void AttachedToWindow(); - virtual void MessageReceived(BMessage* msg); - bool UpdateJobData(bool showPreview); + JobSetupView(JobData* jobData, PrinterData* printerData, + const PrinterCap* printerCap); + virtual void AttachedToWindow(); + virtual void MessageReceived(BMessage* message); + bool UpdateJobData(bool showPreview); private: - void UpdateButtonEnabledState(); - bool IsHalftoneConfigurationNeeded(); - void CreateHalftoneConfigurationUI(); - void FillCapabilityMenu(BPopUpMenu* menu, uint32 message, - PrinterCap::CapID category, int id); - void FillCapabilityMenu(BPopUpMenu* menu, uint32 message, - const BaseCap** capabilities, int count, int id); - int GetID(const BaseCap** capabilities, int count, const char* label, - int defaultValue); - BRadioButton* CreatePageSelectionItem(const char* name, const char* label, - JobData::PageSelection pageSelection); - void AllowOnlyDigits(BTextView* textView, int maxDigits); - void UpdateHalftonePreview(); - JobData::Color Color(); - Halftone::DitherType DitherType(); - float Gamma(); - float InkDensity(); - JobData::PaperSource PaperSource(); + void UpdateButtonEnabledState(); + bool IsHalftoneConfigurationNeeded(); + void CreateHalftoneConfigurationUI(); + void FillCapabilityMenu(BPopUpMenu* menu, uint32 message, + PrinterCap::CapID category, int id); + void FillCapabilityMenu(BPopUpMenu* menu, uint32 message, + const BaseCap** capabilities, int count, int id); + int GetID(const BaseCap** capabilities, int count, + const char* label, int defaultValue); + BRadioButton* CreatePageSelectionItem(const char* name, + const char* label, + JobData::PageSelection pageSelection); + void AllowOnlyDigits(BTextView* textView, int maxDigits); + void UpdateHalftonePreview(); - BTextControl *fCopies; - BTextControl *fFromPage; - BTextControl *fToPage; - JobData *fJobData; - PrinterData *fPrinterData; - const PrinterCap *fPrinterCap; - BPopUpMenu *fColorType; - BPopUpMenu *fDitherType; - BMenuField *fDitherMenuField; - JSDSlider *fGamma; - JSDSlider *fInkDensity; - HalftoneView *fHalftone; - BBox *fHalftoneBox; - BRadioButton *fAll; - BCheckBox *fCollate; - BCheckBox *fReverse; - PagesView *fPages; - BPopUpMenu *fPaperFeed; - BCheckBox *fDuplex; - BPopUpMenu *fNup; - BRadioButton *fAllPages; - BRadioButton *fOddNumberedPages; - BRadioButton *fEvenNumberedPages; + JobData::Color Color(); + Halftone::DitherType DitherType(); + float Gamma(); + float InkDensity(); + JobData::PaperSource PaperSource(); + + BTextControl* fCopies; + BTextControl* fFromPage; + BTextControl* fToPage; + JobData* fJobData; + PrinterData* fPrinterData; + const PrinterCap* fPrinterCap; + BPopUpMenu* fColorType; + BPopUpMenu* fDitherType; + BMenuField* fDitherMenuField; + JSDSlider* fGamma; + JSDSlider* fInkDensity; + HalftoneView* fHalftone; + BBox* fHalftoneBox; + BRadioButton* fAll; + BCheckBox* fCollate; + BCheckBox* fReverse; + PagesView* fPages; + BPopUpMenu* fPaperFeed; + BCheckBox* fDuplex; + BPopUpMenu* fNup; + BRadioButton* fAllPages; + BRadioButton* fOddNumberedPages; + BRadioButton* fEvenNumberedPages; }; class JobSetupDlg : public DialogWindow { public: - JobSetupDlg(JobData *job_data, PrinterData *printer_data, const PrinterCap *printer_cap); - virtual void MessageReceived(BMessage *message); + JobSetupDlg(JobData* jobData, PrinterData* printerData, + const PrinterCap* printerCap); + virtual void MessageReceived(BMessage* message); private: - JobSetupView *fJobSetup; + JobSetupView* fJobSetup; }; #endif /* __JOBSETUPDLG_H */ diff --git a/src/libs/print/libprint/JobSetupDlg.cpp b/src/libs/print/libprint/JobSetupDlg.cpp index fc6acdc41b..db2be42f5b 100644 --- a/src/libs/print/libprint/JobSetupDlg.cpp +++ b/src/libs/print/libprint/JobSetupDlg.cpp @@ -129,16 +129,16 @@ enum { }; -JobSetupView::JobSetupView(JobData *job_data, PrinterData *printer_data, - const PrinterCap *printer_cap) +JobSetupView::JobSetupView(JobData* jobData, PrinterData* printerData, + const PrinterCap *printerCap) : BView("jobSetup", B_WILL_DRAW), fCopies(NULL), fFromPage(NULL), fToPage(NULL), - fJobData(job_data), - fPrinterData(printer_data), - fPrinterCap(printer_cap), + fJobData(jobData), + fPrinterData(printerData), + fPrinterCap(printerCap), fColorType(NULL), fDitherType(NULL), fGamma(NULL), @@ -426,13 +426,6 @@ JobSetupView::AttachedToWindow() .SetInsets(0, 0, 0, 0) ); - /* TODO remove - if (IsHalftoneConfigurationNeeded()) - - fHalftone->preview(fJobData->getGamma(), fJobData->getInkDensity(), - fJobData->getDitherType(), - fJobData->getColor() != JobData::kMonochrome); - */ UpdateHalftonePreview(); UpdateButtonEnabledState(); @@ -577,9 +570,9 @@ JobSetupView::UpdateButtonEnabledState() void -JobSetupView::MessageReceived(BMessage *msg) +JobSetupView::MessageReceived(BMessage* message) { - switch (msg->what) { + switch (message->what) { case kMsgRangeAll: case kMsgRangeSelection: case kMsgDuplexChanged: @@ -700,8 +693,8 @@ JobSetupView::UpdateJobData(bool showPreview) fJobData->setCopies(atoi(fCopies->Text())); - fJobData->setCollate((B_CONTROL_ON == fCollate->Value()) ? true : false); - fJobData->setReverse((B_CONTROL_ON == fReverse->Value()) ? true : false); + fJobData->setCollate(B_CONTROL_ON == fCollate->Value()); + fJobData->setReverse(B_CONTROL_ON == fReverse->Value()); JobData::PageSelection pageSelection = JobData::kAllPages; if (fOddNumberedPages->Value() == B_CONTROL_ON) @@ -715,8 +708,8 @@ JobSetupView::UpdateJobData(bool showPreview) } -JobSetupDlg::JobSetupDlg(JobData *job_data, PrinterData *printer_data, - const PrinterCap *printer_cap) +JobSetupDlg::JobSetupDlg(JobData* jobData, PrinterData* printerData, + const PrinterCap* printerCap) : DialogWindow(BRect(100, 100, 200, 200), "PrintJob Setup", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL, @@ -726,7 +719,7 @@ JobSetupDlg::JobSetupDlg(JobData *job_data, PrinterData *printer_data, SetResult(B_ERROR); AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED)); - fJobSetup = new JobSetupView(job_data, printer_data, printer_cap); + fJobSetup = new JobSetupView(jobData, printerData, printerCap); SetLayout(new BGroupLayout(B_VERTICAL)); AddChild(BGroupLayoutBuilder(B_VERTICAL, 0) .Add(fJobSetup) @@ -736,12 +729,12 @@ JobSetupDlg::JobSetupDlg(JobData *job_data, PrinterData *printer_data, void -JobSetupDlg::MessageReceived(BMessage *msg) +JobSetupDlg::MessageReceived(BMessage* message) { - switch (msg->what) { + switch (message->what) { case kMsgOK: case kMsgPreview: - fJobSetup->UpdateJobData(msg->what == kMsgPreview); + fJobSetup->UpdateJobData(message->what == kMsgPreview); SetResult(B_NO_ERROR); PostMessage(B_QUIT_REQUESTED); break; @@ -751,7 +744,7 @@ JobSetupDlg::MessageReceived(BMessage *msg) break; default: - DialogWindow::MessageReceived(msg); + DialogWindow::MessageReceived(message); break; } }