Sakura

Merge lp:~ikenfin/sakura/q_267951 into lp:~dabisu/sakura/sakura

  1. q_267951
  2. Merge into sakura
Proposed by Tominov Sergey
Status: Merged
Approved by: David Gómez
Approved revision: 530
Merged at revision: 532
Proposed branch: lp:~ikenfin/sakura/q_267951
Merge into: lp:~dabisu/sakura/sakura
Diff against target: 45 lines (+15/-2)
1 file modified
src/sakura.c (+15/-2)
To merge this branch: bzr merge lp:~ikenfin/sakura/q_267951
Reviewer Review Type Date Requested Status
David Gómez Approve
Review via email: mp+278939@code.launchpad.net

Commit message

Added tab_default_title option

Description of the change

Added tab_default_title option, to setting tab name pattern (see https://answers.launchpad.net/sakura/+question/267951)

To post a comment you must log in.
Revision history for this message
David Gómez (dabisu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/sakura.c'
2--- src/sakura.c 2015-11-27 16:22:30 +0000
3+++ src/sakura.c 2015-11-30 10:04:34 +0000
4@@ -247,6 +247,7 @@
5 GtkCssProvider *provider;
6 char *configfile;
7 char *icon;
8+ gchar *tab_default_title;
9 gint last_colorset;
10 gint add_tab_accelerator;
11 gint del_tab_accelerator;
12@@ -2052,6 +2053,9 @@
13 }
14 sakura.icon = g_key_file_get_string(sakura.cfg, cfg_group, "icon_file", NULL);
15
16+ /* set default title pattern from config or NULL */
17+ sakura.tab_default_title = g_key_file_get_string(sakura.cfg, cfg_group, "tab_default_title", NULL);
18+
19 /* Use always GTK header bar*/
20 g_object_set(gtk_settings_get_default(), "gtk-dialogs-use-header", TRUE, NULL);
21
22@@ -2603,13 +2607,22 @@
23 int index;
24 int npages;
25 gchar *cwd = NULL;
26+ gchar *label_text = _("Terminal %d");
27
28 term = g_new0( struct terminal, 1 );
29
30 /* Create label for tabs */
31- term->label_text=g_strdup_printf(_("Terminal %d"), sakura.label_count++);
32+ term->label_set_byuser=false;
33+
34+ /* appling tab title pattern from config (https://answers.launchpad.net/sakura/+question/267951) */
35+ if(sakura.tab_default_title != NULL) {
36+ label_text = sakura.tab_default_title;
37+ term->label_set_byuser = true;
38+ }
39+
40+ term->label_text=g_strdup_printf(label_text, sakura.label_count++);
41 term->label=gtk_label_new(term->label_text);
42- term->label_set_byuser=false;
43+
44 tab_label_hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
45 gtk_box_pack_start(GTK_BOX(tab_label_hbox), term->label, FALSE, FALSE, 0);
46

Subscribers

People subscribed via source and target branches