projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get GUI mostly working again
[projects/chimara/chimara.git]
/
player
/
player.c
diff --git
a/player/player.c
b/player/player.c
index b59da1b374aa7d4921bcd3ddf856e61854e6d972..0d8d629d016dfe407cf458c20f4ddec889a27e74 100644
(file)
--- a/
player/player.c
+++ b/
player/player.c
@@
-1,4
+1,5
@@
#include <glib-object.h>
#include <glib-object.h>
+#include <glib/gi18n.h>
#include <libchimara/chimara-glk.h>
#include <libchimara/chimara-if.h>
#include "player.h"
#include <libchimara/chimara-glk.h>
#include <libchimara/chimara-if.h>
#include "player.h"
@@
-92,11
+93,19
@@
static void
chimara_player_init(ChimaraPlayer *self)
{
GError *error = NULL;
chimara_player_init(ChimaraPlayer *self)
{
GError *error = NULL;
-
+
+ /* Set parent properties */
+ g_object_set(self,
+ "title", _("Chimara"),
+ "default-width", 600,
+ "default-height", 800,
+ NULL);
+
+ /* Construct user interface */
GtkBuilder *builder = gtk_builder_new();
char *object_ids[] = {
"actiongroup",
GtkBuilder *builder = gtk_builder_new();
char *object_ids[] = {
"actiongroup",
- "vbox",
+ "
player-
vbox",
NULL
};
NULL
};
@@
-159,7
+168,7
@@
chimara_player_init(ChimaraPlayer *self)
chimara_glk_set_css_from_string(CHIMARA_GLK(glk),
"buffer.normal { font-family: 'Comic Sans MS'; }");*/
chimara_glk_set_css_from_string(CHIMARA_GLK(glk),
"buffer.normal { font-family: 'Comic Sans MS'; }");*/
- GtkBox *vbox = GTK_BOX(load_object(builder, "
vbox"));
+ GtkBox *vbox = GTK_BOX(load_object(builder, "
player-vbox"));
ChimaraApp *theapp = chimara_app_get();
ChimaraApp *theapp = chimara_app_get();
@@
-301,10
+310,3
@@
on_quit_activate(GtkAction *action, ChimaraPlayer *player)
chimara_glk_feed_line_input(CHIMARA_GLK(player->glk), "quit");
}
chimara_glk_feed_line_input(CHIMARA_GLK(player->glk), "quit");
}
-gboolean
-on_window_delete_event(GtkWidget *widget, GdkEvent *event, ChimaraPlayer *player)
-{
- gtk_main_quit();
- return TRUE;
-}
-