[brasero] brasero-jacket-edit: generalise text justification to reduce duplication
- From: Joshua Lock <joshuagl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [brasero] brasero-jacket-edit: generalise text justification to reduce duplication
- Date: Thu, 22 Aug 2013 17:02:52 +0000 (UTC)
commit 537f12c128bcd96d4ec819e4fa1568e20d0b75d2
Author: Joshua Lock <joshua lock intel com>
Date: Tue Aug 20 18:57:33 2013 +0100
brasero-jacket-edit: generalise text justification to reduce duplication
libbrasero-utils/brasero-jacket-edit.c | 81 +++++--------------------------
1 files changed, 13 insertions(+), 68 deletions(-)
---
diff --git a/libbrasero-utils/brasero-jacket-edit.c b/libbrasero-utils/brasero-jacket-edit.c
index f7ed657..ca09f17 100644
--- a/libbrasero-utils/brasero-jacket-edit.c
+++ b/libbrasero-utils/brasero-jacket-edit.c
@@ -233,8 +233,9 @@ brasero_jacket_edit_bold_pressed_cb (GtkToggleToolButton *button,
}
static void
-brasero_jacket_edit_center_pressed_cb (GtkToggleToolButton *button,
- BraseroJacketEdit *self)
+brasero_jacket_edit_justify (GtkToggleToolButton *button,
+ BraseroJacketEdit *self,
+ GtkJustification justify)
{
BraseroJacketEditPrivate *priv;
GtkTextBuffer *buffer;
@@ -252,7 +253,7 @@ brasero_jacket_edit_center_pressed_cb (GtkToggleToolButton *button,
buffer = brasero_jacket_view_get_active_buffer (BRASERO_JACKET_VIEW (priv->current_view));
tag = gtk_text_buffer_create_tag (buffer, NULL,
- "justification", GTK_JUSTIFY_CENTER,
+ "justification", justify,
NULL);
if (!gtk_text_buffer_get_has_selection (buffer)) {
@@ -272,80 +273,24 @@ brasero_jacket_edit_center_pressed_cb (GtkToggleToolButton *button,
}
static void
+brasero_jacket_edit_center_pressed_cb (GtkToggleToolButton *button,
+ BraseroJacketEdit *self)
+{
+ brasero_jacket_edit_justify (button, self, GTK_JUSTIFY_CENTER);
+}
+
+static void
brasero_jacket_edit_right_pressed_cb (GtkToggleToolButton *button,
BraseroJacketEdit *self)
{
- BraseroJacketEditPrivate *priv;
- GtkTextBuffer *buffer;
- GtkTextIter start;
- GtkTextIter end;
- GtkTextTag *tag;
-
- priv = BRASERO_JACKET_EDIT_PRIVATE (self);
- if (!priv->current_view)
- return;
-
- if (!gtk_toggle_tool_button_get_active (button))
- return;
-
- buffer = brasero_jacket_view_get_active_buffer (BRASERO_JACKET_VIEW (priv->current_view));
- tag = gtk_text_buffer_create_tag (buffer, NULL,
- "justification", GTK_JUSTIFY_RIGHT,
- NULL);
-
- if (!gtk_text_buffer_get_has_selection (buffer)) {
- GtkTextMark *mark;
-
- mark = gtk_text_buffer_get_insert (buffer);
- gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
- gtk_text_buffer_get_iter_at_mark (buffer, &end, mark);
- brasero_jacket_buffer_add_default_tag (BRASERO_JACKET_BUFFER (buffer), tag);
- }
- else
- gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
-
-
- gtk_text_iter_set_line_index (&start, 0);
- gtk_text_iter_forward_to_line_end (&end);
- gtk_text_buffer_apply_tag (buffer, tag, &start, &end);
+ brasero_jacket_edit_justify (button, self, GTK_JUSTIFY_RIGHT);
}
static void
brasero_jacket_edit_left_pressed_cb (GtkToggleToolButton *button,
BraseroJacketEdit *self)
{
- BraseroJacketEditPrivate *priv;
- GtkTextBuffer *buffer;
- GtkTextIter start;
- GtkTextIter end;
- GtkTextTag *tag;
-
- priv = BRASERO_JACKET_EDIT_PRIVATE (self);
- if (!priv->current_view)
- return;
-
- if (!gtk_toggle_tool_button_get_active (button))
- return;
-
- buffer = brasero_jacket_view_get_active_buffer (BRASERO_JACKET_VIEW (priv->current_view));
- tag = gtk_text_buffer_create_tag (buffer, NULL,
- "justification", GTK_JUSTIFY_LEFT,
- NULL);
-
- if (!gtk_text_buffer_get_has_selection (buffer)) {
- GtkTextMark *mark;
-
- mark = gtk_text_buffer_get_insert (buffer);
- gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
- gtk_text_buffer_get_iter_at_mark (buffer, &end, mark);
- brasero_jacket_buffer_add_default_tag (BRASERO_JACKET_BUFFER (buffer), tag);
- }
- else
- gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
-
- gtk_text_iter_set_line_index (&start, 0);
- gtk_text_iter_forward_to_line_end (&end);
- gtk_text_buffer_apply_tag (buffer, tag, &start, &end);
+ brasero_jacket_edit_justify (button, self, GTK_JUSTIFY_LEFT);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]