Commit 1d796c78 authored by Jim Nelson's avatar Jim Nelson
Browse files

Merged from github, some alterations

Can't take submessages (helpful message) because we're past
string freeze.  "No conversations selected" is never displayed.
parent 29ae18b3
......@@ -226,7 +226,21 @@ public class ConversationViewer : Gtk.Box {
// Update the counter's count.
WebKit.DOM.HTMLElement counter =
web_view.get_dom_document().get_element_by_id("selection_counter") as WebKit.DOM.HTMLElement;
counter.set_inner_html(msg);
WebKit.DOM.HTMLElement message_box =
web_view.get_dom_document().get_element_by_id("special_message_container") as WebKit.DOM.HTMLElement;
WebKit.DOM.HTMLElement message = Util.DOM.select(message_box, "#message");
message.set_inner_html(msg);
File icon_file =
GearyApplication.instance.get_resource_directory().get_child("icons").get_child("help-info-symbolic.png");
Geary.Memory.FileBuffer icon_buffer = new Geary.Memory.FileBuffer(icon_file, true);
WebKit.DOM.HTMLImageElement img = Util.DOM.select(message_box, "#icon") as WebKit.DOM.HTMLImageElement;
img.set_attribute("src", assemble_data_uri("image/png", icon_buffer));
counter.set_attribute("style", "display:none");
message_box.set_attribute("style", "display:block");
} catch (Error e) {
debug("Error updating counter: %s", e.message);
}
......@@ -238,6 +252,14 @@ public class ConversationViewer : Gtk.Box {
clear(current_folder, current_account_information);
set_mode(DisplayMode.NONE);
try {
WebKit.DOM.HTMLElement message_box =
web_view.get_dom_document().get_element_by_id("special_message_container") as WebKit.DOM.HTMLElement;
message_box.set_attribute("style", "display:none");
} catch (Error e) {
debug("Error hiding special message box: %s", e.message);
}
}
private void show_multiple_selected(uint selected_count) {
......
......@@ -669,3 +669,23 @@ License: http://cssload.net/en/terms_of_use
/* /Spinner */
.special_message {
color:#6e6e6e;
font-size:larger;
display:none;
word-wrap:break-word;
width:350px;
height:200px;
box-sizing:border-box;
padding-top:40px;
margin:0 auto;
}
.special_message #icon {
float:left;
margin:10px;
}
.special_message #message {
margin-top:25px;
}
......@@ -2,6 +2,10 @@
<head><title>Geary</title></head>
<body>
<div id="message_container"><span id="placeholder"></span></div>
<div id="special_message_container" class="special_message">
<img id="icon" src="" width="48" height="48" />
<div id="message"></div>
</div>
<div id="multiple_messages"><div id="selection_counter" class="email"></div></div>
<div id="email_template" class="email">
<div class="compressed_note"><span><span></div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment