0.9.0claws84

* src/Makefile.am
* src/messageview.c
* src/mimeview.[ch]
* src/stock_pixmap.[ch]
        move mimeview tabs to the right side and use icons
        instead of text to save some space

(patch by Luke Plant <lukeplant@softhome.net>)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 12e0064cd98404bf8d6568a2146388fbcfa0e89e..7b46a5222bffb7dc04f8a6e0724d5e08e5448476 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2003-07-05 [christoph] 0.9.0claws84
+
+       * src/Makefile.am
+       * src/messageview.c
+       * src/mimeview.[ch]
+       * src/stock_pixmap.[ch]
+               move mimeview tabs to the right side and use icons
+               instead of text to save some space
+
+       (patch by Luke Plant <lukeplant@softhome.net>)
+
 2003-07-05 [christoph] 0.9.0claws83
 
        * src/inc.c

diff --git a/configure.ac b/configure.ac
index 6b4d631bf4d424ed1ed98f7769abc3f8868e09a6..502a4918c79995d42ec86e7df0f1ee9b8e6bb00b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws83
+EXTRA_VERSION=claws84
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/Makefile.am b/src/Makefile.am
index 4fb351dd2413869838dbd12a8574ed59f2e32787..65ecd8d26349783e42799d7736b11cfe76e0f951 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,18 +131,18 @@ EXTRA_DIST = \
        pixmaps/category.xpm \
        pixmaps/checkbox_off.xpm \
        pixmaps/checkbox_on.xpm \
-       pixmaps/clip.xpm \
        pixmaps/clipkey.xpm \
+       pixmaps/clip.xpm \
        pixmaps/close.xpm \
        pixmaps/complete.xpm \
        pixmaps/continue.xpm \
        pixmaps/deleted.xpm \
        pixmaps/dir_close.xpm \
-       pixmaps/dir_open.xpm \
        pixmaps/dir_open_hrm.xpm \
+       pixmaps/dir_open.xpm \
+       pixmaps/down_arrow.xpm \
        pixmaps/drafts_close.xpm \
        pixmaps/drafts_open.xpm \
-       pixmaps/down_arrow.xpm \
        pixmaps/error.xpm \
        pixmaps/exec.xpm \
        pixmaps/folder.xpm \
@@ -150,49 +150,50 @@ EXTRA_DIST = \
        pixmaps/gpg_signed.xpm \
        pixmaps/group.xpm \
        pixmaps/ignorethread.xpm \
-       pixmaps/inbox.xpm \
        pixmaps/inbox_hrm.xpm \
+       pixmaps/inbox.xpm \
        pixmaps/interface.xpm \
        pixmaps/jpilot.xpm \
        pixmaps/key.xpm \
        pixmaps/ldap.xpm \
        pixmaps/linewrap.xpm \
        pixmaps/locked.xpm \
-       pixmaps/mail.xpm \
        pixmaps/mail_attach.xpm \
        pixmaps/mail_compose.xpm \
        pixmaps/mail_forward.xpm \
-       pixmaps/mail_receive.xpm \
        pixmaps/mail_receive_all.xpm \
-       pixmaps/mail_reply.xpm \
+       pixmaps/mail_receive.xpm \
        pixmaps/mail_reply_to_all.xpm \
        pixmaps/mail_reply_to_author.xpm \
-       pixmaps/mail_send.xpm \
+       pixmaps/mail_reply.xpm \
        pixmaps/mail_send_queue.xpm \
+       pixmaps/mail_send.xpm \
+       pixmaps/mail.xpm \
        pixmaps/mark.xpm \
-       pixmaps/new.xpm \
+       pixmaps/messageview_text.xpm \
        pixmaps/news_compose.xpm \
-       pixmaps/outbox.xpm \
+       pixmaps/new.xpm \
+       pixmaps/notice_error.xpm \
+       pixmaps/notice_note.xpm \
+       pixmaps/notice_warn.xpm \
        pixmaps/outbox_hrm.xpm \
+       pixmaps/outbox.xpm \
        pixmaps/paste.xpm \
        pixmaps/preferences.xpm \
        pixmaps/properties.xpm \
+       pixmaps/quicksearch.xpm \
        pixmaps/regular.xpm \
        pixmaps/replied.xpm \
        pixmaps/search.xpm \
-       pixmaps/sylpheed.xpm \
        pixmaps/sylpheed_logo.xpm \
-       pixmaps/trash.xpm \
+       pixmaps/sylpheed.xpm \
        pixmaps/trash_hrm.xpm \
+       pixmaps/trash.xpm \
        pixmaps/unread.xpm \
        pixmaps/up_arrow.xpm \
        pixmaps/vcard.xpm \
        pixmaps/work_offline.xpm \
-       pixmaps/work_online.xpm \
-       pixmaps/notice_warn.xpm \
-       pixmaps/notice_error.xpm \
-       pixmaps/notice_note.xpm \
-       pixmaps/quicksearch.xpm
+       pixmaps/work_online.xpm
 
 INCLUDES = \
        -Icommon \

