tools: unify import dialog

tools/gresources.c

@@ -7,7 +7,7 @@
 #endif
 
 #ifdef _MSC_VER
-static const SECTION union { const guint8 data[42219]; const double alignment; void * const ptr;}  gresources_resource_data = { {
+static const SECTION union { const guint8 data[42187]; const double alignment; void * const ptr;}  gresources_resource_data = { {
   0107, 0126, 0141, 0162, 0151, 0141, 0156, 0164, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 
   0030, 0000, 0000, 0000, 0200, 0004, 0000, 0000, 0000, 0000, 0000, 0050, 0050, 0000, 0000, 0000, 
   0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0002, 0000, 0000, 0000, 
@@ -63,23 +63,23 @@ static const SECTION union { const guint8 data[42219]; const double alignment; v
   0140, 0220, 0000, 0000, 0231, 0223, 0000, 0000, 0165, 0177, 0133, 0047, 0015, 0000, 0000, 0000, 
   0231, 0223, 0000, 0000, 0016, 0000, 0166, 0000, 0250, 0223, 0000, 0000, 0245, 0224, 0000, 0000, 
   0115, 0242, 0351, 0242, 0005, 0000, 0000, 0000, 0245, 0224, 0000, 0000, 0020, 0000, 0166, 0000, 
-  0270, 0224, 0000, 0000, 0171, 0227, 0000, 0000, 0326, 0162, 0303, 0002, 0016, 0000, 0000, 0000, 
-  0171, 0227, 0000, 0000, 0006, 0000, 0114, 0000, 0200, 0227, 0000, 0000, 0204, 0227, 0000, 0000, 
-  0317, 0377, 0014, 0355, 0024, 0000, 0000, 0000, 0204, 0227, 0000, 0000, 0012, 0000, 0166, 0000, 
-  0220, 0227, 0000, 0000, 0157, 0232, 0000, 0000, 0170, 0166, 0214, 0371, 0016, 0000, 0000, 0000, 
-  0157, 0232, 0000, 0000, 0010, 0000, 0114, 0000, 0170, 0232, 0000, 0000, 0174, 0232, 0000, 0000, 
-  0301, 0005, 0341, 0067, 0015, 0000, 0000, 0000, 0174, 0232, 0000, 0000, 0020, 0000, 0166, 0000, 
-  0220, 0232, 0000, 0000, 0276, 0233, 0000, 0000, 0362, 0340, 0137, 0224, 0015, 0000, 0000, 0000, 
-  0276, 0233, 0000, 0000, 0016, 0000, 0166, 0000, 0320, 0233, 0000, 0000, 0226, 0234, 0000, 0000, 
-  0113, 0120, 0220, 0013, 0017, 0000, 0000, 0000, 0226, 0234, 0000, 0000, 0004, 0000, 0114, 0000, 
-  0234, 0234, 0000, 0000, 0240, 0234, 0000, 0000, 0035, 0311, 0006, 0227, 0016, 0000, 0000, 0000, 
-  0240, 0234, 0000, 0000, 0006, 0000, 0114, 0000, 0250, 0234, 0000, 0000, 0254, 0234, 0000, 0000, 
-  0355, 0230, 0053, 0240, 0045, 0000, 0000, 0000, 0254, 0234, 0000, 0000, 0012, 0000, 0166, 0000, 
-  0270, 0234, 0000, 0000, 0071, 0241, 0000, 0000, 0116, 0277, 0156, 0371, 0016, 0000, 0000, 0000, 
-  0071, 0241, 0000, 0000, 0006, 0000, 0114, 0000, 0100, 0241, 0000, 0000, 0104, 0241, 0000, 0000, 
-  0177, 0264, 0000, 0216, 0015, 0000, 0000, 0000, 0104, 0241, 0000, 0000, 0017, 0000, 0166, 0000, 
-  0130, 0241, 0000, 0000, 0137, 0243, 0000, 0000, 0307, 0202, 0155, 0222, 0015, 0000, 0000, 0000, 
-  0137, 0243, 0000, 0000, 0015, 0000, 0166, 0000, 0160, 0243, 0000, 0000, 0352, 0244, 0000, 0000, 
+  0270, 0224, 0000, 0000, 0127, 0227, 0000, 0000, 0326, 0162, 0303, 0002, 0016, 0000, 0000, 0000, 
+  0127, 0227, 0000, 0000, 0006, 0000, 0114, 0000, 0140, 0227, 0000, 0000, 0144, 0227, 0000, 0000, 
+  0317, 0377, 0014, 0355, 0024, 0000, 0000, 0000, 0144, 0227, 0000, 0000, 0012, 0000, 0166, 0000, 
+  0160, 0227, 0000, 0000, 0117, 0232, 0000, 0000, 0170, 0166, 0214, 0371, 0016, 0000, 0000, 0000, 
+  0117, 0232, 0000, 0000, 0010, 0000, 0114, 0000, 0130, 0232, 0000, 0000, 0134, 0232, 0000, 0000, 
+  0301, 0005, 0341, 0067, 0015, 0000, 0000, 0000, 0134, 0232, 0000, 0000, 0020, 0000, 0166, 0000, 
+  0160, 0232, 0000, 0000, 0236, 0233, 0000, 0000, 0362, 0340, 0137, 0224, 0015, 0000, 0000, 0000, 
+  0236, 0233, 0000, 0000, 0016, 0000, 0166, 0000, 0260, 0233, 0000, 0000, 0166, 0234, 0000, 0000, 
+  0113, 0120, 0220, 0013, 0017, 0000, 0000, 0000, 0166, 0234, 0000, 0000, 0004, 0000, 0114, 0000, 
+  0174, 0234, 0000, 0000, 0200, 0234, 0000, 0000, 0035, 0311, 0006, 0227, 0016, 0000, 0000, 0000, 
+  0200, 0234, 0000, 0000, 0006, 0000, 0114, 0000, 0210, 0234, 0000, 0000, 0214, 0234, 0000, 0000, 
+  0355, 0230, 0053, 0240, 0045, 0000, 0000, 0000, 0214, 0234, 0000, 0000, 0012, 0000, 0166, 0000, 
+  0230, 0234, 0000, 0000, 0031, 0241, 0000, 0000, 0116, 0277, 0156, 0371, 0016, 0000, 0000, 0000, 
+  0031, 0241, 0000, 0000, 0006, 0000, 0114, 0000, 0040, 0241, 0000, 0000, 0044, 0241, 0000, 0000, 
+  0177, 0264, 0000, 0216, 0015, 0000, 0000, 0000, 0044, 0241, 0000, 0000, 0017, 0000, 0166, 0000, 
+  0070, 0241, 0000, 0000, 0077, 0243, 0000, 0000, 0307, 0202, 0155, 0222, 0015, 0000, 0000, 0000, 
+  0077, 0243, 0000, 0000, 0015, 0000, 0166, 0000, 0120, 0243, 0000, 0000, 0312, 0244, 0000, 0000, 
   0147, 0141, 0155, 0145, 0055, 0163, 0164, 0157, 0160, 0056, 0160, 0156, 0147, 0000, 0000, 0000, 
   0253, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0211, 0120, 0116, 0107, 0015, 0012, 0032, 0012, 
   0000, 0000, 0000, 0015, 0111, 0110, 0104, 0122, 0000, 0000, 0000, 0020, 0000, 0000, 0000, 0020, 
@@ -2387,51 +2387,49 @@ static const SECTION union { const guint8 data[42219]; const double alignment; v
   0252, 0035, 0370, 0164, 0060, 0360, 0006, 0000, 0000, 0074, 0060, 0026, 0254, 0352, 0230, 0257, 
   0057, 0000, 0000, 0000, 0000, 0111, 0105, 0116, 0104, 0256, 0102, 0140, 0202, 0000, 0000, 0050, 
   0165, 0165, 0141, 0171, 0051, 0154, 0145, 0166, 0145, 0154, 0137, 0145, 0144, 0151, 0164, 0157, 
-  0162, 0056, 0170, 0155, 0154, 0000, 0000, 0000, 0102, 0015, 0000, 0000, 0001, 0000, 0000, 0000, 
-  0170, 0332, 0215, 0227, 0113, 0162, 0333, 0060, 0014, 0206, 0367, 0075, 0205, 0207, 0173, 0306, 
-  0166, 0333, 0314, 0244, 0063, 0116, 0262, 0353, 0011, 0332, 0003, 0120, 0024, 0054, 0261, 0245, 
-  0010, 0226, 0017, 0073, 0276, 0175, 0111, 0111, 0211, 0355, 0210, 0017, 0355, 0054, 0375, 0237, 
-  0100, 0020, 0004, 0010, 0370, 0360, 0372, 0066, 0310, 0315, 0011, 0214, 0025, 0250, 0236, 0311, 
-  0376, 0141, 0107, 0066, 0240, 0070, 0266, 0102, 0165, 0317, 0344, 0367, 0257, 0237, 0364, 0211, 
-  0274, 0276, 0174, 0071, 0170, 0361, 0162, 0030, 0100, 0371, 0206, 0231, 0215, 0142, 0003, 0074, 
-  0223, 0371, 0211, 0114, 0357, 0067, 0214, 0273, 0321, 0102, 0174, 0240, 0107, 0041, 0141, 0026, 
-  0204, 0203, 0341, 0103, 0124, 0160, 0246, 0022, 0116, 0040, 0311, 0066, 0241, 0242, 0006, 0125, 
-  0223, 0265, 0301, 0077, 0300, 0135, 0022, 0260, 0354, 0004, 0131, 0201, 0062, 0033, 0065, 0013, 
-  0232, 0031, 0346, 0320, 0154, 0077, 0371, 0055, 0006, 0215, 0306, 0245, 0234, 0236, 0024, 0152, 
-  0265, 0011, 0257, 0155, 0162, 0201, 0031, 0031, 0300, 0366, 0145, 0302, 0242, 0127, 0155, 0221, 
-  0160, 0360, 0346, 0274, 0231, 0254, 0154, 0043, 0264, 0364, 0371, 0356, 0063, 0155, 0340, 0010, 
-  0046, 0034, 0031, 0044, 0367, 0167, 0307, 0266, 0240, 0045, 0136, 0252, 0330, 0277, 0360, 0170, 
-  0263, 0374, 0362, 0170, 0241, 0025, 0311, 0110, 0205, 0275, 0141, 0162, 0157, 0006, 0046, 0241, 
-  0354, 0235, 0327, 0122, 0160, 0346, 0322, 0147, 0330, 0202, 0204, 0111, 0052, 0207, 0103, 0062, 
-  0236, 0066, 0060, 0140, 0046, 0073, 0014, 0272, 0334, 0242, 0226, 0063, 0131, 0137, 0323, 0052, 
-  0246, 0251, 0001, 0311, 0234, 0310, 0045, 0140, 0044, 0130, 0143, 0121, 0372, 0025, 0173, 0370, 
-  0070, 0121, 0152, 0057, 0066, 0010, 0124, 0142, 0360, 0203, 0254, 0102, 0317, 0150, 0144, 0273, 
-  0316, 0143, 0207, 0264, 0063, 0242, 0055, 0126, 0305, 0170, 0334, 0043, 0225, 0260, 0022, 0337, 
-  0123, 0333, 0343, 0271, 0272, 0336, 0110, 0162, 0157, 0035, 0016, 0353, 0330, 0335, 0303, 0236, 
-  0024, 0304, 0257, 0045, 0361, 0061, 0057, 0026, 0214, 0026, 0114, 0076, 0026, 0213, 0141, 0114, 
-  0237, 0360, 0110, 0143, 0120, 0111, 0056, 0277, 0336, 0201, 0265, 0121, 0270, 0377, 0150, 0117, 
-  0126, 0060, 0217, 0053, 0240, 0157, 0273, 0025, 0320, 0367, 0065, 0226, 0176, 0254, 0261, 0264, 
-  0177, 0332, 0335, 0304, 0056, 0033, 0102, 0156, 0040, 0126, 0140, 0112, 0012, 0227, 0356, 0040, 
-  0142, 0135, 0131, 0222, 0274, 0374, 0146, 0065, 0204, 0265, 0111, 0227, 0336, 0025, 0261, 0272, 
-  0017, 0265, 0122, 0201, 0070, 0252, 0052, 0162, 0221, 0102, 0265, 0140, 0052, 0130, 0270, 0211, 
-  0046, 0123, 0067, 0333, 0276, 0103, 0171, 0150, 0243, 0206, 0045, 0255, 0110, 0321, 0365, 0231, 
-  0036, 0027, 0033, 0110, 0154, 0043, 0206, 0103, 0061, 0055, 0147, 0353, 0331, 0165, 0351, 0111, 
-  0204, 0146, 0254, 0103, 0343, 0327, 0241, 0237, 0316, 0027, 0127, 0061, 0045, 0157, 0277, 0073, 
-  0032, 0124, 0151, 0007, 0157, 0251, 0206, 0361, 0277, 0125, 0310, 0144, 0367, 0172, 0113, 0111, 
-  0070, 0326, 0041, 0207, 0272, 0356, 0023, 0272, 0271, 0376, 0262, 0241, 0213, 0134, 0262, 0220, 
-  0141, 0212, 0073, 0345, 0075, 0242, 0315, 0046, 0300, 0070, 0240, 0320, 0306, 0340, 0071, 0307, 
-  0204, 0044, 0013, 0255, 0240, 0036, 0361, 0243, 0227, 0322, 0206, 0342, 0000, 0265, 0242, 0265, 
-  0067, 0276, 0013, 0115, 0050, 0046, 0346, 0265, 0011, 0144, 0060, 0335, 0137, 0254, 0340, 0366, 
-  0312, 0345, 0073, 0275, 0352, 0204, 0202, 0114, 0060, 0034, 0063, 0156, 0105, 0063, 0223, 0310, 
-  0132, 0052, 0075, 0053, 0337, 0242, 0136, 0245, 0126, 0011, 0003, 0227, 0053, 0214, 0204, 0341, 
-  0053, 0332, 0205, 0303, 0055, 0232, 0356, 0101, 0046, 0357, 0345, 0201, 0051, 0237, 0155, 0253, 
-  0343, 0054, 0046, 0254, 0365, 0365, 0123, 0232, 0306, 0126, 0026, 0035, 0305, 0256, 0136, 0105, 
-  0075, 0123, 0035, 0314, 0344, 0102, 0145, 0015, 0172, 0367, 0371, 0312, 0014, 0123, 0366, 0313, 
-  0301, 0041, 0312, 0353, 0360, 0075, 0077, 0221, 0351, 0175, 0172, 0002, 0132, 0050, 0357, 0023, 
-  0320, 0102, 0270, 0116, 0100, 0013, 0051, 0071, 0001, 0055, 0251, 0317, 0023, 0120, 0232, 0310, 
-  0115, 0100, 0113, 0207, 0262, 0023, 0120, 0035, 0115, 0116, 0100, 0151, 0177, 0062, 0023, 0320, 
-  0002, 0276, 0317, 0302, 0355, 0034, 0374, 0360, 0053, 0374, 0053, 0372, 0362, 0037, 0006, 0151, 
-  0305, 0277, 0000, 0050, 0165, 0165, 0141, 0171, 0051, 0066, 0064, 0170, 0066, 0064, 0057, 0000, 
+  0162, 0056, 0170, 0155, 0154, 0000, 0000, 0000, 0265, 0014, 0000, 0000, 0001, 0000, 0000, 0000, 
+  0170, 0332, 0215, 0227, 0315, 0162, 0333, 0040, 0020, 0307, 0357, 0171, 0012, 0217, 0356, 0044, 
+  0166, 0133, 0317, 0244, 0063, 0266, 0163, 0353, 0023, 0264, 0017, 0200, 0320, 0132, 0242, 0105, 
+  0054, 0345, 0303, 0256, 0337, 0276, 0213, 0245, 0304, 0166, 0004, 0102, 0227, 0114, 0320, 0377, 
+  0307, 0262, 0054, 0054, 0273, 0336, 0275, 0375, 0353, 0325, 0352, 0004, 0326, 0111, 0324, 0373, 
+  0152, 0363, 0274, 0256, 0126, 0240, 0005, 0066, 0122, 0267, 0373, 0352, 0327, 0317, 0037, 0354, 
+  0265, 0172, 0073, 0074, 0355, 0202, 0074, 0354, 0172, 0320, 0241, 0346, 0166, 0245, 0171, 0017, 
+  0373, 0152, 0034, 0125, 0303, 0367, 0025, 0027, 0376, 0152, 0041, 0016, 0330, 0121, 0052, 0030, 
+  0005, 0351, 0241, 0377, 0020, 0065, 0234, 0231, 0202, 0023, 0250, 0352, 0045, 0241, 0242, 0001, 
+  0135, 0222, 0215, 0305, 0337, 0040, 0174, 0022, 0160, 0374, 0004, 0131, 0201, 0161, 0027, 0065, 
+  0007, 0206, 0133, 0356, 0321, 0246, 0070, 0331, 0033, 0264, 0276, 0210, 0031, 0013, 0107, 0260, 
+  0024, 0045, 0050, 0233, 0154, 0300, 0050, 0274, 0024, 0261, 0277, 0064, 0214, 0320, 0113, 0124, 
+  0122, 0021, 0205, 0206, 0200, 0304, 0304, 0240, 0033, 0114, 0356, 0331, 0302, 0040, 0314, 0173, 
+  0027, 0214, 0222, 0202, 0373, 0164, 0330, 0032, 0120, 0060, 0110, 0363, 0341, 0120, 0134, 0244, 
+  0015, 0364, 0230, 0071, 0020, 0213, 0076, 0267, 0250, 0023, 0134, 0225, 0327, 0164, 0232, 0033, 
+  0146, 0101, 0161, 0057, 0163, 0147, 0036, 0011, 0136, 0073, 0124, 0141, 0301, 0036, 0076, 0116, 
+  0224, 0271, 0213, 0043, 0201, 0051, 0044, 0077, 0252, 0105, 0350, 0031, 0255, 0152, 0226, 0171, 
+  0354, 0221, 0265, 0126, 0046, 0341, 0307, 0343, 0276, 0122, 0011, 0053, 0361, 0073, 0163, 0035, 
+  0236, 0213, 0353, 0135, 0111, 0021, 0234, 0307, 0176, 0031, 0273, 0176, 0336, 0124, 0063, 0342, 
+  0227, 0071, 0161, 0233, 0027, 0147, 0214, 0316, 0230, 0334, 0316, 0046, 0303, 0365, 0372, 0320, 
+  0220, 0305, 0240, 0126, 0271, 0373, 0365, 0016, 0054, 0215, 0302, 0343, 0244, 0115, 0265, 0200, 
+  0331, 0056, 0200, 0276, 0256, 0027, 0100, 0337, 0226, 0130, 0372, 0276, 0304, 0322, 0346, 0165, 
+  0175, 0027, 0273, 0154, 0010, 0205, 0205, 0230, 0201, 0051, 0311, 0130, 0331, 0313, 0230, 0127, 
+  0256, 0112, 0076, 0176, 0243, 0112, 0141, 0255, 0323, 0251, 0167, 0103, 0234, 0351, 0050, 0127, 
+  0012, 0220, 0100, 0135, 0104, 0056, 0112, 0352, 0006, 0154, 0001, 0243, 0227, 0150, 0060, 0165, 
+  0267, 0355, 0007, 0124, 0120, 0345, 0262, 0074, 0151, 0105, 0311, 0266, 0313, 0224, 0025, 0244, 
+  0107, 0226, 0321, 0137, 0053, 0140, 0366, 0132, 0216, 0326, 0263, 0353, 0262, 0223, 0244, 0372, 
+  0147, 0250, 0326, 0032, 0052, 0141, 0343, 0303, 0065, 0173, 0045, 0357, 0347, 0035, 0055, 0352, 
+  0264, 0203, 0367, 0124, 0315, 0305, 0237, 0042, 0144, 0263, 0173, 0275, 0247, 0024, 0034, 0313, 
+  0220, 0107, 0123, 0366, 0011, 0375, 0230, 0177, 0331, 0320, 0105, 0056, 0231, 0310, 0060, 0304, 
+  0235, 0211, 0016, 0321, 0145, 0057, 0300, 0265, 0047, 0140, 0265, 0305, 0163, 0216, 0241, 0113, 
+  0106, 0245, 0240, 0034, 0361, 0143, 0120, 0312, 0121, 0162, 0200, 0136, 0120, 0332, 0353, 0320, 
+  0122, 0021, 0212, 0027, 0363, 0126, 0004, 0062, 0230, 0351, 0056, 0116, 0012, 0167, 0343, 0362, 
+  0225, 0136, 0267, 0122, 0103, 0046, 0030, 0236, 0057, 0350, 0117, 0250, 0056, 0042, 0157, 0230, 
+  0012, 0174, 0376, 0025, 0015, 0072, 0265, 0212, 0247, 0125, 0146, 0272, 0060, 0232, 0305, 0132, 
+  0072, 0334, 0131, 0323, 0035, 0250, 0344, 0273, 0334, 0163, 0035, 0262, 0145, 0065, 0366, 0136, 
+  0114, 0072, 0027, 0312, 0247, 0064, 0164, 0212, 0074, 0072, 0212, 0155, 0071, 0213, 0072, 0256, 
+  0133, 0030, 0311, 0211, 0312, 0153, 0014, 0376, 0363, 0223, 0111, 0215, 0355, 0141, 0347, 0021, 
+  0325, 0255, 0337, 0035, 0107, 0325, 0360, 0075, 0335, 0001, 0115, 0224, 0367, 0016, 0150, 0042, 
+  0334, 0072, 0240, 0211, 0224, 0354, 0200, 0246, 0324, 0347, 0016, 0050, 0115, 0344, 0072, 0240, 
+  0251, 0103, 0331, 0016, 0250, 0214, 0046, 0073, 0240, 0264, 0077, 0231, 0016, 0150, 0002, 0077, 
+  0336, 0302, 0227, 0061, 0370, 0364, 0037, 0375, 0020, 0171, 0372, 0017, 0175, 0232, 0221, 0300, 
+  0000, 0050, 0165, 0165, 0141, 0171, 0051, 0066, 0064, 0170, 0066, 0064, 0057, 0000, 0000, 0000, 
   0021, 0000, 0000, 0000, 0160, 0145, 0160, 0160, 0145, 0162, 0056, 0160, 0156, 0147, 0000, 0000, 
   0317, 0002, 0000, 0000, 0000, 0000, 0000, 0000, 0211, 0120, 0116, 0107, 0015, 0012, 0032, 0012, 
   0000, 0000, 0000, 0015, 0111, 0110, 0104, 0122, 0000, 0000, 0000, 0020, 0000, 0000, 0000, 0020, 
@@ -2649,7 +2647,7 @@ static const SECTION union { const guint8 data[42219]; const double alignment; v
   0140, 0202, 0000, 0000, 0050, 0165, 0165, 0141, 0171, 0051
 } };
 #else /* _MSC_VER */
-static const SECTION union { const guint8 data[42219]; const double alignment; void * const ptr;}  gresources_resource_data = {
+static const SECTION union { const guint8 data[42187]; const double alignment; void * const ptr;}  gresources_resource_data = {
   "\107\126\141\162\151\141\156\164\000\000\000\000\000\000\000\000"
   "\030\000\000\000\200\004\000\000\000\000\000\050\050\000\000\000"
   "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000"
@@ -2705,23 +2703,23 @@ static const SECTION union { const guint8 data[42219]; const double alignment; v
   "\140\220\000\000\231\223\000\000\165\177\133\047\015\000\000\000"
   "\231\223\000\000\016\000\166\000\250\223\000\000\245\224\000\000"
   "\115\242\351\242\005\000\000\000\245\224\000\000\020\000\166\000"
-  "\270\224\000\000\171\227\000\000\326\162\303\002\016\000\000\000"
-  "\171\227\000\000\006\000\114\000\200\227\000\000\204\227\000\000"
-  "\317\377\014\355\024\000\000\000\204\227\000\000\012\000\166\000"
-  "\220\227\000\000\157\232\000\000\170\166\214\371\016\000\000\000"
-  "\157\232\000\000\010\000\114\000\170\232\000\000\174\232\000\000"
-  "\301\005\341\067\015\000\000\000\174\232\000\000\020\000\166\000"
-  "\220\232\000\000\276\233\000\000\362\340\137\224\015\000\000\000"
-  "\276\233\000\000\016\000\166\000\320\233\000\000\226\234\000\000"
-  "\113\120\220\013\017\000\000\000\226\234\000\000\004\000\114\000"
-  "\234\234\000\000\240\234\000\000\035\311\006\227\016\000\000\000"
-  "\240\234\000\000\006\000\114\000\250\234\000\000\254\234\000\000"
-  "\355\230\053\240\045\000\000\000\254\234\000\000\012\000\166\000"
-  "\270\234\000\000\071\241\000\000\116\277\156\371\016\000\000\000"
-  "\071\241\000\000\006\000\114\000\100\241\000\000\104\241\000\000"
-  "\177\264\000\216\015\000\000\000\104\241\000\000\017\000\166\000"
-  "\130\241\000\000\137\243\000\000\307\202\155\222\015\000\000\000"
-  "\137\243\000\000\015\000\166\000\160\243\000\000\352\244\000\000"
+  "\270\224\000\000\127\227\000\000\326\162\303\002\016\000\000\000"
+  "\127\227\000\000\006\000\114\000\140\227\000\000\144\227\000\000"
+  "\317\377\014\355\024\000\000\000\144\227\000\000\012\000\166\000"
+  "\160\227\000\000\117\232\000\000\170\166\214\371\016\000\000\000"
+  "\117\232\000\000\010\000\114\000\130\232\000\000\134\232\000\000"
+  "\301\005\341\067\015\000\000\000\134\232\000\000\020\000\166\000"
+  "\160\232\000\000\236\233\000\000\362\340\137\224\015\000\000\000"
+  "\236\233\000\000\016\000\166\000\260\233\000\000\166\234\000\000"
+  "\113\120\220\013\017\000\000\000\166\234\000\000\004\000\114\000"
+  "\174\234\000\000\200\234\000\000\035\311\006\227\016\000\000\000"
+  "\200\234\000\000\006\000\114\000\210\234\000\000\214\234\000\000"
+  "\355\230\053\240\045\000\000\000\214\234\000\000\012\000\166\000"
+  "\230\234\000\000\031\241\000\000\116\277\156\371\016\000\000\000"
+  "\031\241\000\000\006\000\114\000\040\241\000\000\044\241\000\000"
+  "\177\264\000\216\015\000\000\000\044\241\000\000\017\000\166\000"
+  "\070\241\000\000\077\243\000\000\307\202\155\222\015\000\000\000"
+  "\077\243\000\000\015\000\166\000\120\243\000\000\312\244\000\000"
   "\147\141\155\145\055\163\164\157\160\056\160\156\147\000\000\000"
   "\253\000\000\000\000\000\000\000\211\120\116\107\015\012\032\012"
   "\000\000\000\015\111\110\104\122\000\000\000\020\000\000\000\020"
@@ -5029,51 +5027,49 @@ static const SECTION union { const guint8 data[42219]; const double alignment; v
   "\252\035\370\164\060\360\006\000\000\074\060\026\254\352\230\257"
   "\057\000\000\000\000\111\105\116\104\256\102\140\202\000\000\050"
   "\165\165\141\171\051\154\145\166\145\154\137\145\144\151\164\157"
-  "\162\056\170\155\154\000\000\000\102\015\000\000\001\000\000\000"
-  "\170\332\215\227\113\162\333\060\014\206\367\075\205\207\173\306"
-  "\166\333\314\244\063\116\262\353\011\332\003\120\024\054\261\245"
-  "\010\226\017\073\276\175\111\111\211\355\210\017\355\054\375\237"
-  "\100\020\004\010\370\360\372\066\310\315\011\214\025\250\236\311"
-  "\376\141\107\066\240\070\266\102\165\317\344\367\257\237\364\211"
-  "\274\276\174\071\170\361\162\030\100\371\206\231\215\142\003\074"
-  "\223\371\211\114\357\067\214\273\321\102\174\240\107\041\141\026"
-  "\204\203\341\103\124\160\246\022\116\040\311\066\241\242\006\125"
-  "\223\265\301\077\300\135\022\260\354\004\131\201\062\033\065\013"
-  "\232\031\346\320\154\077\371\055\006\215\306\245\234\236\024\152"
-  "\265\011\257\155\162\201\031\031\300\366\145\302\242\127\155\221"
-  "\160\360\346\274\231\254\154\043\264\364\371\356\063\155\340\010"
-  "\046\034\031\044\367\167\307\266\240\045\136\252\330\277\360\170"
-  "\263\374\362\170\241\025\311\110\205\275\141\162\157\006\046\241"
-  "\354\235\327\122\160\346\322\147\330\202\204\111\052\207\103\062"
-  "\236\066\060\140\046\073\014\272\334\242\226\063\131\137\323\052"
-  "\246\251\001\311\234\310\045\140\044\130\143\121\372\025\173\370"
-  "\070\121\152\057\066\010\124\142\360\203\254\102\317\150\144\273"
-  "\316\143\207\264\063\242\055\126\305\170\334\043\225\260\022\337"
-  "\123\333\343\271\272\336\110\162\157\035\016\353\330\335\303\236"
-  "\024\304\257\045\361\061\057\026\214\026\114\076\026\213\141\114"
-  "\237\360\110\143\120\111\056\277\336\201\265\121\270\377\150\117"
-  "\126\060\217\053\240\157\273\025\320\367\065\226\176\254\261\264"
-  "\177\332\335\304\056\033\102\156\040\126\140\112\012\227\356\040"
-  "\142\135\131\222\274\374\146\065\204\265\111\227\336\025\261\272"
-  "\017\265\122\201\070\252\052\162\221\102\265\140\052\130\270\211"
-  "\046\123\067\333\276\103\171\150\243\206\045\255\110\321\365\231"
-  "\036\027\033\110\154\043\206\103\061\055\147\353\331\165\351\111"
-  "\204\146\254\103\343\327\241\237\316\027\127\061\045\157\277\073"
-  "\032\124\151\007\157\251\206\361\277\125\310\144\367\172\113\111"
-  "\070\326\041\207\272\356\023\272\271\376\262\241\213\134\262\220"
-  "\141\212\073\345\075\242\315\046\300\070\240\320\306\340\071\307"
-  "\204\044\013\255\240\036\361\243\227\322\206\342\000\265\242\265"
-  "\067\276\013\115\050\046\346\265\011\144\060\335\137\254\340\366"
-  "\312\345\073\275\352\204\202\114\060\034\063\156\105\063\223\310"
-  "\132\052\075\053\337\242\136\245\126\011\003\227\053\214\204\341"
-  "\053\332\205\303\055\232\356\101\046\357\345\201\051\237\155\253"
-  "\343\054\046\254\365\365\123\232\306\126\026\035\305\256\136\105"
-  "\075\123\035\314\344\102\145\015\172\367\371\312\014\123\366\313"
-  "\301\041\312\353\360\075\077\221\351\175\172\002\132\050\357\023"
-  "\320\102\270\116\100\013\051\071\001\055\251\317\023\120\232\310"
-  "\115\100\113\207\262\023\120\035\115\116\100\151\177\062\023\320"
-  "\002\276\317\302\355\034\374\360\053\374\053\372\362\037\006\151"
-  "\305\277\000\050\165\165\141\171\051\066\064\170\066\064\057\000"
+  "\162\056\170\155\154\000\000\000\265\014\000\000\001\000\000\000"
+  "\170\332\215\227\315\162\333\040\020\307\357\171\012\217\356\044"
+  "\166\133\317\244\063\266\163\353\023\264\017\200\320\132\242\105"
+  "\054\345\303\256\337\276\213\245\304\166\004\102\227\114\320\377"
+  "\307\262\054\054\273\336\275\375\353\325\352\004\326\111\324\373"
+  "\152\363\274\256\126\240\005\066\122\267\373\352\327\317\037\354"
+  "\265\172\073\074\355\202\074\354\172\320\241\346\166\245\171\017"
+  "\373\152\034\125\303\367\025\027\376\152\041\016\330\121\052\030"
+  "\005\351\241\377\020\065\234\231\202\023\250\352\045\241\242\001"
+  "\135\222\215\305\337\040\174\022\160\374\004\131\201\161\027\065"
+  "\007\206\133\356\321\246\070\331\033\264\276\210\031\013\107\260"
+  "\024\045\050\233\154\300\050\274\024\261\277\064\214\320\113\124"
+  "\122\021\205\206\200\304\304\240\033\114\356\331\302\040\314\173"
+  "\027\214\222\202\373\164\330\032\120\060\110\363\341\120\134\244"
+  "\015\364\230\071\020\213\076\267\250\023\134\225\327\164\232\033"
+  "\146\101\161\057\163\147\036\011\136\073\124\141\301\036\076\116"
+  "\224\271\213\043\201\051\044\077\252\105\350\031\255\152\226\171"
+  "\354\221\265\126\046\341\307\343\276\122\011\053\361\073\163\035"
+  "\236\213\353\135\111\021\234\307\176\031\273\176\336\124\063\342"
+  "\227\071\161\233\027\147\214\316\230\334\316\046\303\365\372\320"
+  "\220\305\240\126\271\373\365\016\054\215\302\343\244\115\265\200"
+  "\331\056\200\276\256\027\100\337\226\130\372\276\304\322\346\165"
+  "\175\027\273\154\010\205\205\230\201\051\311\130\331\313\230\127"
+  "\256\112\076\176\243\112\141\255\323\251\167\103\234\351\050\127"
+  "\012\220\100\135\104\056\112\352\006\154\001\243\227\150\060\165"
+  "\267\355\007\124\120\345\262\074\151\105\311\266\313\224\025\244"
+  "\107\226\321\137\053\140\366\132\216\326\263\353\262\223\244\372"
+  "\147\250\326\032\052\141\343\303\065\173\045\357\347\035\055\352"
+  "\264\203\367\124\315\305\237\042\144\263\173\275\247\024\034\313"
+  "\220\107\123\366\011\375\230\177\331\320\105\056\231\310\060\304"
+  "\235\211\016\321\145\057\300\265\047\140\265\305\163\216\241\113"
+  "\106\245\240\034\361\143\120\312\121\162\200\136\120\332\353\320"
+  "\122\021\212\027\363\126\004\062\230\351\056\116\012\167\343\362"
+  "\225\136\267\122\103\046\030\236\057\350\117\250\056\042\157\230"
+  "\012\174\376\025\015\072\265\212\247\125\146\272\060\232\305\132"
+  "\072\334\131\323\035\250\344\273\334\163\035\262\145\065\366\136"
+  "\114\072\027\312\247\064\164\212\074\072\212\155\071\213\072\256"
+  "\133\030\311\211\312\153\014\376\363\223\111\215\355\141\347\021"
+  "\325\255\337\035\107\325\360\075\335\001\115\224\367\016\150\042"
+  "\334\072\240\211\224\354\200\246\324\347\016\050\115\344\072\240"
+  "\251\103\331\016\250\214\046\073\240\264\077\231\016\150\002\077"
+  "\336\302\227\061\370\364\037\375\020\171\372\017\175\232\221\300"
+  "\000\050\165\165\141\171\051\066\064\170\066\064\057\000\000\000"
   "\021\000\000\000\160\145\160\160\145\162\056\160\156\147\000\000"
   "\317\002\000\000\000\000\000\000\211\120\116\107\015\012\032\012"
   "\000\000\000\015\111\110\104\122\000\000\000\020\000\000\000\020"

tools/level_editor/level_editor.vala

@@ -46,11 +46,7 @@ namespace Crown
 			{ "open-project",            null,       "Open Project...",     null,             null,         on_open_project            },
 			{ "save",                    null,       "Save",                "<ctrl>S",        null,         on_save                    },
 			{ "save-as",                 null,       "Save As...",          "<shift><ctrl>S", null,         on_save_as                 },
-			{ "import",                  null,       "Import",              null,             null,         null                       },
-			{ "import-sprites",          null,       "Sprites...",          null,             null,         on_import_sprites          },
-			{ "import-meshes",           null,       "Meshes...",           null,             null,         on_import_meshes           },
-			{ "import-sounds",           null,       "Sounds...",           null,             null,         on_import_sounds           },
-			{ "import-textures",         null,       "Textures...",         null,             null,         on_import_textures         },
+			{ "import",                  null,       "Import...",           "<ctrl>I",        null,         on_import                  },
 			{ "preferences",             null,       "Preferences",         null,             null,         on_preferences             },
 			{ "deploy",                  null,       "Deploy...",           null,             null,         on_deploy                  },
 			{ "quit",                    null,       "Quit",                "<ctrl>Q",        null,         on_quit                    },
@@ -240,7 +236,7 @@ namespace Crown
 			_game.disconnected.connect(on_game_disconnected);
 			_game.message_received.connect(on_message_received);
 
-			_data_compiler = new DataCompiler(_compiler);
+			_data_compiler = project._data_compiler;
 			_database = database;
 			_project = project;
 			_project_store = new ProjectStore(_project);
@@ -333,7 +329,7 @@ namespace Crown
 			_main_vbox.pack_start(_menubar, false, false, 0);
 			_main_vbox.pack_start(_main_pane, true, true, 0);
 
-			_file_filter = new FileFilter();
+			_file_filter = new Gtk.FileFilter();
 			_file_filter.set_filter_name("Level (*.level)");
 			_file_filter.add_pattern("*.level");
 
@@ -793,7 +789,7 @@ namespace Crown
 
 		private void deploy_game()
 		{
-			FileChooserDialog fcd = new FileChooserDialog("Select destination directory..."
+			Gtk.FileChooserDialog fcd = new Gtk.FileChooserDialog("Select destination directory..."
 				, null
 				, FileChooserAction.SELECT_FOLDER
 				, "Cancel"
@@ -889,7 +885,7 @@ namespace Crown
 
 		private void load_level()
 		{
-			FileChooserDialog fcd = new FileChooserDialog("Open Level..."
+			Gtk.FileChooserDialog fcd = new Gtk.FileChooserDialog("Open Level..."
 				, this
 				, FileChooserAction.OPEN
 				, "Cancel"
@@ -923,7 +919,7 @@ namespace Crown
 
 		private void load_project()
 		{
-			FileChooserDialog fcd = new FileChooserDialog("Open Project..."
+			Gtk.FileChooserDialog fcd = new Gtk.FileChooserDialog("Open Project..."
 				, this
 				, FileChooserAction.SELECT_FOLDER
 				, "Cancel"
@@ -953,7 +949,7 @@ namespace Crown
 		{
 			bool saved = false;
 
-			FileChooserDialog fcd = new FileChooserDialog("Save As..."
+			Gtk.FileChooserDialog fcd = new Gtk.FileChooserDialog("Save As..."
 				, this
 				, FileChooserAction.SAVE
 				, "Cancel"
@@ -1135,119 +1131,9 @@ namespace Crown
 			save_as();
 		}
 
-		// If it returns true then filenames and out_dir are valid.
-		private bool on_import_begin(Gtk.FileFilter ff, ref SList<string> filenames, ref string out_dir)
+		private void on_import(Gtk.Action action)
 		{
-			FileChooserDialog fcd = new FileChooserDialog("Import..."
-				, this
-				, FileChooserAction.OPEN
-				, "Cancel"
-				, ResponseType.CANCEL
-				, "Open"
-				, ResponseType.ACCEPT
-				);
-			fcd.select_multiple = true;
-			fcd.add_filter(ff);
-
-			if (fcd.run() != (int)ResponseType.ACCEPT)
-			{
-				fcd.destroy();
-				return false;
-			}
-
-			filenames = fcd.get_filenames();
-			fcd.destroy();
-
-			FileChooserDialog dst = new FileChooserDialog("Select destination folder..."
-				, this
-				, FileChooserAction.SELECT_FOLDER
-				, "Cancel"
-				, ResponseType.CANCEL
-				, "Select"
-				, ResponseType.ACCEPT
-				);
-			dst.set_current_folder(_project.source_dir());
-
-			if (dst.run() != (int)ResponseType.ACCEPT)
-			{
-				dst.destroy();
-				return false;
-			}
-
-			out_dir = dst.get_filename();
-			dst.destroy();
-			return true;
-		}
-
-		private void on_import_end()
-		{
-			_data_compiler.compile.begin(_project.data_dir(), _project.platform(), (obj, res) => {
-				_data_compiler.compile.end(res);
-			});
-		}
-
-		private void on_import_sprites(Gtk.Action action)
-		{
-			Gtk.FileFilter ff = new FileFilter();
-			ff.set_filter_name("Sprite (*.png)");
-			ff.add_pattern("*.png");
-
-			SList<string> filenames = new SList<string>();
-			string out_dir = "";
-			if (on_import_begin(ff, ref filenames, ref out_dir))
-			{
-				_project.import_sprites(filenames, out_dir);
-				on_import_end();
-			}
-		}
-
-		private void on_import_meshes(Gtk.Action action)
-		{
-			Gtk.FileFilter ff = new FileFilter();
-			ff.set_filter_name("Mesh (*.mesh)");
-			ff.add_pattern("*.mesh");
-
-			SList<string> filenames = new SList<string>();
-			string out_dir = "";
-			if (on_import_begin(ff, ref filenames, ref out_dir))
-			{
-				_project.import_meshes(filenames, out_dir);
-				on_import_end();
-			}
-		}
-
-		private void on_import_sounds(Gtk.Action action)
-		{
-			Gtk.FileFilter ff = new FileFilter();
-			ff.set_filter_name("Sound (*.wav)");
-			ff.add_pattern("*.wav");
-
-			SList<string> filenames = new SList<string>();
-			string out_dir = "";
-			if (on_import_begin(ff, ref filenames, ref out_dir))
-			{
-				_project.import_sounds(filenames, out_dir);
-				on_import_end();
-			}
-		}
-
-		private void on_import_textures(Gtk.Action action)
-		{
-			Gtk.FileFilter ff = new FileFilter();
-			ff.set_filter_name("Texture (*.png, *.tga, *.dds, *.ktx, *.pvr)");
-			ff.add_pattern("*.png");
-			ff.add_pattern("*.tga");
-			ff.add_pattern("*.dds");
-			ff.add_pattern("*.ktx");
-			ff.add_pattern("*.pvr");
-
-			SList<string> filenames = new SList<string>();
-			string out_dir = "";
-			if (on_import_begin(ff, ref filenames, ref out_dir))
-			{
-				_project.import_textures(filenames, out_dir);
-				on_import_end();
-			}
+			_project.import(null, this);
 		}
 
 		private void on_preferences(Gtk.Action action)
@@ -1625,7 +1511,7 @@ namespace Crown
 		}
 		else
 		{
-			FileChooserDialog fcd = new FileChooserDialog("Select folder where to create new project..."
+			Gtk.FileChooserDialog fcd = new Gtk.FileChooserDialog("Select folder where to create new project..."
 				, null
 				, FileChooserAction.SELECT_FOLDER
 				, "Cancel"
@@ -1700,13 +1586,14 @@ namespace Crown
 			}
 		}
 
-		Project project = new Project();
+		ConsoleClient compiler = new ConsoleClient();
+		DataCompiler data_compiler = new DataCompiler(compiler);
+		Project project = new Project(data_compiler);
 		project.load(source_dir, toolchain_dir);
 		if (create_initial_files)
 			project.create_initial_files();
 
 		Database database = new Database();
-		ConsoleClient compiler = new ConsoleClient();
 		ConsoleClient engine = new ConsoleClient();
 		ConsoleClient game = new ConsoleClient();
 

tools/level_editor/level_editor.xml

@@ -8,12 +8,7 @@
 			<menuitem action="save"></menuitem>
 			<menuitem action="save-as"></menuitem>
 			<separator></separator>
-			<menu action="import">
-				<menuitem action="import-sprites"></menuitem>
-				<menuitem action="import-meshes"></menuitem>
-				<menuitem action="import-sounds"></menuitem>
-				<menuitem action="import-textures"></menuitem>
-			</menu>
+			<menuitem action="import"></menuitem>
 			<separator></separator>
 			<menuitem action="preferences"></menuitem>
 			<separator></separator>

tools/level_editor/project.vala

@@ -11,22 +11,22 @@ namespace Crown
 	public class Project
 	{
 		// Data
-		private File _source_dir;
-		private File _toolchain_dir;
-		private File _data_dir;
-		private File _level_editor_test_level;
-		private File _level_editor_test_package;
-		private string _platform;
-
-		private Database _files;
-		private HashMap<string, Guid?> _map;
+		public File _source_dir;
+		public File _toolchain_dir;
+		public File _data_dir;
+		public File _level_editor_test_level;
+		public File _level_editor_test_package;
+		public string _platform;
+		public Database _files;
+		public HashMap<string, Guid?> _map;
+		public DataCompiler _data_compiler;
 
 		public signal void file_added(string type, string name);
 		public signal void file_removed(string type, string name);
 		public signal void tree_added(string name);
 		public signal void tree_removed(string name);
 
-		public Project()
+		public Project(DataCompiler dc)
 		{
 			_source_dir = null;
 			_toolchain_dir = null;
@@ -40,6 +40,7 @@ namespace Crown
 #endif // CROWN_PLATFORM_LINUX
 			_files = new Database();
 			_map = new HashMap<string, Guid?>();
+			_data_compiler = dc;
 		}
 
 		public void reset()
@@ -863,5 +864,97 @@ end
 				SJSON.save(texture, Path.build_filename(_source_dir.get_path(), resource_name) + ".texture");
 			}
 		}
+
+		public void import(string? destination_dir, Gtk.Window? parent_window = null)
+		{
+			Gtk.FileFilter sprite_filter = new Gtk.FileFilter();
+			sprite_filter.set_filter_name("Sprite (*.png)");
+			sprite_filter.add_pattern("*.png");
+
+			Gtk.FileFilter mesh_filter = new Gtk.FileFilter();
+			mesh_filter.set_filter_name("Mesh (*.mesh)");
+			mesh_filter.add_pattern("*.mesh");
+
+			Gtk.FileFilter sound_filter = new Gtk.FileFilter();
+			sound_filter.set_filter_name("Sound (*.wav)");
+			sound_filter.add_pattern("*.wav");
+
+			Gtk.FileFilter texture_filter = new Gtk.FileFilter();
+			texture_filter.set_filter_name("Texture (*.png, *.tga, *.dds, *.ktx, *.pvr)");
+			texture_filter.add_pattern("*.png");
+			texture_filter.add_pattern("*.tga");
+			texture_filter.add_pattern("*.dds");
+			texture_filter.add_pattern("*.ktx");
+			texture_filter.add_pattern("*.pvr");
+
+			Gtk.FileChooserDialog src = new Gtk.FileChooserDialog("Import..."
+				, parent_window
+				, FileChooserAction.OPEN
+				, "Cancel"
+				, ResponseType.CANCEL
+				, "Open"
+				, ResponseType.ACCEPT
+				);
+			src.select_multiple = true;
+			src.add_filter(sprite_filter);
+			src.add_filter(mesh_filter);
+			src.add_filter(sound_filter);
+			src.add_filter(texture_filter);
+
+			if (src.run() != (int)ResponseType.ACCEPT)
+			{
+				src.destroy();
+				return;
+			}
+
+			string out_dir = "";
+			if (destination_dir == null)
+			{
+				Gtk.FileChooserDialog dst = new Gtk.FileChooserDialog("Select destination folder..."
+					, parent_window
+					, FileChooserAction.SELECT_FOLDER
+					, "Cancel"
+					, ResponseType.CANCEL
+					, "Select"
+					, ResponseType.ACCEPT
+					);
+				dst.set_current_folder(this.source_dir());
+
+				if (dst.run() != (int)ResponseType.ACCEPT)
+				{
+					dst.destroy();
+					src.destroy();
+					return;
+				}
+
+				out_dir = dst.get_filename();
+				dst.destroy();
+			}
+			else
+			{
+				out_dir = destination_dir;
+			}
+
+			Gtk.FileFilter? current_filter = src.get_filter();
+			GLib.SList<string> filenames = src.get_filenames();
+
+			if (current_filter != null)
+			{
+				if (current_filter == sprite_filter)
+					this.import_sprites(filenames, out_dir);
+				else if (current_filter == mesh_filter)
+					this.import_meshes(filenames, out_dir);
+				else if (current_filter == sound_filter)
+					this.import_sounds(filenames, out_dir);
+				else if (current_filter == texture_filter)
+					this.import_textures(filenames, out_dir);
+			}
+
+			_data_compiler.compile.begin(this.data_dir(), this.platform(), (obj, res) => {
+				_data_compiler.compile.end(res);
+			});
+
+			src.destroy();
+		}
 	}
 }