Index: openmoko-dialer/src/openmoko-dialer-window-dialer.c
===================================================================
--- openmoko-dialer.orig/src/openmoko-dialer-window-dialer.c	2007-03-30 21:22:01.000000000 +0200
+++ openmoko-dialer/src/openmoko-dialer-window-dialer.c	2007-03-30 21:22:24.000000000 +0200
@@ -304,8 +304,6 @@
 
 
 
-#define WINDOW_DIALER_BUTTON_SIZE_X 100
-#define WINDOW_DIALER_BUTTON_SIZE_Y 100
 gint
 window_dialer_init (MOKO_DIALER_APP_DATA * p_dialer_data)
 {
@@ -317,6 +315,11 @@
     gdk_color_parse ("black", &color);
 
     GtkWidget *vbox = NULL;
+    int screen_width = gdk_screen_get_width(gdk_screen_get_default());
+    int window_dialer_button_size_x = 100 * screen_width / 480; /* 100% at 480x640 */
+    int window_dialer_button_size_y = 100 * screen_width / 480;
+    int window_dialer_padding = 5 * screen_width / 480;
+    int window_dialer_padding_large = 10 * screen_width / 480;
 
 
     GtkWidget *window = moko_finger_window_new ();
@@ -349,7 +352,7 @@
 
     /* contents */
     vbox = gtk_vbox_new (FALSE, 0);
-    GtkWidget *hbox = gtk_hbox_new (FALSE, 10);
+    GtkWidget *hbox = gtk_hbox_new (FALSE, window_dialer_padding_large);
 
 
     GtkWidget *eventbox1 = gtk_event_box_new ();
@@ -394,7 +397,7 @@
 
     GtkWidget *mokodialerpanel = moko_dialer_panel_new ();
 
-    gtk_widget_set_size_request (mokodialerpanel, 380, 384);
+    gtk_widget_set_size_request (mokodialerpanel, 380 * screen_width / 480, 384 * screen_width / 480);
 
 
     g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_input",
@@ -404,7 +407,7 @@
     g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_hold",
                       G_CALLBACK (on_dialer_panel_user_hold), p_dialer_data);
 
-    gtk_box_pack_start (GTK_BOX (hbox), mokodialerpanel, TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox), mokodialerpanel, TRUE, TRUE, window_dialer_padding);
 
 
 
@@ -421,10 +424,10 @@
                                                             ("delete.png"));
     moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
                                                    (button1), "Delete");
-    gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,
-                                 WINDOW_DIALER_BUTTON_SIZE_Y);
+    gtk_widget_set_size_request (button1, window_dialer_button_size_x,
+                                 window_dialer_button_size_y);
 
-    gtk_box_pack_start (GTK_BOX (vbox2), button1, FALSE, FALSE, 5);
+    gtk_box_pack_start (GTK_BOX (vbox2), button1, FALSE, FALSE, window_dialer_padding);
 
     GtkWidget *button3 = moko_pixmap_button_new ();
     g_signal_connect (G_OBJECT (button3), "clicked",
@@ -436,9 +439,9 @@
                                                             ("history.png"));
     moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
                                                    (button3), "History");
-    gtk_widget_set_size_request (button3, WINDOW_DIALER_BUTTON_SIZE_X,
-                                 WINDOW_DIALER_BUTTON_SIZE_Y);
-    gtk_box_pack_start (GTK_BOX (vbox2), button3, FALSE, FALSE, 5);
+    gtk_widget_set_size_request (button3, window_dialer_button_size_x,
+                                 window_dialer_button_size_y);
+    gtk_box_pack_start (GTK_BOX (vbox2), button3, FALSE, FALSE, window_dialer_padding);
 
 
     GtkWidget *button2 = moko_pixmap_button_new ();
@@ -452,17 +455,17 @@
                                                             ("phone.png"));
     moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
                                                    (button2), "Dial");
-    gtk_widget_set_size_request (button2, WINDOW_DIALER_BUTTON_SIZE_X + 20,
-                                 WINDOW_DIALER_BUTTON_SIZE_Y + 80);
+    gtk_widget_set_size_request (button2, window_dialer_button_size_x + window_dialer_button_size_x / 5,
+                                 window_dialer_button_size_y + window_dialer_button_size_x * 4 / 5);
 
-    gtk_box_pack_start (GTK_BOX (vbox2), button2, FALSE, FALSE, 20);
+    gtk_box_pack_start (GTK_BOX (vbox2), button2, FALSE, FALSE, window_dialer_padding_large * 2);
 
 
-    gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, window_dialer_padding);
 
 
 
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, window_dialer_padding);
 
 
 
