i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Style changes.

Browse Source 
* Removed unused code.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39154 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer
2010-10-26 09:56:56 +00:00
parent 308f0e195d
commit 56c20e828b
2 changed files with 68 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/libs/print/libprint/JobSetupDlg.h
+52 -49
View File
@@ -27,64 +27,67 @@ class PagesView;
class JobSetupView : public BView { class JobSetupView : public BView {
public: public:
JobSetupView(JobData* job_data, PrinterData* printer_data, JobSetupView(JobData* jobData, PrinterData* printerData,
const PrinterCap* printer_cap); const PrinterCap* printerCap);
virtual void AttachedToWindow(); virtual void AttachedToWindow();
virtual void MessageReceived(BMessage* msg); virtual void MessageReceived(BMessage* message);
bool UpdateJobData(bool showPreview); bool UpdateJobData(bool showPreview);
private: private:
void UpdateButtonEnabledState(); void UpdateButtonEnabledState();
bool IsHalftoneConfigurationNeeded(); bool IsHalftoneConfigurationNeeded();
void CreateHalftoneConfigurationUI(); void CreateHalftoneConfigurationUI();
void FillCapabilityMenu(BPopUpMenu* menu, uint32 message, void FillCapabilityMenu(BPopUpMenu* menu, uint32 message,
PrinterCap::CapID category, int id); PrinterCap::CapID category, int id);
void FillCapabilityMenu(BPopUpMenu* menu, uint32 message, void FillCapabilityMenu(BPopUpMenu* menu, uint32 message,
const BaseCap** capabilities, int count, int id); const BaseCap** capabilities, int count, int id);
int GetID(const BaseCap** capabilities, int count, const char* label, int GetID(const BaseCap** capabilities, int count,
int defaultValue); const char* label, int defaultValue);
BRadioButton* CreatePageSelectionItem(const char* name, const char* label, BRadioButton* CreatePageSelectionItem(const char* name,
JobData::PageSelection pageSelection); const char* label,
void AllowOnlyDigits(BTextView* textView, int maxDigits); JobData::PageSelection pageSelection);
void UpdateHalftonePreview(); void AllowOnlyDigits(BTextView* textView, int maxDigits);
JobData::Color Color(); void UpdateHalftonePreview();
Halftone::DitherType DitherType();
float Gamma();
float InkDensity();
JobData::PaperSource PaperSource();
BTextControl *fCopies; JobData::Color Color();
BTextControl *fFromPage; Halftone::DitherType DitherType();
BTextControl *fToPage; float Gamma();
JobData *fJobData; float InkDensity();
PrinterData *fPrinterData; JobData::PaperSource PaperSource();
const PrinterCap *fPrinterCap;
BPopUpMenu *fColorType; BTextControl* fCopies;
BPopUpMenu *fDitherType; BTextControl* fFromPage;
BMenuField *fDitherMenuField; BTextControl* fToPage;
JSDSlider *fGamma; JobData* fJobData;
JSDSlider *fInkDensity; PrinterData* fPrinterData;
HalftoneView *fHalftone; const PrinterCap* fPrinterCap;
BBox *fHalftoneBox; BPopUpMenu* fColorType;
BRadioButton *fAll; BPopUpMenu* fDitherType;
BCheckBox *fCollate; BMenuField* fDitherMenuField;
BCheckBox *fReverse; JSDSlider* fGamma;
PagesView *fPages; JSDSlider* fInkDensity;
BPopUpMenu *fPaperFeed; HalftoneView* fHalftone;
BCheckBox *fDuplex; BBox* fHalftoneBox;
BPopUpMenu *fNup; BRadioButton* fAll;
BRadioButton *fAllPages; BCheckBox* fCollate;
BRadioButton *fOddNumberedPages; BCheckBox* fReverse;
BRadioButton *fEvenNumberedPages; PagesView* fPages;
BPopUpMenu* fPaperFeed;
BCheckBox* fDuplex;
BPopUpMenu* fNup;
BRadioButton* fAllPages;
BRadioButton* fOddNumberedPages;
BRadioButton* fEvenNumberedPages;
}; };
class JobSetupDlg : public DialogWindow { class JobSetupDlg : public DialogWindow {
public: public:
JobSetupDlg(JobData *job_data, PrinterData *printer_data, const PrinterCap *printer_cap); JobSetupDlg(JobData* jobData, PrinterData* printerData,
virtual void MessageReceived(BMessage *message); const PrinterCap* printerCap);
virtual void MessageReceived(BMessage* message);
private: private:
JobSetupView *fJobSetup; JobSetupView* fJobSetup;
}; };
#endif /* __JOBSETUPDLG_H */ #endif /* __JOBSETUPDLG_H */
src/libs/print/libprint/JobSetupDlg.cpp
+16 -23
View File
@@ -129,16 +129,16 @@ enum {
}; };
JobSetupView::JobSetupView(JobData *job_data, PrinterData *printer_data, JobSetupView::JobSetupView(JobData* jobData, PrinterData* printerData,
const PrinterCap *printer_cap) const PrinterCap *printerCap)
: :
BView("jobSetup", B_WILL_DRAW), BView("jobSetup", B_WILL_DRAW),
fCopies(NULL), fCopies(NULL),
fFromPage(NULL), fFromPage(NULL),
fToPage(NULL), fToPage(NULL),
fJobData(job_data), fJobData(jobData),
fPrinterData(printer_data), fPrinterData(printerData),
fPrinterCap(printer_cap), fPrinterCap(printerCap),
fColorType(NULL), fColorType(NULL),
fDitherType(NULL), fDitherType(NULL),
fGamma(NULL), fGamma(NULL),
@@ -426,13 +426,6 @@ JobSetupView::AttachedToWindow()
.SetInsets(0, 0, 0, 0) .SetInsets(0, 0, 0, 0)
); );
/* TODO remove
if (IsHalftoneConfigurationNeeded())
fHalftone->preview(fJobData->getGamma(), fJobData->getInkDensity(),
fJobData->getDitherType(),
fJobData->getColor() != JobData::kMonochrome);
*/
UpdateHalftonePreview(); UpdateHalftonePreview();
UpdateButtonEnabledState(); UpdateButtonEnabledState();
@@ -577,9 +570,9 @@ JobSetupView::UpdateButtonEnabledState()
void void
JobSetupView::MessageReceived(BMessage *msg) JobSetupView::MessageReceived(BMessage* message)
{ {
switch (msg->what) { switch (message->what) {
case kMsgRangeAll: case kMsgRangeAll:
case kMsgRangeSelection: case kMsgRangeSelection:
case kMsgDuplexChanged: case kMsgDuplexChanged:
@@ -700,8 +693,8 @@ JobSetupView::UpdateJobData(bool showPreview)
fJobData->setCopies(atoi(fCopies->Text())); fJobData->setCopies(atoi(fCopies->Text()));
fJobData->setCollate((B_CONTROL_ON == fCollate->Value()) ? true : false); fJobData->setCollate(B_CONTROL_ON == fCollate->Value());
fJobData->setReverse((B_CONTROL_ON == fReverse->Value()) ? true : false); fJobData->setReverse(B_CONTROL_ON == fReverse->Value());
JobData::PageSelection pageSelection = JobData::kAllPages; JobData::PageSelection pageSelection = JobData::kAllPages;
if (fOddNumberedPages->Value() == B_CONTROL_ON) if (fOddNumberedPages->Value() == B_CONTROL_ON)
@@ -715,8 +708,8 @@ JobSetupView::UpdateJobData(bool showPreview)
} }
JobSetupDlg::JobSetupDlg(JobData *job_data, PrinterData *printer_data, JobSetupDlg::JobSetupDlg(JobData* jobData, PrinterData* printerData,
const PrinterCap *printer_cap) const PrinterCap* printerCap)
: :
DialogWindow(BRect(100, 100, 200, 200), "PrintJob Setup", DialogWindow(BRect(100, 100, 200, 200), "PrintJob Setup",
B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL, B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
@@ -726,7 +719,7 @@ JobSetupDlg::JobSetupDlg(JobData *job_data, PrinterData *printer_data,
SetResult(B_ERROR); SetResult(B_ERROR);
AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED)); 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)); SetLayout(new BGroupLayout(B_VERTICAL));
AddChild(BGroupLayoutBuilder(B_VERTICAL, 0) AddChild(BGroupLayoutBuilder(B_VERTICAL, 0)
.Add(fJobSetup) .Add(fJobSetup)
@@ -736,12 +729,12 @@ JobSetupDlg::JobSetupDlg(JobData *job_data, PrinterData *printer_data,
void void
JobSetupDlg::MessageReceived(BMessage *msg) JobSetupDlg::MessageReceived(BMessage* message)
{ {
switch (msg->what) { switch (message->what) {
case kMsgOK: case kMsgOK:
case kMsgPreview: case kMsgPreview:
fJobSetup->UpdateJobData(msg->what == kMsgPreview); fJobSetup->UpdateJobData(message->what == kMsgPreview);
SetResult(B_NO_ERROR); SetResult(B_NO_ERROR);
PostMessage(B_QUIT_REQUESTED); PostMessage(B_QUIT_REQUESTED);
break; break;
@@ -751,7 +744,7 @@ JobSetupDlg::MessageReceived(BMessage *msg)
break; break;
default: default:
DialogWindow::MessageReceived(msg); DialogWindow::MessageReceived(message);
break; break;
} }
} }