[haiku-commits] r39154 - in haiku/trunk: headers/libs/print/libprint src/libs/print/libprint
- From: michael.w.pfeiffer@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 26 Oct 2010 11:56:56 +0200 (CEST)
Author: laplace
Date: 2010-10-26 11:56:56 +0200 (Tue, 26 Oct 2010)
New Revision: 39154
Changeset: http://dev.haiku-os.org/changeset/39154
Modified:
haiku/trunk/headers/libs/print/libprint/JobSetupDlg.h
haiku/trunk/src/libs/print/libprint/JobSetupDlg.cpp
Log:
* Style changes.
* Removed unused code.
Modified: haiku/trunk/headers/libs/print/libprint/JobSetupDlg.h
===================================================================
--- haiku/trunk/headers/libs/print/libprint/JobSetupDlg.h 2010-10-26
09:48:36 UTC (rev 39153)
+++ haiku/trunk/headers/libs/print/libprint/JobSetupDlg.h 2010-10-26
09:56:56 UTC (rev 39154)
@@ -27,64 +27,67 @@
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 */
Modified: haiku/trunk/src/libs/print/libprint/JobSetupDlg.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/JobSetupDlg.cpp 2010-10-26 09:48:36 UTC
(rev 39153)
+++ haiku/trunk/src/libs/print/libprint/JobSetupDlg.cpp 2010-10-26 09:56:56 UTC
(rev 39154)
@@ -129,16 +129,16 @@
};
-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 @@
.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 @@
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 @@
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 @@
}
-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 @@
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 @@
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 @@
break;
default:
- DialogWindow::MessageReceived(msg);
+ DialogWindow::MessageReceived(message);
break;
}
}
Other related posts:
- » [haiku-commits] r39154 - in haiku/trunk: headers/libs/print/libprint src/libs/print/libprint - michael . w . pfeiffer
