[haiku-commits] r39196 - in haiku/trunk: headers/libs/print/libprint src/libs/print/libprint
- From: michael.w.pfeiffer@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 30 Oct 2010 10:06:56 +0200 (CEST)
Author: laplace
Date: 2010-10-30 10:06:55 +0200 (Sat, 30 Oct 2010)
New Revision: 39196
Changeset: http://dev.haiku-os.org/changeset/39196
Modified:
haiku/trunk/headers/libs/print/libprint/StatusWindow.h
haiku/trunk/src/libs/print/libprint/StatusWindow.cpp
Log:
* Style changes.
Modified: haiku/trunk/headers/libs/print/libprint/StatusWindow.h
===================================================================
--- haiku/trunk/headers/libs/print/libprint/StatusWindow.h 2010-10-30
08:05:02 UTC (rev 39195)
+++ haiku/trunk/headers/libs/print/libprint/StatusWindow.h 2010-10-30
08:06:55 UTC (rev 39196)
@@ -13,31 +13,31 @@
class StatusWindow : public BWindow
{
- public:
-
StatusWindow(bool oddPages, bool evenPages,
-
uint32
firstPage, uint32 numPages,
-
uint32
docCopies, uint32 nup);
-
~StatusWindow(void);
+public:
+ StatusWindow(bool oddPages,
bool evenPages,
+ uint32
firstPage, uint32 numPages,
+ uint32
docCopies, uint32 nup);
+ ~StatusWindow(void);
- virtual void MessageReceived(BMessage *message);
+ virtual void MessageReceived(BMessage *message);
- void ResetStatusBar(void);
- bool UpdateStatusBar(uint32 page, uint32 copy);
- void SetPageCopies(uint32 copies);
+ void ResetStatusBar(void);
+ bool UpdateStatusBar(uint32 page, uint32
copy);
+ void SetPageCopies(uint32 copies);
- private:
- BView *fStatusView;
- BStatusBar *fStatusBar;
- BButton *fCancelButton;
- BButton *fHideButton;
- bool fCancelBar;
- bool fDocumentCopy;
- uint32 fNops;
- uint32 fFirstPage;
- uint32 fCopies;
- uint32 fDocCopies;
- float fStatusDelta;
- float fDelta;
+private:
+ BView* fStatusView;
+ BStatusBar* fStatusBar;
+ BButton* fCancelButton;
+ BButton* fHideButton;
+ bool fCancelled;
+ bool fDocumentCopy;
+ uint32 fNops;
+ uint32 fFirstPage;
+ uint32 fCopies;
+ uint32 fDocCopies;
+ float fStatusDelta;
+ float fDelta;
};
#endif
Modified: haiku/trunk/src/libs/print/libprint/StatusWindow.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/StatusWindow.cpp 2010-10-30
08:05:02 UTC (rev 39195)
+++ haiku/trunk/src/libs/print/libprint/StatusWindow.cpp 2010-10-30
08:06:55 UTC (rev 39196)
@@ -19,38 +19,45 @@
#define HIDE_MSG 'hidM'
-StatusWindow::StatusWindow(bool oddPages, bool evenPages, uint32 firstPage,
uint32 numPages, uint32 numCopies, uint32 nup)
- : BWindow (BRect(200, 200, 650, 270), "Print Status",
B_DOCUMENT_WINDOW, B_NOT_RESIZABLE | B_NOT_CLOSABLE | B_NOT_ZOOMABLE)
+StatusWindow::StatusWindow(bool oddPages, bool evenPages, uint32 firstPage,
+ uint32 numPages, uint32 numCopies, uint32 nup)
+ :
+ BWindow(BRect(200, 200, 650, 270),
+ "Print Status",
+ B_DOCUMENT_WINDOW, B_NOT_RESIZABLE | B_NOT_CLOSABLE |
B_NOT_ZOOMABLE)
{
// oddPages - if true, only print odd numbered pages
// evenPages - if true, only print even numbered pages
// firstPage - number of first page
- // numPages - total number of pages (must be recalculate if
odd/even is used)
- // numCopies - total number of document copies
+ // numPages - total number of pages (must be recalculate if
odd/even is
+ // used)
+ // numCopies - total number of document copies
BRect frame = Frame();
// the status view
frame.OffsetTo(B_ORIGIN);
- fStatusView = new BView(frame,"Status View",B_FOLLOW_ALL, B_WILL_DRAW);
- fStatusView->SetViewColor(216,216,216);
+ fStatusView = new BView(frame, "Status View", B_FOLLOW_ALL,
B_WILL_DRAW);
+ fStatusView->SetViewColor(216, 216, 216);
AddChild(fStatusView);
// the status bar
- fStatusBar = new BStatusBar(BRect(10, 15, 245, 50),"Status Bar","Page:
");
+ fStatusBar = new BStatusBar(BRect(10, 15, 245, 50), "Status Bar",
"Page: ");
fStatusView->AddChild(fStatusBar);
// the cancel button
- fHideButton = new BButton(BRect(260, 25, 330,50),"Hide Button","Hide
Status", new BMessage(HIDE_MSG));
+ fHideButton = new BButton(BRect(260, 25, 330, 50), "Hide Button",
+ "Hide Status", new BMessage(HIDE_MSG));
fHideButton->ResizeToPreferred();
fStatusView->AddChild(fHideButton);
- fCancelButton = new BButton(BRect(260, 25, 330,50),"Cancel
Button","Cancel", new BMessage(CANCEL_MSG));
+ fCancelButton = new BButton(BRect(260, 25, 330,50), "Cancel Button",
+ "Cancel", new BMessage(CANCEL_MSG));
fCancelButton->ResizeToPreferred();
fCancelButton->MoveBy(90,0);
fStatusView->AddChild(fCancelButton);
- fCancelBar = false;
+ fCancelled = false;
// calculate the real number of pages
fNops = numPages;
@@ -78,10 +85,10 @@
uint32 addPage = 0;
if (fNops % nup > 0)
addPage = 1;
- fNops = (uint32) ( fNops/(float)nup ) + addPage;
+ fNops = (uint32)(fNops / (float)nup) + addPage;
// recalculate page numbers nup-pages-up
- fStatusBar->SetMaxValue ((float)fNops);
+ fStatusBar->SetMaxValue((float)fNops);
// max value of status bar = real number of pages
fDelta = 1.0/numCopies;
// reduce step width of status bar
@@ -140,11 +147,12 @@
string3.Append(string4);
}
- fStatusBar->Update(fStatusDelta*100.0/fNops, string1.String(),
string3.String());
- if ( (fStatusBar->MaxValue()) == (fStatusBar->CurrentValue()) )
+ fStatusBar->Update(fStatusDelta * 100.0 / fNops,
+ string1.String(), string3.String());
+ if (fStatusBar->MaxValue() == fStatusBar->CurrentValue())
fCancelButton->SetEnabled(false);
Unlock();
- return fCancelBar;
+ return fCancelled;
}
@@ -152,7 +160,7 @@
StatusWindow::SetPageCopies(uint32 copies)
{
fCopies = copies;
- fStatusDelta = fDelta/(float)fCopies;
+ fStatusDelta = fDelta / (float)fCopies;
fDocCopies--;
}
@@ -164,17 +172,13 @@
switch(message->what) {
case CANCEL_MSG: // 'CancelButton' is pressed...
- {
- fCancelBar = true;
- fCancelButton->SetEnabled(false);
- fCancelButton->SetLabel("Job cancelled");
- }
+ fCancelled = true;
+ fCancelButton->SetEnabled(false);
+ fCancelButton->SetLabel("Job cancelled");
break;
case HIDE_MSG: // 'HideButton' is pressed...
- {
- Hide();
- }
+ Hide();
break;
default:
Other related posts:
- » [haiku-commits] r39196 - in haiku/trunk: headers/libs/print/libprint src/libs/print/libprint - michael . w . pfeiffer
