>::const_iterator m = m_messages.find (g->name ());
if (m != m_messages.end ()) {
- text += "" + tl::escaped_to_html (m->second) + "
";
+ if (m->second.first == Warning || m->second.first == Error) {
+ text += "" + tl::escaped_to_html (m->second.second) + "
";
+ } else if (m->second.first == Info) {
+ text += "" + tl::escaped_to_html (m->second.second) + "
";
+ } else {
+ text += "" + tl::escaped_to_html (m->second.second) + "
";
+ }
}
text += "";
@@ -134,7 +162,10 @@ SaltModel::data (const QModelIndex &index, int role) const
int icon_dim = 64;
- const lay::SaltGrain *g = mp_salt->begin_flat ()[index.row ()];
+ const lay::SaltGrain *g = grain_from_index (index);
+ if (!g) {
+ return QVariant ();
+ }
QImage img;
if (g->icon ().isNull ()) {
@@ -160,10 +191,21 @@ SaltModel::data (const QModelIndex &index, int role) const
painter.drawImage (0, 0, warn);
}
- if (m_messages.find (g->name ()) != m_messages.end ()) {
- QPainter painter (&img);
- QImage warn (":/warn_16.png");
- painter.drawImage (0, 0, warn);
+ std::map >::const_iterator m = m_messages.find (g->name ());
+ if (m != m_messages.end ()) {
+ if (m->second.first == Warning) {
+ QPainter painter (&img);
+ QImage warn (":/warn_16.png");
+ painter.drawImage (0, 0, warn);
+ } else if (m->second.first == Error) {
+ QPainter painter (&img);
+ QImage warn (":/error_16.png");
+ painter.drawImage (0, 0, warn);
+ } else if (m->second.first == Info) {
+ QPainter painter (&img);
+ QImage warn (":/info_16.png");
+ painter.drawImage (0, 0, warn);
+ }
}
return QPixmap::fromImage (img);
@@ -179,7 +221,7 @@ SaltModel::index (int row, int column, const QModelIndex &parent) const
if (parent.isValid ()) {
return QModelIndex ();
} else {
- return createIndex (row, column, mp_salt->begin_flat () [row]);
+ return createIndex (row, column, m_ordered_grains [row]);
}
}
@@ -201,7 +243,7 @@ SaltModel::rowCount (const QModelIndex &parent) const
if (parent.isValid ()) {
return 0;
} else {
- return mp_salt->end_flat () - mp_salt->begin_flat ();
+ return int (m_ordered_grains.size ());
}
}
@@ -221,32 +263,149 @@ SaltModel::is_marked (const std::string &name) const
return m_marked.find (name) != m_marked.end ();
}
+bool
+SaltModel::is_enabled (const std::string &name) const
+{
+ return m_disabled.find (name) == m_disabled.end ();
+}
+
void
SaltModel::set_marked (const std::string &name, bool marked)
{
- if (! marked) {
- m_marked.erase (name);
- } else {
- m_marked.insert (name);
+ if (marked != is_marked (name)) {
+ if (! marked) {
+ m_marked.erase (name);
+ } else {
+ m_marked.insert (name);
+ }
+ emit dataChanged (index (0, 0, QModelIndex ()), index (rowCount (QModelIndex ()) - 1, 0, QModelIndex ()));
}
- emit dataChanged (index (0, 0, QModelIndex ()), index (rowCount (QModelIndex ()) - 1, 0, QModelIndex ()));
}
void
-SaltModel::set_message (const std::string &name, const std::string &message)
+SaltModel::clear_marked ()
{
- if (message.empty ()) {
- m_messages.erase (name);
- } else {
- m_messages.insert (std::make_pair (name, message));
+ if (! m_marked.empty ()) {
+ m_marked.clear ();
+ emit dataChanged (index (0, 0, QModelIndex ()), index (rowCount (QModelIndex ()) - 1, 0, QModelIndex ()));
}
- emit dataChanged (index (0, 0, QModelIndex ()), index (rowCount (QModelIndex ()) - 1, 0, QModelIndex ()));
}
-void
+void
+SaltModel::set_enabled (const std::string &name, bool enabled)
+{
+ if (enabled != is_enabled (name)) {
+ if (enabled) {
+ m_disabled.erase (name);
+ } else {
+ m_disabled.insert (name);
+ }
+ emit dataChanged (index (0, 0, QModelIndex ()), index (rowCount (QModelIndex ()) - 1, 0, QModelIndex ()));
+ }
+}
+
+void
+SaltModel::enable_all ()
+{
+ if (! m_disabled.empty ()) {
+ m_disabled.clear ();
+ emit dataChanged (index (0, 0, QModelIndex ()), index (rowCount (QModelIndex ()) - 1, 0, QModelIndex ()));
+ }
+}
+
+void
+SaltModel::clear_order ()
+{
+ m_display_order.clear ();
+}
+
+void
+SaltModel::reset_order (const std::string &name)
+{
+ m_display_order.erase (name);
+}
+
+void
+SaltModel::set_order (const std::string &name, int order)
+{
+ m_display_order[name] = order;
+}
+
+void
+SaltModel::set_message (const std::string &name, Severity severity, const std::string &message)
+{
+ bool needs_update = false;
+ if (message.empty ()) {
+ if (m_messages.find (name) != m_messages.end ()) {
+ m_messages.erase (name);
+ needs_update = true;
+ }
+ } else {
+ std::map >::iterator m = m_messages.find (name);
+ if (m == m_messages.end () || m->second.second != message || m->second.first != severity) {
+ m_messages.insert (std::make_pair (name, std::make_pair (severity, message)));
+ needs_update = true;
+ }
+ }
+
+ if (needs_update) {
+ emit dataChanged (index (0, 0, QModelIndex ()), index (rowCount (QModelIndex ()) - 1, 0, QModelIndex ()));
+ }
+}
+
+void
+SaltModel::clear_messages ()
+{
+ if (! m_messages.empty ()) {
+ m_messages.clear ();
+ emit dataChanged (index (0, 0, QModelIndex ()), index (rowCount (QModelIndex ()) - 1, 0, QModelIndex ()));
+ }
+}
+
+void
SaltModel::update ()
{
+ create_ordered_list ();
reset ();
}
+void
+SaltModel::create_ordered_list ()
+{
+ m_ordered_grains.clear ();
+
+ if (m_display_order.empty ()) {
+
+ for (Salt::flat_iterator i = mp_salt->begin_flat (); i != mp_salt->end_flat (); ++i) {
+ m_ordered_grains.push_back (*i);
+ }
+
+ } else {
+
+ int min_order = m_display_order.begin ()->second;
+ int max_order = min_order;
+ min_order = std::min (min_order, 0);
+ max_order = std::max (max_order, 0);
+
+ for (std::map::const_iterator i = m_display_order.begin (); i != m_display_order.end (); ++i) {
+ min_order = std::min (min_order, i->second);
+ max_order = std::max (max_order, i->second);
+ }
+
+ for (int o = min_order; o <= max_order; ++o) {
+ for (Salt::flat_iterator i = mp_salt->begin_flat (); i != mp_salt->end_flat (); ++i) {
+ std::map::const_iterator d = m_display_order.find ((*i)->name ());
+ int oi = 0;
+ if (d != m_display_order.end ()) {
+ oi = d->second;
+ }
+ if (oi == o) {
+ m_ordered_grains.push_back (*i);
+ }
+ }
+ }
+
+ }
+}
+
}
diff --git a/src/lay/laySaltModel.h b/src/lay/laySaltModel.h
index 20a537e2c..d7ba80d92 100644
--- a/src/lay/laySaltModel.h
+++ b/src/lay/laySaltModel.h
@@ -47,6 +47,17 @@ class SaltModel
Q_OBJECT
public:
+ /**
+ * @brief An enum describing the severity of a message
+ */
+ enum Severity
+ {
+ None = 0,
+ Info = 1,
+ Warning = 2,
+ Error = 3
+ };
+
/**
* @brief Constructor
*/
@@ -57,6 +68,11 @@ public:
*/
QVariant data (const QModelIndex &index, int role) const;
+ /**
+ * @brief Implementation of the QAbstractItemModel interface
+ */
+ Qt::ItemFlags flags (const QModelIndex &index) const;
+
/**
* @brief Implementation of the QAbstractItemModel interface
*/
@@ -93,18 +109,70 @@ public:
*/
void set_marked (const std::string &name, bool marked);
+ /**
+ * @brief Clears the marked state of all grains
+ */
+ void clear_marked ();
+
+ /**
+ * @brief Enables or disables the grain with the given name
+ */
+ void set_enabled (const std::string &name, bool enabled);
+
+ /**
+ * @brief Enables all grains
+ */
+ void enable_all ();
+
/**
* @brief Installs a message on the grain with the given name
* Installing an empty message basically removes the message.
*/
- void set_message (const std::string &name, const std::string &message);
+ void set_message (const std::string &name, Severity severity, const std::string &message);
+
+ /**
+ * @brief Removes a message
+ */
+ void reset_message (const std::string &name)
+ {
+ set_message (name, None, std::string ());
+ }
+
+ /**
+ * @brief Clears all messages
+ */
+ void clear_messages ();
+
+ /**
+ * @brief Sets the display order
+ * Specifying a display order for a name will make the grain appear
+ * before or after other grains.
+ * "update" needs to be called before the order becomes active.
+ * Non-assigned items are considered to have order (0).
+ */
+ void set_order (const std::string &name, int order);
+
+ /**
+ * @brief Resets any display order
+ */
+ void reset_order (const std::string &name);
+
+ /**
+ * @brief Resets all display order specs
+ */
+ void clear_order ();
public:
lay::Salt *mp_salt;
std::set m_marked;
- std::map m_messages;
+ std::set m_disabled;
+ std::map > m_messages;
+ std::map m_display_order;
+ std::vector m_ordered_grains;
bool is_marked (const std::string &name) const;
+ bool is_enabled (const std::string &name) const;
+ void create_ordered_list ();
};
// --------------------------------------------------------------------------------------
diff --git a/src/tl/tlString.cc b/src/tl/tlString.cc
index 22d05402f..3179df4ac 100644
--- a/src/tl/tlString.cc
+++ b/src/tl/tlString.cc
@@ -416,6 +416,20 @@ tl::to_word_or_quoted_string (const std::string &s, const char *non_term)
void
tl::escape_to_html (std::string &out, const std::string &in, bool replace_newlines)
{
+
+
+
+
+
+
+
+
+
+
+
+
+
+
for (const char *cp = in.c_str (); *cp; ++cp) {
if (*cp == '<') {
out += "<";
diff --git a/src/tl/tlWebDAV.cc b/src/tl/tlWebDAV.cc
index 19c2a004e..04706e78e 100644
--- a/src/tl/tlWebDAV.cc
+++ b/src/tl/tlWebDAV.cc
@@ -273,8 +273,10 @@ WebDAVObject::download (const std::string &url, const std::string &target)
bool has_errors = false;
{
- tl::info << tl::to_string (QObject::tr ("Downloading %1 files now").arg (items.size ()));
+ tl::info << tl::to_string (QObject::tr ("Downloading %1 file(s) now ..").arg (items.size ()));
+
tl::RelativeProgress progress (tl::to_string (QObject::tr ("Downloading file(s) from %1").arg (tl::to_qstring (url))), items.size (), 1);
+
for (std::list::const_iterator i = items.begin (); i != items.end (); ++i) {
tl::info << QObject::tr ("Downloading '%1' to '%2' ..").arg (tl::to_qstring (i->url)).arg (tl::to_qstring (i->path));
@@ -307,6 +309,8 @@ WebDAVObject::download (const std::string &url, const std::string &target)
has_errors = true;
}
+ ++progress;
+
}
}