Merge lp:~ikenfin/sakura/q_267951 into lp:~dabisu/sakura/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
=== modified file 'src/sakura.c'
--- src/sakura.c 2015-11-27 16:22:30 +0000
+++ src/sakura.c 2015-11-30 10:04:34 +0000
@@ -247,6 +247,7 @@
247 GtkCssProvider *provider;247 GtkCssProvider *provider;
248 char *configfile;248 char *configfile;
249 char *icon;249 char *icon;
250 gchar *tab_default_title;
250 gint last_colorset;251 gint last_colorset;
251 gint add_tab_accelerator;252 gint add_tab_accelerator;
252 gint del_tab_accelerator;253 gint del_tab_accelerator;
@@ -2052,6 +2053,9 @@
2052 }2053 }
2053 sakura.icon = g_key_file_get_string(sakura.cfg, cfg_group, "icon_file", NULL);2054 sakura.icon = g_key_file_get_string(sakura.cfg, cfg_group, "icon_file", NULL);
20542055
2056 /* set default title pattern from config or NULL */
2057 sakura.tab_default_title = g_key_file_get_string(sakura.cfg, cfg_group, "tab_default_title", NULL);
2058
2055 /* Use always GTK header bar*/2059 /* Use always GTK header bar*/
2056 g_object_set(gtk_settings_get_default(), "gtk-dialogs-use-header", TRUE, NULL);2060 g_object_set(gtk_settings_get_default(), "gtk-dialogs-use-header", TRUE, NULL);
20572061
@@ -2603,13 +2607,22 @@
2603 int index;2607 int index;
2604 int npages;2608 int npages;
2605 gchar *cwd = NULL;2609 gchar *cwd = NULL;
2610 gchar *label_text = _("Terminal %d");
26062611
2607 term = g_new0( struct terminal, 1 );2612 term = g_new0( struct terminal, 1 );
26082613
2609 /* Create label for tabs */2614 /* Create label for tabs */
2610 term->label_text=g_strdup_printf(_("Terminal %d"), sakura.label_count++);2615 term->label_set_byuser=false;
2616
2617 /* appling tab title pattern from config (https://answers.launchpad.net/sakura/+question/267951) */
2618 if(sakura.tab_default_title != NULL) {
2619 label_text = sakura.tab_default_title;
2620 term->label_set_byuser = true;
2621 }
2622
2623 term->label_text=g_strdup_printf(label_text, sakura.label_count++);
2611 term->label=gtk_label_new(term->label_text);2624 term->label=gtk_label_new(term->label_text);
2612 term->label_set_byuser=false;2625
2613 tab_label_hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);2626 tab_label_hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
2614 gtk_box_pack_start(GTK_BOX(tab_label_hbox), term->label, FALSE, FALSE, 0);2627 gtk_box_pack_start(GTK_BOX(tab_label_hbox), term->label, FALSE, FALSE, 0);
2615 2628

Subscribers

People subscribed via source and target branches