[tali] Remove statusbar and put those messages into the headerbar subtitle
- From: Mario Wenzel <mariowenzel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tali] Remove statusbar and put those messages into the headerbar subtitle
- Date: Wed, 15 Jan 2014 22:03:06 +0000 (UTC)
commit 88176fb281b27308cd00ef17072a2c5dee54542a
Author: Mario Wenzel <maweki gmail com>
Date: Wed Jan 15 23:01:35 2014 +0100
Remove statusbar and put those messages into the headerbar subtitle
https://bugzilla.gnome.org/show_bug.cgi?id=666504
src/gyahtzee.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/src/gyahtzee.c b/src/gyahtzee.c
index d5c2d51..8d68007 100644
--- a/src/gyahtzee.c
+++ b/src/gyahtzee.c
@@ -86,10 +86,10 @@ static GtkWidget *dicePixmaps[NUMBER_OF_DICE][NUMBER_OF_PIXMAPS][GAME_TYPES];
GSettings *settings;
GtkWidget *window;
GtkWidget *ScoreList;
-static GtkWidget *statusbar;
static GtkToolItem *diceBox[NUMBER_OF_DICE];
static GtkWidget *rollLabel;
static GtkWidget *mbutton;
+static GtkWidget *hbar;
static GAction *scores_action;
static GAction *undo_action;
static gchar *game_type_string = NULL;
@@ -565,17 +565,14 @@ say (char *fmt, ...)
{
va_list ap;
char buf[200];
- guint context_id;
if (test_computer_play > 0) return;
va_start (ap, fmt);
g_vsnprintf (buf, 200, fmt, ap);
va_end (ap);
- context_id =
- gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar), "message");
- gtk_statusbar_pop (GTK_STATUSBAR (statusbar), context_id);
- gtk_statusbar_push (GTK_STATUSBAR (statusbar), context_id, buf);
+ gtk_header_bar_set_subtitle (GTK_HEADER_BAR (hbar), buf);
+
}
@@ -719,7 +716,6 @@ GyahtzeeCreateMainWindow (void)
GtkWidget *toolbar;
GtkWidget *tmp;
GtkWidget *dicebox;
- GtkWidget *hbar;
GMenu *app_menu, *section;
int i, j;
@@ -734,8 +730,6 @@ GyahtzeeCreateMainWindow (void)
g_signal_connect (G_OBJECT (window), "key_press_event",
G_CALLBACK (key_press), NULL);
- statusbar = gtk_statusbar_new ();
-
g_action_map_add_action_entries (G_ACTION_MAP (application), app_entries, G_N_ELEMENTS (app_entries),
application);
gtk_application_add_accelerator (application, "<Primary>z", "app.undo", NULL);
gtk_application_add_accelerator (application, "<Primary>q", "app.quit", NULL);
@@ -775,9 +769,7 @@ GyahtzeeCreateMainWindow (void)
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), statusbar, FALSE, FALSE, 0);
- gtk_widget_show (statusbar);
/* Retreive dice pixmaps from memory or files */
LoadDicePixmaps ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]