All pastes #571928 Raw Edit

Diff

public text v1 · immutable
·published 2007-06-17 12:04 UTC
rendered paste body
Index: openmoko-dialer/src/dialer-window-history.c===================================================================--- openmoko-dialer.orig/src/dialer-window-history.c	2007-06-15 11:02:29.000000000 +0200+++ openmoko-dialer/src/dialer-window-history.c	2007-06-15 11:02:39.000000000 +0200@@ -594,7 +594,7 @@                     p_dialer_data);    GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);-  gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 150, 0, 0);      //FIXME too many numbers has to be retrieved from style+  gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 75, 0, 0);      //FIXME too many numbers has to be retrieved from style    GtkWidget *scrolledwindow = gtk_scrolled_window_new (NULL, NULL);   gtk_widget_show (scrolledwindow);@@ -952,7 +952,7 @@   all_calls = gtk_image_menu_item_new_with_mnemonic (("Calls All"));   gtk_widget_show (all_calls);   gtk_container_add (GTK_CONTAINER (menu_history), all_calls);-  gtk_widget_set_size_request (all_calls, 250, 60);+  gtk_widget_set_size_request (all_calls, 125, 30);     imageAll = file_new_image_from_relative_path ("all.png");@@ -962,13 +962,13 @@   separator1 = gtk_separator_menu_item_new ();   gtk_widget_show (separator1);   gtk_container_add (GTK_CONTAINER (menu_history), separator1);-  gtk_widget_set_size_request (separator1, 120, -1);+  gtk_widget_set_size_request (separator1, 60, -1);   gtk_widget_set_sensitive (separator1, FALSE);    missed_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Missed "));   gtk_widget_show (missed_calls);   gtk_container_add (GTK_CONTAINER (menu_history), missed_calls);-  gtk_widget_set_size_request (missed_calls, 120, 60);+  gtk_widget_set_size_request (missed_calls, 60, 30);    //imageMissed = gtk_image_new_from_stock ("gtk-goto-bottom", GTK_ICON_SIZE_MENU);   imageMissed = file_new_image_from_relative_path ("missed.png");@@ -979,13 +979,13 @@   separator3 = gtk_separator_menu_item_new ();   gtk_widget_show (separator3);   gtk_container_add (GTK_CONTAINER (menu_history), separator3);-  gtk_widget_set_size_request (separator3, 120, -1);+  gtk_widget_set_size_request (separator3, 60, -1);   gtk_widget_set_sensitive (separator3, FALSE);    dialed_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Dialed"));   gtk_widget_show (dialed_calls);   gtk_container_add (GTK_CONTAINER (menu_history), dialed_calls);-  gtk_widget_set_size_request (dialed_calls, 120, 60);+  gtk_widget_set_size_request (dialed_calls, 60, 30);    // imageDialed = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);   imageDialed = file_new_image_from_relative_path ("dialed.png");@@ -996,13 +996,13 @@   separator2 = gtk_separator_menu_item_new ();   gtk_widget_show (separator2);   gtk_container_add (GTK_CONTAINER (menu_history), separator2);-  gtk_widget_set_size_request (separator2, 120, -1);+  gtk_widget_set_size_request (separator2, 60, -1);   gtk_widget_set_sensitive (separator2, FALSE);    received_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Received "));   gtk_widget_show (received_calls);   gtk_container_add (GTK_CONTAINER (menu_history), received_calls);-  gtk_widget_set_size_request (received_calls, 120, 60);+  gtk_widget_set_size_request (received_calls, 60, 30);    // imageReceived = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU);   imageReceived = file_new_image_from_relative_path ("received.png");Index: openmoko-dialer/src/dialer-window-pin.c===================================================================--- openmoko-dialer.orig/src/dialer-window-pin.c	2007-06-15 11:02:29.000000000 +0200+++ openmoko-dialer/src/dialer-window-pin.c	2007-06-15 11:02:39.000000000 +0200@@ -144,7 +144,7 @@   gtk_widget_show (eventbox1);   gtk_widget_set_name (eventbox1, "gtkeventbox-black");   gtk_widget_modify_bg (eventbox1, GTK_STATE_NORMAL, &color);-  // gtk_widget_set_size_request (eventbox1, 480, 132);+  // gtk_widget_set_size_request (eventbox1, 240, 66);    mokotextview = moko_dialer_textview_new ();   p_dialer_data->moko_pin_text_view = MOKO_DIALER_TEXTVIEW (mokotextview);@@ -155,11 +155,11 @@   gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eventbox1), FALSE, FALSE, 0);    mokodialerpanel = moko_dialer_panel_new ();-  gtk_widget_set_size_request (mokodialerpanel, 380, 384); //??? why hard coded+  gtk_widget_set_size_request (mokodialerpanel, 190, 192); //??? why hard coded   g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_input",                     G_CALLBACK (on_pin_panel_user_input), p_dialer_data);   gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (mokodialerpanel), TRUE,-                      TRUE, 5);+                      TRUE, 2);    /* The buttons */   vbox2 = gtk_vbox_new (FALSE, 0);@@ -177,7 +177,7 @@   // gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,   //                              WINDOW_DIALER_BUTTON_SIZE_Y); -  gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (button1), FALSE, FALSE, 5);+  gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (button1), FALSE, FALSE, 2);    button2 = moko_pixmap_button_new ();   gtk_widget_set_name (GTK_WIDGET (button2), "mokofingerbutton-orange");@@ -190,10 +190,10 @@                     G_CALLBACK (pin_ok_button_clicked), p_dialer_data);   //gtk_widget_set_size_request (button2, WINDOW_DIALER_BUTTON_SIZE_X,   //                         WINDOW_DIALER_BUTTON_SIZE_Y);-  gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (button2), FALSE, FALSE, 20);+  gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (button2), FALSE, FALSE, 10); -  gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (vbox2), TRUE, TRUE, 5);-  gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (hbox), TRUE, TRUE, 5);+  gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (vbox2), TRUE, TRUE, 2);+  gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (hbox), TRUE, TRUE, 2);    moko_finger_window_set_contents (window, GTK_WIDGET (vbox));   p_dialer_data->window_pin = GTK_WIDGET (window);Index: openmoko-dialer/src/dialer-window-talking.c===================================================================--- openmoko-dialer.orig/src/dialer-window-talking.c	2007-06-15 11:02:29.000000000 +0200+++ openmoko-dialer/src/dialer-window-talking.c	2007-06-15 11:02:39.000000000 +0200@@ -352,7 +352,7 @@      mokodialerpanel = moko_dialer_panel_new (); -    gtk_widget_set_size_request (mokodialerpanel, 380, 384);+    gtk_widget_set_size_request (mokodialerpanel, 190, 192);     g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_input",                       G_CALLBACK (on_dtmf_panel_user_input), p_dialer_data);     gtk_box_pack_start (GTK_BOX (content_dtmf),Index: openmoko-dialer/src/moko-dialer-autolist.c===================================================================--- openmoko-dialer.orig/src/moko-dialer-autolist.c	2007-06-15 11:02:29.000000000 +0200+++ openmoko-dialer/src/moko-dialer-autolist.c	2007-06-15 11:02:39.000000000 +0200@@ -177,7 +177,7 @@   priv->g_alternatecount_last_time = 0;   priv->g_last_string[0] = 0; -  gtk_widget_set_size_request (GTK_WIDGET (moko_dialer_autolist), 480, 40);+  gtk_widget_set_size_request (GTK_WIDGET (moko_dialer_autolist), 240, 20); }  /*@@ -367,7 +367,7 @@     imagePerson = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_DND);   }   gtk_widget_hide (imagePerson);-  gtk_widget_set_size_request (imagePerson, 40, 40);+  gtk_widget_set_size_request (imagePerson, 20, 20);    gtk_box_pack_start (GTK_BOX (moko_dialer_autolist), imagePerson,                       FALSE, FALSE, 0);Index: openmoko-dialer/src/moko-dialer-status.c===================================================================--- openmoko-dialer.orig/src/moko-dialer-status.c	2007-06-15 11:02:35.000000000 +0200+++ openmoko-dialer/src/moko-dialer-status.c	2007-06-15 11:02:39.000000000 +0200@@ -56,7 +56,7 @@  //lower section     moko_dialer_status->imagePerson = gtk_image_new ();   ///<the image of the person we care-  gtk_widget_set_size_request (moko_dialer_status->imagePerson, 130, 130);+  gtk_widget_set_size_request (moko_dialer_status->imagePerson, 65, 65);   gtk_misc_set_alignment (GTK_MISC (moko_dialer_status->imagePerson), 1, 0);  @@ -72,11 +72,11 @@ //private section   moko_dialer_status->number_of_the_icons = 0; -  gtk_widget_set_size_request (moko_dialer_status->icon, 64, 64);+  gtk_widget_set_size_request (moko_dialer_status->icon, 32, 32);   gtk_box_pack_start (GTK_BOX (moko_dialer_status),-                      moko_dialer_status->labelStatusTitle, FALSE, FALSE, 20);+                      moko_dialer_status->labelStatusTitle, FALSE, FALSE, 10);   gtk_box_pack_start (GTK_BOX (moko_dialer_status), moko_dialer_status->icon,-                      FALSE, FALSE, 20);+                      FALSE, FALSE, 10);  //ok now, we arrange them in the vbox. @@ -102,11 +102,11 @@                       TRUE, 0);  // gtk_box_pack_start( GTK_BOX(hbox2),vbox2, FALSE, FALSE, 0 );-  gtk_box_pack_start (GTK_BOX (hbox2), vbox2, TRUE, TRUE, 36);+  gtk_box_pack_start (GTK_BOX (hbox2), vbox2, TRUE, TRUE, 18);    gtk_box_pack_start (GTK_BOX (moko_dialer_status), hbox2, TRUE, TRUE, 0); -//gtk_widget_set_size_request (GTK_WIDGET(moko_dialer_status), 320, 200); +//gtk_widget_set_size_request (GTK_WIDGET(moko_dialer_status), 160, 100);     DBG_LEAVE (); Index: openmoko-dialer/src/moko-dialer-textview.c===================================================================--- openmoko-dialer.orig/src/moko-dialer-textview.c	2007-06-15 11:02:29.000000000 +0200+++ openmoko-dialer/src/moko-dialer-textview.c	2007-06-15 11:02:39.000000000 +0200@@ -68,7 +68,7 @@   -  gtk_widget_set_size_request (GTK_WIDGET (textview), 480, 92);+  gtk_widget_set_size_request (GTK_WIDGET (textview), 240, 46);   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 +83,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, 16 * PANGO_SCALE);    if (font_desc_textview)   {@@ -178,19 +178,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, 16 * 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, 24 * 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, 32 * PANGO_SCALE);   }    gtk_widget_modify_font (GTK_WIDGET (moko_dialer_textview),Index: openmoko-dialer/src/moko-dialer-tip.c===================================================================--- openmoko-dialer.orig/src/moko-dialer-tip.c	2007-06-15 11:02:29.000000000 +0200+++ openmoko-dialer/src/moko-dialer-tip.c	2007-06-15 11:02:39.000000000 +0200@@ -167,7 +167,7 @@   priv->index = -1;   priv->selected = FALSE; -// gtk_widget_set_size_request (GTK_WIDGET(self), 64, 64);+// gtk_widget_set_size_request (GTK_WIDGET(self), 32, 32);   return; } Index: openmoko-dialer/src/dialer-window-dialer.c===================================================================--- openmoko-dialer.orig/src/dialer-window-dialer.c	2007-06-15 11:35:08.000000000 +0200+++ openmoko-dialer/src/dialer-window-dialer.c	2007-06-15 11:36:08.000000000 +0200@@ -303,7 +303,7 @@      /* contents */     vbox = gtk_vbox_new (FALSE, 0);-    GtkWidget *hbox = gtk_hbox_new (FALSE, 10);+    GtkWidget *hbox = gtk_hbox_new (FALSE, 5);       GtkWidget *eventbox1 = gtk_event_box_new ();@@ -355,7 +355,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, 2);   @@ -389,9 +389,9 @@      gtk_box_pack_start (GTK_BOX (vbox2), button2, TRUE, TRUE, 0); -    gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 5);+    gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 2); -    gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);+    gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 2);