From bd83b53d566bc7afd80f4fe8539dc2f9050d766b Mon Sep 17 00:00:00 2001 From: Chase Date: Fri, 22 Jul 2022 15:58:17 -0500 Subject: [PATCH] dtfile/dtcopy: remove duplicate icons --- cde/programs/dtfile/dtcopy/sharedFuncs.c | 55 +++++++----------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/cde/programs/dtfile/dtcopy/sharedFuncs.c b/cde/programs/dtfile/dtcopy/sharedFuncs.c index eea1a601c..53c9f9c02 100644 --- a/cde/programs/dtfile/dtcopy/sharedFuncs.c +++ b/cde/programs/dtfile/dtcopy/sharedFuncs.c @@ -90,41 +90,11 @@ /************************************************************************ * Bitmap Data for Default Symbol **********************************<->***********************************/ - -static unsigned char errorBits[] = { - 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0xf0, 0x3a, 0x00, 0x58, 0x55, 0x00, - 0x2c, 0xa0, 0x00, 0x56, 0x40, 0x01, 0xaa, 0x80, 0x02, 0x46, 0x81, 0x01, - 0x8a, 0x82, 0x02, 0x06, 0x85, 0x01, 0x0a, 0x8a, 0x02, 0x06, 0x94, 0x01, - 0x0a, 0xe8, 0x02, 0x14, 0x50, 0x01, 0x28, 0xb0, 0x00, 0xd0, 0x5f, 0x00, - 0xa0, 0x2a, 0x00, 0x40, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - -static unsigned char infoBits[] = { - 0x00, 0x00, 0x78, 0x00, 0x54, 0x00, 0x2c, 0x00, 0x54, 0x00, 0x28, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x2a, 0x00, 0x5c, 0x00, 0x28, 0x00, - 0x58, 0x00, 0x28, 0x00, 0x58, 0x00, 0x28, 0x00, 0x58, 0x00, 0x28, 0x00, - 0x58, 0x00, 0xae, 0x01, 0x56, 0x01, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00}; - -static unsigned char questionBits[] = { - 0xf0, 0x3f, 0x00, 0x58, 0x55, 0x00, 0xac, 0xaa, 0x00, 0xd6, 0x5f, 0x01, - 0xea, 0xbf, 0x02, 0xf6, 0x7f, 0x01, 0xea, 0xba, 0x02, 0xf6, 0x7d, 0x05, - 0xea, 0xba, 0x0a, 0x56, 0x7d, 0x15, 0xaa, 0xbe, 0x1e, 0x56, 0x5f, 0x01, - 0xac, 0xaf, 0x02, 0x58, 0x57, 0x01, 0xb0, 0xaf, 0x00, 0x60, 0x55, 0x01, - 0xa0, 0xaa, 0x00, 0x60, 0x17, 0x00, 0xa0, 0x2f, 0x00, 0x60, 0x17, 0x00, - 0xb0, 0x2a, 0x00, 0x50, 0x55, 0x00}; - -static unsigned char warningBits[] = { - 0x00, 0x00, 0x18, 0x00, 0x2c, 0x00, 0x56, 0x00, 0x2a, 0x00, 0x56, 0x00, - 0x2a, 0x00, 0x56, 0x00, 0x2c, 0x00, 0x14, 0x00, 0x2c, 0x00, 0x14, 0x00, - 0x2c, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x14, 0x00, - 0x2c, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00}; - -static unsigned char workingBits[] = { - 0x00, 0x00, 0x00, 0xfe, 0xff, 0x0f, 0xaa, 0xaa, 0x0a, 0x44, 0x55, 0x06, - 0xcc, 0x2a, 0x02, 0x44, 0x55, 0x06, 0xcc, 0x2a, 0x02, 0x84, 0x15, 0x06, - 0x8c, 0x2a, 0x02, 0x04, 0x15, 0x06, 0x0c, 0x0a, 0x02, 0x04, 0x06, 0x06, - 0x0c, 0x0b, 0x02, 0x84, 0x15, 0x06, 0xcc, 0x2a, 0x02, 0x44, 0x55, 0x06, - 0xcc, 0x2a, 0x02, 0x44, 0x55, 0x06, 0xcc, 0x2a, 0x02, 0x44, 0x55, 0x06, - 0xfe, 0xff, 0x0f, 0x56, 0x55, 0x05, 0x00, 0x00, 0x00}; +#include +#include +#include +#include +#include Widget G_toplevel; int G_dialog_closed = FALSE; @@ -344,19 +314,24 @@ ImageInitialize( Display *display ) /* create and install the default images for the symbol */ - image = CreateDefaultImage (display, (char *)errorBits, 20, 20); + image = CreateDefaultImage (display, (char *)xm_error_bits, xm_error_width, + xm_error_height); XmInstallImage (image, "default_xm_error"); - image = CreateDefaultImage (display, (char *)infoBits, 11, 24); + image = CreateDefaultImage (display, (char *)xm_information_bits, + xm_information_width, xm_information_height); XmInstallImage (image, "default_xm_information"); - image = CreateDefaultImage (display, (char *)questionBits, 22, 22); + image = CreateDefaultImage (display, (char *)xm_question_bits, + xm_question_width, xm_question_height); XmInstallImage (image, "default_xm_question"); - image = CreateDefaultImage (display, (char *)warningBits, 9, 22); + image = CreateDefaultImage (display, (char *)xm_warning_bits, + xm_warning_width, xm_warning_height); XmInstallImage (image, "default_xm_warning"); - image = CreateDefaultImage (display, (char *)workingBits, 21, 23); + image = CreateDefaultImage (display, (char *)xm_working_bits, + xm_working_width, xm_working_height); XmInstallImage (image, "default_xm_working"); return ;