diff options
author | Paolo Borelli <pborelli@gnome.org> | 2014-02-08 14:16:46 +0100 |
---|---|---|
committer | Paolo Borelli <pborelli@gnome.org> | 2014-02-08 14:16:46 +0100 |
commit | d3a2ebb0259c0c45669f197c10b2409796b442c7 (patch) | |
tree | f5773634ae914b1f9395bcf5f2c38c793e891935 /plugins/docinfo | |
parent | d79bd7420001eab8e90dea65852309b1a36d956f (diff) | |
download | gedit-d3a2ebb0259c0c45669f197c10b2409796b442c7.tar.gz |
Use the header subtitle in the doc stats dialog
Diffstat (limited to 'plugins/docinfo')
-rw-r--r-- | plugins/docinfo/gedit-docinfo-plugin.c | 11 | ||||
-rw-r--r-- | plugins/docinfo/gedit-docinfo-plugin.ui | 544 |
2 files changed, 252 insertions, 303 deletions
diff --git a/plugins/docinfo/gedit-docinfo-plugin.c b/plugins/docinfo/gedit-docinfo-plugin.c index 25e611791..983139c11 100644 --- a/plugins/docinfo/gedit-docinfo-plugin.c +++ b/plugins/docinfo/gedit-docinfo-plugin.c @@ -45,7 +45,7 @@ struct _GeditDocinfoPluginPrivate GSimpleAction *action; GtkWidget *dialog; - GtkWidget *file_name_label; + GtkWidget *header_bar; GtkWidget *lines_label; GtkWidget *words_label; GtkWidget *chars_label; @@ -153,8 +153,8 @@ update_document_info (GeditDocinfoPlugin *plugin, gint white_chars = 0; gint lines = 0; gint bytes = 0; - gchar *tmp_str; gchar *doc_name; + gchar *tmp_str; gedit_debug (DEBUG_PLUGINS); @@ -182,10 +182,8 @@ update_document_info (GeditDocinfoPlugin *plugin, gedit_debug_message (DEBUG_PLUGINS, "Bytes: %d", bytes); doc_name = gedit_document_get_short_name_for_display (doc); - tmp_str = g_strdup_printf ("<span weight=\"bold\">%s</span>", doc_name); - gtk_label_set_markup (GTK_LABEL (priv->file_name_label), tmp_str); + gtk_header_bar_set_subtitle (GTK_HEADER_BAR (priv->header_bar), doc_name); g_free (doc_name); - g_free (tmp_str); tmp_str = g_strdup_printf("%d", lines); gtk_label_set_text (GTK_LABEL (priv->document_lines_label), tmp_str); @@ -338,7 +336,7 @@ create_docinfo_dialog (GeditDocinfoPlugin *plugin) builder = gtk_builder_new (); gtk_builder_add_from_resource (builder, "/org/gnome/gedit/plugins/docinfo/ui/gedit-docinfo-plugin.ui", NULL); priv->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "dialog")); - priv->file_name_label = GTK_WIDGET (gtk_builder_get_object (builder, "file_name_label")); + priv->header_bar = GTK_WIDGET (gtk_builder_get_object (builder, "header_bar")); priv->words_label = GTK_WIDGET (gtk_builder_get_object (builder, "words_label")); priv->bytes_label = GTK_WIDGET (gtk_builder_get_object (builder, "bytes_label")); priv->lines_label = GTK_WIDGET (gtk_builder_get_object (builder, "lines_label")); @@ -378,7 +376,6 @@ create_docinfo_dialog (GeditDocinfoPlugin *plugin) * prevent loosing the selection in the document when * creating the dialog. */ - gtk_widget_set_can_focus (priv->file_name_label, FALSE); gtk_widget_set_can_focus (priv->words_label, FALSE); gtk_widget_set_can_focus (priv->bytes_label, FALSE); gtk_widget_set_can_focus (priv->lines_label, FALSE); diff --git a/plugins/docinfo/gedit-docinfo-plugin.ui b/plugins/docinfo/gedit-docinfo-plugin.ui index fbeab1620..84cf918d8 100644 --- a/plugins/docinfo/gedit-docinfo-plugin.ui +++ b/plugins/docinfo/gedit-docinfo-plugin.ui @@ -9,7 +9,7 @@ <property name="destroy_with_parent">True</property> <property name="type_hint">dialog</property> <child type="titlebar"> - <object class="GtkHeaderBar" id="headerbar"> + <object class="GtkHeaderBar" id="header_bar"> <property name="title" translatable="yes">Document Statistics</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -51,310 +51,267 @@ <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="file_name_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">File Name</property> - <property name="selectable">True</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox1"> + <object class="GtkGrid" id="grid_table"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">18</property> + <child> + <object class="GtkLabel" id="document_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Document</property> + <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="justify">center</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="selection_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Selection</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lines_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Lines</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> <child> - <object class="GtkLabel" id="label28"> + <object class="GtkLabel" id="words_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes"> </property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Words</property> + <property name="selectable">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkGrid" id="grid_table"> + <object class="GtkLabel" id="chars_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">18</property> - <child> - <object class="GtkLabel" id="document_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Document</property> - <property name="use_markup">True</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="selection_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Selection</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lines_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Lines</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="words_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Words</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="chars_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Characters (with spaces)</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="chars_ns_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Characters (no spaces)</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="bytes_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Bytes</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="document_lines_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label">0</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="document_words_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label">0</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="document_chars_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label">0</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="document_chars_ns_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label">0</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="document_bytes_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label">0</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="selected_lines_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label">0</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="selected_words_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label">0</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="selected_chars_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label">0</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="selected_chars_ns_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label">0</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="selected_bytes_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label">0</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Characters (with spaces)</property> + <property name="selectable">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="chars_ns_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Characters (no spaces)</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="bytes_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Bytes</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="document_lines_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="document_words_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="document_chars_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="document_chars_ns_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="document_bytes_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="selected_lines_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="selected_words_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="selected_chars_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="selected_chars_ns_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="selected_bytes_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> @@ -377,9 +334,4 @@ <action-widget response="-5">update_button</action-widget> </action-widgets> </object> - <object class="GtkImage" id="update_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-refresh</property> - </object> </interface> |