Changeset 1308

Timestamp:

03/09/07 19:27:21 (6 years ago)

Author:

thomas

Message:

• Add a command line option to to the dialer to show the gui on first run
• Make sure no windows are shown and then hidden in openmoko-dialer

Location:

trunk/src/target/OM-2007/applications/openmoko-dialer/src

Files:

• openmoko-dialer-main.c (modified) (3 diffs)
• openmoko-dialer-window-dialer.c (modified) (2 diffs)
• openmoko-dialer-window-history.c (modified) (5 diffs)
• openmoko-dialer-window-incoming.c (modified) (1 diff)
• openmoko-dialer-window-outgoing.c (modified) (4 diffs)
• openmoko-dialer-window-pin.c (modified) (1 diff)
• openmoko-dialer-window-talking.c (modified) (3 diffs)

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c

@@ -249 +249 @@
 }
 
+static gboolean show_gui;
+
+static GOptionEntry entries[] = 
+{
+  { "show-gui", 's', 0, G_OPTION_ARG_NONE, &show_gui, "Show the GUI at startup (default off)", "N" },
+  { NULL }
+};
+
+
 int main( int argc, char** argv )
 {
@@ -259 +268 @@
     {
       /* Add init code. */
+      GError *error = NULL;
+      GOptionContext *context = g_option_context_new ("");
+
+      g_option_context_add_main_entries (context, entries, NULL);
+      g_option_context_add_group (context, gtk_get_option_group (TRUE));
+      g_option_context_parse (context, &argc, &argv, &error);
+
+      g_option_context_free (context);
     }
   lockapp = testlock ("/tmp/dialer.lock");
@@ -298 +315 @@
   DBG_MSG ("\nusage: \"openmoko-dialer\" will not show any GUI initialy until you reactivate the app using another \"openmoko-dialer\" command");
 
-
+if (show_gui)
+{
+  handle_sigusr1 (SIGUSR1);
+}
 
 //from now on we will not use multithreads.

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c

@@ -91 +91 @@
 
 //start dialling.
-  gtk_widget_show (appdata->window_history);
+  gtk_widget_show_all (appdata->window_history);
 
 }
@@ -148 +148 @@
 
 //start dialling.
-  gtk_widget_show (appdata->window_outgoing);
+  gtk_widget_show_all (appdata->window_outgoing);
 
   g_free (codesinput);

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c

@@ -363 +363 @@
 
    //FIXME: without gtk_widget_show_all first and then hide, the history view will not show properly. -tony
-   gtk_widget_show_all(GTK_WIDGET(window));
+   //gtk_widget_show_all(GTK_WIDGET(window));
 
     //now the wheel and tool box, why should the wheel and toolbox created after the gtk_widget_show_all???
@@ -379 +379 @@
 
     g_signal_connect (G_OBJECT (moko_finger_window_get_wheel (window)),
-                      "press_bottom",
+                      "prehttp://planet.gnome.org/ss_bottom",
                       G_CALLBACK (cb_tool_button_history_back_clicked),
                       p_dialer_data);
@@ -387 +387 @@
 
     /* TODO: remove the GTK_WIDGET() casts when libmokoui is fixed */
-    button =
-      GTK_WIDGET (moko_finger_tool_box_add_button_without_label (tools));
+    button = moko_finger_tool_box_add_button_without_label (tools);
     image = file_new_image_from_relative_path ("phone.png");
     moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
@@ -414 +413 @@
                       G_CALLBACK (cb_tool_button_history_delete_clicked),
                       p_dialer_data);
-    //gtk_widget_show (GTK_WIDGET (tools));
-
     button =
       GTK_WIDGET (moko_finger_tool_box_add_button_without_label (tools));
@@ -425 +422 @@
                       p_dialer_data);
 
-    //gtk_widget_show (GTK_WIDGET (tools));
-
     p_dialer_data->wheel_history = GTK_WIDGET (moko_finger_window_get_wheel (window));
     p_dialer_data->toolbox_history = GTK_WIDGET (tools);
-    gtk_widget_hide(GTK_WIDGET(window));
     DBG_LEAVE ();
   }

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c

@@ -292 +292 @@
 
 
-    gtk_widget_show_all (GTK_WIDGET (window));
-
-
-    gtk_widget_hide (GTK_WIDGET (window));
-
-
     moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status), "Incoming call");
     moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status), "");

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c

@@ -54 +54 @@
 
 
-//transfer the contact info
+  //transfer the contact info
   window_talking_prepare (appdata);
 
-//start dialling.
+  //start dialling.
 
   DBG_TRACE ();
-  gtk_widget_show (appdata->window_talking);
+  gtk_widget_show_all (appdata->window_talking);
 
 
@@ -282 +282 @@
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (cb_redial_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_widget_set_size_request(button,60,24);
+    g_object_set (G_OBJECT (button), "no-show-all", TRUE, NULL);
 
 
@@ -295 +294 @@
     gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
 
-
-
-
     gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 50);
 
@@ -308 +304 @@
     gtk_window_set_decorated(GTK_WINDOW(window ),FALSE); //FIXME: this line seems only necessary on my PC. tony
     moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
-
-
-    gtk_widget_show_all (GTK_WIDGET (window));
-
-    gtk_widget_hide (p_dialer_data->buttonRedial);
-
-
-    gtk_widget_hide (GTK_WIDGET (window));
-
 
     moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status), "Outgoing call");

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c

@@ -219 +219 @@
     p_dialer_data->window_pin = window;
 
-    gtk_widget_show_all (GTK_WIDGET (window));
-    gtk_widget_hide (GTK_WIDGET (window));
-
-
   }
 

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c

@@ -350 +350 @@
     gtk_box_pack_start (GTK_BOX (vbox), content_dtmf, FALSE, FALSE, 0);
     p_dialer_data->content_dtmf = content_dtmf;
-
-
-//now the container--window
+    g_object_set (G_OBJECT (content_dtmf), "no-show-all", TRUE);
+
+
+    //now the container--window
     window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
     gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
@@ -363 +364 @@
 
 
-
-
-    gtk_widget_show_all (GTK_WIDGET (window));
-
-//the gtk_widget_show_all is really bad, cause i have to call it and then hide some widgets.
-
-    gtk_widget_hide (content_dtmf);
-
-
     //now the wheel and tool box, why should the wheel and toolbox created after the gtk_widget_show_all???
-//   gtk_widget_show(GTK_WIDGET(moko_finger_window_get_wheel(window)));
     wheel=moko_finger_window_get_wheel (window);
     g_signal_connect (G_OBJECT (wheel),
@@ -419 +410 @@
     p_dialer_data->toolbox_talking = GTK_WIDGET (tools);
 
-    //gtk_widget_hide(window);
-
-
     DBG_LEAVE ();
   }