[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Nov 24 06:07:09 PST 2010
patches/dev300/apply | 4
patches/dev300/pdf-export-dialog-reduce-height.diff | 404 ++++++++++++++++++++
patches/dev300/recovery-dialog-reduce-height.diff | 21 +
3 files changed, 429 insertions(+)
New commits:
commit 59f1d131100ecbc0c2b03e65ac3fea04ea29d0cd
Author: Petr Mladek <pmladek at walk.suse.cz>
Date: Fri Aug 6 20:25:17 2010 +0200
reduce height of PDF export and recovery dialogs (bnc#623352)
* patches/dev300/pdf-export-dialog-reduce-height.diff:
* patches/dev300/recovery-dialog-reduce-height.diff:
* patches/dev300/apply: reduce high of the two dialogs to avoid shrinking on
Netbooks (bnc#623352)
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a3d28d3..e9713c5 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2292,6 +2292,10 @@ framework-netbook-use-small-screen-mode.diff, rodo
netbook-window-decoration-update.diff, n#621116, rodo
+# reduce height of selected dialogs to avoid shrinking on Netbooks
+pdf-export-dialog-reduce-height.diff, bnc#623352, rodo
+recovery-dialog-reduce-height.diff, bnc#623352, rodo
+
[ MacOSXOnly ]
SectionOwner => thorsten
# make opengl transitions work on OSX, too
diff --git a/patches/dev300/pdf-export-dialog-reduce-height.diff b/patches/dev300/pdf-export-dialog-reduce-height.diff
new file mode 100644
index 0000000..20a6dd6
--- /dev/null
+++ b/patches/dev300/pdf-export-dialog-reduce-height.diff
@@ -0,0 +1,404 @@
+--- filter/source/pdf/impdialog.hrc.old 2010-11-02 12:43:37.000000000 +0100
++++ filter/source/pdf/impdialog.hrc 2010-11-24 14:51:18.000000000 +0100
+@@ -27,6 +27,11 @@
+
+ #include <filter.hrc>
+
++#define RID_PDF_EXPORT_WIDTH 352
++#define RID_PDF_EXPORT_HEIGHT 158
++
++#define PDF_COL2 176
++
+ #define RID_PDF_EXPORT_DLG (RID_PDF_DIALOG_START + 0)
+ #define RID_PDF_TAB_GENER (RID_PDF_DIALOG_START + 1)
+ #define RID_PDF_TAB_VPREFER (RID_PDF_DIALOG_START + 2)
+--- filter/source/pdf/impdialog.src.old 2010-11-02 12:43:37.000000000 +0100
++++ filter/source/pdf/impdialog.src 2010-11-24 14:56:11.000000000 +0100
+@@ -27,7 +27,7 @@
+
+ #include "impdialog.hrc"
+
+-#define TAB_PDF_SIZE Size = MAP_APPFONT ( 176, 268 )
++#define TAB_PDF_SIZE Size = MAP_APPFONT ( RID_PDF_EXPORT_WIDTH, RID_PDF_EXPORT_HEIGHT )
+ //string for TabDialog standard buttons
+ String STR_PDF_EXPORT
+ {
+@@ -59,62 +59,62 @@ TabPage RID_PDF_TAB_GENER
+
+ FixedLine FL_PAGES
+ {
+- Pos = MAP_APPFONT ( 6 , 3 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 6 , 3 ) ;
+ Size = MAP_APPFONT ( 164 , 8 ) ;
+ Text[ en-US ] = "Range";
+ };
+ RadioButton RB_ALL
+ {
+- Pos = MAP_APPFONT ( 12 , 14 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 14 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ Text[ en-US ] = "~All";
+ };
+ RadioButton RB_RANGE
+ {
+- Pos = MAP_APPFONT ( 12 , 27 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 27 ) ;
+ Size = MAP_APPFONT ( 101 , 10 ) ;
+ Text[ en-US ] = "~Pages";
+ };
+ Edit ED_PAGES
+ {
+ Border = TRUE ;
+- Pos = MAP_APPFONT ( 116, 26 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 116, 26 ) ;
+ Size = MAP_APPFONT ( 48 , 12 ) ;
+ };
+ RadioButton RB_SELECTION
+ {
+- Pos = MAP_APPFONT ( 12 , 40 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 40 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ Text[ en-US ] = "~Selection";
+ };
+ FixedLine FL_IMAGES
+ {
+- Pos = MAP_APPFONT ( 6 , 53 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 6 , 53 ) ;
+ Size = MAP_APPFONT ( 164 , 8 ) ;
+ Text[ en-US ] = "Images";
+ };
+ RadioButton RB_LOSSLESSCOMPRESSION
+ {
+- Pos = MAP_APPFONT ( 12 , 64 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 64 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ Text[ en-US ] = "~Lossless compression";
+ };
+ RadioButton RB_JPEGCOMPRESSION
+ {
+- Pos = MAP_APPFONT ( 12 , 76 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 76 ) ;
+ Size = MAP_APPFONT ( 158, 10 ) ;
+ Text[ en-US ] = "~JPEG compression";
+ };
+ FixedText FT_QUALITY
+ {
+- Pos = MAP_APPFONT ( 30 , 89 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 30 , 89 ) ;
+ Size = MAP_APPFONT ( 83, 10 ) ;
+ Text[ en-US ] = "~Quality";
+ };
+ MetricField NF_QUALITY
+ {
+ Border = TRUE ;
+- Pos = MAP_APPFONT ( 116, 88 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 116, 88 ) ;
+ Size = MAP_APPFONT ( 48, 12 ) ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
+@@ -124,14 +124,14 @@ TabPage RID_PDF_TAB_GENER
+ };
+ CheckBox CB_REDUCEIMAGERESOLUTION
+ {
+- Pos = MAP_APPFONT ( 12 , 103 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 103 ) ;
+ Size = MAP_APPFONT ( 101 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "~Reduce image resolution";
+ };
+ ComboBox CO_REDUCEIMAGERESOLUTION
+ {
+- Pos = MAP_APPFONT ( 116 , 102 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 116 , 102 ) ;
+ Size = MAP_APPFONT ( 48 , 50 ) ;
+ TabStop = TRUE ;
+ DropDown = TRUE ;
+@@ -146,41 +146,41 @@ TabPage RID_PDF_TAB_GENER
+ };
+ FixedLine FL_GENERAL
+ {
+- Pos = MAP_APPFONT ( 6 , 117 ) ;
++ Pos = MAP_APPFONT ( 6 , 3 ) ;
+ Size = MAP_APPFONT ( 164 , 8 ) ;
+ Text[ en-US ] = "General";
+ };
+ CheckBox CB_PDFA_1B_SELECT
+ {
+- Pos = MAP_APPFONT ( 12, 128 ) ;
++ Pos = MAP_APPFONT ( 12, 14 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "P~DF/A-1a";
+ };
+ CheckBox CB_TAGGEDPDF
+ {
+- Pos = MAP_APPFONT ( 12 , 141 ) ;
++ Pos = MAP_APPFONT ( 12 , 27 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "~Tagged PDF";
+ };
+ CheckBox CB_EXPORTFORMFIELDS
+ {
+- Pos = MAP_APPFONT ( 12 , 154 ) ;
++ Pos = MAP_APPFONT ( 12 , 40 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "~Create PDF form";
+ };
+ FixedText FT_FORMSFORMAT
+ {
+- Pos = MAP_APPFONT ( 30 , 168 ) ;
++ Pos = MAP_APPFONT ( 30 , 54 ) ;
+ Size = MAP_APPFONT ( 93, 8 ) ;
+ Text[ en-US ] = "Submit ~format";
+ };
+ ListBox LB_FORMSFORMAT
+ {
+ Border = TRUE ;
+- Pos = MAP_APPFONT ( 126, 166 ) ;
++ Pos = MAP_APPFONT ( 126, 52 ) ;
+ Size = MAP_APPFONT ( 38, 48 ) ;
+ DeltaLang = < Default ; Default ; Default ; Default ; > ;
+ TabStop = TRUE ;
+@@ -195,50 +195,50 @@ TabPage RID_PDF_TAB_GENER
+ };
+ CheckBox CB_ALLOWDUPLICATEFIELDNAMES
+ {
+- Pos = MAP_APPFONT( 30, 178 );
++ Pos = MAP_APPFONT( 30, 66 );
+ Size = MAP_APPFONT( 128, 10 );
+ TabStop = TRUE;
+ Text [ en-US ] = "Allow duplicate field ~names";
+ };
+ CheckBox CB_EXPORTBOOKMARKS
+ {
+- Pos = MAP_APPFONT ( 12 , 190 ) ;
++ Pos = MAP_APPFONT ( 12 , 78 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "Export ~bookmarks";
+ };
+ CheckBox CB_EXPORTNOTES
+ {
+- Pos = MAP_APPFONT ( 12 , 203 ) ;
++ Pos = MAP_APPFONT ( 12 , 91 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "~Export comments";
+ };
+ CheckBox CB_EXPORTNOTESPAGES
+ {
+- Pos = MAP_APPFONT ( 12 , 216 ) ;
++ Pos = MAP_APPFONT ( 12 , 104 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "Export ~notes pages";
+ };
+ CheckBox CB_EXPORTEMPTYPAGES
+ {
+- Pos = MAP_APPFONT ( 12 , 229 ) ;
+- Size = MAP_APPFONT ( 158 , 16 ) ;
++ Pos = MAP_APPFONT ( 12 , 117 ) ;
++ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ WordBreak = TRUE ;
+ Text[ en-US ] = "Exp~ort automatically inserted blank pages";
+ };
+ CheckBox CB_EMBEDSTANDARDFONTS
+ {
+- Pos = MAP_APPFONT ( 12 , 248 ) ;
++ Pos = MAP_APPFONT ( 12 , 130 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "E~mbed standard fonts";
+ };
+ CheckBox CB_ADDSTREAM
+ {
+- Pos = MAP_APPFONT ( 12 , 261 ) ;
++ Pos = MAP_APPFONT ( 12 , 143 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "Create ~hybrid file";
+@@ -352,37 +352,37 @@ TabPage RID_PDF_TAB_OPNFTR
+ ////////////////////////////////////////
+ FixedLine FL_PAGE_LAYOUT
+ {
+- Pos = MAP_APPFONT ( 6 , 146 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 6 , 3 ) ;
+ Size = MAP_APPFONT (164 , 8 ) ;
+ Text[ en-US ] = "Page layout" ;
+ };
+ RadioButton RB_PGLY_DEFAULT
+ {
+- Pos = MAP_APPFONT ( 12 , 158 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 15 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ Text[ en-US ] = "D~efault" ;
+ };
+ RadioButton RB_PGLY_SINGPG
+ {
+- Pos = MAP_APPFONT ( 12 , 170 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 27 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ Text[ en-US ] = "~Single page" ;
+ };
+ RadioButton RB_PGLY_CONT
+ {
+- Pos = MAP_APPFONT ( 12 , 182 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 39 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ Text[ en-US ] = "~Continuous" ;
+ };
+ RadioButton RB_PGLY_CONTFAC
+ {
+- Pos = MAP_APPFONT ( 12 , 194 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 51 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ Text[ en-US ] = "C~ontinuous facing" ;
+ };
+ CheckBox CB_PGLY_FIRSTLEFT
+ {
+- Pos = MAP_APPFONT ( 22 , 206 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 22 , 63 ) ;
+ Size = MAP_APPFONT ( 148 , 10 ) ;
+ Text[ en-US ] = "First page is ~left" ;
+ };
+@@ -465,13 +465,13 @@ TabPage RID_PDF_TAB_VPREFER
+ ////////////////////////////////
+ FixedLine FL_TRANSITIONS
+ {
+- Pos = MAP_APPFONT ( 6 , 114 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 6 , 3 ) ;
+ Size = MAP_APPFONT ( 164 , 8 ) ;
+ Text[ en-US ] = "Transitions" ;
+ };
+ CheckBox CB_TRANSITIONEFFECTS
+ {
+- Pos = MAP_APPFONT ( 12 , 126 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 15 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "~Use transition effects";
+@@ -479,25 +479,25 @@ TabPage RID_PDF_TAB_VPREFER
+ ////////////////////////////////
+ FixedLine FL_BOOKMARKS
+ {
+- Pos = MAP_APPFONT ( 6 , 140 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 6 , 29 ) ;
+ Size = MAP_APPFONT ( 164 , 8 ) ;
+ Text[ en-US ] = "Bookmarks" ;
+ };
+ RadioButton RB_ALLBOOKMARKLEVELS
+ {
+- Pos = MAP_APPFONT ( 12 , 152 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 41 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ Text[ en-US ] = "All bookmark levels";
+ };
+ RadioButton RB_VISIBLEBOOKMARKLEVELS
+ {
+- Pos = MAP_APPFONT ( 12 , 166 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 55 ) ;
+ Size = MAP_APPFONT ( 117 , 10 ) ;
+ Text[ en-US ] = "Visible bookmark levels";
+ };
+ NumericField NUM_BOOKMARKLEVELS
+ {
+- Pos = MAP_APPFONT ( 132 , 165 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 132 , 54 ) ;
+ Size = MAP_APPFONT ( 32 , 12 ) ;
+ Border = TRUE;
+ Spin = TRUE;
+@@ -589,25 +589,25 @@ TabPage RID_PDF_TAB_SECURITY
+ //////////////////////////////
+ FixedLine FL_PRINT_PERMISSIONS
+ {
+- Pos = MAP_APPFONT ( 12 , 90 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 6 , 3 ) ;
+ Size = MAP_APPFONT (156 , 8 ) ;
+ Text[ en-US ] = "Printing" ;
+ };
+ RadioButton RB_PRINT_NONE
+ {
+- Pos = MAP_APPFONT ( 18 , 101 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 14 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ Text[ en-US ] = "~Not permitted";
+ };
+ RadioButton RB_PRINT_LOWRES
+ {
+- Pos = MAP_APPFONT ( 18 , 112 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 25 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ Text[ en-US ] = "~Low resolution (150 dpi)";
+ };
+ RadioButton RB_PRINT_HIGHRES
+ {
+- Pos = MAP_APPFONT ( 18 , 123 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 36 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ Text[ en-US ] = "~High resolution";
+ };
+@@ -615,45 +615,45 @@ TabPage RID_PDF_TAB_SECURITY
+ /////////////////////////////
+ FixedLine FL_CHANGES_ALLOWED
+ {
+- Pos = MAP_APPFONT ( 12 , 134 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 6 , 47 ) ;
+ Size = MAP_APPFONT (156 , 8 ) ;
+ Text[ en-US ] = "Changes" ;
+ };
+ RadioButton RB_CHANGES_NONE
+ {
+- Pos = MAP_APPFONT ( 18 , 145 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 58 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ Text[ en-US ] = "No~t permitted";
+ };
+ RadioButton RB_CHANGES_INSDEL
+ {
+- Pos = MAP_APPFONT ( 18 , 157 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 70 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ Text[ en-US ] = "~Inserting, deleting, and rotating pages";
+ };
+ RadioButton RB_CHANGES_FILLFORM
+ {
+- Pos = MAP_APPFONT ( 18 , 168 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 81 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ Text[ en-US ] = "~Filling in form fields";
+ };
+ RadioButton RB_CHANGES_COMMENT
+ {
+- Pos = MAP_APPFONT ( 18 , 179 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 92 ) ;
+ Size = MAP_APPFONT ( 152 , 16 ) ;
+ WordBreak = TRUE ;
+ Text[ en-US ] = "~Commenting, filling in form fields";
+ };
+ RadioButton RB_CHANGES_ANY_NOCOPY
+ {
+- Pos = MAP_APPFONT ( 18 , 198 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 12 , 111 ) ;
+ Size = MAP_APPFONT ( 152 , 10 ) ;
+ Text[ en-US ] = "~Any except extracting pages";
+ };
+
+ CheckBox CB_ENDAB_COPY
+ {
+- Pos = MAP_APPFONT ( 12 , 211 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 6 , 124 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "Ena~ble copying of content" ;
+@@ -661,7 +661,7 @@ TabPage RID_PDF_TAB_SECURITY
+
+ CheckBox CB_ENAB_ACCESS
+ {
+- Pos = MAP_APPFONT ( 12 , 224 ) ;
++ Pos = MAP_APPFONT ( PDF_COL2 + 6 , 137 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "Enable text access for acce~ssibility tools" ;
diff --git a/patches/dev300/recovery-dialog-reduce-height.diff b/patches/dev300/recovery-dialog-reduce-height.diff
new file mode 100644
index 0000000..9c5b44b
--- /dev/null
+++ b/patches/dev300/recovery-dialog-reduce-height.diff
@@ -0,0 +1,21 @@
+diff -rup svx-orig/source/dialog/docrecovery.hrc svx/source/dialog/docrecovery.hrc
+--- svx-orig/source/dialog/docrecovery.hrc 2010-07-30 12:17:00.000000000 +0200
++++ svx/source/dialog/docrecovery.hrc 2010-07-30 13:01:37.000000000 +0200
+@@ -36,7 +36,7 @@
+
+ // TabDialog
+ #define TABDLG_WIDTH 290
+-#define TABDLG_HEIGHT 278
++#define TABDLG_HEIGHT 278-48
+
+ // TabPage CrashSave
+
+@@ -52,7 +52,7 @@
+
+
+ #define SAVE_WIDTH 290
+-#define SAVE_HEIGHT 278
++#define SAVE_HEIGHT 278-48
+ #define SAVE_TITLEWINHEIGHT 36
+ #define SAVE_DESCRHEIGHT 48
+ #define SAVE_COL0 (RSC_SP_DLG_INNERBORDER_LEFT)
More information about the Libreoffice-commits
mailing list