r1658 - in trunk/src/target/OM-2007/openmoko-libs: . libmokoui
rob at sita.openmoko.org
rob at sita.openmoko.org
Thu Apr 5 10:10:41 CEST 2007
Author: rob
Date: 2007-04-05 10:04:05 +0200 (Thu, 05 Apr 2007)
New Revision: 1658
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.c
Log:
2007-04-05 Rob Bradford <rob at openedhand.com>
* libmokoui/moko-dialog.c: (moko_dialog_init):
Remove close button. It isn't on the mockups.
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-04-04 17:42:01 UTC (rev 1657)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-04-05 08:04:05 UTC (rev 1658)
@@ -1,3 +1,8 @@
+2007-04-05 Rob Bradford <rob at openedhand.com>
+
+ * libmokoui/moko-dialog.c: (moko_dialog_init):
+ Remove close button. It isn't on the mockups.
+
2007-04-03 Rob Bradford <rob at openedhand.com>
* libmokoui/moko-dialog.c: (moko_dialog_add_button),
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.c 2007-04-04 17:42:01 UTC (rev 1657)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.c 2007-04-05 08:04:05 UTC (rev 1658)
@@ -131,14 +131,6 @@
}
static void
-moko_dialog_closebutton_cb (GtkButton *button, gpointer user_data)
-{
- MokoDialog *self = MOKO_DIALOG (user_data);
-
- moko_dialog_response (self, GTK_RESPONSE_DELETE_EVENT);
-}
-
-static void
moko_dialog_init (MokoDialog *self)
{
MokoDialogPrivate* priv = DIALOG_PRIVATE(self);
@@ -152,7 +144,7 @@
*/
/* The primary vbox holds the contents of the dialog and the action_area */
- self->vbox = gtk_vbox_new (FALSE, 0);
+ self->vbox = gtk_vbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (self), self->vbox);
/* Create the hbox at the top */
@@ -160,25 +152,18 @@
/* Add an eventbox to said hbox */
priv->eventbox = gtk_event_box_new ();
- gtk_box_pack_start (GTK_BOX(priv->hbox), priv->eventbox, TRUE, TRUE, 0);
- gtk_widget_set_name( priv->eventbox, "mokodialogwindow-title-labelbox" );
+ gtk_box_pack_start (GTK_BOX (priv->hbox), priv->eventbox, TRUE, TRUE, 0);
+ gtk_widget_set_name (priv->eventbox, "mokodialogwindow-title-labelbox");
/* Create the label for the top */
- priv->label = gtk_label_new(NULL);
+ priv->label = gtk_label_new (NULL);
gtk_widget_set_name (priv->label, "mokodialogwindow-title-label");
/* Add to the eventbox */
- gtk_container_add (GTK_CONTAINER(priv->eventbox), priv->label);
+ gtk_container_add (GTK_CONTAINER (priv->eventbox), priv->label);
- /* Add close button */
- priv->closebutton = moko_pixmap_button_new ();
- g_signal_connect (G_OBJECT(priv->closebutton), "clicked", G_CALLBACK(moko_dialog_closebutton_cb), self);
- gtk_widget_set_name(priv->closebutton, "mokodialogwindow-closebutton");
-
- gtk_box_pack_start (GTK_BOX(priv->hbox), priv->closebutton, FALSE, FALSE, 0);
-
/* Add this hbox to the start of vbox */
- gtk_box_pack_start (GTK_BOX (self->vbox), priv->hbox, FALSE, FALSE, 0 );
+ gtk_box_pack_start (GTK_BOX (self->vbox), priv->hbox, FALSE, FALSE, 0);
/**
* Now get back to the proper parts of the dialog
More information about the commitlog
mailing list