From 3fc0398b6ffdfdecbd397df0598c169e59813a71 Mon Sep 17 00:00:00 2001 From: Michael Pfeiffer Date: Mon, 29 Oct 2007 07:53:10 +0000 Subject: [PATCH] Removed duplicate code. MarginView is already in libprintutils.a. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22757 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/print/drivers/pdf/source/Jamfile | 1 - .../print/drivers/pdf/source/MarginView.cpp | 709 ------------------ .../print/drivers/pdf/source/MarginView.h | 226 ------ .../drivers/pdf/source/PageSetupWindow.cpp | 4 +- 4 files changed, 2 insertions(+), 938 deletions(-) delete mode 100644 src/add-ons/print/drivers/pdf/source/MarginView.cpp delete mode 100644 src/add-ons/print/drivers/pdf/source/MarginView.h diff --git a/src/add-ons/print/drivers/pdf/source/Jamfile b/src/add-ons/print/drivers/pdf/source/Jamfile index aab33d90ab..afba08e8d3 100644 --- a/src/add-ons/print/drivers/pdf/source/Jamfile +++ b/src/add-ons/print/drivers/pdf/source/Jamfile @@ -26,7 +26,6 @@ Addon PDF\ Writer : JobSetupWindow.cpp LinePathBuilder.cpp Link.cpp - MarginView.cpp Mask.cpp PDFLinePathBuilder.cpp PDFText.cpp diff --git a/src/add-ons/print/drivers/pdf/source/MarginView.cpp b/src/add-ons/print/drivers/pdf/source/MarginView.cpp deleted file mode 100644 index eae9e438eb..0000000000 --- a/src/add-ons/print/drivers/pdf/source/MarginView.cpp +++ /dev/null @@ -1,709 +0,0 @@ -/* - -MarginView.cpp - -Copyright (c) 2002 OpenBeOS. - -Authors: - Philippe Houdoin - Simon Gauvin - Michael Pfeiffer - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - Todo: - - 2 Make Strings constants or UI resources - -*/ - -#ifndef MARGIN_VIEW_H -#include "MarginView.h" -#endif - -#include -#include - -#include -#include - -/*----------------- MarginView Private Constants --------------------*/ - -const int Y_OFFSET = 20; -const int X_OFFSET = 10; -const int STRING_SIZE = 50; -const int _WIDTH = 50; -const int NUM_COUNT = 10; - -const static float _pointUnits = 1; // 1 point = 1 point -const static float _inchUnits = 72; // 1" = 72 points -const static float _cmUnits = 28.346; // 72/2.54 1cm = 28.346 points - -const static float _minFieldWidth = 100; // pixels -const static float _minUnitHeight = 30; // pixels -const static float _drawInset = 10; // pixels - -const static float unitFormat[] = { _inchUnits, _cmUnits, _pointUnits }; -const static char *unitNames[] = { "Inch", "cm", "Points", NULL }; -const static uint32 unitMsg[] = { MarginView::UNIT_INCH, - MarginView::UNIT_CM, - MarginView::UNIT_POINT }; - -const pattern dots = {{ 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55 }}; - -const rgb_color black = { 0,0,0,0 }; -const rgb_color red = { 255,0,0,0 }; -const rgb_color white = { 255,255,255,0 }; -const rgb_color gray = { 220,220,220,0 }; - -/*----------------- MarginView Public Methods --------------------*/ - -/** - * Constructor - * - * @param frame, BRect that is the size of the view passed to the superclase - * @param pageWidth, float that is the points value of the page width - * @param pageHeight, float that is the points value of the page height - * @param margins, BRect values of margins - * @param units, unit32 enum for units used in view - * @return void - */ -MarginView::MarginView(BRect frame, - int32 pageWidth, - int32 pageHeight, - BRect margins, - uint32 units) - - :BBox(frame, NULL, B_FOLLOW_ALL) -{ - fUnits = units; - fUnitValue = unitFormat[units]; - - SetLabel("Margins"); - - fMaxPageHeight = frame.Height() - _minUnitHeight - Y_OFFSET; - fMaxPageWidth = frame.Width() - _minFieldWidth - X_OFFSET; - - fMargins = margins; - - fPageWidth = pageWidth; - fPageHeight = pageHeight; -} - -/** - * Destructor - * - * @param none - * @return void - */ -MarginView::~MarginView() { -} - -/*----------------- MarginView Public BeOS Hook Methods --------------------*/ - -/** - * Draw - * - * @param BRect, the draw bounds - * @return void - */ -void MarginView::Draw(BRect rect) -{ - BBox::Draw(rect); - - float y_offset = (float)Y_OFFSET; - float x_offset = (float)X_OFFSET; - BRect r; - - // Calculate offsets depending on orientation - if (fPageWidth < fPageHeight) { // Portrait - x_offset = (fMaxPageWidth/2 + X_OFFSET) - fViewWidth/2; - } else { // landscape - y_offset = (fMaxPageHeight/2 + Y_OFFSET) - fViewHeight/2; - } - - // draw the page - SetHighColor(white); - r = BRect(0, 0, fViewWidth, fViewHeight); - r.OffsetBy(x_offset, y_offset); - FillRect(r); - SetHighColor(black); - StrokeRect(r); - - // draw margin - SetHighColor(red); - SetLowColor(white); - r.top += fMargins.top; - r.right -= fMargins.right; - r.bottom -= fMargins.bottom; - r.left += fMargins.left; - StrokeRect(r, dots); - - // draw the page size label - SetHighColor(black); - SetLowColor(gray); - char str[STRING_SIZE]; - sprintf(str, "%2.1f x %2.1f", fPageWidth/fUnitValue, fPageHeight/fUnitValue); - SetFontSize(10); - DrawString((const char *)str, BPoint(x_offset, fMaxPageHeight + 40)); -} - - -/** - * BeOS Hook Function, change the size of the margin display - * - * @param width of the page - * @param height the page - * @return void - */ -void MarginView::FrameResized(float width, float height) -{ - fMaxPageHeight = height - _minUnitHeight - X_OFFSET; - fMaxPageWidth = width - _minFieldWidth - Y_OFFSET; - - CalculateViewSize(MARGIN_CHANGED); - Invalidate(); -} - -/** - * AttachToWindow - * - * @param none - * @return void - */ -void MarginView::AttachedToWindow() -{ - if (Parent()) { - SetViewColor(Parent()->ViewColor()); - } - ConstructGUI(); -} - -/*----------------- MarginView Public Methods --------------------*/ - -/** - * GetUnits - * - * @param none - * @return uint32 enum, units in inches, cm, points - */ -uint32 MarginView::GetUnits(void) { - return fUnits; -} - -/** - * UpdateView, recalculate and redraw the view - * - * @param msg is a message to the calculate size to tell which field caused - * the update to occur, or it is a general update. - * @return void - */ -void MarginView::UpdateView(uint32 msg) -{ - Window()->Lock(); - CalculateViewSize(msg); // nur Preview in Margins BBox! - Invalidate(); - Window()->Unlock(); -} - -/** - * SetPageSize - * - * @param pageWidth, float that is the unit value of the page width - * @param pageHeight, float that is the unit value of the page height - * @return void - */ -void MarginView::SetPageSize(float pageWidth, float pageHeight) -{ - fPageWidth = pageWidth; - fPageHeight = pageHeight; -} - -/** - * GetPageSize - * - * @param none - * @return BPoint, contains actual point values of page in x, y of point - */ -BPoint MarginView::GetPageSize(void) { - return BPoint(fPageWidth, fPageHeight); -} - -/** - * GetMargin - * - * @param none - * @return rect, return margin values always in points - */ -BRect MarginView::GetMargin(void) -{ - BRect margin; - - // convert the field text to values - float ftop = atof(fTop->Text()); - float fright = atof(fRight->Text()); - float fleft = atof(fLeft->Text()); - float fbottom = atof(fBottom->Text()); - - // convert to units to points - switch (fUnits) - { - case UNIT_INCH: - // convert to points - ftop *= _inchUnits; - fright *= _inchUnits; - fleft *= _inchUnits; - fbottom *= _inchUnits; - break; - case UNIT_CM: - // convert to points - ftop *= _cmUnits; - fright *= _cmUnits; - fleft *= _cmUnits; - fbottom *= _cmUnits; - break; - } - - margin.Set(fleft, ftop, fright, fbottom); - - return margin; -} - -/** - * MesssageReceived() - * - * Receive messages for the view - * - * @param BMessage* , the message being received - * @return void - */ -void MarginView::MessageReceived(BMessage *msg) -{ - switch (msg->what) - { - case CHANGE_PAGE_SIZE: { - float w; - float h; - msg->FindFloat("width", &w); - msg->FindFloat("height", &h); - SetPageSize(w, h); - UpdateView(MARGIN_CHANGED); - } - break; - - case FLIP_PAGE: { - BPoint p; - p = GetPageSize(); - SetPageSize(p.y, p.x); - UpdateView(MARGIN_CHANGED); - } - break; - - case MARGIN_CHANGED: - UpdateView(MARGIN_CHANGED); - break; - - case TOP_MARGIN_CHANGED: - UpdateView(TOP_MARGIN_CHANGED); - break; - - case LEFT_MARGIN_CHANGED: - UpdateView(LEFT_MARGIN_CHANGED); - break; - - case RIGHT_MARGIN_CHANGED: - UpdateView(RIGHT_MARGIN_CHANGED); - break; - - case BOTTOM_MARGIN_CHANGED: - UpdateView(BOTTOM_MARGIN_CHANGED); - break; - - case UNIT_INCH: - case UNIT_CM: - case UNIT_POINT: - SetUnits(msg->what); - break; - - default: - BView::MessageReceived(msg); - break; - } -} -/*----------------- MarginView Private Methods --------------------*/ - -/** - * ConstructGUI() - * - * Creates the GUI for the View. MUST be called AFTER the View is attached to - * the Window, or will crash and/or create strange behaviour - * - * @param none - * @return void - */ -void MarginView::ConstructGUI() -{ - BMessage *msg; - BString str; - BMenuItem *item; - BMenuField *mf; - BPopUpMenu *menu; - -// Create text fields - msg = new BMessage(MARGIN_CHANGED); - BRect r(Frame().Width() - be_plain_font->StringWidth("Top#") - _WIDTH, - Y_OFFSET, Frame().Width() - X_OFFSET, _WIDTH); - - // top - str << fMargins.top/fUnitValue; - fTop = new BTextControl( r, "top", "Top", str.String(), NULL, - B_FOLLOW_RIGHT); - - fTop->SetModificationMessage(new BMessage(TOP_MARGIN_CHANGED)); - fTop->SetDivider(be_plain_font->StringWidth("Top#")); - fTop->SetTarget(this); - AllowOnlyNumbers(fTop, NUM_COUNT); - AddChild(fTop); - - - - - //left - r.OffsetBy(0, Y_OFFSET); - r.left = Frame().Width() - be_plain_font->StringWidth("Left#") - _WIDTH; - str = ""; - str << fMargins.left/fUnitValue; - fLeft = new BTextControl( r, "left", "Left", str.String(), NULL, - B_FOLLOW_RIGHT); - - fLeft->SetModificationMessage(new BMessage(LEFT_MARGIN_CHANGED)); - fLeft->SetDivider(be_plain_font->StringWidth("Left#")); - fLeft->SetTarget(this); - AllowOnlyNumbers(fLeft, NUM_COUNT); - AddChild(fLeft); - - - - - //bottom - r.OffsetBy(0, Y_OFFSET); - r.left = Frame().Width() - be_plain_font->StringWidth("Bottom#") - _WIDTH; - str = ""; - str << fMargins.bottom/fUnitValue; - fBottom = new BTextControl( r, "bottom", "Bottom", str.String(), NULL, - B_FOLLOW_RIGHT); - - fBottom->SetModificationMessage(new BMessage(BOTTOM_MARGIN_CHANGED)); - fBottom->SetDivider(be_plain_font->StringWidth("Bottom#")); - fBottom->SetTarget(this); - - AllowOnlyNumbers(fBottom, NUM_COUNT); - AddChild(fBottom); - - - - - //right - r.OffsetBy(0, Y_OFFSET); - r.left = Frame().Width() - be_plain_font->StringWidth("Right#") - _WIDTH; - str = ""; - str << fMargins.right/fUnitValue; - fRight = new BTextControl( r, "right", "Right", str.String(), NULL, - B_FOLLOW_RIGHT); - - fRight->SetModificationMessage(new BMessage(RIGHT_MARGIN_CHANGED)); - fRight->SetDivider(be_plain_font->StringWidth("Right#")); - fRight->SetTarget(this); - AllowOnlyNumbers(fRight, NUM_COUNT); - AddChild(fRight); - - - -// Create Units popup - r.OffsetBy(-X_OFFSET,Y_OFFSET); - r.right += Y_OFFSET; - - menu = new BPopUpMenu("units"); - mf = new BMenuField(r, "units", "Units", menu, - B_FOLLOW_BOTTOM|B_FOLLOW_RIGHT|B_WILL_DRAW); - mf->ResizeToPreferred(); - mf->SetDivider(be_plain_font->StringWidth("Units#")); - - // Construct menu items - for (int i=0; unitNames[i] != NULL; i++ ) - { - msg = new BMessage(unitMsg[i]); - menu->AddItem(item = new BMenuItem(unitNames[i], msg)); - item->SetTarget(this); - if (fUnits == unitMsg[i]) { - item->SetMarked(true); - } - } - AddChild(mf); - - // calculate the sizes for drawing page view - CalculateViewSize(MARGIN_CHANGED); -} - - -/** - * AllowOnlyNumbers() - * - * @param BTextControl, the control we want to only allow numbers - * @param maxNum, the maximun number of characters allowed - * @return void - */ -void MarginView::AllowOnlyNumbers(BTextControl *textControl, int maxNum) -{ - BTextView *tv = textControl->TextView(); - - for (long i = 0; i < 256; i++) { - tv->DisallowChar(i); - } - for (long i = '0'; i <= '9'; i++) { - tv->AllowChar(i); - } - tv->AllowChar(B_BACKSPACE); - tv->AllowChar('.'); - tv->SetMaxBytes(maxNum); -} - -/** - * SetMargin - * - * @param brect, margin values in rect - * @return void - */ -void MarginView::SetMargin(BRect margin) { - fMargins = margin; -} - -/** - * SetUnits, called by the MarginMgr when the units popup is selected - * - * @param uint32, the enum that identifies the units requested to change to. - * @return void - */ -void MarginView::SetUnits(uint32 unit) -{ - // do nothing if the current units are the same as requested - if (unit == fUnits) { - return; - } - - // set the units Format - fUnitValue = unitFormat[unit]; - - // convert the field text to values - float ftop = atof(fTop->Text()); - float fright = atof(fRight->Text()); - float fleft = atof(fLeft->Text()); - float fbottom = atof(fBottom->Text()); - - // convert to target units - switch (fUnits) - { - case UNIT_INCH: - // convert to points - ftop *= _inchUnits; - fright *= _inchUnits; - fleft *= _inchUnits; - fbottom *= _inchUnits; - // check for target unit is cm - if (unit == UNIT_CM) { - ftop /= _cmUnits; - fright /= _cmUnits; - fleft /= _cmUnits; - fbottom /= _cmUnits; - } - break; - case UNIT_CM: - // convert to points - ftop *= _cmUnits; - fright *= _cmUnits; - fleft *= _cmUnits; - fbottom *= _cmUnits; - // check for target unit is inches - if (unit == UNIT_INCH) { - ftop /= _inchUnits; - fright /= _inchUnits; - fleft /= _inchUnits; - fbottom /= _inchUnits; - } - break; - case UNIT_POINT: - // check for target unit is cm - if (unit == UNIT_CM) { - ftop /= _cmUnits; - fright /= _cmUnits; - fleft /= _cmUnits; - fbottom /= _cmUnits; - } - // check for target unit is inches - if (unit == UNIT_INCH) { - ftop /= _inchUnits; - fright /= _inchUnits; - fleft /= _inchUnits; - fbottom /= _inchUnits; - } - break; - } - fUnits = unit; - - // lock Window since these changes are from another thread - Window()->Lock(); - - // set the fields to new units - BString str; - str << ftop; - fTop->SetText(str.String()); - - str = ""; - str << fleft; - fLeft->SetText(str.String()); - - str = ""; - str << fright; - fRight->SetText(str.String()); - - str = ""; - str << fbottom; - fBottom->SetText(str.String()); - - // update UI - CalculateViewSize(MARGIN_CHANGED); - Invalidate(); - - Window()->Unlock(); -} - -/** - * CalculateViewSize - * - * calculate the size of the view that is used - * to show the page inside the margin box. This is dependent - * on the size of the box and the room we have to show it and - * the units that we are using and the orientation of the page. - * - * @param msg, the message for which field changed to check value bounds - * @return void - */ -void MarginView::CalculateViewSize(uint32 msg) -{ - // determine page orientation - if (fPageHeight < fPageWidth) { // LANDSCAPE - fViewWidth = fMaxPageWidth; - fViewHeight = fPageHeight * (fViewWidth/fPageWidth); - float hdiff = fViewHeight - fMaxPageHeight; - if (hdiff > 0) { - fViewHeight -= hdiff; - fViewWidth -= hdiff; - } - } else { // PORTRAIT - fViewHeight = fMaxPageHeight; - fViewWidth = fPageWidth * (fViewHeight/fPageHeight); - float wdiff = fViewWidth - fMaxPageWidth; - if (wdiff > 0) { - fViewHeight -= wdiff; - fViewWidth -= wdiff; - } - } - - // calculate margins based on view size - - // find the length of 1 pixel in points - // ex: 80px/800pt = 0.1px/pt - float pixelLength = fViewHeight/fPageHeight; - - // convert the margins to points - // The text field will have a number that us in the current unit - // ex 0.2" * 72pt = 14.4pts - float ftop = atof(fTop->Text()) * fUnitValue; - float fright = atof(fRight->Text()) * fUnitValue; - float fbottom = atof(fBottom->Text()) * fUnitValue; - float fleft = atof(fLeft->Text()) * fUnitValue; - - // Check that the margins don't overlap each other... - float ph = fPageHeight; - float pw = fPageWidth; - BString str; - - // Bounds calculation rules: - if (msg == TOP_MARGIN_CHANGED) - { - // top must be <= bottom - if (ftop > (ph - fbottom)) { - ftop = ph - fbottom; - str = ""; - str << ftop / fUnitValue; - Window()->Lock(); - fTop->SetText(str.String()); - Window()->Unlock(); - } - - } - - if (msg == BOTTOM_MARGIN_CHANGED) - { - // bottom must be <= pageHeight - if (fbottom > (ph - ftop)) { - fbottom = ph - ftop; - str = ""; - str << fbottom / fUnitValue; - Window()->Lock(); - fBottom->SetText(str.String()); - Window()->Unlock(); - } - } - - if (msg == LEFT_MARGIN_CHANGED) - { - // left must be <= right - if (fleft > (pw - fright)) { - fleft = pw - fright; - str = ""; - str << fleft / fUnitValue; - Window()->Lock(); - fLeft->SetText(str.String()); - Window()->Unlock(); - } - } - - if (msg == RIGHT_MARGIN_CHANGED) - { - // right must be <= fPageWidth - if (fright > (pw - fleft)) { - fright = pw - fleft; - str = ""; - str << fright / fUnitValue; - Window()->Lock(); - fRight->SetText(str.String()); - Window()->Unlock(); - } - } - - // convert the unit value to pixels - // ex: 14.4pt * 0.1px/pt = 1.44px - fMargins.top = ftop * pixelLength; - fMargins.right = fright * pixelLength; - fMargins.bottom = fbottom * pixelLength; - fMargins.left = fleft * pixelLength; -} - - diff --git a/src/add-ons/print/drivers/pdf/source/MarginView.h b/src/add-ons/print/drivers/pdf/source/MarginView.h deleted file mode 100644 index cd8a826e7c..0000000000 --- a/src/add-ons/print/drivers/pdf/source/MarginView.h +++ /dev/null @@ -1,226 +0,0 @@ -/* - -MarginView.h - -Copyright (c) 2002 OpenBeOS. - -Authors: - Philippe Houdoin - Simon Gauvin - Michael Pfeiffer - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - Documentation: - - The MarginView is designed to be a self contained component that manages - the display of a BBox control that shows a graphic of a page and its' - margings. The component also includes text fields that are used to mofify - the margin values and a popup to change the units used for the margins. - - There are two interfaces for the MarginView component: - - 1) Set methods: - - page size - - orientation - - Get methods to retrieve: - - margins - - page size - - The method interface is available for the parent Component to call on - the MarginView in response to the Window receiveing messages from - other BControls that it contains, such as a Page Size popup. The - Get methods are used to extract the page size and margins so that - the printer driver may put these values into a BMessage for printing. - - 2) 'Optional' Message interface: - - Set Page Size - - Flip Orientation - - The message interface is available for GUI Controls, BPopupMenu to send - messages to the MarginView if the parent Window is not used to handle - the messages. - - General Use of MarginView component: - - 1) Simply construct a new MarginView object with the margins - you want as defaults and add this view to the parent view - of the dialog. - - MarginView *mv; - mv = new MarginView(viewSizeRect, pageWidth, pageHeight); - parentView->AddChild(mv); - - * you can also set the margins in the constructor, and the units: - - mv = new MarginView(viewSizeRect, pageWidth, pageHeight - marginRect, UNIT_POINTS); - - ! but remeber to have the marginRect values match the UNITS :-) - - 2) Set Page Size with methods: - - mv-SetPageSize( pageWidth, pageHeight ); - mv->UpdateView(); - - 3) Set Page Size with BMessage: - - BMessage* msg = new BMessage(CHANGE_PAGE_SIZE); - msg->AddFloat("width", pageWidth); - msg->AddFloat("height", pageHeight); - mv->PostMessage(msg); - - 4) Flip Page with methods: - - mv-SetPageSize( pageHeight, pageWidth ); - mv->UpdateView(); - - 5) Flip Page with BMessage: - - BMessage* msg = new BMessage(FLIP_PAGE); - mv->Looper()->PostMessage(msg); - - Note: the MarginView DOES NOT keep track of the orientation. This - should be done by the code for the Page setup dialog. - - 6) Get Page Size - - BPoint pageSize = mv->GetPageSize(); - - 7) Get Margins - - BRect margins = mv->GetMargins(); - - 8) Get Units - - uint32 units = mv->GetUnits(); - - where units is one of: - UNIT_INCH, 72 points/in - UNIT_CM, 28.346 points/cm - UNIT_POINT, 1 point/point -*/ - -#ifndef MARGIN_VIEW_H -#define MARGIN_VIEW_H - -#include -#include - -class MarginManager; - -// Messages that the MarginManager accepts -const uint32 TOP_MARGIN_CHANGED = 'tchg'; -const uint32 RIGHT_MARGIN_CHANGED = 'rchg'; -const uint32 LEFT_MARGIN_CHANGED = 'lchg'; -const uint32 BOTTOM_MARGIN_CHANGED = 'bchg'; -const uint32 MARGIN_CHANGED = 'mchg'; -const uint32 CHANGE_PAGE_SIZE = 'chps'; -const uint32 FLIP_PAGE = 'flip'; - -/** - * Class MarginView - */ -class MarginView : public BBox -{ -friend class MarginManager; - -public: - // used to index unitFormat array - typedef enum { - UNIT_INCH = 0, - UNIT_CM, - UNIT_POINT - }; - -private: - - // GUI components - BTextControl *fTop, *fBottom, *fLeft, *fRight; - - // rect that holds the margins for the page as a set of point offsets - BRect fMargins; - - // the maximum size of the page view calculated from the view size - float fMaxPageWidth; - float fMaxPageHeight; - - // the actual size of the page in points - float fPageHeight; - float fPageWidth; - - // the units used to calculate the page size - uint32 fUnits; - float fUnitValue; - - // the size of the drawing area we have to draw the view in pixels - float fViewHeight; - float fViewWidth; - - // Calculate the view size for the margins - void CalculateViewSize(uint32 msg); - - // performed internally using the supplied popup - void SetUnits(uint32 unit); - - // performed internally using text fields - void SetMargin(BRect margin); - - // utility method - void AllowOnlyNumbers(BTextControl *textControl, int maxNum); - -public: - MarginView(BRect rect, - int32 pageWidth = 0, - int32 pageHeight = 0, - BRect margins = BRect(1, 1, 1, 1), // default to 1 inch - uint32 units = UNIT_INCH); - - ~MarginView(); - - /// all the GUI construction code - void ConstructGUI(); - - // page size - void SetPageSize(float pageWidth, float pageHeight); - // point.x = width, point.y = height - BPoint GetPageSize(void); - - // margin - BRect GetMargin(void); - - // orientation - // None, this state should be saved elsewhere in the page setup code - // and not here. See the FLIP_PAGE message to perform this function. - - // units - uint32 GetUnits(void); - - // will cause a recalc and redraw - void UpdateView(uint32 msg); - - // BeOS Hook methods - virtual void AttachedToWindow(void); - void Draw(BRect rect); - void FrameResized(float width, float height); - void MessageReceived(BMessage *msg); -}; - -#endif //MARGIN_VIEW_H diff --git a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp index b71f38d077..5c074a77e7 100644 --- a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp +++ b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp @@ -165,7 +165,7 @@ PageSetupWindow::PageSetupWindow(BMessage *msg, const char *printerName) margin.bottom = page.bottom - margin.bottom; fMarginView = new MarginView(BRect(20,20,200,160), (int32)width, (int32)height, - margin, units); + margin, (MarginUnit)units); panel->AddChild(fMarginView); // add page format menu @@ -414,7 +414,7 @@ PageSetupWindow::UpdateSetupMessage() fSetupMsg->ReplaceRect("printable_rect", margin); // save the units used - int32 units = fMarginView->GetUnits(); + int32 units = fMarginView->GetMarginUnit(); if (fSetupMsg->HasInt32("units")) { fSetupMsg->ReplaceInt32("units", units); } else {