diff --git a/src/messageview.c b/src/messageview.c
index 97bbc6b13e252ac49e1128f8a77c05a4a09f28b6..63682094e11286fa7b08ecba7332536cf8df8f92 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -301,7 +301,7 @@ MessageView *messageview_create(MainWindow *mainwin)
        textview = textview_create();
        textview->messageview = messageview;
 
-       mimeview = mimeview_create();
+       mimeview = mimeview_create(mainwin);
        mimeview->textview = textview_create();
        mimeview->textview->messageview = messageview;
        mimeview->messageview = messageview;

diff --git a/src/mimeview.c b/src/mimeview.c
index 3a3d8fa87529a37ac17c79ba834b4a493cdeaf60..846d554976df1b04d68ca66f656d601d8ddceb3f 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -57,6 +57,7 @@
 #include "gtkutils.h"
 #include "prefs_common.h"
 #include "rfc2015.h"
+#include "stock_pixmap.h"
 
 typedef enum
 {
@@ -131,7 +132,7 @@ static GtkTargetEntry mimeview_mime_types[] =
 GSList *mimeviewer_factories;
 GSList *mimeviews;
 
-MimeView *mimeview_create(void)
+MimeView *mimeview_create(MainWindow *mainwin)
 {
        MimeView *mimeview;
 
@@ -142,6 +143,7 @@ MimeView *mimeview_create(void)
        GtkWidget *ctree;
        GtkWidget *mime_vbox;
        GtkWidget *popupmenu;
+       GtkWidget *icon;
        GtkItemFactory *popupfactory;
        gchar *titles[N_MIMEVIEW_COLS];
        gint n_entries;
@@ -159,9 +161,10 @@ MimeView *mimeview_create(void)
 
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_container_add(GTK_CONTAINER(notebook), vbox);
-       gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook), vbox,
-                                       _("Text"));
-
+       icon = stock_pixmap_widget(mainwin->window, STOCK_PIXMAP_MESSAGEVIEW_TEXT); 
+       gtk_widget_show(icon);
+       gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook), vbox, icon);
+       
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
@@ -197,8 +200,10 @@ MimeView *mimeview_create(void)
        gtk_paned_add1(GTK_PANED(paned), scrolledwin);
        gtk_paned_add2(GTK_PANED(paned), mime_vbox);
        gtk_container_add(GTK_CONTAINER(notebook), paned);
-       gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook), paned,
-                                       _("Attachments"));
+       icon = stock_pixmap_widget(mainwin->window, STOCK_PIXMAP_CLIP); 
+       gtk_widget_show(icon);
+       gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook), paned, icon);
+       gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_RIGHT);
 
        gtk_widget_show_all(notebook);
 

diff --git a/src/mimeview.h b/src/mimeview.h
index 5411b1c21ce154653c1b042162344f00c18956b4..93865d26d6ece5f437aae3c98a7c3df3a1db5ddd 100644 (file)
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -94,7 +94,7 @@ struct _MimeViewer
        void            (*destroy_viewer)       (MimeViewer *);
 };
 
-MimeView *mimeview_create      (void);
+MimeView *mimeview_create      (MainWindow     *mainwin);
 void mimeview_init             (MimeView       *mimeview);
 void mimeview_show_message     (MimeView       *mimeview,
                                 MimeInfo       *mimeinfo,

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 731fddf53977f937c9aacee7afbabcbbb2c7682b..7c7cb14ccee5e63f3535bc9909242c994a522918 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -93,7 +93,8 @@
 #include "pixmaps/gpg_signed.xpm"
 #include "pixmaps/drafts_close.xpm"
 #include "pixmaps/drafts_open.xpm"
-
+#include "pixmaps/messageview_text.xpm"
+                  
 typedef struct _StockPixmapData        StockPixmapData;
 
 struct _StockPixmapData
@@ -187,6 +188,7 @@ static StockPixmapData pixmaps[] =
        {gpg_signed_xpm                         , NULL, NULL, "gpg_signed", "  "},
        {drafts_close_xpm                       , NULL, NULL, "drafts_close", "  "},
        {drafts_open_xpm                        , NULL, NULL, "drafts_open", "  "},
+       {messageview_text_xpm                   , NULL, NULL, "messageview_text", "  "},
        {sylpheed_logo_xpm                      , NULL, NULL, "sylpheed_logo", "  "},
 };
 
@@ -350,4 +352,3 @@ StockPixmap stock_pixmap_get_icon (gchar *file)
        }
        return -1;
 }
-       

diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index d54ee932b2865f4ca8c4a47461bed6c3de39305a..99d7ac87541182be5a33d2448afde306ac37840c 100644 (file)
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -102,6 +102,7 @@ typedef enum
        STOCK_PIXMAP_GPG_SIGNED,
        STOCK_PIXMAP_DRAFTS_CLOSE,
        STOCK_PIXMAP_DRAFTS_OPEN,
+       STOCK_PIXMAP_MESSAGEVIEW_TEXT,
 
        STOCK_PIXMAP_SYLPHEED_LOGO,             /* last entry */