#85520# change import fonts behaviour

1 files changed, 63 insertions, 45 deletions

diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc
index 33644608118b..c39a48b925be 100644
--- a/padmin/source/padialog.hrc
+++ b/padmin/source/padialog.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: padialog.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pl $ $Date: 2001-06-05 17:33:50 $
+ *  last change: $Author: pl $ $Date: 2001-06-06 13:54:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,7 +154,6 @@
 #define RID_QUERY_REMOVEDRIVER          1058
 #define RID_QUERY_REMOVEPRINTER         1059
 #define RID_QUERY_REMOVEFONTFROMLIST        1060
-#define RID_STR_REMOVE_MULTIPLE_FONTS       1061
 #define RID_QUERY_DRIVERUSED            1062
 #define RID_ERR_REMOVEDEFAULTDRIVER         1063
 #define RID_ERR_WRITEFONTSDIR           1064
@@ -165,7 +164,7 @@
 #define RID_FIMP_EDT_FROM                       3
 #define RID_FIMP_BTN_FROM                       4
 #define RID_FIMP_GRP_FROM                       5
-#define RID_FIMP_BTN_REMOVE                     6
+#define RID_FIMP_BTN_SELECTALL                  6
 #define RID_FIMP_BOX_NEWFONTS                   7
 #define RID_FIMP_TXT_HELP                        8
 #define RID_FIMP_STR_IMPORTOP                   9
@@ -179,52 +178,71 @@
 #define RID_FIMP_STR_NUMBEROFFONTSIMPORTED      17
 #define RID_FIMP_BOX_LINKONLY                    18
 
-#define RID_TXT_IMPORTTITLE                 1066
+#define RID_TXT_IMPORTTITLE                      1066
 #define RID_TXT_FONTS2IMPORT                    1067
-#define RID_TXT_TESTPAGE_MODEL              1068
-#define RID_TXT_TESTPAGE_QUEUE              1069
-#define RID_TXT_TESTPAGE_DATE               1070
-#define RID_TXT_TESTPAGE_TIME               1071
+#define RID_TXT_TESTPAGE_MODEL                   1068
+#define RID_TXT_TESTPAGE_QUEUE                   1069
+#define RID_TXT_TESTPAGE_DATE                    1070
+#define RID_TXT_TESTPAGE_TIME                    1071
 #define RID_TXT_PRINTERALREADYEXISTS            1072
-#define RID_TXT_PRINTERWITHOUTCOMMAND       1073
+#define RID_TXT_PRINTERWITHOUTCOMMAND            1073
 #define RID_TXT_PRINTERADDFAILED                1074
-#define RID_TXT_DRIVERDOESNOTEXIST          1075
+#define RID_TXT_DRIVERDOESNOTEXIST               1075
 #define RID_TXT_TESTPAGE_COMMENT                1076
-#define RID_TXT_TESTPAGE_NAME               1077
+#define RID_TXT_TESTPAGE_NAME                    1077
 
-#define RID_AFMERROR_OK                     1300
-#define RID_AFMERROR_NO_FONT_NAME           1301
-#define RID_AFMERROR_NO_FULL_NAME           1302
-#define RID_AFMERROR_NO_FAMILY_NAME         1303
-#define RID_AFMERROR_MOVETO_FAILED          1304
-#define RID_AFMERROR_STREAM_READ_FAILED     1305
-#define RID_AFMERROR_STREAM_WRITE_FAILED    1306
-#define RID_AFMERROR_NOT_A_METRIC           1307
+#define RID_TXT_FONT_ITALIC                  1078
+#define RID_TXT_FONT_OBLIQUE                     1079
+#define RID_TXT_FONT_THIN                        1080
+#define RID_TXT_FONT_ULTRALIGHT              1081
+#define RID_TXT_FONT_LIGHT                       1082
+#define RID_TXT_FONT_SEMILIGHT                   1083
+#define RID_TXT_FONT_SEMIBOLD                    1084
+#define RID_TXT_FONT_BOLD                        1085
+#define RID_TXT_FONT_ULTRABOLD                   1086
+#define RID_TXT_FONT_ULTRACONDENSED          1087
+#define RID_TXT_FONT_EXTRACONDENSED          1088
+#define RID_TXT_FONT_CONDENSED                   1089
+#define RID_TXT_FONT_SEMICONDENSED              1090
+#define RID_TXT_FONT_SEMIEXPANDED                1091
+#define RID_TXT_FONT_EXPANDED                    1092
+#define RID_TXT_FONT_EXTRAEXPANDED               1093
+#define RID_TXT_FONT_ULTRAEXPANDED               1094
+#define RID_TXT_FONT_REGULAR                     1095
 