Index: openmoko-dialer/src/moko-dialer-textview.c
===================================================================
--- openmoko-dialer.orig/src/moko-dialer-textview.c	2007-03-30 21:29:37.000000000 +0200
+++ openmoko-dialer/src/moko-dialer-textview.c	2007-03-30 21:29:38.000000000 +0200
@@ -53,6 +53,8 @@
   GtkTextView *textview = 0;
   GtkTextBuffer *buffer;
   GdkColor color;
+  int screen_width = gdk_screen_get_width(gdk_screen_get_default());
+
 
   textview = &moko_dialer_textview->textview;
   buffer = gtk_text_view_get_buffer (textview);
@@ -68,7 +70,7 @@
 
 
 
-  gtk_widget_set_size_request (GTK_WIDGET (textview), 480, 92);
+  gtk_widget_set_size_request (GTK_WIDGET (textview), screen_width, 92 * screen_width / 480);
   GTK_WIDGET_UNSET_FLAGS (textview, GTK_CAN_FOCUS);
   gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), FALSE);
   gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (textview), FALSE);
@@ -83,7 +85,7 @@
   font_desc_textview = pango_font_description_new ();
 
   // set the default font for the textview.
-  pango_font_description_set_size (font_desc_textview, 32 * PANGO_SCALE);
+  pango_font_description_set_size (font_desc_textview, 32 * screen_width / 480 * PANGO_SCALE);
 
   if (font_desc_textview)
   {
@@ -136,6 +138,7 @@
   gint len;
   GtkTextIter start, cursoriter_1, cursoriter;
   GtkTextIter end;
+  int screen_width = gdk_screen_get_width(gdk_screen_get_default());
 
 //text_view= lookup_widget (GTK_WIDGET(button), "textview");
   /* Obtaining the buffer associated with the widget. */
@@ -177,19 +180,19 @@
   {
     if (moko_dialer_textview->font_desc_textview)
       pango_font_description_set_size (moko_dialer_textview->
-                                       font_desc_textview, 32 * PANGO_SCALE);
+                                       font_desc_textview, 32 * screen_width / 480 * PANGO_SCALE);
   }
   else if (len >= 9 && len < 12)
   {
     if (moko_dialer_textview->font_desc_textview)
       pango_font_description_set_size (moko_dialer_textview->
-                                       font_desc_textview, 48 * PANGO_SCALE);
+                                       font_desc_textview, 48 * screen_width / 480 * PANGO_SCALE);
   }
   else if (len >= 0 && len < 9)
   {
     if (moko_dialer_textview->font_desc_textview)
       pango_font_description_set_size (moko_dialer_textview->
-                                       font_desc_textview, 64 * PANGO_SCALE);
+                                       font_desc_textview, 64 * screen_width / 480 * PANGO_SCALE);
   }
 
   gtk_widget_modify_font (GTK_WIDGET (moko_dialer_textview),
Index: openmoko-dialer/src/openmoko-dialer-window-outgoing.c
===================================================================
--- openmoko-dialer.orig/src/openmoko-dialer-window-outgoing.c	2007-03-30 21:24:06.000000000 +0200
+++ openmoko-dialer/src/openmoko-dialer-window-outgoing.c	2007-03-30 21:24:39.000000000 +0200
@@ -253,6 +253,7 @@
   MokoFingerWindow *window;
   GtkWidget *vbox;
   GtkWidget *status;
+  int screen_width = gdk_screen_get_width(gdk_screen_get_default());
 
   if (p_dialer_data->window_outgoing == 0)
   {
@@ -276,14 +277,14 @@
                       G_CALLBACK (cb_speaker_button_clicked), p_dialer_data);
     p_dialer_data->buttonSpeaker = button;
 //gtk_widget_set_size_request(button,100,32);
-    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
+    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40 * screen_width / 480);
 
     button = gtk_button_new_with_label ("Redial");
     gtk_button_set_image(GTK_BUTTON(button),file_new_image_from_relative_path("redial.png"));
     p_dialer_data->buttonRedial = button;
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (cb_redial_button_clicked), p_dialer_data);
-    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
+    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40 * screen_width / 480);
     g_object_set (G_OBJECT (button), "no-show-all", TRUE, NULL);
 
 
@@ -293,9 +294,9 @@
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (cb_cancel_button_clicked), p_dialer_data);
 //gtk_widget_set_size_request(button,100,32);
-    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
+    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40 * screen_width / 480);
 
-    gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 50);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 50 * screen_width / 480);
 
 
 //currently     MokoDialogWindow is not finished, wating...