desktop/source/app/desktop.hrc | 4 ---- desktop/source/app/desktop.src | 14 -------------- sc/source/ui/inc/datafdlg.hxx | 13 +++++++------ sc/source/ui/miscdlgs/datafdlg.cxx | 17 +++++++++++------ sc/source/ui/src/datafdlg.src | 36 +++++++++++++++++------------------- svx/source/dialog/docrecovery.src | 4 ++-- 6 files changed, 37 insertions(+), 51 deletions(-)
New commits: commit c61e3c941d46fe1ae6066f31e01786100e39da56 Author: Andras Timar <[email protected]> Date: Sun Jul 15 21:18:42 2012 +0200 fdo#47947 Data Form dialog layout fix Change-Id: Ifa1689ff9be7afa14f5694825c506f7c8c3eff43 diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index bfa3769..6f41ddb 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -43,12 +43,13 @@ #define MAX_DATAFORM_COLS 256 #define MAX_DATAFORM_ROWS 32000 -#define CTRL_HEIGHT 22 -#define FIXED_WIDTH 60 -#define EDIT_WIDTH 140 -#define FIXED_LEFT 12 -#define EDIT_LEFT 78 -#define LINE_HEIGHT 30 +#define FIXED_WIDTH 54 +#define EDIT_WIDTH 86 +#define FIXED_HEIGHT 10 +#define EDIT_HEIGHT 12 +#define FIXED_LEFT 6 +#define EDIT_LEFT 62 +#define LINE_HEIGHT 16 //zhangyun class ScDataFormDlg : public ModalDialog diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 9f0f318..d87d552 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -163,10 +163,15 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShellOri String aFieldName; - int nTop = 12; + //align with LAB_DATAFORM_RECORDNO + int nTop = LogicToPixel( Size(1,6), MapMode(MAP_APPFONT) ).getHeight(); + const int nOne = LogicToPixel( Size(1,1), MapMode(MAP_APPFONT) ).getHeight(); + const int nLineHeight = LogicToPixel( Size(1, LINE_HEIGHT), MapMode(MAP_APPFONT) ).getHeight(); + const int nFixedLeft = LogicToPixel( Size(FIXED_LEFT, 1), MapMode(MAP_APPFONT) ).getWidth(); + const int nEditLeft = LogicToPixel( Size(EDIT_LEFT, 1), MapMode(MAP_APPFONT) ).getWidth(); - Size nFixedSize(FIXED_WIDTH, CTRL_HEIGHT ); - Size nEditSize(EDIT_WIDTH, CTRL_HEIGHT ); + Size nFixedSize(LogicToPixel( Size(FIXED_WIDTH, FIXED_HEIGHT), MapMode(MAP_APPFONT) )); + Size nEditSize(LogicToPixel( Size(EDIT_WIDTH, EDIT_HEIGHT), MapMode(MAP_APPFONT) )); aColLength = nEndCol - nStartCol + 1; @@ -185,13 +190,13 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShellOri maFixedTexts[nIndex].SetSizePixel(nFixedSize); maEdits[nIndex].SetSizePixel(nEditSize); - maFixedTexts[nIndex].SetPosPixel(Point(FIXED_LEFT, nTop)); - maEdits[nIndex].SetPosPixel(Point(EDIT_LEFT, nTop)); + maFixedTexts[nIndex].SetPosPixel(Point(nFixedLeft, nTop + nOne)); + maEdits[nIndex].SetPosPixel(Point(nEditLeft, nTop)); maFixedTexts[nIndex].SetText(aFieldName); maFixedTexts[nIndex].Show(); maEdits[nIndex].Show(); - nTop += LINE_HEIGHT; + nTop += nLineHeight; } else { diff --git a/sc/source/ui/src/datafdlg.src b/sc/source/ui/src/datafdlg.src index 5c0ee6d..0b6d01f 100644 --- a/sc/source/ui/src/datafdlg.src +++ b/sc/source/ui/src/datafdlg.src @@ -26,67 +26,66 @@ */ #include "datafdlg.hrc" -//zhangyun, dataform ModalDialog RID_SCDLG_DATAFORM { OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 191 , 180 ) ; + Size = MAP_APPFONT ( 257 , 180 ) ; Text [ en-US ] = "Data Form" ; Moveable = TRUE ; Closeable = TRUE ; FixedText LAB_DATAFORM_RECORDNO { - Pos = MAP_APPFONT ( 136 , 6 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - Text [ en-US ] = "/" ; + Pos = MAP_APPFONT ( 162 , 6 ) ; + Size = MAP_APPFONT ( 60 , 12 ) ; + Text = "/" ; //placeholder only }; PushButton BTN_DATAFORM_NEW { - Pos = MAP_APPFONT ( 135 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 161 , 23 ) ; + Size = MAP_APPFONT ( 90 , 14 ) ; TabStop = TRUE ; DefButton = TRUE ; Text [ en-US ] = "New" ; }; PushButton BTN_DATAFORM_DELETE { - Pos = MAP_APPFONT ( 135 , 40 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 161 , 40 ) ; + Size = MAP_APPFONT ( 90 , 14 ) ; TabStop = TRUE ; Text [ en-US ] = "Delete" ; }; PushButton BTN_DATAFORM_RESTORE { - Pos = MAP_APPFONT ( 135 , 57 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 161 , 57 ) ; + Size = MAP_APPFONT ( 90 , 14 ) ; TabStop = TRUE ; Text [ en-US ] = "Restore" ; }; PushButton BTN_DATAFORM_PREV { - Pos = MAP_APPFONT ( 135 , 82 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 161 , 82 ) ; + Size = MAP_APPFONT ( 90 , 14 ) ; TabStop = TRUE ; Text [ en-US ] = "Previous Record" ; }; PushButton BTN_DATAFORM_NEXT { - Pos = MAP_APPFONT ( 135 , 99 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 161 , 99 ) ; + Size = MAP_APPFONT ( 90 , 14 ) ; TabStop = TRUE ; Text [ en-US ] = "Next Record" ; }; PushButton BTN_DATAFORM_CLOSE { - Pos = MAP_APPFONT ( 135 , 116 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 161 , 116 ) ; + Size = MAP_APPFONT ( 90 , 14 ) ; TabStop = TRUE ; Text [ en-US ] = "Close" ; }; ScrollBar WND_DATAFORM_SCROLLBAR { - Pos = MAP_APPFONT ( 124 , 6 ) ; + Pos = MAP_APPFONT ( 150 , 6 ) ; Size = MAP_APPFONT ( 8 , 135 ) ; HScroll = FALSE ; TabStop = FALSE ; @@ -96,4 +95,3 @@ ModalDialog RID_SCDLG_DATAFORM Text [ en-US ] = "New Record" ; }; }; -//end commit 8d0c180469d9f7257afab63b7b8ef404b253ac27 Author: Andras Timar <[email protected]> Date: Sun Jul 15 21:08:41 2012 +0200 remove 2 unused resources Change-Id: I5b0faac6c47c284fd25f020fdf6dbbed5c643e72 diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index df95f1f..ff23d47 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -25,10 +25,6 @@ // RID_FIRSTSTSTART_START 3000 #define RID_DESKTOP_STRING_START 10000 - -#define INFOBOX_CMDLINEHELP (RID_DESKTOP_DIALOG_START+51) -#define INFOBOX_EXPIRED (RID_DESKTOP_DIALOG_START+52) - #define QBX_USERDATALOCKED (RID_DESKTOP_DIALOG_START+100) #define DLG_CMDLINEHELP (RID_DESKTOP_DIALOG_START+101) diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src index cd56186..6eb9a3e 100644 --- a/desktop/source/app/desktop.src +++ b/desktop/source/app/desktop.src @@ -115,13 +115,6 @@ String STR_TITLE_USERDATALOCKED Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION"; }; -InfoBox INFOBOX_CMDLINEHELP -{ - Buttons = WB_OK ; - DefButton = WB_DEF_OK ; - Message = ""; -}; - ModalDialog DLG_CMDLINEHELP { HelpID = "desktop:ModalDialog:DLG_CMDLINEHELP"; @@ -171,13 +164,6 @@ ErrorBox EBX_ERR_PRINTDISABLED Message [ en-US ] = "Printing is disabled. No documents can be printed."; }; -InfoBox INFOBOX_EXPIRED -{ - Buttons = WB_OK ; - DefButton = WB_DEF_OK ; - Message [ en-US ] = "This Evaluation Version has expired. To find out more about %PRODUCTNAME,\nvisit http://www.oracle.com/us/products/applications/open-office.";; -}; - String STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE { Text [ en-US ] = "The path manager is not available.\n"; commit 29b302d5375c89b3fd44ff4e459c9d177a64eff8 Author: Andras Timar <[email protected]> Date: Sun Jul 15 19:28:41 2012 +0200 cleanup malingering vendor name in docrecovery.src Change-Id: Ie9fa8a07361a1ed957d9e4d19df256b4d9668606 diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src index 1898776..e4c2248 100644 --- a/svx/source/dialog/docrecovery.src +++ b/svx/source/dialog/docrecovery.src @@ -363,7 +363,7 @@ TabPage RID_SVXPAGE_ERR_REP_WELCOME Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW2 ); Size = MAP_APPFONT( RECOV_CONTROLWIDTH, (RECOV_ROW7-RECOV_ROW2-RSC_SP_CTRL_Y) ); WordBreak = TRUE; - Text[ en-US ] = "This error report tool gathers information about how %PRODUCTNAME is working and sends it to Oracle to help improve future versions.\n\nIt's easy - just send the report without any further effort on your part by clicking 'Send' in the next dialog, or you can briefly describe how the error occurred and then click 'Send'. If you want to see the report, click the 'Show Report' button. No data will be sent if you click 'Do Not Send'.\n\nCustomer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME %PRODUCTVERSION when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME and will not be shared with third parties.\nFor more information on Oracle's privacy policy, visit\nwww.oracle.com/html/services-privacy-policy.html"; + Text[ en-US ] = "This error report tool gathers information about how %PRODUCTNAME is working and sends it to The Document Foundation to help improve future versions.\n\nIt's easy - just send the report without any further effort on your part by clicking 'Send' in the next dialog, or you can briefly describe how the error occurred and then click 'Send'. If you want to see the report, click the 'Show Report' button. No data will be sent if you click 'Do Not Send'.\n\nCustomer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME %PRODUCTVERSION when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME and will not be shared with third parties.\nFor more information on The Document Foundation's privacy policy, visit\nhttp://www.documentfoundation.org/privacy";; }; FixedLine FL_RECOV_BOTTOM { @@ -471,7 +471,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW12 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_CHECKBOX_HEIGHT ); Check = FALSE; - Text[ en-US ] = "~I allow Oracle to contact me regarding this report."; + Text[ en-US ] = "~I allow The Document Foundation to contact me regarding this report."; }; FixedText FT_ERRSEND_EMAILADDR { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
