[gnome-control-center/new-printers-panel] printers: Add printer's status field
- From: Marek Kašík <mkasik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/new-printers-panel] printers: Add printer's status field
- Date: Mon, 10 Jan 2011 16:53:12 +0000 (UTC)
commit f062b9fcf470df51b4c30613afc5981ed4b41313
Author: Marek Kasik <mkasik redhat com>
Date: Mon Jan 10 17:50:16 2011 +0100
printers: Add printer's status field
panels/printers/cc-printers-panel.c | 137 +++++++++++++++++++++++++++++++++--
panels/printers/printers.ui | 58 +++++++++++----
2 files changed, 173 insertions(+), 22 deletions(-)
---
diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
index db1496f..c722d03 100644
--- a/panels/printers/cc-printers-panel.c
+++ b/panels/printers/cc-printers-panel.c
@@ -132,11 +132,56 @@ printer_selection_changed_cb (GtkTreeSelection *selection,
GtkTreeIter iter;
const gchar *none = "---";
GtkWidget *widget;
- gboolean paused = FALSE;
+ gchar *reason = NULL;
+ gchar **printer_reasons = NULL;
gchar *description = NULL;
gchar *device_uri = NULL;
gchar *location = NULL;
- int id, i;
+ gchar *status = NULL;
+ int printer_state = 3;
+ int id, i, j;
+ static const char * const reasons[] =
+ {
+ "toner-low",
+ "toner-empty",
+ "developer-low",
+ "developer-empty",
+ "marker-supply-low",
+ "marker-supply-empty",
+ "cover-open",
+ "door-open",
+ "media-low",
+ "media-empty",
+ "offline",
+ "paused",
+ "marker-waste-almost-full",
+ "marker-waste-full",
+ "opc-near-eol",
+ "opc-life-over"
+ };
+ static const char * statuses[] =
+ {
+ N_("Low on toner"),
+ N_("Out of toner"),
+ /* Translators: "Developer" like on photo development context */
+ N_("Low on developer"),
+ /* Translators: "Developer" like on photo development context */
+ N_("Out of developer"),
+ /* Translators: "marker" is one color bin of the printer */
+ N_("Low on a marker supply"),
+ /* Translators: "marker" is one color bin of the printer */
+ N_("Out of a marker supply"),
+ N_("Open cover"),
+ N_("Open door"),
+ N_("Low on paper"),
+ N_("Out of paper"),
+ N_("Offline"),
+ N_("Paused"),
+ N_("Waste receptacle almost full"),
+ N_("Waste receptacle full"),
+ N_("The optical photo conductor is near end of life"),
+ N_("The optical photo conductor is no longer functioning")
+ };
priv = PRINTERS_PANEL_PRIVATE (self);
@@ -163,11 +208,87 @@ printer_selection_changed_cb (GtkTreeSelection *selection,
else if (g_strcmp0 (priv->dests[id].options[i].name, "device-uri") == 0)
device_uri = g_strdup (priv->dests[id].options[i].value);
else if (g_strcmp0 (priv->dests[id].options[i].name, "printer-state") == 0)
- paused = (g_strcmp0 (priv->dests[id].options[i].value, "5") == 0);
+ printer_state = atoi (priv->dests[id].options[i].value);
else if (g_strcmp0 (priv->dests[id].options[i].name, "printer-info") == 0)
description = g_strdup (priv->dests[id].options[i].value);
+ else if (g_strcmp0 (priv->dests[id].options[i].name, "printer-state-reasons") == 0)
+ reason = priv->dests[id].options[i].value;
}
+ /* Find the first of the most severe reasons
+ * and show it in the status field
+ */
+ if (reason && g_strcmp0 (reason, "none") != 0)
+ {
+ int errors = 0, warnings = 0, reports = 0;
+ int error_index = -1, warning_index = -1, report_index = -1;
+
+ printer_reasons = g_strsplit (reason, ",", -1);
+ for (i = 0; i < g_strv_length (printer_reasons); i++)
+ {
+ for (j = 0; j < G_N_ELEMENTS (reasons); j++)
+ if (strncmp (printer_reasons[i],
+ reasons[j],
+ strlen (reasons[j])) == 0)
+ {
+ if (g_str_has_suffix (printer_reasons[i], "-report"))
+ {
+ if (reports == 0)
+ report_index = j;
+ reports++;
+ }
+ else if (g_str_has_suffix (printer_reasons[i], "-warning"))
+ {
+ if (warnings == 0)
+ warning_index = j;
+ warnings++;
+ }
+ else
+ {
+ if (errors == 0)
+ error_index = j;
+ errors++;
+ }
+ }
+ }
+ g_strfreev (printer_reasons);
+
+ if (error_index >= 0)
+ status = g_strdup (statuses[error_index]);
+ else if (warning_index >= 0)
+ status = g_strdup (statuses[warning_index]);
+ else if (report_index >= 0)
+ status = g_strdup (statuses[report_index]);
+ }
+
+ if (status == NULL)
+ {
+ switch (printer_state)
+ {
+ case 3:
+ status = g_strdup ( N_ ("Idle"));
+ break;
+ case 4:
+ status = g_strdup ( N_ ("Processing"));
+ break;
+ case 5:
+ status = g_strdup ( N_ ("Paused"));
+ break;
+ }
+ }
+
+ widget = (GtkWidget*)
+ gtk_builder_get_object (priv->builder, "printer-status-label");
+
+ if (status)
+ {
+ gtk_label_set_text (GTK_LABEL (widget), status);
+ g_free (status);
+ }
+ else
+ gtk_label_set_text (GTK_LABEL (widget), none);
+
+
widget = (GtkWidget*)
gtk_builder_get_object (priv->builder, "printer-location-label");
@@ -208,9 +329,9 @@ printer_selection_changed_cb (GtkTreeSelection *selection,
gtk_builder_get_object (priv->builder, "printer-disable-button");
gtk_widget_set_sensitive (widget, TRUE);
- g_signal_handlers_block_by_func(G_OBJECT (widget), printer_disable_cb, self);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), paused);
- g_signal_handlers_unblock_by_func(G_OBJECT (widget), printer_disable_cb, self);
+ g_signal_handlers_block_by_func (G_OBJECT (widget), printer_disable_cb, self);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), printer_state == 5);
+ g_signal_handlers_unblock_by_func (G_OBJECT (widget), printer_disable_cb, self);
}
else
{
@@ -431,7 +552,7 @@ actualize_jobs_list (CcPrintersPanel *self)
gchar *time_string;
gchar *state = NULL;
- ts = localtime(&(priv->jobs[i].creation_time));
+ ts = localtime (&(priv->jobs[i].creation_time));
time_string = g_strdup_printf ("%02d:%02d:%02d", ts->tm_hour, ts->tm_min, ts->tm_sec);
switch (priv->jobs[i].state)
@@ -583,7 +704,7 @@ ccGetAllowedUsers (gchar ***allowed_users, char *printer_name)
{
if (attr->group_tag == IPP_TAG_PRINTER &&
attr->value_tag == IPP_TAG_NAME &&
- !g_strcmp0(attr->name, "requesting-user-name-allowed"))
+ !g_strcmp0 (attr->name, "requesting-user-name-allowed"))
allowed = attr;
}
diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui
index 832b511..08b87f5 100644
--- a/panels/printers/printers.ui
+++ b/panels/printers/printers.ui
@@ -76,7 +76,7 @@
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
- <property name="n_rows">5</property>
+ <property name="n_rows">6</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
<property name="row_spacing">10</property>
@@ -133,8 +133,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
</packing>
</child>
<child>
@@ -145,8 +145,8 @@
<property name="label" translatable="yes">Share with these users:</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -158,8 +158,8 @@
<property name="label" translatable="yes">Printer URI:</property>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -171,8 +171,8 @@
<property name="label" translatable="yes">Ink:</property>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -184,8 +184,8 @@
<property name="label" translatable="yes">Location:</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -210,14 +210,29 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkDrawingArea" id="drawingarea1">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <object class="GtkDrawingArea" id="drawingarea1">
+ <object class="GtkLabel" id="printer-location-label">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">---</property>
+ <property name="ellipsize">end</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -228,28 +243,43 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="printer-location-label">
+ <object class="GtkLabel" id="printer-description-label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">---</property>
+ <property name="ellipsize">end</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Status:</property>
+ </object>
+ <packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="printer-description-label">
+ <object class="GtkLabel" id="printer-status-label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">---</property>
+ <property name="ellipsize">end</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
