Icon fixes.

See probably related issue: https://bugs.launchpad.net/ubuntu/+source/httrack/+bug/1156982

9 files changed, 168 insertions, 142 deletions

diff --git a/debian/webhttrack.menu b/debian/webhttrack.menu
index 0ec04ac..eaa6cda 100644
--- a/debian/webhttrack.menu
+++ b/debian/webhttrack.menu
@@ -1,3 +1,4 @@
 ?package(webhttrack):needs="X11" section="Applications/Network/Web Browsing" \
         title="WebHTTrack" command="webhttrack" hints="Offline browsers" \
-        icon="/usr/share/pixmaps/httrack.xpm"
+        icon16x16="/usr/share/pixmaps/webhttrack16x16.xpm" \
+        icon32x32="/usr/share/pixmaps/webhttrack32x32.xpm"
diff --git a/html/Makefile.am b/html/Makefile.am
index 2bd25bc..c1f5670 100755
--- a/html/Makefile.am
+++ b/html/Makefile.am
@@ -8,8 +8,9 @@ HelpHtmlTxtdir = $(datadir)/doc/httrack/html
 WebHtmldir = $(datadir)/doc/httrack/html/server
 WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images
 WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx
-WebPixmapdir = $(datadir)/pixmaps
-WebGPixmapdir = $(datadir)/httrack/icons
+WebPixmap16x16dir = $(datadir)/pixmaps
+WebPixmap32x32dir = $(datadir)/pixmaps
+WebPixmap48x48dir = $(datadir)/pixmaps
 VFolderEntrydir = $(prefix)/share/applications
 
 HelpHtmlroot_DATA = ../httrack-doc.html ../history.txt
