Add a 32x32 icon.

Also, some fixes for Linux



git-svn-id: https://tikzit.svn.sourceforge.net/svnroot/tikzit/trunk@368 7c02a99a-9b00-45e3-bf44-6f3dd7fddb64

7 files changed, 11 insertions, 16 deletions

diff --git a/tikzit/Makefile.am b/tikzit/Makefile.am
index 0c7cb93..d9793a4 100644
--- a/tikzit/Makefile.am
+++ b/tikzit/Makefile.am
@@ -1,8 +1,3 @@
 SUBDIRS = src share
 appdir = $(datarootdir)/tikzit
 nobase_dist_app_DATA = shapes/*.tikz
-
-if WINDOWS
-else
-nobase_dist_app_DATA += tikzit48x48.png
-endif
diff --git a/tikzit/README.release b/tikzit/README.release
index 48d6b8a..f161665 100644
--- a/tikzit/README.release
+++ b/tikzit/README.release
@@ -44,7 +44,7 @@ Set the tar.bz2 file as default for everything except windows and mac
 Updating the website
 --------------------
 
-Edit docs/web/link.php, and update the versions.
+Edit /trunk/www/htdocs/link.php, and update the versions.
 
 sftp to
   [sf-username],tikzit@web.sourceforge.net
diff --git a/tikzit/share/icons/hicolor/32x32/apps/tikzit.png b/tikzit/share/icons/hicolor/32x32/apps/tikzit.png
new file mode 100644
index 0000000..66008b7
--- /dev/null
+++ b/tikzit/share/icons/hicolor/32x32/apps/tikzit.png
diff --git a/tikzit/src/Makefile.am b/tikzit/src/Makefile.am
index 37e1914..f75e525 100644
--- a/tikzit/src/Makefile.am
+++ b/tikzit/src/Makefile.am
@@ -119,10 +119,11 @@ linux/icondata.m: ../draw-ellipse.png ../draw-path.png ../select-rectangular.png
 		transform_move ../transform-move.png \
 		> $@
 
-linux/logodata.m: ../share/icons/hicolor/16x16/apps/tikzit.png ../share/icons/hicolor/24x24/apps/tikzit.png ../share/icons/hicolor/48x48/apps/tikzit.png ../share/icons/hicolor/64x64/apps/tikzit.png ../share/icons/hicolor/128x128/apps/tikzit.png
+linux/logodata.m: ../share/icons/hicolor/*/apps/tikzit.png
 	$(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \
 		logo16 ../share/icons/hicolor/16x16/apps/tikzit.png \
 		logo24 ../share/icons/hicolor/24x24/apps/tikzit.png \
+		logo32 ../share/icons/hicolor/32x32/apps/tikzit.png \
 		logo48 ../share/icons/hicolor/48x48/apps/tikzit.png \
 		logo64 ../share/icons/hicolor/64x64/apps/tikzit.png \
 		logo128 ../share/icons/hicolor/128x128/apps/tikzit.png \
diff --git a/tikzit/src/linux/logo.h b/tikzit/src/linux/logo.h
index 48a70ba..e778da9 100644
--- a/tikzit/src/linux/logo.h
+++ b/tikzit/src/linux/logo.h
@@ -20,7 +20,7 @@
 typedef enum {
   LOGO_SIZE_16,
   LOGO_SIZE_24,
-  //LOGO_SIZE_32,
+  LOGO_SIZE_32,
   LOGO_SIZE_48,
   LOGO_SIZE_64,
   LOGO_SIZE_128,
diff --git a/tikzit/src/linux/logo.m b/tikzit/src/linux/logo.m
index 1bf006d..57533c7 100644
--- a/tikzit/src/linux/logo.m
+++ b/tikzit/src/linux/logo.m
@@ -34,10 +34,9 @@ GdkPixbuf *get_logo (LogoSize size) {
         case LOGO_SIZE_24:
             data = &logo24;
             break;
-/*        case LOGO_SIZE_32:
+        case LOGO_SIZE_32:
             data = &logo32;
             break;
-*/
         case LOGO_SIZE_48:
             data = &logo48;
             break;
diff --git a/tikzit/src/linux/main.m b/tikzit/src/linux/main.m
index f28123c..93aa9e4 100644
--- a/tikzit/src/linux/main.m
+++ b/tikzit/src/linux/main.m
@@ -45,12 +45,12 @@ int main (int argc, char *argv[]) {
 
 #ifndef WINDOWS
     GList *icon_list = NULL;
-    g_list_prepend (icon_list, get_logo(LOGO_SIZE_128));
-    g_list_prepend (icon_list, get_logo(LOGO_SIZE_64));
-    g_list_prepend (icon_list, get_logo(LOGO_SIZE_48));
-    //g_list_prepend (icon_list, get_logo(LOGO_SIZE_32));
-    g_list_prepend (icon_list, get_logo(LOGO_SIZE_24));
-    g_list_prepend (icon_list, get_logo(LOGO_SIZE_16));
+    icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_128));
+    icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_64));
+    icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_48));
+    icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_32));
+    icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_24));
+    icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_16));
     gtk_window_set_default_icon_list (icon_list);
     GList *list_head = icon_list;
     while (list_head) {