2005-10-13 [colin] 1.9.15cvs44
authorColin Leroy <colin@colino.net>
Thu, 13 Oct 2005 19:56:17 +0000 (19:56 +0000)
committerColin Leroy <colin@colino.net>
Thu, 13 Oct 2005 19:56:17 +0000 (19:56 +0000)
* src/mimeview.c
* src/noticeview.c
* src/noticeview.h
Add a tooltip on the icon (optional)
Get rid of the signature buttons and only
use the icon+tooltip

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/mimeview.c
src/noticeview.c
src/noticeview.h

index f0fe040ae728a35414cbc80745dd472ee39e0c23..7403332231a823c40820a3ebb85c45c86ca077a9 100644 (file)
@@ -1,3 +1,12 @@
+2005-10-13 [colin]     1.9.15cvs44
+
+       * src/mimeview.c
+       * src/noticeview.c
+       * src/noticeview.h
+               Add a tooltip on the icon (optional) 
+               Get rid of the signature buttons and only
+               use the icon+tooltip
+
 2005-10-13 [colin]     1.9.15cvs43
 
        * src/noticeview.c
index 12ee84f159d33dfa2359e597a1dd27c6e30adbee..4d2114edc69202c78592b1997f289b3e7081ff58 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.183 -r 1.382.2.184 src/compose.c;  ) > 1.9.15cvs41.patchset
 ( cvs diff -u -r 1.395.2.136 -r 1.395.2.137 src/summaryview.c;  ) > 1.9.15cvs42.patchset
 ( cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/noticeview.c;  cvs diff -u -r 1.3.8.4 -r 1.3.8.5 src/noticeview.h;  ) > 1.9.15cvs43.patchset
+( cvs diff -u -r 1.83.2.43 -r 1.83.2.44 src/mimeview.c;  cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/noticeview.c;  cvs diff -u -r 1.3.8.5 -r 1.3.8.6 src/noticeview.h;  ) > 1.9.15cvs44.patchset
index 5413182becaa61146bf4edeb32acf12317d0d999..39e346e11c3767628e58487c89a32587850dca5c 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=43
+EXTRA_VERSION=44
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 981401b3fae47c11a7fc82a0fe9313e3f9bb2804..6dc050e917f3708e38040ce3e89b9802c3d11d03 100644 (file)
@@ -639,22 +639,22 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
        
        switch (privacy_mimeinfo_get_sig_status(mimeinfo)) {
        case SIGNATURE_UNCHECKED:
-               button_text = _("Check");
+               button_text = _("Check signature");
                func = check_signature_cb;
                icon = STOCK_PIXMAP_PRIVACY_SIGNED;
                break;
        case SIGNATURE_OK:
-               button_text = _("Full info");
+               button_text = _("View full information");
                func = display_full_info_cb;
                icon = STOCK_PIXMAP_PRIVACY_PASSED;
                break;
        case SIGNATURE_WARN:
-               button_text = _("Full info");
+               button_text = _("View full information");
                func = display_full_info_cb;
                icon = STOCK_PIXMAP_PRIVACY_WARN;
                break;
        case SIGNATURE_INVALID:
-               button_text = _("Full info");
+               button_text = _("View full information");
                func = display_full_info_cb;
                icon = STOCK_PIXMAP_PRIVACY_FAILED;
                break;
@@ -668,12 +668,13 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
        text = privacy_mimeinfo_sig_info_short(mimeinfo);
        noticeview_set_text(mimeview->siginfoview, text);
        g_free(text);
-       noticeview_set_button_text(mimeview->siginfoview, button_text);
+       noticeview_set_button_text(mimeview->siginfoview, NULL);
        noticeview_set_button_press_callback(
                mimeview->siginfoview,
                G_CALLBACK(func),
                (gpointer) mimeview);
        noticeview_set_icon(mimeview->siginfoview, icon);
+       noticeview_set_tooltip(mimeview->siginfoview, button_text);
 }
 
 static void check_signature_cb(GtkWidget *widget, gpointer user_data)
@@ -703,11 +704,12 @@ static void display_full_info_cb(GtkWidget *widget, gpointer user_data)
        siginfo = privacy_mimeinfo_sig_info_full(mimeview->siginfo);
        textview_set_text(mimeview->textview, siginfo);
        g_free(siginfo);
-       noticeview_set_button_text(mimeview->siginfoview, _("Back to email"));
+       noticeview_set_button_text(mimeview->siginfoview, NULL);
        noticeview_set_button_press_callback(
                mimeview->siginfoview,
                G_CALLBACK(redisplay_email),
                (gpointer) mimeview);
+       noticeview_set_tooltip(mimeview->siginfoview, _("Go back to email"));
 }
 
 static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
index 21b3d9aab39bc94f5546bb83fdbb258849014ada..1e127fe29a544d7f50e3da00fd04130e5274d7bc 100644 (file)
@@ -75,6 +75,7 @@ NoticeView *noticeview_create(MainWindow *mainwin)
        GtkWidget  *widget;
        GtkWidget  *widget2;
        GtkWidget  *evtbox;
+       GtkTooltips *tooltips;
 
        debug_print("Creating notice view...\n");
        noticeview = g_new0(NoticeView, 1);
@@ -133,6 +134,8 @@ NoticeView *noticeview_create(MainWindow *mainwin)
                         (gpointer) noticeview);
        gtk_box_pack_start(GTK_BOX(hbox), widget2, FALSE, FALSE, 0);
        
+       tooltips = gtk_tooltips_new();
+       
        noticeview->vbox   = vbox;
        noticeview->hsep   = hsep;
        noticeview->hbox   = hbox;
@@ -142,6 +145,7 @@ NoticeView *noticeview_create(MainWindow *mainwin)
        noticeview->button2= widget2;
        noticeview->evtbox = evtbox;
        noticeview->visible= TRUE;
+       noticeview->tooltips = tooltips;
 
        return noticeview;
 }
@@ -297,3 +301,12 @@ void noticeview_set_icon_clickable(NoticeView *noticeview, gboolean setting)
 {
        noticeview->icon_clickable = setting;
 }              
+
+void noticeview_set_tooltip (NoticeView *noticeview, const gchar *text)
+{
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(noticeview->tooltips), 
+                       noticeview->evtbox,
+                       text,
+                       NULL);
+
+}
index 2535a39342f4e7dbe18e4b12b3eba48acd9a8cf9..bd6612b5caf02c32338a496edd545940972ad89b 100644 (file)
@@ -41,6 +41,7 @@ struct _NoticeView
        void            (*press2) (NoticeView *, gpointer user_data);
        gboolean         icon_clickable;
        GtkWidget       *evtbox;
+       GtkTooltips     *tooltips;
 };
 
 NoticeView     *noticeview_create      (MainWindow     *mainwin);
@@ -71,4 +72,7 @@ void           noticeview_set_2ndbutton_press_callback
 void            noticeview_set_icon_clickable
                                        (NoticeView     *noticeview,
                                         gboolean        setting);                      
+void            noticeview_set_tooltip
+                                       (NoticeView     *noticeview,
+                                        const gchar    *text);                 
 #endif /* NOTICEVIEW_H__ */