@@ -24,8 +25,9 @@ WebHtmlsfx_DATA = server/sfx/*
 # note: converted & normalized by
 # ico2xpm favicon.ico -o httrack.xpm
 # mogrify -format xpm -map /usr/share/doc/menu/examples/cmap.xpm httrack.xpm
-WebPixmap_DATA = server/div/httrack.xpm
-WebGPixmap_DATA = server/div/webhttrack.xpm
+WebPixmap16x16_DATA = server/div/webhttrack16x16.xpm
+WebPixmap32x32_DATA = server/div/webhttrack32x32.xpm
+WebPixmap48x48_DATA = server/div/webhttrack48x48.xpm
 VFolderEntry_DATA = server/div/*.desktop
 
 EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \
diff --git a/html/server/div/WebHTTrack-Websites.desktop b/html/server/div/WebHTTrack-Websites.desktop
index 92688ed..01b3f38 100644
--- a/html/server/div/WebHTTrack-Websites.desktop
+++ b/html/server/div/WebHTTrack-Websites.desktop
@@ -6,4 +6,4 @@ Terminal=false
 Name=Browse Mirrored Websites
 Comment=Browse Websites Mirrored by WebHTTrack
 Exec=webhttrack browse
-Icon=/usr/share/httrack/icons/webhttrack.xpm
+Icon=/usr/share/httrack/icons/webhttrack32x32.xpm
diff --git a/html/server/div/WebHTTrack.desktop b/html/server/div/WebHTTrack.desktop
index b6d75ef..8731326 100644
--- a/html/server/div/WebHTTrack.desktop
+++ b/html/server/div/WebHTTrack.desktop
@@ -6,4 +6,4 @@ Terminal=false
 Name=WebHTTrack Website Copier
 Comment=Copy websites to your computer
 Exec=webhttrack
-Icon=/usr/share/httrack/icons/webhttrack.xpm
+Icon=/usr/share/httrack/icons/webhttrack32x32.xpm
diff --git a/html/server/div/httrack.xpm b/html/server/div/httrack.xpm
deleted file mode 100644
index 74755e7..0000000
--- a/html/server/div/httrack.xpm
+++ /dev/null
@@ -1,47 +0,0 @@
-/* XPM */
-static char *httrack[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 9 1",
-"  c opaque",
-". c #191919",
-"X c #00007f",
-"o c #4c4c4c",
-"O c #666667",
-"+ c gray50",
-"@ c blue",
-"# c gray60",
-"$ c #b2b2b2",
-/* pixels */
-"$$+...   .$#########$+X    . $#$",
-"$#+       $#########$+  .    $##",
-"##@. ..   ##########$@      X###",
-"###.    .X##########$+    . .###",
-"##+      .$##########@ ..  . $$#",
-"##+..  .  $#########$#       $##",
-"##+.      ##########$#      X###",
-"##+   . .X###########@ . .  .###",
-"##@..   . $$########$+       $$#",
-"##+.      #$$$#####$#+  . .  $##",
-"##+..  .  ##$$$###$$#@ .  . X###",
-"#$O.     .X@XoXoX@oXoo      .###",
-"##+..    .     ...      .  . $$#",
-"##+  . .  . .        ..      $##",
-"##@.  .  .         .        X###",
-"###.          . .     .  .  .###",
-"##+    .      .    .        .$#$",
-"##+..     . .  .     ..  .   $##",
-"##+.    . X...X. X....   . .X###",
-"##+   .   #$#$##$$#$$+.     .###",
-"##@.  .   $$####$####@. .  . $$#",
-"##+.    . #$#####$##$#       $##",
-"##+. .   .##########$+.     X###",
-"#$O.  .  X###########@.  .  .###",
-"##+..    .$#########$+       $$#",
-"##+  .    $##########+  . .  $##",
-"##@.  .   ###########@ .  . X###",
-"###. .  .X#########$$#      .###",
-"##+      .$#########$+X .  . $$#",
-"##+..  .  $#########$+       $##",
-"##O.      ##########$@      X###",
-"##+.   ..X###########+.  .  .###"
-};
diff --git a/html/server/div/webhttrack.xpm b/html/server/div/webhttrack.xpm
deleted file mode 100644
index 0297b40..0000000
--- a/html/server/div/webhttrack.xpm
+++ /dev/null
@@ -1,88 +0,0 @@
-/* XPM */
-static char *pixmap[] = {
-/* width height ncols cpp */
-"48 48 34 2",
-  /* Colors */
-  "00 c #C0C0C0",
-  "01 c #040404",
-  "02 c #080808",
-  "03 c #0C0C0C",
-  "04 c #111111",
-  "05 c #161616",
-  "06 c #1C1C1C",
-  "07 c #222222",
-  "08 c #292929",
-  "09 c #555555",
-  "0A c #4D4D4D",
-  "0B c #424242",
-  "0C c #393939",
-  "0D c #333333",
-  "0E c #333366",
-  "0F c #666666",
-  "10 c #999999",
-  "11 c #666699",
-  "12 c #9999CC",
-  "13 c #CCCCCC",
-  "14 c #6666CC",
-  "15 c #5F5F5F",
-  "16 c #777777",
-  "17 c #868686",
-  "18 c #969696",
-  "19 c #B2B2B2",
-  "1A c #D7D7D7",
-  "1B c #DDDDDD",
-  "1C c #E3E3E3",
-  "1D c #EAEAEA",
-  "1E c #F1F1F1",
-  "1F c #A0A0A4",
-  "20 c #808080",
-  ".. s None c None",
-  "121212121212121212121212121212121212121212121212121212121212121212121212121212121214111114121212",
-  "150E111212110E0914090E0E0E0E0E11090E0E0E0E0E11121212121212121212121212121212121212140D0D14121212",
-  "080111121211010614040101010101090601010101010B12121212121212121212121212121212121214040414121212",
-  "080111121211010614040101010101090601010101010B12121212121212121212121212121212121214040414121212",
-  "080111121211010614040101010101090601010101010B12121212121212121212121212121212121214040414121212",
-  "080111121211010614040101010101090601010101010B12121212121212121212121212121212121214040414121212",
-  "080111121211010614070501010405150805020104050E12121212121212121212121212121212121214040414121212",
-  "0801111212110106121212060111121212120C0115121212121212121212121212121212121212121214040414121212",
-  "0801111212110106121212060111121212120C0115121212121212121212121212121212121212121214040414121212",
-  "0801111212110106121212060111121212120C0115121214141414141214111414141412121411141414040414141414",
-  "0801111212110106121212060111121212120C011512121109110E141209010911091112121501051114040414110909",
-  "0801080E0E0D0106121212060111121212120C011512120E010E0114140401050D011112110401010D140404140E0108",
-  "0801010101010106121212060111121212120C011512120E01060114110101010301111209010101081404041407010E",
-  "0801010101010106121212060111121212120C011512120E010101140C01010101011112070101010814040411010111",
-  "0801010101010106121212060111121212120C011512120E0101011406010101010111140201060D0814040415010514",
-  "0801010101010106121212060111121212120C011512120E0101021104010E0E0101111101011111091404040C010D12",
-  "0801030404040106121212060111121212120C011512120E010514110102141404011111010512121214040303011112",
-  "08010E1111090106121212060111121212120C011512120E010E12110105141208011111010812121214040101011112",
-  "0801111212110106121212060111121212120C011512120E01091211010812120D011111010D12121214040101011412",
-  "0801111212110106121212060111121212120C011512120E01091211010812120D011111010D12121214040405011112",
-  "0801111212110106121212060111121212120C011512120E01091211010612120801111101061212121404040C010E12",
-  "0801111212110106121212060111121212120C011512120E010912110104141404011111010111121414040409010712",
-  "0801111212110106121212060111121212120C011512120E01091214040115150101111101010D090C14040411010414",
-  "0801111212110106121212060111121212120C011512120E010912140701010101011112040101010814040414050111",
-  "0801111212110106121212060111121212120C011512120E010912120C010101010111120D01010108140404140D0109",
-  "0801111212110106121212060111121212120C011512120E0109121211010101070111121501010108140404140E0108",
-  "0801111212110106121212060111121212120C011512120E01091212140501080D011112140601010D14040414110104",
-  "0401080E0E0D01030E0E0E04010D0E0E0E0E0501080E0E0601080E0E0E0601070501080E0E060101070E02010C0C0101",
-  "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101",
-  "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101",
-  "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101",
-  "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101",
-  "0B07010705010B0B101008180A01061C20060A1710170F10200101010A1E1001081B000501171603150618100C172003",
-  "151501090D011715....0B1B1B050F1A1A0C201B..1B19..0001010113131B01101A1D0F031B1C0A100D1E..0F131C09",
-  "0D2001200901100B100A0719190D1F0C0F0D200C130C1F090D01010D00080A05130D0F0003190F17100D190A06191510",
-  "0510011F2001100B16010510160C1F05010D200119011005010101160901010B1701031A031F051F100D18010119051F",
-  "011901191005170B100907101706180F010D200119011F0F0B0101180701010F0901011F081F0510100D190907190510",
-  "01190510190D160B1E1D0B1A00010A1C0B0D20011901191D1901011F030101170D0101170C191620100D1D1D15190F17",
-  "01170A201F0F0A0B13190D1D1D0C0110000D200119011F192001011F03010117080101200C1C1B07100D1A190B1A1C0D",
-  "010F10091710070B160105100F170103130B2001190110050101011F050101170C0101170D000B01100D180101000001",
-  "010C1C080F1A030B16010510081801011015200119011005010101180D01010F15010119061F0101100D180101190003",
-  "01051E050C1A010B16010510081710031815200119011006010101162001010B19010300031F0101100D100101191008",
-  "01011901061F010B19200819170F190F000B200119011F170F0101081C0A0F031B0F2018031F0101100D00200D19150F",
-  "01011601010F010B....0B1D1A060F1E000D2001190119..00010101001D1B01181E1E0C031F0101100D1E..0F190810",
-  "01010701010701060F0F05150801051F0B0508010B010B0F0B0101010D190F0106192001010C01010C05150F070C010C",
-  "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101",
-  "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101",
-  "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101",
-};
diff --git a/html/server/div/webhttrack16x16.xpm b/html/server/div/webhttrack16x16.xpm
new file mode 100644
index 0000000..419883c
--- /dev/null
+++ b/html/server/div/webhttrack16x16.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char *httrack__[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 3 1",
+"  c #000000000000",
+". c #000000008080",
+"X c #808080808080",
+/* pixels */
+"X.   XXXXXX   .X",
+"X.   XXXXXX   .X",
+"X.   XXXXXX   .X",
+"X.   XXXXXX   .X",
+"X.   XXXXXX   .X",
+"X.   XXXXXX   .X",
+"X.            .X",
+"X.            .X",
+"X.            .X",
+"X.   XXXXXX   .X",
+"X.   XXXXXX   .X",
+"X.   XXXXXX   .X",
+"X.   XXXXXX   .X",
+"X.   XXXXXX   .X",
+"X.   XXXXXX   .X",
+"X.   XXXXXX   .X"
+};
diff --git a/html/server/div/webhttrack32x32.xpm b/html/server/div/webhttrack32x32.xpm
new file mode 100644
index 0000000..4c8e4c5
--- /dev/null
+++ b/html/server/div/webhttrack32x32.xpm
@@ -0,0 +1,45 @@
+/* XPM */
+static char *httrack__[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 7 1",
+"  c #040404040404",
+". c #0C0C0C0C0C0C",
+"X c #161616161616",
+"o c #333333333333",
+"O c #333333336666",
+"+ c #666666669999",
+"@ c #99999999CCCC",
+/* pixels */
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       OOOOOOOOOOOo       @@@",
+"@@+                          @@@",
+"@@+                          @@@",
+"@@+                          @@@",
+"@@+                          @@@",
+"@@+                          @@@",
+"@@+                          @@@",
+"@@+       XXXXXXXXXXX.       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@",
+"@@+       @@@@@@@@@@@+       @@@"
+};
diff --git a/html/server/div/webhttrack48x48.xpm b/html/server/div/webhttrack48x48.xpm
new file mode 100644
index 0000000..e919243
--- /dev/null
+++ b/html/server/div/webhttrack48x48.xpm
@@ -0,0 +1,88 @@
+/* XPM */
+static char *httrack__[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 34 1",
+"  c #040404040404",
+". c #080808080808",
+"X c #0C0C0C0C0C0C",
+"o c #111111111111",
+"O c #161616161616",
+"+ c #1C1C1C1C1C1C",
+"@ c #222222222222",
+"# c #292929292929",
+"$ c #333333333333",
+"% c #393939393939",
+"& c #333333336666",
+"* c #424242424242",
+"= c #4D4D4D4D4D4D",
+"- c #555555555555",
+"; c #5F5F5F5F5F5F",
+": c #666666666666",
+"> c #777777777777",
+", c #666666669999",
+"< c #66666666CCCC",
+"1 c #808080808080",
+"2 c #868686868686",
+"3 c #969696969696",
+"4 c #999999999999",
+"5 c #A0A0A0A0A4A4",
+"6 c #B2B2B2B2B2B2",
+"7 c #99999999CCCC",
+"8 c #C0C0C0C0C0C0",
+"9 c #CCCCCCCCCCCC",
+"0 c #D7D7D7D7D7D7",
+"q c #DDDDDDDDDDDD",
+"w c #E3E3E3E3E3E3",
+"e c #EAEAEAEAEAEA",
+"r c #F1F1F1F1F1F1",
+"t c None",
+/* pixels */
+"77777777777777777777777777777777777777777<,,<777",
+";&,77,&-<-&&&&&,-&&&&&,777777777777777777<$$<777",
+"# ,77, +<o     -+     *777777777777777777<oo<777",
+"# ,77, +<o     -+     *777777777777777777<oo<777",
+"# ,77, +<o     -+     *777777777777777777<oo<777",
+"# ,77, +<o     -+     *777777777777777777<oo<777",
+"# ,77, +<@O  oO;#O. oO&777777777777777777<oo<777",
+"# ,77, +777+ ,7777% ;77777777777777777777<oo<777",
+"# ,77, +777+ ,7777% ;77777777777777777777<oo<777",
+"# ,77, +777+ ,7777% ;77<<<<<7<,<<<<77<,<<<oo<<<<",
+"# ,77, +777+ ,7777% ;77,-,&<7- -,-,77; O,<oo<,--",
+"# #&&$ +777+ ,7777% ;77& & <<o O$ ,7,o  $<oo<& #",
+"#      +777+ ,7777% ;77& + <,   X ,7-   #<oo<@ &",
+"#      +777+ ,7777% ;77&   <%     ,7@   #<oo,  ,",
+"#      +777+ ,7777% ;77&   <+     ,<. +$#<oo; O<",
+"#      +777+ ,7777% ;77&  .,o &&  ,,  ,,-<oo% $7",
+"# Xooo +777+ ,7777% ;77& O<, .<<o ,, O777<oXX ,7",
+"# &,,- +777+ ,7777% ;77& &7, O<7# ,, #777<o   ,7",
+"# ,77, +777+ ,7777% ;77& -7, #77$ ,, $777<o   <7",
+"# ,77, +777+ ,7777% ;77& -7, #77$ ,, $777<ooO ,7",
+"# ,77, +777+ ,7777% ;77& -7, +77# ,, +777<oo% &7",
+"# ,77, +777+ ,7777% ;77& -7, o<<o ,,  ,7<<oo- @7",
+"# ,77, +777+ ,7777% ;77& -7<o ;;  ,,  $-%<oo, o<",
+"# ,77, +777+ ,7777% ;77& -7<@     ,7o   #<oo<O ,",
+"# ,77, +777+ ,7777% ;77& -77%     ,7$   #<oo<$ -",
+"# ,77, +777+ ,7777% ;77& -77,   @ ,7;   #<oo<& #",
+"# ,77, +777+ ,7777% ;77& -77<O #$ ,7<+  $<oo<, o",
+"o #&&$ X&&&o $&&&&O #&&+ #&&&+ @O #&&+  @&. %%  ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"*@ @O **44#3= +w1+=242:41   =r4 #q8O 2>X;+34%21X",
+";; -$ 2;tt*qqO:00%1qtq6t8   99q 40e:Xqw=4$rt:9w-",
+"$1 1- 4*4=@66$5%:$1%9%5-$  $8#=O9$:8X6:24$6=+6;4",
+"O4 51 4*> O4>%5O $1 6 4O   >-  *2 X0X5O54$3  6O5",
+" 6 64O2*4-@42+3: $1 6 5:*  3@  :-  5#5O44$6-@6O4",
+" 6O46$>*re*08 =w*$1 6 6e6  5X  2$  2%6>14$ee;6:2",
+" 2=15:=*96$ee% 48$1 6 561  5X  2#  1%wq@4$06*0w$",
+" :4-24@*> O4:2 X9*1 6 4O   5O  2%  2$8* 4$3  88 ",
+" %w#:0X*> O4#3  4;1 6 4O   3$  :;  6+5  4$3  68X",
+" OrO%0 *> O4#24X3;1 6 4+   >1  *6 X8X5  4$4  64#",
+"  6 +5 *61#62:6:8*1 6 52:  #w=:Xq:13X5  4$81$6;:",
+"  >  : *tt*e0+:r8$1 6 6t8   8eq 3rr%X5  4$rt:6#4",
+"  @  @ +::O;# O5*O# * *:*   $6: +61  %  %O;:@% %",
+"                                                ",
+"                                                ",
+"                                                "
+};