[pan2/pre-201201] iconv fixes, new iconset
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2/pre-201201] iconv fixes, new iconset
- Date: Mon, 2 Jan 2012 15:08:32 +0000 (UTC)
commit 47620a5f31eb96dae0f1015c397abd06ac4603b1
Author: Heinrich MÃller <henmull src gnome org>
Date: Sun Dec 18 17:33:14 2011 +0100
iconv fixes, new iconset
pan/gui/Makefile.am | 2 +-
pan/gui/actions.cc | 2 +-
pan/gui/actions.h | 2 +-
pan/gui/body-pane.cc | 5 +-
pan/gui/body-pane.h | 2 +-
pan/gui/dl-headers-ui.cc | 2 +-
pan/gui/dl-headers-ui.h | 2 +-
pan/gui/e-action-combo-box.h | 2 +-
pan/gui/e-charset-combo-box.c | 2 +-
pan/gui/e-charset.h | 2 +-
pan/gui/group-pane.cc | 12 +-
pan/gui/group-pane.h | 2 +-
pan/gui/group-prefs-dialog.cc | 4 +-
pan/gui/group-prefs-dialog.h | 4 +-
pan/gui/{gtk_compat.h => gtk-compat.h} | 49 ++++--
pan/gui/gui.cc | 8 +-
pan/gui/gui.h | 2 +-
pan/gui/header-pane.cc | 7 +-
pan/gui/header-pane.h | 2 +-
pan/gui/hig.cc | 4 +-
pan/gui/hig.h | 2 +-
pan/gui/log-ui.cc | 6 +-
pan/gui/log-ui.h | 2 +-
pan/gui/pan-file-entry.cc | 4 +-
pan/gui/pan-file-entry.h | 2 +-
pan/gui/pan-tree.h | 10 +-
pan/gui/pan.cc | 2 +-
pan/gui/post-ui.cc | 4 +-
pan/gui/prefs-ui.cc | 4 +-
pan/gui/prefs-ui.h | 2 +-
pan/gui/prefs.h | 2 +-
pan/gui/profiles-dialog.cc | 2 +-
pan/gui/profiles-dialog.h | 2 +-
pan/gui/progress-view.cc | 2 +-
pan/gui/progress-view.h | 4 +-
pan/gui/save-ui.cc | 4 +-
pan/gui/save-ui.h | 4 +-
pan/gui/score-add-ui.cc | 16 +-
pan/gui/score-add-ui.h | 4 +-
pan/gui/score-view-ui.cc | 16 +-
pan/gui/score-view-ui.h | 2 +-
pan/gui/server-ui.cc | 10 +-
pan/gui/server-ui.h | 2 +-
pan/gui/task-pane.cc | 4 +-
pan/gui/task-pane.h | 2 +-
pan/gui/xface.c | 267 ++++++++++++++--------------
pan/icons/Makefile.am | 15 ++-
pan/icons/icon_article_read.png | Bin 489 -> 748 bytes
pan/icons/icon_article_unread.png | Bin 438 -> 593 bytes
pan/icons/icon_binary_complete.png | Bin 269 -> 861 bytes
pan/icons/icon_binary_complete_read.png | Bin 221 -> 834 bytes
pan/icons/icon_binary_incomplete.png | Bin 268 -> 875 bytes
pan/icons/icon_binary_incomplete_read.png | Bin 223 -> 834 bytes
pan/icons/icon_by_me.png | Bin 351 -> 270 bytes
pan/icons/icon_by_others.png | Bin 402 -> 2065 bytes
pan/icons/icon_cert.png | Bin 0 -> 689 bytes
pan/icons/icon_compose_followup.png | Bin 668 -> 2062 bytes
pan/icons/icon_compose_post.png | Bin 642 -> 1579 bytes
pan/icons/icon_disk.png | Bin 237 -> 718 bytes
pan/icons/icon_filter.png | Bin 483 -> 1621 bytes
pan/icons/icon_filter_only_attachments.png | Bin 417 -> 1477 bytes
pan/icons/icon_filter_only_cached.png | Bin 542 -> 1375 bytes
pan/icons/icon_filter_only_me.png | Bin 585 -> 1204 bytes
pan/icons/icon_filter_only_unread.png | Bin 621 -> 1243 bytes
pan/icons/icon_filter_only_watched.png | Bin 400 -> 1438 bytes
pan/icons/icon_get_dialog.png | Bin 339 -> 1136 bytes
pan/icons/icon_get_flagged.png | Bin 659 -> 1128 bytes
pan/icons/icon_get_selected.png | Bin 423 -> 1070 bytes
pan/icons/icon_get_subscribed.png | Bin 568 -> 1327 bytes
pan/icons/icon_mozilla_frown.png | Bin 1002 -> 836 bytes
pan/icons/icon_mozilla_smile.png | Bin 1008 -> 816 bytes
pan/icons/icon_mozilla_surprised.png | Bin 1029 -> 834 bytes
pan/icons/icon_mozilla_tongueout.png | Bin 1008 -> 872 bytes
pan/icons/icon_mozilla_wink.png | Bin 1042 -> 825 bytes
pan/icons/icon_pan.png | Bin 4909 -> 3897 bytes
pan/icons/icon_pan_about_logo.png | Bin 2203 -> 9327 bytes
pan/icons/icon_pan_about_logo.xcf | Bin 0 -> 22316 bytes
pan/icons/icon_pan_logo.png | Bin 4373 -> 17058 bytes
pan/icons/icon_pan_logo.xcf | Bin 0 -> 78119 bytes
pan/icons/icon_plain.png | Bin 0 -> 687 bytes
pan/icons/icon_read_group.png | Bin 541 -> 1230 bytes
pan/icons/icon_read_less.png | Bin 361 -> 863 bytes
pan/icons/icon_read_more.png | Bin 354 -> 851 bytes
pan/icons/icon_read_unread_article.png | Bin 590 -> 1385 bytes
pan/icons/icon_read_unread_thread.png | Bin 568 -> 1542 bytes
pan/icons/icon_score.png | Bin 228 -> 1991 bytes
pan/icons/icon_search_pulldown.png | Bin 1318 -> 2041 bytes
pan/icons/icon_sig_fail.png | Bin 0 -> 1777 bytes
pan/icons/icon_sig_ok.png | Bin 0 -> 1759 bytes
pan/icons/icon_status_active.png | Bin 0 -> 1824 bytes
pan/icons/icon_status_error.png | Bin 0 -> 1772 bytes
pan/icons/icon_status_idle.png | Bin 0 -> 1481 bytes
pan/icons/icon_status_new_articles.png | Bin 0 -> 1590 bytes
pan/icons/icon_status_offline.png | Bin 0 -> 1945 bytes
pan/icons/icon_status_online.png | Bin 0 -> 1783 bytes
pan/icons/icon_status_queue_empty.png | Bin 0 -> 1704 bytes
pan/icons/icon_tabbar.png | Bin 0 -> 1616 bytes
97 files changed, 273 insertions(+), 240 deletions(-)
---
diff --git a/pan/gui/Makefile.am b/pan/gui/Makefile.am
index c36242d..208772e 100644
--- a/pan/gui/Makefile.am
+++ b/pan/gui/Makefile.am
@@ -47,7 +47,7 @@ noinst_HEADERS = \
group-pane.h \
group-prefs.h \
group-prefs-dialog.h \
- gtk_compat.h \
+ gtk-compat.h \
gui.h \
header-pane.h \
hig.h \
diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc
index b7e3f63..1392c7a 100644
--- a/pan/gui/actions.cc
+++ b/pan/gui/actions.cc
@@ -20,7 +20,7 @@
#include <config.h>
extern "C" {
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/debug.h>
#include <pan/tasks/task-xover.h>
diff --git a/pan/gui/actions.h b/pan/gui/actions.h
index 75c15cf..c6120ee 100644
--- a/pan/gui/actions.h
+++ b/pan/gui/actions.h
@@ -19,7 +19,7 @@
#ifndef _actions_h_
#define _actions_h_
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <pan/gui/pan-ui.h>
#include <pan/gui/prefs.h>
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index 94b405e..c6b7b46 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -23,8 +23,7 @@
#include <iostream>
extern "C" {
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
- #include <gdk/gdk.h>
+ #include <pan/gui/gtk-compat.h>
#include <gdk/gdkkeysyms.h>
#include <gmime/gmime.h>
}
@@ -42,7 +41,7 @@ extern "C" {
#include "tango-colors.h"
#include "xface.h"
#include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
#define FIRST_PICTURE "first-picture"
diff --git a/pan/gui/body-pane.h b/pan/gui/body-pane.h
index dd3d110..e0a514b 100644
--- a/pan/gui/body-pane.h
+++ b/pan/gui/body-pane.h
@@ -20,7 +20,7 @@
#ifndef _BodyPane_h_
#define _BodyPane_h_
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <gmime/gmime.h>
#include <pan/general/quark.h>
#include <pan/usenet-utils/text-massager.h>
diff --git a/pan/gui/dl-headers-ui.cc b/pan/gui/dl-headers-ui.cc
index 2eaaa3f..20426a6 100644
--- a/pan/gui/dl-headers-ui.cc
+++ b/pan/gui/dl-headers-ui.cc
@@ -21,7 +21,7 @@
extern "C" {
#include <glib.h>
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/macros.h>
#include <pan/tasks/queue.h>
diff --git a/pan/gui/dl-headers-ui.h b/pan/gui/dl-headers-ui.h
index 19c2b88..1376c9a 100644
--- a/pan/gui/dl-headers-ui.h
+++ b/pan/gui/dl-headers-ui.h
@@ -19,7 +19,7 @@
#ifndef DOWNLOAD_HEADERS_UI_H
#define DOWNLOAD_HEADERS_UI_H
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <pan/general/quark.h>
#include "prefs.h"
diff --git a/pan/gui/e-action-combo-box.h b/pan/gui/e-action-combo-box.h
index 3003386..9e40b2f 100644
--- a/pan/gui/e-action-combo-box.h
+++ b/pan/gui/e-action-combo-box.h
@@ -25,7 +25,7 @@
* Just plug in a GtkRadioAction and the widget will handle the rest.
* (Based on GtkhtmlComboBox.) */
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
/* Standard GObject macros */
#define E_TYPE_ACTION_COMBO_BOX \
diff --git a/pan/gui/e-charset-combo-box.c b/pan/gui/e-charset-combo-box.c
index 2fe1948..42b1d30 100644
--- a/pan/gui/e-charset-combo-box.c
+++ b/pan/gui/e-charset-combo-box.c
@@ -24,7 +24,7 @@
#include <glib/gi18n.h>
#include "e-charset.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
#define E_CHARSET_COMBO_BOX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/pan/gui/e-charset.h b/pan/gui/e-charset.h
index 57b6976..4b3b372 100644
--- a/pan/gui/e-charset.h
+++ b/pan/gui/e-charset.h
@@ -21,7 +21,7 @@
#ifndef E_CHARSET_H
#define E_CHARSET_H
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
G_BEGIN_DECLS
diff --git a/pan/gui/group-pane.cc b/pan/gui/group-pane.cc
index 378cf92..1faee6d 100644
--- a/pan/gui/group-pane.cc
+++ b/pan/gui/group-pane.cc
@@ -22,7 +22,7 @@
#include <deque>
extern "C" {
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/debug.h>
#include <pan/general/log.h>
@@ -33,7 +33,7 @@ extern "C" {
#include <pan/data/data.h>
#include "group-pane.h"
#include "pad.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
@@ -215,7 +215,7 @@ namespace
blah->path = path;
blah->col = col;
g_idle_add (maybe_activate_on_idle_idle, blah);
- }
+ }
}
gboolean
@@ -343,8 +343,8 @@ namespace
headers[0].groupname = *sub_title_quark;
headers[1].groupname = *other_title_quark;
g_object_weak_ref (G_OBJECT(store), delete_rows, headers);
-
- //
+
+ //
// subscribed
//
@@ -428,7 +428,7 @@ GroupPane :: on_group_subscribe (const Quark& groupname, bool sub)
++pos;
} while (gtk_tree_model_iter_next (model, &group_iter));
}
-
+
// move the row
_tree_store->reparent (_tree_store->get_row(§ion_iter), find_row(groupname), pos);
diff --git a/pan/gui/group-pane.h b/pan/gui/group-pane.h
index 0e77866..9c3ce54 100644
--- a/pan/gui/group-pane.h
+++ b/pan/gui/group-pane.h
@@ -20,7 +20,7 @@
#ifndef _GroupPane_h_
#define _GroupPane_h_
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <pan/general/quark.h>
#include <pan/data/data.h>
#include <pan/gui/action-manager.h>
diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc
index ee47e02..8b9edaa 100644
--- a/pan/gui/group-prefs-dialog.cc
+++ b/pan/gui/group-prefs-dialog.cc
@@ -21,7 +21,7 @@
extern "C" {
#include <glib/gi18n.h>
#include <glib.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
#ifdef HAVE_GTKSPELL
#include <gtkspell/gtkspell.h>
#include <enchant/enchant.h>
@@ -35,7 +35,7 @@ extern "C" {
#include "hig.h"
#include "pad.h"
#include "pan-file-entry.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
diff --git a/pan/gui/group-prefs-dialog.h b/pan/gui/group-prefs-dialog.h
index 2d8a671..d757c4f 100644
--- a/pan/gui/group-prefs-dialog.h
+++ b/pan/gui/group-prefs-dialog.h
@@ -22,7 +22,7 @@
#include <pan/general/quark.h>
#include <pan/data/data.h>
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include "group-prefs.h"
namespace pan
@@ -51,5 +51,5 @@ namespace pan
static void response_cb (GtkDialog*, int, gpointer);
void save_from_gui ();
};
-}
+}
#endif
diff --git a/pan/gui/gtk_compat.h b/pan/gui/gtk-compat.h
similarity index 70%
rename from pan/gui/gtk_compat.h
rename to pan/gui/gtk-compat.h
index c4c5b29..62d0ae4 100644
--- a/pan/gui/gtk_compat.h
+++ b/pan/gui/gtk-compat.h
@@ -1,19 +1,22 @@
//========================================================================
-/** file pan/pan/gui/gtk_compat.h
+/** file pan/pan/gui/gtk-compat.h
* @author kid
* @date
* Created: Mon 09 May 2011 04:42:46 PM MDT \n
* Last Update: Mon 09 May 2011 04:42:46 PM MDT
*/
/*------------------------------------------------------------------------
- * Description: ÂdescriptionÂ
- *
+ * Description: GTK Compatibility layer for GTK2/3+ migration
+ *
*========================================================================
*/
#ifndef PAN_GTK_COMPAT_H
#define PAN_GTK_COMPAT_H
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+
#ifdef __cplusplus
namespace
{
@@ -79,30 +82,50 @@ namespace
}
#endif
-#if !GTK_CHECK_VERSION(3,0,0)
-#ifndef GDK_KEY_Up
-#define GDK_KEY_Up GDK_Up
-#define GDK_KEY_KP_Up GDK_KP_Up
-#define GDK_KEY_Down GDK_Down
-#define GDK_KEY_KP_Down GDK_KP_Down
+#if !GTK_CHECK_VERSION(3, 0, 0)
+ #include <gdk/gdkkeysyms.h>
+#endif
+
+//#if !GTK_CHECK_VERSION(3,0,0)
+//#ifndef GDK_KEY_Up
+// #define GDK_KEY_Up GDK_Up
+//#define GDK_KEY_KP_Up GDK_KP_Up
+//#ifndef GDK_KEY_Down
+// #define GDK_KEY_Down GDK_Down
+//#define GDK_KEY_KP_Down GDK_KP_Down
+//#endif
+
+#if !GTK_CHECK_VERSION(2, 22, 0)
+// Define any keys not defined by older GDK versions
+ #define GDK_KEY_Delete GDK_Delete
+ #define GDK_KEY_Return GDK_Return
+ #define GDK_KEY_Down GDK_Down
+ #define GDK_KEY_Up GDK_Up
#endif
+
+#if !GTK_CHECK_VERSION(3,0,0)
+
typedef GtkStyle GtkStyleContext;
- GtkStyleContext* gtk_widget_get_style_context(GtkWidget *w)
+ static inline GtkStyleContext* gtk_widget_get_style_context(GtkWidget *w)
{
return gtk_widget_get_style(w);
}
- GtkIconSet* gtk_style_context_lookup_icon_set(GtkStyleContext *s,
+ static inline GtkIconSet* gtk_style_context_lookup_icon_set(GtkStyleContext *s,
const char *id)
{
return gtk_style_lookup_icon_set(s,id);
}
- void gtk_widget_override_font(GtkWidget *w, PangoFontDescription *f)
+ static inline void gtk_widget_override_font(GtkWidget *w, PangoFontDescription *f)
{
gtk_widget_modify_font(w,f);
}
#endif
#if GTK_CHECK_VERSION(3,0,0)
+
+// include this for conversion of old key names to new
+#include <gdk/gdkkeysyms-compat.h>
+
#define GTK_OBJECT(w) w
typedef GtkWidget GtkObject;
#ifdef GTK_DISABLE_DEPRECATED
@@ -116,5 +139,5 @@ namespace
#ifdef __cplusplus
}
#endif
-
+
#endif
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 1585dc9..99e89a8 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -63,7 +63,7 @@ extern "C" {
#include "server-ui.h"
#include "task-pane.h"
#include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
namespace pan
{
@@ -369,6 +369,8 @@ GUI :: ~GUI ()
foreach (std::set<GtkWidget*>, unref, it)
g_object_unref (*it);
g_object_unref (G_OBJECT(_ui_manager));
+
+ if (iconv_inited) iconv_close(conv);
}
/***
@@ -1637,8 +1639,10 @@ void GUI :: do_read_selected_group ()
char buf[256];
g_snprintf(buf, sizeof(buf), "%s//IGNORE", _prefs.get_string("default-charset", "UTF-8").c_str());
const char * to = g_mime_charset_iconv_name(buf);
- if (strncmp (from, buf, strlen(from)) != 0)
+// if (strncmp (from, buf, strlen(from)) != 0)
{
+ if (iconv_inited)
+ iconv_close(conv);
conv = iconv_open (to, from);
if (conv == (iconv_t)-1)
{
diff --git a/pan/gui/gui.h b/pan/gui/gui.h
index 0babeb6..677fb38 100644
--- a/pan/gui/gui.h
+++ b/pan/gui/gui.h
@@ -30,7 +30,7 @@
#include <pan/gui/group-prefs.h>
#include <pan/gui/wait.h>
-#include "gtk_compat.h"
+#include "gtk-compat.h"
namespace pan
{
diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc
index 97af79b..db70267 100644
--- a/pan/gui/header-pane.cc
+++ b/pan/gui/header-pane.cc
@@ -20,7 +20,7 @@
extern "C" {
#include <config.h>
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
#include <gdk/gdkkeysyms.h>
#include <iconv.h>
}
@@ -41,7 +41,7 @@ extern "C" {
#include "header-pane.h"
#include "render-bytes.h"
#include "tango-colors.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
@@ -1627,9 +1627,6 @@ HeaderPane :: ~HeaderPane ()
for (guint i=0; i<ICON_QTY; ++i)
g_object_unref (G_OBJECT(_icons[i].pixbuf));
- // close iconv handler
- if (iconv_inited) iconv_close(conv);
- iconv_inited = false;
}
GtkWidget*
diff --git a/pan/gui/header-pane.h b/pan/gui/header-pane.h
index 702c032..d56f469 100644
--- a/pan/gui/header-pane.h
+++ b/pan/gui/header-pane.h
@@ -20,7 +20,7 @@
#ifndef _HeaderPane_h_
#define _HeaderPane_h_
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <pan/general/e-util.h>
#include <pan/general/macros.h> // for UNUSED
#include <pan/data/article-cache.h>
diff --git a/pan/gui/hig.cc b/pan/gui/hig.cc
index 918adac..4810dfd 100644
--- a/pan/gui/hig.cc
+++ b/pan/gui/hig.cc
@@ -19,7 +19,7 @@
#include <config.h>
#include <glib.h>
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include "hig.h"
using namespace pan;
@@ -129,7 +129,7 @@ HIG :: workarea_add_label (GtkWidget * table,
return l;
}
-
+
void
HIG :: workarea_add_control (GtkWidget * table,
int row,
diff --git a/pan/gui/hig.h b/pan/gui/hig.h
index 265530b..7ae7ece 100644
--- a/pan/gui/hig.h
+++ b/pan/gui/hig.h
@@ -20,7 +20,7 @@
#ifndef _HIG_h_
#define _HIG_h_
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
namespace pan
{
diff --git a/pan/gui/log-ui.cc b/pan/gui/log-ui.cc
index 05a4d72..bcbda13 100644
--- a/pan/gui/log-ui.cc
+++ b/pan/gui/log-ui.cc
@@ -22,7 +22,7 @@
#include <fstream>
extern "C" {
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/log.h>
#include <pan/general/macros.h>
@@ -51,7 +51,7 @@ namespace
virtual void on_log_entry_added (const Log::Entry& e) {
GtkTreeIter iter;
gtk_list_store_prepend (myStore, &iter);
- gtk_list_store_set (myStore, &iter,
+ gtk_list_store_set (myStore, &iter,
COL_SEVERITY, (e.severity & Log::PAN_SEVERITY_ERROR),
COL_DATE, (unsigned long)e.date,
COL_MESSAGE, e.message.c_str(), -1);
@@ -122,7 +122,7 @@ namespace
foreach_const (Log::entries_t, entries, it) {
GtkTreeIter iter;
gtk_list_store_prepend (store, &iter);
- gtk_list_store_set (store, &iter,
+ gtk_list_store_set (store, &iter,
COL_SEVERITY, (it->severity & Log::PAN_SEVERITY_ERROR),
COL_DATE, (unsigned long)it->date,
COL_MESSAGE, it->message.c_str(), -1);
diff --git a/pan/gui/log-ui.h b/pan/gui/log-ui.h
index c337b25..e6bf3d5 100644
--- a/pan/gui/log-ui.h
+++ b/pan/gui/log-ui.h
@@ -19,7 +19,7 @@
#ifndef LOG_UI_H
#define LOG_UI_H
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include "prefs.h"
namespace pan
diff --git a/pan/gui/pan-file-entry.cc b/pan/gui/pan-file-entry.cc
index ded3008..93bb7e5 100644
--- a/pan/gui/pan-file-entry.cc
+++ b/pan/gui/pan-file-entry.cc
@@ -21,7 +21,7 @@
#include <string>
extern "C" {
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/file-util.h>
#include "pad.h"
@@ -81,7 +81,7 @@ pan :: file_entry_new (const char * title, int chooser_action)
g_object_set_data (G_OBJECT(hbox), "chooser-action", GINT_TO_POINTER(chooser_action));
g_object_set_data (G_OBJECT(hbox), "entry", e);
file_entry_set (hbox, g_get_home_dir());
-
+
gtk_widget_show (e);
gtk_widget_show (b);
return hbox;
diff --git a/pan/gui/pan-file-entry.h b/pan/gui/pan-file-entry.h
index fed7359..1573dc9 100644
--- a/pan/gui/pan-file-entry.h
+++ b/pan/gui/pan-file-entry.h
@@ -20,7 +20,7 @@
#ifndef __PanFileEntry_h__
#define __PanFileEntry_h__
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
namespace pan
{
diff --git a/pan/gui/pan-tree.h b/pan/gui/pan-tree.h
index 7bafb96..a7d16e3 100644
--- a/pan/gui/pan-tree.h
+++ b/pan/gui/pan-tree.h
@@ -22,7 +22,7 @@
#include <map>
#include <vector>
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#define PAN_TREE_STORE_TYPE (PanTreeStore::get_type())
#define PAN_TREE_STORE(obj) \
@@ -75,7 +75,7 @@ struct PanTreeStoreClass
* 6. Entire subtrees can be reparented in a single call.
*
*
- * WARTS
+ * WARTS
*
* _ Sorting is not triggered when a row changes.
* When you're done with a batch of changes, call sort() manually.
@@ -334,7 +334,7 @@ struct PanTreeStore
/** one of GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID,
or [0...n_columns) */
- int sort_column_id;
+ int sort_column_id;
/** the model's sort order -- ascending or descending */
GtkSortType order;
@@ -376,7 +376,7 @@ struct PanTreeStore
passed as arguments to us actually do belong to this tree. */
int stamp;
- /** Defines the GType of each column. */
+ /** Defines the GType of each column. */
std::vector<GType> * column_types;
/** number of columns in each row. */
@@ -442,7 +442,7 @@ struct PanTreeStore
gpointer,
GDestroyNotify);
static gboolean sortable_has_default_sort_func (GtkTreeSortable*);
-
+
private:
struct SortData;
struct SortRowInfo;
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index a681fd2..c4a7fa7 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -22,7 +22,7 @@
#include <signal.h>
extern "C" {
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
#include <gmime/gmime.h>
#include <gio/gio.h>
#include <sys/types.h>
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 366e927..b831583 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -25,7 +25,7 @@
extern "C" {
#include <gmime/gmime.h>
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
#ifdef HAVE_GTKSPELL
#include <gtkspell/gtkspell.h>
#endif
@@ -47,7 +47,7 @@ extern "C" {
#include "post.ui.h"
#include "profiles-dialog.h"
#include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
#ifdef HAVE_GTKSPELL
#define DEFAULT_SPELLCHECK_FLAG true
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index 2f7cce5..2cbed6a 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -20,7 +20,7 @@
#include <config.h>
extern "C" {
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/debug.h>
#include <pan/general/macros.h>
@@ -31,7 +31,7 @@ extern "C" {
#include "prefs-ui.h"
#include "tango-colors.h"
#include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
#include "e-charset-dialog.h"
using namespace pan;
diff --git a/pan/gui/prefs-ui.h b/pan/gui/prefs-ui.h
index 21a42e4..dda9bd7 100644
--- a/pan/gui/prefs-ui.h
+++ b/pan/gui/prefs-ui.h
@@ -20,7 +20,7 @@
#ifndef PREFS_UI_H
#define PREFS_UI_H
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <pan/gui/prefs.h>
namespace pan
diff --git a/pan/gui/prefs.h b/pan/gui/prefs.h
index 317a573..068e6fd 100644
--- a/pan/gui/prefs.h
+++ b/pan/gui/prefs.h
@@ -26,7 +26,7 @@
#include <string>
#include <vector>
#include <pan/general/string-view.h>
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
namespace pan
{
diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc
index 9ed3742..856ee36 100644
--- a/pan/gui/profiles-dialog.cc
+++ b/pan/gui/profiles-dialog.cc
@@ -25,7 +25,7 @@
#include <iostream>
extern "C" {
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/debug.h>
#include <pan/general/macros.h>
diff --git a/pan/gui/profiles-dialog.h b/pan/gui/profiles-dialog.h
index 74c4c64..3ef0fac 100644
--- a/pan/gui/profiles-dialog.h
+++ b/pan/gui/profiles-dialog.h
@@ -20,7 +20,7 @@
#ifndef __ProfilesDialog_h__
#define __ProfilesDialog_h__
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <pan/data/data.h>
namespace pan
diff --git a/pan/gui/progress-view.cc b/pan/gui/progress-view.cc
index 9478e77..7134bfc 100644
--- a/pan/gui/progress-view.cc
+++ b/pan/gui/progress-view.cc
@@ -19,7 +19,7 @@
#include <config.h>
extern "C" {
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/string-view.h>
#include "progress-view.h"
diff --git a/pan/gui/progress-view.h b/pan/gui/progress-view.h
index de0d917..3549918 100644
--- a/pan/gui/progress-view.h
+++ b/pan/gui/progress-view.h
@@ -20,14 +20,14 @@
#ifndef __Progress_View_h__
#define __Progress_View_h__
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <pan/general/progress.h>
namespace pan
{
/**
* GtkProgressBar representations of general::Progress objects.
- *
+ *
* These are used at the bottom of Pan's main window to show
* the status of running Task objects.
*
diff --git a/pan/gui/save-ui.cc b/pan/gui/save-ui.cc
index 2cf3f1a..a5ffed0 100644
--- a/pan/gui/save-ui.cc
+++ b/pan/gui/save-ui.cc
@@ -20,7 +20,7 @@
#include <config.h>
extern "C" {
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/debug.h>
#include <pan/general/macros.h>
@@ -32,7 +32,7 @@ extern "C" {
#include "pad.h"
#include "pan-file-entry.h"
#include "save-ui.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
diff --git a/pan/gui/save-ui.h b/pan/gui/save-ui.h
index 0ac695e..a9aba4f 100644
--- a/pan/gui/save-ui.h
+++ b/pan/gui/save-ui.h
@@ -26,7 +26,7 @@
#include <pan/data/article.h>
#include <pan/data/article-cache.h>
#include <pan/data/data.h>
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include "group-prefs.h"
#include "prefs.h"
@@ -71,5 +71,5 @@ namespace pan
static bool _save_text;
static bool _save_attachments;
};
-}
+}
#endif
diff --git a/pan/gui/score-add-ui.cc b/pan/gui/score-add-ui.cc
index 9584736..4703925 100644
--- a/pan/gui/score-add-ui.cc
+++ b/pan/gui/score-add-ui.cc
@@ -29,7 +29,7 @@ extern "C" {
#include "pad.h"
#include "score-add-ui.h"
#include "score-view-ui.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
@@ -195,9 +195,9 @@ namespace
{ TextMatch::CONTAINS, true, N_("doesn't contain")},
{ TextMatch::IS, false, N_("is")},
{ TextMatch::IS, true, N_("isn't")},
- { TextMatch::BEGINS_WITH, false, N_("starts with")},
+ { TextMatch::BEGINS_WITH, false, N_("starts with")},
{ TextMatch::ENDS_WITH, false, N_("ends with")},
- { TextMatch::REGEX, false, N_("matches regex")},
+ { TextMatch::REGEX, false, N_("matches regex")},
};
GtkListStore * store = gtk_list_store_new (TEXT_MATCH_COLS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
@@ -319,7 +319,7 @@ namespace
GtkTreeModel * model = field_tree_model_new ();
GtkWidget * field = setme_field = value_combo_new (model);
- g_object_unref (G_OBJECT(model));
+ g_object_unref (G_OBJECT(model));
gtk_box_pack_start (GTK_BOX(h), field, false, false, 0);
g_signal_connect (field, "changed", G_CALLBACK(field_changed_cb), h);
g_object_set_data (G_OBJECT(h), "field", field);
@@ -353,7 +353,7 @@ namespace
void
ScoreAddDialog :: add_this_to_scorefile (bool do_rescore)
{
-
+
// section
bool negate (false);
int value (0);
@@ -552,12 +552,12 @@ namespace
GtkWidget * button = gtk_button_new ();
GtkWidget * label = gtk_label_new_with_mnemonic (_("Add and Re_score"));
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-
+
GtkWidget * image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
GtkWidget * image2 = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
GtkWidget * hbox = gtk_hbox_new (FALSE, 2);
GtkWidget * align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-
+
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), image2, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -643,7 +643,7 @@ ScoreAddDialog :: ScoreAddDialog (Data & data,
gtk_widget_show (w);
// score
- h = gtk_hbox_new (false, PAD_SMALL);
+ h = gtk_hbox_new (false, PAD_SMALL);
model = score_tree_model_new ();
w = _score_menu = value_combo_new (model);
g_object_unref (model);
diff --git a/pan/gui/score-add-ui.h b/pan/gui/score-add-ui.h
index 0b43d92..de0c9e2 100644
--- a/pan/gui/score-add-ui.h
+++ b/pan/gui/score-add-ui.h
@@ -1,13 +1,13 @@
#ifndef __SCORE_ADD_UI_H__
#define __SCORE_ADD_UI_H__
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <pan/data/article.h>
#include <pan/data/data.h>
namespace pan
{
- /**
+ /**
* Dialog for creating a new entry for the Scorefile.
* @ingroup GUI
*/
diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc
index 6bc1974..a82b700 100644
--- a/pan/gui/score-view-ui.cc
+++ b/pan/gui/score-view-ui.cc
@@ -20,25 +20,25 @@
#include <config.h>
extern "C" {
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/debug.h>
#include "pad.h"
#include "score-add-ui.h"
#include "score-view-ui.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
namespace
{
- void
+ void
response_cb (GtkDialog * dialog, int response, gpointer data)
{
if (response == GTK_RESPONSE_APPLY)
static_cast<Data*>(data)->rescore ();
- gtk_widget_destroy (GTK_WIDGET(dialog));
+ gtk_widget_destroy (GTK_WIDGET(dialog));
}
enum
@@ -55,13 +55,13 @@ namespace
GtkWidget * button = gtk_button_new ();
GtkWidget * label = gtk_label_new_with_mnemonic (_("Close and Re_score"));
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-
+
GtkWidget * image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON);
GtkWidget * image2 = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
GtkWidget * hbox = gtk_hbox_new (FALSE, 2);
GtkWidget * align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-
+
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), image2, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -167,7 +167,7 @@ ScoreView :: tree_view_refresh ()
COLUMN_DATA, i, // index into _items
-1);
- // cleanup
+ // cleanup
g_string_free (criteria, TRUE);
}
}
@@ -185,7 +185,7 @@ ScoreView :: ScoreView (Data& data, GtkWindow* parent,
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
NULL);
GtkWidget * button = create_rescore_button ();
- gtk_widget_show (button);
+ gtk_widget_show (button);
gtk_dialog_add_action_widget (GTK_DIALOG(w), button, GTK_RESPONSE_APPLY);
gtk_window_set_resizable (GTK_WINDOW(w), true);
g_signal_connect (GTK_OBJECT(w), "response", G_CALLBACK(response_cb), &data);
diff --git a/pan/gui/score-view-ui.h b/pan/gui/score-view-ui.h
index fccaa5b..b96cb16 100644
--- a/pan/gui/score-view-ui.h
+++ b/pan/gui/score-view-ui.h
@@ -20,7 +20,7 @@
#define _ScoreViewUI_h_
#include <vector>
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <pan/general/quark.h>
#include <pan/usenet-utils/scorefile.h>
#include <pan/data/article.h>
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index 3ba8ee2..5b1ff33 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -24,7 +24,7 @@
extern "C" {
#include <glib.h>
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/macros.h>
#include <pan/general/quark.h>
@@ -32,7 +32,7 @@ extern "C" {
#include "server-ui.h"
#include "pad.h"
#include "hig.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
@@ -417,7 +417,7 @@ namespace
GtkDialogFlags(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
- _("Really delete \"%s\"?"),
+ _("Really delete \"%s\"?"),
addr.c_str());
gtk_dialog_add_buttons (GTK_DIALOG(w),
GTK_STOCK_NO, GTK_RESPONSE_NO,
@@ -471,7 +471,7 @@ namespace
void
server_tree_view_row_activated_cb (GtkTreeView*, GtkTreePath*, GtkTreeViewColumn*, gpointer user_data)
{
- edit_button_clicked_cb (NULL, user_data);
+ edit_button_clicked_cb (NULL, user_data);
}
void
@@ -514,7 +514,7 @@ pan :: server_list_dialog_new (Data& data, Queue& queue, GtkWindow* parent)
gtk_tree_view_append_column (GTK_TREE_VIEW (d->server_tree_view), column);
GtkTreeSelection * selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (d->server_tree_view));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-
+
// add callbacks
g_signal_connect (GTK_TREE_VIEW (d->server_tree_view), "row-activated",
G_CALLBACK (server_tree_view_row_activated_cb), d->dialog);
diff --git a/pan/gui/server-ui.h b/pan/gui/server-ui.h
index 2201976..32e6462 100644
--- a/pan/gui/server-ui.h
+++ b/pan/gui/server-ui.h
@@ -20,7 +20,7 @@
#ifndef SERVER_UI_H
#define SERVER_UI_H
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <pan/data/data.h>
#include <pan/tasks/queue.h>
diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc
index 15066e5..da7107f 100644
--- a/pan/gui/task-pane.cc
+++ b/pan/gui/task-pane.cc
@@ -21,7 +21,7 @@
extern "C" {
#include <glib.h>
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
+ #include <pan/gui/gtk-compat.h>
}
#include <pan/general/debug.h>
#include <pan/general/macros.h>
@@ -225,7 +225,7 @@ TaskPane :: update_status (const task_states_t& tasks)
g_snprintf (buf, sizeof(buf), _("Pan: Tasks (%d Queued, %d Running, %d Stopped)"), queued_count, running_count, stopped_count);
else if (running_count || queued_count)
g_snprintf (buf, sizeof(buf), _("Pan: Tasks (%d Queued, %d Running)"), queued_count, running_count);
- else
+ else
g_snprintf (buf, sizeof(buf), _("Pan: Tasks"));
gtk_window_set_title (GTK_WINDOW(_root), buf);
diff --git a/pan/gui/task-pane.h b/pan/gui/task-pane.h
index 99be244..cb81d3d 100644
--- a/pan/gui/task-pane.h
+++ b/pan/gui/task-pane.h
@@ -20,7 +20,7 @@
#ifndef TASK_MANAGER_H
#define TASK_MANAGER_H
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
#include <vector>
#include <pan/tasks/task.h>
#include <pan/tasks/queue.h>
diff --git a/pan/gui/xface.c b/pan/gui/xface.c
index 714c635..6631295 100644
--- a/pan/gui/xface.c
+++ b/pan/gui/xface.c
@@ -1,6 +1,5 @@
#include <string.h>
#include <stdio.h>
-#include <gdk/gdk.h>
#include "xface.h"
/** begin compface.h */
@@ -13,7 +12,7 @@
* Written 11th November 1989.
*
* Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
+ * copyright messages are not removed, and no monies are exchanged.
*
* No responsibility is taken for any errors on inaccuracies inherent
* either to the comments or the code of this program, but if reported
@@ -162,7 +161,7 @@ static void WriteFace P((char *)) ;
* Written 11th November 1989.
*
* Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
+ * copyright messages are not removed, and no monies are exchanged.
*
* No responsibility is taken for any errors on inaccuracies inherent
* either to the comments or the code of this program, but if reported
@@ -452,160 +451,160 @@ static Guesses G
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 1, 0, 1,
+ 0, 1, 0, 1,
},
{
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1,
- 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
- 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0,
- 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1,
- 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1,
- 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
- 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1,
+ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+ 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+ 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1,
+ 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
+ 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1,
+ 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
- 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
+ 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1,
},
{
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1,
- 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1,
+ 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1,
+ 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1,
},
{
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0,
- 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0,
- 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1,
- 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1,
- 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
- 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1,
- 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
- 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
- 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
- 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1,
- 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0,
+ 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0,
+ 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1,
+ 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1,
+ 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+ 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1,
+ 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+ 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
+ 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
+ 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 0, 0, 1, 0, 1, 1, 1,
+ 0, 0, 0, 1, 0, 1, 1, 1,
},
{
- 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
- 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
+ 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 1,
+ 0, 1,
},
{
- 0,
+ 0,
},
{
- 0, 0, 0, 1,
+ 0, 0, 0, 1,
},
{
- 0, 0, 0, 1,
+ 0, 0, 0, 1,
}
}
;
@@ -1068,7 +1067,7 @@ pan_gdk_pixbuf_create_from_x_face (const char *text)
const int stride = cairo_format_stride_for_width( CAIRO_FORMAT_A1, WIDTH);
char xface [2048];
GdkPixbuf * pixbuf = NULL;
-
+
g_strlcpy (xface, text, sizeof(xface));
status = uncompface (xface);
if (status >= 0)
diff --git a/pan/icons/Makefile.am b/pan/icons/Makefile.am
index 0e3680e..3107fb3 100644
--- a/pan/icons/Makefile.am
+++ b/pan/icons/Makefile.am
@@ -44,8 +44,19 @@ stock_images = \
icon_mozilla_smile.png \
icon_mozilla_surprised.png \
icon_mozilla_tongueout.png \
- icon_mozilla_wink.png
-
+ icon_mozilla_wink.png \
+ icon_plain.png \
+ icon_cert.png \
+ icon_status_online.png \
+ icon_status_offline.png \
+ icon_status_active.png \
+ icon_status_queue_empty.png \
+ icon_status_error.png \
+ icon_status_idle.png \
+ icon_status_new_articles.png \
+ icon_sig_ok.png \
+ icon_sig_fail.png
+
EXTRA_DIST = \
pan-template.xcf \
diff --git a/pan/icons/icon_article_read.png b/pan/icons/icon_article_read.png
index 4bdbf0a..f9ed302 100644
Binary files a/pan/icons/icon_article_read.png and b/pan/icons/icon_article_read.png differ
diff --git a/pan/icons/icon_article_unread.png b/pan/icons/icon_article_unread.png
index 211ff9b..752d08c 100644
Binary files a/pan/icons/icon_article_unread.png and b/pan/icons/icon_article_unread.png differ
diff --git a/pan/icons/icon_binary_complete.png b/pan/icons/icon_binary_complete.png
index 430fb85..83b8b58 100644
Binary files a/pan/icons/icon_binary_complete.png and b/pan/icons/icon_binary_complete.png differ
diff --git a/pan/icons/icon_binary_complete_read.png b/pan/icons/icon_binary_complete_read.png
index def3f5a..3a048d9 100644
Binary files a/pan/icons/icon_binary_complete_read.png and b/pan/icons/icon_binary_complete_read.png differ
diff --git a/pan/icons/icon_binary_incomplete.png b/pan/icons/icon_binary_incomplete.png
index b07956c..68a2e01 100644
Binary files a/pan/icons/icon_binary_incomplete.png and b/pan/icons/icon_binary_incomplete.png differ
diff --git a/pan/icons/icon_binary_incomplete_read.png b/pan/icons/icon_binary_incomplete_read.png
index 2c848ef..aa47eb7 100644
Binary files a/pan/icons/icon_binary_incomplete_read.png and b/pan/icons/icon_binary_incomplete_read.png differ
diff --git a/pan/icons/icon_by_me.png b/pan/icons/icon_by_me.png
index 081f4d4..f3352d6 100644
Binary files a/pan/icons/icon_by_me.png and b/pan/icons/icon_by_me.png differ
diff --git a/pan/icons/icon_by_others.png b/pan/icons/icon_by_others.png
index f3a2dbe..79c4dcd 100644
Binary files a/pan/icons/icon_by_others.png and b/pan/icons/icon_by_others.png differ
diff --git a/pan/icons/icon_cert.png b/pan/icons/icon_cert.png
new file mode 100644
index 0000000..ddf83d9
Binary files /dev/null and b/pan/icons/icon_cert.png differ
diff --git a/pan/icons/icon_compose_followup.png b/pan/icons/icon_compose_followup.png
index 03399dc..a57ecaa 100644
Binary files a/pan/icons/icon_compose_followup.png and b/pan/icons/icon_compose_followup.png differ
diff --git a/pan/icons/icon_compose_post.png b/pan/icons/icon_compose_post.png
index 82d83d0..c3deffc 100644
Binary files a/pan/icons/icon_compose_post.png and b/pan/icons/icon_compose_post.png differ
diff --git a/pan/icons/icon_disk.png b/pan/icons/icon_disk.png
index d0f576f..b3f5d93 100644
Binary files a/pan/icons/icon_disk.png and b/pan/icons/icon_disk.png differ
diff --git a/pan/icons/icon_filter.png b/pan/icons/icon_filter.png
index 1c1993c..f4d6eab 100644
Binary files a/pan/icons/icon_filter.png and b/pan/icons/icon_filter.png differ
diff --git a/pan/icons/icon_filter_only_attachments.png b/pan/icons/icon_filter_only_attachments.png
index 91ce6c8..f10caac 100644
Binary files a/pan/icons/icon_filter_only_attachments.png and b/pan/icons/icon_filter_only_attachments.png differ
diff --git a/pan/icons/icon_filter_only_cached.png b/pan/icons/icon_filter_only_cached.png
index 7d230de..c2a2781 100644
Binary files a/pan/icons/icon_filter_only_cached.png and b/pan/icons/icon_filter_only_cached.png differ
diff --git a/pan/icons/icon_filter_only_me.png b/pan/icons/icon_filter_only_me.png
index 2ff09bb..3ac0548 100644
Binary files a/pan/icons/icon_filter_only_me.png and b/pan/icons/icon_filter_only_me.png differ
diff --git a/pan/icons/icon_filter_only_unread.png b/pan/icons/icon_filter_only_unread.png
index 6fe6d81..98f5f4a 100644
Binary files a/pan/icons/icon_filter_only_unread.png and b/pan/icons/icon_filter_only_unread.png differ
diff --git a/pan/icons/icon_filter_only_watched.png b/pan/icons/icon_filter_only_watched.png
index e8512e8..4ffa61c 100644
Binary files a/pan/icons/icon_filter_only_watched.png and b/pan/icons/icon_filter_only_watched.png differ
diff --git a/pan/icons/icon_get_dialog.png b/pan/icons/icon_get_dialog.png
index 863cf8e..aa96cc9 100644
Binary files a/pan/icons/icon_get_dialog.png and b/pan/icons/icon_get_dialog.png differ
diff --git a/pan/icons/icon_get_flagged.png b/pan/icons/icon_get_flagged.png
index f535574..1eb3e77 100644
Binary files a/pan/icons/icon_get_flagged.png and b/pan/icons/icon_get_flagged.png differ
diff --git a/pan/icons/icon_get_selected.png b/pan/icons/icon_get_selected.png
index 5154222..e5419e6 100644
Binary files a/pan/icons/icon_get_selected.png and b/pan/icons/icon_get_selected.png differ
diff --git a/pan/icons/icon_get_subscribed.png b/pan/icons/icon_get_subscribed.png
index 1b9f84d..af3d647 100644
Binary files a/pan/icons/icon_get_subscribed.png and b/pan/icons/icon_get_subscribed.png differ
diff --git a/pan/icons/icon_mozilla_frown.png b/pan/icons/icon_mozilla_frown.png
index 7415032..462bd64 100644
Binary files a/pan/icons/icon_mozilla_frown.png and b/pan/icons/icon_mozilla_frown.png differ
diff --git a/pan/icons/icon_mozilla_smile.png b/pan/icons/icon_mozilla_smile.png
index 0882ead..674a59f 100644
Binary files a/pan/icons/icon_mozilla_smile.png and b/pan/icons/icon_mozilla_smile.png differ
diff --git a/pan/icons/icon_mozilla_surprised.png b/pan/icons/icon_mozilla_surprised.png
index ae4398e..f08152e 100644
Binary files a/pan/icons/icon_mozilla_surprised.png and b/pan/icons/icon_mozilla_surprised.png differ
diff --git a/pan/icons/icon_mozilla_tongueout.png b/pan/icons/icon_mozilla_tongueout.png
index e5bf989..8fc50f6 100644
Binary files a/pan/icons/icon_mozilla_tongueout.png and b/pan/icons/icon_mozilla_tongueout.png differ
diff --git a/pan/icons/icon_mozilla_wink.png b/pan/icons/icon_mozilla_wink.png
index 6c3b8c9..e44263a 100644
Binary files a/pan/icons/icon_mozilla_wink.png and b/pan/icons/icon_mozilla_wink.png differ
diff --git a/pan/icons/icon_pan.png b/pan/icons/icon_pan.png
index b7cc52a..1d6ccad 100644
Binary files a/pan/icons/icon_pan.png and b/pan/icons/icon_pan.png differ
diff --git a/pan/icons/icon_pan_about_logo.png b/pan/icons/icon_pan_about_logo.png
index d11da5d..ac0ec9b 100644
Binary files a/pan/icons/icon_pan_about_logo.png and b/pan/icons/icon_pan_about_logo.png differ
diff --git a/pan/icons/icon_pan_about_logo.xcf b/pan/icons/icon_pan_about_logo.xcf
new file mode 100644
index 0000000..69665b1
Binary files /dev/null and b/pan/icons/icon_pan_about_logo.xcf differ
diff --git a/pan/icons/icon_pan_logo.png b/pan/icons/icon_pan_logo.png
index c707e1b..a0f3d21 100644
Binary files a/pan/icons/icon_pan_logo.png and b/pan/icons/icon_pan_logo.png differ
diff --git a/pan/icons/icon_pan_logo.xcf b/pan/icons/icon_pan_logo.xcf
new file mode 100644
index 0000000..74ad966
Binary files /dev/null and b/pan/icons/icon_pan_logo.xcf differ
diff --git a/pan/icons/icon_plain.png b/pan/icons/icon_plain.png
new file mode 100644
index 0000000..b09e418
Binary files /dev/null and b/pan/icons/icon_plain.png differ
diff --git a/pan/icons/icon_read_group.png b/pan/icons/icon_read_group.png
index afe2b09..32e7035 100644
Binary files a/pan/icons/icon_read_group.png and b/pan/icons/icon_read_group.png differ
diff --git a/pan/icons/icon_read_less.png b/pan/icons/icon_read_less.png
index eb4876d..44f4049 100644
Binary files a/pan/icons/icon_read_less.png and b/pan/icons/icon_read_less.png differ
diff --git a/pan/icons/icon_read_more.png b/pan/icons/icon_read_more.png
index 8eb4fa2..6f24a1a 100644
Binary files a/pan/icons/icon_read_more.png and b/pan/icons/icon_read_more.png differ
diff --git a/pan/icons/icon_read_unread_article.png b/pan/icons/icon_read_unread_article.png
index 125a364..2f1546f 100644
Binary files a/pan/icons/icon_read_unread_article.png and b/pan/icons/icon_read_unread_article.png differ
diff --git a/pan/icons/icon_read_unread_thread.png b/pan/icons/icon_read_unread_thread.png
index 6b66655..943209a 100644
Binary files a/pan/icons/icon_read_unread_thread.png and b/pan/icons/icon_read_unread_thread.png differ
diff --git a/pan/icons/icon_score.png b/pan/icons/icon_score.png
index a309ba9..6016ce8 100644
Binary files a/pan/icons/icon_score.png and b/pan/icons/icon_score.png differ
diff --git a/pan/icons/icon_search_pulldown.png b/pan/icons/icon_search_pulldown.png
index bb8fde9..2a63f0b 100644
Binary files a/pan/icons/icon_search_pulldown.png and b/pan/icons/icon_search_pulldown.png differ
diff --git a/pan/icons/icon_sig_fail.png b/pan/icons/icon_sig_fail.png
new file mode 100644
index 0000000..d9d8e6a
Binary files /dev/null and b/pan/icons/icon_sig_fail.png differ
diff --git a/pan/icons/icon_sig_ok.png b/pan/icons/icon_sig_ok.png
new file mode 100644
index 0000000..49e6c06
Binary files /dev/null and b/pan/icons/icon_sig_ok.png differ
diff --git a/pan/icons/icon_status_active.png b/pan/icons/icon_status_active.png
new file mode 100644
index 0000000..54cc0a4
Binary files /dev/null and b/pan/icons/icon_status_active.png differ
diff --git a/pan/icons/icon_status_error.png b/pan/icons/icon_status_error.png
new file mode 100644
index 0000000..5abdae7
Binary files /dev/null and b/pan/icons/icon_status_error.png differ
diff --git a/pan/icons/icon_status_idle.png b/pan/icons/icon_status_idle.png
new file mode 100644
index 0000000..ac71641
Binary files /dev/null and b/pan/icons/icon_status_idle.png differ
diff --git a/pan/icons/icon_status_new_articles.png b/pan/icons/icon_status_new_articles.png
new file mode 100644
index 0000000..e371813
Binary files /dev/null and b/pan/icons/icon_status_new_articles.png differ
diff --git a/pan/icons/icon_status_offline.png b/pan/icons/icon_status_offline.png
new file mode 100644
index 0000000..224efba
Binary files /dev/null and b/pan/icons/icon_status_offline.png differ
diff --git a/pan/icons/icon_status_online.png b/pan/icons/icon_status_online.png
new file mode 100644
index 0000000..2c7d3b7
Binary files /dev/null and b/pan/icons/icon_status_online.png differ
diff --git a/pan/icons/icon_status_queue_empty.png b/pan/icons/icon_status_queue_empty.png
new file mode 100644
index 0000000..17c6e06
Binary files /dev/null and b/pan/icons/icon_status_queue_empty.png differ
diff --git a/pan/icons/icon_tabbar.png b/pan/icons/icon_tabbar.png
new file mode 100644
index 0000000..cbe7e13
Binary files /dev/null and b/pan/icons/icon_tabbar.png differ
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