-#define RID_AFMERROR_BOX_TXT                1350
+#define RID_AFMERROR_OK                         1300
+#define RID_AFMERROR_NO_FONT_NAME               1301
+#define RID_AFMERROR_NO_FULL_NAME               1302
+#define RID_AFMERROR_NO_FAMILY_NAME             1303
+#define RID_AFMERROR_MOVETO_FAILED              1304
+#define RID_AFMERROR_STREAM_READ_FAILED         1305
+#define RID_AFMERROR_STREAM_WRITE_FAILED        1306
+#define RID_AFMERROR_NOT_A_METRIC               1307
 
-#define RID_PROGRESS_DLG                    1400
-#define RID_PROGRESS_BTN_CANCEL                1
-#define RID_PROGRESS_OPERATION_TXT             2
-#define RID_PROGRESS_PROGRESS_TXT              3
-#define RID_PROGRESS_STATUSBAR                 5
-#define RID_PROGRESS_FILENAME_TXT              6
+#define RID_AFMERROR_BOX_TXT                    1350
 
-#define RID_OPERATION_FONTINTEGRATE         1402
-#define RID_OPERATION_FONTADD               1403
-#define RID_OPERATION_CONVERTMETRIC         1406
-#define RID_OPERATION_FONTCOLLECT           1407
-#define RID_OPERATION_FONTIMPORT             1408
+#define RID_PROGRESS_DLG                        1400
+#define RID_PROGRESS_BTN_CANCEL                 1
+#define RID_PROGRESS_OPERATION_TXT              2
+#define RID_PROGRESS_PROGRESS_TXT               3
+#define RID_PROGRESS_STATUSBAR                  5
+#define RID_PROGRESS_FILENAME_TXT               6
+
+#define RID_OPERATION_FONTINTEGRATE             1402
+#define RID_OPERATION_FONTADD                   1403
+#define RID_OPERATION_CONVERTMETRIC             1406
+#define RID_OPERATION_FONTCOLLECT               1407
+#define RID_OPERATION_FONTIMPORT                1408
 
 #define RID_ADD_PRINTER_DIALOG                  2000
-#define RID_ADDP_BTN_FINISH                 1
-#define RID_ADDP_BTN_CANCEL                 2
+#define RID_ADDP_BTN_FINISH                     1
+#define RID_ADDP_BTN_CANCEL                     2
 #define RID_ADDP_BTN_NEXT                       3
 #define RID_ADDP_BTN_PREV                       4
 #define RID_ADDP_LINE                           5
 
-#define RID_ADDP_PAGE_CHOOSEDEV             2001
-#define RID_ADDP_CHDEV_TXT_OVER             1
+#define RID_ADDP_PAGE_CHOOSEDEV                 2001
+#define RID_ADDP_CHDEV_TXT_OVER                 1
 #define RID_ADDP_CHDEV_BTN_PRINTER              2
 #define RID_ADDP_CHDEV_BTN_FAX                  3
 #define RID_ADDP_CHDEV_BTN_PDF                  4
@@ -253,25 +271,25 @@
 #define RID_ADDP_CMD_BTN_HELP                   3
 #define RID_ADDP_CMD_STR_FAXHELP                4
 #define RID_ADDP_CMD_STR_PDFHELP                5
-#define RID_ADDP_CMD_TXT_PDFDIR             6
-#define RID_ADDP_CMD_EDT_PDFDIR             7
-#define RID_ADDP_CMD_BTN_PDFDIR             8
-#define RID_ADDP_CMD_BOX_PDFCOMMAND         9
+#define RID_ADDP_CMD_TXT_PDFDIR                 6
+#define RID_ADDP_CMD_EDT_PDFDIR                 7
+#define RID_ADDP_CMD_BTN_PDFDIR                 8
+#define RID_ADDP_CMD_BOX_PDFCOMMAND             9
 
 #define RID_ADDP_PAGE_OLDPRINTERS               2005
 #define RID_ADDP_OLD_TXT_PRINTERS               1
 #define RID_ADDP_OLD_BOX_PRINTERS               2
-#define RID_ADDP_OLD_BTN_REMOVE             3
+#define RID_ADDP_OLD_BTN_REMOVE                 3
 #define RID_ADDP_OLD_BTN_RESTORE                4
 
-#define RID_ADDP_PAGE_FAXDRIVER             2006
+#define RID_ADDP_PAGE_FAXDRIVER                 2006
 #define RID_ADDP_FAXDRV_TXT_DRIVER              1
-#define RID_ADDP_FAXDRV_BTN_DEFAULT         2
+#define RID_ADDP_FAXDRV_BTN_DEFAULT             2
 #define RID_ADDP_FAXDRV_BTN_SELECT              3
 
-#define RID_ADDP_PAGE_PDFDRIVER             2007
+#define RID_ADDP_PAGE_PDFDRIVER                 2007
 #define RID_ADDP_PDFDRV_TXT_DRIVER              1
-#define RID_ADDP_PDFDRV_BTN_DEFAULT         2
+#define RID_ADDP_PDFDRV_BTN_DEFAULT             2
 #define RID_ADDP_PDFDRV_BTN_DIST                3
 #define RID_ADDP_PDFDRV_BTN_SELECT              4